From ea33136657f35b47158553f3c2193e5e996cf654 Mon Sep 17 00:00:00 2001 From: EttyKitty <20323032+EttyKitty@users.noreply.github.com> Date: Mon, 28 Apr 2025 22:03:09 +0300 Subject: [PATCH 001/286] chore: More logging for the NameGenerator (#778) --- scripts/NameGenerator/NameGenerator.gml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/NameGenerator/NameGenerator.gml b/scripts/NameGenerator/NameGenerator.gml index 46046b640d..1e03be5ab6 100644 --- a/scripts/NameGenerator/NameGenerator.gml +++ b/scripts/NameGenerator/NameGenerator.gml @@ -83,8 +83,8 @@ function NameGenerator() constructor { array_copy(names, 0, used_names, 0, used_names_length); array_delete(used_names, 0, used_names_length); } else { - log_message($"Used up all {entity_name} names, generating generic name"); - return $"{entity_name} {used_names_length + ++star_names_generic_counter}"; + log_error($"Used up all {entity_name} names. Generating a generic name. used_names_length = {used_names_length}; star_names_generic_counter = {star_names_generic_counter}."); + return $"{entity_name} {used_names_length + (star_names_generic_counter++)}"; } } From 0b8043f77db357a726d1a99fbeb938bf56abf3eb Mon Sep 17 00:00:00 2001 From: EttyKitty <20323032+EttyKitty@users.noreply.github.com> Date: Mon, 28 Apr 2025 22:03:24 +0300 Subject: [PATCH 002/286] feat: Less red in the battlelog (#779) --- objects/obj_ncombat/Alarm_3.gml | 1 - objects/obj_ncombat/Alarm_5.gml | 4 +--- scripts/scr_flavor2/scr_flavor2.gml | 8 ++++---- 3 files changed, 5 insertions(+), 8 deletions(-) diff --git a/objects/obj_ncombat/Alarm_3.gml b/objects/obj_ncombat/Alarm_3.gml index 2fc932d6d9..960ade494f 100644 --- a/objects/obj_ncombat/Alarm_3.gml +++ b/objects/obj_ncombat/Alarm_3.gml @@ -94,7 +94,6 @@ if ((messages>0) and (messages_shown<24)) and (messages_shown<=100){ newline=message[that]; if (message_priority[that]>0) then newline_color="bright"; if (string_count("lost",newline)>0) then newline_color="red"; - if (string_count("critically damaged",newline)>0) then newline_color="red"; if (string_count("^",newline)>0){ newline=string_replace(newline,"^",""); newline_color="white"; diff --git a/objects/obj_ncombat/Alarm_5.gml b/objects/obj_ncombat/Alarm_5.gml index 9013944a67..a7b94f8315 100644 --- a/objects/obj_ncombat/Alarm_5.gml +++ b/objects/obj_ncombat/Alarm_5.gml @@ -115,7 +115,6 @@ var _total_deaths = final_marine_deaths + final_command_deaths; var _total_injured = _total_deaths + injured + units_saved_count; if (_total_injured > 0) { newline = $"{string_plural_count("unit", _total_injured)} {smart_verb("was", _total_injured)} critically injured."; - newline_color = "red"; scr_newtext(); if (units_saved_count > 0) { @@ -204,8 +203,7 @@ scr_newtext(); var _total_damaged_count = vehicle_deaths + vehicles_saved_count; if (_total_damaged_count > 0) { - newline = $"{string_plural_count("vehicle", _total_damaged_count)} {smart_verb("was", _total_damaged_count)} critically damaged during battle."; - newline_color="red"; + newline = $"{string_plural_count("vehicle", _total_damaged_count)} {smart_verb("was", _total_damaged_count)} disabled during battle."; scr_newtext(); if (vehicles_saved_count > 0) { diff --git a/scripts/scr_flavor2/scr_flavor2.gml b/scripts/scr_flavor2/scr_flavor2.gml index 1f37791a76..7ad3ad7b45 100644 --- a/scripts/scr_flavor2/scr_flavor2.gml +++ b/scripts/scr_flavor2/scr_flavor2.gml @@ -336,9 +336,9 @@ function scr_flavor2(lost_units_count, target_type, hostile_range, hostile_weapo if (him != -1) { // found a valid unit obj_ncombat.dead_jims += 1; if (marine_type[him] == obj_ini.role[100][5]) { - obj_ncombat.dead_jim[obj_ncombat.dead_jims] = $"A {marine_type[him]} has been critically injured!"; + obj_ncombat.dead_jim[obj_ncombat.dead_jims] = $"A {marine_type[him]} has been lost!"; } else { - obj_ncombat.dead_jim[obj_ncombat.dead_jims] = $"{unit_struct[him].name_role()} has been critically injured!"; + obj_ncombat.dead_jim[obj_ncombat.dead_jims] = $"{unit_struct[him].name_role()} has been lost!"; } } } @@ -355,7 +355,7 @@ function scr_flavor2(lost_units_count, target_type, hostile_range, hostile_weapo var lis, y1, y2; lis = string_rpos(", ", m2); m2 = string_delete(m2, lis, 3); // This clears the last ', ' and replaces it with the end statement - if (lost_units_count > 0) then m2 += " critically damaged."; + if (lost_units_count > 0) then m2 += " lost."; // show_message(m2); @@ -376,7 +376,7 @@ function scr_flavor2(lost_units_count, target_type, hostile_range, hostile_weapo var lis, y1, y2; lis = string_rpos(", ", m2); m2 = string_delete(m2, lis, 3); - if (lost_units_count > 0) then m2 += " critically damaged."; + if (lost_units_count > 0) then m2 += " lost."; } if (string_count(", ", m2) = 1) and(unce = 0) and(hostile_weapon = "Web Spinner") { var lis, y1, y2; From 4cc64ba30e867c22e3ad218019897abec325a9f0 Mon Sep 17 00:00:00 2001 From: EttyKitty <20323032+EttyKitty@users.noreply.github.com> Date: Tue, 29 Apr 2025 00:10:22 +0300 Subject: [PATCH 003/286] feat: Great Luck trait; Luck for more rolls; Ref the roll func (#769) --- datafiles/data/traits.json | 5 ++ objects/obj_controller/Alarm_5.gml | 12 ++--- objects/obj_creation/Create_0.gml | 11 ++++- objects/obj_ncombat/Alarm_5.gml | 21 ++++----- objects/obj_ncombat/Alarm_7.gml | 6 +-- objects/obj_popup/Step_0.gml | 6 +-- scripts/scr_add_artifact/scr_add_artifact.gml | 7 +-- scripts/scr_after_combat/scr_after_combat.gml | 2 +- .../scr_ancient_ruins/scr_ancient_ruins.gml | 4 +- .../scr_chaos_alliance_test.gml | 4 +- scripts/scr_clean/scr_clean.gml | 2 +- scripts/scr_enemy_ai_a/scr_enemy_ai_a.gml | 8 ++-- scripts/scr_enemy_ai_b/scr_enemy_ai_b.gml | 5 +- .../scr_initialize_custom.gml | 8 ++-- .../scr_marine_struct/scr_marine_struct.gml | 20 ++++---- .../scr_mechanicus_missions.gml | 6 +-- .../scr_mission_reward/scr_mission_reward.gml | 12 ++--- .../scr_pen_And_paper/scr_pen_And_paper.gml | 38 +++++++++++---- scripts/scr_perils_table/scr_perils_table.gml | 26 +++++------ .../scr_player_fleet_functions.gml | 4 +- .../scr_player_ship_functions.gml | 6 +-- scripts/scr_powers/scr_powers.gml | 2 +- scripts/scr_purge_world/scr_purge_world.gml | 46 ++++++++----------- scripts/scr_random_event/scr_random_event.gml | 40 +++++++--------- scripts/scr_ruins_reward/scr_ruins_reward.gml | 4 +- scripts/scr_unit_traits/scr_unit_traits.gml | 9 +++- 26 files changed, 157 insertions(+), 157 deletions(-) diff --git a/datafiles/data/traits.json b/datafiles/data/traits.json index 54f9cd50de..9f9507339f 100644 --- a/datafiles/data/traits.json +++ b/datafiles/data/traits.json @@ -41,6 +41,11 @@ "flavour_text": "For all their talent they are dogged by poor luck", "display_name": "Shitty Luck" }, + "great_luck": { + "luck": 4, + "flavour_text": "Blessed by great luck", + "display_name": "Great Luck" + }, "very_hard_to_kill": { "constitution": 15, "luck": 2, diff --git a/objects/obj_controller/Alarm_5.gml b/objects/obj_controller/Alarm_5.gml index 42056cfbb4..b541ca594f 100644 --- a/objects/obj_controller/Alarm_5.gml +++ b/objects/obj_controller/Alarm_5.gml @@ -118,12 +118,8 @@ if (turn=240) and (global.chapter_name="Lamenters"){ // ** Battlefield Loot ** if (scr_has_adv("Tech-Scavengers")){ var lroll1,lroll2,loot=""; - lroll1=floor(random(100))+1; - lroll2=floor(random(100))+1; - if (scr_has_disadv("Shitty Luck")){ - lroll1+=2; - lroll2+=25; - } + lroll1=roll_dice_chapter(1, 100, "low"); + lroll2=roll_dice_chapter(1, 100, "low"); if (lroll1<=5){ loot=choose("Chainsword","Bolt Pistol","Combat Knife","Narthecium"); if (lroll2<=80) then loot=choose("Power Sword","Storm Bolter"); @@ -631,9 +627,7 @@ for(var i=1; i<=99; i++){ } // Spare the inquisitor if (string_count("inquisitor_spared",event[i])>0){ - var diceh=floor(random(100))+1; - - if (scr_has_disadv("Shitty Luck")) then diceh-=25; + var diceh=roll_dice_chapter(1, 100, "high"); if (diceh<=25){ alarm[8]=1; diff --git a/objects/obj_creation/Create_0.gml b/objects/obj_creation/Create_0.gml index afc15d2bbd..a66a7e27e6 100644 --- a/objects/obj_creation/Create_0.gml +++ b/objects/obj_creation/Create_0.gml @@ -907,7 +907,13 @@ var all_advantages = [ description: "Your chapter is an elite fighting force comprised almost exclusively of Veterans. All Tactical Marines are replaced by Veterans.", value: 150, meta: ["Specialists"] - } + }, + { + name : "Great Luck", + description: "This is actually really helpful and beneficial for your chapter. Trust me.", + value: 20, + meta: ["Luck"] + }, ] @@ -962,8 +968,9 @@ var all_disadvantages = [ }, { name : "Shitty Luck", - description: "This is actually really helpful and beneficial for your chapter. Trust me.", + description: "This is actually really bad for your chapter. Trust me.", value: 20, + meta: ["Luck"] }, { name : "Sieged", diff --git a/objects/obj_ncombat/Alarm_5.gml b/objects/obj_ncombat/Alarm_5.gml index a7b94f8315..0674c4cb17 100644 --- a/objects/obj_ncombat/Alarm_5.gml +++ b/objects/obj_ncombat/Alarm_5.gml @@ -75,9 +75,9 @@ if (obj_ncombat.defeat == 0) { if (obj_controller.stc_bonus[3] = 4) { var _survival_roll = 70 + _candidate.priority; - var _dice_roll = roll_dice(1, 100, "high"); + var _dice_roll = roll_dice_chapter(1, 100, "high"); if (_dice_roll >= _survival_roll) && (_column_id.veh_dead[_vehicle_id] != 2) { - _column_id.veh_hp[_vehicle_id] = roll_dice(1, 10, "high"); + _column_id.veh_hp[_vehicle_id] = roll_dice_chapter(1, 10, "high"); _column_id.veh_dead[_vehicle_id] = false; vehicles_saved_count++; @@ -91,7 +91,7 @@ if (obj_ncombat.defeat == 0) { } if (vehicle_recovery_score > 0) { - _column_id.veh_hp[_vehicle_id] = roll_dice(1, 10, "high"); + _column_id.veh_hp[_vehicle_id] = roll_dice_chapter(1, 10, "high"); _column_id.veh_dead[_vehicle_id] = false; vehicle_recovery_score -= _candidate.priority; vehicles_saved_count++; @@ -339,7 +339,10 @@ if (fortified>0) and (!instance_exists(obj_nfort)) and (reduce_fortification=tru if (defeat=0) and (battle_special="space_hulk"){ - var enemy_power=0,loot=0,dicey=floor(random(100))+1,ex=0; + var enemy_power=0, + loot=0, + dicey=roll_dice_chapter(1, 100, "low"), + ex=0; if (enemy=7){ enemy_power=battle_object.p_orks[battle_id]; @@ -361,7 +364,6 @@ if (defeat=0) and (battle_special="space_hulk"){ if (ex=100) then newline_color="red"; scr_newtext(); - if (scr_has_disadv("Shitty Luck")) then dicey=dicey*1.5; // show_message("Roll Under: "+string(enemy_power*10)+", Roll: "+string(dicey)); if (dicey<=(enemy_power*10)){ @@ -684,13 +686,12 @@ inq_eated=false; if (obj_ini.omophagea){ - var eatme=floor(random(100))+1; + var eatme=roll_dice_chapter(1, 100, "high"); if (enemy=13) or (enemy=9) or (battle_special="ship_demon") then eatme+=100; if (enemy=10) and (battle_object.p_traitors[battle_id]=7) then eatme+=200; if (red_thirst=3) then thirsty=1;if (red_thirst>3) then thirsty=red_thirst-2; if (thirsty>0) then eatme-=(thirsty*6);if (really_thirsty>0) then eatme-=(really_thirsty*15); - if (scr_has_disadv("Shitty Luck")) then eatme-=10; if (allies>0){ obj_controller.disposition[2]-=choose(1,0,0); @@ -721,8 +722,7 @@ if (obj_ini.omophagea){ // check for pdf/guardsmen - eatme=floor(random(100))+1; - if (scr_has_disadv("Shitty Luck")) then eatme-=10; + eatme=roll_dice_chapter(1, 100, "high"); if (eatme<=10) and (allies>0){ obj_controller.disposition[2]-=2; if (allies=1){ @@ -737,8 +737,7 @@ if (obj_ini.omophagea){ } // check for inquisitor - eatme=floor(random(100))+1; - if (scr_has_disadv("Shitty Luck")) then eatme-=5; + eatme=roll_dice_chapter(1, 100, "high"); if (eatme<=40) and (present_inquisitor=1){ var thatta=0,remove=0,i=0; obj_controller.disposition[4]-=10; diff --git a/objects/obj_ncombat/Alarm_7.gml b/objects/obj_ncombat/Alarm_7.gml index 95c1476f29..8caf6ca151 100644 --- a/objects/obj_ncombat/Alarm_7.gml +++ b/objects/obj_ncombat/Alarm_7.gml @@ -482,10 +482,8 @@ try { if (enemy=1) and (on_ship=true) and (defeat=0){ - var diceh=floor(random(100))+1; - - if(scr_has_disadv("Shitty Luck")) then diceh-=15; - + var diceh=roll_dice_chapter(1, 100, "high"); + if (diceh<=15){ var ship,ship_hp,i=-1; for (var i=0;i 0) { var randa, randa2; - randa = roll_dice(1, 100, "high"); + randa = roll_dice_chapter(1, 100, "high"); randa2 = roll_dice(1, 100); } @@ -676,13 +676,13 @@ try { _ruins.determine_race(); - dice = roll_dice(1, 100, "high"); + dice = roll_dice_chapter(1, 100, "high"); ruins_battle = dice <= 50; // ruins_battle=1; if (ruins_battle == 1) { - dice = roll_dice(1, 100, "low"); + dice = roll_dice_chapter(1, 100, "low"); if (dice >= 0 && dice <= 60) { battle_threat = 1; diff --git a/scripts/scr_add_artifact/scr_add_artifact.gml b/scripts/scr_add_artifact/scr_add_artifact.gml index 56b1a5c189..4ccb449881 100644 --- a/scripts/scr_add_artifact/scr_add_artifact.gml +++ b/scripts/scr_add_artifact/scr_add_artifact.gml @@ -138,11 +138,8 @@ function scr_add_artifact(artifact_type, artifact_tags, is_identified, artifact_ } } - rand2 = floor(random(100)) + 1; + rand2 = roll_dice_chapter(1, 100, "low"); good = 0; - if (scr_has_disadv("Shitty Luck")) { - rand2 = min(rand2 + 20, 100); - } if (rand2 <= 70) { t3 = ""; } else if (rand2 <= 90 && artifact_type != "random_nodemon") { @@ -422,7 +419,7 @@ function ArtifactStruct(Index) constructor { if (has_tag("daemonic")) { var _ship_id = ship_id(); if (_ship_id > 0) { - var demonSummonChance = roll_dice(1, 100, "high"); + var demonSummonChance = roll_dice_chapter(1, 100, "high"); if ((demonSummonChance <= 60) && (obj_ini.ship_carrying[_ship_id] > 0)) { instance_create(0, 0, obj_ncombat); diff --git a/scripts/scr_after_combat/scr_after_combat.gml b/scripts/scr_after_combat/scr_after_combat.gml index 80ad4551d8..9cc6cc1f4d 100644 --- a/scripts/scr_after_combat/scr_after_combat.gml +++ b/scripts/scr_after_combat/scr_after_combat.gml @@ -141,7 +141,7 @@ function after_battle_part2() { } if (_unit.base_group=="astartes"){ if (marine_dead[i]=0) and (_unit.gene_seed_mutations.mucranoid==1) and (ally[i]=false){ - var muck=roll_personal_dice(1,100,"high",_unit); + var muck=roll_dice_unit(1,100,"high",_unit); if (muck==1){ //slime armour damaged due to mucranoid if (_unit.armour != ""){ obj_controller.specialist_point_handler.add_to_armoury_repair(_unit.armour()); diff --git a/scripts/scr_ancient_ruins/scr_ancient_ruins.gml b/scripts/scr_ancient_ruins/scr_ancient_ruins.gml index 9d379214ca..a381ff7b30 100644 --- a/scripts/scr_ancient_ruins/scr_ancient_ruins.gml +++ b/scripts/scr_ancient_ruins/scr_ancient_ruins.gml @@ -249,7 +249,7 @@ function scr_ruins_combat_end() { var planet = obj_ground_mission.num; var _battle_threat = obj_ground_mission.battle_threat; if (obj_ground_mission.defeat == 0){ - var dice=roll_dice(1, 100, "low"); + var dice=roll_dice_chapter(1, 100, "low"); if (dice < (_battle_threat*10)){ if (ruins_race == eFACTION.Ecclesiarchy){ @@ -290,7 +290,7 @@ function scr_ruins_combat_end() { scr_ruins_reward(_star,planet,self); } else if (obj_ground_mission.defeat == 1) { - var dice=roll_dice(1, 100, "low"); + var dice=roll_dice_chapter(1, 100, "low"); if (dice < (_battle_threat*10)){ if (ruins_race == eFACTION.Ecclesiarchy) { diff --git a/scripts/scr_chaos_alliance_test/scr_chaos_alliance_test.gml b/scripts/scr_chaos_alliance_test/scr_chaos_alliance_test.gml index 1227f09f53..3324212147 100644 --- a/scripts/scr_chaos_alliance_test/scr_chaos_alliance_test.gml +++ b/scripts/scr_chaos_alliance_test/scr_chaos_alliance_test.gml @@ -2,7 +2,7 @@ function scr_chaos_alliance_test() { var accept_chance,o,result,jroll,shittah; - accept_chance=0;o=0;result="";jroll=floor(random(100))+1;shittah=false; + accept_chance=0;o=0;result="";jroll=roll_dice_chapter(1, 100, "high"); accept_chance+=(obj_controller.marines*0.00375); accept_chance+=(obj_controller.command*0.00375); @@ -14,14 +14,12 @@ function scr_chaos_alliance_test() { if (scr_has_adv("Reverent Guardians")) then accept_chance-=2; if (scr_has_disadv("Never Forgive")) then accept_chance-=2; if (scr_has_adv("Enemy: Fallen")){accept_chance-=999;result="fail_fallen";} - if (scr_has_disadv("Shitty Luck")) then shittah=true; if (string_count("|CPF|",obj_controller.useful_info)>0) then result="fail_angry"; if (string_count("CHTRP2|",obj_controller.useful_info)>0) then result="fail"; if (accept_chance<3) and (result="") then result="fail"; if (accept_chance>=3) and (result=""){ accept_chance=round(accept_chance*15); - if (shittah=true) then accept_chance-=20; if (jroll<=accept_chance) then result="success"; if (jroll>accept_chance) then result="success_trap"; diff --git a/scripts/scr_clean/scr_clean.gml b/scripts/scr_clean/scr_clean.gml index 78e64a7c29..9654735677 100644 --- a/scripts/scr_clean/scr_clean.gml +++ b/scripts/scr_clean/scr_clean.gml @@ -218,7 +218,7 @@ function scr_clean(target_object, target_is_infantry, hostile_shots, hostile_dam var units_lost = 0; // Apply damage - var _shot_luck = roll_dice(1, 100, "low"); + var _shot_luck = roll_dice_chapter(1, 100, "low"); var _modified_damage = 0; if (_shot_luck <= 5) { _modified_damage = hostile_damage - (2 * marine_ac[marine_index]); diff --git a/scripts/scr_enemy_ai_a/scr_enemy_ai_a.gml b/scripts/scr_enemy_ai_a/scr_enemy_ai_a.gml index f4a34ae61d..df54cdc657 100644 --- a/scripts/scr_enemy_ai_a/scr_enemy_ai_a.gml +++ b/scripts/scr_enemy_ai_a/scr_enemy_ai_a.gml @@ -41,13 +41,11 @@ function scr_enemy_ai_a() { // checking for inquisition dead world inspections here if (present_fleet[eFACTION.Player]>=0) and (present_fleet[eFACTION.Inquisition]==0){ var chapter_asset_discovery,yep=0,stop=false; - - var shitty = scr_has_disadv("Shitty Luck"); - + if (present_fleet[1]=0){ - chapter_asset_discovery = irandom_range(1, shitty?800:2000); + chapter_asset_discovery = roll_dice_chapter(20, 100, "high"); } else { - chapter_asset_discovery = irandom_range(1, shitty?50:200); + chapter_asset_discovery = roll_dice_chapter(2, 100, "high"); } // 137 ; chapter_asset_discovery=floor(random(20))+1; diff --git a/scripts/scr_enemy_ai_b/scr_enemy_ai_b.gml b/scripts/scr_enemy_ai_b/scr_enemy_ai_b.gml index cce8148a30..3ee0b01044 100644 --- a/scripts/scr_enemy_ai_b/scr_enemy_ai_b.gml +++ b/scripts/scr_enemy_ai_b/scr_enemy_ai_b.gml @@ -72,11 +72,8 @@ function scr_enemy_ai_b() { } } - var fleet_spawn_chance = irandom(99) + 1; + var fleet_spawn_chance = roll_dice_chapter(1, 100, "high"); onceh = 0; - if (scr_has_disadv("Shitty Luck")) { - fleet_spawn_chance -= 5; - } if (fleet_spawn_chance <= 15) { if (present_fleet[eFACTION.Necrons] > 0) { diff --git a/scripts/scr_initialize_custom/scr_initialize_custom.gml b/scripts/scr_initialize_custom/scr_initialize_custom.gml index 94a2757051..651729c4d2 100644 --- a/scripts/scr_initialize_custom/scr_initialize_custom.gml +++ b/scripts/scr_initialize_custom/scr_initialize_custom.gml @@ -3312,9 +3312,9 @@ function add_unit_to_company(ttrpg_name, company, slot, role_name, role_id, wep1 spawn_unit.add_trait("soft_target"); } if(role_id == eROLE.Librarian){ - if (scr_has_adv("Favoured By The Warp") && (roll_personal_dice(1, 6, "high", spawn_unit) >= 4)) { + if (scr_has_adv("Favoured By The Warp") && (roll_dice_unit(1, 6, "high", spawn_unit) >= 4)) { spawn_unit.add_trait("favoured_by_the_warp"); - } else if (roll_personal_dice(1, 10, "high", spawn_unit) == 10) { + } else if (roll_dice_unit(1, 10, "high", spawn_unit) == 10) { spawn_unit.add_trait("favoured_by_the_warp"); } @@ -3322,10 +3322,10 @@ function add_unit_to_company(ttrpg_name, company, slot, role_name, role_id, wep1 spawn_unit.psionic = irandom_range(8, 10); } else if (role_name == "Codiciery") { spawn_unit.psionic = irandom_range(5, 7); - if (roll_personal_dice(1, 6, "high", spawn_unit) < 4) { + if (roll_dice_unit(1, 6, "high", spawn_unit) < 4) { spawn_unit.update_gear(obj_ini.gear[obj_ini.defaults_slot][eROLE.Tactical], false, false); } - if (roll_personal_dice(1, 6, "high", spawn_unit) < 4) { + if (roll_dice_unit(1, 6, "high", spawn_unit) < 4) { spawn_unit.update_weapon_one(choose("Force Axe", "Force Sword"), false, false); } } else if (role_name == "Lexicanum") { diff --git a/scripts/scr_marine_struct/scr_marine_struct.gml b/scripts/scr_marine_struct/scr_marine_struct.gml index dbf3e81ea3..4bd759014f 100644 --- a/scripts/scr_marine_struct/scr_marine_struct.gml +++ b/scripts/scr_marine_struct/scr_marine_struct.gml @@ -916,7 +916,7 @@ function TTRPG_stats(faction, comp, mar, class = "marine", other_spawn_data = {} }; static assign_random_mutations = function() { - var _mutation_roll = roll_personal_dice(1, 100, "high", self); + var _mutation_roll = roll_dice_unit(1, 100, "high", self); var _mutation_threshold = 100 - obj_ini.stability; if (_mutation_roll <= _mutation_threshold) { var _mutation_names = struct_get_names(gene_seed_mutations); @@ -1267,16 +1267,16 @@ function TTRPG_stats(faction, comp, mar, class = "marine", other_spawn_data = {} static roll_psionics = function() { var _dice_count = marine_ascension == "pre_game" ? 1 : 2; - var _psionics_roll = roll_dice(_dice_count, 100); + var _psionics_roll = roll_dice_chapter(_dice_count, 100); if (scr_has_adv("Warp Touched")) { if (_psionics_roll < 170) { - var _second_roll = roll_personal_dice(_dice_count, 100, "high", self); + var _second_roll = roll_dice_unit(_dice_count, 100, "high", self); _psionics_roll = _second_roll > _psionics_roll ? _second_roll : _psionics_roll; } } else if (scr_has_disadv("Psyker Intolerant")) { if (_psionics_roll >= 170) { - var _second_roll = roll_personal_dice(_dice_count, 100, "low", self); + var _second_roll = roll_dice_unit(_dice_count, 100, "low", self); _psionics_roll = _second_roll < _psionics_roll ? _second_roll : _psionics_roll; } } @@ -2190,11 +2190,11 @@ function TTRPG_stats(faction, comp, mar, class = "marine", other_spawn_data = {} }; static perils_strength = function() { - var _perils_strength = roll_personal_dice(1, 100, "low", self); + var _perils_strength = roll_dice_unit(1, 100, "low", self); // I hope you like demons if (has_trait("warp_tainted")) { - var _second_roll = roll_personal_dice(1, 100, "high", self); + var _second_roll = roll_dice_unit(1, 100, "high", self); if (_second_roll > _perils_strength) { _perils_strength = _second_roll; } @@ -2206,7 +2206,7 @@ function TTRPG_stats(faction, comp, mar, class = "marine", other_spawn_data = {} } static perils_test = function() { - var _roll = roll_personal_dice(1, 1000, "high", self); + var _roll = roll_dice_unit(1, 1000, "high", self); var _perils_threshold = perils_threshold(); return _roll <= _perils_threshold; @@ -2222,13 +2222,13 @@ function TTRPG_stats(faction, comp, mar, class = "marine", other_spawn_data = {} } static psychic_focus_test = function() { - var _cast_roll = roll_personal_dice(1, 100, "high", self); + var _cast_roll = roll_dice_unit(1, 100, "high", self); var _cast_difficulty = psychic_focus_difficulty(); var _test_successful = _cast_roll >= _cast_difficulty; if (_test_successful) { roll_psionic_increase(); - if (roll_personal_dice(2, 10, "high", self) == 20) { + if (roll_dice_unit(2, 10, "high", self) == 20) { add_exp(1 * (_cast_difficulty / 100)); } } @@ -2240,7 +2240,7 @@ function TTRPG_stats(faction, comp, mar, class = "marine", other_spawn_data = {} if (psionic < 12) { var _psionic_difficulty = max(1, (psionic * 50) - experience); - var _dice_roll = roll_personal_dice(1, _psionic_difficulty, "high", self); + var _dice_roll = roll_dice_unit(1, _psionic_difficulty, "high", self); if (_dice_roll == _psionic_difficulty) { psionic++; add_battle_log_message($"{name_role()} was touched by the warp!", 999, 135); diff --git a/scripts/scr_mechanicus_missions/scr_mechanicus_missions.gml b/scripts/scr_mechanicus_missions/scr_mechanicus_missions.gml index 8e91d7ede1..b5d4efb5f9 100644 --- a/scripts/scr_mechanicus_missions/scr_mechanicus_missions.gml +++ b/scripts/scr_mechanicus_missions/scr_mechanicus_missions.gml @@ -31,7 +31,7 @@ function mechanicus_missions_end_turn(planet){ var _mission_data = p_problem_other_data[planet][tomb2_planet_slot]; _mission_data.turns++; var battli=0; - var _roll1 = roll_dice(1, 100+_mission_data.turns, "low"); + var _roll1 = roll_dice_chapter(1, 100+_mission_data.turns, "low"); var completion = _mission_data.completion>0; if (roll1>98){ @@ -61,9 +61,7 @@ function mechanicus_missions_end_turn(planet){ remove_planet_problem(planet,"mech_tomb2"); } } - else {// Done - if scr_has_adv("Shitty Luck") then roll1+=15; - + else {// Done if (roll1>20){ scr_alert("","mission","Adeptus Mechanicus research within the Necron Tomb of "+string(name)+" "+scr_roman(planet)+" continues.",0,0); } diff --git a/scripts/scr_mission_reward/scr_mission_reward.gml b/scripts/scr_mission_reward/scr_mission_reward.gml index c48219ea41..5f39664cf7 100644 --- a/scripts/scr_mission_reward/scr_mission_reward.gml +++ b/scripts/scr_mission_reward/scr_mission_reward.gml @@ -22,9 +22,7 @@ function scr_mission_reward(mission, star, planet) { repeat(11){com+=1;i=0; repeat(300){i+=1; if (obj_ini.role[com][i]=obj_ini.role[100][16]) and (obj_ini.loc[com][i]="Mechanicus Vessel"){ - roll2=floor(random(100))+1; - - if(scr_has_disadv("Shitty Luck")) then roll2-=10; + roll2=roll_dice_chapter(1, 100, "high"); if (roll2<=50){obj_controller.command-=1;techs_lost+=1; kill_and_recover(com, i, true, false); @@ -93,8 +91,8 @@ function scr_mission_reward(mission, star, planet) { if (mission="mech_raider"){ var roll1,result; - roll1=floor(random(100))+1;result=""; - if (scr_has_disadv("Shitty Luck")) then roll1+=20; + roll1=roll_dice_chapter(1, 100, "low") + result=""; if (roll1<=33) then result="New"; if (roll1>33) and (roll1<=66) then result="Land Raider"; @@ -151,8 +149,8 @@ function scr_mission_reward(mission, star, planet) { if (mission="mech_bionics"){ var roll1,result; - roll1=floor(random(100))+1;result=""; - if (scr_has_disadv("Shitty Luck")) then roll1+=20; + roll1=roll_dice_chapter(1, 100, "low") + result=""; if (roll1<=33) then result="Requisition"; if (roll1>33) and (roll1<=66) then result="Bionics"; diff --git a/scripts/scr_pen_And_paper/scr_pen_And_paper.gml b/scripts/scr_pen_And_paper/scr_pen_And_paper.gml index e3c9623c6b..7b8f1fa959 100644 --- a/scripts/scr_pen_And_paper/scr_pen_And_paper.gml +++ b/scripts/scr_pen_And_paper/scr_pen_And_paper.gml @@ -111,24 +111,46 @@ function print_stat_diffs(diffs){ return _diff_string; } +/// @description repeat(x){irandom_range(1, y)} with a nice name, return sum of all rolls. +/// @param {real} dices - how many dices to roll. +/// @param {real} faces - how many faces each dice has. +/// @returns {real} +function roll_dice(dices = 1, faces = 6) { + var _total_roll = 0; + var _roll = 0; + + repeat (dices) { + _roll = irandom_range(1, faces); + + _total_roll += _roll; + } + + return _total_roll; +} /// @description Roll a custom dice, influenced by the chapter' luck, return sum of all rolls. /// @param {real} dices - how many dices to roll. /// @param {real} faces - how many faces each dice has. /// @param {real} player_benefit_at - will the player benefit from low or high rolls, for the luck logic. /// @returns {real} -function roll_dice(dices = 1, faces = 6, player_benefit_at = "none") { +function roll_dice_chapter(dices = 1, faces = 6, player_benefit_at) { var _total_roll = 0; var _roll = 0; repeat (dices) { - _roll = irandom_range(1, faces); + _roll = roll_dice(1, faces); - if (scr_has_disadv("Shitty Luck") && player_benefit_at != "none") { + if (scr_has_disadv("Shitty Luck")) { if (player_benefit_at == "high" && _roll > (faces / 2)) { - _roll = irandom_range(1, faces); + _roll = roll_dice(1, faces); } else if (player_benefit_at == "low" && _roll < (faces / 2 + 1)) { - _roll = irandom_range(1, faces); + _roll = roll_dice(1, faces); + } + } else if (scr_has_adv("Great Luck")) { + if (player_benefit_at == "high" && _roll < (faces / 2 + 1)) { + _roll = roll_dice(1, faces); + } else if (player_benefit_at == "low" && _roll > (faces / 2)) { + _roll = roll_dice(1, faces); } } @@ -144,7 +166,7 @@ function roll_dice(dices = 1, faces = 6, player_benefit_at = "none") { /// @param {real} player_benefit_at - will the player benefit from low or high rolls, for the luck logic. /// @param {struct} unit - unit struct. /// @returns {real} -function roll_personal_dice(dices = 1, faces = 6, player_benefit_at = "none", unit) { +function roll_dice_unit(dices = 1, faces = 6, player_benefit_at, unit) { var _total_roll = 0; var _roll = 0; @@ -157,9 +179,9 @@ function roll_personal_dice(dices = 1, faces = 6, player_benefit_at = "none", un if (luck_chance <= unit.luck) { if (player_benefit_at == "high" && _roll > (faces / 2)) { - _roll = irandom_range(1, faces); + _roll = roll_dice(1, faces); } else if (player_benefit_at == "low" && _roll < (faces / 2 + 1)) { - _roll = irandom_range(1, faces); + _roll = roll_dice(1, faces); } } } diff --git a/scripts/scr_perils_table/scr_perils_table.gml b/scripts/scr_perils_table/scr_perils_table.gml index f4ea7b7e71..b3586c6ad3 100644 --- a/scripts/scr_perils_table/scr_perils_table.gml +++ b/scripts/scr_perils_table/scr_perils_table.gml @@ -4,7 +4,7 @@ function scr_perils_table(perils_strength, unit, psy_discipline, power_name, uni [ 1, function(perils_strength, unit, psy_discipline, power_name, unit_id) { - unit.corruption += roll_dice(1, 6, "low"); + unit.corruption += roll_dice_chapter(1, 6, "low"); var flavour_text2 = "He begins to gibber as psychic backlash overtakes him."; return flavour_text2; } @@ -12,7 +12,7 @@ function scr_perils_table(perils_strength, unit, psy_discipline, power_name, uni [ 5, function(perils_strength, unit, psy_discipline, power_name, unit_id) { - marine_casting_cooldown[unit_id] += roll_dice(1, 6, "low"); + marine_casting_cooldown[unit_id] += roll_dice_chapter(1, 6, "low"); var flavour_text2 = "His mind is burned fiercely by the warp."; return flavour_text2; } @@ -20,9 +20,9 @@ function scr_perils_table(perils_strength, unit, psy_discipline, power_name, uni [ 15, function(perils_strength, unit, psy_discipline, power_name, unit_id) { - var _cooldown = roll_dice(1, 6, "low"); + var _cooldown = roll_dice_chapter(1, 6, "low"); marine_casting_cooldown[unit_id] += _cooldown; - var _cooldown2 = roll_dice(1, 6, "low"); + var _cooldown2 = roll_dice_chapter(1, 6, "low"); if (men > 0) { repeat (6) { var t = irandom(men - 1); // Random value from 0 to men-1 @@ -38,7 +38,7 @@ function scr_perils_table(perils_strength, unit, psy_discipline, power_name, uni [ 20, function(perils_strength, unit, psy_discipline, power_name, unit_id) { - unit.add_or_sub_health(roll_dice(1, 50, "low") * -1); + unit.add_or_sub_health(roll_dice_chapter(1, 50, "low") * -1); switch (psy_discipline) { case "biomancy": var flavour_text2 = "The psychic blast he had prepared runs loose, boiling his own blood!"; @@ -60,7 +60,7 @@ function scr_perils_table(perils_strength, unit, psy_discipline, power_name, uni 30, function(perils_strength, unit, psy_discipline, power_name, unit_id) { marine_casting_cooldown[unit_id] += 20; - unit.corruption += roll_dice(1, 6, "low"); + unit.corruption += roll_dice_chapter(1, 6, "low"); var flavour_text2 = $"His mind is seared by the warp, now unable to cast more powers for {marine_casting_cooldown[unit_id]} hours."; return flavour_text2; } @@ -69,13 +69,13 @@ function scr_perils_table(perils_strength, unit, psy_discipline, power_name, uni 40, function(perils_strength, unit, psy_discipline, power_name, unit_id) { var flavour_text2 = "Capricious voices eminate from the surrounding area, whispering poisonous lies and horrible truths."; - unit.corruption += roll_dice(1, 10, "low"); + unit.corruption += roll_dice_chapter(1, 10, "low"); if (men > 0) { repeat (6) { var t = irandom(men - 1); // Random value from 0 to men-1 if (marine_type[t] != "") { var _ally = unit_struct[t]; - _ally.corruption += roll_dice(1, 10, "low"); + _ally.corruption += roll_dice_chapter(1, 10, "low"); } } } @@ -138,12 +138,12 @@ function scr_perils_table(perils_strength, unit, psy_discipline, power_name, uni 60, function(perils_strength, unit, psy_discipline, power_name, unit_id) { var flavour_text2 = "There is a massive explosion of warp energy which injures him and several other marines!"; - unit.add_or_sub_health(roll_dice(1, 50, "low") * -1); + unit.add_or_sub_health(roll_dice_chapter(1, 50, "low") * -1); if (men > 0) { repeat (6) { var t = irandom(men - 1); // Random value from 0 to men-1 if (marine_type[t] != "") { - marine_hp[t] -= roll_dice(1, 50, "low"); + marine_hp[t] -= roll_dice_chapter(1, 50, "low"); } } } @@ -161,12 +161,12 @@ function scr_perils_table(perils_strength, unit, psy_discipline, power_name, uni [ 80, function(perils_strength, unit, psy_discipline, power_name, unit_id) { - unit.add_or_sub_health(roll_dice(5, 10, "low") * -1); + unit.add_or_sub_health(roll_dice_chapter(5, 10, "low") * -1); if (men > 0) { repeat (6) { var t = irandom(men - 1); // Random value from 0 to men-1 if (marine_type[t] != "") { - marine_hp[t] -= roll_dice(1, 50, "low"); + marine_hp[t] -= roll_dice_chapter(1, 50, "low"); } } } @@ -180,7 +180,7 @@ function scr_perils_table(perils_strength, unit, psy_discipline, power_name, uni function(perils_strength, unit, psy_discipline, power_name, unit_id) { var flavour_text2; marine_casting_cooldown[unit_id] += 999; - unit.corruption += roll_dice(5, 10, "low"); + unit.corruption += roll_dice_chapter(5, 10, "low"); flavour_text2 = "The marine's flesh begins to twist and rip, seemingly turning inside out. His form looms up, and up, and up. Within seconds a Greater Daemon of "; var dem = choose("Slaanesh", "Nurgle", "Tzeentch"); diff --git a/scripts/scr_player_fleet_functions/scr_player_fleet_functions.gml b/scripts/scr_player_fleet_functions/scr_player_fleet_functions.gml index 568bff61ab..44edbb8d32 100644 --- a/scripts/scr_player_fleet_functions/scr_player_fleet_functions.gml +++ b/scripts/scr_player_fleet_functions/scr_player_fleet_functions.gml @@ -302,7 +302,7 @@ function player_retreat_from_fleet_combat(){ p_strength+=mfleet.frigate_number*3; p_strength+=mfleet.capital_number*8; - _roll_100=roll_dice(1, 100, "low"); + _roll_100=roll_dice_chapter(1, 100, "low"); var _loc_star = star_by_name(obj_turn_end.battle_location[obj_turn_end.current_battle]); @@ -340,7 +340,7 @@ function player_retreat_from_fleet_combat(){ if (_roll_100!=-5){ repeat(50){ - diceh=roll_dice(1, 100, "high"); + diceh=roll_dice_chapter(1, 100, "high"); if (diceh<=ratio){ ratio-=100; var onceh=0; diff --git a/scripts/scr_player_ship_functions/scr_player_ship_functions.gml b/scripts/scr_player_ship_functions/scr_player_ship_functions.gml index 2c085164b3..451269d813 100644 --- a/scripts/scr_player_ship_functions/scr_player_ship_functions.gml +++ b/scripts/scr_player_ship_functions/scr_player_ship_functions.gml @@ -1,6 +1,6 @@ function return_lost_ships_chance(){ if (array_contains(obj_ini.ship_location, "Lost")){ - if (roll_dice(1, 100, "high")>97){ + if (roll_dice_chapter(1, 100, "high")>97){ return_lost_ship(); } } @@ -30,7 +30,7 @@ function return_lost_ship(){ add_ship_to_fleet(_return_id, _new_fleet); } - var _return_defect = roll_dice(1, 100, "high"); + var _return_defect = roll_dice_chapter(1, 100, "high"); var _text = $"The ship {obj_ini.ship[_return_id]} has returned to real space and is now orbiting the {_star.name} system\n"; if (_return_defect<90){ if (_return_defect>80){ @@ -85,7 +85,7 @@ function return_lost_ship(){ } scr_kill_ship(_return_id); var _chaos_fleet = spawn_chaos_fleet_at_system(_star); - var fleet_strength = ((100 - roll_dice(1, 100, "low"))/10)+3; + var fleet_strength = ((100 - roll_dice_chapter(1, 100, "low"))/10)+3; distribute_strength_to_fleet(fleet_strength, _chaos_fleet); with (_new_fleet){ instance_destroy(); diff --git a/scripts/scr_powers/scr_powers.gml b/scripts/scr_powers/scr_powers.gml index c02169c7fa..c7e707a0d9 100644 --- a/scripts/scr_powers/scr_powers.gml +++ b/scripts/scr_powers/scr_powers.gml @@ -570,7 +570,7 @@ function process_tome_mechanics(_unit, _unit_id) { // Apply corruption based on perils chance if (_result.perils_chance > 0) { if ((_tome_roll > 90) && (_result.perils_chance > 0)) { - _unit.corruption += roll_personal_dice(1, 6, "low", _unit); + _unit.corruption += roll_dice_unit(1, 6, "low", _unit); } } } diff --git a/scripts/scr_purge_world/scr_purge_world.gml b/scripts/scr_purge_world/scr_purge_world.gml index 84c8b7b625..fd62e46881 100644 --- a/scripts/scr_purge_world/scr_purge_world.gml +++ b/scripts/scr_purge_world/scr_purge_world.gml @@ -230,31 +230,26 @@ function scr_purge_world(star, planet, action_type, action_score) { if (action_type=DropType.PurgeAssassinate){ - var dis,chance,siz_penalty,aroll,o,yep,ambush; - aroll=floor(random(100))+1;dis=0;chance=0;siz_penalty=0;o=0;yep=0;ambush=false; - - // Base - dis=star.dispo[planet]; - if (dis<=20) then chance=75; - if (dis>20) and (dis<40) then chance=40; - if (dis>40) and (dis<70) then chance=15; - if (dis>70) then chance=0; + var aroll=roll_dice_chapter(1, 100, "high"); + var chance = 100; + // var siz_penalty=0; + var o=0; + var yep=0; + // Disposition + aroll += floor(star.dispo[planet] / 10); + // Advantages - if(scr_has_adv("Ambushers")) then ambush=true; - if(scr_has_adv("Lightning Warriors")) then chance+=5; - if(scr_has_disadv("Shitty Luck")) then chance+=20; - - // Size - if ((action_score > 5) && (action_score <= 10)) { siz_penalty = 5; } - if ((action_score > 10) && (action_score <= 20)) { siz_penalty = 20; } - if ((action_score > 20) && (action_score <= 50)) { siz_penalty = 30; } - if ((action_score > 50) && (action_score <= 100)) { siz_penalty = 50; } - if ((action_score > 100) && (action_score <= 200)) { siz_penalty = 75; } - if (action_score > 200) { siz_penalty = 125; } - - // Ambushers go! - if (ambush=true) then chance=round(chance/2); + if(scr_has_adv("Ambushers")) then aroll+=10; + if(scr_has_adv("Lightning Warriors")) then aroll+=5; + + // Size - unused + // if ((action_score > 5) && (action_score <= 10)) { siz_penalty = 5; } + // if ((action_score > 10) && (action_score <= 20)) { siz_penalty = 20; } + // if ((action_score > 20) && (action_score <= 50)) { siz_penalty = 30; } + // if ((action_score > 50) && (action_score <= 100)) { siz_penalty = 50; } + // if ((action_score > 100) && (action_score <= 200)) { siz_penalty = 75; } + // if (action_score > 200) { siz_penalty = 125; } var spec1=0,spec2=0,txt=""; // TODO consider making it a battle with Planetary governor's guards txt="Your Astartes descend upon the surface of "+string(star.name)+" "+string(scr_roman(planet))+" and plot the movements and schedule of the governor. "; @@ -296,10 +291,9 @@ function scr_purge_world(star, planet, action_type, action_score) { // Result- this is the multiplier for the chance of discovery with the inquisition, can also be used to determine // the new Governor disposition if they are the official successor - if (aroll<=chance){// Discovered + if (aroll < chance){// Discovered pip.estimate=2; - } - if (aroll>chance){// Success + } else if (aroll >= chance){// Success pip.estimate=1; } // If there are enemy non-chaos forces then they may be used as a cover diff --git a/scripts/scr_random_event/scr_random_event.gml b/scripts/scr_random_event/scr_random_event.gml index 20be7bd281..8cd92050f7 100644 --- a/scripts/scr_random_event/scr_random_event.gml +++ b/scripts/scr_random_event/scr_random_event.gml @@ -47,18 +47,11 @@ function scr_random_event(execute_now) { } else { var player_luck; - var has_bad_luck = scr_has_disadv("Shitty Luck"); - var luck_roll = irandom(100); - if (has_bad_luck){ - if (luck_roll<=30) then player_luck=luck.good; - if (luck_roll>30) and (luck_roll<45) then player_luck=luck.neutral; - if (luck_roll>=45) then player_luck=luck.bad; - } - else{ - if (luck_roll<=45) then player_luck=luck.good; - if (luck_roll>45) and (luck_roll<55) then player_luck=luck.neutral; - if (luck_roll>=55) then player_luck=luck.bad; - } + var luck_roll = roll_dice_chapter(1, 100, "low"); + + if (luck_roll<=45) then player_luck=luck.good; + if (luck_roll>45) and (luck_roll<55) then player_luck=luck.neutral; + if (luck_roll>=55) then player_luck=luck.bad; var events; @@ -330,14 +323,11 @@ function scr_random_event(execute_now) { var crafted_object; - var craft_roll=irandom(100); + var craft_roll=roll_dice_chapter(1, 100, "low"); var heritical_item = false; //this bit should be improved, idk what duke was checking for here //TODO make craft chance reflective of crafters skill, rewards players for having skilled tech area - if (scr_has_disadv("Shitty Luck")) { - craft_roll+=20; - } if (scr_has_disadv("Tech-Heresy")) { craft_roll+=20; } @@ -680,9 +670,10 @@ function scr_random_event(execute_now) { time=irandom_range(6,24); if (scr_has_disadv("Shitty Luck")){ - own=1; - } - else { + own=choose(1,2,0,0,0); + } else if (scr_has_adv("Great Luck")) { + own=choose(1,1,2,2,0); + } else { own=choose(1,1,2,0,0); } @@ -715,11 +706,12 @@ function scr_random_event(execute_now) { else if (chosen_event == EVENT.enemy_forces){ log_message("RE: Enemy Forces"); var own; - if (scr_has_disadv("Shitty Luck")) { - own=1; - } - else{ - own=choose(1,1,2,2,3); + if (scr_has_disadv("Shitty Luck")){ + own=choose(1,1,1,1,1,1,2,2,3); + } else if (scr_has_adv("Great Luck")) { + own=choose(1,1,1,2,2,2,2,3,3); + } else { + own=choose(1,1,1,2,2,3); } var star_id = scr_random_find(own,true,"",""); diff --git a/scripts/scr_ruins_reward/scr_ruins_reward.gml b/scripts/scr_ruins_reward/scr_ruins_reward.gml index 32d2b01a7d..534403cda6 100644 --- a/scripts/scr_ruins_reward/scr_ruins_reward.gml +++ b/scripts/scr_ruins_reward/scr_ruins_reward.gml @@ -10,11 +10,9 @@ function scr_ruins_reward(star_system, planet, _ruins) { // star_system: world object // planet: planet // ruins_type: ruins_type - var dice=floor(random(100))+1; + var dice=roll_dice_chapter(1, 100, "high"); var loot=""; - if (scr_has_disadv("Shitty Luck")) then dice-=10; - if (dice>0) and (dice<=35) then loot="req";// if (dice>35) and (dice<=50) then loot="gear";// if (dice>50) and (dice<=60) then loot="artifact";// diff --git a/scripts/scr_unit_traits/scr_unit_traits.gml b/scripts/scr_unit_traits/scr_unit_traits.gml index a75871f757..6e72864a58 100644 --- a/scripts/scr_unit_traits/scr_unit_traits.gml +++ b/scripts/scr_unit_traits/scr_unit_traits.gml @@ -256,7 +256,7 @@ global.astartes_trait_dist = [ "Warp Tainted",[20,1] ] } - ], + ], ["shitty_luck", [99,98], { @@ -267,7 +267,12 @@ global.astartes_trait_dist = [ ], [ "lucky", - [99,98] + [99,98], + { + "advantage":[ + "Great Luck",[3,2] + ] + } ], ["natural_leader", [199,198], From 48556276f7ab9442193eb00eacc05e875ed0f7f7 Mon Sep 17 00:00:00 2001 From: EttyKitty <20323032+EttyKitty@users.noreply.github.com> Date: Tue, 29 Apr 2025 00:10:49 +0300 Subject: [PATCH 004/286] build: Disable deprecated options (#758) --- options/main/options_main.yy | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/options/main/options_main.yy b/options/main/options_main.yy index 4288a81cd8..a665081efc 100644 --- a/options/main/options_main.yy +++ b/options/main/options_main.yy @@ -2,17 +2,17 @@ "$GMMainOptions":"v3", "%Name":"Main", "name":"Main", - "option_audio_error_behaviour":true, + "option_audio_error_behaviour":false, "option_author":"", - "option_collision_compatibility":true, - "option_copy_on_write_enabled":true, + "option_collision_compatibility":false, + "option_copy_on_write_enabled":false, "option_draw_colour":4294967295, "option_gameguid":"60d8bf5e-3804-4d8f-93f8-fe72952db6af", "option_gameid":"0", "option_game_speed":30, - "option_legacy_json_parsing":true, - "option_legacy_number_conversion":true, - "option_legacy_other_behaviour":true, + "option_legacy_json_parsing":false, + "option_legacy_number_conversion":false, + "option_legacy_other_behaviour":false, "option_mips_for_3d_textures":false, "option_remove_unused_assets":false, "option_sci_usesci":false, From c3e15708d38b8460fe365e847a841d9fbad63307 Mon Sep 17 00:00:00 2001 From: Nelsonh <81228864+OH296@users.noreply.github.com> Date: Tue, 29 Apr 2025 18:57:54 +0100 Subject: [PATCH 005/286] feat: Ork Strongholds and improve Warboss (#770) Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com> Co-authored-by: Blogaugis <105600180+Blogaugis@users.noreply.github.com> --- objects/obj_bomb_select/Draw_0.gml | 2 +- objects/obj_controller/Alarm_5.gml | 49 ---- objects/obj_en_fleet/Create_0.gml | 2 +- objects/obj_fleet/Alarm_1.gml | 39 ++- objects/obj_star/Alarm_4.gml | 7 - objects/obj_star/Create_0.gml | 2 +- scripts/scr_PlanetData/scr_PlanetData.gml | 233 +++++++++++++++++- scripts/scr_bomb_world/scr_bomb_world.gml | 171 +++++++------ scripts/scr_cheatcode/scr_cheatcode.gml | 4 + .../scr_draw_planet_features.gml | 9 + scripts/scr_enemy_ai_a/scr_enemy_ai_a.gml | 220 ++++++++--------- scripts/scr_enemy_ai_c/scr_enemy_ai_c.gml | 108 +------- .../scr_fleet_functions.gml | 2 +- scripts/scr_garrison/scr_garrison.gml | 4 +- .../scr_ork_fleet_functions.gml | 171 +++++++------ .../scr_ork_planet_functions.gml | 128 +++++----- .../scr_planetary_feature.gml | 13 +- .../scr_star_ownership/scr_star_ownership.gml | 30 ++- .../scr_system_search_helpers.gml | 18 ++ sprites/spr_fleet_ork/spr_fleet_ork.yy | 7 +- sprites/spr_ship_deth/spr_ship_deth.yy | 7 +- sprites/spr_ship_gorbag/spr_ship_gorbag.yy | 7 +- sprites/spr_ship_kroozer/spr_ship_kroozer.yy | 7 +- .../spr_tartaros_complex.yy | 2 + 24 files changed, 709 insertions(+), 533 deletions(-) diff --git a/objects/obj_bomb_select/Draw_0.gml b/objects/obj_bomb_select/Draw_0.gml index c4336ce603..7ec199e388 100644 --- a/objects/obj_bomb_select/Draw_0.gml +++ b/objects/obj_bomb_select/Draw_0.gml @@ -219,7 +219,7 @@ if (max_ships>0)and (instance_exists(obj_star_select)){ } } // Start bombardment here - scr_bomb_world(p_data.system,p_data.planet,target,bomb_score,str); + p_data.bombard(target,bomb_score,str); } } var cancel_button = draw_unit_buttons([bomb_window.x2-166, bomb_window.y2-40],"Cancel",[1,1],#34bc75,fa_center,fnt_40k_14b); diff --git a/objects/obj_controller/Alarm_5.gml b/objects/obj_controller/Alarm_5.gml index b541ca594f..6226408290 100644 --- a/objects/obj_controller/Alarm_5.gml +++ b/objects/obj_controller/Alarm_5.gml @@ -363,56 +363,7 @@ if (penitent==1) and (blood_debt==0){ } // ** Ork WAAAAGH ** if ((turn>=irandom(200)+100) or (obj_ini.fleet_type==eFACTION.Mechanicus)) and (faction_defeated[eFACTION.Ork]==0){ - var waaagh=floor(random(100))+1; - with(obj_star){ - if (owner==eFACTION.Ork) then instance_create(x,y,obj_temp2); - } - if ((instance_number(obj_temp2)>=5) and (waaagh<=instance_number(obj_temp2)) and (obj_controller.known[eFACTION.Ork]==0))/* or (obj_controller.is_test_map=true)*/{ - obj_controller.known[eFACTION.Ork]=0.5; - //set an alarm for all ork controlled planets - with(obj_star){ - if (owner==eFACTION.Ork) then alarm[4]=1; - } - if (!instance_exists(obj_turn_end)) then scr_popup("WAAAAGH!","The greenskins have swelled in activity, their numbers increasing seemingly without relent. A massive Warboss has risen to take control, leading most of the sector's Orks on a massive WAAAGH!","waaagh",""); - - if (instance_exists(obj_turn_end)){ - obj_turn_end.popups+=1; - obj_turn_end.popup[obj_turn_end.popups]=1; - obj_turn_end.popup_type[obj_turn_end.popups]="WAAAAGH!"; - obj_turn_end.popup_text[obj_turn_end.popups]="The greenskins have swelled in activity, their numbers increasing seemingly without relent. A massive Warboss has risen to take control, leading most of the sector's Orks on a massive WAAAGH!"; - obj_turn_end.popup_image[obj_turn_end.popups]="waaagh"; - scr_event_log("red","Ork WAAAAGH! begins."); - - with(obj_star){ - if (owner==eFACTION.Ork){ - rund=floor(random(planets))+1; - if (p_owner[rund]==eFACTION.Ork) and (p_pdf[rund]==0) and (p_guardsmen[rund]==0) and (p_orks[rund]>=2) then instance_create(x,y,obj_temp6); - } - } - if (instance_exists(obj_temp6)){ - var you2,you; - rund=0; - you2=instance_nearest(random(room_width),random(room_height),obj_temp6); - you=instance_nearest(you2.x,you2.y,obj_star); - - with(obj_temp2){instance_destroy();} - for(var i=0; i<10; i++){ - if (!instance_exists(obj_temp2)){ - rund=round(random(you.planets)); - if (rund>0) and(rund<5){ - if (you.p_owner[rund]==eFACTION.Ork) and (you.p_pdf[rund]+you.p_guardsmen[rund]==0) and (you.p_orks[rund]>=2) then array_push( you.p_feature[rund], new NewPlanetFeature(P_features.OrkWarboss)); - } - if (you.p_orks[rund]<4) then you.p_orks[rund]=4; - if (planet_feature_bool(you.p_feature[rund], P_features.OrkWarboss)==1) then instance_create(x,y,obj_temp2); - } - } - } - with(obj_temp6){instance_destroy();} - with(obj_temp2){instance_destroy();} - } - } - with(obj_temp2){instance_destroy();} } // if (known[eFACTION.Ecclesiarchy]=1){var spikky;spikky=choose(0,0,0,1,1);if (spikky=1) then with(obj_turn_end){audiences+=1;audien[audiences]=5;audien_topic[audiences]="intro";}} diff --git a/objects/obj_en_fleet/Create_0.gml b/objects/obj_en_fleet/Create_0.gml index fa1dba0041..851e17d517 100644 --- a/objects/obj_en_fleet/Create_0.gml +++ b/objects/obj_en_fleet/Create_0.gml @@ -107,7 +107,7 @@ deserialize = function(save_data){ } } - if(save_data.orbiting != 0){ + if(save_data.orbiting != 0 && action == ""){ var nearest_star = instance_nearest(x, y, obj_star); orbiting = nearest_star; // show_debug_message($"p_fleet id {id} deserialized: {self}"); diff --git a/objects/obj_fleet/Alarm_1.gml b/objects/obj_fleet/Alarm_1.gml index 8a1f4a4ff8..e4450c8a7c 100644 --- a/objects/obj_fleet/Alarm_1.gml +++ b/objects/obj_fleet/Alarm_1.gml @@ -34,17 +34,40 @@ if (enemy=6){ if (enemy=7){ - var i;i=0;i=en_capital; - - if (i>0){en_column[1]="Dethdeala";en_num[1]=floor(random(i))+1;i-=en_num[1];en_size[1]=3;} + var i=en_capital; - if (i>0){en_column[2]="Gorbag's Revenge";en_num[2]=floor(random(i))+1;i-=en_num[2];en_size[2]=3;}// en_num[2]+=en_num[1]+1; - - if (i>0){en_column[3]="Kroolboy";en_num[3]=i;i-=en_num[3];en_size[3]=3;}// en_num[3]+=en_num[2]+1; + if (i>0){ + en_column[1]="Dethdeala"; + en_num[1]=irandom_range(1, i); + i-=en_num[1]; + en_size[1]=3; + } - if (en_frigate>0){en_column[4]="Battlekroozer";en_num[4]=en_frigate;en_size[4]=2;}// en_num[4]+=en_num[3]+1; + if (i>0){ + en_column[2]="Gorbag's Revenge"; + en_num[2]=irandom_range(1, i); + i-=en_num[2]; + en_size[2]=3; + }// en_num[2]+=en_num[1]+1; - if (en_escort>0){en_column[5]="Ravager";en_num[5]=en_escort;en_size[5]=1;}// en_num[5]+=en_num[4]+1; + if (i>0){ + en_column[3]="Kroolboy"; + en_num[3]=i; + i-=en_num[3]; + en_size[3]=3; + }// en_num[3]+=en_num[2]+1; + + if (en_frigate>0){ + en_column[4]="Battlekroozer"; + en_num[4]=en_frigate; + en_size[4]=2; + }// en_num[4]+=en_num[3]+1; + + if (en_escort>0){ + en_column[5]="Ravager"; + en_num[5]=en_escort; + en_size[5]=1; + }// en_num[5]+=en_num[4]+1; } if (enemy=8){ diff --git a/objects/obj_star/Alarm_4.gml b/objects/obj_star/Alarm_4.gml index 9da8704d28..e69de29bb2 100644 --- a/objects/obj_star/Alarm_4.gml +++ b/objects/obj_star/Alarm_4.gml @@ -1,7 +0,0 @@ - -// Checks if the planet has industrial facilities to create an ork fleet -var rando=0,contin=0; - -for(var i=1; i<=planets; i++){ - ork_ship_production(i); -} diff --git a/objects/obj_star/Create_0.gml b/objects/obj_star/Create_0.gml index c3485ed9e3..5e0c32b8f0 100644 --- a/objects/obj_star/Create_0.gml +++ b/objects/obj_star/Create_0.gml @@ -94,7 +94,7 @@ ai_d=-1; ai_e=-1; global.star_name_colors = [ - 38144, + c_gray, c_white, //player c_gray, //imperium c_red, // toaster fuckers diff --git a/scripts/scr_PlanetData/scr_PlanetData.gml b/scripts/scr_PlanetData/scr_PlanetData.gml index eb106d13aa..9797f5e7f4 100644 --- a/scripts/scr_PlanetData/scr_PlanetData.gml +++ b/scripts/scr_PlanetData/scr_PlanetData.gml @@ -16,10 +16,12 @@ function PlanetData(planet, system) constructor{ self.planet = planet; self.system = system; + x = system.x; + y = system.y; player_disposition = system.dispo[planet]; planet_type = system.p_type[planet]; operatives = system.p_operatives[planet]; - features =system.p_feature[planet]; + features = system.p_feature[planet]; current_owner = system.p_owner[planet]; origional_owner = system.p_first[planet]; population = system.p_population[planet]; @@ -45,13 +47,17 @@ function PlanetData(planet, system) constructor{ } //assumes a large pop figure and changes down if small pop planet - static population_small_conversion= function(pop_value){ + static population_small_conversion = function(pop_value){ if (!large_population){ pop_value *= large_pop_conversion; } return pop_value; } + static send_colony_ship = function(target, targ_planet, type){ + new_colony_fleet(system, planet, target, targ_planet, type); + } + static return_to_first_owner = function(allow_player = false){ if (!allow_player && origional_owner == eFACTION.Player){ system.p_owner[planet]= eFACTION.Imperium; @@ -144,6 +150,223 @@ function PlanetData(planet, system) constructor{ handle_exception(_exception); } + static add_forces = function(faction, val){ + planet_forces[faction] = clamp(planet_forces[faction]+val,0,12); + var _new_val = planet_forces[faction]; + switch (faction){ + case eFACTION.Ork: + system.p_orks[planet] = _new_val; + break; + } + } + + static grow_ork_forces = function(){ + var contin=0; + var rando=roll_dice(1,100);// This part handles the spreading + // if (rando<30){ + var _non_deads = planets_without_type("dead", system); + + var _has_warboss = has_feature(P_features.OrkWarboss); + var _has_stronghold = has_feature(P_features.OrkStronghold); + var _build_ships = false; + if (_has_stronghold){ + var _stronghold = get_features(P_features.OrkStronghold)[0]; + } + + if (_has_warboss){ + var _warboss = get_features(P_features.OrkWarboss)[0]; + _warboss.turns_static++; + } + if (array_length(_non_deads)>0 && rando>40){ + var _ork_spread_planet = array_random_element(_non_deads); + var _orks = planet_forces[eFACTION.Ork] + var _ork_target = system.p_orks[_ork_spread_planet]; + var _spread_orks = (current_owner==eFACTION.Ork && ((pdf + guardsmen + planet_forces[8] + planet_forces[10]+planet_forces[1]) == 0 )); + if (_spread_orks){ + // determine maximum Ork presence on the source planet + var _ork_max = planet_forces[eFACTION.Ork]; + + if (_ork_max<5 && _ork_target<2) then system.p_orks[_ork_spread_planet]++; + if (_orks>4 && _ork_target<3){ + system.p_orks[_ork_spread_planet]++; + if (_ork_target<3){ + system.p_orks[_ork_spread_planet]++; + add_forces(eFACTION.Ork, -1); + } + } + + } + } + contin=0; + rando=roll_dice(1,100);// This part handles the ship building + if (population>0 && pdf==0 && guardsmen==0 && planet_forces[10]==0) and (planet_forces[eFACTION.Tau]==0){ + if (!large_population){ + set_population(population*0.97); + }else { + edit_population(-0.01); + } + + }; + + var enemies_present=false; + with (system){ + for (var n=0;n=1) and ((p_pdf[plan]>0) or (p_guardsmen[plan]>0) or (p_traitors[plan]>0) or (p_tau[plan]>0)){ + enemies_present=true; + } + } + } + + if (_has_warboss && !_has_stronghold){ + rando=roll_dice(1,100, "low"); + if (rando<30){ + add_feature(P_features.OrkStronghold); + } + } else { + if (_has_stronghold){ + growth = 0.01; + if (_has_warboss){ + growth *= 2; + } + if (_stronghold.tier0) then rando-=10;// Empire bonus, was 15 before + + // Check for industrial facilities + var fleet_buildable = ((planet_type!="Dead" && planet_type!="Lava") || _has_warboss || _has_stronghold); + if (fleet_buildable && planet_forces[eFACTION.Ork]>=4){// Used to not have Ice either + + if (instance_exists(obj_p_fleet)){ + var ppp=instance_nearest(x,y,obj_p_fleet); + if (point_distance(x,y,ppp.x,ppp.y)<50) and (ppp.action=""){ + exit; + }; + } + if (planet_type == "Forge"){ + rando-=80; + } else if (planet_type == "Hive" || planet_type == "Temperate"){ + rando-=30; + }else if (planet_type == "Agri"){ + rando-=10; + } + var _ork_fleet = scr_orbiting_fleet(eFACTION.Ork, system); + if (_ork_fleet=="none"){ + if (rando<=20){ + new_ork_fleet(x,y); + } + } else { + + _build_ships = true; + + } + } + } + if (_build_ships){ + var _pdata = self; + with (_ork_fleet){ + // Increase ship number for this object? + var rando=irandom(101); + if (obj_controller.known[eFACTION.Ork]>0) then rando-=10; + var _planet_type = _pdata.planet_type; + if (_planet_type=="Forge"){ + rando-=20; + } else if (_planet_type=="Hive"){ + rando-=10; + }else if (_planet_type=="Shrine" || _planet_type=="Temperate"){ + rando-=5; + } + if (rando<=15){// was 25 + rando=choose(1,1,1,1,1,1,1,2,2,2); + var _big_stronghold = false + if (_has_stronghold){ + if (_stronghold.tier>=2){ + _big_stronghold = true; + } + } + if (_planet_type=="Forge" || _big_stronghold || _has_warboss){ + if (!irandom(10)){ + rando = 3; + } + }else if (_has_stronghold || _planet_type=="Hive"){ + if (!irandom(30)){ + rando = 3; + } + } + if (capital_number<=0){ + rando = 3; + } + switch(rando){ + case 3: + capital_number+=1; + break; + case 2: + frigate_number+=1; + break; + case 1: + escort_number+=1; + break; + + } + } + var ii=0; + ii+=capital_number; + ii+=round((frigate_number/2)); + ii+=round((escort_number/4)); + if (ii<=1) then ii=1; + image_index=ii; + //if big enough flee bugger off to new star + if (image_index>=5){ + instance_deactivate_object(_pdata.system); + with(obj_star){ + if (is_dead_star()){ + instance_deactivate_object(id); + } else { + if (owner == eFACTION.Ork || array_contains(p_owner, eFACTION.Ork)){ + instance_deactivate_object(id); + } + } + } + var new_wagh_star = instance_nearest(x,y,obj_star); + if (instance_exists(new_wagh_star)){ + action_x=new_wagh_star.x; + action_y=new_wagh_star.y; + action = ""; + set_fleet_movement(); + } + + } + instance_activate_object(obj_star); + } + } + if (_has_warboss){ + rando=roll_dice(1,100)+10; + var _ork_fleet = scr_orbiting_fleet(eFACTION.Ork, system); + if (_ork_fleet!="none" && rando < _warboss.turns_static){ + _warboss.turns_static = 0; + _ork_fleet.cargo_data.ork_warboss = _warboss; + delete_feature(P_features.OrkWarboss); + if (!_warboss.player_hidden){ + scr_alert("red","ork",$"{obj_controller.faction_leader[0]} departs {name()} as his waaagh gains momentum",0,0); + } + } + } + + } + deamons = system.p_demons[planet]; chaos_forces = system.p_chaos[planet]; @@ -215,7 +438,9 @@ function PlanetData(planet, system) constructor{ } static add_feature = function(feature_type){ - array_push(system.p_feature[planet], new NewPlanetFeature(feature_type)); + var new_feature = new NewPlanetFeature(feature_type); + array_push(system.p_feature[planet], new_feature); + return new_feature; } static has_upgrade = function(feature){ @@ -235,6 +460,8 @@ function PlanetData(planet, system) constructor{ delete_features(system.p_feature[planet], feature); } + static bombard = scr_bomb_world; + static get_local_apothecary_points = function() { var _system_point_use = obj_controller.specialist_point_handler.point_breakdown.systems; var _spare_apoth_points = 0; diff --git a/scripts/scr_bomb_world/scr_bomb_world.gml b/scripts/scr_bomb_world/scr_bomb_world.gml index b6576a4958..ea63482868 100644 --- a/scripts/scr_bomb_world/scr_bomb_world.gml +++ b/scripts/scr_bomb_world/scr_bomb_world.gml @@ -1,37 +1,34 @@ -function scr_bomb_world(star_system, planet_number, bombard_target_faction, bombard_ment_power, target_strength) { +function scr_bomb_world(bombard_target_faction, bombard_ment_power, target_strength) { - var pop_before=0,pop_after=0,reduced_bombard_score=0,strength_reduction=0,txt2="",txt3="",txt4="",max_kill,overkill,roll,kill; - var score_before=star_system.p_population[planet_number]; + var pop_after=0,reduced_bombard_score=0,strength_reduction=0,txt2="",txt3="",txt4="",max_kill,overkill,roll,kill; + + var score_before=population; // TODO - update descriptions below, once we get Surface to Orbit weaponry into the game var txt1=choose("Your cruiser and larger ship", "The heavens rumble and thunder as your ship"); // TODO - add more variation, for different planets, perhaps different ships, CMs positioning, planetary features and other factors - if (ships_selected>1) then txt1+="s"; + if (obj_bomb_select.ships_selected>1) then txt1+="s"; txt1+=choose(" position themselves over the target in close orbit, and unleash", " unload"); - if (ships_selected=1) then txt1+="s"; - txt1+= $" annihilation upon {planet_numeral_name(planet_number, star_system)}. Even from space the explosions can be seen, {choose("tearing ground", "hammering", "battering", "thundering")} across the planet's surface."; + if (obj_bomb_select.ships_selected=1) then txt1+="s"; + txt1+= $" annihilation upon {name()}. Even from space the explosions can be seen, {choose("tearing ground", "hammering", "battering", "thundering")} across the planet's surface."; - if (star_system.p_large[planet_number]=0){ - kill=bombard_ment_power*15000000;// Population if normal, TODO consider making loses to be more percentage-wise, rather than flat, also in scr_purge_world - }else if (star_system.p_large[planet_number]=1){ - kill=bombard_ment_power*0.15;// Population if large - } + kill = population_small_conversion(0.15); - pop_before=star_system.p_population[planet_number]; + var pop_before=population; // Minimum kills pop_after=max(0,pop_before-kill); if (pop_after<=0) and (pop_before>0) then heres_after=0; // Code bits copied from scr_purge_world - if (star_system.p_population[planet_number] > 0) { - heres_before = max(star_system.p_heresy[planet_number] + star_system.p_heresy_secret[planet_number], star_system.p_influence[planet_number][eFACTION.Tau]); + if (population > 0) { + heres_before = max(corruption + secret_corruption, population_influences[eFACTION.Tau]); sci1 = 0; sci1 = (pop_after / pop_before) * irandom_range(1, 3); // Make bombard corruption reduction random to encourage other forms of purging // TODO MEDIUM BOMBARD_CORRUPTION // Tweak numbers heres_after = heres_before - sci1; } - if (star_system.p_type[planet_number]!="Space Hulk"){ + if (planet_type!="Space Hulk"){ var bombard_protection=1; switch(bombard_target_faction){ // case 1: @@ -43,10 +40,10 @@ function scr_bomb_world(star_system, planet_number, bombard_target_faction, bomb bombard_protection=2; break; // I'm not sure about IG, maybe they should be left at 2, or, maybe they should be at 1, like the PDF case 2.5: - if (star_system.p_owner[planet_number]<=5){ + if (current_owner<=5){ txt2="##The PDF forces are poorly fortified; "; bombard_protection=1; - } else if (star_system.p_owner[planet_number]>5){ + } else if (current_owner>5){ txt2="##The renegade forces are poorly fortified; "; bombard_protection=1; } @@ -69,7 +66,20 @@ function scr_bomb_world(star_system, planet_number, bombard_target_faction, bomb break; case 7: txt2="##The Ork forces, for brutal savages, are well dug in; "; // TODO spice up descriptions with variable levels of protection - bombard_protection=2; // TODO Make protection variable depending on leaders present + bombard_protection=2; + if (has_feature(P_features.OrkStronghold)){ + var _stronghold = get_features(P_features.OrkStronghold)[0]; + var _protection = floor(_stronghold.tier); + bombard_protection += _protection; + if (_protection){ + if (bombard_protection == 3){ + txt2 = "The Ork Stronghold on this planet is sizeable and provides the Orks with heavy protection" + } else { + txt2 = "The Ork Stronghold Provides near absolute protection for the greenskins within the vast shielding is impressivly effective despite it's seemingly primitive designs"; + } + } + } + // TODO Make protection variable depending on leaders present break; case 8: txt2="##The Tau forces are well fortified; "; @@ -80,7 +90,7 @@ function scr_bomb_world(star_system, planet_number, bombard_target_faction, bomb bombard_protection=0; // TODO add considerations when it is a cult, and when it is bioforms out in the open break; case 10: - if (star_system.p_type[planet_number]="Daemon"){ + if (planet_type="Daemon"){ bombard_protection=3; // Kind of irrelevant if the bombardment will be nulled later either way txt2="##Reality warps and twists within the planet; "; } else { @@ -107,12 +117,14 @@ function scr_bomb_world(star_system, planet_number, bombard_target_faction, bomb var i=reduced_bombard_score; roll=0; - - if (bombard_protection==0){i=i*4;} // No protection, Nids out in the open use this - else if (bombard_protection==1){i=i*0.9;} // Poor protection, PDF/Renegades and Ecclesiarchy use it, - else if (bombard_protection==2){i=i*0.75;} // Competent protection - IG, standard chaos forces and Orks - else if (bombard_protection==3){i=i*0.5;} // Hi-tech, Admech, Tau and Daemons kind of - else if (bombard_protection==4){i=i*0.34;} // Figured I add a level 4 to this, Ultra hi-tech, Necrons and Eldar + var bombard_protect_scores = [4, 0.9, 0.75, 0.5, 0.34]; + bombard_protection = clamp(bombard_protection, 0, 4); + i *= bombard_protect_scores[bombard_protection]; + // 0 No protection, Nids out in the open use this + //1: Poor protection, PDF/Renegades and Ecclesiarchy use it, + // 2: Competent protection - IG, standard chaos forces and Orks + // 3: Hi-tech, Admech, Tau and Daemons kind of + // 4: Figured I add a level 4 to this, Ultra hi-tech, Necrons and Eldar for(var r=0;r<100;r++){ if (i < 1) then break; @@ -128,7 +140,7 @@ function scr_bomb_world(star_system, planet_number, bombard_target_faction, bomb strength_reduction=round(strength_reduction); txt2+="they suffer"; - if (bombard_target_faction==10) and (star_system.p_type[planet_number]=="Daemon") then strength_reduction=0; + if (bombard_target_faction==10) and (planet_type=="Daemon") then strength_reduction=0; var rel=0; if (strength_reduction!=0) and (target_strength!=0){ @@ -167,73 +179,73 @@ function scr_bomb_world(star_system, planet_number, bombard_target_faction, bomb if (strength_reduction>0){ // Faction 2.5 being renegades, interesting - if (bombard_target_faction=2.5) and (star_system.p_owner[planet_number]=8){ + if (bombard_target_faction=2.5) and (current_owner=8){ var wib="",wob=0; txt2="##The renegade forces are poorly fortified; "; wob=bombard_ment_power*5000000+choose(floor(random(100000)),floor(random(100000))*-1); - if (wob>star_system.p_pdf[planet_number]) then wob=star_system.p_pdf[planet_number]; - rel=(star_system.p_pdf[planet_number]/wob)*100; - star_system.p_pdf[planet_number]-=wob; + if (wob>system.p_pdf[planet]) then wob=system.p_pdf[planet]; + rel=(system.p_pdf[planet]/wob)*100; + system.p_pdf[planet]-=wob; if (rel>0) and (rel<=20) then txt2+=" they suffer minor losses from the bombardment, "+string(scr_display_number(wob))+" purged."; if (rel>20) and (rel<=40) then txt2+=" they suffer moderate losses from the bombardment, "+string(scr_display_number(wob))+" purged."; if (rel>40) and (rel<=60) then txt2+=" they suffer heavy losses from the bombardment, "+string(scr_display_number(wob))+" purged."; - if (rel>60) and (star_system.p_pdf[planet_number]>0) then txt2+=" they suffer devastating losses from the bombardment, "+string(scr_display_number(wob))+" purged."; - if (wob>0) and (star_system.p_pdf[planet_number]=0) then txt2+=" they suffer total annihilation from the bombardment and are wiped clean from the planet."; + if (rel>60) and (system.p_pdf[planet]>0) then txt2+=" they suffer devastating losses from the bombardment, "+string(scr_display_number(wob))+" purged."; + if (wob>0) and (system.p_pdf[planet]=0) then txt2+=" they suffer total annihilation from the bombardment and are wiped clean from the planet."; } switch(bombard_target_faction){ // case 1: - // star_system.p_marines[planet_number]-=strength_reduction; + // system.p_marines[planet]-=strength_reduction; // break; // case 2: - // star_system.p_ig[planet_number]-=strength_reduction; + // system.p_ig[planet]-=strength_reduction; // break; // case 3: - // star_system.p_mechanicus[planet_number]-=strength_reduction; + // system.p_mechanicus[planet]-=strength_reduction; // break; // case 4: - // star_system.p_inquisition[planet_number]-=strength_reduction; + // system.p_inquisition[planet]-=strength_reduction; // break; case 5: - star_system.p_sisters[planet_number]-=strength_reduction; + system.p_sisters[planet]-=strength_reduction; break; case 6: - star_system.p_eldar[planet_number]-=strength_reduction; + system.p_eldar[planet]-=strength_reduction; break; case 7: - star_system.p_orks[planet_number]-=strength_reduction; + system.p_orks[planet]-=strength_reduction; break; case 8: - star_system.p_tau[planet_number]-=strength_reduction; + system.p_tau[planet]-=strength_reduction; break; case 9: - star_system.p_tyranids[planet_number]-=strength_reduction; + system.p_tyranids[planet]-=strength_reduction; break; case 10: - star_system.p_traitors[planet_number]-=strength_reduction; + system.p_traitors[planet]-=strength_reduction; break; // case 11: - // star_system.p_csm[planet_number]-=strength_reduction; + // system.p_csm[planet]-=strength_reduction; // break; // case 12: - // star_system.p_demons[planet_number]-=strength_reduction; + // system.p_demons[planet]-=strength_reduction; // break; case 13: - star_system.p_necrons[planet_number]-=strength_reduction; + system.p_necrons[planet]-=strength_reduction; break; } } - if (kill>0) then kill=min(star_system.p_population[planet_number],kill); + if (kill>0) then kill=min(system.p_population[planet],kill); txt3=""; // Life is the Emperor's currency. Spend it well - if (pop_before > 0 && star_system.p_type[planet_number] != "Daemon") { - var _displayed_population = star_system.p_large[planet_number] == 1 ? $"{pop_before} billion" : scr_display_number(floor(pop_before)); - var _displayed_killed = star_system.p_large[planet_number] == 1 ? $"{kill} billion" : scr_display_number(floor(kill)); + if (pop_before > 0 && planet_type != "Daemon") { + var _displayed_population = system.p_large[planet] == 1 ? $"{pop_before} billion" : scr_display_number(floor(pop_before)); + var _displayed_killed = system.p_large[planet] == 1 ? $"{kill} billion" : scr_display_number(floor(kill)); if (pop_after == 0) { heres_after = 0; } @@ -242,14 +254,14 @@ function scr_bomb_world(star_system, planet_number, bombard_target_faction, bomb // DO EET if (pop_before > 0) { - star_system.p_population[planet_number] = pop_before - kill; - star_system.p_heresy[planet_number] -= sci1; - star_system.p_influence[planet_number][eFACTION.Tau] -= sci1; // TODO LOW PURGE_INFLUENCE // Make this affect all influences - if (star_system.p_heresy[planet_number] < 0) { - star_system.p_heresy[planet_number] = 0; + system.p_population[planet] = pop_before - kill; + system.p_heresy[planet] -= sci1; + system.p_influence[planet][eFACTION.Tau] -= sci1; // TODO LOW PURGE_INFLUENCE // Make this affect all influences + if (system.p_heresy[planet] < 0) { + system.p_heresy[planet] = 0; } - if (star_system.p_influence[planet_number][eFACTION.Tau] < 0) { - star_system.p_influence[planet_number][eFACTION.Tau] = 0; + if (system.p_influence[planet][eFACTION.Tau] < 0) { + system.p_influence[planet][eFACTION.Tau] = 0; } } @@ -260,30 +272,31 @@ function scr_bomb_world(star_system, planet_number, bombard_target_faction, bomb if (pop_after==0 && pop_before>0){ - if (star_system.p_owner[planet_number]=2) and (obj_controller.faction_status[eFACTION.Imperium]!="War"){ - if (star_system.p_type[planet_number]="Temperate") or (star_system.p_type[planet_number]="Hive") or (star_system.p_type[planet_number]="Desert"){ - obj_controller.audiences+=1;obj_controller.audien[obj_controller.audiences]=2; + if (current_owner=2) and (obj_controller.faction_status[eFACTION.Imperium]!="War"){ + if (planet_type="Temperate" || planet_type="Hive" || planet_type="Desert"){ + obj_controller.audiences+=1; + obj_controller.audien[obj_controller.audiences]=2; obj_controller.audien_topic[obj_controller.audiences]="bombard_angry"; } - if (star_system.p_type[planet_number]="Temperate"){ + if (planet_type="Temperate"){ obj_controller.disposition[2]-=5; - }else if (star_system.p_type[planet_number]="Desert"){ + }else if (planet_type="Desert"){ obj_controller.disposition[2]-=3; - }else if (star_system.p_type[planet_number]="Hive"){ + }else if (planet_type="Hive"){ obj_controller.disposition[2]-=10; } - }else if (star_system.p_owner[planet_number]=3) and (obj_controller.faction_status[eFACTION.Mechanicus]!="War"){ + }else if (current_owner=3) and (obj_controller.faction_status[eFACTION.Mechanicus]!="War"){ obj_controller.audiences+=1;obj_controller.audien[obj_controller.audiences]=3; obj_controller.audien_topic[obj_controller.audiences]="bombard_angry"; - if (star_system.p_type[planet_number]="Forge"){ + if (planet_type="Forge"){ obj_controller.disposition[3]-=15; - }else if (star_system.p_type[planet_number]="Ice"){ + }else if (planet_type="Ice"){ obj_controller.disposition[3]-=7; } } - if (planet_feature_bool(star_system.p_feature[planet_number], P_features.Gene_Stealer_Cult)) { - delete_features(star_system.p_feature[planet_number], P_features.Gene_Stealer_Cult); - adjust_influence(eFACTION.Tyranids, -100, planet_number, star_system); + if (planet_feature_bool(system.p_feature[planet], P_features.Gene_Stealer_Cult)) { + delete_features(system.p_feature[planet], P_features.Gene_Stealer_Cult); + adjust_influence(eFACTION.Tyranids, -100, planet, system); pip.text += " The xeno taint of the tyranids that was infesting the population has been completely eradicated with the planets cleansing"; } else { pip.text += " Any xeno taint that was infesting the population has been completely eradicated with the planets cleansing"; @@ -305,7 +318,7 @@ function scr_bomb_world(star_system, planet_number, bombard_target_faction, bomb - if (star_system.p_type[planet_number]="Space Hulk"){ + if (planet_type="Space Hulk"){ var bombard_protection=1; txt1="Torpedoes and Bombardment Cannons rain hell upon the space hulk; "; @@ -314,20 +327,20 @@ function scr_bomb_world(star_system, planet_number, bombard_target_faction, bomb var rel=0; - if (reduced_bombard_score!=0) then rel=((star_system.p_fortified[planet_number]-reduced_bombard_score)/star_system.p_fortified[planet_number])*100; + if (reduced_bombard_score!=0) then rel=((system.p_fortified[planet]-reduced_bombard_score)/system.p_fortified[planet])*100; if (strength_reduction==0) then txt2="it suffers minimal damage from the bombardment."; if (rel>0) and (rel<=20) then txt2="it suffers minor damage from the bombardment, its integrity reduced by "+string(100-rel)+"%"; if (rel>20) and (rel<=40) then txt2="it suffers moderate damage from the bombardment, its integrity reduced by "+string(100-rel)+"%"; if (rel>40) and (rel<=60) then txt2="it suffers heavy damage from the bombardment, its integrity reduced by "+string(100-rel)+"%"; - if (rel>60) and ((star_system.p_fortified[planet_number]-reduced_bombard_score)>0) then txt2="it suffers extensive damage from the bombardment, its integrity reduced by "+string(100-rel)+"%"; - if ((star_system.p_fortified[planet_number]-reduced_bombard_score)<=0) then txt2="it crumbles apart from the onslaught. It is no more."; // Potential TODO Consider adding salvage from the bombed wreckage + if (rel>60) and ((system.p_fortified[planet]-reduced_bombard_score)>0) then txt2="it suffers extensive damage from the bombardment, its integrity reduced by "+string(100-rel)+"%"; + if ((system.p_fortified[planet]-reduced_bombard_score)<=0) then txt2="it crumbles apart from the onslaught. It is no more."; // Potential TODO Consider adding salvage from the bombed wreckage // DO EET - if (reduced_bombard_score>0) then star_system.p_fortified[planet_number]-=reduced_bombard_score; + if (reduced_bombard_score>0) then system.p_fortified[planet]-=reduced_bombard_score; - if (star_system.p_fortified[planet_number]<=0){ - with(star_system){instance_destroy();} + if (system.p_fortified[planet]<=0){ + with(system){instance_destroy();} instance_activate_object(obj_star_select); with(obj_star_select){instance_destroy();} obj_controller.sel_system_x=0; @@ -344,10 +357,10 @@ function scr_bomb_world(star_system, planet_number, bombard_target_faction, bomb - sh_target.acted=5; - with(obj_bomb_select){instance_destroy();} - instance_destroy(); - + obj_bomb_select.sh_target.acted=5; + with(obj_bomb_select){ + instance_destroy(); + } // show_message("Pop: "+string(pop_before)+" -> "+string(pop_after)+"#killed: "+string(kill)+"#Heresy: "+string(heres_before)+" -> "+string(heres_after)); diff --git a/scripts/scr_cheatcode/scr_cheatcode.gml b/scripts/scr_cheatcode/scr_cheatcode.gml index d74d258765..af8412705b 100644 --- a/scripts/scr_cheatcode/scr_cheatcode.gml +++ b/scripts/scr_cheatcode/scr_cheatcode.gml @@ -105,6 +105,10 @@ function scr_cheatcode(argument0) { case "chaosfleetspawn": spawn_chaos_warlord(); break; + case "waaagh": + + init_ork_waagh(true); + break; case "neworkfleet": var p_fleet = get_largest_player_fleet(); with (instance_nearest(p_fleet.x, p_fleet.y, obj_star)) { diff --git a/scripts/scr_draw_planet_features/scr_draw_planet_features.gml b/scripts/scr_draw_planet_features/scr_draw_planet_features.gml index f83a478ac3..ff6b5d9205 100644 --- a/scripts/scr_draw_planet_features/scr_draw_planet_features.gml +++ b/scripts/scr_draw_planet_features/scr_draw_planet_features.gml @@ -177,6 +177,15 @@ function FeatureSelected(Feature, system, planet) constructor{ }; } break; + case P_features.OrkStronghold: + title = "Ork Stronghold"; + generic = true; + if (planet_data.planet_forces[eFACTION.Ork]){ + body = $"For as long as this Stronghold stands the orks here will continue to fortify it. The larger it gets the greater the capacity of this planet to produce orkish machines of war and ships and the better protected the ork forces will be from bombardment"; + } else { + body = "Without a force of orks to hold it together the fortress is slowly pulled apart from within by the inhabitants, It's capabilities will constantly decrease until soon there will be nothing left"; + } + break case P_features.Recruiting_World: generic = true; var _planet = planet_data.planet; diff --git a/scripts/scr_enemy_ai_a/scr_enemy_ai_a.gml b/scripts/scr_enemy_ai_a/scr_enemy_ai_a.gml index df54cdc657..a25e88a361 100644 --- a/scripts/scr_enemy_ai_a/scr_enemy_ai_a.gml +++ b/scripts/scr_enemy_ai_a/scr_enemy_ai_a.gml @@ -311,7 +311,7 @@ function scr_enemy_ai_a() { if (!stop){// Start stop - default_imperium_attack = guard_score>0 && !((guard_score<=0.5) && (pdf_score>1)) ?"guard":"pdf"; + default_imperium_attack = guard_score>0 && !((guard_score<=0.5) && (pdf_score>0)) ?"guard":"pdf"; if (ork_attack=="imp") then ork_attack = default_imperium_attack; @@ -869,113 +869,113 @@ function scr_enemy_ai_a() { } // end repeat here - // quene player battles here - - - // End quene player battles - - - - scr_star_ownership(true); - - - - - // Restock PDF and military - var i; - i = 0; - repeat(planets) { - i += 1; - if (p_type[i] == "Daemon") { - p_heresy[i] = 200; - p_owner[i] = 10; - } - - if (p_population[i] <= 0) and(p_large[i] = 0) and(p_chaos[i] = 0) and(p_traitors[i] = 0) and(p_tau[i] = 0) and(p_type[i] != "Daemon") then p_heresy[i] = 0; - if (p_population[i] < 1) and(p_large[i] = 1) { - p_population[i] = p_population[i] * 100000000; - p_large[i] = 0; - } - - if (p_owner[i] = 2) and(p_type[i] != "Dead") and(planets >= i) and(p_tyranids[i] = 0) and(p_chaos[i] = 0) and(p_traitors[i] = 0) and(p_eldar[i] = 0) and(p_tau[i] = 0) { - var military, pdf, rando, contin; - military = 0; - pdf = 0; - contin = 0; - rando = floor(random(100)) + 1; - - if (p_population[i] >= 10000000) { - military = (p_population[i] / 470); - pdf = floor(military * 0.75); - military = floor(military * 0.25); - } - if (p_population[i] >= 5000000) and(p_population[i] < 10000000) { - military = p_population[i] / 200; - pdf = floor(military * 0.75); - military = floor(military * 0.25); - } - if (p_population[i] >= 100000) and(p_population[i] < 5000000) { - military = p_population[i] / 50; - pdf = floor(military * 0.75); - military = floor(military * 0.25); - } - if (p_large[i] = 1) { - military = military * 1000000000; - pdf = pdf * 1000000000; - } - - if (p_large[i] = 0) and(rando < 50) and(military != 0) and(pdf != 0) { - // if (p_guardsmen[i] 5) and(p_large[i] = 0) { - pdf = floor(p_population[i] / 25); - military = 0; - } - if (p_population[i] < 2000) and(p_population[i] > 5) and(p_large[i] = 0) { - pdf = floor(p_population[i] / 10); - military = 0; - } - - if (p_large[i] = 0) and(rando < 3) { - // if (p_guardsmen[i]= i) and(p_tyranids[i] = 0) and(p_chaos[i] = 0) and(p_traitors[i] = 0) and(p_eldar[i] = 0) and(p_tau[i] = 0) { + var military, pdf, rando, contin; + military = 0; + pdf = 0; + contin = 0; + rando = floor(random(100)) + 1; + + if (p_population[i] >= 10000000) { + military = (p_population[i] / 470); + pdf = floor(military * 0.75); + military = floor(military * 0.25); + } + if (p_population[i] >= 5000000) and(p_population[i] < 10000000) { + military = p_population[i] / 200; + pdf = floor(military * 0.75); + military = floor(military * 0.25); + } + if (p_population[i] >= 100000) and(p_population[i] < 5000000) { + military = p_population[i] / 50; + pdf = floor(military * 0.75); + military = floor(military * 0.25); + } + if (p_large[i] = 1) { + military = military * 1000000000; + pdf = pdf * 1000000000; + } + + if (p_large[i] = 0) and(rando < 50) and(military != 0) and(pdf != 0) { + // if (p_guardsmen[i] 5) and(p_large[i] = 0) { + pdf = floor(p_population[i] / 25); + military = 0; + } + if (p_population[i] < 2000) and(p_population[i] > 5) and(p_large[i] = 0) { + pdf = floor(p_population[i] / 10); + military = 0; + } + + if (p_large[i] = 0) and(rando < 3) { + // if (p_guardsmen[i]0){ - var ork_spread_planet = non_deads[irandom(array_length(non_deads)-1)]; - - var spread_orks = !((p_owner[i]!=7) or (p_pdf[i]>0) or (p_guardsmen[i]>0) or (p_traitors[i]>0) or (p_tau[i]>0) or (p_orks[i]<3) or (p_player[i]>0)); - if (spread_orks){ - if (p_orks[i]<5 && p_orks[ork_spread_planet]<2) then p_orks[ork_spread_planet]++; - if (p_orks[i]>4 && p_orks[ork_spread_planet]<3){ - p_orks[ork_spread_planet]++; - if (p_orks[ork_spread_planet]<3){ - p_orks[ork_spread_planet]++; - p_orks[i]--; - } - - } - - } - } - contin=0; - rando=floor(random(100))+1;// This part handles the ship building - if (p_population[i]>0) and (p_pdf[i]=0) and (p_guardsmen[i]=0) and (p_traitors[i]=0) and (p_tau[i]=0) and (p_large[i]=0) then p_population[i]=round(p_population[i]*0.97); - if (p_population[i]>0) and (p_pdf[i]=0) and (p_guardsmen[i]=0) and (p_traitors[i]=0) and (p_tau[i]=0) and (p_large[i]=1) then p_population[i]-=0.01; - // ^ And extermination - - var enemies_present=false; - for (var n=0;n=1) and ((p_pdf[plan]>0) or (p_guardsmen[plan]>0) or (p_traitors[plan]>0) or (p_tau[plan]>0)) then enemies_present=true; - } - //What is the point of this? - if (owner = eFACTION.Ork){ - contin=1; - } - - if (contin=1 && !enemies_present){ - rando=floor(random(100))+1; - if (obj_controller.known[eFACTION.Ork]>0) then rando-=10;// Empire bonus, was 15 before - - // Check for industrial facilities - if (p_type[i]!="Dead") and (p_type[i]!="Lava"){// Used to not have Ice either - if (p_orks[i]>=4){// Have the proppa facilities and size - fleet=0; - contin=2; - if (instance_number(obj_en_fleet)==0) then contin=3; - if (instance_number(obj_en_fleet)>0) then contin=2; - - if (instance_exists(obj_p_fleet)){ - var ppp=instance_nearest(x,y,obj_p_fleet); - if (point_distance(x,y,ppp.x,ppp.y)<50) and (ppp.action="") then contin=0; - } - if (contin==2){ - var ork_fleet = 0; - var oriting_name = name; - var fleet_loop =true; - var _instance_count=0; - var _instance_numer = instance_number(obj_en_fleet); - while (fleet_loop){ - var loop_fleet = instance_nearest(x,y, obj_en_fleet); - with (loop_fleet){ - if (instance_nearest(x,y,obj_star).name==oriting_name){ - if (owner==eFACTION.Ork && action==""){ - ork_fleet=self; - fleet_loop=false; - } else{ - instance_deactivate_object(id); - } - } else { - fleet_loop=false; - } - } - _instance_count++; - if (_instance_count>_instance_numer) then break; - } - instance_activate_object(obj_en_fleet); - if (instance_exists(ork_fleet)) { - var star_id=self.id; - with (ork_fleet){ - build_new_ork_ships_to_fleet(star_id, i); - } - } else { - if (rando<=25){ - new_ork_fleet(x,y); - } - } - } - if (contin=3) and (rando<=25){// Create a fleet - // fleet=instance_create - new_ork_fleet(x,y); - } - /*if (fleet!=0){ - if (instance_exists(fleet)) then with(fleet){ - var ii;ii=0;ii+=capital_number;ii+=round((frigate_number/2));ii+=round((escort_number/4)); - if (ii<=1) then ii=1;image_index=ii; - } - }*/ - } - } - - } - } - - + orks_end_turn_growth(); // traitors below here diff --git a/scripts/scr_fleet_functions/scr_fleet_functions.gml b/scripts/scr_fleet_functions/scr_fleet_functions.gml index 377d79ed39..808340945b 100644 --- a/scripts/scr_fleet_functions/scr_fleet_functions.gml +++ b/scripts/scr_fleet_functions/scr_fleet_functions.gml @@ -377,7 +377,7 @@ function scr_orbiting_fleet(faction, system="none"){ var xx = system == "none" ? x : system.x; var yy = system == "none" ? y : system.y; with (obj_en_fleet){ - if (x=xx && y==yy){ + if (x==xx && y==yy){ var _valid = false; if (_faction_list){ _valid = array_contains(faction, owner); diff --git a/scripts/scr_garrison/scr_garrison.gml b/scripts/scr_garrison/scr_garrison.gml index 79f73e5937..5cad14e61d 100644 --- a/scripts/scr_garrison/scr_garrison.gml +++ b/scripts/scr_garrison/scr_garrison.gml @@ -324,9 +324,9 @@ function determine_pdf_defence(pdf, garrison="none", planet_forti=0, enemy=0){ pdf_score = 2; } else if (pdf < 100000 && pdf >= 2000) { pdf_score = 1; - } else if (pdf < 2000) { + } else if (pdf < 2000 &&pdf >500) { pdf_score = 0.5; - } else if (pdf < 500) { + } else if (pdf <= 500) { pdf_score = 0.1; } explanations += $"PDF Defence: {pdf_score}#" diff --git a/scripts/scr_ork_fleet_functions/scr_ork_fleet_functions.gml b/scripts/scr_ork_fleet_functions/scr_ork_fleet_functions.gml index 3ceafbc4b9..2a9c980a4c 100644 --- a/scripts/scr_ork_fleet_functions/scr_ork_fleet_functions.gml +++ b/scripts/scr_ork_fleet_functions/scr_ork_fleet_functions.gml @@ -10,58 +10,24 @@ function new_ork_fleet(xx,yy){ present_fleet[7] = 1; } -function build_new_ork_ships_to_fleet(star, planet){ - - // Increase ship number for this object? - var rando=irandom(101); - if (obj_controller.known[eFACTION.Ork]>0) then rando-=10; - var _planet_type = star.p_type[planet]; - if (_planet_type=="Forge"){ - rando-=20; - } else if (_planet_type=="Hive"){ - rando-=10; - }else if (_planet_type=="Shrine" || _planet_type=="Temperate"){ - rando-=5; - } - if (rando<=15){// was 25 - rando=choose(1,1,1,1,1,1,1,3,3,3,3); - if (capital_number<=0) then rando = 3; - if (rando=1) then capital_number+=1; - // if (rando=2) then fleet.frigate_number+=1; - if (rando=3) then escort_number+=1; - } - var ii=0; - ii+=capital_number; - ii+=round((frigate_number/2)); - ii+=round((escort_number/4)); - if (ii<=1) then ii=1; - image_index=ii; - //if big enough flee bugger off to new star - if (image_index>=5){ - instance_deactivate_object(star); - with(obj_star){ - if (is_dead_star()){ - instance_deactivate_object(id); - } else { - if (owner == eFACTION.Ork || array_contains(p_owner, eFACTION.Ork)){ - instance_deactivate_object(id); - } - } - } - var new_wagh_star = instance_nearest(x,y,obj_star); - if (instance_exists(new_wagh_star)){ - action_x=new_wagh_star.x; - action_y=new_wagh_star.y; - action = ""; - set_fleet_movement(); - } - +function orks_end_turn_growth(){ + for (i=1;i<=planets;i++){ + var _pdata = new PlanetData(i, self); + if (!p_orks[i]){ + var _strongholds = _pdata.get_features(P_features.OrkStronghold); + for (var s=0;s0) then p_tyranids[ork_attack_planet]-=_ork_fleet.capital_number+(_ork_fleet.frigate_number/2); + var _pdata = new PlanetData(ork_attack_planet, self); + + //generate refugee ships to spread tyranids if (p_tyranids[ork_attack_planet]<=0){ if (planet_feature_bool(p_feature[ork_attack_planet], P_features.Gene_Stealer_Cult)){ - delete_features(p_feature[ork_attack_planet], P_features.Gene_Stealer_Cult); + _pdata.delete_feature(P_features.Gene_Stealer_Cult); adjust_influence(eFACTION.Tyranids, -25, ork_attack_planet); var nearest_imperial = nearest_star_with_ownership(x,y,eFACTION.Imperium, self.id); if (nearest_imperial != "none"){ var targ_planet = scr_get_planet_with_owner(nearest_imperial,eFACTION.Imperium); if (targ_planet==-1) then targ_planet = irandom_range(1, nearest_imperial.planets); - new_colony_fleet(self.id, ork_attack_planet, nearest_imperial.id, targ_planet, "refugee"); + _pdata.send_colony_ship(nearest_imperial.id, targ_planet, "refugee"); } } } @@ -124,30 +93,34 @@ function ork_fleet_arrive_target(){ if (fleet_has_cargo("ork_warboss",_ork_fleet)){ - array_push(p_feature[i], _ork_fleet.carg_data.ork_warboss); + array_push(p_feature[i], _ork_fleet.cargo_data.ork_warboss); p_orks[i]=6; } if (p_orks[i]>6) then p_orks[i]=6; - with(_ork_fleet){instance_destroy();} - aler=1; - } - } else { - var new_wagh_star = distance_removed_star(x,y, choose(2,3,4,5)); - if (instance_exists(new_wagh_star)){ - with (_ork_fleet){ - action_x=new_wagh_star.x; - action_y=new_wagh_star.y; - action = ""; - set_fleet_movement(); + with(_ork_fleet){ + instance_destroy(); } + aler=1; } } } } - if (aler>0) then scr_alert("green","owner",$"Ork ships have crashed across the {name} system.",x,y); + if (aler>0){ + scr_alert("green","owner",$"Ork ships have crashed across the {name} system.",x,y); + } else { + var new_wagh_star = distance_removed_star(x,y, choose(2,3,4,5)); + if (instance_exists(new_wagh_star)){ + with (_ork_fleet){ + action_x=new_wagh_star.x; + action_y=new_wagh_star.y; + action = ""; + set_fleet_movement(); + } + } + } }// End _allow_landingng portion of code @@ -157,21 +130,9 @@ function ork_fleet_arrive_target(){ //TOSO provide logic for fleets to attack each other function merge_ork_fleets(){ - var _stars_with_ork_fleets = {}; - with (obj_en_fleet){ - if (!owner != eFACTION.Ork) then continue; - if (capital_number+frigate_number+escort_number <= 0){ - instance_destroy(); - continue; - } - if (is_orbiting()){ - if (struct_exists(_stars_with_ork_fleets, orbiting.name)){ - array_push(_stars_with_ork_fleets[$orbiting.name],id); - } else { - _stars_with_ork_fleets[$ orbiting.name] = [id]; - } - } - } + + var _stars_with_ork_fleets = stars_with_faction_fleets(eFACTION.Ork); + var _star_names = struct_get_names(_stars_with_ork_fleets); for (var i =0;i=5 && (waaagh<=_ork_star_count || overide) && obj_controller.known[eFACTION.Ork]==0)/* or (obj_controller.is_test_map=true)*/{ + obj_controller.known[eFACTION.Ork]=0.5; + //set an alarm for all ork controlled planets + + + scr_popup("WAAAAGH!","The greenskins have swelled in activity, their numbers increasing seemingly without relent. A massive Warboss has risen to take control, leading most of the sector's Orks on a massive WAAAGH!","waaagh",""); + scr_event_log("red","Ork WAAAAGH! begins."); + + var ork_waagh_activity = []; + var _any_ork_star = []; + for (var p=0;p=2){ + array_push(ork_waagh_activity, [id,_rand_planet]); + } + } + if (p_orks[i]>0){ + array_push(_any_ork_star, [id, i]); + } + } + } + } + + if (array_length(ork_waagh_activity)){ + + var _waaagh_star = array_random_element(ork_waagh_activity); + + } else { + var _waaagh_star = array_random_element(_any_ork_star); + } + var _pdata = new PlanetData(_waaagh_star[1], _waaagh_star[0]); + var _boss = _pdata.add_feature(P_features.OrkWarboss); + if (overide){ + _boss.player_hidden = false; + scr_event_log("red","boss on {_pdata.name()}", _pdata.system.name); + } + + if (_pdata.planet_forces[eFACTION.Ork] < 4) { + _pdata.add_forces(eFACTION.Ork, 2); + } + + } +} + diff --git a/scripts/scr_ork_planet_functions/scr_ork_planet_functions.gml b/scripts/scr_ork_planet_functions/scr_ork_planet_functions.gml index 2bf5019be8..4c03940d98 100644 --- a/scripts/scr_ork_planet_functions/scr_ork_planet_functions.gml +++ b/scripts/scr_ork_planet_functions/scr_ork_planet_functions.gml @@ -3,76 +3,80 @@ // Check for industrial facilities // Used to not have Ice either function ork_ship_production(planet){ - if(!array_contains(["dead", "lava", "ice"], p_type[planet])){ - // Have the proppa facilities and size - if (p_orks[planet]>=4){ - var fleet=0; - contin=2; - if (instance_number(obj_en_fleet)==0) then contin=3; - if (instance_number(obj_en_fleet)>0) then contin=2; - - if (instance_exists(obj_p_fleet)){ - var nearestPlayerFleet=instance_nearest(x,y,obj_p_fleet); - if (point_distance(x,y,nearestPlayerFleet.x,nearestPlayerFleet.y)<50) and (nearestPlayerFleet.action=="") then contin=0; + if (array_contains(["dead", "lava", "ice"], p_type[planet])){ + exit; + } + // Have the proppa facilities and size + if (p_orks[planet]>=4){ + var fleet=0; + contin=2; + if (instance_number(obj_en_fleet)==0) then contin=3; + if (instance_number(obj_en_fleet)>0) then contin=2; + + if (instance_exists(obj_p_fleet)){ + var nearestPlayerFleet=instance_nearest(x,y,obj_p_fleet); + if (point_distance(x,y,nearestPlayerFleet.x,nearestPlayerFleet.y)<50) and (nearestPlayerFleet.action==""){ + exit; } - if (contin==2){ - fleet=scr_orbiting_fleet(eFACTION.Ork); - if (fleet=="none") then contin=3; - if (fleet!="none") and (contin!=3){ - rando=choose(1,1,1,1,1,2,2,2,2); - switch (rando) { - case 1: - fleet.capital_number += 1; - break; - case 2: - fleet.escort_number += 1; - break; - } + } + if (contin==2){ + fleet=scr_orbiting_fleet(eFACTION.Ork); + if (fleet=="none") then contin=3; + if (fleet!="none") and (contin!=3){ + rando=choose(1,1,1,1,1,2,2,2,2); + switch (rando) { + case 1: + fleet.capital_number += 1; + break; + case 2: + fleet.escort_number += 1; + break; + } + + if (fleet.image_index>=5){ + var nearestStar=0,targetStar=0; + var locationOk=false; - if (fleet.image_index>=5){ - var nearestStar=0,targetStar=0; - var locationOk=false; - - with(obj_star){ - if (planets==1) and (p_type[1]=="Dead") then instance_deactivate_object(instance_id_get( 0 )); - } - nearestStar=instance_nearest(fleet.x,fleet.y,obj_star); - instance_deactivate_object(nearestStar); - for(var j=0; j<10; j++){ - if (!locationOk){ - targetStar=instance_nearest(fleet.x+choose(random(400),random(400)*-1),fleet.y+choose(random(100),random(100)*-1),obj_star); - if (targetStar.owner != eFACTION.Ork) then locationOk=true; - // New code testing - if (nearestStar.owner == eFACTION.Ork) and (instance_exists(nearestStar)){ - if (nearestStar.present_fleet[7]>0){ - var fli=instance_nearest(nearestStar.x,nearestStar.y,obj_en_fleet); - if (fli.action=="") and (owner != eFACTION.Ork) and (point_distance(nearestStar.x,nearestStar.y,fli.x,fli.y)<60) then locationOk=true; - if (fli.action=="") and (owner != eFACTION.Ork) and (point_distance(nearestStar.x,nearestStar.y,fli.x,fli.y)<60) then locationOk=true; - } - }// End new code testing - - if (targetStar.planets==0) then locationOk=false; - if (targetStar.planets==1) and (targetStar.p_type[1]=="Dead") then locationOk=false; - } + with(obj_star){ + if (planets==1) and (p_type[1]=="Dead") then instance_deactivate_object(instance_id_get( 0 )); + } + nearestStar=instance_nearest(fleet.x,fleet.y,obj_star); + instance_deactivate_object(nearestStar); + for(var j=0; j<10; j++){ + if (!locationOk){ + targetStar=instance_nearest(fleet.x+choose(random(400),random(400)*-1),fleet.y+choose(random(100),random(100)*-1),obj_star); + if (targetStar.owner != eFACTION.Ork) then locationOk=true; + // New code testing + if (nearestStar.owner == eFACTION.Ork) and (instance_exists(nearestStar)){ + if (nearestStar.present_fleet[7]>0){ + var fli=instance_nearest(nearestStar.x,nearestStar.y,obj_en_fleet); + if (fli.action=="") and (owner != eFACTION.Ork) and (point_distance(nearestStar.x,nearestStar.y,fli.x,fli.y)<60) then locationOk=true; + if (fli.action=="") and (owner != eFACTION.Ork) and (point_distance(nearestStar.x,nearestStar.y,fli.x,fli.y)<60) then locationOk=true; + } + }// End new code testing + + if (targetStar.planets==0) then locationOk=false; + if (targetStar.planets==1) and (targetStar.p_type[1]=="Dead") then locationOk=false; } - fleet.action_x=targetStar.x; - fleet.action_y=targetStar.y; - fleet.alarm[4]=1;// present_fleets-=1; - instance_activate_object(obj_star); } + fleet.action_x=targetStar.x; + fleet.action_y=targetStar.y; + fleet.alarm[4]=1;// present_fleets-=1; + instance_activate_object(obj_star); } } - if (contin==3 && irandom_range(1,100)<=25){// Create a fleet - // fleet=instance_create - fleet=instance_create(x,y,obj_en_fleet); - fleet.owner = eFACTION.Ork; - fleet.sprite_index=spr_fleet_ork; - fleet.image_index=1; - fleet.capital_number=2; - // present_fleets+=1; - } + } + if (contin==3 && irandom_range(1,100)<=25){// Create a fleet + // fleet=instance_create + fleet=instance_create(x,y,obj_en_fleet); + fleet.owner = eFACTION.Ork; + fleet.sprite_index=spr_fleet_ork; + fleet.image_index=1; + fleet.capital_number=2; + // present_fleets+=1; } } + } function kill_warboss(){ diff --git a/scripts/scr_planetary_feature/scr_planetary_feature.gml b/scripts/scr_planetary_feature/scr_planetary_feature.gml index 1f10a50cde..1fc2f626a3 100644 --- a/scripts/scr_planetary_feature/scr_planetary_feature.gml +++ b/scripts/scr_planetary_feature/scr_planetary_feature.gml @@ -26,7 +26,7 @@ enum P_features { Forge, Gene_Stealer_Cult, Mission, - Ork_Stronghold + OrkStronghold }; @@ -141,8 +141,14 @@ function NewPlanetFeature(feature_type, other_data={}) constructor{ break; case P_features.OrkWarboss: player_hidden = 1; - planet_display= "Ork Warboss"; + planet_display = "Ork Warboss"; Warboss = "alive"; + turns_static = 0; + break; + case P_features.OrkStronghold: + player_hidden = 1; + planet_display= "Ork Stronghold"; + tier = 1; break; case P_features.Monastery: planet_display="Fortress Monastary"; @@ -160,6 +166,9 @@ function NewPlanetFeature(feature_type, other_data={}) constructor{ player_hidden = 1; planet_display = 0; } + if (global.cheat_debug){ + player_hidden = 0; + } static load_json_data = function(data){ var names = variable_struct_get_names(data); for (var i = 0; i < array_length(names); i++) { diff --git a/scripts/scr_star_ownership/scr_star_ownership.gml b/scripts/scr_star_ownership/scr_star_ownership.gml index 158c037e0e..d902a1ae90 100644 --- a/scripts/scr_star_ownership/scr_star_ownership.gml +++ b/scripts/scr_star_ownership/scr_star_ownership.gml @@ -9,12 +9,25 @@ function scr_star_ownership(argument0) { repeat(planets){ run+=1; if (p_owner[run]=eFACTION.Player){ - if (dispo[run]<90 && !planet_feature_bool(p_feature[run], P_features.Monastery)){ + if (dispo[run]<95 && !planet_feature_bool(p_feature[run], P_features.Monastery)){ p_owner[run]=2; } - } - if (p_type[run]="Dead") and (p_owner[run]!=2) and (p_first[run]!=1) and (p_first[run]!=5) then p_owner[run]=2; - if (p_owner[run]=7) and (p_orks[run]=0) then p_owner[run]=p_first[run]; + } + var _set_to_first = false; + if (p_owner[run]=7 && p_orks[run]=0 && p_type[run]!="Dead"){ + _set_to_first = true; + } + if (_set_to_first){ + var _first = p_first[run]; + if (p_first[run] == eFACTION.Ork && p_orks[planet] <= 0){ + p_owner[run]=2; + } else { + p_owner[run]=p_first[run]; + } + } + if (p_type[run]=="Dead") and (p_owner[run]!=2) and (p_first[run]!=1) and (p_first[run]!=5){ + p_owner[run]=2; + } if (p_owner[run]=8) and (p_tau[run]=0) and (p_pdf[run]=0){ p_owner[run]=2; p_influence[run][eFACTION.Tau]=round(p_influence[run][eFACTION.Tau]/2); @@ -25,15 +38,19 @@ function scr_star_ownership(argument0) { if (p_owner[run]=10) then p_owner[run]=2;} if (p_type[run]="Daemon") then p_owner[run]=10; + var _nid_chosen = false; if (planet_feature_bool(p_feature[run], P_features.Gene_Stealer_Cult)){ if (p_influence[run][eFACTION.Tyranids]>50){ p_owner[run]=9; tyranids_owner+=1; + _nid_chosen = true; } } else if (p_tyranids[run]>=5) and (p_population[run]=0){ p_owner[run]=9; tyranids_owner+=1; - }else if (p_type[run]!="Dead"){ + _nid_chosen = true; + } + if (p_type[run]!="Dead" && !_nid_chosen){ if (p_owner[run]=eFACTION.Player) then player_owner+=1; if (p_owner[run]=eFACTION.Imperium) then imperium_owner+=1; if (p_owner[run]=eFACTION.Mechanicus) then forge_owner+=1; @@ -67,7 +84,8 @@ function scr_star_ownership(argument0) { if (randoo=4){ p_type[run]="Daemon"; p_fortified[run]=6; - p_traitors[run]=7;p_owner[run]=10; + p_traitors[run]=7; + p_owner[run]=10; delete_features(p_feature[run],P_features.Daemonic_Incursion); } } diff --git a/scripts/scr_system_search_helpers/scr_system_search_helpers.gml b/scripts/scr_system_search_helpers/scr_system_search_helpers.gml index 955b25490c..1b1e6e183b 100644 --- a/scripts/scr_system_search_helpers/scr_system_search_helpers.gml +++ b/scripts/scr_system_search_helpers/scr_system_search_helpers.gml @@ -77,6 +77,24 @@ function scr_get_planet_with_type(star, type){ return -1; } +function stars_with_faction_fleets(search_faction){ + var _stars_with_fleets = {}; + with (obj_en_fleet){ + if (owner != search_faction) then continue; + if (capital_number+frigate_number+escort_number <= 0){ + instance_destroy(); + continue; + } + if (is_orbiting()){ + if (struct_exists(_stars_with_fleets, orbiting.name)){ + array_push(_stars_with_fleets[$orbiting.name],id); + } else { + _stars_with_fleets[$ orbiting.name] = [id]; + } + } + } + return _stars_with_fleets; +} function planets_without_type(type,star="none"){ var return_planets = []; diff --git a/sprites/spr_fleet_ork/spr_fleet_ork.yy b/sprites/spr_fleet_ork/spr_fleet_ork.yy index 05a0b7f2a7..0873800d21 100644 --- a/sprites/spr_fleet_ork/spr_fleet_ork.yy +++ b/sprites/spr_fleet_ork/spr_fleet_ork.yy @@ -72,6 +72,8 @@ "playbackSpeedType":1, "resourceType":"GMSequence", "resourceVersion":"2.0", + "seqHeight":22.0, + "seqWidth":22.0, "showBackdrop":true, "showBackdropImage":false, "timeUnits":1, @@ -109,10 +111,7 @@ },"Disabled":false,"id":"90531e4a-e9cc-4501-9a48-f0b3a50ad878","IsCreationKey":false,"Key":9.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":11, "yorigin":11, diff --git a/sprites/spr_ship_deth/spr_ship_deth.yy b/sprites/spr_ship_deth/spr_ship_deth.yy index 559ed272b6..ec1c601627 100644 --- a/sprites/spr_ship_deth/spr_ship_deth.yy +++ b/sprites/spr_ship_deth/spr_ship_deth.yy @@ -63,6 +63,8 @@ "playbackSpeedType":1, "resourceType":"GMSequence", "resourceVersion":"2.0", + "seqHeight":91.0, + "seqWidth":172.0, "showBackdrop":true, "showBackdropImage":false, "timeUnits":1, @@ -73,10 +75,7 @@ },"Disabled":false,"id":"69824969-8aec-4e69-b60d-c2a00439a438","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":86, "yorigin":45, diff --git a/sprites/spr_ship_gorbag/spr_ship_gorbag.yy b/sprites/spr_ship_gorbag/spr_ship_gorbag.yy index c0aa6d77f8..ef20f7097a 100644 --- a/sprites/spr_ship_gorbag/spr_ship_gorbag.yy +++ b/sprites/spr_ship_gorbag/spr_ship_gorbag.yy @@ -63,6 +63,8 @@ "playbackSpeedType":1, "resourceType":"GMSequence", "resourceVersion":"2.0", + "seqHeight":101.0, + "seqWidth":166.0, "showBackdrop":true, "showBackdropImage":false, "timeUnits":1, @@ -73,10 +75,7 @@ },"Disabled":false,"id":"f104132a-3439-4d37-88e1-75d95f3f8607","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":83, "yorigin":50, diff --git a/sprites/spr_ship_kroozer/spr_ship_kroozer.yy b/sprites/spr_ship_kroozer/spr_ship_kroozer.yy index beea25917d..7079a91f96 100644 --- a/sprites/spr_ship_kroozer/spr_ship_kroozer.yy +++ b/sprites/spr_ship_kroozer/spr_ship_kroozer.yy @@ -63,6 +63,8 @@ "playbackSpeedType":1, "resourceType":"GMSequence", "resourceVersion":"2.0", + "seqHeight":60.0, + "seqWidth":138.0, "showBackdrop":true, "showBackdropImage":false, "timeUnits":1, @@ -73,10 +75,7 @@ },"Disabled":false,"id":"7553d091-4021-4d8f-8705-9a7ea17ee8d6","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":69, "yorigin":30, diff --git a/sprites/spr_tartaros_complex/spr_tartaros_complex.yy b/sprites/spr_tartaros_complex/spr_tartaros_complex.yy index 87ec6a4c02..cae9cf8490 100644 --- a/sprites/spr_tartaros_complex/spr_tartaros_complex.yy +++ b/sprites/spr_tartaros_complex/spr_tartaros_complex.yy @@ -63,6 +63,8 @@ "playbackSpeedType":0, "resourceType":"GMSequence", "resourceVersion":"2.0", + "seqHeight":271.0, + "seqWidth":181.0, "showBackdrop":true, "showBackdropImage":false, "timeUnits":1, From 1c1fcca5c1236c30e1b4b8b8b3df222a60839311 Mon Sep 17 00:00:00 2001 From: EttyKitty <20323032+EttyKitty@users.noreply.github.com> Date: Tue, 29 Apr 2025 23:52:54 +0300 Subject: [PATCH 006/286] ci: Run daily workflows at 22:00 UTC (#785) --- .github/workflows/release_dev.yml | 2 +- .github/workflows/stale_labeler.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/release_dev.yml b/.github/workflows/release_dev.yml index 6b9e821054..fe36d8329a 100644 --- a/.github/workflows/release_dev.yml +++ b/.github/workflows/release_dev.yml @@ -11,7 +11,7 @@ on: - YYC - VM schedule: - - cron: "0 0 * * *" + - cron: "0 22 * * *" # every day at 22:00 UTC jobs: build_needed: diff --git a/.github/workflows/stale_labeler.yml b/.github/workflows/stale_labeler.yml index 6d0bb9466f..0277edc566 100644 --- a/.github/workflows/stale_labeler.yml +++ b/.github/workflows/stale_labeler.yml @@ -1,7 +1,7 @@ name: "Mark stale issues and PRs" on: schedule: - - cron: '0 0 * * *' # every day at midnight UTC + - cron: '0 22 * * *' # every day at 22:00 UTC jobs: stale: From b8d38b24d8f256340aa92053651270036807cd2f Mon Sep 17 00:00:00 2001 From: Nelsonh <81228864+OH296@users.noreply.github.com> Date: Tue, 29 Apr 2025 22:06:01 +0100 Subject: [PATCH 007/286] fix: Role names displays player chosen names in creation (#780) --- scripts/scr_livery_setup/scr_livery_setup.gml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/scr_livery_setup/scr_livery_setup.gml b/scripts/scr_livery_setup/scr_livery_setup.gml index 9ddaa3fa68..4a54e43385 100644 --- a/scripts/scr_livery_setup/scr_livery_setup.gml +++ b/scripts/scr_livery_setup/scr_livery_setup.gml @@ -536,7 +536,7 @@ function scr_livery_setup(){ draw_set_color(38144); draw_rectangle(xxx,yyy,1150,yyy+20,1); draw_set_color(38144); - draw_text(xxx,yyy,string_hash_to_newline(role[c,role_id])); + draw_text(xxx,yyy,role[100,role_id]); if (scr_hit(xxx,yyy,1150,yyy+20)) and ((!instance_exists(obj_creation_popup)) || ((instance_exists(obj_creation_popup) and obj_creation_popup.target_gear=0))) { draw_set_alpha(custom==2?0.2:0.1); From f925c47ff111ac13bf3dfc6612937c6d4257bd8c Mon Sep 17 00:00:00 2001 From: Nelsonh <81228864+OH296@users.noreply.github.com> Date: Tue, 29 Apr 2025 22:08:05 +0100 Subject: [PATCH 008/286] fix: Remaining sprite weapon issues and streamline customiser (#782) --- scripts/scr_ComplexSet/scr_ComplexSet.gml | 11 +- scripts/scr_buttons/scr_buttons.gml | 6 +- .../scr_complex_colour_kit.gml | 1 + .../scr_culture_visuals.gml | 65 ++++++- scripts/scr_livery_setup/scr_livery_setup.gml | 165 +++++------------- 5 files changed, 110 insertions(+), 138 deletions(-) diff --git a/scripts/scr_ComplexSet/scr_ComplexSet.gml b/scripts/scr_ComplexSet/scr_ComplexSet.gml index 966c83bb68..47f1c8348a 100644 --- a/scripts/scr_ComplexSet/scr_ComplexSet.gml +++ b/scripts/scr_ComplexSet/scr_ComplexSet.gml @@ -539,7 +539,11 @@ function ComplexSet(_unit) constructor { } else if (_variant == 3) { _bio = [spr_terminator_complex_arm_hidden_right, spr_terminator_complex_arm_hidden_left]; } - } + } else { + if (_variant == 2 || _variant == 3){ + continue; + } + } if (_bionic_arm && !array_length(_bio)) { if (armour_type == ArmourType.Normal) { var _bio = [spr_bionic_right_arm, spr_bionic_left_arm]; @@ -774,11 +778,6 @@ function ComplexSet(_unit) constructor { weapon_left.hand_type = 0; _arm.ui_ymod += 15; } - - if (array_contains(["Chainaxe", "Power Axe", "Crozius Arcanum", "Power Mace", "Mace of Absolution", "Relic Blade"], _wep)) { - _arm.hand_type = 3; - _arm.arm_type = 3; - } } else if (armour_type == ArmourType.Scout) { _arm.ui_xmod += 4; _arm.ui_ymod += 11; diff --git a/scripts/scr_buttons/scr_buttons.gml b/scripts/scr_buttons/scr_buttons.gml index a9c2910ddc..40fe67c43d 100644 --- a/scripts/scr_buttons/scr_buttons.gml +++ b/scripts/scr_buttons/scr_buttons.gml @@ -437,6 +437,7 @@ function radio_set(options_array, title)constructor{ y_gap = 5; x1 = 0; y1 = 0; + draw_title = true; changed = false; max_width = 0; max_height = 0; @@ -448,7 +449,10 @@ function radio_set(options_array, title)constructor{ static update = item_data_updater; static draw = function(){ - draw_text(x1, y1, title); + if (draw_title){ + draw_text(x1, y1, title); + } + changed = false; var _start_current_selection = current_selection; var _prev_x = x1; diff --git a/scripts/scr_complex_colour_kit/scr_complex_colour_kit.gml b/scripts/scr_complex_colour_kit/scr_complex_colour_kit.gml index 49ba4f05f4..a6b76ffc76 100644 --- a/scripts/scr_complex_colour_kit/scr_complex_colour_kit.gml +++ b/scripts/scr_complex_colour_kit/scr_complex_colour_kit.gml @@ -182,6 +182,7 @@ function ColourItem(xx,yy) constructor{ set_pattern(struct_cols.main_color, lower_left); set_pattern(struct_cols.main_color, head_set); } + reset_image(); return variable_clone(map_colour); } diff --git a/scripts/scr_culture_visuals/scr_culture_visuals.gml b/scripts/scr_culture_visuals/scr_culture_visuals.gml index 3d86d304b0..4e1aea1dd3 100644 --- a/scripts/scr_culture_visuals/scr_culture_visuals.gml +++ b/scripts/scr_culture_visuals/scr_culture_visuals.gml @@ -1417,7 +1417,9 @@ global.weapon_visual_data = { sprite: spr_weapon_plasma_cannon_term }, { - display_type: "ranged_twohand", + weapon_data: { + display_type: "ranged_twohand", + }, sprite: spr_weapon_plasc, body_types: [0, 1] } @@ -1436,8 +1438,11 @@ global.weapon_visual_data = { sprite: spr_weapon_plasma_cannon_term }, { - display_type: "ranged_twohand", + weapon_data: { + display_type: "ranged_twohand", + }, sprite: spr_weapon_grav_cannon, + body_types: [0,1] } ] }, @@ -1731,6 +1736,18 @@ global.weapon_visual_data = { } ] }, +"Eviscerator" : { + base: { + weapon_data: { + display_type: "melee_onehand", + hand_type: 0, + new_weapon_draw: true + }, + }, + variants: [{ + sprite: spr_weapon_evisc + }] +}, "Eldar Power Sword": { base: { @@ -1779,7 +1796,8 @@ global.weapon_visual_data = { base: { weapon_data: { display_type: "melee_onehand", - hand_type: 2, + hand_type: 3, + arm_type : 3, new_weapon_draw: true }, }, @@ -1789,12 +1807,44 @@ global.weapon_visual_data = { } ] }, +"Power Mace": { + base: { + weapon_data: { + display_type: "melee_onehand", + hand_type: 3, + arm_type : 3, + new_weapon_draw: true + }, + }, + variants: [ + { + sprite: spr_weapon_powmace + }, + ] +}, +"Mace of Absolution": { + base: { + weapon_data: { + display_type: "melee_onehand", + hand_type: 3, + arm_type : 3, + new_weapon_draw: true + }, + }, + variants: [ + { + sprite: spr_weapon_powmace + } + ] +}, "Crozius Arcanum": { base: { weapon_data: { hand_on_top: true, - display_type: "melee_onehand" + display_type: "melee_onehand", + hand_type: 3, + arm_type : 3, }, }, variants: [ @@ -1808,7 +1858,8 @@ global.weapon_visual_data = { base: { weapon_data: { display_type: "melee_onehand", - hand_type: 2, + hand_type: 3, + arm_type : 3, new_weapon_draw: true }, }, @@ -1868,7 +1919,9 @@ global.weapon_visual_data = { base: { weapon_data: { hand_on_top: true, - display_type: "melee_onehand" + display_type: "melee_onehand", + hand_type: 3, + arm_type : 3, }, }, variants: [ diff --git a/scripts/scr_livery_setup/scr_livery_setup.gml b/scripts/scr_livery_setup/scr_livery_setup.gml index 4a54e43385..d0bc83a284 100644 --- a/scripts/scr_livery_setup/scr_livery_setup.gml +++ b/scripts/scr_livery_setup/scr_livery_setup.gml @@ -1,7 +1,7 @@ // Script assets have changed for v2.3.0 see // https://help.yoyogames.com/hc/en-us/articles/360005277377 for more information function scr_livery_setup(){ - draw_set_font(fnt_40k_30b); + draw_set_font(fnt_40k_30b); draw_set_halign(fa_center); draw_set_alpha(1); draw_set_color(38144); @@ -24,7 +24,7 @@ function scr_livery_setup(){ preview_box.x2 = preview_box.x1 + preview_box.w; preview_box.y2 = preview_box.y1 + preview_box.h; - draw_sprite_stretched(spr_creation_arrow,0,preview_box.x1,preview_box.y1,32,32);// Left Arrow + /*draw_sprite_stretched(spr_creation_arrow,0,preview_box.x1,preview_box.y1,32,32);// Left Arrow draw_sprite_stretched(spr_creation_arrow,1,preview_box.x2-32,preview_box.y1,32,32);// Right Arrow if (point_and_click([preview_box.x1,preview_box.y1,preview_box.x1+32,preview_box.y1+32])){ test_sprite++; @@ -33,107 +33,17 @@ function scr_livery_setup(){ if (point_and_click([preview_box.x2-32,preview_box.y1,preview_box.x2, preview_box.y1+32])){ test_sprite--; if (test_sprite<0) then test_sprite=(array_length(draw_sprites)-1); - } + }*/ livery_picker.draw_base(); - draw_rectangle_color_simple(preview_box.x1,preview_box.y1,preview_box.x2,preview_box.y2,1,38144); - if( shader_is_compiled(sReplaceColor)){ - shader_set(sReplaceColor); - - shader_set_uniform_f_array(colour_to_find1, body_colour_find ); - shader_set_uniform_f_array(colour_to_set1, body_colour_replace ); - shader_set_uniform_f_array(colour_to_find2, secondary_colour_find ); - shader_set_uniform_f_array(colour_to_set2, secondary_colour_replace ); - shader_set_uniform_f_array(colour_to_find3, pauldron_colour_find ); - shader_set_uniform_f_array(colour_to_set3, pauldron_colour_replace ); - shader_set_uniform_f_array(colour_to_find4, lens_colour_find ); - shader_set_uniform_f_array(colour_to_set4, lens_colour_replace ); - shader_set_uniform_f_array(colour_to_find5, trim_colour_find ); - shader_set_uniform_f_array(colour_to_set5, trim_colour_replace ); - shader_set_uniform_f_array(colour_to_find6, pauldron2_colour_find ); - shader_set_uniform_f_array(colour_to_set6, pauldron2_colour_replace ); - shader_set_uniform_f_array(colour_to_find7, weapon_colour_find ); - shader_set_uniform_f_array(colour_to_set7, weapon_colour_replace ); - - //Rejoice! - tester_sprite = draw_sprites[test_sprite]; - tester_helm = draw_hem[test_sprite]; - if (col_special=0) then draw_sprite(tester_sprite,10,preview_box.x1,preview_box.y1 + 8); - if (col_special=1) then draw_sprite(tester_sprite,11,preview_box.x1,preview_box.y1 + 8); - if (col_special>=2) then draw_sprite(tester_sprite,12,preview_box.x1,preview_box.y1 + 8); - - draw_sprite(tester_sprite,col_special,preview_box.x1,preview_box.y1 + 8); - if (col_special<=1){ - draw_sprite(tester_sprite,6,preview_box.x1,preview_box.y1 + 8); - draw_sprite(tester_sprite,8,preview_box.x1,preview_box.y1 + 8); - } - if (col_special>=2){ - draw_sprite(tester_sprite,6,preview_box.x1,preview_box.y1 + 8); - draw_sprite(tester_sprite,9,preview_box.x1,preview_box.y1 + 8); - } - if (trim=0) and (col_special<=1) then draw_sprite(tester_sprite,4,preview_box.x1,preview_box.y1 + 8); - if (trim=0) and (col_special>=2) then draw_sprite(tester_sprite,5,preview_box.x1,preview_box.y1 + 8); - //TODO this can be imprved but for now it's fit for purpose - if (complex_selection=="Sergeant Markers" && complex_livery){ - var sgt_col_1 = complex_livery_data.sgt.helm_primary; - var sgt_col_2 = complex_livery_data.sgt.helm_secondary; - var lens_col = complex_livery_data.sgt.helm_lens; - shader_set_uniform_f_array(colour_to_find1, [30/255,30/255,30/255]); - shader_set_uniform_f(colour_to_set1, col_r[sgt_col_1]/255, col_g[sgt_col_1]/255, col_b[sgt_col_1]/255); - shader_set_uniform_f_array(colour_to_find2, [200/255,0/255,0/255]); - shader_set_uniform_f(colour_to_set2, col_r[sgt_col_2]/255, col_g[sgt_col_2]/255, col_b[sgt_col_2]/255); - shader_set_uniform_f(colour_to_set4, col_r[lens_col]/255, col_g[lens_col]/255, col_b[lens_col]/255); - draw_sprite(tester_helm, complex_depth_selection, preview_box.x1,preview_box.y1 + 8); - } - else if (complex_selection=="Veteran Sergeant Markers" && complex_livery){ - var sgt_col_1 = complex_livery_data.vet_sgt.helm_primary; - var sgt_col_2 = complex_livery_data.vet_sgt.helm_secondary; - var lens_col = complex_livery_data.vet_sgt.helm_lens; - shader_set_uniform_f_array(colour_to_find1, [30/255,30/255,30/255]); - shader_set_uniform_f(colour_to_set1, col_r[sgt_col_1]/255, col_g[sgt_col_1]/255, col_b[sgt_col_1]/255); - shader_set_uniform_f_array(colour_to_find2, [200/255,0/255,0/255]); - shader_set_uniform_f(colour_to_set2, col_r[sgt_col_2]/255, col_g[sgt_col_2]/255, col_b[sgt_col_2]/255); - shader_set_uniform_f(colour_to_set4, col_r[lens_col]/255, col_g[lens_col]/255, col_b[lens_col]/255); - draw_sprite(tester_helm, complex_depth_selection, preview_box.x1,preview_box.y1 + 8); - } - else if (complex_selection=="Captain Markers" && complex_livery){ - var sgt_col_1 = complex_livery_data.captain.helm_primary; - var sgt_col_2 = complex_livery_data.captain.helm_secondary; - var lens_col = complex_livery_data.captain.helm_lens; - shader_set_uniform_f_array(colour_to_find1, [30/255,30/255,30/255]); - shader_set_uniform_f(colour_to_set1, col_r[sgt_col_1]/255, col_g[sgt_col_1]/255, col_b[sgt_col_1]/255); - shader_set_uniform_f_array(colour_to_find2, [200/255,0/255,0/255]); - shader_set_uniform_f(colour_to_set2, col_r[sgt_col_2]/255, col_g[sgt_col_2]/255, col_b[sgt_col_2]/255); - shader_set_uniform_f(colour_to_set4, col_r[lens_col]/255, col_g[lens_col]/255, col_b[lens_col]/255); - draw_sprite(tester_helm, complex_depth_selection, preview_box.x1,preview_box.y1 + 8); - } else if (complex_selection=="Veteran Markers" && complex_livery){ - var sgt_col_1 = complex_livery_data.veteran.helm_primary; - var sgt_col_2 = complex_livery_data.veteran.helm_secondary; - var lens_col = complex_livery_data.veteran.helm_lens; - shader_set_uniform_f_array(colour_to_find1, [30/255,30/255,30/255]); - shader_set_uniform_f(colour_to_set1, col_r[sgt_col_1]/255, col_g[sgt_col_1]/255, col_b[sgt_col_1]/255); - shader_set_uniform_f_array(colour_to_find2, [200/255,0/255,0/255]); - shader_set_uniform_f(colour_to_set2, col_r[sgt_col_2]/255, col_g[sgt_col_2]/255, col_b[sgt_col_2]/255); - shader_set_uniform_f(colour_to_set4, col_r[lens_col]/255, col_g[lens_col]/255, col_b[lens_col]/255); - draw_sprite(tester_helm, complex_depth_selection, preview_box.x1,preview_box.y1 + 8); - } - shader_set_uniform_f_array(colour_to_find1, body_colour_find ); - shader_set_uniform_f_array(colour_to_set1, body_colour_replace ); - shader_set_uniform_f_array(colour_to_find2, secondary_colour_find ); - shader_set_uniform_f_array(colour_to_set2, secondary_colour_replace ); - shader_set_uniform_f_array(colour_to_set4, lens_colour_replace ); - if(tester_sprite == spr_terminator3_colors){ - draw_sprite(spr_weapon_colors,0,444 - 12,252 + 5); - } else { - draw_sprite(spr_weapon_colors,0,444,252); - } - shader_reset(); - - }else{ - draw_text(444,252,string_hash_to_newline("Color swap shader#did not compile")); - } + draw_set_alpha(1); + draw_set_font(fnt_40k_30b); + draw_set_halign(fa_center); + draw_set_alpha(1); + draw_set_color(38144); var comp_toggle = buttons.company_options_toggle; var company_radio = buttons.company_liveries_choice; + company_radio.draw_title = false; var comp_change = false; comp_toggle.update({ x1 : 50, @@ -179,6 +89,23 @@ function scr_livery_setup(){ } } + var _updater = draw_unit_buttons([preview_box.x1,preview_box.y1], "Update Sprite"); + if(scr_hit(_updater)){ + tooltip_draw("Click to Update Marine colour picker with Colour settings, warning this will overide Existing colour selections"); + } + + if (point_and_click(_updater)){ + var struct_cols = { + main_color :main_color, + secondary_color:secondary_color, + main_trim:main_trim, + right_pauldron:right_pauldron, + left_pauldron:left_pauldron, + lens_color:lens_color, + weapon_color:weapon_color + } + livery_picker.set_default_armour(struct_cols, col_special); + } draw_set_color(38144); draw_set_halign(fa_left); draw_text_transformed(580,118,"Battle Cry:",0.6,0.6,0); @@ -213,11 +140,12 @@ function scr_livery_setup(){ draw_text_transformed(cur_button.cords[0]+30,cur_button.cords[1]+4,cur_button.text,0.4,0.4,0); }*/ if (!complex_livery){ + var _tooltip_add_on = ". You can change this value as much as you want in order to update the marine role, company and defualt options on the left but remember to set this value back to your desired base value before continuing"; var button_data = [ { text : $"Primary : {col[main_color]}", tooltip:"Primary", - tooltip2:"The main color of your Astartes and their vehicles.", + tooltip2:"The main color of your Astartes and their vehicles. And the colour of your chapters Ships", cords : [620, 252], }, { @@ -264,7 +192,7 @@ function scr_livery_setup(){ button_cords = draw_unit_buttons(cur_button.cords, cur_button.text,[0.5,0.5], 38144,, fnt_40k_30b, button_alpha); if (scr_hit(button_cords[0],button_cords[1],button_cords[2],button_cords[3])){ tooltip=cur_button.tooltip; - tooltip2=cur_button.tooltip2; + tooltip2=cur_button.tooltip2+_tooltip_add_on; } if (point_and_click(button_cords) && custom >= 2){ @@ -291,33 +219,17 @@ function scr_livery_setup(){ var yar; for (var i=0;i Date: Wed, 30 Apr 2025 00:08:18 +0300 Subject: [PATCH 009/286] fix: NameGenerator breakage (#783) --- objects/obj_creation/Create_0.gml | 2 ++ scripts/NameGenerator/NameGenerator.gml | 46 ++++++++++++------------- 2 files changed, 24 insertions(+), 24 deletions(-) diff --git a/objects/obj_creation/Create_0.gml b/objects/obj_creation/Create_0.gml index a66a7e27e6..1f4708ad95 100644 --- a/objects/obj_creation/Create_0.gml +++ b/objects/obj_creation/Create_0.gml @@ -9,6 +9,8 @@ try{ handle_exception(_exception); } +global.name_generator = new NameGenerator(); + #region Global Settings: volume, fullscreen etc ini_open("saves.ini"); master_volume=ini_read_real("Settings","master_volume",1); diff --git a/scripts/NameGenerator/NameGenerator.gml b/scripts/NameGenerator/NameGenerator.gml index 1e03be5ab6..3453164078 100644 --- a/scripts/NameGenerator/NameGenerator.gml +++ b/scripts/NameGenerator/NameGenerator.gml @@ -39,37 +39,37 @@ function NameGenerator() constructor { }; // vars // TODO put these into a struct or dict or something - static sector_names = LoadSimpleNames("sector", "Sector 1"); - static sector_used_names = []; + sector_names = LoadSimpleNames("sector", "Sector 1"); + sector_used_names = []; - static star_names = LoadSimpleNames("star", "Star 1"); - static star_used_names = []; - static star_names_generic_counter = 0; // TODO once we migrate Star data to proper structs and jsons, this can probably be removed + star_names = LoadSimpleNames("star", "Star 1"); + star_used_names = []; + star_names_generic_counter = 0; // TODO once we migrate Star data to proper structs and jsons, this can probably be removed - static space_marines_names = LoadSimpleNames("space_marine", "Space Marine 1"); - static space_marines_used_names = []; + space_marines_names = LoadSimpleNames("space_marine", "Space Marine 1"); + space_marines_used_names = []; - static imperial_names = LoadSimpleNames("imperial", "Imperial 1"); - static imperial_used_names = []; + imperial_names = LoadSimpleNames("imperial", "Imperial 1"); + imperial_used_names = []; - static chaos_names = LoadSimpleNames("chaos", "Chaos 1"); - static chaos_used_names = []; + chaos_names = LoadSimpleNames("chaos", "Chaos 1"); + chaos_used_names = []; - static eldar_syllables = LoadCompositeNames("eldar", ["first_syllables", "second_syllables", "third_syllables"]); + eldar_syllables = LoadCompositeNames("eldar", ["first_syllables", "second_syllables", "third_syllables"]); - static ork_name_composites = LoadCompositeNames("ork", ["prefixes", "suffixes", "special"]); + ork_name_composites = LoadCompositeNames("ork", ["prefixes", "suffixes", "special"]); - static imperial_ship_names = LoadSimpleNames("imperial_ship", "Imperial Ship 1"); - static imperial_ship_used_names = []; + imperial_ship_names = LoadSimpleNames("imperial_ship", "Imperial Ship 1"); + imperial_ship_used_names = []; - static ork_ship_names = LoadSimpleNames("ork_ship", "Ork Ship 1"); - static ork_ship_used_names = []; + ork_ship_names = LoadSimpleNames("ork_ship", "Ork Ship 1"); + ork_ship_used_names = []; - static hulk_name_composites = LoadCompositeNames("hulk", ["prefixes", "suffixes"]); + hulk_name_composites = LoadCompositeNames("hulk", ["prefixes", "suffixes"]); - static tau_name_composites = LoadCompositeNames("tau", ["prefixes", "suffixes"]); + tau_name_composites = LoadCompositeNames("tau", ["prefixes", "suffixes"]); - static genestealer_cult_names = LoadCompositeNames("genestealercult", ["main", "embelishment", "title"]); + genestealer_cult_names = LoadCompositeNames("genestealercult", ["main", "embelishment", "title"]); // init @@ -84,7 +84,8 @@ function NameGenerator() constructor { array_delete(used_names, 0, used_names_length); } else { log_error($"Used up all {entity_name} names. Generating a generic name. used_names_length = {used_names_length}; star_names_generic_counter = {star_names_generic_counter}."); - return $"{entity_name} {used_names_length + (star_names_generic_counter++)}"; + star_names_generic_counter++; + return $"{entity_name} {used_names_length + star_names_generic_counter}"; } } @@ -225,6 +226,3 @@ function NameGenerator() constructor { return CompositeNameGeneration(tau_name_composites, true); }; } - -// Init -global.name_generator = new NameGenerator(); From 478866f01cbc0964d331fd349666302fe702ab52 Mon Sep 17 00:00:00 2001 From: EttyKitty <20323032+EttyKitty@users.noreply.github.com> Date: Wed, 30 Apr 2025 00:08:44 +0300 Subject: [PATCH 010/286] revert: Copy-on-Write back to true (#784) --- options/main/options_main.yy | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/options/main/options_main.yy b/options/main/options_main.yy index a665081efc..858eb0c4f3 100644 --- a/options/main/options_main.yy +++ b/options/main/options_main.yy @@ -5,7 +5,7 @@ "option_audio_error_behaviour":false, "option_author":"", "option_collision_compatibility":false, - "option_copy_on_write_enabled":false, + "option_copy_on_write_enabled":true, "option_draw_colour":4294967295, "option_gameguid":"60d8bf5e-3804-4d8f-93f8-fe72952db6af", "option_gameid":"0", From 92f80cc1cec36413ef6ea144010534585f62346f Mon Sep 17 00:00:00 2001 From: EttyKitty <20323032+EttyKitty@users.noreply.github.com> Date: Wed, 30 Apr 2025 00:19:06 +0300 Subject: [PATCH 011/286] ci: Title checker allows "!" (#787) --- .github/pr-title-checker-config.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/pr-title-checker-config.json b/.github/pr-title-checker-config.json index be898e9522..497f9249ad 100644 --- a/.github/pr-title-checker-config.json +++ b/.github/pr-title-checker-config.json @@ -1,6 +1,6 @@ { "CHECKS": { - "regexp": "((feat|fix|ci|chore|docs|test|refactor|revert|style|perf|build)(\\(.*\\))?: )|Merge branch" + "regexp": "((feat|fix|ci|chore|docs|test|refactor|revert|style|perf|build)(\\(.*\\))?!?: )|Merge branch" }, "MESSAGES": { "failure": "Invalid PR Title. Please use the following formats: `(): `. Refer to the list of [conventional commit types](https://github.com/pvdlg/conventional-commit-types?tab=readme-ov-file#commit-types)." From c71e60b1ed4878da358b888e5aa4c2ecc10e9c3f Mon Sep 17 00:00:00 2001 From: EttyKitty <20323032+EttyKitty@users.noreply.github.com> Date: Wed, 30 Apr 2025 00:19:46 +0300 Subject: [PATCH 012/286] ci: Add the rest of conventional commits to labeler (#786) --- .github/pr_labeler_contents.yml | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/.github/pr_labeler_contents.yml b/.github/pr_labeler_contents.yml index ccdec76495..77f436312d 100644 --- a/.github/pr_labeler_contents.yml +++ b/.github/pr_labeler_contents.yml @@ -40,3 +40,13 @@ labels: title: "^perf" - label: "Type: Performance" body: "(?i)(\\[performance\\]|\\[perf\\])" + +- label: "Type: Revert" + title: "^revert" +- label: "Type: Revert" + body: "(?i)\\[revert\\]" + +- label: "Type: Build" + title: "^build" +- label: "Type: Build" + body: "(?i)\\[build\\]" From 1aa11eea90f256d115b9ffca96831a10f5bcfe9d Mon Sep 17 00:00:00 2001 From: Nelsonh <81228864+OH296@users.noreply.github.com> Date: Wed, 30 Apr 2025 21:27:58 +0100 Subject: [PATCH 013/286] fix: Problem getting eta time for missions (#788) --- scripts/scr_mission_eta/scr_mission_eta.gml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/scripts/scr_mission_eta/scr_mission_eta.gml b/scripts/scr_mission_eta/scr_mission_eta.gml index 3982d2a17e..5aa6c8cb2b 100644 --- a/scripts/scr_mission_eta/scr_mission_eta.gml +++ b/scripts/scr_mission_eta/scr_mission_eta.gml @@ -17,8 +17,10 @@ function scr_mission_eta(star_x, star_y, type=1, leeway = 10) { if (instance_exists(obj_p_fleet)){ if (type=1){ - var nearest_fleet = get_nearest_player_fleet(star_x, star_y, true); - eta1 = get_viable_travel_time(leeway, nearest_fleet.x, nearest_fleet.y, star_x, star_y, nearest_fleet, false); + var nearest_fleet = get_nearest_player_fleet(star_x, star_y); + if (nearest_fleet != "none"){ + eta1 = get_viable_travel_time(leeway, nearest_fleet.x, nearest_fleet.y, star_x, star_y, nearest_fleet, false); + } // n1=instance_nearest(x,y,obj_p_fleet); // with(n1){y-=3000;} // n2=instance_nearest(x,y,obj_p_fleet); From 0a731b93e1cec867067f7b0c132a82383df410dc Mon Sep 17 00:00:00 2001 From: Nelsonh <81228864+OH296@users.noreply.github.com> Date: Wed, 30 Apr 2025 23:13:54 +0100 Subject: [PATCH 014/286] feat: New Force Axe Sprite (#790) --- ChapterMaster.yyp | 1 + scripts/scr_ComplexSet/scr_ComplexSet.gml | 8 +- .../scr_culture_visuals.gml | 5 +- .../7e323b40-4d75-4c0f-9c71-ade5cce4038e.png | Bin 0 -> 6564 bytes .../074e27fd-1f15-4bfa-a7f0-b156311448c2.png | Bin 0 -> 6564 bytes .../spr_weapon_frcaxe/spr_weapon_frcaxe.yy | 92 ++++++++++++++++++ 6 files changed, 101 insertions(+), 5 deletions(-) create mode 100644 sprites/spr_weapon_frcaxe/7e323b40-4d75-4c0f-9c71-ade5cce4038e.png create mode 100644 sprites/spr_weapon_frcaxe/layers/7e323b40-4d75-4c0f-9c71-ade5cce4038e/074e27fd-1f15-4bfa-a7f0-b156311448c2.png create mode 100644 sprites/spr_weapon_frcaxe/spr_weapon_frcaxe.yy diff --git a/ChapterMaster.yyp b/ChapterMaster.yyp index d1d7b3e64a..ea1fa47894 100644 --- a/ChapterMaster.yyp +++ b/ChapterMaster.yyp @@ -1620,6 +1620,7 @@ {"id":{"name":"spr_weapon_eldsword","path":"sprites/spr_weapon_eldsword/spr_weapon_eldsword.yy",},}, {"id":{"name":"spr_weapon_evisc","path":"sprites/spr_weapon_evisc/spr_weapon_evisc.yy",},}, {"id":{"name":"spr_weapon_flamer","path":"sprites/spr_weapon_flamer/spr_weapon_flamer.yy",},}, + {"id":{"name":"spr_weapon_frcaxe","path":"sprites/spr_weapon_frcaxe/spr_weapon_frcaxe.yy",},}, {"id":{"name":"spr_weapon_frcstaff","path":"sprites/spr_weapon_frcstaff/spr_weapon_frcstaff.yy",},}, {"id":{"name":"spr_weapon_grav_cannon","path":"sprites/spr_weapon_grav_cannon/spr_weapon_grav_cannon.yy",},}, {"id":{"name":"spr_weapon_grav_gun","path":"sprites/spr_weapon_grav_gun/spr_weapon_grav_gun.yy",},}, diff --git a/scripts/scr_ComplexSet/scr_ComplexSet.gml b/scripts/scr_ComplexSet/scr_ComplexSet.gml index 47f1c8348a..c8d1801983 100644 --- a/scripts/scr_ComplexSet/scr_ComplexSet.gml +++ b/scripts/scr_ComplexSet/scr_ComplexSet.gml @@ -756,9 +756,11 @@ function ComplexSet(_unit) constructor { } _arm.ui_ymod += 24; } - if (_arm.display_type == "melee_onehand" && (_wep != "Company Standard")) { - _arm.arm_type = 2; - _arm.hand_type = 2; + if (_arm.display_type == "melee_onehand" && _wep != "Company Standard" ) { + if (!_arm.hand_type){ + _arm.arm_type = 2; + _arm.hand_type = 2; + } _arm.ui_xmod -= 14; _arm.ui_ymod += 23; } diff --git a/scripts/scr_culture_visuals/scr_culture_visuals.gml b/scripts/scr_culture_visuals/scr_culture_visuals.gml index 4e1aea1dd3..2274be20dd 100644 --- a/scripts/scr_culture_visuals/scr_culture_visuals.gml +++ b/scripts/scr_culture_visuals/scr_culture_visuals.gml @@ -1904,13 +1904,14 @@ global.weapon_visual_data = { base: { weapon_data: { display_type: "melee_onehand", - hand_type: 2, + hand_type: 3, + arm_type : 3, new_weapon_draw: true }, }, variants: [ { - sprite: spr_weapon_powaxe + sprite: spr_weapon_frcaxe, } ] }, diff --git a/sprites/spr_weapon_frcaxe/7e323b40-4d75-4c0f-9c71-ade5cce4038e.png b/sprites/spr_weapon_frcaxe/7e323b40-4d75-4c0f-9c71-ade5cce4038e.png new file mode 100644 index 0000000000000000000000000000000000000000..51f62f9ce055e37baf5930048d34addd96e1aed1 GIT binary patch literal 6564 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 literal 0 HcmV?d00001 diff --git a/sprites/spr_weapon_frcaxe/layers/7e323b40-4d75-4c0f-9c71-ade5cce4038e/074e27fd-1f15-4bfa-a7f0-b156311448c2.png b/sprites/spr_weapon_frcaxe/layers/7e323b40-4d75-4c0f-9c71-ade5cce4038e/074e27fd-1f15-4bfa-a7f0-b156311448c2.png new file mode 100644 index 0000000000000000000000000000000000000000..51f62f9ce055e37baf5930048d34addd96e1aed1 GIT binary patch literal 6564 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 literal 0 HcmV?d00001 diff --git a/sprites/spr_weapon_frcaxe/spr_weapon_frcaxe.yy b/sprites/spr_weapon_frcaxe/spr_weapon_frcaxe.yy new file mode 100644 index 0000000000..d8a5fe83b6 --- /dev/null +++ b/sprites/spr_weapon_frcaxe/spr_weapon_frcaxe.yy @@ -0,0 +1,92 @@ +{ + "$GMSprite":"", + "%Name":"spr_weapon_frcaxe", + "bboxMode":0, + "bbox_bottom":247, + "bbox_left":31, + "bbox_right":116, + "bbox_top":89, + "collisionKind":1, + "collisionTolerance":0, + "DynamicTexturePage":false, + "edgeFiltering":false, + "For3D":false, + "frames":[ + {"$GMSpriteFrame":"","%Name":"7e323b40-4d75-4c0f-9c71-ade5cce4038e","name":"7e323b40-4d75-4c0f-9c71-ade5cce4038e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + ], + "gridX":0, + "gridY":0, + "height":281, + "HTile":false, + "layers":[ + {"$GMImageLayer":"","%Name":"074e27fd-1f15-4bfa-a7f0-b156311448c2","blendMode":0,"displayName":"default","isLocked":false,"name":"074e27fd-1f15-4bfa-a7f0-b156311448c2","opacity":100.0,"resourceType":"GMImageLayer","resourceVersion":"2.0","visible":true,}, + ], + "name":"spr_weapon_frcaxe", + "nineSlice":null, + "origin":0, + "parent":{ + "name":"melee", + "path":"folders/Sprites/Marine Viewer/weapons/melee.yy", + }, + "preMultiplyAlpha":false, + "resourceType":"GMSprite", + "resourceVersion":"2.0", + "sequence":{ + "$GMSequence":"v1", + "%Name":"spr_weapon_frcaxe", + "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_weapon_frcaxe", + "playback":1, + "playbackSpeed":30.0, + "playbackSpeedType":0, + "resourceType":"GMSequence", + "resourceVersion":"2.0", + "seqHeight":281.0, + "seqWidth":201.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":"7e323b40-4d75-4c0f-9c71-ade5cce4038e","path":"sprites/spr_weapon_frcaxe/spr_weapon_frcaxe.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"d1cbf5d8-ad42-4a35-b45b-c36bbcb08988","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":0.5, + "textureGroupId":{ + "name":"Default", + "path":"texturegroups/Default", + }, + "type":0, + "VTile":false, + "width":201, +} \ No newline at end of file From dcf4e61970b00c268fe7397d00cd2cc83ecec078 Mon Sep 17 00:00:00 2001 From: Luke Van Epen Date: Thu, 1 May 2025 12:09:17 +1000 Subject: [PATCH 015/286] fix: Crash on mission_inquisition_tyranid_organism (#792) --- .../scr_inquisition_mission.gml | 52 +++++++++---------- 1 file changed, 26 insertions(+), 26 deletions(-) diff --git a/scripts/scr_inquisition_mission/scr_inquisition_mission.gml b/scripts/scr_inquisition_mission/scr_inquisition_mission.gml index 54f2302d11..562abb2ba2 100644 --- a/scripts/scr_inquisition_mission/scr_inquisition_mission.gml +++ b/scripts/scr_inquisition_mission/scr_inquisition_mission.gml @@ -131,9 +131,9 @@ function mission_inquisition_demon_world(demon_worlds){ } } var eta = scr_mission_eta(star.x, star.y, 25); - var text="The Inquisitor is trusting you with a special mission. The planet " + string(star.name) + " " + scr_roman(planet); - text+=" has been uncovered as a Demon World. The taint of chaos must be eradicated from this system. Can your chapter handle this mission?"; - scr_popup("Inquisition Mission",text,"inquisition","demon_world|"+string(star.name)+"|"+string(planet)+"|"+string(eta+1)+"|"); + var text=$"The Inquisitor is trusting you with a special mission. The planet {string(star.name)} {scr_roman(planet)}"; + text+=$" has been uncovered as a Demon World. The taint of chaos must be eradicated from this system. Can your chapter handle this mission?"; + scr_popup("Inquisition Mission",text,"inquisition",$"demon_world|{string(star.name)}|{string(planet)}|{string(eta+1)}|"); } function mission_inquisition_ethereal(){ @@ -161,9 +161,9 @@ function mission_inquisition_ethereal(){ } var eta = scr_mission_eta(star.x,star.y,1); eta = min(max(eta,12),50); - var text = "An Inquisitor is trusting you with a special mission."; - text +="They require that you capture a Tau Ethereal from the planet "+string(star.name)+" "+scr_roman(planet)+"for research purposes. You have"+string(eta)+" months to locate and capture one. Can your chapter handle this mission?"; - scr_popup("Inquisition Mission",text,"inquisition","ethereal|" + string(star.name) + "|" + string(planet) + "|" +string(eta+1) + "|"); + var text = $"An Inquisitor is trusting you with a special mission."; + text +=$"They require that you capture a Tau Ethereal from the planet {string(star.name)} {scr_roman(planet)} for research purposes. You have {string(eta)} months to locate and capture one. Can your chapter handle this mission?"; + scr_popup("Inquisition Mission",text,"inquisition",$"ethereal|{string(star.name)}|{string(planet)}|{string(eta+1)}|"); } @@ -181,9 +181,9 @@ function mission_inquisition_tyranid_organism(worlds){ var eta = scr_mission_eta(star.x, star.y, 1); var eta = min(max(eta,6),50); - var text="An Inquisitor is trusting you with a special mission. The planet " + string(star.name) + " " + scr_roman(planet); + var text=$"An Inquisitor is trusting you with a special mission. The planet {string(star.name)} {scr_roman(planet)}"; text+=" is ripe with Tyranid organisms. They require that you capture one of the Gaunt species for research purposes. Can your chapter handle this mission?"; - scr_popup("Inquisition Mission",text,"inquisition","tyranid_org|"+string(star.name)+"|"+string(planet)+"|"+string(eta+1)+"|"); + scr_popup("Inquisition Mission",text,"inquisition",$"tyranid_org|{string(star.name)}|{string(planet)}|{string(eta+1)}|"); } @@ -193,9 +193,9 @@ function mission_inquisition_tomb_world(tomb_worlds){ var planet = scr_get_planet_with_feature(star, P_features.Necron_Tomb); var eta = scr_mission_eta(star.x, star.y,1) - var text="The Inquisition is trusting you with a special mission. They have reason to suspect the Necron Tomb on planet " + string(star.name) + " " +scr_roman(planet); - text+=" may become active. You are to send a small group of marines to plant a bomb deep inside, within "+string(eta)+" months. Can your chapter handle this mission?"; - scr_popup("Inquisition Mission",text,"inquisition","necron|"+string(star.name)+"|"+string(planet)+"|"+string((eta+1))+"|"); + var text=$"The Inquisition is trusting you with a special mission. They have reason to suspect the Necron Tomb on planet {string(star.name)} {scr_roman(planet)}"; + text+=$" may become active. You are to send a small group of marines to plant a bomb deep inside, within {string(eta)} months. Can your chapter handle this mission?"; + scr_popup("Inquisition Mission",text,"inquisition",$"necron|{string(star.name)}|{string(planet)}|{string((eta+1))}|"); } @@ -203,7 +203,7 @@ function mission_inquisition_artifact(){ var text; log_message("RE: Artifact Hold"); text="The Inquisition is trusting you with a special mission. A local Inquisitor has a powerful artifact. You are to keep it safe, and NOT use it, until the artifact may be safely retrieved. Can your chapter handle this mission?"; - scr_popup("Inquisition Mission",text,"inquisition","artifact|bop|0|"+string(irandom_range(6,26))+"|"); + scr_popup("Inquisition Mission",text,"inquisition",$"artifact|bop|0|{string(irandom_range(6,26))}|"); } function mission_inquistion_hunt_inquisitor(){ @@ -236,8 +236,8 @@ function mission_inquistion_hunt_inquisitor(){ var eta = scr_mission_eta(star.x,star.y,1); eta=max(eta, 8); - var text="The Inquisition is trusting you with a special mission. A radical inquisitor named "+string(name)+" will be visiting the "+string(star.name)+" system in "+string(eta)+" month's time. They are highly suspect of heresy, and as such, are to be put down. Can your chapter handle this mission?"; - scr_popup("Inquisition Mission",text,"inquisition","inquisitor|"+string(star.name)+"|"+string(planet)+"|"+string(real(eta))+"|"); + var text=$"The Inquisition is trusting you with a special mission. A radical inquisitor named {string(name)} will be visiting the {string(star.name)} system in {string(eta)} month's time. They are highly suspect of heresy, and as such, are to be put down. Can your chapter handle this mission?"; + scr_popup("Inquisition Mission",text,"inquisition",$"inquisitor|{string(star.name)}|{string(planet)}|{string(real(eta))}|"); } function mission_inquistion_spyrer(){ @@ -258,9 +258,9 @@ function mission_inquistion_spyrer(){ eta = min(max(eta, 6), 50); - var text="The Inquisition is trusting you with a special mission. An experienced Spyrer on hive world " + string(star.name) + " " + scr_roman(planet); - text += " has began to hunt indiscriminately, and proven impossible to take down by conventional means. If they are not put down within "+string(eta)+" month's time panic is likely. Can your chapter handle this mission?"; - var mission_params = "spyrer|"+string(star.name)+"|"+string(planet)+"|"+string(eta+1)+"|"; + var text=$"The Inquisition is trusting you with a special mission. An experienced Spyrer on hive world {string(star.name)} {scr_roman(planet)}"; + text += $" has began to hunt indiscriminately, and proven impossible to take down by conventional means. If they are not put down within {string(eta)} month's time panic is likely. Can your chapter handle this mission?"; + var mission_params = $"spyrer|{string(star.name)}|{string(planet)}|{string(eta+1)}|"; log_message($"Starting spyrer mission with params {mission_params}") scr_popup("Inquisition Mission",text,"inquisition",mission_params); } @@ -333,20 +333,20 @@ function mission_inquistion_purge(){ if (mission_flavour==1) { - text +=" A number of high-ranking nobility on the planet "+scr_roman(planet)+" are being difficult and harboring heretical thoughts. They are to be selectively purged within "+string(eta)+" months. Can your chapter handle this mission?"; + text +=$" A number of high-ranking nobility on the planet {scr_roman(planet)} are being difficult and harboring heretical thoughts. They are to be selectively purged within {string(eta)} months. Can your chapter handle this mission?"; } else if (mission_flavour==2) { - text+=" A powerful crimelord on the planet "+scr_roman(planet)+" is gaining an unacceptable amount of power and disrupting daily operations. They are to be selectively purged within "+string(eta)+" months. Can your chapter handle this mission?"; + text+=$" A powerful crimelord on the planet {scr_roman(planet)} is gaining an unacceptable amount of power and disrupting daily operations. They are to be selectively purged within {string(eta)} months. Can your chapter handle this mission?"; } else if (mission_flavour==3) { - text+=" The mutants of hive world "+scr_roman(planet)+" are growing in numbers and ferocity, rising sporadically from the underhive. They are to be cleansed by promethium within "+string(eta)+" months. Can your chapter handle this mission?"; + text+=$" The mutants of hive world {scr_roman(planet)} are growing in numbers and ferocity, rising sporadically from the underhive. They are to be cleansed by promethium within {string(eta)} months. Can your chapter handle this mission?"; } if (mission_flavour!=3) { - scr_popup("Inquisition Mission",text,"inquisition","purge|"+string(star.name)+"|"+string(planet)+"|"+string(real(eta+1))+"|"); + scr_popup("Inquisition Mission",text,"inquisition",$"purge|{string(star.name)}|{string(planet)}|{string(real(eta+1))}|"); } else { - scr_popup("Inquisition Mission",text,"inquisition","cleanse|"+string(star.name)+"|"+string(planet)+"|"+string(real(eta+1))+"|"); + scr_popup("Inquisition Mission",text,"inquisition",$"cleanse|{string(star.name)}|{string(planet)}|{string(real(eta+1))}|"); } } @@ -387,9 +387,9 @@ function mission_investigate_planet(){ } eta = min(max(3,eta),100); - var text="The Inquisition wishes for you to investigate " + string(star.name) + " " + scr_roman(planet) + "."; - text+=" Boots are expected to be planted on its surface over the course of your investigation."; - text += " You have " + string(eta) + " months to complete this task."; - scr_popup("Inquisition Recon",text,"inquisition","recon|"+string(star.name)+"|"+string(planet)+"|"+string(eta)+"|"); + var text=$"The Inquisition wishes for you to investigate {string(star.name)} {scr_roman(planet)}"; + text+=$" Boots are expected to be planted on its surface over the course of your investigation."; + text += $" You have {string(eta)} months to complete this task."; + scr_popup("Inquisition Recon",text,"inquisition",$"recon|{string(star.name)}|{string(planet)}|{string(eta)}|"); } \ No newline at end of file From 0d8050b78c315a9209799c7ffdb784a844aab12e Mon Sep 17 00:00:00 2001 From: EttyKitty <20323032+EttyKitty@users.noreply.github.com> Date: Fri, 2 May 2025 08:39:34 +0300 Subject: [PATCH 016/286] refactor: Inquisitor, loyalty, quest arrays with array_create() (#791) --- objects/obj_controller/Create_0.gml | 38 +++++++++++++++-------------- 1 file changed, 20 insertions(+), 18 deletions(-) diff --git a/objects/obj_controller/Create_0.gml b/objects/obj_controller/Create_0.gml index cca061f4b6..ce3b3e21d9 100644 --- a/objects/obj_controller/Create_0.gml +++ b/objects/obj_controller/Create_0.gml @@ -803,25 +803,27 @@ recruit_training[0]=0; recruit_exp[0]=0; recruit_data[0]={}; -for(var i=0; i<501; i++){ - - // For loyalty penalties - if (i<=50){ - loyal[i]=""; - loyal_num[i]=0;// If less than 1 and greater than 0; that x100 is the chance for discovery - loyal_time[i]=0; - } - if (i<=10){ - inquisitor_gender[i]=choose(0,0,0,1,1,1,1); // 4:3 chance of male Inquisitor - inquisitor_type[i]=choose("Ordo Malleus","Ordo Xenos","Ordo Hereticus","Ordo Hereticus","Ordo Hereticus","Ordo Hereticus","Ordo Hereticus","Ordo Hereticus"); - inquisitor[i]=global.name_generator.generate_imperial_name(inquisitor_gender[i]);// For 'random inquisitor wishes to inspect your fleet - } - if (i<60){ - quest[i]="";// 300req - quest_faction[i]=0;// 6 - quest_end[i]=0;// like 4 or so after the turn this is created - } +// ** Sets loyalty variables ** +loyal = array_create(51, ""); +loyal_num = array_create(51, 0); +loyal_time = array_create(51, 0); + +// ** Sets quest variables ** +quest = array_create(60, ""); +quest_faction = array_create(60, 0); +quest_end = array_create(60, 0); + +// ** Sets inquisitor variables ** +inquisitor_gender = array_create(11, 0); +inquisitor_type = array_create(11, ""); +inquisitor = array_create(11, ""); + +for (var i = 0, l = array_length(inquisitor_gender); i < l; i++) { + inquisitor_gender[i] = choose(0, 0, 0, 1, 1, 1, 1); + inquisitor_type[i] = choose("Ordo Malleus", "Ordo Xenos", "Ordo Hereticus", "Ordo Hereticus", "Ordo Hereticus", "Ordo Hereticus", "Ordo Hereticus", "Ordo Hereticus"); + inquisitor[i] = global.name_generator.generate_imperial_name(inquisitor_gender[i]); } + // ** Sets diplomacy variables ** diplo_last=""; diplo_text=""; From 7a5e34c76fd4763eca678ba4fcc1d0f425136f4d Mon Sep 17 00:00:00 2001 From: EttyKitty <20323032+EttyKitty@users.noreply.github.com> Date: Sat, 3 May 2025 21:24:42 +0300 Subject: [PATCH 017/286] fix: NameGenerator not initialized when loading (#796) --- objects/obj_creation/CleanUp_0.gml | 3 ++- objects/obj_creation/Create_0.gml | 2 -- scripts/__init_global/__init_global.gml | 1 + 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/objects/obj_creation/CleanUp_0.gml b/objects/obj_creation/CleanUp_0.gml index 82d9187617..276e87902e 100644 --- a/objects/obj_creation/CleanUp_0.gml +++ b/objects/obj_creation/CleanUp_0.gml @@ -1 +1,2 @@ -chapter_icons_container.cleanup(); \ No newline at end of file +chapter_icons_container.cleanup(); +global.name_generator = new NameGenerator(); \ No newline at end of file diff --git a/objects/obj_creation/Create_0.gml b/objects/obj_creation/Create_0.gml index 1f4708ad95..a66a7e27e6 100644 --- a/objects/obj_creation/Create_0.gml +++ b/objects/obj_creation/Create_0.gml @@ -9,8 +9,6 @@ try{ handle_exception(_exception); } -global.name_generator = new NameGenerator(); - #region Global Settings: volume, fullscreen etc ini_open("saves.ini"); master_volume=ini_read_real("Settings","master_volume",1); diff --git a/scripts/__init_global/__init_global.gml b/scripts/__init_global/__init_global.gml index e1afd62310..63ef6ff9d2 100644 --- a/scripts/__init_global/__init_global.gml +++ b/scripts/__init_global/__init_global.gml @@ -11,4 +11,5 @@ function __init_global() { global.chapter_name = "None"; global.game_seed = 0; global.ui_click_lock = false; + global.name_generator = new NameGenerator(); } From 72777d4734e57d6af411e11909b923d8d979f1dd Mon Sep 17 00:00:00 2001 From: EttyKitty <20323032+EttyKitty@users.noreply.github.com> Date: Sun, 4 May 2025 05:05:07 +0300 Subject: [PATCH 018/286] feat: Force Axe and Mace of Absolution sprite edits (#799) --- .../scr_culture_visuals.gml | 2 +- .../7e323b40-4d75-4c0f-9c71-ade5cce4038e.png | Bin 6564 -> 5727 bytes .../074e27fd-1f15-4bfa-a7f0-b156311448c2.png | Bin 6564 -> 0 bytes .../ea93f36a-f600-49c5-852d-94e130eda274.png | Bin 0 -> 5727 bytes .../spr_weapon_frcaxe/spr_weapon_frcaxe.yy | 22 +++++++++--------- .../630e8d95-baaa-4950-8761-35b8ccf4848c.png | Bin 2308 -> 2488 bytes .../a09831c3-3081-40fc-8d7d-4b4f2da95434.png | Bin 0 -> 2488 bytes .../dd5c4d52-a4e9-4e96-b0f6-3da408ee2ec1.png | Bin 2308 -> 0 bytes .../spr_weapon_mace_of_absolution.yy | 14 ++++++----- 9 files changed, 20 insertions(+), 18 deletions(-) delete mode 100644 sprites/spr_weapon_frcaxe/layers/7e323b40-4d75-4c0f-9c71-ade5cce4038e/074e27fd-1f15-4bfa-a7f0-b156311448c2.png create mode 100644 sprites/spr_weapon_frcaxe/layers/7e323b40-4d75-4c0f-9c71-ade5cce4038e/ea93f36a-f600-49c5-852d-94e130eda274.png create mode 100644 sprites/spr_weapon_mace_of_absolution/layers/630e8d95-baaa-4950-8761-35b8ccf4848c/a09831c3-3081-40fc-8d7d-4b4f2da95434.png delete mode 100644 sprites/spr_weapon_mace_of_absolution/layers/630e8d95-baaa-4950-8761-35b8ccf4848c/dd5c4d52-a4e9-4e96-b0f6-3da408ee2ec1.png diff --git a/scripts/scr_culture_visuals/scr_culture_visuals.gml b/scripts/scr_culture_visuals/scr_culture_visuals.gml index 2274be20dd..380e8d7594 100644 --- a/scripts/scr_culture_visuals/scr_culture_visuals.gml +++ b/scripts/scr_culture_visuals/scr_culture_visuals.gml @@ -1833,7 +1833,7 @@ global.weapon_visual_data = { }, variants: [ { - sprite: spr_weapon_powmace + sprite: spr_weapon_mace_of_absolution } ] }, diff --git a/sprites/spr_weapon_frcaxe/7e323b40-4d75-4c0f-9c71-ade5cce4038e.png b/sprites/spr_weapon_frcaxe/7e323b40-4d75-4c0f-9c71-ade5cce4038e.png index 51f62f9ce055e37baf5930048d34addd96e1aed1..9dec60d31ea1620025de365a1641d5c3e376f82e 100644 GIT binary patch literal 5727 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 bw{&v(zj1g>eetiv0HFRzOSweRBIJJnLh|MN literal 6564 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 diff --git a/sprites/spr_weapon_frcaxe/layers/7e323b40-4d75-4c0f-9c71-ade5cce4038e/074e27fd-1f15-4bfa-a7f0-b156311448c2.png b/sprites/spr_weapon_frcaxe/layers/7e323b40-4d75-4c0f-9c71-ade5cce4038e/074e27fd-1f15-4bfa-a7f0-b156311448c2.png deleted file mode 100644 index 51f62f9ce055e37baf5930048d34addd96e1aed1..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6564 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 diff --git a/sprites/spr_weapon_frcaxe/layers/7e323b40-4d75-4c0f-9c71-ade5cce4038e/ea93f36a-f600-49c5-852d-94e130eda274.png b/sprites/spr_weapon_frcaxe/layers/7e323b40-4d75-4c0f-9c71-ade5cce4038e/ea93f36a-f600-49c5-852d-94e130eda274.png new file mode 100644 index 0000000000000000000000000000000000000000..9dec60d31ea1620025de365a1641d5c3e376f82e GIT binary patch literal 5727 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 bw{&v(zj1g>eetiv0HFRzOSweRBIJJnLh|MN literal 0 HcmV?d00001 diff --git a/sprites/spr_weapon_frcaxe/spr_weapon_frcaxe.yy b/sprites/spr_weapon_frcaxe/spr_weapon_frcaxe.yy index d8a5fe83b6..eb43e5f7dd 100644 --- a/sprites/spr_weapon_frcaxe/spr_weapon_frcaxe.yy +++ b/sprites/spr_weapon_frcaxe/spr_weapon_frcaxe.yy @@ -2,10 +2,10 @@ "$GMSprite":"", "%Name":"spr_weapon_frcaxe", "bboxMode":0, - "bbox_bottom":247, - "bbox_left":31, - "bbox_right":116, - "bbox_top":89, + "bbox_bottom":220, + "bbox_left":0, + "bbox_right":83, + "bbox_top":67, "collisionKind":1, "collisionTolerance":0, "DynamicTexturePage":false, @@ -16,14 +16,14 @@ ], "gridX":0, "gridY":0, - "height":281, + "height":231, "HTile":false, "layers":[ - {"$GMImageLayer":"","%Name":"074e27fd-1f15-4bfa-a7f0-b156311448c2","blendMode":0,"displayName":"default","isLocked":false,"name":"074e27fd-1f15-4bfa-a7f0-b156311448c2","opacity":100.0,"resourceType":"GMImageLayer","resourceVersion":"2.0","visible":true,}, + {"$GMImageLayer":"","%Name":"ea93f36a-f600-49c5-852d-94e130eda274","blendMode":0,"displayName":"default","isLocked":false,"name":"ea93f36a-f600-49c5-852d-94e130eda274","opacity":100.0,"resourceType":"GMImageLayer","resourceVersion":"2.0","visible":true,}, ], "name":"spr_weapon_frcaxe", "nineSlice":null, - "origin":0, + "origin":9, "parent":{ "name":"melee", "path":"folders/Sprites/Marine Viewer/weapons/melee.yy", @@ -63,8 +63,8 @@ "playbackSpeedType":0, "resourceType":"GMSequence", "resourceVersion":"2.0", - "seqHeight":281.0, - "seqWidth":201.0, + "seqHeight":231.0, + "seqWidth":181.0, "showBackdrop":true, "showBackdropImage":false, "timeUnits":1, @@ -77,7 +77,7 @@ ], "visibleRange":null, "volume":1.0, - "xorigin":0, + "xorigin":7, "yorigin":0, }, "swatchColours":null, @@ -88,5 +88,5 @@ }, "type":0, "VTile":false, - "width":201, + "width":181, } \ No newline at end of file diff --git a/sprites/spr_weapon_mace_of_absolution/630e8d95-baaa-4950-8761-35b8ccf4848c.png b/sprites/spr_weapon_mace_of_absolution/630e8d95-baaa-4950-8761-35b8ccf4848c.png index 6d60690ea20ef51fb0fbffc2accc9bda77b28d8f..782831f20ccda9cb3f5a02154e108ab47bc3df04 100644 GIT binary patch literal 2488 zcmd5;c{Cf?9!||rW39Ggsj*br(j^nMhoqFMrBqQ{>_kZ$iqsNYtw9VeRo<~w5X-2o z6|t+58dXIlmLarii6E(wP*S{f{&?rScg~#m*E{Fkd(ZiP-}k%U`Q3l+@7{Db&Kdx~o&^9NCIbL_eCZ(r0C)fa0GM6? z0JH!Akhx#fe#?-b5c09QZVEX3K1;i*asdG0S_@NShsZxR=&;}!$5U@MtwQXy0u1z$ z#AMABn;Blp&y0Lu?5ResRH_^4s)#qkUTH?Dl}hF+7mpAA?pPXd3)GkzV2(ejw!S5% zA(sJ-$yLu?fggH$X(81fKLIP1@V;0J@C*Mhhpg7*j>yOD+0|&lpajH4;PKupGckgh zpRo2jIc}GL!P9UU$igD0zj1i1oS3SgEWhkLC*AM>W`{9e|1L}*F3wLibJ1CI^lm4w z$>pu6?Vag+6Fbb0K<6Nm8+^28%?mNdVz?ZH)=J>NM=9G&mBw|5;NT0zs3})nci?^1 zpeAQM+OwiX`EQse1u@%4CRph^bfobO1amj0WPh=$)^K)i6P>I&HI_~BA%H9vVr=+73YpVw4kt-*Esut$DEa#Tf|I}Yr%-tGsM zp$;%|ZDl!xu7}CTm?R_K$s`w<^~$Xi_hwC3jdONmSRnm#D@ATPu>HdY&O+zv+R$7T zvnz&Oz9F&v5hzYFEw0tcv5=P+A4`*AXBj#?VvJRom(7sYaP7UAwUU4URmW;TtRyxw&QlW>%1TO zDhbWhnm>TiGA2YkD~x{*45w`Va#MypJIm@`X5@etp$@{rqjG@n&~$>bW%A6>a^^>hn|GM!Nd9L|W79 zz&YIE@{9|fzj;h@eCE2ZsC^Y2vm@(o1{5N)X4wXLM?;{+^}{jY;Vqj&-BB6d z;ESrwBWl=Q618US++00rw%f}ICa5cpiGxZCQP5#{O4)kq%3RapLQU15nF(ZPq0zSX zM)d4zPvjS(UhL2kptwfV)gA9PX-Reg3Y~uv!gTmt9&xk8@Nx65aybT@KlHjW8OW^r zqK9ual|uDXFx6G#fjVw0r&vkWKwhTJ9yKD4!+8AWbI3%M2RI+QwQPNG5CJ4#!2%J? zUrV1V*s6@0xrk|>zFzGuLHMh29YYnE{0GURnNX~4SmgGNv6o*dI_=XSr;HiorWHEu zr>B&S>=M#1B-*8fz&dnBneF<5)R-`iXlrneEcFp&;h^pArV*4ya&I8>9)r@~R-XDM zR(7X`2&UBaFZeX&`EXQ2d*_s2SmHxavVJ7uLYhzijTY*MDg| z$yJj1`Fp%S?c&|tSL5TmH=?xkFNX`uRc@Z6f2U z)UvJGYXuQXnhRafUd=3%FF60dZ+|C~k%QS}_sp#}4x;YTDx$p~%#@S)uk`vu0~n0v zcX@2h(_;-4PRz|cVSV;Q*WPa4+!;0|Cg%Cp)|S#47&{s{275`D>>px+3s^`0`aFDH zJT#1Sehs>1?#Sn7FxQ+he%=@))Hf8#2f$^>W$jB4{?c-QXh1bIq1u`kAP^`7qME+j z_-_VuuwS5m)ZZKIsK#P^gWA6;U;@#|FpM|){@;59d%ecLpVH!*jcNT=uf%@>s`Qe& literal 2308 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 literal 0 HcmV?d00001 diff --git a/sprites/spr_weapon_mace_of_absolution/layers/630e8d95-baaa-4950-8761-35b8ccf4848c/dd5c4d52-a4e9-4e96-b0f6-3da408ee2ec1.png b/sprites/spr_weapon_mace_of_absolution/layers/630e8d95-baaa-4950-8761-35b8ccf4848c/dd5c4d52-a4e9-4e96-b0f6-3da408ee2ec1.png deleted file mode 100644 index 6d60690ea20ef51fb0fbffc2accc9bda77b28d8f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2308 zcmb`Jdo8R8m5@q)TY5Gl&#IU%+|;ylySd?!Gsyx-OjbCh}uFj1|ipS znPG-eX-sq6O5-}HMp2VSVho8nqrKKy=bW|nTIY}RzJEO5^*-zQJkRs4_g(LM)y~#R zPIkX60044GYlMT?wgA8uDQPLO(uieui_Jk_YX=kn#2x{F&ZK8v%Dc8F{siw4m?;4-S)i2?U9@U6b7wQ+`+iHC1nCMXx}rmae&9i z2l8X8U#)XYCbOFs`}^lC#2NoD<8etaPt|LRk81sVba1Py6T~z3JM~n1`dO3;&szEt zT9YY-6J$Kj%7?QRJDzx?k*iAy0k9CE(@RzCA5*_xlc6LW!(QvIhj+DRTEK~~my7C! zD@&udiFdTyOa=0Yc=_oOa&?~qMUwaxwV#JeYwP2gDDR)Wr+=4kC9)+`TD7zv@tOSm z>ihh;a}8xfVR4;Dt1mn&m3^W!1@goWxooR1quC`jWcfHe+(G`FN9FBsL&SNuHVABE zrh@m`U2`X+QmMSeH~5mZ^!HSW@pu&aWW^`z7rW>WqJ@OQ@u-xxOW1vpz;sTKIj!-5(k;@k<(lZ8k0d&6W;_9N^5?&l8)n{Ku9k z7v*jsnoY=5Rb4Rk+q5sijN!c+pi2t6uYKFs(ztNI;A#*hwB7D|M9MUi#Ka%!rUxKg zEJNIrS;{g|$b#B(&$E-YW*u3p0}}nzHTKZ#fyo+&3f^M9#Oq-uTd}@H8VXz9hqpTKC@BTwj8-jBZ`Tjo4Ah zy@Iv$@?vOP%_EMAYxBX0)z*+I(;G?J#%SKmI*KD5^$$FCnTGF#1#&}Z5YJSaS}7?x zyv7TxPb?4o`X?+fz&(vyhizCwsRz3T_L$)5xYsO_!VIP^&blEl(_#p$w-%K&Sn!m3 z+ccLhjI?}&X)<2btLPaNP?eM)dOPna9FOWF?{TAI8t?PnhKHh$(k@;aCXV18DyQzL z6!yaHV7yq6kMm?U*@)f8xv@v%9%alOEr;Xi)y(+z0lOrd-|zIAjiZF#`HE>jcaK_I z9ip@{YCw2ko+9C)R>SHF{yK=^+0;6uk2#=+aV8YsoCdGJussPp`#T>(X=k5|ZY<`{ z;@qT2Nlcf;=I7&1Cb% zx>Ta2Z$B|ZyI?3n=R!ss1yk3_A94cOb~N>Ny(@#5clRpVOFNtt!kayk2PMHD^@YC( zc>5Dncgey%3*)LZ)Vc58l?(iOSS%Ks*1gkTG1xi>RW;DxALfpqo14S%+n z{f18~ZF{w|AfyVdJcW0U>Nvq1Z&Ap{HMvZ_{jD-`<1~ilhUVGoob9?PuH4epI&bJH zM~7g=i?Hs>A2!Yyc#_vkzn`_zYI!*+$#hvLoPJqmwZNaGwYIlk@9F9JeSynh)0n+} zioDFsuC6XaL&HpFHiXHcgipWi%D5a8V@M{BBCT_3VsG&HJM3t^x_YsR5g}Z-%%z3XuO_W8qrb=ElmQeo zq%=oO2e4S#Yvw{Ty2xfZP+1GYE%P0fcIAd*Rb~f8%4dY8sUtxI&`%kAZAsRb#mb6g zoeP%d$XeuTg0yVqwTpg$H~CN_FjC{CrJJD(h@wc$G`piNB{QK4HOsxVKNvNh-ZrrqVr;&m#%Hm znn`>T_X`S$`TGDv_-+Ytfabq4L Date: Sun, 4 May 2025 05:47:27 +0300 Subject: [PATCH 019/286] fix: Grav-Cannon sprite artifact (#798) --- .../cbb0ffd1-9108-4578-8690-2b8c6fc3c0be.png | Bin 11016 -> 11028 bytes .../1300598b-ffe2-4a1c-a7c8-7db8b3078acf.png | Bin 1072 -> 910 bytes .../234b02f3-1afc-4539-ad33-93955d6e0288.png | Bin 0 -> 10701 bytes .../4c68dd2d-a1e6-4382-b7bf-d242a78c6b49.png | Bin 10729 -> 0 bytes .../a14db8e2-fda1-4cbf-99ab-1f40858bdedd.png | Bin 0 -> 641 bytes .../spr_weapon_grav_cannon.yy | 7 +++++-- 6 files changed, 5 insertions(+), 2 deletions(-) create mode 100644 sprites/spr_weapon_grav_cannon/layers/cbb0ffd1-9108-4578-8690-2b8c6fc3c0be/234b02f3-1afc-4539-ad33-93955d6e0288.png delete mode 100644 sprites/spr_weapon_grav_cannon/layers/cbb0ffd1-9108-4578-8690-2b8c6fc3c0be/4c68dd2d-a1e6-4382-b7bf-d242a78c6b49.png create mode 100644 sprites/spr_weapon_grav_cannon/layers/cbb0ffd1-9108-4578-8690-2b8c6fc3c0be/a14db8e2-fda1-4cbf-99ab-1f40858bdedd.png diff --git a/sprites/spr_weapon_grav_cannon/cbb0ffd1-9108-4578-8690-2b8c6fc3c0be.png b/sprites/spr_weapon_grav_cannon/cbb0ffd1-9108-4578-8690-2b8c6fc3c0be.png index 7718a4de25edc86befd6666e61b4adb97563e75e..bf51f1fbd175f8b875ba07b91fe653ce6ec4558d 100644 GIT binary patch literal 11028 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 ZJIDY19Kq&_3UCfYQC3Z+LdqoQe*ix4>ZJex literal 11016 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 HDWM4fs^be3 delta 762 zcmeBU-@q{;(U)1-)5S5Q;?~<+hW$d05^N9h^^UkmCnqLlC!H0Id91&1@3E$Hw~j^J zz7Z%PeEYY4`O%NYI=T8rVoZlNZQy1%+HwB!!FM@qM)~_@-t3&X(Xjr(gi9-}8LCh4 zUO!(HGe33t%Q;g&JbnK@TyNQHeeL^8U+Z7}mTq{idigsBlM}p-tMj+qQadim^6AkP zS%!ZCZW=Bhm(D(yeQQnT>K_~9YS>@y*=m|Rn|BWH>obdv@6ObkYry?{;i@-*9Lge2 z5(@+8SDsWxBppL}WA*t`7vVVB5zxM;EVpsCKPONBEdj{bsMNHv-@G+q<|NnSB0!pO9CF zz_Dv;@9o_F{Mq>b)?5mB|4)6N>j)9O<0h zu|KqMKCk>PXNm1M#5^oa5_1B0Q~syz`5tmLYGUr5JF6xZ$Ni3fwmfCkd(PR*=6%-8 zx?FY9u`uVs788EGz^^Z&wtD4pFJE=S?9h(I%N%sWFYMa9Vnb(UR`0INSL;@ZZgK7K z4Yu}6wGj#qnq0_~Kk)z;&x89vc>nai?eVzsao^-OOj6>;x(4PUhGtd<23AG}+Cb94 oAg%P8#bjA#ta9QSc`cLum}Ql*=yS03k7fV@Pgg&ebxsLQ0A68gWB>pF diff --git a/sprites/spr_weapon_grav_cannon/layers/cbb0ffd1-9108-4578-8690-2b8c6fc3c0be/234b02f3-1afc-4539-ad33-93955d6e0288.png b/sprites/spr_weapon_grav_cannon/layers/cbb0ffd1-9108-4578-8690-2b8c6fc3c0be/234b02f3-1afc-4539-ad33-93955d6e0288.png new file mode 100644 index 0000000000000000000000000000000000000000..efc82ffa18ece5b9b8bd080942736341e5b1640f GIT binary patch literal 10701 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 SRTa1g@ie^1!F)0CdY8A}dh5L( z@Bf338P?2v^WE>>bN1PLpBtg7EQ^gnh5>;?KS^fJeri^Uj5_S}wm9D+|K>Dx|K;7mM#f3T2}J-ETG0QiLz@9j(GL+hHst3h z;}=xvF_kHGLu~O}s-ytQ(B&EKesx0vaXfUnXyk8C|LY+njVZ8exlQ~ze~2y~Dhi6K zfx+jbCz}*HkVyYHGg9<1yciiZJw43&nSMTWY2QD49xKfk^Q_Q&>97vDLWHW45=^3~ zC$VzKLso9${&Zw9G*2Ubn^b)TudC|RrgX@$@h->G${JN^8}X$ROGjJOkb=+4ex^Xs zpp$z_TeT{cqox6cg0t8nNoZrySXfz!cReve1)SFZUZCqdZN_4ewR3RzG-cOSzu=FV zJy`!$lqg2#Xv#7h0kZ2M*k|!FEj`_Ndz2ZUL%EYh?HiQ?2ecaAtHgM3&MU*}wHg zpjg1&dE9-r8L4IV07E=FPFQf1O37GHN8ymw;>p#&g#}nv7Ug+?d>J$POO@|KOe`!c zi$`9$nq8r6viGghIci=)l-gy`Xc&ysU5)KBG#SxEQW6Oan1O+TkUb|Zbkyn<2?>dq zo*sF$3@tdOXJ&M=8WM_9WT)4{e}1@d&}Jh7UohL~j!Dd+uf2PW=Xo$61MYzq4~>ch zi=*?+U+tpTNRV)jf>9b+UxBE{Xvpv_$e&RRiv`H z`MHvk65Ku`!`jZSV|A5|z+qS?v5-O0boA{|h0l32Q-9*KISVsHJ4eUvjt;4=A0AE5 zH8nL4eVVPnD~E?%;CqJV=Rbe@M%}UE9RB_9!kokF#-=9ondKvXh>@8YGUTuglk?E8 zqUG8~B78TWLs~6q`3-T;Y`g64-k!9M4rxzM&%gP3gGw$fFfOy2=$ng!Fe)@W+5R>-G1;DnyYkFY(%7v!1#K+TNgwQ&E3QVG28bz!tTQ>GHFLg$4E^xA}+F+<>^}6 zYQNoQu5Of4)>{utr?G5VsV#!H5c7znvw^z`tcA&Y6-a+Amza!O7b z+%Rpi!4Ig6>kRi2!YLU`8|UG{x2VYo;Zf%{uvhpcdW2$Bn0eE8=~i*uL@3E_RG4}r z!o6es)Gfkq>vR0^*1VL@N!_R)o9Ncnx&+n`mi zr=TF5nV!arkXpRBX{dD*$PAaFu{#d@`Ms0r?7>`7b`^HIK3{7~3|TB|b~K)u3Ahr4 z2}@hB1w*vNEM178Z1sG5fC0{SNp_ zeeRe@@SoqJwxcJ*Gcje+fVDR31Fvuq7SAkC0NY%OkL2 zB3$0mDkU+kO6glRFOE#o;B}`iH4F5%sE#Ihz^y(|n8_oVU@(Ahx#FAFordamxiO99 zCLohVNIC6I^IE-%P}N{ni#AbI#C-9?zGf3x9$dF1S zxhYlmbhSurGwOktgJ#?!w}@{|p+k1b0#ai79DE;b?iURCQkO58-5cR;6g>B&VrM zQsVaJ*n-JC@gT`>cn=h~NaHX1@-S~Ty+82u6|*Op_i06MeHxTEp?1#tcz>1PvC`sq z;}uZz(sH2GjywN^fIg~%j%`Ik77b6@Tl)*e7wAo{38AEmS~&IEp0!He->s>86U}!z z2Ze-r1Js$yVKL;dmwP!|kt?g&awh-%`%-V7;6YdTv`9MRS@ER=2bDDg z&ZAHg)miSbp5CI`n}S2X#O#i>5Yg_7k@AA!Fyn4RpGtlLF#7rh#)0MW@{GSgbpxp&f&8?6i2?@|3k6A~^?Qf5p&{oDC9K=~88s=r^ZDtiSj9w6 zNr~+iZ3L?})07;+J7<5HG|T)2s053QMOh~rm#g4WsxUuE_P*wT<<3@vshKoax|WNG zbrc&S@Gkps@92bFoR$K)^%@;)IyzRc`F=n3+IkmduQH!xovkjS4w%F@!Xn)W&v|b~ zS2>hCa<(f^%O^#NqtQREmm^}=So=jMii>}&lq{y+OYc$-@QsL0$ai8j8{p;)g=>~T zjrXQ&tKpqsXmfLO;2%3|;);phU@iIJcSXw4r8pdsG?d<}_^C|VzC)lITlO;&MH!Fe zD={M~FxI&(oJ?K7KHefhi~zsd%z;@5iRzS&(omJjD3lbvT%a?!qI!;6tgY0Kzt!Jd zNX?gkC#~O)=OfuDJmG5ooJ-;5-9)KQd)ZfLN$2IISL3GhHg?k=3Es-Dt;6KmwJQeR zYl)>-l?MMppMF=@_3($5B%;zOgiY+QJ2a54X4f(pt>fU4qKaH|UabMdVCZrpo9JIF z>DP+3Iqe_7sMg+e6OiUs5cJ5Uriix@-Nqd&q?4g?9?@eXq7ZNk|ES`h41Hb(W%ZP= z^b^U(70HHute@F);-`?V$=ba@3=G(1E|j9eV>0*_K~s)~=4ex#+b zF+_DDMs>#3&_{Ke+`h!bqpK|j(Etf328(n>w~=ZsDrnfc0Na_Upe4a#G05pOk#BMo zxxH!#(To~|%s;$o{gvx2bXHL#p>LN9Eycs{zqn-EJoDL4`pX#ZEHFwZga1XZ3-F-a zJt_F;79t%{an;P8ez<>Yw&y*d-y!YB(b3Ug%gV5iyeI%mxb>=-z-(RM>|I!L`a8^Y zmp{sbf{1Xtg!@tT*T3wC+YL-rpNP*HtfESDiMA81gn7O$TUBh=yyiWxiL2NT|I&@C zKvoH*GqM}h4Q%jpHa(h_JenHJeOF>AzGIm${`)3bsauAJi~#rqzxy^}KtmQZz5i2E z5)l~1Vkfa-NWVqArn!z8r}a|TinBr46ZIEZrTt9LmN@;7Fh@s6zcx0KE%@KCD`$(a z&u~^VD@ZeU(w9qcbQ~0%SPl%-WZV>gQQpRVAAmjq7hViSQ;pQ^_$w>Q#m)EX)u9i+ zEndywuxDOYDIoCk>&WX;Z7AnB*x27{Yc=@{If$a1F?))uhXa30N=gC}8^#oA&7M2w zAnWP*dLe7ziRc?( z(XdVJu^*UaQ3Ocq!`;EVa$ZWw-IO1JsWE;A{S_Z%)ljT&0@+zF8(`mA~ zx3?BLJ3r4s-kuiK+hI}j4QMtbB&5qV&X4HL1~9+`ztz_h^Q9}T*D*)vP&ZVnj*YsB zzGm$x4bty9lRFl3H!&LQsD|BSa$;ek3FS*Ev*UEfw3fZvG=oXciDoM@|6QAAWZzL`Gne1WTL^e9t911}XEQr~N*=I`O$ntUy9m_Ap1y*bA5~un3 z`hCgvk6Sq^Cr~CRKF)T=3U_ zi)(<$0VJVKk+V6Zs*2m8Q#ng0Vtw5LC@}q2|4h$Gu8Rnb1Q4!XS8K^tK$_|QbP~59 z1u~M0i!0#sXB_|CYWx+6knoIygEj8T=FJ2f-e)z!??40q-N-rEU+i9`jYUgK%kO(x zX(xDdd%aU(I+!Iaw5R9T9GWTUNrQ*>+osm#wQPP}R;S6**i^EizmA6sDlTP6r%B+% zj`3AV?PBk~_& zO&LF@b)ZqHDV3F#g^p~k3V#R5o$Yr{8qm@I%XvknMVKh+h*F~r8Wr}!p9COXlgHjN zfv)HNEPTd4;#gr}+;mS7nwbc7^%HpkGOhnk-p|j^3Mlc3oi!-W(L#8&XOX#?MB@2* zY6by=(KgWD`HQNoFz?(_n6F0bKq|F=5W&M!e>ONfk*w6Il$(YsdKn z9oafq!|Tbzy16D#S`gpMol%7q6=4ep8&DoKnVvn7@fI`5@yX-&Z10%}gZeEbLHdE^ z#-QT_XEy5!dul_F1C%5O4lZtQDYolA(wDOPv}m{Ap0|}$v_v*G3hd4|lLt{5 z0igoKx|ppkt7idQ311E(unu-6dXpm>-FJur^3tJsZpsQ9$*i4?IJFV@DbMJ>;8E@{ z6_uBNn%P??qHpN`i_G`tO~lcW^OQ)8Oz`_A4{<_i{a;@A?(Xhr$cUBNY?1cxhzN88 zceC+|iVECss%VceWn~or;skCM)M@hP?&iYWAD*AjFlom}A>@Tu(R`k^yR56L`_p}3 z+Cm?NBt|A7Ik~_Ni7INUW^^Oh&A)*r^V!Sn9km>iz^QBAnm7>Xg~i2fD=^W4Ck*y4 ztL*`9086Am#WL&V>3-7zBE(~NGIlsABPHc`M+Y*8!LM*|xwlG62myArUjYmO&7z^D z1(wxxtXLByKcEr+w%j(iw*CYnp;DnCrlqBM%@3zC4jas_?OMJ{ef!h%z@Udu?5U+m ztl+n|4DV#Pt515LePgRaW7Tu3RUJL>O?~e2N=PWWxR^!6hhFCk7$V7w7u|pVqHS+) zo6))^$Q%LV<97XZ>z|5`ceap4=<)g9jMv4S=aNf$ku!92H?WiVQO4q{+%f$RLFO6;mue)|?6b13Yuag5IvKNO6tX$~j&PXL%r4go;N z>SwUQYpn}|rWstUq_FOxnHfw#(gEbX;^RB6qtiQ6n3l=Z;??Yo%0v8p;h*fE?aXVW zjg2gt)vt@HU1vGyDzb%O7V|CPz@1c!5z!-+GRg7b!cY-M?pB5LgXS2UOsvieBEP7Z z@E2rc%l7i?lt#kE0IHrndsbbQ3ol188VDU49!3PANWiFkSh)+z11Q{?nVI^zV`F25 z09uBuIz~qmN*UdOrVQ_1;Sry<<9n;DTzxi;0Evl-sSZSAHRjKdLDlyEB8>fEVij-R zRAj4ugTLo^L^?V_`iSj$&;tGC691A^bMu`D69!drl5* zP9hs8r>qcV*v#H1R(CWM~5lfZ+4OOjX4_X4`xzUR?fN(Y&r+4g8UDlxpn_+!MilF_}I zO4;Y$<{MgSNnOIsw>%GEq&`lXAm?j&r+VOQ>4b@Hm+$c4 zMxzUymXtSAEy3e+{xa#A;TJZAnZtm>#76q0|0Sp8NV)^?f z6o`{R=Hw4+0$&kB1E>p_di@{Zb3Ck53k$d)Le9@UUcGwt7loj&b#=5>o8_xWZ;HzG zmHtF^Rdh1P`!*nLxOjP=06((~I61ORgc9cF^dK;~1q31iez>x};phMRBy~6V?LEiy z6QAo-Yc~%MPv^X;WG1pNhV4I4mHV7u^tIARuVXfkF6zL5a)<;qK<|@SF2F663kbktZEfx0mG9>Mz6@|?pm8zIiH!uH z(gKt0^9#`d+V(00qz~u2OZLr0Ma-uc7m_7o-)m|Jnwy&efO1YMj89CQXod}Bya@(X zOhZG%$i&3t{z*Ywr#ix!P8aOnHnt~-8m$PC?eJS619#-kcv*X`?Zn|~yb29b)E|o) zV^H!`M6T#iP*D-+k_`M$`d?Q$E{O0`;7}%(l$J)oWO z4C9g7nNtVY=(X5XRB_6az@S5IC+Q~Jx3K+c5l z9zQs)`F-LIaPD8$m7zK@L;AEVA!Yq#J$cX>UML-HVsHN#S5@vi(AzamblJg|gF@|d zczShq;!K2XAOIl&75h13Hr@&AR^VRE<90LT5%m1T;IUS!5z*&E%tJA zzU84z_EJsia{38k9Ta6y6>cxPMLz+7i~7PhU~i`WM0^^Y z(a{w{?tFLcZdI%MpJ`HKfeo4)ptbNZ1_paMR2@YO=!Z0wF+H%*aVUlUhI)af$GmbW zumQK4vBTOyIEw+}GTpHSJ-N5D%*@e|Q%X$=04ikFp58T8uRso+EeV5)ewBV@b0`PT zvXgEgQmRi)|3n^_uH&V!a3)`~8~jAy=*s*}xf=tq<78#v%|+IS{WpLx+s)KrzxbFz zqWyP08@N1n3oV%{N-j-vkJt3}egonS7{ZPJ!Vn=X+g#+S?LI0xXBv%t#5>LAnKHxX z`KjT+cmFpsf&@(9nz-S~k_KJ)=*t0~VEr{vx*{&?0Y)U)H~HTQ1WcJXOCFp5ajkYc zk;7$6C8_yN#!ZHW0xtQy1X|X%)|*`AcjEyxYpG!?CCJ!%hq<;Sc0E-!HR_#N=cYN( zR9Vave3UwaSxy^i5Uq?d#QR$9lTAM~9 zl>HGsV`Ory=uN9gD22SfG^p})LsJ!L3tg);sPOlwt{BXpJDCuo`P0Gqwm$G-JWd?# zds@>LLRQh*aJ8Qvduf-aBP#7iT#H);*7T=TO@I@!l&cXUpp$>(iapIcxOp7i#_8= z!Z0H;J(imFWn3ppyFZ&S&Y6y& zC(xR)XR`BNE7-eJHDS2of&k#Ar>D8zyn!>`@!)>~@;@d9KAw+CRTBw%bHM2b(+XUv zS%vCUGIdsFG(^y`x!T1mO3dUe)?;%|a^lZuF_rAE(M&*8%A;*SiTBZ0CM|MzaqemT zVctuW@|K}gx0WT(m5~sm3eCB}00ykY->Bi)f}Wpm2v}KJ)j*GNYs-4J$rBgky>&?e zxT;4}W_L$wT3TB$Dy|V135b>U2{%uE3Q*`kHwhg2h3X|y^(>D*?Y6(6O^-evMd61SL;S4U>bTuvma!DD|leAA`D ztFq|RCzMBWkC~g3g9KtK2yUie&B$O{tLr@mwYESfZyp&L2?kVi%1Mx_70s-nay2TC zCBm@*lj8$vg2Su^z01}t{46N2<8P+$hx6ZHxoam301rp1Xaq)r^T+Q$E(qnyvOohO zO~(aP7m@w3m7}k%t%g;Zg-m_ENLw6dCPi1eU26&)&mA!mf=FsS_Nido%;}6edU{b{ zX58G|4&TJSO&AV$*eWi-38R$`>3i*cvH$+DR9+sf_!>iD-Ly54xWcD+5570&d#^0h z3p8~GpiJrMmZYi}Cdk!p`>S$2Lh>bJk%0Fa0gMAwLReTBNCh!4&{t&Gu*9_4KW)p) za?(s^N}oS}KBn)PS~bod3 z5)lxUl`6f1g;rQZM8t0UqC#0({lDIDMN|qlO|xH5ay#z#e&J93C@KcdFkB(P2 z;Ap4k=gR=}E2r#y+g$i59vj>x{P(A~S0}&NLDnf}3UqF0jgOCi|Nb2jB+9KeQQqx( ze>xk7?LMwBugKO$ux?3w=%qAq${LG|&fkygk`yE)zyJNi%iaJTwwTCB43LT-Wd48# zq}4K9xKO>-3@m=OAsnR`_WASjDm>oT+NEM5-BC!xgE73g$@zp{C!hh1Cm!a)$CPBk z%R5uG<(o$u;Uas-DO+F4sK z<#@$CzkM5B+6=#qv(sdzGUiPct*WYu)lxwUgy@~nF7R*&b6Zq1HAK_&xHqYPXyo_K zf8MLF>P@JvG)8!8x-GrCxhbc!2H$c!P7IywFeU0<2LpX%W#5Mi*=QN0){|!e^(`(b z85$Z21kLfkZ1hoMw2?F~LJYp*CCXDC{G42<$<$jGNHiSwO$mMLZ?4P6cXg>BhPHmJ zHx)`lco_F!K*{#Hm#MC{_R+ZZ9nu7fza#a(U-}?`LEr2DNtwg%e2riJe3x*G9Lkr`tO_Ro*8SshGiMS@R99 zs36Q&IHExAwA<9ukYMqYyveS9_7XZcO4W7iXmO^|s>vi}bmg`f&d$#6yVnlbO#6ji z8Fc=0dgjz)yBO9T&+jzO{Q@Y)i3wD3JOHMT><&2JK%^fz7Y?iOB_<|5wif`Q28}Ha z{hw6tsdd~xx~VbmS`a0Df0rw_(ZXL)H_E6=*C82(vos|8Vr}Gmu3~xB0bohMIF>!x z-rZdtNzY9h-8nm^M|3$;97r-Bpgpa553^xkxpiF6Bgl;mE!-yPMLGh7*H?VlO~R}~ zjOzD9JxI+s^jP$9aN+^rp}>a>HK^F|hl8Z+>+4&bZ~j0+PHxIdOh(obG4om5GjcLA7a~)>Z}UH$kpQ2s#>v{>cgPyw^C-BaC$7XwZt?4+qUONJ z+qWbf$QH!~I0%Yw+s4TeRo8H*L!4;A2j(mKJj}Jz)6?8DMGif=@FRdJ=k8;M#52oQ=lF33Sthd9}QW$wSrz?S&+Z><1jM0@)}4z9ZW zguUFbHLK})xj}OzfUaYA-rT6URb4;xAhQ_*|0{Ey+FDSa0LK@}cC12{FU3=s8e|eV z{U<5((-}~%ET3)W@z3o8nSxil=wPFOvqvR2LH23WX$>$CX(pFEB8@mLnL!UL0dClAm%Smy1ZF6BDki*0s7Pb#Z}W5U}y3+tlxQ9#w627S-crN*h%iF&uu!~zuUudIhvgM z{S6zL+Vf~BH$_i={!RS{*pBpss$8!gr`~blQ~Q#bwDgnlQk`H{t@6d4iq>_t1yG8B zQC$jUWAWU_xr7W3;4-sajTQ?R4A9YmExoOkI)JW*i? z)2nwd26E(=PtWYr7ruuGki`hbtVQbU_9d>CD~75?srT>Si$i%xuzX!;n43rhdY~Q$j-OlHN9*5$qThnpyw%hHJib+Jq zJZ%dpbk*wSB6D-|OK|rvFnS0i%kNwV(9nd$L~61a6R^Q(mSw)l6ZV|p@oro1>`l1a z!B+vdlJ)$jf+%Y6A74o;JgNDF<#z^Vu^l=EN?>!#JrDwjkUIOBE@FN_;qAmA^^tIY z`Q+ZjAqA9R@wac^5}JOd5jV@#aO5}wxA(gsn}I0fBannYpWV(Z+$Zgmb%s&;pn=Kl z0wfqLEAZg!OWDM#I!$6V)f^XEn*W)qq9clJLEnX{h~8=V?l){4F8)Ef-BS68_+|6Q z)Gu#Wg#v7gyEt?6h+cM9R!J}_&{}=GIf$zMZ`26QS*gO>jnRSv;Ba{`Qy_%i zld1VOB;bE@fwsl)akj2vFw;srDGedFZ}FE8(k6tqVKV}!r(j~|2p|qZ%84RIP(W%b zseyFjCB2r!6dsES{jAf;k>b;i?^Ws!jS{zU$W?`Q3I_WsBAL6fPI2ZTgEwTYxmr&O@>k={*O z+s(|_&0N6L#T-0Ac({0Y*|}b_bG_E!<`dxJ65!!t1&>@@7VhKx|LX*MM>A^+@BjM* qVkQT$?-IiF-&b(6wl{ZmGq!j7zt0g9R?!3JK;)&BrOG9Yg8l=gZI8qN diff --git a/sprites/spr_weapon_grav_cannon/layers/cbb0ffd1-9108-4578-8690-2b8c6fc3c0be/a14db8e2-fda1-4cbf-99ab-1f40858bdedd.png b/sprites/spr_weapon_grav_cannon/layers/cbb0ffd1-9108-4578-8690-2b8c6fc3c0be/a14db8e2-fda1-4cbf-99ab-1f40858bdedd.png new file mode 100644 index 0000000000000000000000000000000000000000..1b7c35222a4dc465aa688950f2d7bc92cf4ba1f9 GIT binary patch literal 641 zcmeAS@N?(olHy`uVBq!ia0vp^kAe6F2OE%-^$hL@QVPi)LB0$ORcZ_j4J`}|zkosw zFBlj~4Hy_+B``2p&0t^3o8Z1bJH*>FCA!lyC6<3*{qp1OtE>muE0r@&Pd{b7bG6EZzgJlq^bc`3hJ5_B zEHe7^ti7vVeAen(61jP1;d!R?)N?%dU)u%$tbSi0_jQ_WuYr>QP%Vcti(uV~rJ3&M zDj!zgmA7ayyF1TMH#Z{vx#f4w*7HgvI-0i1Kde^IX3^F>U$epyXpw4(YeY#(Vo9o1 za#1RfVlXl=GSxKzBI6JvLn|W#D^oLV0|P4q1NqP9XHhid=BH$)RpQo=x30ess6hj6 fLrG?CYH>+oZUJsRmb=%j19{)m)z4*}Q$iB} Date: Sun, 4 May 2025 06:42:13 +0300 Subject: [PATCH 020/286] ci: Add debugging to old release deletion (#800) --- .github/workflows/release_dev.yml | 38 +++++++++++++++++++++++++++++++ 1 file changed, 38 insertions(+) diff --git a/.github/workflows/release_dev.yml b/.github/workflows/release_dev.yml index fe36d8329a..aa32251903 100644 --- a/.github/workflows/release_dev.yml +++ b/.github/workflows/release_dev.yml @@ -90,6 +90,44 @@ jobs: echo "tag_name=$TAG_NAME" >> $GITHUB_OUTPUT echo "build_date=$DATE_TAG" >> $GITHUB_OUTPUT + - name: Cleanup old releases (debug mode) + run: | + set -euo pipefail + + #— Produce TAG_NAME earlier in your workflow: + TAG_NAME="${{ steps.tag_info.outputs.tag_name }}" + echo "DEBUG: TAG_NAME='${TAG_NAME}'" + + BRANCH_SUFFIX="${TAG_NAME%%/*}" + PREFIX="${BRANCH_SUFFIX}/" + echo "DEBUG: PREFIX='${PREFIX}'" + + echo "All releases:" + gh release list --limit 100 | awk '{print $1}' + + echo "Releases matching prefix:" + MATCHING=$(gh release list --limit 100 | awk '{print $1}' | grep "^${PREFIX}" || true) + echo "$MATCHING" | cat -n + + # Only delete if we actually matched anything + if [ -n "$MATCHING" ]; then + COUNT=0 + KEEP=10 + IFS=$'\n' + for TAG in $MATCHING; do + COUNT=$((COUNT+1)) + if [ "$COUNT" -gt "$KEEP" ]; then + echo "Deleting: $TAG" + # gh release delete "$TAG" --cleanup-tag -y + fi + done + unset IFS + else + echo "No releases to delete for prefix '$PREFIX'" + fi + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + - name: Cleanup old releases run: | # tag_name looks like: branch-name/date From 30ffbcf27f1e8477126da4a57a921065172a98aa Mon Sep 17 00:00:00 2001 From: Luke Van Epen Date: Sun, 4 May 2025 22:16:01 +1000 Subject: [PATCH 021/286] fix: Elite guard trait not working (#801) --- scripts/scr_initialize_custom/scr_initialize_custom.gml | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/scripts/scr_initialize_custom/scr_initialize_custom.gml b/scripts/scr_initialize_custom/scr_initialize_custom.gml index 651729c4d2..0aade9edec 100644 --- a/scripts/scr_initialize_custom/scr_initialize_custom.gml +++ b/scripts/scr_initialize_custom/scr_initialize_custom.gml @@ -2798,8 +2798,13 @@ function scr_initialize_custom() { switch (_role) { // MAINLINE case "tacticals": - _rolename = roles.tactical; - _erole = eROLE.Tactical; + if(scr_has_adv("Elite Guard")){ + _rolename = roles.veteran; + _erole = eROLE.Veteran; + } else { + _rolename = roles.tactical; + _erole = eROLE.Tactical; + } break; case "assaults": _rolename = roles.assault; From 0c26ce5795e06b44d742c490fc1aba3de2334288 Mon Sep 17 00:00:00 2001 From: Luke Van Epen Date: Sun, 4 May 2025 22:17:02 +1000 Subject: [PATCH 022/286] feat: Flesh Tearers (#794) --- ChapterMaster.yyp | 2 + .../creation/chapters/icons/flesh_tearers.png | Bin 0 -> 12874 bytes datafiles/main/chapters/34.json | 1277 +++++++++++++++++ 3 files changed, 1279 insertions(+) create mode 100644 datafiles/images/creation/chapters/icons/flesh_tearers.png create mode 100644 datafiles/main/chapters/34.json diff --git a/ChapterMaster.yyp b/ChapterMaster.yyp index ea1fa47894..fc43a26f14 100644 --- a/ChapterMaster.yyp +++ b/ChapterMaster.yyp @@ -136,6 +136,7 @@ {"$GMIncludedFile":"","%Name":"dark_angels.png","CopyToMask":-1,"filePath":"datafiles/images/creation/chapters/icons","name":"dark_angels.png","resourceType":"GMIncludedFile","resourceVersion":"2.0",}, {"$GMIncludedFile":"","%Name":"deathwatch.png","CopyToMask":-1,"filePath":"datafiles/images/creation/chapters/icons","name":"deathwatch.png","resourceType":"GMIncludedFile","resourceVersion":"2.0",}, {"$GMIncludedFile":"","%Name":"emperors_nightmare.png","CopyToMask":-1,"filePath":"datafiles/images/creation/chapters/icons","name":"emperors_nightmare.png","resourceType":"GMIncludedFile","resourceVersion":"2.0",}, + {"$GMIncludedFile":"","%Name":"flesh_tearers.png","CopyToMask":-1,"filePath":"datafiles/images/creation/chapters/icons","name":"flesh_tearers.png","resourceType":"GMIncludedFile","resourceVersion":"2.0",}, {"$GMIncludedFile":"","%Name":"imperial_fists.png","CopyToMask":-1,"filePath":"datafiles/images/creation/chapters/icons","name":"imperial_fists.png","resourceType":"GMIncludedFile","resourceVersion":"2.0",}, {"$GMIncludedFile":"","%Name":"iron_hands.png","CopyToMask":-1,"filePath":"datafiles/images/creation/chapters/icons","name":"iron_hands.png","resourceType":"GMIncludedFile","resourceVersion":"2.0",}, {"$GMIncludedFile":"","%Name":"lamenters.png","CopyToMask":-1,"filePath":"datafiles/images/creation/chapters/icons","name":"lamenters.png","resourceType":"GMIncludedFile","resourceVersion":"2.0",}, @@ -514,6 +515,7 @@ {"$GMIncludedFile":"","%Name":"31.JSON","CopyToMask":-1,"filePath":"datafiles/main/chapters","name":"31.JSON","resourceType":"GMIncludedFile","resourceVersion":"2.0",}, {"$GMIncludedFile":"","%Name":"32.JSON","CopyToMask":-1,"filePath":"datafiles/main/chapters","name":"32.JSON","resourceType":"GMIncludedFile","resourceVersion":"2.0",}, {"$GMIncludedFile":"","%Name":"33.json","CopyToMask":-1,"filePath":"datafiles/main/chapters","name":"33.json","resourceType":"GMIncludedFile","resourceVersion":"2.0",}, + {"$GMIncludedFile":"","%Name":"34.json","CopyToMask":-1,"filePath":"datafiles/main/chapters","name":"34.json","resourceType":"GMIncludedFile","resourceVersion":"2.0",}, {"$GMIncludedFile":"","%Name":"4.JSON","CopyToMask":-1,"filePath":"datafiles/main/chapters","name":"4.JSON","resourceType":"GMIncludedFile","resourceVersion":"2.0",}, {"$GMIncludedFile":"","%Name":"5.JSON","CopyToMask":-1,"filePath":"datafiles/main/chapters","name":"5.JSON","resourceType":"GMIncludedFile","resourceVersion":"2.0",}, {"$GMIncludedFile":"","%Name":"6.JSON","CopyToMask":-1,"filePath":"datafiles/main/chapters","name":"6.JSON","resourceType":"GMIncludedFile","resourceVersion":"2.0",}, diff --git a/datafiles/images/creation/chapters/icons/flesh_tearers.png b/datafiles/images/creation/chapters/icons/flesh_tearers.png new file mode 100644 index 0000000000000000000000000000000000000000..fcbe84d98d214e4b06cc9fcab15d1a40e5caf3ad GIT binary patch literal 12874 zcmeHtXH=BS((aH41SCn8EC@&#a?Uw}WKbA}0fr1imLv+2gMa~)3?hhRk({#x2_jjN zWJH1>L2l#TXYYO1{nonctaZPCXNc2pcXfAlRrOO(O_ZLFDiHxK0R#deQdd(l0Dt2y zf1tSFcl6z#`QT4mfT5|E0o<3#-P6qu<&0$V@^?ovA^lKx5QyKDi=I4LI}@~FKUzi} zn@FZxXk9C0c-7bFag?@i7mitlyu(F<)qz9gn>T4bgoK}v=GX#_ithD0#Sbrg1JNk2FH(1s42ZSS6_zd5ugbF{ia`8mF6XtKcs(NQN(e%(e9mwP_xEY&nsl5@ix>855HML%gH`c z#dx%vAoh!**4ERgrKdcU)=({;@$71_uM_2~S2KBf^lSd*+X)^_@2^zRzB> z-*fu5bb!%gVA3zz(#p)QpR?ti;CtkA^yAxepAgw>LC@MF(u_G^bUr9xT&CJu5(qaJ zUbwBB4U*T-#T{531R^Et=MG0WA-$MvkoG87X_jyG%`8kPTWJ;(VQqeGcSWQFN-e+> zc{@PI5E0;n5VvKKl_8MwlK=u-kX~>mKNn|Lw1l5D%Wt_7;Qz~JJ{G3mUA&y6SxmL{ zm=xVSkxW9oLcIJu%6=#x0TvkoCMi!_I|&0Nl|My*chW2lUS94Je0;vXzP!GIyl$TM zd@ylwaXx+lJ^=w9(1Qo<@9G8j<8ei^UW)ibh7uBu@I<+Lq1;@VE@i@P+`PS{Sy;ex zrhl!^#a&zbFY&JEKeYh#!RH5e=Y#R`^SQY2{c{A`OW6kq`Ex=4;|R1N@KHVkB-+i} z6MI9KkOnz{4*hF2EyXV}sxkgTeWE5HLZwpn$NgogfVU4^ir_XfL=c0(mJ4 z2T`z^{AA)(^t=>iAGiE@G4 zBl+B2?SDVGRJeq^p1L%P05AXFEqcyyFFP;*_yEe)*3B3F_aj4;3-Y!X{8FDVQ6XVr zAu%CQK~Z55esSTyI~gNA(ZCijrNa1m1;u_pxjYyNupOXU_@$)+0l(Y9ZX^^vk#H|J zPeV61XK9wpMKN8D{Ohqca41{27hDPMg#<$R1%xH|g(L)o4PgQjfW@QLL!rU^{=b|4@TuEKk3Zi1@zxpj+nJb{e!GPP9P!5%&~P85 z?eBF0S${l2IKW-)ksyBjX|VrlNBs}RAOaJy6%~OC^6&%0;t>);zGDH`WcS@_)$NkHI>JK4aLA@#&1-@f5@IS5@U!VFTWC&wTtC!;%up;Oa$G_ zW@?M`Bt>bYQZP}Vn6vYe6a>~Abqg{pkB(IPaQN5+UkfJtXL2Osecckb&-5*QH(^f4 zpNnfeE~^^`4gD;o4T0%mK$xuCj=yhq#nK>TKhHOtvLu=IuXsk4DCP9@53Sz5eH+ny zw%7mu@#Du9kctnZ<37y6hvO#AVj;iIUXP6#K3B-LPBBp7M8=k@{`%xteT$DTVfMWT ztKCTQ%ce}N&_WE`C+*_{9B_9}!B z+u9|g_Z_=y$D%)nZpPW2Y`rnf7qq?Y`%>JzykC94Og`b6QiVa06@-MbYP6&v$PlBU>52T_$!JnO{2A)>-r|odqW&k&%&VAt4v9=saDJ$Q#p*_l`KeHS7F|?9Gp0MN5@)S(H~*=Oj+$D}@C}_DO~U+!h8HR-DqY)C)tlOoM(;b>#U`b9 zCrA{Jzww!t7+2nYrGta@EPqJpjajAL&*Yilj8!uoop_(wI&VqH@jGOjR3*GUqPn)W z_H4=66k*Z;%poc&%3oey-fB{VO&81E?{OB|-TfIQDJk=)gHYTrR}IeFHz}MqKb0`9 z3(}xhKltBePnPzu1QrRbKq!Wi_l(5FYrd@e(dI;RdU|@XQStbj+LnDOF#49Tun`>t zL$LeT56=am%t4R?Olyl0TIn`E%lDsBj^sI!W@ctZ{=n+-z7+O93_SbZO}Cl+PHL#K zr>955#KffeoqhZ9@vX>&gr}So1nf}E(e8Lu?8Z%Q?%boDS#Cli{GUr5QRK2#@7>`c zo}Qj?gwaxR4!)EOsSh}GRJwbYVSc6qh3Z-Hq@4E;DmJ0`Dq=gVzl=W8)`p z?$rCxP1VV7@!K5lq81hwRu5*e1iX4|1t_Vhj~O9835V4sCH8k4{9xvpJcMy7?LT&A zPdPu-Z$Th2Sy@@q1mSJAO2qjosZXAaT%QlBNg&zd_c$4NA&zdZcAD7Ps9!a5na;!V zYo{lDt8lt|g({d%+;Pmb{Iih2EgFPg@pxoRoOW>HW6$xvzM{59M7RE3=>S46Z|@bc z_|ba}BO?Y)9TLj(z|_faIEaBDH9Z6YFc&I2#O%&$|s<- zfr)9t#IWY{>|$GIXJ>28NBD0u#g$g4rp|N6P(AeqUgz|b_fFkCKfm`eor}Cbe0;7u zvyokmQd+cibJL}#r+4I#pO-U1f0_H~P8bkOcrSJ2hqx5++Vh&$g zT#JoM0;akrd<#MNl;hxd^|py^5lu@i5jhw)8^{w;kE@W&9!Spa?^_pjF1pn+2#e{j+rx!_e5)Qa>5*| zr&LrWEx2up7yO?*PiYYm^Q$Pc`XN}fnxW@3gVxg0YKp6_9y|&B)!>g_v_V{Rns|Fo z+Y&~ZDg_1)@-?`RtG}ke`*EoqaZC zgc_TRKUJeMIAF#52hLRGkhm{A~7Zgl$~=!p@Fst=IYp>#UUYsW26a9(bJOx5Ejm zi=5p0`fzp90`sv~Gcgz@2E@dK*c9rmRC4n2kqbNTNfdTJ2o6PhCkX`y2lqELG@Qt6 z1rgB-^#rdT&4+xvmG@lKZSDoTx zphpD>42u8siN}J{XKncY>FLhNZCz<$*YAs+qiJbE{l=wt&ohdPi{pBe!ZA}YSCo}| z!~$p)s=xI?NJnaw^?cHhMX+#3bRf^_inxHJ19&x6Pd%PgGR& zV?ST>nPc)}yXki>X|FN@ieA089g*gmr|~ON?rJp6GW=cx<(J=EM`y)~&P;P)gF9kL z=KNq3WflB$#XxH6VGDYsBWh_dQ#Qn|FNJe6vr4$#gTBu9o6PLopsQ=+{Hvv)!}md_ zKD$}+4;td8^Mk|A`>Fjhx|0qwnFQS#l@i`?Vb&(|%+-Zl8@w(7c}V@{Lw1S+3HI{p zYB9l;E9Ano+T}_t>*KZP)p+0vmUr;2Vqws*&><1mK({6P%yVc~1I&Z=dyaBUL4d!% zf4h=AH4`6?;@8q{<^Zj&t{h7ol%>?xRIS1-GCJoE1?+uuwP^cIotF|sc`2Xlu57TB zblAWoe0QX1TIRZnIKD@cvflM|cMs*%c+Qm`!NS2w!&b8eyDNrupEBxId&|D?r}%{j zOJb3oHjSg|L4iScFj7R)gw9V6H?=sG2NH~n!xgd%uRV%|<+8^;Ay9)hLw=YlkVI0; z`?%k%A`sVV)KAUL&CO{_)h`X$n5ZdDuCK30%gbYEYiq|v#>dCkd7KB-hKDPcy=**x z)|B!&Y)kS44uK+X zTJB#=v#?f2up|a<(*{PIv_BS{B`<hzn3wbayZF`k13!d5Kb%vv)h&S-BB5h^yLZ zLa6P|7^)a-dHytf7D7E#wVISK%|rYwZ?Zo3BC#0$uU~&@|Mp3e6gw1WVfV`v5!8HcE$*UQo#we##P05Hv`R6DbW+Nb zCqBKVmS}krrbcoim5rfZyDaNimK)3TLXN^WpY^Jz&CFOHu8+Q|sS-k+ZEtM_(Drjt z`0MSaW)WP^+ zDlP_jy*)j8TXT)~gds+ni4l;p=?Y~3kf7ZMzh3Gsnl4D3am=$}ep7zT0@ar^Sc+Yx z9L#*YFwR2?a&ok8iLurAN@W~-TxBJCVyQdf5f8W;W0RA~VG)J=L)044F?yc2s0k_R zwk(o27>TiskzBTH={ky6YApwwE`FWr-I1MtCaTqyz<4nVl;EbDF2d6?H#g@XA|&3Y zm+}Jhu|-kM)egPX`!79L_>$f0{WH43m6{Ad&5;W_S%n^el9joj)4Rk_sQZH0paZnM z$Vh7=F4BBG`_$VgE6dOQ>=u`%Ms@*3*H+MN4G#c|pkqn0qYfhnTa#!2t~lCE-dg?) z=J55^%$?4&4K-j_9Lbi=C@U_BF=}s__YVy-X zBj14L&C`I11;I}crz99NJe|lqvwY9Ys3A6vE-z6tZn}?l=bt5!Vc#xh` z8jasMDef@eNEaDN{W7KYy7#Hw-Me#{0g`0iXPG@+QvqYY&QC*L$cFrqLvRox2r+YS z_6;cOuUUFV7sqaaO;?7;^RodI#*GyO>sgVzTbq1@WaY4NhZj+Y8Nmb#=}oSd%Q z#!#ikt|kz-9~6DrPkW$V@Mk`%eYwI(9p{`K@<0uX_<9rH)Dv@S$UpW zQ{c}$kS6d5T*Kd=7yXc!oQC`J4vIXWoBkG!qIsa!xDu^;L)XX%89*y&j5RMvAgozBkBn=!2qp(tl(=aUlC@S9W`Hbi#z{N%N0c-}#{F8Y@{VMn*q-4~_KF-N0(!o^01f6RxwPX*e)E{TR2(fl?+4kRB`{zXoou;4DN=(xQWmx%m<$p}ZlsQBU^Kjf|ISmfezhM{EX+uaS6BuY~yL@3$ z@8jYIVSq$Hp0$uJo`Rh8LqcqsW4K2W_xxgy_V)H* zjc-Ye!ne(Od&_P;z8@-7`?Os#^x#DMfKHNl5R#fLvS4m*FWA_;67vUFwo;>E&G#A~Z z`&c2u#LCZ~U))xAh%USl2NJVfSnAjYLnekTPG?~Q?I?ZV8+Pb}Cnl`YJ2FBIl$g0L zVM0pTdR_w6nEa40IMEGwy-XEfwXs*J6Mgn^p^&7gKH4tozW)AxN40h~GWB=rGMxE| zD)Y){+@Ioxlg+hH-ztif2Oii?}uC}l)7?aNq-suGyo(yp9`V;DeegpIeAurtNcl-iN?PQOJ9+?&x~m*Rd1t7%$%$I^7+yNK_ z9Z1SjBDfr}Rg$ign_SP#=Gn`iY+cRPFV>D0N->zJMRWL{{@AvXTJ*%)jf#oU1UT*P z)}qN>f5w)AfG&+bkRfa8>NYz^UgZi^C?0288o5R?Ou4=%*OK)=O$KRLm0GW}OQf?s;?>{j(sNV zz}ISYEsOhU|M$((W`orI2t2Vr3%qH^h&q)4g@aH9HJ^uxwZ zk3QNT+>Ctlrj@3gJm0vOl$JIi=x}3P7DMdFJu(~S@NH{Ls+FmeYdnXE6NiUpY*nrW zqvyRJR)ewA*eO0&DuMk_Mx!WTK_n*_|A$Uy+uUeo5$=s)vCC`~Jne>>FRP z%#La>D*;z{n}a%FO1`f?7sTfScipv?ptF*5HH4j44_*IL-O8F8(H=Ywa|ZE{JE~3% z;>LRMkGJSaSZ_^${K8f>fq@9z!t2yLL-x{lb3{md-o1-&3^-yy73#zN&BVFB&AFxa zyrGs;cjb-EZ#UPbI$2z_>Aa7HC(^Lj$IY1fBz0xtFp#J<)MdJcZ)fava%;iQ-souN z9z&8E1!D?0q4L!{rdXOl<~sxWIO^)^G=K#Qc3J9*TlF@hAZp#sR*Yz}?&&7&BZw~Q zbl5D6Z2No)eD~HZBH#ET*2Y^xY|9&T+{TuJLqij6*!OT33h_}H z$5t6^8i$3gIXH}QnVOo?SgPW8QA3$~1_q26WCD-(!M$6+|3x%tthA}j&+cH2im=w^ zJ`C3%WmYV~H}xS)OsHb??g9m(o+F88tApH?b7s1@}u- zbv2yviDpsnsAB_83#ys~doJ`7nIa0s*#wBheKa70X7t+Dw9|kKPyg7Qo|w<-w}fJJ z&@0j7DGWQlnh}VE-&9rN@5<7<>Aw4=wS9A^G9@25I2Q3!YLYp)x zL*3+iO<6~eb#&IIYJ3F^<3wk=Hb-A245e`1{t8fP!@UFdN2Ky>l(`pGoJ>k%IeDbe zM>1|a;f=*tp54cm!)JC!qsbcq2rRDm50Jnrb0Hmh|Ngy~NI{b@w%n_XxwVQP!XzUC z!U@=r?X6fi+P-b7tH7+^j#lAC600ilv9I26ZE(=(Aja^z2P2)R>&)0C9ZM0V#JU-v z^OEG+HSf*WuQF(zZ{=mj-WQ0rM9~I67rJ8H`_o~^I6B3B_hQ{CHUKGet0Uq$M2=G# z@Q(fp3T;t|U%uP}oZ%wxoqEayYFJx$_w>CK`x;k8Bd%+k>zmULs2;|4$H5&39DZ>t z;A5yNIm}mI$+)m1Z?m$*(8+pvMb?Q+>BWK$celsx!GYJo!9gH$ z=Di0Xn=Y^2vN8yQFct=a;p(qsXztShgV%<%h+CNCQA*VODEgC-pStcZ^2~l@-=tVMWF-oo}J|?#tr&6-B-J2?o2Ptl#_R`z+!6$bd{BHBmt|e z4blBDGdfvK&2Jq#3Qz&ZIFj&6nBHi-LZU{#xWQ|oimWU-UT9dZ5)0|XvPYF|Xqh7p zX()NN=0y`zV?Fcvlod(8zmUjoH`dzwJ>?IR6*RmrB@{Y5zC?OF{iUj`d@b;O@VVDm z`D|8Y-sHig{Z)`#|KvC<%TCDwuCJw?REa>#dOJV2FWvjSX8O{tR-rnhUoqo5i z2Zv`DjI$A|GL@IN?*2rVeVM`k%=ZFn{3xj1F{DUFu_%F}_*~S@7n^?OzPOchm?oYt ziM}>Q%y)$nV^%gcTW+k4KwSw<+WRBR0Q<{KlvvcbCM1ijtgL*lv>!TrY8CA7ZEim0 z0uis~V(bA+liUChn~{WMxKfxU{~-xU{DVmH*7BEhfnBi=+k0N=7Zu7O4Fa~~1QLrh z)U)2b&V9lUeTc=1U8PHP98^WQ)O<$W_=vc~v!u4jDb|cfUxSpC)Wa80C#AU=+S-i_ zXi#Ng#0AvR*R{1{*@>4D-dq6y*kecyac}Z#ob%nOqo4${JC;mQL%1MJ6e*aVwS?iX z*VXFLc;ZP(YEAxEHntQ(OVdOpYkb_dHi`HyUM(z$LTB*^Lpyp&Z8Wb$ijO*os&Xm= zcGq*XK>PL)NPMzicQXbp9)EXotWFybHRuCe_u4~za+UR*8}anwd+AKj57u(U8Ta-3 z3Yqvzv|2Sr(5C9f4BWkah`q<2T~1Z82KPU145gD*ne+62_%PPg=sJ6KKv^TIzW$UB z(9bu7JF-(MfQ6eHz8p3weR8}idr_-jJWjjCW}rdC2Q^Z%xww(?Iw>611;TXy;NYh- zr}l^={qexMN$c+$k8gZiSza!5imXJh4rW5uJTdWT_^n%p!-qH|j9`w7*JAPA=YQoCG!n<)CpQb!AmbC}O z+&>BM^Q@IhH`qW%t6~dts58Vz8Kpd}+>4I3N!3Wzh4z*L5>Zn_<1tW?ZN7RwO7>z; z(^6QTLFllts?Wz6g+di@`l!0`R_sa*fg3P-e}9kI>gQ(Z2kxhQ94esZMjD!vM$J># zI>D94$;&$^lB^=y23RhqcW(2+!JzUW2o_0{i{N3)w*Zbn*LAMJ zU!2zL%cm5FYq>1EygP51pmxS%iqx+Si%!;Z6BIrw9crj(rvYkbvX6_)Pf&P61rCRE zg<4a8_V+GXY03leg7ZUFAuFW<)GuQQH!+I+X1*}aNCzd=wa#bTX>|)6&`vGM88ytrG`xn@05&tA>s1(ZRgH@?$eHJM!+Hf zlA)y|C%*^4r6N8)zNmkOuLpR!tb2{vSq#wQSy)&sE-dK#e`&dI0nr$cNKXug!CUTg1F4DBh;Ufj)0b|-S11PS+Zrr$0#a`0-nHh@7&B+P3z{KLqDk7f7H5zD~;tdA$ z(Ga7~+DJG*NZV9vi(_I|$s?-fnu1Oz_x3#PxPS);JlE<1Afoi-^mGU^T&=Jd z;w(vP&);>W|B&?EX~;Er?L{_jKllQF1Ua11)I{tHSpRwYjs^dW8*FUL=fPW_*SDu@ z7{x#&odj0wo_`Iv&jLQA!@HzYnRa;O{;0z=dXP7kfI&PWTlLP;9(D1h}KMTu(a3 z&E=I9)Tg&*`~DWy9?nm1neE*Lua|-)hFs5^n=jH&9GYKB`Zn<-_nO{TgJi5u&Vqel zJ=1@>?B(f2U*|U8bO#_w98j$k_LiwKE=B@IIxXaEi4hO-!FBY<0IX zmzRf=MddMHui?OJ!hS$atty&^x(FYvzi}+g z9-X7RI4tE%ex+qL1un1*z;If}GK1vo87R4)0h1Pl9IV^Gc4PROOq)RonCkjJqx?0|{cPb^uR1}m2O3KR8#|NXjl^9#1 z{p7Puxcu&ych|Yk?w1e{TgX5e>lg&U?b7(z4PiP^#ed(1QZRb z?eY6oJdFU>JXz6v$`Uf!Z1tds3j=*Up2p~{_*8(8rS$Oy<*1-bEN6)=_*e);U0Fxz Jt%7yf{{dJ~)P(>5 literal 0 HcmV?d00001 diff --git a/datafiles/main/chapters/34.json b/datafiles/main/chapters/34.json new file mode 100644 index 0000000000..2cffceccfb --- /dev/null +++ b/datafiles/main/chapters/34.json @@ -0,0 +1,1277 @@ +{ + "chapter": { + "mutations": { + "betchers": 0.0, + "catalepsean": 0.0, + "secretions": 0.0, + "occulobe": 0.0, + "zygote": 0.0, + "mucranoid": 0.0, + "preomnor": 0.0, + "voice": 0.0, + "doomed": 0.0, + "lyman": 0.0, + "omophagea": 1.0, + "ossmodula": 0.0, + "membrane": 0.0 + }, + "battle_cry": "By the Blood of Sanguinius", + "equal_specialists": 1.0, + "origin": 2, + "custom_advisors": {}, + "load_to_ships": { + "escort_load": 2.0, + "split_scouts": 0.0, + "split_vets": 0.0 + }, + "company_titles": [ + "", + "", + "", + "", + "Death Company", + "", + "", + "", + "", + "", + "" + ], + "id": 34, + "chapter_master": { + "ranged": 1.0, + "specialty": 2.0, + "traits": [], + "melee": 7.0, + "name": "Gabriel Seth" + }, + "fleet_type": 1.0, + "strength": 1.0, + "extra_ships": { + "battle_barges": 0.0, + "gladius": 0.0, + "strike_cruisers": 0.0, + "hunters": 0.0 + }, + "extra_specialists": { + "assault": 30.0, + "veteran": 0.0, + "devastator": -10.0, + "chaplains": 0.0, + "apothecary": 0.0, + "techmarines": 0.0, + "epistolary": 0.0, + "codiciery": 0.0, + "lexicanum": 0.0, + "terminator": 0.0 + }, + "extra_marines": { + "second": 0.0, + "third": 0.0, + "fourth": 0.0, + "fifth": -100.0, + "sixth": 0.0, + "seventh": 0.0, + "eighth": 0.0, + "ninth": 0.0, + "tenth": -100.0 + }, + "extra_vehicles": { + "whirlwind": 0.0, + "predator": 0.0, + "land_raider": 0.0, + "land_speeder": 0.0, + "rhino": 0.0 + }, + "extra_equipment": [], + "custom_roles": { + "honour_guard": { + "name": "Sanguinary Guard", + "wep1": "Power Axe", + "wep2": "Bolt Pistol", + "armour": "Artificer Armour", + "mobi": "Jump Pack" + }, + "apothecary": { + "name": "Sanguinary Priest", + "wep1": "Power Axe" + } + }, + "squad_name": "Squad", + "recruiting": "Death", + "custom_squads": {}, + "points": 0.0, + "names": { + "hchaplain": "Appollus", + "clibrarian": "Luciferus", + "fmaster": "Alfie", + "hapothecary": "", + "honorcapt": "Barakiel", + "watchmaster": "Crassun", + "arsenalmaster": "Cain Severan", + "admiral": "Tanthius", + "marchmaster": "", + "ritesmaster": "", + "victualler": "", + "lordexec": "", + "relmaster": "", + "recruiter": "Akrasiel" + }, + "flavor": "The Flesh Tearers are a Second Founding chapter, created when the Blood Angels legion split up after the Horus Heresy in accordance with the Codex Astartes. They suffer from a mutation in their gene-seed, making them far more prone to suffer the Black Rage than other chapters with Blood Angels gene-seed. If no cure is found the chapter is likely to be extinct within the next two millennia. The Flesh Tearers are also ill-famed for their savageness and thirst for blood in battle", + "founding": 5.0, + "successors": 0.0, + "splash": 97.0, + "icon_name": "flesh_tearers", + "aspirant_trial": 0, + "purity": 9.0, + "stability": 97.0, + "cooperation": 5.0, + "homeworld": "Temperate", + "homeworld_name": "Cretacia", + "homeworld_exists": 1.0, + "recruiting_exists": 1.0, + "recruiting_name": "Noctae", + "homeworld_rule": 1.0, + "home_spawn_loc": 1.0, + "recruit_home_relationship": 1.0, + "home_warp": 1.0, + "culture_styles": [], + "home_planets": 1.0, + "flagship_name": "Victus", + "monastary_name": "", + "advantages": [ + "", + "Assault Doctrine", + "", + "", + "", + "", + "", + "", + "" + ], + "disadvantages": [ + "", + "Black Rage", + "", + "", + "", + "", + "", + "", + "" + ], + "discipline": "librarius", + "name": "Flesh Tearers", + "full_liveries": [ + { + "right_trim": 7.0, + "left_trim": 7.0, + "left_chest": 11.0, + "right_chest": 11.0, + "left_thorax": 0.0, + "right_thorax": 0.0, + "left_arm": 11.0, + "left_hand": 11.0, + "right_arm": 11.0, + "right_hand": 11.0, + "left_head": 8.0, + "right_head": 8.0, + "left_muzzle": 8.0, + "right_muzzle": 8.0, + "eye_lense": 22.0, + "right_backpack": 8.0, + "left_backpack": 8.0, + "weapon_primary": 8.0, + "weapon_secondary": 8.0, + "company_marks": 0.0, + "company_marks_loc": 0.0, + "right_pauldron": 8.0, + "left_pauldron": 8.0, + "is_changed": true, + "left_leg_lower": 11.0, + "left_leg_upper": 11.0, + "left_leg_knee": 11.0, + "right_leg_lower": 11.0, + "right_leg_upper": 11.0, + "right_leg_knee": 11.0, + "metallic_trim": 7.0 + }, + { + "right_trim": 7.0, + "left_trim": 7.0, + "left_chest": 11.0, + "right_chest": 11.0, + "left_thorax": 0.0, + "right_thorax": 0.0, + "left_arm": 11.0, + "left_hand": 11.0, + "right_arm": 11.0, + "right_hand": 11.0, + "left_head": 8.0, + "right_head": 8.0, + "left_muzzle": 8.0, + "right_muzzle": 8.0, + "eye_lense": 22.0, + "right_backpack": 8.0, + "left_backpack": 8.0, + "weapon_primary": 8.0, + "weapon_secondary": 8.0, + "company_marks": 0.0, + "company_marks_loc": 0.0, + "right_pauldron": 8.0, + "left_pauldron": 8.0, + "is_changed": true, + "left_leg_lower": 11.0, + "left_leg_upper": 11.0, + "left_leg_knee": 11.0, + "right_leg_lower": 11.0, + "right_leg_upper": 11.0, + "right_leg_knee": 11.0, + "metallic_trim": 7.0 + }, + { + "right_trim": 7.0, + "left_trim": 7.0, + "left_chest": 11.0, + "right_chest": 11.0, + "left_thorax": 0.0, + "right_thorax": 0.0, + "left_arm": 11.0, + "left_hand": 11.0, + "right_arm": 11.0, + "right_hand": 11.0, + "left_head": 8.0, + "right_head": 8.0, + "left_muzzle": 8.0, + "right_muzzle": 8.0, + "eye_lense": 22.0, + "right_backpack": 8.0, + "left_backpack": 8.0, + "weapon_primary": 8.0, + "weapon_secondary": 8.0, + "company_marks": 0.0, + "company_marks_loc": 0.0, + "right_pauldron": 8.0, + "left_pauldron": 8.0, + "is_changed": true, + "left_leg_lower": 11.0, + "left_leg_upper": 11.0, + "left_leg_knee": 11.0, + "right_leg_lower": 11.0, + "right_leg_upper": 11.0, + "right_leg_knee": 11.0, + "metallic_trim": 7.0 + }, + { + "right_trim": 7.0, + "left_trim": 7.0, + "left_chest": 11.0, + "right_chest": 11.0, + "left_thorax": 0.0, + "right_thorax": 0.0, + "left_arm": 11.0, + "left_hand": 11.0, + "right_arm": 11.0, + "right_hand": 11.0, + "left_head": 8.0, + "right_head": 8.0, + "left_muzzle": 8.0, + "right_muzzle": 8.0, + "eye_lense": 22.0, + "right_backpack": 8.0, + "left_backpack": 8.0, + "weapon_primary": 8.0, + "weapon_secondary": 8.0, + "company_marks": 0.0, + "company_marks_loc": 0.0, + "right_pauldron": 8.0, + "left_pauldron": 8.0, + "is_changed": true, + "left_leg_lower": 11.0, + "left_leg_upper": 11.0, + "left_leg_knee": 11.0, + "right_leg_lower": 11.0, + "right_leg_upper": 11.0, + "right_leg_knee": 11.0, + "metallic_trim": 7.0 + }, + { + "right_trim": 7.0, + "left_trim": 7.0, + "left_chest": 11.0, + "right_chest": 11.0, + "left_thorax": 0.0, + "right_thorax": 0.0, + "left_arm": 11.0, + "left_hand": 11.0, + "right_arm": 11.0, + "right_hand": 11.0, + "left_head": 8.0, + "right_head": 8.0, + "left_muzzle": 8.0, + "right_muzzle": 8.0, + "eye_lense": 22.0, + "right_backpack": 8.0, + "left_backpack": 8.0, + "weapon_primary": 8.0, + "weapon_secondary": 8.0, + "company_marks": 0.0, + "company_marks_loc": 0.0, + "right_pauldron": 8.0, + "left_pauldron": 8.0, + "is_changed": true, + "left_leg_lower": 11.0, + "left_leg_upper": 11.0, + "left_leg_knee": 11.0, + "right_leg_lower": 11.0, + "right_leg_upper": 11.0, + "right_leg_knee": 11.0, + "metallic_trim": 7.0 + }, + { + "right_trim": 7.0, + "left_trim": 7.0, + "left_chest": 11.0, + "right_chest": 11.0, + "left_thorax": 0.0, + "right_thorax": 0.0, + "left_arm": 11.0, + "left_hand": 11.0, + "right_arm": 11.0, + "right_hand": 11.0, + "left_head": 8.0, + "right_head": 8.0, + "left_muzzle": 8.0, + "right_muzzle": 8.0, + "eye_lense": 22.0, + "right_backpack": 8.0, + "left_backpack": 8.0, + "weapon_primary": 8.0, + "weapon_secondary": 8.0, + "company_marks": 0.0, + "company_marks_loc": 0.0, + "right_pauldron": 8.0, + "left_pauldron": 8.0, + "is_changed": true, + "left_leg_lower": 11.0, + "left_leg_upper": 11.0, + "left_leg_knee": 11.0, + "right_leg_lower": 11.0, + "right_leg_upper": 11.0, + "right_leg_knee": 11.0, + "metallic_trim": 7.0 + }, + { + "right_trim": 7.0, + "left_trim": 7.0, + "left_chest": 11.0, + "right_chest": 11.0, + "left_thorax": 0.0, + "right_thorax": 0.0, + "left_arm": 11.0, + "left_hand": 11.0, + "right_arm": 11.0, + "right_hand": 11.0, + "left_head": 8.0, + "right_head": 8.0, + "left_muzzle": 8.0, + "right_muzzle": 8.0, + "eye_lense": 22.0, + "right_backpack": 8.0, + "left_backpack": 8.0, + "weapon_primary": 8.0, + "weapon_secondary": 8.0, + "company_marks": 0.0, + "company_marks_loc": 0.0, + "right_pauldron": 8.0, + "left_pauldron": 8.0, + "is_changed": true, + "left_leg_lower": 11.0, + "left_leg_upper": 11.0, + "left_leg_knee": 11.0, + "right_leg_lower": 11.0, + "right_leg_upper": 11.0, + "right_leg_knee": 11.0, + "metallic_trim": 7.0 + }, + { + "right_trim": 7.0, + "left_trim": 7.0, + "left_chest": 11.0, + "right_chest": 11.0, + "left_thorax": 0.0, + "right_thorax": 0.0, + "left_arm": 11.0, + "left_hand": 11.0, + "right_arm": 11.0, + "right_hand": 11.0, + "left_head": 8.0, + "right_head": 8.0, + "left_muzzle": 8.0, + "right_muzzle": 8.0, + "eye_lense": 22.0, + "right_backpack": 8.0, + "left_backpack": 8.0, + "weapon_primary": 8.0, + "weapon_secondary": 8.0, + "company_marks": 0.0, + "company_marks_loc": 0.0, + "right_pauldron": 8.0, + "left_pauldron": 8.0, + "is_changed": true, + "left_leg_lower": 11.0, + "left_leg_upper": 11.0, + "left_leg_knee": 11.0, + "right_leg_lower": 11.0, + "right_leg_upper": 11.0, + "right_leg_knee": 11.0, + "metallic_trim": 7.0 + }, + { + "right_trim": 7.0, + "left_trim": 7.0, + "left_chest": 11.0, + "right_chest": 11.0, + "left_thorax": 0.0, + "right_thorax": 0.0, + "left_arm": 11.0, + "left_hand": 11.0, + "right_arm": 11.0, + "right_hand": 11.0, + "left_head": 8.0, + "right_head": 8.0, + "left_muzzle": 8.0, + "right_muzzle": 8.0, + "eye_lense": 22.0, + "right_backpack": 8.0, + "left_backpack": 8.0, + "weapon_primary": 8.0, + "weapon_secondary": 8.0, + "company_marks": 0.0, + "company_marks_loc": 0.0, + "right_pauldron": 8.0, + "left_pauldron": 8.0, + "is_changed": true, + "left_leg_lower": 11.0, + "left_leg_upper": 11.0, + "left_leg_knee": 11.0, + "right_leg_lower": 11.0, + "right_leg_upper": 11.0, + "right_leg_knee": 11.0, + "metallic_trim": 7.0 + }, + { + "right_trim": 7.0, + "left_trim": 7.0, + "left_chest": 11.0, + "right_chest": 11.0, + "left_thorax": 0.0, + "right_thorax": 0.0, + "left_arm": 11.0, + "left_hand": 11.0, + "right_arm": 11.0, + "right_hand": 11.0, + "left_head": 8.0, + "right_head": 8.0, + "left_muzzle": 8.0, + "right_muzzle": 8.0, + "eye_lense": 22.0, + "right_backpack": 8.0, + "left_backpack": 8.0, + "weapon_primary": 8.0, + "weapon_secondary": 8.0, + "company_marks": 0.0, + "company_marks_loc": 0.0, + "right_pauldron": 8.0, + "left_pauldron": 8.0, + "is_changed": true, + "left_leg_lower": 11.0, + "left_leg_upper": 11.0, + "left_leg_knee": 11.0, + "right_leg_lower": 11.0, + "right_leg_upper": 11.0, + "right_leg_knee": 11.0, + "metallic_trim": 7.0 + }, + { + "right_trim": 7.0, + "left_trim": 7.0, + "left_chest": 11.0, + "right_chest": 11.0, + "left_thorax": 0.0, + "right_thorax": 0.0, + "left_arm": 11.0, + "left_hand": 11.0, + "right_arm": 11.0, + "right_hand": 11.0, + "left_head": 8.0, + "right_head": 8.0, + "left_muzzle": 8.0, + "right_muzzle": 8.0, + "eye_lense": 22.0, + "right_backpack": 8.0, + "left_backpack": 8.0, + "weapon_primary": 8.0, + "weapon_secondary": 8.0, + "company_marks": 0.0, + "company_marks_loc": 0.0, + "right_pauldron": 8.0, + "left_pauldron": 8.0, + "is_changed": true, + "left_leg_lower": 11.0, + "left_leg_upper": 11.0, + "left_leg_knee": 11.0, + "right_leg_lower": 11.0, + "right_leg_upper": 11.0, + "right_leg_knee": 11.0, + "metallic_trim": 7.0 + }, + { + "right_trim": 7.0, + "left_trim": 7.0, + "left_chest": 11.0, + "right_chest": 11.0, + "left_thorax": 0.0, + "right_thorax": 0.0, + "left_arm": 11.0, + "left_hand": 11.0, + "right_arm": 11.0, + "right_hand": 11.0, + "left_head": 8.0, + "right_head": 8.0, + "left_muzzle": 8.0, + "right_muzzle": 8.0, + "eye_lense": 22.0, + "right_backpack": 8.0, + "left_backpack": 8.0, + "weapon_primary": 8.0, + "weapon_secondary": 8.0, + "company_marks": 0.0, + "company_marks_loc": 0.0, + "right_pauldron": 8.0, + "left_pauldron": 8.0, + "is_changed": true, + "left_leg_lower": 11.0, + "left_leg_upper": 11.0, + "left_leg_knee": 11.0, + "right_leg_lower": 11.0, + "right_leg_upper": 11.0, + "right_leg_knee": 11.0, + "metallic_trim": 7.0 + }, + { + "right_trim": 7.0, + "left_trim": 7.0, + "left_chest": 11.0, + "right_chest": 11.0, + "left_thorax": 0.0, + "right_thorax": 0.0, + "left_arm": 11.0, + "left_hand": 11.0, + "right_arm": 11.0, + "right_hand": 11.0, + "left_head": 8.0, + "right_head": 8.0, + "left_muzzle": 8.0, + "right_muzzle": 8.0, + "eye_lense": 22.0, + "right_backpack": 8.0, + "left_backpack": 8.0, + "weapon_primary": 8.0, + "weapon_secondary": 8.0, + "company_marks": 0.0, + "company_marks_loc": 0.0, + "right_pauldron": 8.0, + "left_pauldron": 8.0, + "is_changed": true, + "left_leg_lower": 11.0, + "left_leg_upper": 11.0, + "left_leg_knee": 11.0, + "right_leg_lower": 11.0, + "right_leg_upper": 11.0, + "right_leg_knee": 11.0, + "metallic_trim": 7.0 + }, + { + "right_trim": 7.0, + "left_trim": 7.0, + "left_chest": 11.0, + "right_chest": 11.0, + "left_thorax": 0.0, + "right_thorax": 0.0, + "left_arm": 11.0, + "left_hand": 11.0, + "right_arm": 11.0, + "right_hand": 11.0, + "left_head": 8.0, + "right_head": 8.0, + "left_muzzle": 8.0, + "right_muzzle": 8.0, + "eye_lense": 22.0, + "right_backpack": 8.0, + "left_backpack": 8.0, + "weapon_primary": 8.0, + "weapon_secondary": 8.0, + "company_marks": 0.0, + "company_marks_loc": 0.0, + "right_pauldron": 8.0, + "left_pauldron": 8.0, + "is_changed": true, + "left_leg_lower": 11.0, + "left_leg_upper": 11.0, + "left_leg_knee": 11.0, + "right_leg_lower": 11.0, + "right_leg_upper": 11.0, + "right_leg_knee": 11.0, + "metallic_trim": 7.0 + }, + { + "right_trim": 0.0, + "left_trim": 0.0, + "left_chest": 8, + "right_chest": 8, + "left_thorax": 0.0, + "right_thorax": 0.0, + "left_arm": 8, + "left_hand": 8, + "right_arm": 8, + "right_hand": 8, + "left_head": 8, + "right_head": 8, + "left_muzzle": 8, + "right_muzzle": 8, + "eye_lense": 9, + "right_backpack": 8, + "left_backpack": 8, + "weapon_primary": 8.0, + "weapon_secondary": 8.0, + "company_marks": 0.0, + "company_marks_loc": 0.0, + "right_pauldron": 8, + "left_pauldron": 9.0, + "is_changed": true, + "left_leg_lower": 8, + "left_leg_upper": 8, + "left_leg_knee": 8, + "right_leg_lower": 8, + "right_leg_upper": 8, + "right_leg_knee": 8, + "metallic_trim": 0.0 + }, + { + "right_trim": 0.0, + "left_trim": 0.0, + "left_chest": 0, + "right_chest": 0, + "left_thorax": 0.0, + "right_thorax": 0.0, + "left_arm": 0, + "left_hand": 0, + "right_arm": 0, + "right_hand": 0, + "left_head": 0, + "right_head": 0, + "left_muzzle": 0, + "right_muzzle": 0, + "eye_lense": 9, + "right_backpack": 0, + "left_backpack": 0, + "weapon_primary": 8.0, + "weapon_secondary": 8.0, + "company_marks": 0.0, + "company_marks_loc": 0.0, + "right_pauldron": 0, + "left_pauldron": 9.0, + "is_changed": true, + "left_leg_lower": 0, + "left_leg_upper": 0, + "left_leg_knee": 0, + "right_leg_lower": 0, + "right_leg_upper": 0, + "right_leg_knee": 0, + "metallic_trim": 0.0 + }, + { + "right_trim": 0.0, + "left_trim": 0.0, + "left_chest": 9, + "right_chest": 9, + "left_thorax": 0.0, + "right_thorax": 0.0, + "left_arm": 9, + "left_hand": 9, + "right_arm": 9, + "right_hand": 9, + "left_head": 9, + "right_head": 9, + "left_muzzle": 9, + "right_muzzle": 9, + "eye_lense": 23, + "right_backpack": 9, + "left_backpack": 9, + "weapon_primary": 8.0, + "weapon_secondary": 8.0, + "company_marks": 0.0, + "company_marks_loc": 0.0, + "right_pauldron": 9, + "left_pauldron": 9.0, + "is_changed": true, + "left_leg_lower": 9, + "left_leg_upper": 9, + "left_leg_knee": 9, + "right_leg_lower": 9, + "right_leg_upper": 9, + "right_leg_knee": 9, + "metallic_trim": 0.0 + }, + { + "right_trim": 0.0, + "left_trim": 0.0, + "left_chest": 34, + "right_chest": 34, + "left_thorax": 0.0, + "right_thorax": 0.0, + "left_arm": 34, + "left_hand": 34, + "right_arm": 34, + "right_hand": 34, + "left_head": 34, + "right_head": 34, + "left_muzzle": 34, + "right_muzzle": 34, + "eye_lense": 28, + "right_backpack": 34, + "left_backpack": 34, + "weapon_primary": 8.0, + "weapon_secondary": 8.0, + "company_marks": 0.0, + "company_marks_loc": 0.0, + "right_pauldron": 34, + "left_pauldron": 9.0, + "is_changed": true, + "left_leg_lower": 34, + "left_leg_upper": 34, + "left_leg_knee": 34, + "right_leg_lower": 34, + "right_leg_upper": 34, + "right_leg_knee": 34, + "metallic_trim": 0.0 + }, + { + "right_trim": 7.0, + "left_trim": 7.0, + "left_chest": 11.0, + "right_chest": 11.0, + "left_thorax": 0.0, + "right_thorax": 0.0, + "left_arm": 11.0, + "left_hand": 11.0, + "right_arm": 11.0, + "right_hand": 11.0, + "left_head": 8.0, + "right_head": 8.0, + "left_muzzle": 8.0, + "right_muzzle": 8.0, + "eye_lense": 22.0, + "right_backpack": 8.0, + "left_backpack": 8.0, + "weapon_primary": 8.0, + "weapon_secondary": 8.0, + "company_marks": 0.0, + "company_marks_loc": 0.0, + "right_pauldron": 8.0, + "left_pauldron": 8.0, + "is_changed": true, + "left_leg_lower": 11.0, + "left_leg_upper": 11.0, + "left_leg_knee": 11.0, + "right_leg_lower": 11.0, + "right_leg_upper": 11.0, + "right_leg_knee": 11.0, + "metallic_trim": 7.0 + }, + { + "right_trim": 7.0, + "left_trim": 7.0, + "left_chest": 11.0, + "right_chest": 11.0, + "left_thorax": 0.0, + "right_thorax": 0.0, + "left_arm": 11.0, + "left_hand": 11.0, + "right_arm": 11.0, + "right_hand": 11.0, + "left_head": 8.0, + "right_head": 8.0, + "left_muzzle": 8.0, + "right_muzzle": 8.0, + "eye_lense": 22.0, + "right_backpack": 8.0, + "left_backpack": 8.0, + "weapon_primary": 8.0, + "weapon_secondary": 8.0, + "company_marks": 0.0, + "company_marks_loc": 0.0, + "right_pauldron": 8.0, + "left_pauldron": 8.0, + "is_changed": true, + "left_leg_lower": 11.0, + "left_leg_upper": 11.0, + "left_leg_knee": 11.0, + "right_leg_lower": 11.0, + "right_leg_upper": 11.0, + "right_leg_knee": 11.0, + "metallic_trim": 7.0 + }, + { + "right_trim": 7.0, + "left_trim": 7.0, + "left_chest": 11.0, + "right_chest": 11.0, + "left_thorax": 0.0, + "right_thorax": 0.0, + "left_arm": 11.0, + "left_hand": 11.0, + "right_arm": 11.0, + "right_hand": 11.0, + "left_head": 8.0, + "right_head": 8.0, + "left_muzzle": 8.0, + "right_muzzle": 8.0, + "eye_lense": 22.0, + "right_backpack": 8.0, + "left_backpack": 8.0, + "weapon_primary": 8.0, + "weapon_secondary": 8.0, + "company_marks": 0.0, + "company_marks_loc": 0.0, + "right_pauldron": 8.0, + "left_pauldron": 8.0, + "is_changed": true, + "left_leg_lower": 11.0, + "left_leg_upper": 11.0, + "left_leg_knee": 11.0, + "right_leg_lower": 11.0, + "right_leg_upper": 11.0, + "right_leg_knee": 11.0, + "metallic_trim": 7.0 + } + ], + "company_liveries": [ + { + "right_trim": -1.0, + "left_trim": -1.0, + "left_chest": -1.0, + "right_chest": -1.0, + "left_thorax": -1.0, + "right_thorax": -1.0, + "left_arm": -1.0, + "left_hand": -1.0, + "right_arm": -1.0, + "right_hand": -1.0, + "left_head": -1.0, + "right_head": -1.0, + "left_muzzle": -1.0, + "right_muzzle": -1.0, + "eye_lense": -1.0, + "right_backpack": -1.0, + "left_backpack": -1.0, + "weapon_primary": -1.0, + "weapon_secondary": -1.0, + "company_marks": -1.0, + "company_marks_loc": -1.0, + "right_pauldron": -1.0, + "left_pauldron": -1.0, + "is_changed": false, + "left_leg_lower": -1.0, + "left_leg_upper": -1.0, + "left_leg_knee": -1.0, + "right_leg_lower": -1.0, + "right_leg_upper": -1.0, + "right_leg_knee": -1.0, + "metallic_trim": -1.0 + }, + { + "right_trim": -1.0, + "left_trim": -1.0, + "left_chest": -1.0, + "right_chest": -1.0, + "left_thorax": -1.0, + "right_thorax": -1.0, + "left_arm": -1.0, + "left_hand": -1.0, + "right_arm": -1.0, + "right_hand": -1.0, + "left_head": -1.0, + "right_head": -1.0, + "left_muzzle": -1.0, + "right_muzzle": -1.0, + "eye_lense": -1.0, + "right_backpack": -1.0, + "left_backpack": -1.0, + "weapon_primary": -1.0, + "weapon_secondary": -1.0, + "company_marks": -1.0, + "company_marks_loc": -1.0, + "right_pauldron": -1.0, + "left_pauldron": -1.0, + "is_changed": false, + "left_leg_lower": -1.0, + "left_leg_upper": -1.0, + "left_leg_knee": -1.0, + "right_leg_lower": -1.0, + "right_leg_upper": -1.0, + "right_leg_knee": -1.0, + "metallic_trim": -1.0 + }, + { + "right_trim": -1.0, + "left_trim": -1.0, + "left_chest": -1.0, + "right_chest": -1.0, + "left_thorax": -1.0, + "right_thorax": -1.0, + "left_arm": -1.0, + "left_hand": -1.0, + "right_arm": -1.0, + "right_hand": -1.0, + "left_head": -1.0, + "right_head": -1.0, + "left_muzzle": -1.0, + "right_muzzle": -1.0, + "eye_lense": -1.0, + "right_backpack": -1.0, + "left_backpack": -1.0, + "weapon_primary": -1.0, + "weapon_secondary": -1.0, + "company_marks": -1.0, + "company_marks_loc": -1.0, + "right_pauldron": -1.0, + "left_pauldron": -1.0, + "is_changed": false, + "left_leg_lower": -1.0, + "left_leg_upper": -1.0, + "left_leg_knee": -1.0, + "right_leg_lower": -1.0, + "right_leg_upper": -1.0, + "right_leg_knee": -1.0, + "metallic_trim": -1.0 + }, + { + "right_trim": -1.0, + "left_trim": -1.0, + "left_chest": -1.0, + "right_chest": -1.0, + "left_thorax": -1.0, + "right_thorax": -1.0, + "left_arm": -1.0, + "left_hand": -1.0, + "right_arm": -1.0, + "right_hand": -1.0, + "left_head": -1.0, + "right_head": -1.0, + "left_muzzle": -1.0, + "right_muzzle": -1.0, + "eye_lense": -1.0, + "right_backpack": -1.0, + "left_backpack": -1.0, + "weapon_primary": -1.0, + "weapon_secondary": -1.0, + "company_marks": -1.0, + "company_marks_loc": -1.0, + "right_pauldron": -1.0, + "left_pauldron": -1.0, + "is_changed": false, + "left_leg_lower": -1.0, + "left_leg_upper": -1.0, + "left_leg_knee": -1.0, + "right_leg_lower": -1.0, + "right_leg_upper": -1.0, + "right_leg_knee": -1.0, + "metallic_trim": -1.0 + }, + { + "right_trim": 8.0, + "left_trim": 8.0, + "left_chest": 8.0, + "right_chest": 8.0, + "left_thorax": 8.0, + "right_thorax": 8.0, + "left_arm": 8.0, + "left_hand": 8.0, + "right_arm": 8.0, + "right_hand": 8.0, + "left_head": 8.0, + "right_head": 8.0, + "left_muzzle": 8.0, + "right_muzzle": 8.0, + "eye_lense": -1.0, + "right_backpack": 8.0, + "left_backpack": 8.0, + "weapon_primary": 8.0, + "weapon_secondary": 8.0, + "company_marks": -1.0, + "company_marks_loc": -1.0, + "right_pauldron": 8.0, + "left_pauldron": 8.0, + "is_changed": true, + "left_leg_lower": 8.0, + "left_leg_upper": 8.0, + "left_leg_knee": 8.0, + "right_leg_lower": 8.0, + "right_leg_upper": 8.0, + "right_leg_knee": 8.0, + "metallic_trim": -1.0 + }, + { + "right_trim": -1.0, + "left_trim": -1.0, + "left_chest": -1.0, + "right_chest": -1.0, + "left_thorax": -1.0, + "right_thorax": -1.0, + "left_arm": -1.0, + "left_hand": -1.0, + "right_arm": -1.0, + "right_hand": -1.0, + "left_head": -1.0, + "right_head": -1.0, + "left_muzzle": -1.0, + "right_muzzle": -1.0, + "eye_lense": -1.0, + "right_backpack": -1.0, + "left_backpack": -1.0, + "weapon_primary": -1.0, + "weapon_secondary": -1.0, + "company_marks": -1.0, + "company_marks_loc": -1.0, + "right_pauldron": -1.0, + "left_pauldron": -1.0, + "is_changed": false, + "left_leg_lower": -1.0, + "left_leg_upper": -1.0, + "left_leg_knee": -1.0, + "right_leg_lower": -1.0, + "right_leg_upper": -1.0, + "right_leg_knee": -1.0, + "metallic_trim": -1.0 + }, + { + "right_trim": -1.0, + "left_trim": -1.0, + "left_chest": -1.0, + "right_chest": -1.0, + "left_thorax": -1.0, + "right_thorax": -1.0, + "left_arm": -1.0, + "left_hand": -1.0, + "right_arm": -1.0, + "right_hand": -1.0, + "left_head": -1.0, + "right_head": -1.0, + "left_muzzle": -1.0, + "right_muzzle": -1.0, + "eye_lense": -1.0, + "right_backpack": -1.0, + "left_backpack": -1.0, + "weapon_primary": -1.0, + "weapon_secondary": -1.0, + "company_marks": -1.0, + "company_marks_loc": -1.0, + "right_pauldron": -1.0, + "left_pauldron": -1.0, + "is_changed": false, + "left_leg_lower": -1.0, + "left_leg_upper": -1.0, + "left_leg_knee": -1.0, + "right_leg_lower": -1.0, + "right_leg_upper": -1.0, + "right_leg_knee": -1.0, + "metallic_trim": -1.0 + }, + { + "right_trim": -1.0, + "left_trim": -1.0, + "left_chest": -1.0, + "right_chest": -1.0, + "left_thorax": -1.0, + "right_thorax": -1.0, + "left_arm": -1.0, + "left_hand": -1.0, + "right_arm": -1.0, + "right_hand": -1.0, + "left_head": -1.0, + "right_head": -1.0, + "left_muzzle": -1.0, + "right_muzzle": -1.0, + "eye_lense": -1.0, + "right_backpack": -1.0, + "left_backpack": -1.0, + "weapon_primary": -1.0, + "weapon_secondary": -1.0, + "company_marks": -1.0, + "company_marks_loc": -1.0, + "right_pauldron": -1.0, + "left_pauldron": -1.0, + "is_changed": false, + "left_leg_lower": -1.0, + "left_leg_upper": -1.0, + "left_leg_knee": -1.0, + "right_leg_lower": -1.0, + "right_leg_upper": -1.0, + "right_leg_knee": -1.0, + "metallic_trim": -1.0 + }, + { + "right_trim": -1.0, + "left_trim": -1.0, + "left_chest": -1.0, + "right_chest": -1.0, + "left_thorax": -1.0, + "right_thorax": -1.0, + "left_arm": -1.0, + "left_hand": -1.0, + "right_arm": -1.0, + "right_hand": -1.0, + "left_head": -1.0, + "right_head": -1.0, + "left_muzzle": -1.0, + "right_muzzle": -1.0, + "eye_lense": -1.0, + "right_backpack": -1.0, + "left_backpack": -1.0, + "weapon_primary": -1.0, + "weapon_secondary": -1.0, + "company_marks": -1.0, + "company_marks_loc": -1.0, + "right_pauldron": -1.0, + "left_pauldron": -1.0, + "is_changed": false, + "left_leg_lower": -1.0, + "left_leg_upper": -1.0, + "left_leg_knee": -1.0, + "right_leg_lower": -1.0, + "right_leg_upper": -1.0, + "right_leg_knee": -1.0, + "metallic_trim": -1.0 + }, + { + "right_trim": -1.0, + "left_trim": -1.0, + "left_chest": -1.0, + "right_chest": -1.0, + "left_thorax": -1.0, + "right_thorax": -1.0, + "left_arm": -1.0, + "left_hand": -1.0, + "right_arm": -1.0, + "right_hand": -1.0, + "left_head": -1.0, + "right_head": -1.0, + "left_muzzle": -1.0, + "right_muzzle": -1.0, + "eye_lense": -1.0, + "right_backpack": -1.0, + "left_backpack": -1.0, + "weapon_primary": -1.0, + "weapon_secondary": -1.0, + "company_marks": -1.0, + "company_marks_loc": -1.0, + "right_pauldron": -1.0, + "left_pauldron": -1.0, + "is_changed": false, + "left_leg_lower": -1.0, + "left_leg_upper": -1.0, + "left_leg_knee": -1.0, + "right_leg_lower": -1.0, + "right_leg_upper": -1.0, + "right_leg_knee": -1.0, + "metallic_trim": -1.0 + }, + { + "right_trim": -1.0, + "left_trim": -1.0, + "left_chest": -1.0, + "right_chest": -1.0, + "left_thorax": -1.0, + "right_thorax": -1.0, + "left_arm": -1.0, + "left_hand": -1.0, + "right_arm": -1.0, + "right_hand": -1.0, + "left_head": -1.0, + "right_head": -1.0, + "left_muzzle": -1.0, + "right_muzzle": -1.0, + "eye_lense": -1.0, + "right_backpack": -1.0, + "left_backpack": -1.0, + "weapon_primary": -1.0, + "weapon_secondary": -1.0, + "company_marks": -1.0, + "company_marks_loc": -1.0, + "right_pauldron": -1.0, + "left_pauldron": -1.0, + "is_changed": false, + "left_leg_lower": -1.0, + "left_leg_upper": -1.0, + "left_leg_knee": -1.0, + "right_leg_lower": -1.0, + "right_leg_upper": -1.0, + "right_leg_knee": -1.0, + "metallic_trim": -1.0 + } + ], + "complex_livery_data": { + "sgt": { + "helm_lens": 0.0, + "helm_pattern": 3.0, + "helm_primary": 0.0, + "helm_secondary": 0.0, + "helm_detail": 0.0 + }, + "veteran": { + "helm_lens": 0.0, + "helm_pattern": 3.0, + "helm_primary": 0.0, + "helm_secondary": 0.0, + "helm_detail": 0.0 + }, + "vet_sgt": { + "helm_lens": 0.0, + "helm_pattern": 3.0, + "helm_primary": 0.0, + "helm_secondary": 0.0, + "helm_detail": 0.0 + }, + "captain": { + "helm_lens": 0.0, + "helm_pattern": 3.0, + "helm_primary": 0.0, + "helm_secondary": 0.0, + "helm_detail": 0.0 + } + }, + "colors": { + "secondary": "Black", + "pauldron_r": "Black", + "pauldron_l": "Black", + "trim": "Lighter Black", + "lens": "Lime", + "weapon": "Black", + "main": "Dark Red", + "special": 0.0 + }, + "disposition": [ + 0.0, + 60.0, + 58.0, + 40.0, + 27.6, + 38.6, + 0.0, + 0.0 + ] + } +} \ No newline at end of file From e0a6aa3b0ca12ca344e013ba1caa0b6043bee294 Mon Sep 17 00:00:00 2001 From: Nelsonh <81228864+OH296@users.noreply.github.com> Date: Sun, 4 May 2025 19:52:16 +0100 Subject: [PATCH 023/286] fix: Universal charisma tweak (#802) --- scripts/scr_marine_struct/scr_marine_struct.gml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/scr_marine_struct/scr_marine_struct.gml b/scripts/scr_marine_struct/scr_marine_struct.gml index 4bd759014f..01de86024b 100644 --- a/scripts/scr_marine_struct/scr_marine_struct.gml +++ b/scripts/scr_marine_struct/scr_marine_struct.gml @@ -71,7 +71,7 @@ global.base_stats = { dexterity: [40, 3], intelligence: [40, 3], wisdom: [40, 3], - charisma: [30, 5], + charisma: [32, 6], religion: "imperial_cult", piety: [30, 3], luck: 10, From 646c0cb9ae91e9d0fb747b4921859c58c55d3454 Mon Sep 17 00:00:00 2001 From: Nelsonh <81228864+OH296@users.noreply.github.com> Date: Sun, 4 May 2025 22:20:09 +0100 Subject: [PATCH 024/286] fix: scr_ownership typo "planet" to "run" (#803) --- scripts/scr_star_ownership/scr_star_ownership.gml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/scr_star_ownership/scr_star_ownership.gml b/scripts/scr_star_ownership/scr_star_ownership.gml index d902a1ae90..37f19559f7 100644 --- a/scripts/scr_star_ownership/scr_star_ownership.gml +++ b/scripts/scr_star_ownership/scr_star_ownership.gml @@ -19,7 +19,7 @@ function scr_star_ownership(argument0) { } if (_set_to_first){ var _first = p_first[run]; - if (p_first[run] == eFACTION.Ork && p_orks[planet] <= 0){ + if (p_first[run] == eFACTION.Ork && p_orks[run] <= 0){ p_owner[run]=2; } else { p_owner[run]=p_first[run]; From 734c11c02551e0f1b387777078b38683b18c278f Mon Sep 17 00:00:00 2001 From: Nelsonh <81228864+OH296@users.noreply.github.com> Date: Mon, 5 May 2025 01:56:10 +0100 Subject: [PATCH 025/286] fix: Train forces missionName print error (#804) Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com> --- .../scr_mission_functions.gml | 20 +++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) diff --git a/scripts/scr_mission_functions/scr_mission_functions.gml b/scripts/scr_mission_functions/scr_mission_functions.gml index 495f973e98..2aab02cdd7 100644 --- a/scripts/scr_mission_functions/scr_mission_functions.gml +++ b/scripts/scr_mission_functions/scr_mission_functions.gml @@ -257,6 +257,7 @@ function complete_train_forces_mission(targ_planet, problem_index){ var _mission_string = ""; var _trainer = collect_role_group("all",[name,targ_planet,0], false, man_conditions); if (array_length(_trainer)){ + var _unit_report_string = ""; var _tester = global.character_tester; var _wis_test_difficulty = -20; _trainer = _trainer[0]; @@ -284,10 +285,20 @@ function complete_train_forces_mission(targ_planet, problem_index){ var _new_pdf = planet.recruit_pdf((_unit_pass[1]/10));//this will approximate podf improvement for the time being _mission_string += $"Training of the Pdf went well and improved the quality of the pdf as well as providing sizeable big recruitment improvement for the planet {_new_pdf} new pdf were recruited"; if (_siege_master){ - _mission_string += "{_trainer.name()}s trained eye as a Siege Master also allowed him to make several improvements to the planets fortifications (fortification +1)"; - + _mission_string += $"{_trainer.name()}s trained eye as a Siege Master also allowed him to make several improvements to the planets fortifications (fortification +1)"; planet.alter_fortification(1); - } + } else { + if (roll_dice(1, 100) > 75 && _trainer.intelligence > 45){ + _mission_string += $"{_trainer.name()} has proven themselves a great strategist when it comes to defensive structures beyond previousy known "; + var _start_stats = variable_clone(_trainer.get_stat_line()); + _trainer.add_trait("siege_master"); + var end_stat = _trainer.get_stat_line(); + var _stat_diff = compare_stats(end_stat,_start_stats); + _unit_report_string += $"{_trainer.name_role()} Has gained the trait {global.trait_list.siege_master.display_name}, {(print_stat_diffs(_stat_diff))}\n"; + _mission_string += "The new insights have allowed for minor improvements to planetary fortifications (fortification +1)"; + planet.alter_fortification(1); + } + } } else { disp_loss = -5; _mission_string += "The orgional training mission was a failiure" @@ -314,7 +325,8 @@ function complete_train_forces_mission(targ_planet, problem_index){ } planet.add_disposition(disp_loss); } - scr_popup($"Training Forces on {planet_numeral_name(i)}",_mission_string,"",""); + _mission_string += $"\n{_unit_report_string}"; + scr_popup($"Training Forces on {planet.name()}",_mission_string,"",""); remove_planet_problem(targ_planet, "train_forces"); _trainer.job = "none"; } From 93b4d74af7fedf0a3b5d7645d505e9fbc00de228 Mon Sep 17 00:00:00 2001 From: Nelsonh <81228864+OH296@users.noreply.github.com> Date: Mon, 5 May 2025 02:10:56 +0100 Subject: [PATCH 026/286] fix: Issue in cleanup with ships becoming dissociated with fleets (#805) --- .../scr_ini_ship_cleanup.gml | 20 ++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) diff --git a/scripts/scr_ini_ship_cleanup/scr_ini_ship_cleanup.gml b/scripts/scr_ini_ship_cleanup/scr_ini_ship_cleanup.gml index 63c5c47135..8cab32875a 100644 --- a/scripts/scr_ini_ship_cleanup/scr_ini_ship_cleanup.gml +++ b/scripts/scr_ini_ship_cleanup/scr_ini_ship_cleanup.gml @@ -52,7 +52,25 @@ function scr_kill_ship(index){ array_delete(_units_on_ship, 0, 1); } } - } + } + var _index = index; + with (obj_p_fleet){ + for (var i=0;i_index ){ + escort_num[i]--; + } + } + for (var i=0;i_index ){ + capital_num[i]--; + } + } + for (var i=0;i_index ){ + frigate_num[i]--; + } + } + } array_delete(ship,index,1); array_delete(ship_uid,index,1); array_delete(ship_owner,index,1); From b42f2d915ef88fb85b13c60590f07a9235b648d9 Mon Sep 17 00:00:00 2001 From: Nelsonh <81228864+OH296@users.noreply.github.com> Date: Wed, 7 May 2025 11:29:00 +0100 Subject: [PATCH 027/286] fix: Crash when creating fallen mission (#806) --- .../scr_mission_functions.gml | 2 +- scripts/scr_random_event/scr_random_event.gml | 40 +++++++++---------- 2 files changed, 20 insertions(+), 22 deletions(-) diff --git a/scripts/scr_mission_functions/scr_mission_functions.gml b/scripts/scr_mission_functions/scr_mission_functions.gml index 2aab02cdd7..1327adbcfe 100644 --- a/scripts/scr_mission_functions/scr_mission_functions.gml +++ b/scripts/scr_mission_functions/scr_mission_functions.gml @@ -594,7 +594,7 @@ function problem_count_down(planet, count_change=1){ function add_new_problem(planet, problem, timer,star="none", other_data={}){ var problem_added=false; if (star=="none"){ - for (var i=1;i0){ + log_message($"Fallen: found star {star.name} planet {planet} as candidate") + + var assigned_problem = add_new_problem(planet, "fallen", eta,star) + log_message($"assigned_problem {assigned_problem}") - if(!assigned_problem) { - log_error("RE: Hunt the Fallen, coulnd't assign a problem to the planet"); - return; + if (!assigned_problem) { + log_error("RE: Hunt the Fallen, coulnd't assign a problem to the planet"); + return; + } + + var text = "Sources indicate one of the Fallen may be upon "+string(star.name)+" "+string(scr_roman(planet))+". We have "+string(eta)+" months to send out a strike team and scour the planet. Any longer and any Fallen that might be there will have escaped."; + scr_popup("Hunt the Fallen",text,"fallen",""); + scr_event_log("","Sources indicate one of the Fallen may be upon "+string(star.name)+" "+string(scr_roman(planet))+". We have "+string(eta)+" months to investigate."); + var star_alert = instance_create(star.x+16,star.y-24,obj_star_event); + star_alert.image_alpha=1; + star_alert.image_speed=1; + star_alert.col="purple"; } - - var text = "Sources indicate one of the Fallen may be upon "+string(star.name)+" "+string(scr_roman(planet))+". We have "+string(eta)+" months to send out a strike team and scour the planet. Any longer and any Fallen that might be there will have escaped."; - scr_popup("Hunt the Fallen",text,"fallen",""); - scr_event_log("","Sources indicate one of the Fallen may be upon "+string(star.name)+" "+string(scr_roman(planet))+". We have "+string(eta)+" months to investigate."); - var star_alert = instance_create(star.x+16,star.y-24,obj_star_event); - star_alert.image_alpha=1; - star_alert.image_speed=1; - star_alert.col="purple"; } \ No newline at end of file From 8c7de93d670de4c8c7df43933937015b392e60ff Mon Sep 17 00:00:00 2001 From: Nelsonh <81228864+OH296@users.noreply.github.com> Date: Wed, 7 May 2025 11:54:39 +0100 Subject: [PATCH 028/286] fix: Destroy colour_pick on area change (#807) --- scripts/scr_complex_colour_kit/scr_complex_colour_kit.gml | 3 +++ scripts/scr_livery_setup/scr_livery_setup.gml | 7 ++++++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/scripts/scr_complex_colour_kit/scr_complex_colour_kit.gml b/scripts/scr_complex_colour_kit/scr_complex_colour_kit.gml index a6b76ffc76..7cc3a51022 100644 --- a/scripts/scr_complex_colour_kit/scr_complex_colour_kit.gml +++ b/scripts/scr_complex_colour_kit/scr_complex_colour_kit.gml @@ -677,6 +677,9 @@ function colour_picker(xx,yy, max_width=400) constructor{ static create_texture_surface = function(texture_set, sprite_draw_args){ var texture_names = struct_get_names(texture_set); var total_width = sprite_draw_args.frame_width * array_length(texture_names); + if (sprite_draw_args.frame_height <= 0 || total_width <= 0){ + exit; + } _texture_offset = [0,0]; texture_coords = []; diff --git a/scripts/scr_livery_setup/scr_livery_setup.gml b/scripts/scr_livery_setup/scr_livery_setup.gml index d0bc83a284..e4942e9680 100644 --- a/scripts/scr_livery_setup/scr_livery_setup.gml +++ b/scripts/scr_livery_setup/scr_livery_setup.gml @@ -52,6 +52,7 @@ function scr_livery_setup(){ draw_set_halign(fa_center); if (comp_toggle.draw()){ comp_toggle.company_view = !comp_toggle.company_view; + livery_picker.colour_pick=false; if (!comp_toggle.company_view){ company_liveries[livery_picker.role_set] = variable_clone(livery_picker.map_colour); livery_picker.role_set = 0; @@ -405,7 +406,10 @@ function scr_livery_setup(){ var onceh=0; if (complex_depth_selection=i) and (onceh=0){complex_depth_selection=0;onceh=1;} - else if (complex_depth_selection!=i) and (onceh=0){complex_depth_selection=i;onceh=1;} + else if (complex_depth_selection!=i) and (onceh=0){ + complex_depth_selection=i; + onceh=1; + } } draw_text_transformed(cur_button.cords[0]+30,cur_button.cords[1]+4,cur_button.text,0.4,0.4,0); } @@ -470,6 +474,7 @@ function scr_livery_setup(){ } livery_picker.shuffle_dummy(); livery_picker.reset_image(); + livery_picker.colour_pick=false; } } } From be225c3a2415122b5002436e4fdff630991aec42 Mon Sep 17 00:00:00 2001 From: Nelsonh <81228864+OH296@users.noreply.github.com> Date: Wed, 7 May 2025 20:04:56 +0100 Subject: [PATCH 029/286] fix: Scouts starting with Black Carapace (#808) --- scripts/scr_initialize_custom/scr_initialize_custom.gml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/scripts/scr_initialize_custom/scr_initialize_custom.gml b/scripts/scr_initialize_custom/scr_initialize_custom.gml index 0aade9edec..f9cad9dcc1 100644 --- a/scripts/scr_initialize_custom/scr_initialize_custom.gml +++ b/scripts/scr_initialize_custom/scr_initialize_custom.gml @@ -2819,6 +2819,7 @@ function scr_initialize_custom() { } break; case "scouts": + _unit_type = "scout"; _rolename = roles.scout; _erole = eROLE.Scout; break; @@ -2974,6 +2975,7 @@ function scr_initialize_custom() { _wep2 = wep2[defaults_slot][eROLE.Terminator]; } break; + // VEHICLES case "rhinos": From 95d160a5acfedc99df5615ead98a07da84143dd2 Mon Sep 17 00:00:00 2001 From: Nelsonh <81228864+OH296@users.noreply.github.com> Date: Thu, 8 May 2025 13:57:09 +0100 Subject: [PATCH 030/286] feat: Flamberg style sword (Alpha culture pack) (#809) --- ChapterMaster.yyp | 1 + .../scr_culture_visuals.gml | 4 + .../spr_mk7_gladiator_chest.yy | 2 + sprites/spr_ship_glad/spr_ship_glad.yy | 7 +- .../b9e276c7-1d8b-4129-82dc-1842ecff6f07.png | Bin 0 -> 2185 bytes .../14afc33a-1a1a-4c24-bf75-ee4e1cb523e8.png | Bin 0 -> 2185 bytes .../spr_weapoon_powso_flamberge.yy | 92 ++++++++++++++++++ 7 files changed, 102 insertions(+), 4 deletions(-) create mode 100644 sprites/spr_weapoon_powso_flamberge/b9e276c7-1d8b-4129-82dc-1842ecff6f07.png create mode 100644 sprites/spr_weapoon_powso_flamberge/layers/b9e276c7-1d8b-4129-82dc-1842ecff6f07/14afc33a-1a1a-4c24-bf75-ee4e1cb523e8.png create mode 100644 sprites/spr_weapoon_powso_flamberge/spr_weapoon_powso_flamberge.yy diff --git a/ChapterMaster.yyp b/ChapterMaster.yyp index fc43a26f14..7f193bbbe1 100644 --- a/ChapterMaster.yyp +++ b/ChapterMaster.yyp @@ -1673,6 +1673,7 @@ {"id":{"name":"spr_weapon_sword_turk","path":"sprites/spr_weapon_sword_turk/spr_weapon_sword_turk.yy",},}, {"id":{"name":"spr_weapon_thhammer","path":"sprites/spr_weapon_thhammer/spr_weapon_thhammer.yy",},}, {"id":{"name":"spr_weapon_xenophase_blade_var1","path":"sprites/spr_weapon_xenophase_blade_var1/spr_weapon_xenophase_blade_var1.yy",},}, + {"id":{"name":"spr_weapoon_powso_flamberge","path":"sprites/spr_weapoon_powso_flamberge/spr_weapoon_powso_flamberge.yy",},}, {"id":{"name":"spr_welcome_bg","path":"sprites/spr_welcome_bg/spr_welcome_bg.yy",},}, {"id":{"name":"spr_wings","path":"sprites/spr_wings/spr_wings.yy",},}, {"id":{"name":"spr_wisdom_icon","path":"sprites/spr_wisdom_icon/spr_wisdom_icon.yy",},}, diff --git a/scripts/scr_culture_visuals/scr_culture_visuals.gml b/scripts/scr_culture_visuals/scr_culture_visuals.gml index 380e8d7594..36c2cf251b 100644 --- a/scripts/scr_culture_visuals/scr_culture_visuals.gml +++ b/scripts/scr_culture_visuals/scr_culture_visuals.gml @@ -1733,6 +1733,10 @@ global.weapon_visual_data = { { cultures: ["Mongol"], sprite: spr_weapon_sword_oriental + }, + { + cultures: ["Alpha"], + sprite: spr_weapoon_powso_flamberge } ] }, diff --git a/sprites/spr_mk7_gladiator_chest/spr_mk7_gladiator_chest.yy b/sprites/spr_mk7_gladiator_chest/spr_mk7_gladiator_chest.yy index 6da82ea10c..a95b2f8f92 100644 --- a/sprites/spr_mk7_gladiator_chest/spr_mk7_gladiator_chest.yy +++ b/sprites/spr_mk7_gladiator_chest/spr_mk7_gladiator_chest.yy @@ -65,6 +65,8 @@ "playbackSpeedType":0, "resourceType":"GMSequence", "resourceVersion":"2.0", + "seqHeight":232.0, + "seqWidth":164.0, "showBackdrop":true, "showBackdropImage":false, "timeUnits":1, diff --git a/sprites/spr_ship_glad/spr_ship_glad.yy b/sprites/spr_ship_glad/spr_ship_glad.yy index 9cc53775ef..572141dc6e 100644 --- a/sprites/spr_ship_glad/spr_ship_glad.yy +++ b/sprites/spr_ship_glad/spr_ship_glad.yy @@ -63,6 +63,8 @@ "playbackSpeedType":1, "resourceType":"GMSequence", "resourceVersion":"2.0", + "seqHeight":30.0, + "seqWidth":79.0, "showBackdrop":true, "showBackdropImage":false, "timeUnits":1, @@ -73,10 +75,7 @@ },"Disabled":false,"id":"dc542ebd-2f6e-43f1-b053-8b4014539608","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":39, "yorigin":15, diff --git a/sprites/spr_weapoon_powso_flamberge/b9e276c7-1d8b-4129-82dc-1842ecff6f07.png b/sprites/spr_weapoon_powso_flamberge/b9e276c7-1d8b-4129-82dc-1842ecff6f07.png new file mode 100644 index 0000000000000000000000000000000000000000..beb610c16e91e4aee1dcef31bd0e0972155a66b7 GIT binary patch literal 2185 zcmb7FeK^zW8~;`(k_r{7o#;3s>YydI#r8|6p?QBvA|WPPYs-wGNF|~6Qpz_vjAa%| ziO^2vC0%XHS=nL6Y2GOu^U}QSe4Rgj*Y&%u(;vU*d9LezuFrjc?)$l4uItJ0z#U${ zcH3G20M=uVIC?>n0{|-=)~G=@=8ymni5+1_yp94uf(ZazybJ(y5Oi?}04`Voz{p7e zK;;5}{yFf4ryZnFJLP)V5l}7f2Mrts0I1Wjjt70>JHN^v6E+PRw)`dX#prnSUS6@+ z_mto_hhm=9jNwSZtIqrUiyCUpPn^H{aCs~v4^9b!Mc>h%eCSjQ?gkbwpAR0JcF^&= zCJ2)qr-;IOkQz|1e_!_P`AK^{RHF%i<{G*&Ry++@)NDEZ?61cTJ!JcfnVnS_4>Oz- zoZ|w1?I%3dXZS zi6r8R(o_#7og1PbunJbG4oe#C zJ>RZ&N>Ef(M4Ou`9ew=RLATe99&`3APHQ-2Ng268ON&IKbxl_W{Q86>oSz*ZoS3jm zQ7uyFePWKg-l0|AaNz;Um>Z$u(W9MM$hyuzZ@1q}<%XTJU`tC&M^BHtv|3CpY5FkX z1M-uGe-K^|8&G3*k${ ztGiQzlz9efug_Vn6T#{t85kNy+8LO(l0Cx@THERB>+3lho4pu(y2Hq98)vmn#%i5( z$SP3#*2kcr0PS1sp?q=bHFgvTndv!h_B$`aA9VC05kn6;(hC!Dnnv_OB4oTdOAIpD z^GfN3q>?y^C=FK0&3a+?dS*8)w%nTbdFG?JO&66K0{iT5UzN_s=Ni_Jh_TLGa6k$|- zcrmDEL%q=<_1ECx2S#J0tzl37UtsRnjm@@OUg-$>Hdn}CFzjgGtm^9Ou;RX^O#P4p zx0R|yoAdkwRr=+s#+;Jc>NkU9V`I;27STtVhe+`EmY5gCjp(16L=d%g?%r6Z)R5}^?1T-4Tu!J%W%p8wQ0&R3x+ z1?B1@!SG~sqYYMXHS)}vGo!zAQrs-I8sxNeba$6e1l6oKK|>F+3hS@8MKNVE8J5jR zbxLsMp@eY+f~C5;x@7JFXf(PS5^eMH@~9JkzM7iX902uI zS_!<@YM|P5v4^x;@aom8n47G8bqVjaD^~2DD(&tTmibpqE-lW}7QPY3t~U1)gZat! z8j6sVgzbyoKj8w7fJ|RFj$fL^4h97|n5CL2^?Xc9etc<^Hn#~G8Ru!eEo<^iM^*XN z#F|FYGQg%H@*vRy#zd)vGI z=D1v6bDX4XUzrP74wKW(i5C4YehnRQ0@r!hB6?mXB@Q#tTS{Dr_b714pX*)926uuy zJl>@l-;MRM#3^tk+@|GhDyPhGSBm|Ks0va5w`sV38Nb^|y$_miH8pnXC2!ZkK0-(b zMFp1j>^#B-*J4CyHo~kd2zsKMPlk9jFUV`B&^Wj!Jh&7Q>Q{<5@m$C=C!%r~uH432 zrUG%bRG$cU>z9)kwKuWk*5l#0V#FQz_>cMBjja>R8{&Ef)Qo}qZoZi$Glej8*cV*q zS|KL~4_5kQimA)^z6=El3H9yB_2yxe5j~K2kFcB)R0gEK1ul1&K4#{w_!KCnMvATR z_mt0nZ{VYU)a|`&Y@ea%>tm1p^x;x)qf%hou*F2eoASdT5JL%T$PXu97bYnNjvCk} zFpZVHIhe^eS{NV0eUgV$`HBkuk_){)MU|WY<3>^9;yUkGhE)G`yZ=vSHwpJ;e4Jwc zLk(Nj(eYTq-V?g=-#@qi1O0GGwdyIKyyN^wrx}R0lk5~g4i6Wm3ybN}Yfe5?)8-a|EjUbUjW6yn` TGwd2&wVVvr3Flbua5D98Jz@^> literal 0 HcmV?d00001 diff --git a/sprites/spr_weapoon_powso_flamberge/layers/b9e276c7-1d8b-4129-82dc-1842ecff6f07/14afc33a-1a1a-4c24-bf75-ee4e1cb523e8.png b/sprites/spr_weapoon_powso_flamberge/layers/b9e276c7-1d8b-4129-82dc-1842ecff6f07/14afc33a-1a1a-4c24-bf75-ee4e1cb523e8.png new file mode 100644 index 0000000000000000000000000000000000000000..beb610c16e91e4aee1dcef31bd0e0972155a66b7 GIT binary patch literal 2185 zcmb7FeK^zW8~;`(k_r{7o#;3s>YydI#r8|6p?QBvA|WPPYs-wGNF|~6Qpz_vjAa%| ziO^2vC0%XHS=nL6Y2GOu^U}QSe4Rgj*Y&%u(;vU*d9LezuFrjc?)$l4uItJ0z#U${ zcH3G20M=uVIC?>n0{|-=)~G=@=8ymni5+1_yp94uf(ZazybJ(y5Oi?}04`Voz{p7e zK;;5}{yFf4ryZnFJLP)V5l}7f2Mrts0I1Wjjt70>JHN^v6E+PRw)`dX#prnSUS6@+ z_mto_hhm=9jNwSZtIqrUiyCUpPn^H{aCs~v4^9b!Mc>h%eCSjQ?gkbwpAR0JcF^&= zCJ2)qr-;IOkQz|1e_!_P`AK^{RHF%i<{G*&Ry++@)NDEZ?61cTJ!JcfnVnS_4>Oz- zoZ|w1?I%3dXZS zi6r8R(o_#7og1PbunJbG4oe#C zJ>RZ&N>Ef(M4Ou`9ew=RLATe99&`3APHQ-2Ng268ON&IKbxl_W{Q86>oSz*ZoS3jm zQ7uyFePWKg-l0|AaNz;Um>Z$u(W9MM$hyuzZ@1q}<%XTJU`tC&M^BHtv|3CpY5FkX z1M-uGe-K^|8&G3*k${ ztGiQzlz9efug_Vn6T#{t85kNy+8LO(l0Cx@THERB>+3lho4pu(y2Hq98)vmn#%i5( z$SP3#*2kcr0PS1sp?q=bHFgvTndv!h_B$`aA9VC05kn6;(hC!Dnnv_OB4oTdOAIpD z^GfN3q>?y^C=FK0&3a+?dS*8)w%nTbdFG?JO&66K0{iT5UzN_s=Ni_Jh_TLGa6k$|- zcrmDEL%q=<_1ECx2S#J0tzl37UtsRnjm@@OUg-$>Hdn}CFzjgGtm^9Ou;RX^O#P4p zx0R|yoAdkwRr=+s#+;Jc>NkU9V`I;27STtVhe+`EmY5gCjp(16L=d%g?%r6Z)R5}^?1T-4Tu!J%W%p8wQ0&R3x+ z1?B1@!SG~sqYYMXHS)}vGo!zAQrs-I8sxNeba$6e1l6oKK|>F+3hS@8MKNVE8J5jR zbxLsMp@eY+f~C5;x@7JFXf(PS5^eMH@~9JkzM7iX902uI zS_!<@YM|P5v4^x;@aom8n47G8bqVjaD^~2DD(&tTmibpqE-lW}7QPY3t~U1)gZat! z8j6sVgzbyoKj8w7fJ|RFj$fL^4h97|n5CL2^?Xc9etc<^Hn#~G8Ru!eEo<^iM^*XN z#F|FYGQg%H@*vRy#zd)vGI z=D1v6bDX4XUzrP74wKW(i5C4YehnRQ0@r!hB6?mXB@Q#tTS{Dr_b714pX*)926uuy zJl>@l-;MRM#3^tk+@|GhDyPhGSBm|Ks0va5w`sV38Nb^|y$_miH8pnXC2!ZkK0-(b zMFp1j>^#B-*J4CyHo~kd2zsKMPlk9jFUV`B&^Wj!Jh&7Q>Q{<5@m$C=C!%r~uH432 zrUG%bRG$cU>z9)kwKuWk*5l#0V#FQz_>cMBjja>R8{&Ef)Qo}qZoZi$Glej8*cV*q zS|KL~4_5kQimA)^z6=El3H9yB_2yxe5j~K2kFcB)R0gEK1ul1&K4#{w_!KCnMvATR z_mt0nZ{VYU)a|`&Y@ea%>tm1p^x;x)qf%hou*F2eoASdT5JL%T$PXu97bYnNjvCk} zFpZVHIhe^eS{NV0eUgV$`HBkuk_){)MU|WY<3>^9;yUkGhE)G`yZ=vSHwpJ;e4Jwc zLk(Nj(eYTq-V?g=-#@qi1O0GGwdyIKyyN^wrx}R0lk5~g4i6Wm3ybN}Yfe5?)8-a|EjUbUjW6yn` TGwd2&wVVvr3Flbua5D98Jz@^> literal 0 HcmV?d00001 diff --git a/sprites/spr_weapoon_powso_flamberge/spr_weapoon_powso_flamberge.yy b/sprites/spr_weapoon_powso_flamberge/spr_weapoon_powso_flamberge.yy new file mode 100644 index 0000000000..d582e2a271 --- /dev/null +++ b/sprites/spr_weapoon_powso_flamberge/spr_weapoon_powso_flamberge.yy @@ -0,0 +1,92 @@ +{ + "$GMSprite":"", + "%Name":"spr_weapoon_powso_flamberge", + "bboxMode":0, + "bbox_bottom":219, + "bbox_left":19, + "bbox_right":61, + "bbox_top":39, + "collisionKind":1, + "collisionTolerance":0, + "DynamicTexturePage":false, + "edgeFiltering":false, + "For3D":false, + "frames":[ + {"$GMSpriteFrame":"","%Name":"b9e276c7-1d8b-4129-82dc-1842ecff6f07","name":"b9e276c7-1d8b-4129-82dc-1842ecff6f07","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + ], + "gridX":0, + "gridY":0, + "height":322, + "HTile":false, + "layers":[ + {"$GMImageLayer":"","%Name":"14afc33a-1a1a-4c24-bf75-ee4e1cb523e8","blendMode":0,"displayName":"default","isLocked":false,"name":"14afc33a-1a1a-4c24-bf75-ee4e1cb523e8","opacity":100.0,"resourceType":"GMImageLayer","resourceVersion":"2.0","visible":true,}, + ], + "name":"spr_weapoon_powso_flamberge", + "nineSlice":null, + "origin":0, + "parent":{ + "name":"melee", + "path":"folders/Sprites/Marine Viewer/weapons/melee.yy", + }, + "preMultiplyAlpha":false, + "resourceType":"GMSprite", + "resourceVersion":"2.0", + "sequence":{ + "$GMSequence":"v1", + "%Name":"spr_weapoon_powso_flamberge", + "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_weapoon_powso_flamberge", + "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":"b9e276c7-1d8b-4129-82dc-1842ecff6f07","path":"sprites/spr_weapoon_powso_flamberge/spr_weapoon_powso_flamberge.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"93646429-a51d-45af-b161-669f4ae09116","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 From 51c53cca710554d4563790f7e99eff11517cfda4 Mon Sep 17 00:00:00 2001 From: Rathowm <3449985213@qq.com> Date: Thu, 8 May 2025 20:57:38 +0800 Subject: [PATCH 031/286] fix: Pistol modifier inconsistent with description (#811) --- scripts/scr_marine_struct/scr_marine_struct.gml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/scr_marine_struct/scr_marine_struct.gml b/scripts/scr_marine_struct/scr_marine_struct.gml index 01de86024b..524211cd81 100644 --- a/scripts/scr_marine_struct/scr_marine_struct.gml +++ b/scripts/scr_marine_struct/scr_marine_struct.gml @@ -1735,7 +1735,7 @@ function TTRPG_stats(faction, comp, mar, class = "marine", other_spawn_data = {} secondary_modifier = 0; } else { secondary_modifier = 0.6; - side_arm_data = "Pistol: x0.8"; + side_arm_data = "Pistol: x0.6"; } } else if (secondary_weapon.has_tag("flame")) { secondary_modifier = 0.3; From e0b75fa738efbcb80853455d9f11f748357a5984 Mon Sep 17 00:00:00 2001 From: Rathowm <3449985213@qq.com> Date: Fri, 9 May 2025 07:27:54 +0800 Subject: [PATCH 032/286] fix: Range multiplier not applied to range attack (#810) --- scripts/scr_marine_struct/scr_marine_struct.gml | 1 + 1 file changed, 1 insertion(+) diff --git a/scripts/scr_marine_struct/scr_marine_struct.gml b/scripts/scr_marine_struct/scr_marine_struct.gml index 524211cd81..e7d3e7045b 100644 --- a/scripts/scr_marine_struct/scr_marine_struct.gml +++ b/scripts/scr_marine_struct/scr_marine_struct.gml @@ -1550,6 +1550,7 @@ function TTRPG_stats(faction, comp, mar, class = "marine", other_spawn_data = {} explanation_string += $"Secondary: +{second_attack}#"; } } + final_range_attack = floor(final_range_attack * range_multiplyer); ranged_damage_data = [final_range_attack, explanation_string, carry_data, primary_weapon, secondary_weapon]; return ranged_damage_data; }; From 2b02b0a57579635d4c2ea1014cc061528eb628c7 Mon Sep 17 00:00:00 2001 From: EttyKitty <20323032+EttyKitty@users.noreply.github.com> Date: Sun, 11 May 2025 19:37:32 +0300 Subject: [PATCH 033/286] ci: Attempt to fix commit checking and old build deletion (#816) --- .github/workflows/release_dev.yml | 111 +++++++++++++++--------------- 1 file changed, 57 insertions(+), 54 deletions(-) diff --git a/.github/workflows/release_dev.yml b/.github/workflows/release_dev.yml index aa32251903..e7a5c8d757 100644 --- a/.github/workflows/release_dev.yml +++ b/.github/workflows/release_dev.yml @@ -36,32 +36,55 @@ jobs: # manual override if [ "${{ github.event_name }}" = "workflow_dispatch" ]; then - echo "Manually triggered → build." + echo "Manually triggered → build." echo "needed=true" >> $GITHUB_OUTPUT exit 0 fi # determine commit range since last tag + # Use 2>/dev/null to suppress error if no tags exist LAST_TAG=$(git describe --tags --abbrev=0 2>/dev/null || echo "") if [ -n "$LAST_TAG" ]; then RANGE="$LAST_TAG..HEAD" + echo "Checking commits in range: $RANGE (since last tag '$LAST_TAG')" else - RANGE="HEAD" + RANGE="HEAD" # If no tags, check all commits up to HEAD + echo "No previous tags found. Checking all commits up to HEAD." fi - echo "Commit range: $RANGE" + + # Check if there are *any* commits in the range. + # git log -n 1 --format=%H will return the latest commit SHA if there's at least one. + # If the range is empty (HEAD is same as LAST_TAG), it returns nothing. + COMMITS_IN_RANGE=$(git log $RANGE -n 1 --format=%H 2>/dev/null || echo "") + + if [ -z "$COMMITS_IN_RANGE" ]; then + echo "No new commits found in the range '$RANGE'. HEAD is likely the same as the last tag ($LAST_TAG)." + echo "Skipping build as no changes since the last tagged build." + # needed is already defaulted to false, so we just exit. + exit 0 + fi + + # If we reached here, there are new commits in the range. + echo "New commits found in range '$RANGE'. Checking their messages." # collect all commit messages in range ALL_MSGS=$(git log $RANGE --pretty=%B) echo "Messages in range:" - echo "$ALL_MSGS" + # Use sed to indent messages for clarity in logs + echo "$ALL_MSGS" | sed 's/^/ /' - # only skip if every message matches exclude pattern + # only build if at least one message does NOT match exclude pattern + # The -v option inverts the match; -E enables extended regex; -q suppresses output. + # The overall command exits successfully (0) if a non-matching line is found. EXCLUDE="^(docs|chore|style|ci)" if echo "$ALL_MSGS" | grep -vEq "$EXCLUDE"; then - echo "Found non-excluded commit → build needed." + echo "Found at least one commit message not matching the exclude pattern '$EXCLUDE'." + echo "Build needed." echo "needed=true" >> $GITHUB_OUTPUT else - echo "All commits are docs/chore/style/ci → skipping build." + echo "All new commit messages match the exclude pattern '$EXCLUDE'." + echo "Skipping build." + # needed is already defaulted to false. fi prepare_release: @@ -90,66 +113,46 @@ jobs: echo "tag_name=$TAG_NAME" >> $GITHUB_OUTPUT echo "build_date=$DATE_TAG" >> $GITHUB_OUTPUT - - name: Cleanup old releases (debug mode) - run: | - set -euo pipefail - - #— Produce TAG_NAME earlier in your workflow: - TAG_NAME="${{ steps.tag_info.outputs.tag_name }}" - echo "DEBUG: TAG_NAME='${TAG_NAME}'" - - BRANCH_SUFFIX="${TAG_NAME%%/*}" - PREFIX="${BRANCH_SUFFIX}/" - echo "DEBUG: PREFIX='${PREFIX}'" - - echo "All releases:" - gh release list --limit 100 | awk '{print $1}' - - echo "Releases matching prefix:" - MATCHING=$(gh release list --limit 100 | awk '{print $1}' | grep "^${PREFIX}" || true) - echo "$MATCHING" | cat -n - - # Only delete if we actually matched anything - if [ -n "$MATCHING" ]; then - COUNT=0 - KEEP=10 - IFS=$'\n' - for TAG in $MATCHING; do - COUNT=$((COUNT+1)) - if [ "$COUNT" -gt "$KEEP" ]; then - echo "Deleting: $TAG" - # gh release delete "$TAG" --cleanup-tag -y - fi - done - unset IFS - else - echo "No releases to delete for prefix '$PREFIX'" - fi - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - - name: Cleanup old releases run: | - # tag_name looks like: branch-name/date + set -euo pipefail # Exit immediately if a command exits with a non-zero status + + # tag_name looks like: branch-name/date (e.g., main/2025-05-10-2220) TAG_NAME="${{ steps.tag_info.outputs.tag_name }}" - BRANCH_SUFFIX="${TAG_NAME%%/*}" - PREFIX="${BRANCH_SUFFIX}/" - echo "Checking releases with prefix: $PREFIX" + # Extract the branch prefix from the tag name (e.g., "main/") + # This assumes your tag format is always 'branch-name/date' + BRANCH_PREFIX="${TAG_NAME%%/*}/" - # Get tags starting with the prefix, sort reverse chronologically (best effort with default sort) - # Using gh release list is more reliable than just git tags if releases exist - TAGS=$(gh release list --limit 100 | awk '{print $1}' | grep "^${PREFIX}" | sort -r) + echo "Checking releases with prefix: $BRANCH_PREFIX" + + # Get tag names starting with the prefix from the gh release list, sort reverse chronologically by tag name. + # Use || true at the end of the pipe to prevent the step from failing if no releases match the prefix + TAGS_TO_PROCESS=$(gh release list --limit 100 --json tagName | jq -r '.[].tagName' | grep "^${BRANCH_PREFIX}" | sort -r || true) + + if [ -z "$TAGS_TO_PROCESS" ]; then + echo "No releases found matching prefix '${BRANCH_PREFIX}'. No cleanup needed." + exit 0 + fi COUNT=0 RELEASES_TO_KEEP=10 # How many releases per branch prefix to keep - for TAG in $TAGS; do + echo "Found releases matching prefix '${BRANCH_PREFIX}'. Will keep the latest $RELEASES_TO_KEEP." + + IFS=$'\n' # Set IFS to newline to correctly iterate over tags + for TAG in $TAGS_TO_PROCESS; do COUNT=$((COUNT + 1)) if [ $COUNT -gt $RELEASES_TO_KEEP ]; then echo "Deleting old release+tag: $TAG" - gh release delete "$TAG" -y --cleanup-tag || echo "Failed to delete release $TAG, maybe already deleted?" + # gh release delete "$TAG" -y --cleanup-tag command deletes the release AND the associated git tag + # Use || echo to log a non-fatal warning if deletion fails (e.g., release already gone) + # gh release delete "$TAG" -y --cleanup-tag || echo "Warning: Failed to delete release $TAG. It may have been deleted already." + else + echo "Keeping release+tag: $TAG (it's within the latest $RELEASES_TO_KEEP)" fi done + unset IFS # Reset IFS + env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # Needs permissions to delete releases/tags From 686eb39e9b62de6b4b18e4caa8928a007f00ce88 Mon Sep 17 00:00:00 2001 From: Luke Van Epen Date: Tue, 13 May 2025 09:55:33 +1000 Subject: [PATCH 034/286] feat: Celestial Lions (#812) --- ChapterMaster.yyp | 2 + .../chapters/icons/celestial_lions.png | Bin 0 -> 26543 bytes datafiles/main/chapters/34.json | 2 +- datafiles/main/chapters/35.json | 328 ++++++++++++++++++ .../scr_initialize_custom.gml | 18 +- .../scr_unit_spawn_functions.gml | 3 +- 6 files changed, 343 insertions(+), 10 deletions(-) create mode 100644 datafiles/images/creation/chapters/icons/celestial_lions.png create mode 100644 datafiles/main/chapters/35.json diff --git a/ChapterMaster.yyp b/ChapterMaster.yyp index 7f193bbbe1..249367d1a5 100644 --- a/ChapterMaster.yyp +++ b/ChapterMaster.yyp @@ -131,6 +131,7 @@ {"$GMIncludedFile":"","%Name":"blood_angels.png","CopyToMask":-1,"filePath":"datafiles/images/creation/chapters/icons","name":"blood_angels.png","resourceType":"GMIncludedFile","resourceVersion":"2.0",}, {"$GMIncludedFile":"","%Name":"blood_ravens.png","CopyToMask":-1,"filePath":"datafiles/images/creation/chapters/icons","name":"blood_ravens.png","resourceType":"GMIncludedFile","resourceVersion":"2.0",}, {"$GMIncludedFile":"","%Name":"carcharodons.png","CopyToMask":-1,"filePath":"datafiles/images/creation/chapters/icons","name":"carcharodons.png","resourceType":"GMIncludedFile","resourceVersion":"2.0",}, + {"$GMIncludedFile":"","%Name":"celestial_lions.png","CopyToMask":-1,"filePath":"datafiles/images/creation/chapters/icons","name":"celestial_lions.png","resourceType":"GMIncludedFile","resourceVersion":"2.0",}, {"$GMIncludedFile":"","%Name":"conservators.png","CopyToMask":-1,"filePath":"datafiles/images/creation/chapters/icons","name":"conservators.png","resourceType":"GMIncludedFile","resourceVersion":"2.0",}, {"$GMIncludedFile":"","%Name":"crimson_fists.png","CopyToMask":-1,"filePath":"datafiles/images/creation/chapters/icons","name":"crimson_fists.png","resourceType":"GMIncludedFile","resourceVersion":"2.0",}, {"$GMIncludedFile":"","%Name":"dark_angels.png","CopyToMask":-1,"filePath":"datafiles/images/creation/chapters/icons","name":"dark_angels.png","resourceType":"GMIncludedFile","resourceVersion":"2.0",}, @@ -516,6 +517,7 @@ {"$GMIncludedFile":"","%Name":"32.JSON","CopyToMask":-1,"filePath":"datafiles/main/chapters","name":"32.JSON","resourceType":"GMIncludedFile","resourceVersion":"2.0",}, {"$GMIncludedFile":"","%Name":"33.json","CopyToMask":-1,"filePath":"datafiles/main/chapters","name":"33.json","resourceType":"GMIncludedFile","resourceVersion":"2.0",}, {"$GMIncludedFile":"","%Name":"34.json","CopyToMask":-1,"filePath":"datafiles/main/chapters","name":"34.json","resourceType":"GMIncludedFile","resourceVersion":"2.0",}, + {"$GMIncludedFile":"","%Name":"35.json","CopyToMask":-1,"filePath":"datafiles/main/chapters","name":"35.json","resourceType":"GMIncludedFile","resourceVersion":"2.0",}, {"$GMIncludedFile":"","%Name":"4.JSON","CopyToMask":-1,"filePath":"datafiles/main/chapters","name":"4.JSON","resourceType":"GMIncludedFile","resourceVersion":"2.0",}, {"$GMIncludedFile":"","%Name":"5.JSON","CopyToMask":-1,"filePath":"datafiles/main/chapters","name":"5.JSON","resourceType":"GMIncludedFile","resourceVersion":"2.0",}, {"$GMIncludedFile":"","%Name":"6.JSON","CopyToMask":-1,"filePath":"datafiles/main/chapters","name":"6.JSON","resourceType":"GMIncludedFile","resourceVersion":"2.0",}, diff --git a/datafiles/images/creation/chapters/icons/celestial_lions.png b/datafiles/images/creation/chapters/icons/celestial_lions.png new file mode 100644 index 0000000000000000000000000000000000000000..cef0226c4512e30f3aede037baa74cc9aa046edf GIT binary patch literal 26543 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 N002ovPDHLkV1lh4(M|vW literal 0 HcmV?d00001 diff --git a/datafiles/main/chapters/34.json b/datafiles/main/chapters/34.json index 2cffceccfb..1efdde8555 100644 --- a/datafiles/main/chapters/34.json +++ b/datafiles/main/chapters/34.json @@ -1,5 +1,6 @@ { "chapter": { + "name": "Flesh Tearers", "mutations": { "betchers": 0.0, "catalepsean": 0.0, @@ -162,7 +163,6 @@ "" ], "discipline": "librarius", - "name": "Flesh Tearers", "full_liveries": [ { "right_trim": 7.0, diff --git a/datafiles/main/chapters/35.json b/datafiles/main/chapters/35.json new file mode 100644 index 0000000000..23544b5a82 --- /dev/null +++ b/datafiles/main/chapters/35.json @@ -0,0 +1,328 @@ +{ + "chapter": { + "id": 35, + "name": "Celestial Lions", + "flavor": "The Celestial Lions are a Space Marine chapter nearly annihilated by the Inquisition after they dared question Inquisitorial atrocities on Armageddon, with their remnants saved from extinction only through the intervention of the Black Templars. Currently they have barely a hundred brothers left.", + "origin": 2, // 1 - Founding, 2 - Successor, 3 - Other/non-canon/fanmade, 4 - Custom + "points": 150, + "founding": 4, // The id of the founding chapter, 0 for unknown or none, 10 for random + "splash": 98, // in \images\creation\chapters\splash folder, the img number, 1 being Dark Angels etc. + "icon_name": "celestial_lions", + "fleet_type": 2, // 1= Homeworld, 2 = Fleet based, 3 = Penitent + "strength": 1, // 1-10 + "purity": 10, // 1-10 + "stability": 99, // 1-99 + "cooperation": 5, // 1-10 + "homeworld_exists": 1, // 1 = true + "recruiting_exists": 1, // 1 = true + "homeworld_rule": 1, // 1 = Govenor, 2 = Countries, 3 = Personal Rule + "homeworld": "", // one of "Lava" "Desert" "Forge" "Hive" "Death" "Agri" "Feudal" "Temperate" "Ice" "Dead" "Shrine" + "homeworld_name": "", // Homeworld Planet name, leave blank to autogenerate + "recruiting": "Death", // one of "Lava" "Desert" "Forge" "Hive" "Death" "Agri" "Feudal" "Temperate" "Ice" "Dead" "Shrine" + "recruiting_name": "", // Recruiting Planet name, leave blank to autogenerate + "discipline": "librarius", // one of 'default' 'biomancy' 'pyromancy' 'telekinesis' 'rune_magic' + "aspirant_trial": "SURVIVAL", // one of "BLOODDUEL" "HUNTING" "SURVIVAL" "EXPOSURE" "KNOWLEDGE" "CHALLENGE" "APPRENTICESHIP" + "advantages": [ + "", // leave the first entry blank for now + "Enemy: Orks", + "", + "", + "", + "", + "", + "", + "" + ], + "disadvantages": [ + "", // leave the first entry blank for now + "Obliterated", + "Suspicious", + "", + "", + "", + "", + "", + "" + ], + "colors": { + "secondary": "Gold", + "pauldron_r": "Turqoise", + "pauldron_l": "Turqoise", + "trim": "Lighter Black", + "lens": "Red", + "weapon": "Black", + "main": "Gold", + "special": 0.0 + }, + "complex_livery_data": { + "sgt": { + "helm_lens": 11.0, + "helm_pattern": 0.0, + "helm_primary": 8.0, + "helm_secondary": 0.0, + "helm_detail": 0.0 + }, + "veteran": { + "helm_lens": 11.0, + "helm_pattern": 0.0, + "helm_primary": 29.0, + "helm_secondary": 0.0, + "helm_detail": 0.0 + }, + "vet_sgt": { + "helm_lens": 11.0, //dark red + "helm_pattern": 0.0, + "helm_primary": 8.0, //black + "helm_secondary": 0.0, + "helm_detail": 0.0 + }, + "captain": { + "helm_lens": 22.0, //lime + "helm_pattern": 0.0, + "helm_primary": 29.0, //turquoise + "helm_secondary": 0.0, + "helm_detail": 0.0 + } + }, + "names": { + //Chapter Staff + "hchaplain": "", // Head Chaplain + "clibrarian": "", // Chief Librarian + "fmaster": "", // Forge Master + "hapothecary": "", // Head Apothecary + //Company Captains 1 - 10 + "honorcapt": "", + "watchmaster": "", + "arsenalmaster": "", + "admiral": "", + "marchmaster": "", + "ritesmaster": "", + "victualler": "", + "lordexec": "", + "relmaster": "", + "recruiter": "" + }, + "battle_cry": "For the Emperor!", + "equal_specialists": 0, // 0 if no, 1 if yes. If yes, will distribute specialist roles like Assaults and Devastators equally between companies. Otherwise all Assaults go in Company 8 and all Devastators in Company 9 + "load_to_ships": { + "escort_load": 2, // 0 no, 2 yes, 1 doesnt do anything :) + "split_scouts": 0, // 0 no, 1 yes. If yes, splits scouts between companies equally. Otherwise all scouts are kept in 10th Company. + "split_vets": 0 // 0 no, 1 yes. If yes, all veterans are distrubuted equally between companies. Otherwise all veterans are kept in the 1st Company + }, + "successors": 0, //total number of successor chapters + "mutations": { + "preomnor": 0, + "voice": 0, + "doomed": 0, + "lyman": 0, + "omophagea": 0, + "ossmodula": 0, + "membrane": 0, + "zygote": 0, + "betchers": 0, + "catalepsean": 0, + "secretions": 0, + "occulobe": 0, + "mucranoid": 0 + }, + "disposition": [ + 0, // nothing + 0, // Progenitor faction + 42, // Imperium + 50, // Admech + 22, //Inquisition + 24, // Ecclesiarchy + 50, // Astartes + 0 // nothing + ], + "chapter_master": { + "name": "Ekene Dubaku", + "specialty": 1, //1 Leader, 2 Champion, 3 Psyker, + "melee": 5, // 1 twin power fists ... 8 force staff + "ranged": 3, // 1 boltstorm gauntlets ... 7 storm shield + // All chapter masters have the trait `Lead by Example` by default + "traits": [ + "" + ], + "gear": "", + "mobi": "", + "armour": "" // default is Artificer armour, only needed to set if changing to something else. + }, + "artifact": [], + "company_titles": [ + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "" + ], + "flagship_name": "Hex", // leave blank to autogenerate + /** + * * Default fleet composition + * * Homeworld + * - 2 Battle Barges, 8 Strike cruisers, 7 Gladius, 3 Hunters + * * Fleet based and Penitent + * - 4 Battle Barges, 3 Strike Cruisers, 7 Gladius, 3 Hunters + * + * use negative numbers to subtract ships + * * Stacks with advantages/disadvantages + */ + "extra_ships": { + "battle_barges": 0, + "gladius": 0, + "strike_cruisers": 0, + "hunters": 0 + }, + /** + * * Default HQ Layout (Does not include company specialists) + * - 8 Chaplains, 8 Techmarines, 8 Apothecary, 2 Epistolary (librarian), + * - 2 Codiciery, 4 Lexicanum + * * Default Company specialists (divided based on `load_to_ships.split_vets` setting) + * - 20 Terminators, 85 Veterans, 20 Devastators, 20 Assault + * Use negative numbers to subtract + * * Stacks with advantages/disadvantages + */ + "extra_specialists": { + "chaplains": 0, + "techmarines": 0, + "apothecary": -10, + "epistolary": 0, + "codiciery": 0, + "lexicanum": 0, + "terminator": -10, + "assault": 0, + "veteran": 45, //offset obliterated + "devastator": 0 + }, + /** + * * Default Marine strength + * - 100 marines per company + * use negative numbers to subtract + * * Stacks with strength for non-founding chapters only + */ + "extra_marines": { + "second": 0, + "third": 0, + "fourth": 0, + "fifth": 0, + "sixth": 0, + "seventh": 0, + "eighth": 0, + "ninth": 0, + "tenth": 40 //offset obliterated + }, + /** + * All vehicles are added to the 10th company at the start of the game + */ + "extra_vehicles": { + "rhino": 0, + "whirlwind": 0, + "predator": 0, + "land_raider": 0, + "land_speeder": 0 + }, + /** Add extra starting items ["Item Name", Number to add] */ + "extra_equipment": [ + // [ + // "Bolter", + // 20 + // ] + ], + /** + * Provide a place to change the default name and equipment preferences of roles for this chapter + * `custom_roles` should be used for specialist/leadership type roles, + * To affect an entire squad, see `custom_squads` below + */ + "custom_roles": { + "captain": { + "name": "Warleader" + }, + "sergeant": { + "name": "Pride Leader" + }, + "chaplain": { + "name": "Deathspeaker" + }, + "librarian": { + "name": "Spiritwalker" + }, + "apothecary": { + "name": "Lifebinder" + } + // "tactical": { + // "name": "Tactical" + // }, + // "devastator": { + // "name": "Devastator" + // }, + // "assault": { + // "name": "Assault", + // "wep1": "Chainsword" + // }, + // "scout": { + // "name": "Scout", + // "wep1": "Sniper Rifle" + // }, + // "chaplain": { + // "name": "Chaplain", + // }, + // "techmarine": { + // "name": "Techmarine", + // "wep1": "Power Axe" + // }, + // "apothecary": { + // "name": "Apothecary", + // "wep1": "Power Axe" + // }, + // "librarian": { + // "name": "Librarian", + // "wep1": "Force Staff" + // }, + // "sergeant": { + // "name": "Sergeant", + // "wep1": "Chainaxe" + // }, + // "veteran_sergeant": { + // "name": "Veteran Sergeant", + // "wep1": "Chainaxe" + // } + }, + /** + * * Custom squad roles, loadouts and formations + * When companies are made, squads are formed based on these rules: + * - squad name: one of captain, terminator, terminator_assault, sternguard_veteran, + vanguard_veteran, devastator, tactical, assault, scout, scout_sniper + * - squad array layout [Role, Role, ...Role, type_data] + * - each element of the array is a default Role, and their settings. + - if you changed the role using `custom_roles` you need to reference the role with this new name + - for non-leader roles it is better to change the name of the role in the squad layout instead + * - unit layout [Role Name, Settings Struct] + * - settings struct: + * - max: The most amount of this unit is allowed per squad + * - min: The squad can't be formed unless at least 1 of this unit is in it + * - role: The name of the unit when it is a member of the squad. This is where you rename roles e.g. + "Terminator" > "Deathwing Terminator" + ** - loadout: Struct containing Required and Optional weaponry this unit can equip + a required loadout always follows this syntax :[,] + so "wep1":["Bolter",4], will mean four marines are always equipped with 4 bolters in the wep1 slot + * option loadouts follow the following syntax :[[],] + for example [["Flamer", "Meltagun"],1], means the role can have a max of one flamer or meltagun + [["Plasma Pistol","Bolt Pistol"], 4] means the role can have a mix of 4 plasma pistols and bolt pistols on top + of all required loadout options + - wep1: right hand weapon + - wep2: left hand weapon + - mobi: Mobility item, e.g. Jump Packs. + - armour: required armour + - gear: special equipment needed for certain roles, like a Roasrius or Narthecium + * - type_data: names the squad, allows certain formations + */ + "squad_name": "Squad", + "custom_squads": {} + } +} \ No newline at end of file diff --git a/scripts/scr_initialize_custom/scr_initialize_custom.gml b/scripts/scr_initialize_custom/scr_initialize_custom.gml index f9cad9dcc1..b5d6404c58 100644 --- a/scripts/scr_initialize_custom/scr_initialize_custom.gml +++ b/scripts/scr_initialize_custom/scr_initialize_custom.gml @@ -1055,6 +1055,7 @@ function scr_initialize_custom() { landspeeder = 0; rhino = 0; whirlwind = 0; + dreadnought = 0; } if scr_has_disadv("Enduring Angels") { @@ -2509,7 +2510,7 @@ function scr_initialize_custom() { tacticals: 0, assaults: 0, devastators: 0, - dreadnoughts: dreadnought+1, + dreadnoughts: dreadnought == 0 ? 0 : dreadnought+1, //handle obliterated predators: predator, landraiders: landraider }, @@ -2598,7 +2599,7 @@ function scr_initialize_custom() { } } - // log_message($"Pre balancing company totals: {json_stringify(companies,true)}") + log_message($"Pre balancing company totals: {json_stringify(companies,true)}") // Extra vehicles loaded from json files all get dumped into the 10th company for the player to sort out var vehicle_keys = ["rhino", "whirlwind", "predator", "land_raider", "land_speeder"]; @@ -2638,6 +2639,9 @@ function scr_initialize_custom() { var _moved_scouts = 0; var _coys = struct_get_names(companies); + function _is_terminator (_armour) { + return array_contains(["Terminator Armour", "Tartaros"], _armour); + }; for(var _c = 0, _clen = array_length(_coys); _c < _clen; _c++ ){ var k = 0, v = 0;//k = marine slot, v = vehicle slot @@ -2762,16 +2766,14 @@ function scr_initialize_custom() { } } - // log_message($"New Company Totals: eq specialists: {equal_specialists}: scout coy {scout_company_behaviour} equal_scouts: {equal_scouts}"); - // log_message($"Company {_coy.coy}: {json_stringify(_coy,true)}"); + log_message($"New Company Totals: eq specialists: {equal_specialists}: scout coy {scout_company_behaviour} equal_scouts: {equal_scouts}"); + log_message($"Company {_coy.coy}: {json_stringify(_coy,true)}"); var attrs = struct_get_names(_coy); - var _is_terminator = function(_armour) { - return array_contains(["Terminator Armour", "Tartaros"], _armour); - }; + // log_message($"attrs {attrs}"); for(var _a = 0, _alen = array_length(attrs); _a < _alen; _a++ ){ @@ -3308,7 +3310,7 @@ function add_unit_to_company(ttrpg_name, company, slot, role_name, role_id, wep1 } else { spawn_unit.roll_age(); spawn_unit.roll_experience(); - } + } if(role_id == eROLE.HonourGuard){ spawn_unit.add_trait(choose("guardian", "champion", "observant", "perfectionist","natural_leader")); } diff --git a/scripts/scr_unit_spawn_functions/scr_unit_spawn_functions.gml b/scripts/scr_unit_spawn_functions/scr_unit_spawn_functions.gml index a717662d01..2325f7822f 100644 --- a/scripts/scr_unit_spawn_functions/scr_unit_spawn_functions.gml +++ b/scripts/scr_unit_spawn_functions/scr_unit_spawn_functions.gml @@ -190,7 +190,8 @@ function scr_marine_spawn_armour() { var _terminator_roles_array = [obj_ini.role[100][eROLE.Captain], obj_ini.role[100][eROLE.Champion], obj_ini.role[100][eROLE.Ancient], obj_ini.role[100][eROLE.Chaplain], obj_ini.role[100][eROLE.Apothecary], obj_ini.role[100][eROLE.Librarian], obj_ini.role[100][eROLE.Techmarine]]; - if (_company == 1 && array_contains(_terminator_roles_array, _role)) { + // terminator/tartaros should be decided in scr_initialize_custom + if (_company == 1 && array_contains(_terminator_roles_array, _role) && armour() == "Terminator Armour") { _terminator_armour_roll(_total_score); } else { switch (_role) { From 8e8924d4ff28bba15c603eba8bf83bfc6c8fd81d Mon Sep 17 00:00:00 2001 From: Luke Van Epen Date: Tue, 13 May 2025 09:55:49 +1000 Subject: [PATCH 035/286] chore: Fleshtearers to use Enduring Angels instead of strength 1 (#813) --- datafiles/main/chapters/34.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/datafiles/main/chapters/34.json b/datafiles/main/chapters/34.json index 1efdde8555..5de8330fb9 100644 --- a/datafiles/main/chapters/34.json +++ b/datafiles/main/chapters/34.json @@ -47,7 +47,7 @@ "name": "Gabriel Seth" }, "fleet_type": 1.0, - "strength": 1.0, + "strength": 5.0, "extra_ships": { "battle_barges": 0.0, "gladius": 0.0, @@ -70,12 +70,12 @@ "second": 0.0, "third": 0.0, "fourth": 0.0, - "fifth": -100.0, + "fifth": 0.0, "sixth": 0.0, "seventh": 0.0, "eighth": 0.0, "ninth": 0.0, - "tenth": -100.0 + "tenth": -50.0 }, "extra_vehicles": { "whirlwind": 0.0, @@ -154,7 +154,7 @@ "disadvantages": [ "", "Black Rage", - "", + "Enduring Angels", "", "", "", From 2b4d2299b2c3f705a632acb7f8c77a963f2b6e5c Mon Sep 17 00:00:00 2001 From: Luke Van Epen Date: Wed, 14 May 2025 01:17:32 +1000 Subject: [PATCH 036/286] feat: Raptors chapter (#814) Co-authored-by: Nelsonh <81228864+OH296@users.noreply.github.com> --- ChapterMaster.yyp | 3 + .../creation/chapters/icons/raptors.png | Bin 0 -> 9104 bytes .../images/creation/chapters/splash/36.png | Bin 0 -> 306118 bytes datafiles/main/chapters/36.json | 1028 +++++++++++++++++ datafiles/main/chapters/template.JSON | 4 +- .../scr_colors_initialize.gml | 15 +- 6 files changed, 1042 insertions(+), 8 deletions(-) create mode 100644 datafiles/images/creation/chapters/icons/raptors.png create mode 100644 datafiles/images/creation/chapters/splash/36.png create mode 100644 datafiles/main/chapters/36.json diff --git a/ChapterMaster.yyp b/ChapterMaster.yyp index 249367d1a5..3032f1412f 100644 --- a/ChapterMaster.yyp +++ b/ChapterMaster.yyp @@ -142,6 +142,7 @@ {"$GMIncludedFile":"","%Name":"iron_hands.png","CopyToMask":-1,"filePath":"datafiles/images/creation/chapters/icons","name":"iron_hands.png","resourceType":"GMIncludedFile","resourceVersion":"2.0",}, {"$GMIncludedFile":"","%Name":"lamenters.png","CopyToMask":-1,"filePath":"datafiles/images/creation/chapters/icons","name":"lamenters.png","resourceType":"GMIncludedFile","resourceVersion":"2.0",}, {"$GMIncludedFile":"","%Name":"minotaurs.png","CopyToMask":-1,"filePath":"datafiles/images/creation/chapters/icons","name":"minotaurs.png","resourceType":"GMIncludedFile","resourceVersion":"2.0",}, + {"$GMIncludedFile":"","%Name":"raptors.png","CopyToMask":-1,"filePath":"datafiles/images/creation/chapters/icons","name":"raptors.png","resourceType":"GMIncludedFile","resourceVersion":"2.0",}, {"$GMIncludedFile":"","%Name":"raven_guard.png","CopyToMask":-1,"filePath":"datafiles/images/creation/chapters/icons","name":"raven_guard.png","resourceType":"GMIncludedFile","resourceVersion":"2.0",}, {"$GMIncludedFile":"","%Name":"red_scorpions.png","CopyToMask":-1,"filePath":"datafiles/images/creation/chapters/icons","name":"red_scorpions.png","resourceType":"GMIncludedFile","resourceVersion":"2.0",}, {"$GMIncludedFile":"","%Name":"salamanders.png","CopyToMask":-1,"filePath":"datafiles/images/creation/chapters/icons","name":"salamanders.png","resourceType":"GMIncludedFile","resourceVersion":"2.0",}, @@ -165,6 +166,7 @@ {"$GMIncludedFile":"","%Name":"3.png","CopyToMask":-1,"filePath":"datafiles/images/creation/chapters/splash","name":"3.png","resourceType":"GMIncludedFile","resourceVersion":"2.0",}, {"$GMIncludedFile":"","%Name":"32.png","CopyToMask":-1,"filePath":"datafiles/images/creation/chapters/splash","name":"32.png","resourceType":"GMIncludedFile","resourceVersion":"2.0",}, {"$GMIncludedFile":"","%Name":"33.png","CopyToMask":-1,"filePath":"datafiles/images/creation/chapters/splash","name":"33.png","resourceType":"GMIncludedFile","resourceVersion":"2.0",}, + {"$GMIncludedFile":"","%Name":"36.png","CopyToMask":-1,"filePath":"datafiles/images/creation/chapters/splash","name":"36.png","resourceType":"GMIncludedFile","resourceVersion":"2.0",}, {"$GMIncludedFile":"","%Name":"4.png","CopyToMask":-1,"filePath":"datafiles/images/creation/chapters/splash","name":"4.png","resourceType":"GMIncludedFile","resourceVersion":"2.0",}, {"$GMIncludedFile":"","%Name":"5.png","CopyToMask":-1,"filePath":"datafiles/images/creation/chapters/splash","name":"5.png","resourceType":"GMIncludedFile","resourceVersion":"2.0",}, {"$GMIncludedFile":"","%Name":"6.png","CopyToMask":-1,"filePath":"datafiles/images/creation/chapters/splash","name":"6.png","resourceType":"GMIncludedFile","resourceVersion":"2.0",}, @@ -517,6 +519,7 @@ {"$GMIncludedFile":"","%Name":"32.JSON","CopyToMask":-1,"filePath":"datafiles/main/chapters","name":"32.JSON","resourceType":"GMIncludedFile","resourceVersion":"2.0",}, {"$GMIncludedFile":"","%Name":"33.json","CopyToMask":-1,"filePath":"datafiles/main/chapters","name":"33.json","resourceType":"GMIncludedFile","resourceVersion":"2.0",}, {"$GMIncludedFile":"","%Name":"34.json","CopyToMask":-1,"filePath":"datafiles/main/chapters","name":"34.json","resourceType":"GMIncludedFile","resourceVersion":"2.0",}, + {"$GMIncludedFile":"","%Name":"36.json","CopyToMask":-1,"filePath":"datafiles/main/chapters","name":"36.json","resourceType":"GMIncludedFile","resourceVersion":"2.0",}, {"$GMIncludedFile":"","%Name":"35.json","CopyToMask":-1,"filePath":"datafiles/main/chapters","name":"35.json","resourceType":"GMIncludedFile","resourceVersion":"2.0",}, {"$GMIncludedFile":"","%Name":"4.JSON","CopyToMask":-1,"filePath":"datafiles/main/chapters","name":"4.JSON","resourceType":"GMIncludedFile","resourceVersion":"2.0",}, {"$GMIncludedFile":"","%Name":"5.JSON","CopyToMask":-1,"filePath":"datafiles/main/chapters","name":"5.JSON","resourceType":"GMIncludedFile","resourceVersion":"2.0",}, diff --git a/datafiles/images/creation/chapters/icons/raptors.png b/datafiles/images/creation/chapters/icons/raptors.png new file mode 100644 index 0000000000000000000000000000000000000000..479c0d6b457d56426d127cc6cd093f4d02e5275f GIT binary patch literal 9104 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 XZ&fzEhmHUzL{x^lMmptMm%{!FTXtB- literal 0 HcmV?d00001 diff --git a/datafiles/images/creation/chapters/splash/36.png b/datafiles/images/creation/chapters/splash/36.png new file mode 100644 index 0000000000000000000000000000000000000000..77861349ca7cc07c7bb3beccbcb7d8261f6a9709 GIT binary patch literal 306118 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

dMtF~ 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

dMtF~ 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":"", + "Keyframes":[], + "resourceType":"KeyframeStore", + "resourceVersion":"2.0", + }, + "eventStubScript":null, + "eventToFunction":{}, + "length":1.0, + "lockOrigin":false, + "moments":{ + "$KeyframeStore":"", + "Keyframes":[], + "resourceType":"KeyframeStore", + "resourceVersion":"2.0", + }, + "name":"spr_weapon_volkite_caliver", + "playback":1, + "playbackSpeed":1.0, + "playbackSpeedType":1, + "resourceType":"GMSequence", + "resourceVersion":"2.0", + "seqHeight":272.0, + "seqWidth":301.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":"746312be-a5f0-47ac-a783-e19dcde061a8","path":"sprites/spr_weapon_volkite_caliver/spr_weapon_volkite_caliver.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"73eb5e07-0f91-494b-bbf9-d2628d726607","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":39, + "yorigin":21, + }, + "swatchColours":null, + "swfPrecision":2.525, + "textureGroupId":{ + "name":"MarineViewer", + "path":"texturegroups/MarineViewer", + }, + "type":0, + "VTile":false, + "width":301, +} \ No newline at end of file diff --git a/sprites/spr_weapon_volkite_charger/b91b3e74-91d9-46d1-b954-65c7a49d8b7d.png b/sprites/spr_weapon_volkite_charger/b91b3e74-91d9-46d1-b954-65c7a49d8b7d.png new file mode 100644 index 0000000000000000000000000000000000000000..8ed5fecb09c7832c4869d1baf845c49a0df70897 GIT binary patch literal 4872 zcmc&&XH*kix1LZ!7o-WHBcQYwgdhQtE*# zzJfH?sKKObxS*=9}MoUy1Yp z?4Yl$30(eryy~b(2Y{<*x|(W;kh$$eYcJMg6xH5tq|1>9*Zc`bG(15=$3*R^pMK?r zCK)R;PqouCY7+#{KP$qF+Zv}#<&3qX`lVvRW-+Xl8Ak#h{O&OI0zb=V$eQQ(RqH^VAhE6_AlBn-ht#U#*c9rWtjE zLZnu7gOEsK(B>xrCTc*(^`2-s&y!JAvyYyYD7R^44EK+N72?GBxINXY1{xY2s*;!P zdF?ebxq4I;6~_TCI%~U$4F})p5n$H{Q8Adj*JoodKf=L*pg_zbVP|1=xNO693cBr0 zf@C{HnLgS7aE;Af(I5P>VL10Ny1v;KnK+2{CuT_sa$mU)NgC1-64d(`=*0JZYqkLv zek1|duZL-?|=ThNx%rm6<2q2 zCTKRgK|Q<|-o1(N^&Q8Bwu!5cYMoRRh7IxlDt3pY4LTiR*2q}JEpRc9I7k6~V@ZEa z%C=@z8%u_egOyHHQUVo5MV*Utb9wvuvZ^V(cWD6+)i?6%K&*S--r0r1GpfdV$sA%> zK!EH&Hmwx)xFV%ogHfC2XI{PS{wuWfz32?)D#X19gi1|z17F*YFg7EV3+OpY1&!}K zIP+-BV79t`-|}T0r&(34w%}FCncdpjS~pM62EJ$4q>fO=0&mHUsO{HHNM~ShP7SWKLs;bqp>=JJoR$Av@A56C^`|Kor?0J=+z&u|a8oq&{! zq>z#CH1zeKEg~Pw_gu3|prIfm?LD#yDTT#i_jE0;#SNVlR|V2CjP^k4Y}hi~0VcAS zx4qxS_f^@xDlQfv@dB8KhljI6JvemVb}>8DW78*c52W7B&park7~QS+qyixrOHuLU zXL0=a($bY)>8-y$$hIHl`q{q6qXnUiKMwyerS$u4eZB<{n!V?j5C3d^XI=2lt-Fdk z`tp8@7{^^#5i8~6ODo`HYHHfooR!7i*xbBYV_%uqMEmxSjwlKG29KU=VSFj?1AehH zxbIKjqAB?3n0SX0VLG{`U}yw4I}yh^;G<2ehut{9w;wO$+@hT6sE%t8$(KuX;}sKE zB-ir}a5XfN6+4vcp~GnNMRLR8@E0Zy{{GD5>od24KA~%dXJ=;OS65v~6aE|**qUn+ zcVumqRV~Oyt~ub21!D+wQtjwyDn>FOcz4M=#fy)Zx0!qaI)Y!$-+jlx5TLdmwm7D8 z`FwCt*DWtjQxH_mqad|8I$SPOdM8~W5_$VLgvOBgmWejD-gD-kGmedSUm`Cf`aI>} zy`u$p8b0ZnT#EMf_wP>(rth@W8#%bS>8yq)vp3f)BTCV$*1Ek`aRIi$bOpYv5;Bz+ zh|;#XEWL7>MAp&ayD~CS-}_T4WL;78eUMDEhWm?gqi94f+$_vsYM5gvYg#0faRWAL zkW-gdo?J&}>TQa_KkAM1h>S;wSmhobj;X|B-AOh2xeZyzlQSyenkPcvJFo$P()XHL z6yr9>p(Dy!vh@X~QPacvzZj`WxaAgOuNfk!w2> z)Q9p$4XR{HhTiRVp5Y=4_&Yut2r;YOWbH}4t_=Vr3e)INwsE`?GN9x6y%U`;*U+0zuvW)W;u3s$oo2ig+s8cMv{O1%Ah zd(tFEAU`}-HDBFYUwU+$Rrut?l@%hvG7Q{G((Gkt`%fJ; z%NZs;P3Yb3M{+^UH+x_!ViS%?rzO$jL_k-Hg)f%<7Hfhl3 z4h37!?fnq$i;D{Y&2uOC^I62j?-}a&UJhPf+!0d4EQ>9_!muC;x5>fB*T1vaw!M`9 zF#C}!o@KA|SCf0*&)waAlG@NuLH(8qpzwi(WS%=O3`DjMDzWY-d%cXWFYexFbCT;Z z8g1s>X#M9)fTVMW%Lqimx>>?;xLnqai;Ig+EF4S*YCCy#LoO#emi*55t9oB2NjR6*assrR7e$e)8H`GMfR?uQcK_$k3lDm$N#T}8SDodv;qf0* z5^hlL;3j+z)iA^)!UL7@a*d&Fw;BRcSJ*t2*b0fM;YIE)QN9>0AtxsfA@vEjq@{iB zc5f9@7_jWcqqTrr3@1&%-}_{dC9~T=uBy8s8P}pA%D4(bu(;UsY68)JOlY zbO|RlR~o9;LN7j2q(Sy@fb!haIFAT(F*xP%);`7;63)wB~N-H8N9V6vlZ-{T1hI~zR}s(o7y+*n>tNqES2(E*uj zYiqkjs!$Ti&dq;}qK{|f1G_{Y{=Up|JJNL%UCyWEj$kKV0hA|F{#aZorL5XATkwTR zL?{>CRfT2hsZnDPV$O8{RT;TF`!i=KSCFJ#GS|-Z)5Y!bhOSFLN1*5z*4}`6;9YEy zmQW!l=p3@Qc(^C4>S=_Rt?=^k8Ow|Q`0-<}NAy_svxuHyZ3 zv@a-(nL$yVW5zUzxo(in7voGTg?8Er@3;I}f0KLBMUS=Y?&>BQnY)qYpCGiV5 z54(80ZOP85ntsI+GX9z3xgGi6>oiayj9p=mk^h}MO%(^WQ`;(vAzSO+jg2A8&4ITP zjg5^?2KlD5L4ko#$F*XC-4=Ff3Vsvx9=X33f2FS5h^o+)Crz9fT2heTB%XKYd*`;| z90LPcpRr30Js|&B`}#GV?Jhnm4LE1cVb>V}k{&JZG82}cFKR$d6UOw)O`E(-2GSC2 zJN)&&OlN={X%s(#8xv3qweMZaCq=`rw+G-kgFHEcSR__Zo*Mx^U=C&b`xA^D-IwI*LF{+m!b}C@T)*3uF_D?QsLQR?1Q^`;SNcy-2 z+8JamxjZStQBw3Q_G4b+uUhf|BGED{mL%V2Y1{2(k-w)c?sZL+(UeK>=Th{!2$4w= zRNkX6d0NCZ5sqS$5$oJC6+ahKj?$$&nODZFUuE#?qUi#7?1;_768)4pi2i(k(Ud+gFUmO8TEU^4FB&+Ybtk=i#HX+!om((+{3uNxb;CMWqecM zJ>NTfTSkQ4zw~NA)=#Ou-~~ib=0LuKudlR^{X20Dj6D;oi;tuyHsa>Xc@-@>XB7de zri2(d%KRye+4@V~Lx01=G)~EV-haO|?rpE-gb#aJ^$wW}Y;0{o%_Z#)=&Skor%{n& zCbLluYC`gtUw&KPusxeTtws@MP))pf*juWe#tjB!GmDr+L; z;5wF}X?d-}#SaQavj40y#i|R0^I-S)_uK1O8rIaBDr&mdWuZb?e*?~J=B`1xSG~f! zLw(iHLsKp=zgAS1k24P)O>#5p3L1p>w!WNiy63nQn%U=jc3qQYUi$tQo7>a*JsWhy znp)zXH!=OqB5BWTQ^3Q`ZCS2E%j~bY6lH-8Xhi?dk!xR#Rpxo`;KNNJe75$lz)9S^ zS6j*&>kuj@K#r=TQuW&lDqYg_gv^`&OFvt(sukM#O?yDpW3cNX01 zI7<4^kT^`s7Zg|c(UuyFI}Yo9ba1<&MZ(GW6DG06@O9Id0`K(dS{VzMARJp=p@pML zLI2HuK?Z~k8>6Ak%r+5sXm`v&w}8Q7nO?WikO#aLbp3>>v_&YwK5W)?J{-{GX@8XWOGNge>Z*i?ObO8qAC z5)}?N46+()I(;JxOd}kQoiCQVqXF`U9mE;qgKBk$CKaly{|7Uhz9h$Jb$)7qozIhg z3<(F`vkY{46zHtz=6fH uyM+FC0P^0_FbQz;e`W}D_jV2leB|x>-!c5gm!xJG0CeveYU0%Gqy7V35G%X@ literal 0 HcmV?d00001 diff --git a/sprites/spr_weapon_volkite_charger/layers/b91b3e74-91d9-46d1-b954-65c7a49d8b7d/e98a4021-39fb-45ff-81e5-78fc2e913c77.png b/sprites/spr_weapon_volkite_charger/layers/b91b3e74-91d9-46d1-b954-65c7a49d8b7d/e98a4021-39fb-45ff-81e5-78fc2e913c77.png new file mode 100644 index 0000000000000000000000000000000000000000..8ed5fecb09c7832c4869d1baf845c49a0df70897 GIT binary patch literal 4872 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 literal 0 HcmV?d00001 diff --git a/sprites/spr_weapon_volkite_charger/spr_weapon_volkite_charger.yy b/sprites/spr_weapon_volkite_charger/spr_weapon_volkite_charger.yy new file mode 100644 index 0000000000..0ec12375f6 --- /dev/null +++ b/sprites/spr_weapon_volkite_charger/spr_weapon_volkite_charger.yy @@ -0,0 +1,111 @@ +{ + "$GMSprite":"v2", + "%Name":"spr_weapon_volkite_charger", + "bboxMode":0, + "bbox_bottom":196, + "bbox_left":3, + "bbox_right":61, + "bbox_top":98, + "collisionKind":1, + "collisionTolerance":0, + "DynamicTexturePage":false, + "edgeFiltering":false, + "For3D":false, + "frames":[ + {"$GMSpriteFrame":"v1","%Name":"b91b3e74-91d9-46d1-b954-65c7a49d8b7d","name":"b91b3e74-91d9-46d1-b954-65c7a49d8b7d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + ], + "gridX":0, + "gridY":0, + "height":231, + "HTile":false, + "layers":[ + {"$GMImageLayer":"","%Name":"e98a4021-39fb-45ff-81e5-78fc2e913c77","blendMode":0,"displayName":"default","isLocked":false,"name":"e98a4021-39fb-45ff-81e5-78fc2e913c77","opacity":100.0,"resourceType":"GMImageLayer","resourceVersion":"2.0","visible":true,}, + ], + "name":"spr_weapon_volkite_charger", + "nineSlice":{ + "$GMNineSliceData":"", + "bottom":0, + "enabled":false, + "guideColour":[4294902015,4294902015,4294902015,4294902015,], + "highlightColour":1728023040, + "highlightStyle":0, + "left":0, + "resourceType":"GMNineSliceData", + "resourceVersion":"2.0", + "right":0, + "tileMode":[ + 0, + 0, + 0, + 0, + 0, + ], + "top":0, + }, + "origin":0, + "parent":{ + "name":"ranged", + "path":"folders/Sprites/Marine Viewer/weapons/ranged.yy", + }, + "preMultiplyAlpha":false, + "resourceType":"GMSprite", + "resourceVersion":"2.0", + "sequence":{ + "$GMSequence":"v1", + "%Name":"spr_weapon_volkite_charger", + "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_weapon_volkite_charger", + "playback":1, + "playbackSpeed":1.0, + "playbackSpeedType":1, + "resourceType":"GMSequence", + "resourceVersion":"2.0", + "seqHeight":231.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":"b91b3e74-91d9-46d1-b954-65c7a49d8b7d","path":"sprites/spr_weapon_volkite_charger/spr_weapon_volkite_charger.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"4fd01b85-2055-4135-b8d2-6b4b621d9ab0","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_weapon_volkite_culverin/27b95a4c-b7c0-4f2e-aa03-ece8e4e50432.png b/sprites/spr_weapon_volkite_culverin/27b95a4c-b7c0-4f2e-aa03-ece8e4e50432.png new file mode 100644 index 0000000000000000000000000000000000000000..9d9444b122c2f17d523bd2addbf559794b410c9e GIT binary patch literal 13243 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 jzpwDk&dJLCo4J$g|2!rYkF6gVgQO&":"", + "Keyframes":[], + "resourceType":"KeyframeStore", + "resourceVersion":"2.0", + }, + "eventStubScript":null, + "eventToFunction":{}, + "length":1.0, + "lockOrigin":false, + "moments":{ + "$KeyframeStore":"", + "Keyframes":[], + "resourceType":"KeyframeStore", + "resourceVersion":"2.0", + }, + "name":"spr_weapon_volkite_culverin", + "playback":1, + "playbackSpeed":1.0, + "playbackSpeedType":1, + "resourceType":"GMSequence", + "resourceVersion":"2.0", + "seqHeight":272.0, + "seqWidth":301.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":"27b95a4c-b7c0-4f2e-aa03-ece8e4e50432","path":"sprites/spr_weapon_volkite_culverin/spr_weapon_volkite_culverin.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"568801a4-4dcc-4f73-a88b-447c31f2e712","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":39, + "yorigin":21, + }, + "swatchColours":null, + "swfPrecision":2.525, + "textureGroupId":{ + "name":"MarineViewer", + "path":"texturegroups/MarineViewer", + }, + "type":0, + "VTile":false, + "width":301, +} \ No newline at end of file diff --git a/sprites/spr_weapon_volkite_serpenta/73214df0-5c58-4848-aae2-d68778f0fe65.png b/sprites/spr_weapon_volkite_serpenta/73214df0-5c58-4848-aae2-d68778f0fe65.png new file mode 100644 index 0000000000000000000000000000000000000000..2490d00c8477909f461a07b8d39d83b524f74bec GIT binary patch literal 3779 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 literal 0 HcmV?d00001 diff --git a/sprites/spr_weapon_volkite_serpenta/layers/73214df0-5c58-4848-aae2-d68778f0fe65/9b9d7ab4-6736-4bc5-b3cc-4d650606eedb.png b/sprites/spr_weapon_volkite_serpenta/layers/73214df0-5c58-4848-aae2-d68778f0fe65/9b9d7ab4-6736-4bc5-b3cc-4d650606eedb.png new file mode 100644 index 0000000000000000000000000000000000000000..2490d00c8477909f461a07b8d39d83b524f74bec GIT binary patch literal 3779 zcmc(ic`zGZ*T+*7Z4pJ4+N!nI(!{>UPf=^E)z;bw2|^=c50yvJO;K9ASXz5yDY3*( zOO;A1ma2VMyIO)+9`8Tz%=^bP@B80-&fNQ*x%YnVJ$L5JnK>^kp?BFYUb_eY0N9O< z^sUdd@N6uyGM~*js3HDLuEUM2%>jT=2><{e1ppkLE#a2{fB+Bxu>1%B&`1RUuKH$@ zt+dWIm|acp>H|*y%X69vlg@6fG1mXbHu(42IQqHZBCKm`Ls5|)5xwq5wsGzLQu!)( zz)Of~sX1WzQaZ*G=4%i=qv7XmfWGLZCtZz>au$1X*(6Uj|Du&U8(3*LO80eARi$y(_3-oGOJY(+lArtc_ zhp&ZJ^60C5MHW*K=fgMsVvO$6d@EN|GNg^~oAk*#WsF6c-CKFaA=GYf%46WKAp{^q zoE)5}26Wsnwk;Z7*}|4~pyc@AR=QpG1?`^1HM+t|wFqr}{Oq*8)o0V&P1O@^JU_rG z#l8};;Nv#OEB)75D~8J6W-c?0Co5d(1F?ZSKji1lem*9#2=B9v)}mQvrea{vS2S!( z?+J&@U2dJB>wHJNszOrY4i(&t6s|xi+ZE$`a4s{vYo&g!rJJj3B((4;c#7T+m+coT2zquVnDnK^P%SC%YMPVbMg_;e9g`f1X*iVkP-Izrp2bJ=k}; zU{@PPFi+|Rn`U@EF}B6*Sg8YK_AD_^$|U=CiVV{~3CuMk-W*4@Wu;!nfr-V5+XKZm zjM>1B1if55NrfFzHS)psR{jRYsn#L!+6{P3;3ZoHnA`MGAv&D;>ucEGjpoDJt4WJG z^bts&V;LYBQDu;8*%}}enRBP~O06UkiKN0;M{9w2Yw2}ReOV7d8yCDn#J(rX^5?yY z#$sS?S*fXYz&ch8z0&p;SY6#XH-UvM3(A7JSu*IOlwpoQBGp58JVImPU2*y60tBC} zjY@hbU3-5l@-DYN-=_~9vFJi|HqZY=TndT4)IBTpa`PAuV(Xs&8%(%c@93>e1XLR`jm8M+^h_a|=mP{N9{j*izGHV9>d*G$7DXY1eg%s1oNmyg)`y;Y=BdX{;{ z4Gryj9UE$FDT~{s$?@v8-VZdzet&Mh7!n+RR-c+k60fIC{zqnSS`AjV#{gy?aYSy*2+jpoX0M^#QCFmysN4{3n%3 zAw-@v(m&9;VZ3>3Lp&{o=vy{J?n}Q#w!O8>-b$fRsu~;38paE(i#eH2iYy#r#HiD3 zk=L^>Ps&^W70T~ocMyV5)9I`rG|FKy$P4n#E5 z(UYcVCt7>vCKfl;}@!4U2jn_(*Bp%;u=xHyR zZ)BWQp6g{x*C-5FgU{O8t^_XjWv%`WVChujd1c@@JiYTL`y>BwqqrUOBFS5AHiip| zB7!?Vj>?QQ;jRMW;2tXIM<$~sId-M@0LdvS=$)vtQ*tsla>BA*9Rh)z$Hc2Wl!p<; zSs9>N8V2=_(?3P#L|8;R26~y|c zQu(bf)ZErzt&Bb7>Zd?@ss-K2khe%^nk0-VtE1vQkk@zX;|isx^& zy_`Lfcizw4SIynqM?F(fQBnCpTFnp+2R{2i-FDx2Z?Bmm7;H?e`CN}hqk|nM(c68R zElardHkQ*moGJBYHf4Lc6nW^}vPiI~;y+8*iMcs9q|K?(<1`q%I7z6h`xz|tu{5;- zewS!BJ62!I0-bqaVeParN=rE_p0t+Jr#qyH(RVo7$@#%$73bjT=<1{a&8z>^Fsm-{3NewEP=@!}9$*qhJHst!~UHt>s>xLGC&p;n2#ABzl_Xa1c zXgGn_Sj5N==IMrW3KgFm9IZX-%kJb_K2p@=7yrjJCgD1V_Xe-hP-nR$RxL?)vZ(uo zF>?*W>xrxO^Day8o(lV;_7rP1N!`d=kr`|CvLx;mnpYK{2gu_j6Y`@M>dvo;L zkM=)mapykHs!0@wa`*J~j76Lt&uyRgA_XgN?rP{ai6gnls*^_>kC$fQ0^C8L6BjyK zeQ#C3Q6AH59h_a5SQ77W0CoHsJf;fi(o#Ij`^vztUXV^Zy+Ww{B#GSUbT;nRsJQb1 z(^siH;5BZak?eZhBjNqGKtRV?p)+mlyq_S;B#pX}WwveOs3LYz?@6;1ROu&L5G2}_*&5^6iv0D6)4)5TH_~K&eg@uJf z=isH>XRHj_(84?U)-Vj_&GzEtL(ObOp$Mh1mPMVw#$&8st9VZL@5|d<31;Okt05;5 zhS*~Tw~kD2Z@h9F(<-XGsgn^HCP57Bng1IAtWjjc{0kj^Vx#mVFm2EE>-;+5LXYma zUWYEVU2BTb{Sj|)U&V1weozuZ1rVqGK4iw1f#-Dob0CMv`e<8Ot)lp>sOez3dC9IcJa`{? ziU&?=bVY<8Q;L)vq6%FkGgp2P;vej_#XlHf64`p@$h$5K4a6^i z6rDP~{aK(#t*mLTd$->A_IsCn^)(_xSbQd`RNe-;_VRtR z)CgHN3j5ustEZC_YW~w-u%P^asW~4umCk6|n#dS1Bl;o!h6n$1*;NL40E^u3nSGUn z*S;K_3x2ZpJ>f1#He>Pfmro9FSjmX(?`lmeXCnZnavt=}QVrR9jC5!X0}1u(l@~Uy z$&93qbJ`8}Vs7mAsm6x%&Z(GH0(S9VIJK?{GG4Cu{$e!qRcjxDc5~Wo)jik05{2Mq z54z#YTW0lGPo;DhHhwzfO{+{E@p96ie%t#^uc`KlkWNwP2C)SFk(eHhdYh3Dt%Bqd zrteTK3Q-dl1TFQcteBg3<30f6fxqnNX-I;x>J`m^<$Q zmz{3c52KEQ0UH;8oQUKKRn^`Ev%5Ul47rbW3hMCf+2`|A+o*%zZ>C{N2klR}M?TK) zZ_T!vfZ|0U%?022V_@V2^UhHtP5oya;UlNNhnopH&_Fropnw7rMzUye%d3>;nYg9g z?>iAN>?HcAd2GTEa&r~wSCCfN+nk4u@|XYb#xD>LIoa*4G@U)UQN*d x0DRDHo`{hD48T}9dd>i;|9-*W)5jg_5A*T;&y0%DZJsj*U~B-@FVlMz`EP0bD!l*z literal 0 HcmV?d00001 diff --git a/sprites/spr_weapon_volkite_serpenta/spr_weapon_volkite_serpenta.yy b/sprites/spr_weapon_volkite_serpenta/spr_weapon_volkite_serpenta.yy new file mode 100644 index 0000000000..5bf98b47ea --- /dev/null +++ b/sprites/spr_weapon_volkite_serpenta/spr_weapon_volkite_serpenta.yy @@ -0,0 +1,111 @@ +{ + "$GMSprite":"v2", + "%Name":"spr_weapon_volkite_serpenta", + "bboxMode":0, + "bbox_bottom":204, + "bbox_left":16, + "bbox_right":63, + "bbox_top":94, + "collisionKind":1, + "collisionTolerance":0, + "DynamicTexturePage":false, + "edgeFiltering":false, + "For3D":false, + "frames":[ + {"$GMSpriteFrame":"v1","%Name":"73214df0-5c58-4848-aae2-d68778f0fe65","name":"73214df0-5c58-4848-aae2-d68778f0fe65","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + ], + "gridX":0, + "gridY":0, + "height":231, + "HTile":false, + "layers":[ + {"$GMImageLayer":"","%Name":"9b9d7ab4-6736-4bc5-b3cc-4d650606eedb","blendMode":0,"displayName":"default","isLocked":false,"name":"9b9d7ab4-6736-4bc5-b3cc-4d650606eedb","opacity":100.0,"resourceType":"GMImageLayer","resourceVersion":"2.0","visible":true,}, + ], + "name":"spr_weapon_volkite_serpenta", + "nineSlice":{ + "$GMNineSliceData":"", + "bottom":0, + "enabled":false, + "guideColour":[4294902015,4294902015,4294902015,4294902015,], + "highlightColour":1728023040, + "highlightStyle":0, + "left":0, + "resourceType":"GMNineSliceData", + "resourceVersion":"2.0", + "right":0, + "tileMode":[ + 0, + 0, + 0, + 0, + 0, + ], + "top":0, + }, + "origin":0, + "parent":{ + "name":"ranged", + "path":"folders/Sprites/Marine Viewer/weapons/ranged.yy", + }, + "preMultiplyAlpha":false, + "resourceType":"GMSprite", + "resourceVersion":"2.0", + "sequence":{ + "$GMSequence":"v1", + "%Name":"spr_weapon_volkite_serpenta", + "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_weapon_volkite_serpenta", + "playback":1, + "playbackSpeed":1.0, + "playbackSpeedType":1, + "resourceType":"GMSequence", + "resourceVersion":"2.0", + "seqHeight":231.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":"73214df0-5c58-4848-aae2-d68778f0fe65","path":"sprites/spr_weapon_volkite_serpenta/spr_weapon_volkite_serpenta.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"fbb0a04d-9eb3-48d6-9bbd-379d17e44217","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 From 447925c23f501b65df48d0801132fdf15f2a0ebe Mon Sep 17 00:00:00 2001 From: Nelsonh <81228864+OH296@users.noreply.github.com> Date: Tue, 17 Jun 2025 01:40:11 +0100 Subject: [PATCH 094/286] fix: Layering issue making unit buttons not work (#880) --- scripts/scr_ui_manage/scr_ui_manage.gml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/scripts/scr_ui_manage/scr_ui_manage.gml b/scripts/scr_ui_manage/scr_ui_manage.gml index b0e20235da..ba341f71a0 100644 --- a/scripts/scr_ui_manage/scr_ui_manage.gml +++ b/scripts/scr_ui_manage/scr_ui_manage.gml @@ -506,7 +506,9 @@ function draw_sprite_and_unit_equip_data(){ } setup_tooltip_list(_unit_tooltips) } - company_data.unit_ui_panel.draw_with_dimensions(); + if (!instance_exists(obj_popup)){ + company_data.unit_ui_panel.draw_with_dimensions(); + } } /// @mixin function scr_ui_manage() { From 8b72037585b283d6374ed107d03ff16f01a5f714 Mon Sep 17 00:00:00 2001 From: CptMacTavish2224 <95313759+CptMacTavish2224@users.noreply.github.com> Date: Fri, 20 Jun 2025 06:46:10 +0200 Subject: [PATCH 095/286] fix: Add Crozius Arcanum to stockpile of Sieged chapters (#884) --- ChapterMaster.yyp | 2 +- scripts/scr_initialize_custom/scr_initialize_custom.gml | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/ChapterMaster.yyp b/ChapterMaster.yyp index 45b7e1b39d..a302f02db9 100644 --- a/ChapterMaster.yyp +++ b/ChapterMaster.yyp @@ -1746,4 +1746,4 @@ {"$GMTextureGroup":"","%Name":"MarineViewer","autocrop":true,"border":2,"compressFormat":"bz2","customOptions":"","directory":"","groupParent":null,"isScaled":true,"loadType":"default","mipsToGenerate":0,"name":"MarineViewer","resourceType":"GMTextureGroup","resourceVersion":"2.0","targets":-1,}, {"$GMTextureGroup":"","%Name":"NavalCombat","autocrop":true,"border":2,"compressFormat":"bz2","customOptions":"","directory":"","groupParent":null,"isScaled":true,"loadType":"default","mipsToGenerate":0,"name":"NavalCombat","resourceType":"GMTextureGroup","resourceVersion":"2.0","targets":-1,}, ], -} \ No newline at end of file +} diff --git a/scripts/scr_initialize_custom/scr_initialize_custom.gml b/scripts/scr_initialize_custom/scr_initialize_custom.gml index 8d9e76c173..a5a0ab98f8 100644 --- a/scripts/scr_initialize_custom/scr_initialize_custom.gml +++ b/scripts/scr_initialize_custom/scr_initialize_custom.gml @@ -3164,6 +3164,7 @@ function scr_initialize_custom() { scr_add_item(wep1[defaults_slot, eROLE.Apothecary], 4); scr_add_item(wep2[defaults_slot, eROLE.Apothecary], 4); scr_add_item("Psychic Hood", 4); + scr_add_item("Crozius Arcanum", 4); scr_add_item("Force Staff", 4); scr_add_item("Plasma Pistol", 4); scr_add_item("Company Standard", 4); From 724827b07fd59d1613ce480e93236e686cc50753 Mon Sep 17 00:00:00 2001 From: EttyKitty <20323032+EttyKitty@users.noreply.github.com> Date: Fri, 20 Jun 2025 08:34:24 +0300 Subject: [PATCH 096/286] ci: Enable old dev release deletion (#885) --- .github/workflows/release_dev.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.github/workflows/release_dev.yml b/.github/workflows/release_dev.yml index f4539c0b46..50016b6f48 100644 --- a/.github/workflows/release_dev.yml +++ b/.github/workflows/release_dev.yml @@ -160,9 +160,7 @@ jobs: COUNT=$((COUNT + 1)) if [ $COUNT -gt $RELEASES_TO_KEEP ]; then echo "Deleting old release+tag: $TAG" - # gh release delete "$TAG" -y --cleanup-tag command deletes the release AND the associated git tag - # Use || echo to log a non-fatal warning if deletion fails (e.g., release already gone) - # gh release delete "$TAG" -y --cleanup-tag || echo "Warning: Failed to delete release $TAG. It may have been deleted already." + gh release delete "$TAG" -y --cleanup-tag || echo "Warning: Failed to delete release $TAG. It may have been deleted already." else echo "Keeping release+tag: $TAG (it's within the latest $RELEASES_TO_KEEP)" fi From fc670b8a217d625df9863c675ac88d16d0925bf3 Mon Sep 17 00:00:00 2001 From: EttyKitty <20323032+EttyKitty@users.noreply.github.com> Date: Fri, 20 Jun 2025 11:34:06 +0300 Subject: [PATCH 097/286] fix: Remove STC from the planet after sending it to Admech (#886) --- objects/obj_ground_mission/Alarm_6.gml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/objects/obj_ground_mission/Alarm_6.gml b/objects/obj_ground_mission/Alarm_6.gml index bc7d00ded3..180cd1a41a 100644 --- a/objects/obj_ground_mission/Alarm_6.gml +++ b/objects/obj_ground_mission/Alarm_6.gml @@ -1,6 +1,6 @@ var _target_planet; _target_planet = instance_nearest(x, y, obj_star); -delete_features(_target_planet.p_feature[num], P_features.Artifact); +delete_features(_target_planet.p_feature[num], P_features.STC_Fragment); scr_return_ship(loc, self, num); From 54c6b8e223cfe290dec58bd0aaed6fcd3ddcd075 Mon Sep 17 00:00:00 2001 From: EttyKitty <20323032+EttyKitty@users.noreply.github.com> Date: Sat, 21 Jun 2025 04:00:04 +0300 Subject: [PATCH 098/286] ci: Update pull_request_template (#887) --- .github/pull_request_template.md | 18 +++++------------- 1 file changed, 5 insertions(+), 13 deletions(-) diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md index 9cfc5c257d..d2315d4e38 100644 --- a/.github/pull_request_template.md +++ b/.github/pull_request_template.md @@ -1,23 +1,15 @@ -### Purpose - +## Purpose and Description + - Self-descriptive. -### Describe your changes/additions - -- Self-descriptive. - -### What can/needs to be improved/changed - -- Nothing. - -### Testing done +## Testing done - None, and I understand the risks. -### Related things and/or additional context +## Related things and/or additional context -- None. +- From 39f6e2a60ad8d927d7c3a745780f275409cc335d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=9C=D0=B0=D1=81=D1=82=D0=B5=D1=80=20=D0=A7=D0=B8=D1=84?= <43174917+MCPO-Spartan-117@users.noreply.github.com> Date: Sun, 22 Jun 2025 17:10:52 +0000 Subject: [PATCH 099/286] feat: Debug shop (#888) --- objects/obj_shop/Create_0.gml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/objects/obj_shop/Create_0.gml b/objects/obj_shop/Create_0.gml index 40b1e5ff4e..0ddec7b040 100644 --- a/objects/obj_shop/Create_0.gml +++ b/objects/obj_shop/Create_0.gml @@ -1656,6 +1656,14 @@ var tech_heretic_modifier =1 item_cost[i] = ceil(item_cost[i]); } +if (global.cheat_debug) { + var i_count = array_length(item_cost); + var empty_array = array_create(i_count, 0); + item_cost = empty_array; + forge_cost = array_create(i_count, 1); + nobuy = empty_array; +} + item_cost_tooltip_info = ""; item_cost_tooltip_info += $"Modifier from forge Master : X{forge_master_modifier}/n" item_cost_tooltip_info += $"Mechanicus Relations : X{mechanicus_modifier}/n" From 9f937adc8179ff04fa3eacb5eacacd61d022e46b Mon Sep 17 00:00:00 2001 From: Werwolf-12 Date: Mon, 23 Jun 2025 01:00:56 +0200 Subject: [PATCH 100/286] feat: More 30k stuff, fixes, and debug shop (#882) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: EttyKitty <20323032+EttyKitty@users.noreply.github.com> Co-authored-by: Мастер Чиф <43174917+MCPO-Spartan-117@users.noreply.github.com> --- ChapterMaster.yyp | 5 +- objects/obj_shop/Create_0.gml | 62 ++++++++++++ .../scr_culture_visuals.gml | 53 ++++++++-- scripts/scr_weapon/scr_weapon.gml | 78 ++++++++++++--- .../473a7284-a688-484d-91d4-96d25b326cfd.png | Bin 7510 -> 0 bytes .../98934121-510d-447a-ad2c-d09856d6ea01.png | Bin 0 -> 8078 bytes .../cb2bbe01-35ef-4dc1-b409-a1cbfe34ce5a.png | Bin 7510 -> 0 bytes .../f8d667c7-b860-44f8-8273-9a2e330a1b8e.png | Bin 0 -> 8078 bytes .../spr_weapon_mars_hbolt.yy | 12 +-- .../56d53598-e41a-4814-a85d-43df630bc638.png | Bin 0 -> 11457 bytes .../c5e2032c-1118-47da-b38a-f1a322a71a20.png | Bin 0 -> 11457 bytes .../spr_weapon_mars_plasc.yy | 92 ++++++++++++++++++ .../7bf54d5b-eb4f-4225-8043-c7bbdfefe28f.png | Bin 3207 -> 0 bytes .../874c87bf-544a-4c32-a371-509dc9981ec4.png | Bin 3207 -> 0 bytes .../7bf54d5b-eb4f-4225-8043-c7bbdfefe28f.png | Bin 0 -> 3240 bytes .../874c87bf-544a-4c32-a371-509dc9981ec4.png | Bin 0 -> 3240 bytes .../spr_weapon_phobos_boltpis.yy} | 10 +- sprites/spr_weapon_plasp/spr_weapon_plasp.yy | 6 +- .../8baa401d-fcf9-46d7-b840-bd2164b100ef.png | Bin 0 -> 6110 bytes .../2401f208-6b0e-4e06-8e13-c37a028d23b2.png | Bin 0 -> 6110 bytes .../spr_weapon_ryza_plasg.yy | 92 ++++++++++++++++++ .../187943a3-b1b6-4aee-8064-6942dae163d4.png | Bin 0 -> 3563 bytes .../8c36642c-c5e7-4e05-97b8-4b302c6f569a.png | Bin 0 -> 3563 bytes .../spr_weapon_ryza_plasp.yy | 92 ++++++++++++++++++ .../7078d58a-3619-44c5-bbe0-4449064aeaa4.png | Bin 4885 -> 0 bytes .../b3d7b70f-4483-4f84-8860-eab1782faab0.png | Bin 0 -> 4972 bytes .../c71b0c2f-0e0d-4b9e-aa10-73d13c7796a6.png | Bin 4885 -> 0 bytes .../5ea71bce-75c2-4ee0-b0da-6d7aa5a267c2.png | Bin 0 -> 4972 bytes .../spr_weapon_tigris_combi.yy | 8 +- .../746312be-a5f0-47ac-a783-e19dcde061a8.png | Bin 6168 -> 0 bytes .../85c35f09-7885-4620-994b-f2cdea15616f.png | Bin 0 -> 6200 bytes .../7661b2ed-1571-406e-8395-989f5935e303.png | Bin 6168 -> 0 bytes .../013b86b2-2c2c-4f20-bd1d-d814a1d77f93.png | Bin 0 -> 6200 bytes .../spr_weapon_volkite_caliver.yy | 8 +- .../27b95a4c-b7c0-4f2e-aa03-ece8e4e50432.png | Bin 13243 -> 0 bytes .../7b3c2e59-eccf-4cac-a8b2-eae514f15c3c.png | Bin 0 -> 13132 bytes .../7e7d708c-6c89-45d1-b800-7d518f4ba3cd.png | Bin 13243 -> 0 bytes .../7be89fef-b0dd-4ad6-b42c-9e1dac1d31b8.png | Bin 0 -> 13132 bytes .../spr_weapon_volkite_culverin.yy | 8 +- 39 files changed, 479 insertions(+), 47 deletions(-) delete mode 100644 sprites/spr_weapon_mars_hbolt/473a7284-a688-484d-91d4-96d25b326cfd.png create mode 100644 sprites/spr_weapon_mars_hbolt/98934121-510d-447a-ad2c-d09856d6ea01.png delete mode 100644 sprites/spr_weapon_mars_hbolt/layers/473a7284-a688-484d-91d4-96d25b326cfd/cb2bbe01-35ef-4dc1-b409-a1cbfe34ce5a.png create mode 100644 sprites/spr_weapon_mars_hbolt/layers/98934121-510d-447a-ad2c-d09856d6ea01/f8d667c7-b860-44f8-8273-9a2e330a1b8e.png create mode 100644 sprites/spr_weapon_mars_plasc/56d53598-e41a-4814-a85d-43df630bc638.png create mode 100644 sprites/spr_weapon_mars_plasc/layers/56d53598-e41a-4814-a85d-43df630bc638/c5e2032c-1118-47da-b38a-f1a322a71a20.png create mode 100644 sprites/spr_weapon_mars_plasc/spr_weapon_mars_plasc.yy delete mode 100644 sprites/spr_weapon_phobos_bolt_pistol/7bf54d5b-eb4f-4225-8043-c7bbdfefe28f.png delete mode 100644 sprites/spr_weapon_phobos_bolt_pistol/layers/7bf54d5b-eb4f-4225-8043-c7bbdfefe28f/874c87bf-544a-4c32-a371-509dc9981ec4.png create mode 100644 sprites/spr_weapon_phobos_boltpis/7bf54d5b-eb4f-4225-8043-c7bbdfefe28f.png create mode 100644 sprites/spr_weapon_phobos_boltpis/layers/7bf54d5b-eb4f-4225-8043-c7bbdfefe28f/874c87bf-544a-4c32-a371-509dc9981ec4.png rename sprites/{spr_weapon_phobos_bolt_pistol/spr_weapon_phobos_bolt_pistol.yy => spr_weapon_phobos_boltpis/spr_weapon_phobos_boltpis.yy} (92%) create mode 100644 sprites/spr_weapon_ryza_plasg/8baa401d-fcf9-46d7-b840-bd2164b100ef.png create mode 100644 sprites/spr_weapon_ryza_plasg/layers/8baa401d-fcf9-46d7-b840-bd2164b100ef/2401f208-6b0e-4e06-8e13-c37a028d23b2.png create mode 100644 sprites/spr_weapon_ryza_plasg/spr_weapon_ryza_plasg.yy create mode 100644 sprites/spr_weapon_ryza_plasp/187943a3-b1b6-4aee-8064-6942dae163d4.png create mode 100644 sprites/spr_weapon_ryza_plasp/layers/187943a3-b1b6-4aee-8064-6942dae163d4/8c36642c-c5e7-4e05-97b8-4b302c6f569a.png create mode 100644 sprites/spr_weapon_ryza_plasp/spr_weapon_ryza_plasp.yy delete mode 100644 sprites/spr_weapon_tigris_combi/7078d58a-3619-44c5-bbe0-4449064aeaa4.png create mode 100644 sprites/spr_weapon_tigris_combi/b3d7b70f-4483-4f84-8860-eab1782faab0.png delete mode 100644 sprites/spr_weapon_tigris_combi/layers/7078d58a-3619-44c5-bbe0-4449064aeaa4/c71b0c2f-0e0d-4b9e-aa10-73d13c7796a6.png create mode 100644 sprites/spr_weapon_tigris_combi/layers/b3d7b70f-4483-4f84-8860-eab1782faab0/5ea71bce-75c2-4ee0-b0da-6d7aa5a267c2.png delete mode 100644 sprites/spr_weapon_volkite_caliver/746312be-a5f0-47ac-a783-e19dcde061a8.png create mode 100644 sprites/spr_weapon_volkite_caliver/85c35f09-7885-4620-994b-f2cdea15616f.png delete mode 100644 sprites/spr_weapon_volkite_caliver/layers/746312be-a5f0-47ac-a783-e19dcde061a8/7661b2ed-1571-406e-8395-989f5935e303.png create mode 100644 sprites/spr_weapon_volkite_caliver/layers/85c35f09-7885-4620-994b-f2cdea15616f/013b86b2-2c2c-4f20-bd1d-d814a1d77f93.png delete mode 100644 sprites/spr_weapon_volkite_culverin/27b95a4c-b7c0-4f2e-aa03-ece8e4e50432.png create mode 100644 sprites/spr_weapon_volkite_culverin/7b3c2e59-eccf-4cac-a8b2-eae514f15c3c.png delete mode 100644 sprites/spr_weapon_volkite_culverin/layers/27b95a4c-b7c0-4f2e-aa03-ece8e4e50432/7e7d708c-6c89-45d1-b800-7d518f4ba3cd.png create mode 100644 sprites/spr_weapon_volkite_culverin/layers/7b3c2e59-eccf-4cac-a8b2-eae514f15c3c/7be89fef-b0dd-4ad6-b42c-9e1dac1d31b8.png diff --git a/ChapterMaster.yyp b/ChapterMaster.yyp index a302f02db9..8da6ed12b1 100644 --- a/ChapterMaster.yyp +++ b/ChapterMaster.yyp @@ -1661,11 +1661,12 @@ {"id":{"name":"spr_weapon_lightning2","path":"sprites/spr_weapon_lightning2/spr_weapon_lightning2.yy",},}, {"id":{"name":"spr_weapon_mace_of_absolution","path":"sprites/spr_weapon_mace_of_absolution/spr_weapon_mace_of_absolution.yy",},}, {"id":{"name":"spr_weapon_mars_hbolt","path":"sprites/spr_weapon_mars_hbolt/spr_weapon_mars_hbolt.yy",},}, + {"id":{"name":"spr_weapon_mars_plasc","path":"sprites/spr_weapon_mars_plasc/spr_weapon_mars_plasc.yy",},}, {"id":{"name":"spr_weapon_melta","path":"sprites/spr_weapon_melta/spr_weapon_melta.yy",},}, {"id":{"name":"spr_weapon_missile","path":"sprites/spr_weapon_missile/spr_weapon_missile.yy",},}, {"id":{"name":"spr_weapon_mmelta","path":"sprites/spr_weapon_mmelta/spr_weapon_mmelta.yy",},}, - {"id":{"name":"spr_weapon_phobos_bolt_pistol","path":"sprites/spr_weapon_phobos_bolt_pistol/spr_weapon_phobos_bolt_pistol.yy",},}, {"id":{"name":"spr_weapon_phobos_bolter","path":"sprites/spr_weapon_phobos_bolter/spr_weapon_phobos_bolter.yy",},}, + {"id":{"name":"spr_weapon_phobos_boltpis","path":"sprites/spr_weapon_phobos_boltpis/spr_weapon_phobos_boltpis.yy",},}, {"id":{"name":"spr_weapon_plasc","path":"sprites/spr_weapon_plasc/spr_weapon_plasc.yy",},}, {"id":{"name":"spr_weapon_plasg","path":"sprites/spr_weapon_plasg/spr_weapon_plasg.yy",},}, {"id":{"name":"spr_weapon_plasma_cannon_term","path":"sprites/spr_weapon_plasma_cannon_term/spr_weapon_plasma_cannon_term.yy",},}, @@ -1683,6 +1684,8 @@ {"id":{"name":"spr_weapon_powswo","path":"sprites/spr_weapon_powswo/spr_weapon_powswo.yy",},}, {"id":{"name":"spr_weapon_relbla","path":"sprites/spr_weapon_relbla/spr_weapon_relbla.yy",},}, {"id":{"name":"spr_weapon_relic_blade","path":"sprites/spr_weapon_relic_blade/spr_weapon_relic_blade.yy",},}, + {"id":{"name":"spr_weapon_ryza_plasg","path":"sprites/spr_weapon_ryza_plasg/spr_weapon_ryza_plasg.yy",},}, + {"id":{"name":"spr_weapon_ryza_plasp","path":"sprites/spr_weapon_ryza_plasp/spr_weapon_ryza_plasp.yy",},}, {"id":{"name":"spr_weapon_sbolter","path":"sprites/spr_weapon_sbolter/spr_weapon_sbolter.yy",},}, {"id":{"name":"spr_weapon_skill_icon","path":"sprites/spr_weapon_skill_icon/spr_weapon_skill_icon.yy",},}, {"id":{"name":"spr_weapon_sniper","path":"sprites/spr_weapon_sniper/spr_weapon_sniper.yy",},}, diff --git a/objects/obj_shop/Create_0.gml b/objects/obj_shop/Create_0.gml index 0ddec7b040..7eb63d95fd 100644 --- a/objects/obj_shop/Create_0.gml +++ b/objects/obj_shop/Create_0.gml @@ -111,6 +111,68 @@ if (shop = "equipment") { item_cost[i] = 10; forge_cost[i] = 40; i += 1; + if (global.cheat_debug) { + //Debug space for 30k weapons + //Volkite Pack + item[i] = "Volkite Serpenta"; + item_stocked[i] = scr_item_count(item[i]); + item_cost[i] = 0; + forge_cost[i] = 0; + i += 1; + item[i] = "Volkite Charger"; + item_stocked[i] = scr_item_count(item[i]); + item_cost[i] = 0; + forge_cost[i] = 0; + i += 1; + item[i] = "Volkite Caliver"; + item_stocked[i] = scr_item_count(item[i]); + item_cost[i] = 0; + forge_cost[i] = 0; + i += 1; + item[i] ="Volkite Culverin"; + item_stocked[i] = scr_item_count(item[i]); + item_cost[i] = 0; + forge_cost[i] = 0; + i += 1; + //Bolt Pack + item[i] = "Phobos Bolt Pistol"; + item_stocked[i] = scr_item_count(item[i]); + item_cost[i] = 0; + forge_cost[i] = 0; + i += 1; + item[i] = "Phobos Bolter"; + item_stocked[i] = scr_item_count(item[i]); + item_cost[i] = 0; + forge_cost[i] = 0; + i += 1; + item[i] = "Mars Heavy Bolter"; + item_stocked[i] = scr_item_count(item[i]); + item_cost[i] = 0; + forge_cost[i] = 0; + i += 1; + item[i] = "Tigris Combi Bolter"; + item_stocked[i] = scr_item_count(item[i]); + item_cost[i] = 0; + forge_cost[i] = 0; + i += 1; + //Plasma Pack + item[i] = "Ryza Plasma Gun"; + item_stocked[i] = scr_item_count(item[i]); + item_cost[i] = 0; + forge_cost[i] = 0; + i += 1; + item[i] = "Ryza Plasma Pistol"; + item_stocked[i] = scr_item_count(item[i]); + item_cost[i] = 0; + forge_cost[i] = 0; + i += 1; + item[i] = "Mars Plasma Cannon"; + item_stocked[i] = scr_item_count(item[i]); + item_cost[i] = 0; + forge_cost[i] = 0; + i += 1; + //End of debug space for 30k weapons + } item[i] = "Power Axe"; item_stocked[i] = scr_item_count(item[i]); item_cost[i] = 40; diff --git a/scripts/scr_culture_visuals/scr_culture_visuals.gml b/scripts/scr_culture_visuals/scr_culture_visuals.gml index 83395d65f7..33d0ad0855 100644 --- a/scripts/scr_culture_visuals/scr_culture_visuals.gml +++ b/scripts/scr_culture_visuals/scr_culture_visuals.gml @@ -1255,8 +1255,8 @@ function format_weapon_visuals(weapon_name){ } global.weapon_visual_data = { //30k weapons - //Volkitepack - "Volkite Charger": { + //Volkite Pack +"Volkite Charger": { base: { weapon_data: { display_type: "normal_ranged", @@ -1286,6 +1286,7 @@ global.weapon_visual_data = { display_type: "ranged_twohand", new_weapon_draw: true }, + body_types: [0,1] }, variants: [{ sprite: spr_weapon_volkite_caliver, @@ -1298,13 +1299,14 @@ global.weapon_visual_data = { display_type: "ranged_twohand", new_weapon_draw: true }, + body_types: [0,1] }, variants: [{ sprite: spr_weapon_volkite_culverin, }] }, //Bolter Pack -"Phobos pattern Bolter": { +"Phobos Bolter": { base: { weapon_data: { display_type: "normal_ranged", @@ -1315,7 +1317,7 @@ global.weapon_visual_data = { sprite: spr_weapon_phobos_bolter, }] }, -"Phobos pattern Bolt Pistol": { +"Phobos Bolt Pistol": { base: { weapon_data: { display_type: "normal_ranged", @@ -1323,21 +1325,22 @@ global.weapon_visual_data = { }, }, variants: [{ - sprite: spr_weapon_phobos_bolt_pistol, + sprite: spr_weapon_phobos_boltpis, }] }, -"Mars pattern Heavy Bolter": { +"Mars Heavy Bolter": { base: { weapon_data: { display_type: "ranged_twohand", new_weapon_draw: true }, + body_types: [0,1] }, variants: [{ sprite: spr_weapon_mars_hbolt, }] }, -"Tigris pattern Combi Bolter": { +"Tigris Combi Bolter": { base: { weapon_data: { display_type: "normal_ranged", @@ -1348,7 +1351,41 @@ global.weapon_visual_data = { sprite: spr_weapon_tigris_combi, }] }, - +//Plasma Pack +"Ryza Plasma Gun": { + base: { + weapon_data: { + display_type: "normal_ranged", + new_weapon_draw: true + }, + }, + variants: [{ + sprite: spr_weapon_ryza_plasg, + }] +}, +"Ryza Plasma Pistol": { + base: { + weapon_data: { + display_type: "normal_ranged", + new_weapon_draw: true + }, + }, + variants: [{ + sprite: spr_weapon_ryza_plasp, + }] +}, +"Mars Plasma Cannon": { + base: { + weapon_data: { + display_type: "ranged_twohand", + new_weapon_draw: true + }, + body_types: [0,1] + }, + variants: [{ + sprite: spr_weapon_mars_plasc, + }] +}, //40k weapons "Assault Cannon": { diff --git a/scripts/scr_weapon/scr_weapon.gml b/scripts/scr_weapon/scr_weapon.gml index 93fc2c2853..3f0d355506 100644 --- a/scripts/scr_weapon/scr_weapon.gml +++ b/scripts/scr_weapon/scr_weapon.gml @@ -1,7 +1,7 @@ global.weapons = { //30k Weapons //Volkite Pack - "Volkite Culverin": { +"Volkite Culverin": { "abbreviation": "VolkCul", "attack": { "standard": 700, @@ -59,18 +59,18 @@ global.weapons = { "master_crafted": 270, "artifact": 290 }, - "description": "Ancient one handed thermal ray weapon, preferred by melee specialists, and officers .", + "description": "Ancient one-handed thermal ray weapon, preferred by melee specialists, and officers .", "melee_hands": 0, "ranged_hands": 1, "ammo": 10, "range": 3, "spli": 4, "arp": 0, - "tags": ["Volkite", "energy"] - + "tags": ["Volkite", "energy", "pistol"] }, + //Bolt Pack -"Phobos pattern Bolt Pistol": { +"Phobos Bolt Pistol": { "abbreviation": "PhBltPis", "attack": { "standard": 38, @@ -84,10 +84,10 @@ global.weapons = { "range": 3.5, "spli": 2, "arp": 0, - "tags": ["bolt", "pistol"] + "tags": ["bolt", "pistol"], }, -"Phobos pattern Bolter": { +"Phobos Bolter": { "abbreviation": "PhBltr", "attack": { "standard": 75, @@ -104,14 +104,14 @@ global.weapons = { "tags": ["bolt"] }, -"Mars pattern Heavy Bolter": { +"Mars Heavy Bolter": { "abbreviation": "MarsHvyBltr", "attack": { "standard": 400, "master_crafted": 430, "artifact": 460 }, - "description": " Rare variant of heavy bolter, uncommon even during times of it's production. Made in forges of Mars itself, it's more lightweight and compact in comparison to modern patterns.", + "description": "Rare variant of heavy bolter, uncommon even during times of it's production. Made in forges of Mars itself, it's more lightweight and compact in comparison to modern patterns.", "melee_hands": 1, "ranged_hands": 2, "ammo": 12, @@ -120,7 +120,7 @@ global.weapons = { "arp": 1, "tags": ["heavy_ranged", "bolt"] }, -"Tigris pattern Combi Bolter": { +"Tigris Combi Bolter": { "abbreviation": "TigComBltr", "attack": { "standard": 100, @@ -134,7 +134,57 @@ global.weapons = { "range": 19, "spli": 11, "arp": 1, - "tags": ["heavy_ranged", "bolt"] + "tags": [ "bolt"] +}, + +//Plasma Pack +"Ryza Plasma Gun": { +"abbreviation": "RyzPlsmGn", + "attack": { + "standard": 325, + "master_crafted": 350, + "artifact": 375 + }, + "description": "Ancient and now forgotten pattern of plasma weapon. It features improved coils, more stable hydrogen fuel, and characteristic purple glow", + "melee_hands": 1, + "ranged_hands": 2, + "ammo": 18, + "range": 14, + "spli": 5, + "arp": 1, + "tags": [ "plasma","energy"] +}, +"Ryza Plasma Pistol": { +"abbreviation": "RyzPlsmPis", + "attack": { + "standard": 145, + "master_crafted": 160, + "artifact": 175 + }, + "description": "Ancient and now forgotten pattern of plasma pistol. Often given to veterans and officers as a sign of great honor. It features improved coils, more stable hydrogen fuel, and characteristic purple glow", + "melee_hands": 1, + "ranged_hands": 2, + "ammo": 18, + "range": 14, + "spli": 5, + "arp": 1, + "tags": [ "plasma","energy","pistol"] +}, +"Mars Plasma Cannon": { +"abbreviation": "MarsPlsmCnn", + "attack": { + "standard": 650, + "master_crafted": 700, + "artifact": 750 //I think that usual 25% increase will be too much for that weapon so applied +150. + }, + "description": "Ancient and now forgotten pattern of plasma weapon. Heaviest portable variant. It features improved coils, more stable hydrogen ammo, and characteristic purple glow", + "melee_hands": 1, + "ranged_hands": 3, + "ammo": 18, + "range": 16, + "spli": 8, + "arp": 1, + "tags": [ "plasma","energy"] }, //40K Weapons "Storm Shield": { @@ -1019,11 +1069,11 @@ global.weapons = { "artifact": 300 }, "description": "A two-handed weapon that launches blobs of plasma at the target. They are considered both sacred and dangerous, overheating through rapid firing of the weapon. Overheating can result in detonation of the weapon, killing the wielder.", - "melee_hands": 0, + "melee_hands": 1, "ranged_hands": 2, "ammo": 16, "range": 12, - "spli": 3, + "spli": 2, "arp": 1, "tags": ["plasma", "energy"] }, @@ -1039,7 +1089,7 @@ global.weapons = { "ranged_hands": 3, "ammo": 16, "range": 14, - "spli": 2, + "spli": 5, "arp": 1, "tags": ["plasma","energy","heavy_ranged", "dreadnought"] }, diff --git a/sprites/spr_weapon_mars_hbolt/473a7284-a688-484d-91d4-96d25b326cfd.png b/sprites/spr_weapon_mars_hbolt/473a7284-a688-484d-91d4-96d25b326cfd.png deleted file mode 100644 index ec16396eafa43f92ef094e495cb02570d9f79f60..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 7510 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

dY9 zR4wZ8Gb`70*!5Dbsas;3!8xBiZ+S^h=JM8X{@5xNV7&^2vL z$u~Oj2WTg5;q0t#{6mbrup7G#6*)^QR2|lE-w2i>k@%0^9%1y*%kAZO@)!?n&`_zh;{1`ac=!cB6~n`utx zyl3AST}L*)Kgd*%I`rdjG-%ISjaXq&tke7q_4PuSd;6t>>}%!*Gx5)GAnK0khrJMt z_~_)Fh;U==E2JK%5Vb)PXW8aZRl43F5WE>R2wiZ7t}ut$)`)8pKG(IPHY?w>_mmL6 zvy`&w>{rGe!yV^y>M>bG>rGX@8<|&QXd~=6;}*Y@g>WC zH>-BAk9an?i56iMlOmIQ3u%ETj#n!zJU&6iDvm52?>&!Gf4M4^FfnYyb(yWzNjO8t z-Ho1Mn2pn#zbK1)D$c%PTe#IHnJ*epj7= zot=HJ0;0nqk~oj1!Pa@MA9)g;{CaH%&{O@IN;&I02nO? zzjvt}wb5W=h=|G6Rs+Y5BDIlE#G4JQkpKs=>3ccwO^c>0~cuaJpixf3Q ze9YNl!Ip6iZ2ilo;Jmt6Z9}kK+fHG8nBN0Qn$p1K{pB#=6nt7Q!Z^=lM3jjdq<=lQ znFjcwz1FiEblv@``Ut3#gOXqj^!o*Ix=(?^*weAuF`L<%Lx2!Afy@!ZcRosg{ zYQg%?KYD@C)SV)G%OV?^eH;Bd;cSO{I>x{=1`^EvVtwH3W|*#>U^ZqFCU#9A<6cP4 zOin*(`>!6}28o27sagBOf#t#Z>L!);J;J(Jo)r2|YqYx@n3HV z2?-alhSsS~)u!&X3H1hLqE_#At$pR(Q*Uh`X%K@wx+j`zF3L;<>^Qb44ykqg`NI#A zkU;#(&o}ChtclmtZiD@^WqXb10gxY$Kq~H}*SQ(s`hz&EDkl1_pd?vrx(}E(VyepB zLPB`rFZRYXSJA2ZY;T&J3l_~!Mp66|J0zhm2?nmha`@f0ax3=bOu}ztbR72s1q(|oY z8NBF~rs-?zdZhH#)o0UiEZ;OKs16w$Q*aQs9VPigjw4c(NfSNiFYCUqW0w|BxIbGRDO`@Prl6qi%5U ze6Ct#+BPS$LXjJKe`2omXGo?L4Hfe~f>*=((DunK-y4#c7jtL< z0txVe2YKzY^(3Bew+uzp&$eno$UQsSc^-X?&^HuupWMdiij?E}B(Dcobzhtv=?|L; zqjXIzq`oi!uv%NWC?C%%?b1d8+UORHkm+IDs`|kW& zD447;bJ_|rEAoT-VYFs|5s~`Uo?V$Sw%7fQqw94T+i}go^vUVhjaDBpc5J#lZMioo z7Zg)&AGTR(VE^b;!Y~s6E~Zuu=%46N)2PscaZXhLhSj3P?*TF)#_C0K9wUUH7meh6Rja6%1lfi;X`H$>6uT-2ZntJOD| zt5@qXD5T`yx2-L4dvtd|+?icSbgP!}1oi-BUH!m1_dD{f|VSk_Mu83l#pD6LbA=q)#H-xv~3C|D$f>@LsOrDCYEv$GpL zJ$n2W#dZ3t{4p>p<1+d<+rU|GeMn31-6_v9X2!1>+*%n(B(l$B;V{qn%+dCRK>sT} z1XGnmONvlQG$W{^fEpcG{-2LGzwg+N-~#D6tLp#?)Je_DtxP<>!K}fC(bsoyctBa6 zL)HV@k}!ENRIX3hWNG&*a4%90`aU%8@8`GBkw60GRMy)^S4a&MYD7ylX$NeR1Nxu+ z_7%ec-~c9MZWzk6jkT>+nii4E+tJ6bJS$yN&MzwJ?oMNoQB#|#*OuDy>u=*$%jeXH zWYRk6HV>eIw?>8yu)tTbunCBppLTw1D2BSza%R z{6qKSA3~Z}o4$oRY|GM2N#;M%=Zg5jbh)fz9E6>3zT?4+D0-7XCnQKZrvZLx~;nt5ob3F^#}`Kp))_@ML| zQl6g?BO*AsD^g^tuX>6rVu)W6f8}@W{2Y%eJS!|H=&ZDBsMp9a5xlnEwQ+B7EXEcT zsNH4%4Ke$kQK@CRgSo(4rb8{kzCLNI+`TMhMdKCGjV_DU~KgsASFwlnt{ zjcmyK9)KEH0guZ&_(w!{_iZ_Qqq4F5SFebH^D?30_$B4ze(VJ&*P~sXSwaU%R-x9&+c14+tC9g^aMMXtke@d`z9f5*GWvtE+=qOTq zcqN5r5{>2yYnW*W02^l)H#fdfcztzs!utApQ7pJi^L(W2@jTqdYk2U;;vJ&M)7+p~i=DTGrp%&LjP3{XUG(^ySgWd{3!@<3Wc4|Cjd5Nc3hX8{;$#+HRh& zH*j}xctsV+S7ijww<;T^xwxfX&&*tz*-H5tzE!(EwRMo99s0eat&J2~euPP=m|Kad zi<0q5cfvYd5LTXF;@SyV!g+;LXrob?*_(~kNCX7NAS_Y1jKSoQ<0X1g}U2`rl!CS z3l#l9^<*W~{vY$t=#AYz4gwYIQY+B{#2s)JOR+|Ey}Nes(}`-Ii@$kokBeG7gv(#nKGU#=d)=HR&3xgbz@b-eQ`dsG zbA+dQjhhq=RM{e%rxc{X3#sTCM6y1ux-7PHR+dDpOgR0AHvGE5-e(AQFn z_id2#AW1rhWrz_7>++D#-WCwQh|(40Ovzo!L4Z`*{zTteMd-Gbf09Uv<$s~{n* zC?TU{C8MG$Bd;p0ASNxXDlL7}f-&cR8TbdlygefRvw;QeCt=V)_h13y66)d~ X_@8aaS<{X{8^G|ksb1AB=fwX47g1?I literal 0 HcmV?d00001 diff --git a/sprites/spr_weapon_mars_hbolt/layers/473a7284-a688-484d-91d4-96d25b326cfd/cb2bbe01-35ef-4dc1-b409-a1cbfe34ce5a.png b/sprites/spr_weapon_mars_hbolt/layers/473a7284-a688-484d-91d4-96d25b326cfd/cb2bbe01-35ef-4dc1-b409-a1cbfe34ce5a.png deleted file mode 100644 index ec16396eafa43f92ef094e495cb02570d9f79f60..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 7510 zcmdUU_d8pC_`j#E(xST1+AUSJTdOFkDxOeVjo8%QGbK&Z(&|t=c1a0E%$Tua1br&4 z(Wux&)ZU{A5#n>6U%uD%{o(Tmd`_-h=j7zP*L}b5*Zq3k=e?=1KG%8v^DHbZT;RVS zo3pU|B@28nvY!R+%(LCh22P@Gf14YzutZ6)u)KWD!g2`Qdbz~H60X3)vf|9bqW+16 zg)itc-s}PJ$5~fH{l_dP|9x^>i&9uv1i|3P+Lq79*C|eZc8i&d+f=o;SHa*US^pFk z?R(&=hY`G)kP4yPhrhlwEx~VVXloY3l76^)^!MpT{Z_j3tS4PYIbh%mazOXhx6V;s z_Vdv5_hVWqao~neUmp662G?e1hc!%SLvR7UcJ<=PZ|Brt+FF%UI@@UR?$ifVZqdyrl4a1Pl#cmfJ*==$fxpufViRaXbytYx?(&1D%49+&PRc z4AN6|YE&P8=%iAQIudwKI@A>Z9 zrx1*FGeQLCU)p5^GY?ldBdSxuGFewuZC!2S zC$t>It<0(O#--Sx@QVUxTF)-QWn5&NWf&EVz10TER3;|KVd)<78A-No_8 z$NJP|l@65-C_Qa;w9dkG&xh~}2v}T;{V;2jA@3wS2+Lc0J&`E1_ z`|#b|;~74JX|>Iu3G&clzgdT`O$;2hKe`yc)Cmon|L@#?<6Cg~3$028PW=eEvY}Fr zEGK%mwR%A4%)jS&;&cm_7s$Wa^0IAgZ2FhUMd9<^Jeqrh7E)Kwi)q}xCKo-dS2em0 z$#WE9I-sfd&T?303*xtgT48HD&G3Wcf}Ncmzth#0e)Dz~udeHPsYu0?|yG7f^CuzqA}D-&U-^sjQ+hjGP^IAom8fyjRdm}Bfec&|rgIr+q&4)B4 zWUsCR+g6YW?6=I`?|yZ?d3Iwu$>PAzijpOF`>R}=Zf9go2pH$e_BzT-mA}ubzB5zd zs&pc3+{>cV={ZI^DVUNklH*4Vp-D|YQoZr#`$;)k@bSHBR_$Cx&!0;(-{SC5dp=P+ z3w=lpP0eGZe#A_btP(fM99(f{)UXIMW2{&;Hf9Tj`Zn7R=W$T4KaEZQNh0~e;STd5 zk-2P2{9N-p^k%a{VHp{jVtcvfo0FpKyUQj>NV3v@{pkgFRw+J%nB%jX;k?DMLy2|h z%>Y{`E3B1(7en$xD#m+3&g~FYDfN8m--j^;&DC(+xu4k@8FDf*jhz$X;N3qx@@4jN zs%?ANz+aY=p6rkbrE;wbSRO($!HreB>TW_1OC7}D;v|DL`!@Q8`DW{W&IJ*z$?9`= zlxypxtt%S+$<$qhh~Gy{ypCVI=sO(SWMlA-g`y()#BGpR?Q{`W?|m&Z-GEJ8xwgD0 zC(2;k@FaLp-q$Xq>2vq|pY$x4KOCaH)&E}UxX)T~Y#>eA`f!8DZG$C-_hwBYPvDxn z{W|BP9|BuO`=XbttLtEqaq{E#asESGfpb~*Z$vIXPVh^9nA^u`jm?(Ye7^0CYEojk z;#Ah#n1sl+ks|kwGPHI>N|xJwVpo^a-Me|N)y3u|1y08+)?#W-qu1|YWmi&d*FDt! z%{|(Fm+yRRX*X7n4ViMc^XPvmzW1}Hz{9zYSuXkE>Y0uWPO;7kG4gn{3max+N^>?V zmN5q4mxqUklA4-YKg~M}k5mz`rkE1+^~D3@_me z&ekZz_MvHnV)x9z^0IfKcj?|bj>=1!yd9C1^LeK6I+Uoys37;`{uksi&ZrL5k(E4R+WL9guY+Wgbq&r1aHRD!S zIis07tx&{d#o2M6x|NmhfFVbb>=1{KD*@BSHCUBQ(XGSPN+u~!*sGzvg(6{{wc#@j zac~$K9JE|58FDdmcYfX-0Ns+3J437CKr&J0=K>;Clzp-)+oH%ge3N^knYP<;?E45) zXS?uKZF<1jfi}nbkJ$sqfteXsiI+C@Hi0|#vH%jwezf!I zE6?V{%_;{$VyRVG>5vbA^lTRdzhAXo2vKVoeLYw%*bq0y`__L$ox;xU|EdFnNUBkc zg=nU-rig>XRtE26uV1ujWA0TN`Xm^AoE=>!dI~MogE(4fEh=fDFpK_sni@<9Ha+r~ zc2X~IH`9C82CWvV=lS#VjiB|v&S3qk;=Z21uEh$)NlT}7C*=6rCGMY!mfh$ljkM9~ zdI{@a_TNs9vVuUMO~ii(HuEqm==zE0T&;!m>LTXWi4t`CN15r)oK&TH5JvI86D9x@jQVzhn6!7f9 z_N-i4&9n<27I!K4*yEGCAN|FYyAL?|nXo76*8|+bEWk$qo>OfT*3liE>_75i*<0e% zfzxH0FplrTc-wI=kYSqENP!3gfiiX=4j<+HB^QFCbj0<-rnAmhkK~p zb=%z5#NpSwo+gE&;k)dR(={BhfB@rU91b^^b>Yn;?fH-~cgV@|8@@^1B+@*tz8(Xt z1qf1#s`9*?5;!w3oKd~z;^+6o?5elFzY!HN%LQMtK!@<<`CF6?O{OY%XGuNXxoPj@ zlu@3q&TgOPosSLGP$YK;(EGi6f6MMll?Ri=@*DO zJoctwUUpHm`^TfnMJB7EXvXJG$$=j!w<*|@`w5EFNq`;hS;dmQ!mkm7fqXEjipX7f za|I_SNuWOVag?e5Q)Beoyu{M7azqiXz&qF}nOr_5euuiUWn5=wb6wXAL%7YUlh!lO zjCs3hbv&qYxS_6DL4N(3RyYeCWava532-AqgJ%0xqD97ry)NO-KBHCubd)DhSdy^T zq1C%*6|MC*9hL5&y~ScuEl2fq_}egtsEN6d`Z)T7$mIqF3(Zb$!c=ZSd7-8btj+P*Bj z4|w_b9L{x&)p|PY^lw@xL8#-7!#roT6|W3*slG@SmlH_AE!$1ry9o{;5EDh96Sm}E zB8HxPsJ+^umTCF|DlkAgrOECu!(=V`F1fFL=z-a3O^gNj9V<^WY!s{JIhMln72{nB zMEofSf?7k{e(Pq_eh1C-x&tg_u*Ly=xaJ8myv@9D5qEZa#dl}yi^u`n4vc}Kr&W_$?8so|dhQ)}Ox-b1-rz4oS#BTt6yghZTVc%cu< z7acFh&qLc%c&Hg-j|Zk!rU%GVD~{*xi^Q2Mt4 zI&$H+8T_o-afn@uL5aV2j9R`0 z4#{pBeqC-=1|T&6cZUnAgr@49Y|g#woiZ0Swny_56Xqge)zi+I6|LOEflIZek%aHV z0jUS!_DoUV=3l=PU2yHtxusu|^M)Dx`U%2Dkdp*CC;VX5Vp7(1jlX;WdVBhN!=WfI zFRy*}@X=Are_OpN2FX|5x^V}HO@mw33hI8`#A>a^9^Zpj==%6pgvuPI4CD;+_m@>1 z9Ve9C{=r(VWJH0v)#}?&0fh?8GgBgm>M$K%@z!S;AN${^x0>#ns(5`)ILH?B@;8HJ zr}Ow6La!Y+TMvu4iXc|0ArZ;9>Vz2`#U|atuA8rh${Yv?2a^Zeucg(tP*EzH@gg7B zFmY*VHfI++$yNmuh!HFEn_#S;v}vs=buTy|yh1)qub)+bzHL(skjusw z6MWEVxt@D;VRX%N!dA}%VZ?!pb?t(uGw)*=vQGwP8T0Mg@$&N{Ek%yU|M|)Ae1f3n z;md+gt2lp|D?5z4w13UlVt#&zYPi?rKlOTv#$PT52c|#*owP`w zX+<34Q4mibAA?}Q=KU^%OWpG|0Oz)sO=rE2(yg;9TW)`Ky5jx)yLW%*WUz!o0pQ^4 z?dvN9A@3;&E}G+GGjSAmpFI1|4WC(#?_vWc)x zwjXvUO-#8@L;0Sct_DfH&#mKv55G^D13q}9JG)8KDA1VT#@YuawkyX zIR4FzG))!{xc7B_e*Waa3c0~4$=lyVK~*(FPF}wG+S9U;afnb!r)hKP)pMj zmj;cQP1+1rY;NQ+-CYu4(MtB?L^u_IF#Q`h>o*t2JkgYm8_d<`ViD(V2YOCg_C5{d zWjnDOQD5|}%aTg_5G~r@Ksa7ch|3O8^K!taQb@)d67|9-ogDIjt`vIkTp@JZF5dj& znSiw%YHCfJ5UQ|q81ew%Hy-duJ&*m~M`?hPEhVqoUn)X38H|As)*>f}TVn_r#Tq(p ze3MqcuQr}&bbZc*@7ZQH{QB4?Kyv`Xu<$c}&vU#w!{F8kPy3^5Uv)8cigL4nI|Dq- zkZC9&ZaWJjP_6lw!v2L0cqv`2%hF}GSPpc}T$PrV9{a&Lu}}s)EEj~6zx$f%k&-j-@{-8xqcX8yBnLW%W#Pz>W+kJiC6>E@GU7gI z)C9P7u$$7c)*ZKw-h?vvxx1iGqXd85n-e2*a|Jzr)Qv7Ku|Z(MCnw@`p%s)zb{+LL zc;IicC7=_M8i!+JpZMOdKYX<&Xsegz&H5?_wxOo$QVb3plk1V1xo@R~hPv(GDe)*2 zDuob|42;Tg9?&G**gsiJDtDY5c68+fi~Z4`?{mw^!fao=$=R8#8o@(RDzjFEo>E0e_l3IKrayDL93$Fa=R2~yR!dr087lKp;y(n! zH)DCV<^m0n%yJnHSICG4JigSRa7Jo1MifZoV1al&JRU#(cd~feu9N<8Qsc-!-s?O% zEAK#vqsC@fLru*WZupW;sijn=@isu*?4`?+v-)zsjBNX7nlVNVKo7AM6*Nx0;p(n+&ywLmFz^)2Wq&%@JG@zw?A!+jds zUJeihdGbhl55*BL^v=N!sX57go*e@FaWN}upNb?jR{;>(d`-6f-{A5`c~#y|-BB9d zR{bkeo8N|BlQ#U`KB>3B<>K`1WN2nrGTSKAy!P$b30x z4BaW;s%_0&@-#q*q=L|y#}v{yP=!=m8k6V3--wON4NokwDy#7LJGqRj%u=etm8zbC zrKge>6?u-Cy=((r4oWDA0}iKyXjofj=5PTA~01x~;7xxL?(U*x7}S zrO-RxaP&R=g^%Hjg5L9&n#0zx482baz}5cN93=qO8{xFq`2z?B8U<~Xm9}xJ}Fy=W}mVKn-_Uok=>B=3{=-l9UuBox0IQB7lAaF z`;cl-(RqYj5L|85O36-8yf(90&HaxzrCH8*izC>Oubiu|TBiFD)78~wiM67P>h>Ux z9$6tBWjJh9NX!cfp*94f*2DhJbbw3yy1VNFx)2Z~Ks8C0xVInJI6d+!|trAi5i5ITeo(ouR7f+7e40wTo{5fPLUx)hO)1Zg3( zfJi5_NH2NgkN4JkKfeEOy-BhrnVBRuUZvm4vH^fA!B9`f>d`cA?jpb*9U-*4)AVq@-<-FSr6bF?MSFIxnacfFp?D(G z4EH|1*^%9Xk+pJ(tiG=~^&6eP*v;Eda&9O;UE&XnC)-aNfw_?elk}}SnN!%_OoKl4 zn&?xUyImiDO|M2gi+2?_{OxFqK@L?ABDH!!?`d#yMnwLyzX?AOv7&;C7;XZt{{P;7 z4MUb<0X>H``gThVuHJTh3nkWM+Mid)h=9YdU^mux{LTnB1bR2I-$u_Dzv1`QnrYtm zTmaz-I_>@5$Dw(pbrAw+&5ovlLEa&OE>{2;kcLNe))s8i8W?e1D~GUO?(qVfbwxID@) zF1~Yx^y7rjN9&3aXxCAUS7nwFBC{X1piHlh>dFSseTVx*=5jh}cNP@4xRdhP$eS&HKCw6%+mnJ}{i$nYKbA%3*1|+){Au z!Cc@B;V6;+Ur>ij8A_jx0@BE~U=J zkb=CDXFcfA6huAWw!xiPhfmo5+F6r*oOsFT^0NE5j{@k%%CPqT1^D@(}F1sg0v!&-z$d(80z%_0zR?eIB(-kq%xI%3x%+VA2?VE}egI!dQRt z3H#6)dN7;HoV29e2a`SE4*huFFhP@6 z*TlqRYielz^5U!-i6pC3FfCF|uJuF_9~>1V_&#?VVJmI2BECNw?@rPFP4%%#=-L%Q zAt5ktB1Nm2{IXIGt1j&r!A!V#qwm+uKl9lDtYIL!pwW zh;ShGL{7Z4z#V6C+LO+1fPe%#pt(}QG!1+ktHcPt#Hr$;vB!&WqH#Osm6a8!BNzs3 zO%I~8{+^$=7W^EC>WUYZeQ z`gYkw0|FtCV}$TPN96g5Q4+r&TYr?-3^^M11&7It8J(!O-!e~V*=h47w)Vq{e`{@h zmMvt)TVz^zXRMbiiq_ZH7lez;_F(K%EM2+QP#rK4uuz@0_k=i)en<-&dxq09`(3o; z#AU2u>|;AxGLgR7EEr!GW6RcAQ7DPF1a|iarTB73SF$!SF z59joN#yoAf1^nz#c$SP#V!O{Xk5?B)K&$xtZu|O6$_UQLqH#Qd1xa>0rk?;W%tMn& z9#MpO#l&oJ!0Yhqp!JP#XH~*5tDO97g=_(>JsKBbnDJS~uXfwKf8;CoT)pM|?5zBe z2&;=`3HOn)K8fqdr%hG8*=iG?{o)|4BfSr0WioPdN&Wr(#Z^1X^feg2S`Ak<#CDOs zROeu`V{fw+U+q)B&8~ygC>A(eV@<)C&M_zMiuURohlb0_s|++hr?$aZ+T845_GPq_ z*tZ72rQey<{bhM|4zHeVYv_=6DCq%p_*>-Cjh;COj5y;aRO7=&mLwU}8YwZcDgGrw z=1%%k+oS7^hj#eT=D&LNWiPGM9$X`;YmpiAfk8kJ`9@6?3k#EijMj^jUgWh z?+h9#ZR(2p5#aCd;^Xrv=zjC+9h>Q*8+FrD3PgjGxTFs`oWRt{T;TDp3rvAG2w-=JH9_`GnSM;97}d}B~dVB{FNEm-7S370`pvD zUH#fs#g2oGJk`=id~I%~M&YFu6v(hg7Ufn~NE0x>bY9|KtA>5T(O+qqs)`NdRvfB> zu7xH(E%v0u0kWy@d*8JQq;YC*m0wzkx|;$ZvI`0dE}UsX%9#>xO6&B5Ie1mxed#I{ zoRK|~nPO@CRlN7%%&*1eJSRn8vMy=8O6#Oaw&h?}z+9NggraSTc+y89Tce-M%a3>p zHQyb{M7_j*rm?X}uN`n0sPERvPg)x|T-Hhj^J z`~#iEklyEfd4r2^i08)URoX|SM>6SwmerJtHD8p9Sh3-p^!JqY`wvG1>6M`)X_31ulRjUZvsPY{p&cwcsemN6WFx zr1d&ioLyXqDq`Bgg>t`Fd};HkPqH@RDKcFeDv(nSS)nCCOLi)~(Ta3;?~c~afe6;x zI63tmwG(3Gom9aLd#dwtaK=fnCZoZMZ5Fj^3SZ3IRDtmV>o1;>A|Y0P5$B>aHp^e+P5X zT;76|sro^kx}f0rD9(lB9{68|?G^@o%~OjZ6SIG7xBEtSN=YGEt8qs&8sixB zkx;q`pNZ%QgO1!S8ZX$33s@=CEhy-hdTc~2$Xtq>=+-$3%r*q>2eq zkjX@2mAIMl>DVr~uI8HBqFmf*8L*M?cI7NfPJBjJluGi2Of1gViG6i*7NS~oN3qa9 zN|BT5S#bRZgXS?HWL7NSo+tGZQf~F-c6~(#<5QCR<*PeFswjE9T9&dSS zv8xb$V(NE)Q!~lNc5rG|ZbkgwyfSB9md>>s*9Up&aGda2K@vxro<>n>6Q}cY=q;@U zPR``Z=g-a}T#b?We=~=MAIz2Rxr}W50%^zIxTRTVkb}6SEIGt8# zH>RVULeBRILhuG!5+(H4s(QF8VY`A~<)#%(MZ8%S&v^>V;V#K2`iC*_O{Zi

dY9 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 X_@8aaS<{X{8^G|ksb1AB=fwX47g1?I literal 0 HcmV?d00001 diff --git a/sprites/spr_weapon_mars_hbolt/spr_weapon_mars_hbolt.yy b/sprites/spr_weapon_mars_hbolt/spr_weapon_mars_hbolt.yy index 4a3173c977..f3160cd532 100644 --- a/sprites/spr_weapon_mars_hbolt/spr_weapon_mars_hbolt.yy +++ b/sprites/spr_weapon_mars_hbolt/spr_weapon_mars_hbolt.yy @@ -2,9 +2,9 @@ "$GMSprite":"v2", "%Name":"spr_weapon_mars_hbolt", "bboxMode":0, - "bbox_bottom":167, + "bbox_bottom":210, "bbox_left":64, - "bbox_right":225, + "bbox_right":220, "bbox_top":96, "collisionKind":1, "collisionTolerance":0, @@ -12,14 +12,14 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"v1","%Name":"473a7284-a688-484d-91d4-96d25b326cfd","name":"473a7284-a688-484d-91d4-96d25b326cfd","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"98934121-510d-447a-ad2c-d09856d6ea01","name":"98934121-510d-447a-ad2c-d09856d6ea01","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, "height":272, "HTile":false, "layers":[ - {"$GMImageLayer":"","%Name":"cb2bbe01-35ef-4dc1-b409-a1cbfe34ce5a","blendMode":0,"displayName":"default","isLocked":false,"name":"cb2bbe01-35ef-4dc1-b409-a1cbfe34ce5a","opacity":100.0,"resourceType":"GMImageLayer","resourceVersion":"2.0","visible":true,}, + {"$GMImageLayer":"","%Name":"f8d667c7-b860-44f8-8273-9a2e330a1b8e","blendMode":0,"displayName":"default","isLocked":false,"name":"f8d667c7-b860-44f8-8273-9a2e330a1b8e","opacity":100.0,"resourceType":"GMImageLayer","resourceVersion":"2.0","visible":true,}, ], "name":"spr_weapon_mars_hbolt", "nineSlice":null, @@ -71,8 +71,8 @@ "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"473a7284-a688-484d-91d4-96d25b326cfd","path":"sprites/spr_weapon_mars_hbolt/spr_weapon_mars_hbolt.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"a1388382-acc0-40ab-8fda-87d712ffca54","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"98934121-510d-447a-ad2c-d09856d6ea01","path":"sprites/spr_weapon_mars_hbolt/spr_weapon_mars_hbolt.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"7083e8c1-3489-46f9-a5e6-9a3de2110e2e","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_weapon_mars_plasc/56d53598-e41a-4814-a85d-43df630bc638.png b/sprites/spr_weapon_mars_plasc/56d53598-e41a-4814-a85d-43df630bc638.png new file mode 100644 index 0000000000000000000000000000000000000000..6da895ed1a07beabc2c03580485a8e05f31cf348 GIT binary patch literal 11457 zcmds7^;cBUx4*#9H6X~)Aky942ucZvbc%F$m$bB$bazV+4FV#P1B{d)h=52*_q%-G zT5qlQ!}|x`u!dRd&YXMiK4;&(KXGC-)RpjYC~yD(z<=>vK??v-IKej*3j;i|iTNZK z{GhXVuB8S5eoO!m5)J@Y;GvLh0Py4ifInscAodXe$Xs&ZniAj_7;jXR6oC7Ozk=@a z6aZjvexV?%?X$SI;+tyxI+y$K;Dy?IYeOz1^-EyO1jXrNi*kIP`&Mv6O}C0 z8wPC*zK@XNBog!Oa6CD=H;^60ypqsTDcjXQL0;@nxuHR9fFt1VZKEVXz+m2KSxmi*EFYZy-?j1Gf zcf0V5)B0e^nvhgtbJ&wybp|~7+1=Ajx4+Cc-ow&yG^vr&9UV6|DC}qjd@I2mYBXVw zLpbkSYWFsfz2@-)0zH?jmlNJkGR6w)>j@A1keyHnio~RRw@H*1PS1fnD>_2Jd`YMz z)y0@BQTpz}gZkg+3dLn&=2LBcvu;%$n|Q}XyEn&MlTlFAhyT0q>3$aUu}=UHY2J4p zh(*8VOQVWVfI<*~J;O710qW*`cC&Shd&k<9fio;VL@0tMu9e)+IhYd{VuXTF|5u~AH0jfml{P)-Nqx=K4QO1QTA~5|e|Mga;_V&COt}>)oLL;V~gM zjV&d2sb<(2?d>!zJ)S&E>3ZKBp9|FSDN#66l^(~Flu;Qh6jsL1qkHVd8L+VVDat?z z!BXCb*%-8YzQ{s-$FL_&Gk^@O%1!SRbQE%0#+p0^7b;cj2zil6gsNOA5`EDVtd$_2 ze~-)E1vNG{#u{{izr12?;N#%N_4U zQabfHwyi`4UZ4GZhs*V`^;quJOZ9V!o*E~0APdKwB%2amFs zC%bCGDrQ%a2ch=-N~EYjy{r@S%X(#^xeqtDaWVd0bIS3IucmOyj4UUwpjtp3+SoCz^A&yH& z(S?@!4IK90zx;TsNSJbIoSU1=lBTSoY<_!n+P;}?7{b!W=aRb)Ykqvybj+RWRdN#c6C=ggGXPYk)dGF?BqA<(?MjO+f(%5e0q1Wm#&ErghRncElnA{ z=U`)$IX^DH+3)mEyH2E{L6lfK{(78X%GXHb5>WKp&e@r}Bo6Kv0d3zY%RU@;4tn%b z;wW4!=;mS<4u=PcuP`U6Q-#e#810QxUMNe>DYXhYe1}?ZvzI1KZkfX{26z-|b;7`` z>kXDp=Q73_an<0;Fo!8Fad=XDOh}#^Nu18UYCjynP3f z*K2b!UdBt)S`R$%rv+;Owuh(ZEt6)tIz1R)$#pB!9CI2M5N)UbkhaS$!Qv~y^Vs}& zXohW0L%v(Nm*x_lN5lpQKd;?~2>n$m)Ymt2e9)wQ%O_NVSx2{#r{9rsr@Z^&RMwD8>qW?vI*Eb4T{xHq}wE+X1py?8O1H`E3$_0icLg46PBXPs|?zgiUO!1Y=lzR~4fwaS%6;};! znC`l$va_&$N|U2_p111#kJh~%DMtZWJOd)vTgv%3vG+bRc3K^xh}*XOiZZXtVm`NWFU66x z6WF@gaU!|R;_)O!{ilX0ZTjAwFwj@q_CxH?YKn5HM)lm{Z9?t|KQwG!BxknFbcZDb zsp`kiZ5yPc5}fMfv?Eir)ii^cnza-3$s@yL8*v5eF|d~7J`q#?{tm1~ky%@V&78kD z&^GTXmUiNu11v1s7?4vzmt&>_URuvfUnNDNOv5|__Uuh56KVe3Ykl?kYDfM2^vu)o zP`CGLPQ_blCmif~=3wcN$UTAEe&;%j6JGFuJAIsgkpq9ZyB^CujCd&>kL)>X;lV>| zG2q-U>AkJjSF%a4EHbGrnp(iFcWr7R@baVKGGhtZu`-(wGJ~O}TgpY?$U@V= zS>{T?Gpf|K(*tG~t_7NSZScwG6>>gN%qx_ei$41yBMU9isU8wFh$5sNmM4^))gJ!D z(RErBThy^nDcDe+=f_4s4F6q9X9mMy+tgZi5x`?0&=~D2a_BG2cN!?IxV)6$CFAZw6OFv#ua2uJ2)8bfx;1D^BL@J7&1v(Lz$h zRGjxlUpYpr5eslN$=HVxk|uq%LJ=ep;TW@{2vrr5j)1zNRyo|9%SX_~VPH{>kY5FE zi2CJ=>7mO)F%^x)OEP0+tK&x@HI;A_14`!<=kQUW+$7sz)YV`cDH%Ju4z*{JD3d3WT1 zHmvVBV0PD2L>*_rp_P@JBQrhO!Qc;5F@e>no4_%TjUc5viKabS&WFSm4}_Y}-R0KN zCU>y!x)MUK^mkQtot#vDBCU{GlWo=do5pBN8XvRu@u^W8s*RMFQsm=>q><0dwZ6RN z1D6&=BQn~%zK!*SFQsoi5D1l0;sKtxjOSz4GZi|!Nv-&d#YS~^cXwrwx#SPpXp>;K7s3Ggp9X0j1Li<$CeaaJmBWXGjNQv2*oi9 zy4*aPJpMf{->9eH?JXRzI`S|@K08&FNn@J@sROpX zy_T&bYR?Ni(+B$Aq2uz1h`_uHFl9sNu!>fh&lWUU`i{HW=OF-(>c>cwrRHR1)s!0X zpN1)NDb!oCP|kGv5+M9@p?uWT+}zx(X=!%o=rf@YF?D_=yeXpvGwr06wLiD~%IdW5 zJ`ENK8X<6NR&c~JOoK%44x^+$7YFGYxuUCsbMmn)#;-e}r>BQ?Z|XH$mEbm0YMprr z!ZzGI+ODMvH?PlBbmCmoz9ac8+2>{_#&0vEPJlv1;|ZqQBTR}0%NMUJ}( zr)8A&5g{oP{W|msG-9bfdY?^CpIh&?90f|76m}ZaKFOa6c>an&TPC%v!E)@e z#Qn|j_eKj$r>>*n3YT>?!PkPd2DOo3Cdd^+&o_W+O3{?jwJ*sG%;$JH+n-K1@bYeN zZ?_K)oc+Gxl9X)rRY$R;6`9?Pncle>ExC6CGf9Vbp0oC8kNox(x^DNJN0vL>c|}B` zxAOc6hTibj_3un;&_m{H^dAv2v6O05YP)RZdehjgm=tR0@$m4tK!7kL3#^&R%*6!? z9Dd`U6gbV?w!(y-{(O2}$h2{HeK2ypdLQ(F)0_i$4L7ERa>Gj0wKQz)s}MXNMxH<( z2meftp{|GO9hDxSUhL1_)>?d&4wfoO{m5@kkmtWI>XR1*M%a1K(^!Hf4>9M*$wYu^-u8T`dZ_3{nT zQl?s>_OrdEDDR%*ToJz$mT>47t0uMFFJ-nx8Y~4GENhw8d7Ej<*cKkQt+C7=bLlq0ZJ6cra2S4KlocRa*s zhF3eionQ4X&FPx1G)rbtNrr&!j;>UJEe#d;b?mEM{kpvl7wMU-TnaX53C*IqO!7#S z)pPSKru~ksJfBW>oti!{0P5ER7RkqcgjeA50TP!C=dvW~}g8`cG;5)7qqNaKFtMkb%$;fm?i+cew?wqk@;Rn~Q1t>)YsgqlcU@rhO2t;2(X{HTkC}3Zp8i_fc znb{ElKJ)ibM25z4_rSb=_%f$+8e-7l=#8jInFvc)>EjN5&X_lqBIw zRIb?>`L`JjYLvuJ_IHT^lG)j1lBWvS%S5F`g5BXiEZk3JW$`VIat^r+^Lah+s*bp| zaR?=krI}BdckEZ;+|-|SYV?Q*zkrlF% zz2G-@!W1Gwi^?6k0hjDjt`g z^TqZv6`tdZmqp~wOwSXk80`(Nj#6s1Dh0-U>!im$QySBp-ZgtIGruTYMN^AikddRa z6v0YOgp;YUZ#<_|!blht!1D=>QZ9Y>9$MiqsQoMzYKP6wwSmFKHpj*`M`0JkC&WQT zEkd($PUgdqE}9(3IM%$HL7ry&*Pailf=MxXye?HWpAA3Vl?x7eYRWLWz~&LJ@6G-c z(`}$HzO^{=ot{~FVd}s@1n!VUqNGr@;%jjJL21BzB1cpWR}`?hG6{Z%`tjc^s$_GX z1I?ep^S4vVT(1wVrQAA}zfh8*$|)39xjQifG7&h1)K45sHE>r%a`b23(LdFO3a+GT zL2+1oNm+_{{cTz3=!^JlQc*O{#x#B}+hi!q$jC&*4=-X_uJ3`9&5$Y^{kaF4n5TZS zV!}d_Rp)JLYAW%*!oKAS{?y*+#noV4i!FD!O%{z3YsADp7sSNF(X-aRRbB5(f#-d*HTGEYy0bTJrAC1yR*M#gu3JCTx7(#r`ur3ideg z_sCBttxNG%e@0U5i4s%=5|sMYMX@AkBW-~qUfnbj0D^iE|1v0)C)z2u^4hb2*RTRA zGhQ!?PEUtlL06Rwm!&Quk_d+^7Z8xLVX+opvR+@xZTH5LbEV*Cje|M{~GB>cd1LEORhVW9LKFg-5LslW7o(xd2c`c1)$ z^tn}UFYkU&$%{N`ZN(v!SEyJ#u{<`pbdrHCZokLg7EI0g(JL5HstDm5n0|xD5J6#*W<+w2}*vtJOkR4VA&rC>y{H<1V5_ z6F~%^mp~8MxFiO{a7ex?#U8rRV5~eLpcaqQCAXGQj`>qYZCdAoO0^||we9(9SCGGQ)US@-jyTwxq}91H zZV5Z%=ZqetgmPfLyZFBNUaPO5fDSK42K{ht@Eyu4iX`{~BR-b=KoYSsKwq@+ZAmnm zE)J804*luV68d5aItU*hew%h^wx_xNW40ljcXGfWF$-Zj(FFd_@W*VoVHM)je#N*FLFnz%DB3u`Bq( zH_}izvxwk6PR&9^F{5PkG2pj}QJ5U>>y%O-Y$+!DXvuP`&c? z6CY)g`>)S-1_6~iCov(_db;{k%t8sYcyjoa*5o&KT=h!)EgjW>$CXLq0(xa=W6|$2p{QC|Fs(Nxeog}Mjg}J?eCf6WsgF5qg)kl~@(ynsiRDH*F1ecI z)fpfB=%&Oa2I-u7Z6et1DnB3aPHsc(7x8=LNv(vwNyR!Q8Y8O;#_3e|U z`K_5~k!t8G2g!exRL)|b?$FIS5uARmns8)vp9jZqgSs1$c3^auL)~iwCe+^Kc<0P$ z;vGwb+@mtbp%D>_uL?WXN%5M~ja}#62N9`!PG^kHUh~N3`N+2;*VDyH8*7gu>8VC! zK>}uKN(;)GyQcSkA_?`FkYIqK}aJvl$$FkHQQ z{Fu`qe2l9TuWi{4H>B_~O{Uq_d$^araBm&_9^>cs?{6v zXqLn0^dmK8U>WdP;J*zpw&zS!1|=8A^0_k!!VV*X2)PG1+Q5P9{`;G3p@s~|C8Z;9u+Pl)<} zV3Jlk@1|r9G5ftWK0qoFWC|cKd=O>96CO5bN=vT#b|x#XSjcLwwCbykui!&&iRk#X5pa_=*B6|qXUwvnCuDP?TT|EbaWV0oq-`_IBJjCL)D#P76B${m; z8EP>A0xH~}SMs5};JrI890J)dl%j-?}v|6Vcp%!&Qvn>*Ksiy4(U1nztFoZH z98-AN1?_>)`poqGdOy0Sh?>$;I{*0@bKjGQ6~XwrBEPtEj&@aWB9Ob+Eo7?P_ES)uHq#NeBavRfnfaY5Jn^d1vGt^WDA3w}OJ z*OmQyv~L4coFFSH`W!|mC9-383F>_~fX{j7YW(qpIANrDL1$-YzsINa(q1O_ z`o&GRoqDmP1g7kSs~2{gY%`Yv3M$8y{3)1tC`%1VjR*~55T3X0$)Ia;7K!Tuc-SMK zl3Nhabl#1xdNc1V7c>gRe+$kC>ICjfOvZ|@pK|KJnQG9GGo>mcs=j)SZ=MCHr6AQX zN8Tz0*el-r^A8R$Rmr&9@hOM6PwX zDPrVPihmrCO@wh*n1ZdsJ`T{!4(jLDO;}Y@K!mbJEU^lTPa)Yk(at0K5}9ds`H%6e zj;L+EE@l{M)52DX`|!q}y$N85*B#a#To%Bb`%#n(XQI4WVw z_h{g0E%_1f*#Tb<5MQ^(K>@ObornASfUlcwUC$%$Qjxc8qe0cb#*r4M#_{$i4M$93 z$1U~Yw)$AmVM!@{hDY%&Dly6$5$5_K#1(V)P|&d8B&m^rDhSJvbc4!8z4|iyjpg|3 z1i!hsPzh9oQ1(n%NF`sOnb`$GPO`p8}Xm5 zOc!M5Wr0>fQBWaIvOcuaxi{e9rl-h>rG=)cGZ=1%&~xgw;xD=KjBxbvIeb^g+3~>e zVhVGx#w_6}@A_t2>7-|+&6GVhVyTKq7|Y4a$6Rt-E1B8eX6c)Fo5cFd{5jZ;TDo60 zq?rU136kq!mcEUD5&Y$8nAWbgEL^eFzQ;}P$I>BHC-~efBm^4pCjtddoqIw?-Yfs% z&iFQai!Go<3#yU{8*$&45&7TUw!;lo;(a;5oXUGQ?do(&&#)bD@ex<hMA{~W%)VaB?nMP8p zUgFdd>K@;m9hfzTC(1VXI*e#8eT@NNugQ4#8AF=*A-DHBuk$<&@4=f+( z1DX8ylb9O*Kd0q4N>cxleHiobDTO|dMaMt2QQf4hP*mcTt1)aNI1ssY{FpC^pTOHZ zRheb$E6tVEtYtui#~YlFt(FoIae~@RdwA&IHQv~mj_&EjY-sjR^$?F( zFefbF2KL2$E%~LPp=t5Ub|-DnFe6N*O!y&}2Al3AdH$se9QnR1(cWGwZ>xT!HmLEl zuMt}Rd2O}}{@|?fe}B0B`^J5@**{VoV|{1#t6_67{$i{I*v;4idsdZd3979GaZlZUpXgFo7#w$=+`bo+B?mZO zt);D?j(G)kx-wa{=?9})@syHT-;QKUMZW2HS1)Ul&}N(di|Y8J;vjG(UtWez8zFmv0{I|^+DHMg@6c8()qbHq(pRmvsSVtfyHQ2&wF)kLl?`=OHU-X=J6IN>D zocd8GO8mo0=g^-aiTm(~kLf`9d07ohX#;2syWU&cBkST1oR^!d3HS9c$=ZKU1e5PV zCMjxc$KS>a52gtRdVaTHuzQpwCN8eYmZliEcz-qCiwfNRt&t8T^V3i~iS++-(d1(X zpBxmJ85dspYoB{>d@j3l$DDiRa=q6k?6~zoh0B&g0|lC>tiwjyUPr0+=KEYktzp|6 z@F_admc!E&Uh5 z6CW+D9|i8SrQv|sZaH`p&IL+R2O?9q(HTZ=*bag-Pw_utk#2@ZOrND`!2o2=2E*bRUrW4-ti?))-$ut{Q=qKXG)=rmOW#*Oih2Srpg|0a z3Fl*JNVsQo$h8kxxG|p z(PK*kF<^uDfr)WWza160Zkcn{x@bTvF7KN)oOg72TlTGpCMO#)8%AW=?6?dlx7QjX zQ=3X((WPot%-Ml*B`B`TLf6233%U!znvz{N2*Z$!Q=tG)`~7YEC1r2la6IJ(weaH}>Yb3e)%vRgp1&kP zr}qhT`K|O2Gi4Nn09{Eq#EgPCog`k`@aL5K`)BCyA&;*?|7So#09x7J@}85-7Fge0&(gM z4%5n{!lCwE_8T&cs-2R|lBN=g9*iQ~czulX#o7TYTtrAiu2FBeaRcpQrGL=p=NDHh ziN!?u+h0zC@E^t`7%07~Ggk2n*$5 z^_;!b>~d)u^U034=;oUJWI1NG()XydAxQl1zHdZYP9~8Qs;BD58g`@v~NWE z4*Rdc6-|j2IhC{*mi>W0p10Eys%^O$1x7lD@q6)lU$U7@j)$zU>xjSHbD4WM$Te z!R!Z@-l@uAB73CPMUNALL&Q@)(W87%2-B|O4NN!~_@oLeLs|MYcDospFCsv$HrM*P zT8BPO*&I=(*8Wr8`PrfnulEmIkYHSF4`aF>be|9NKjkoJ#u5%bHfX!^Lp+*C2ZCH^-ANf$?26j^frS?dO5w;c&!$K5!b`Y zrC!k=dsBGB5}a9aWz)}C8HF4d!)s$7zX6jN1;mh7FOyz~wg-<{AH`JH5C7=)CyJ!+ zxtgnAx1ha-d6`_7e<^wOec`xV?=ExFY^k-jp>}wn+6#x6xfwNH?{p}by7qP~V|?Nd+)!Qu6^lW!^PM;{S&02evzH2qmtzlV9TSVD9dA4KnOa5!XY;E;k$L6 z1WQt<1SQ8ShwNb@ZogRmE#MJQNrZRyoco8=t5Be4M|to?pWa{Oi_A-hXf=k5O9f)r zb)PMk*~aqk2sr%g_u}aK_u6{>@aPHJ<9J+CIuE`|`~zvi%Yer-U(HT4ddcqJOny?? zI7p1*jOAESlTKciso(bz8K zndiU@pe82z|MluNx($B4GCs&!? zydq-!qGAGk>^wYTJUm40qa^=pfTQzUTPxrHdw|)dYXvxf<$tc=Ve4q=?qTle@_&yJ TKGg6A#{e&$sVmgUnZ5fjt;MgM literal 0 HcmV?d00001 diff --git a/sprites/spr_weapon_mars_plasc/layers/56d53598-e41a-4814-a85d-43df630bc638/c5e2032c-1118-47da-b38a-f1a322a71a20.png b/sprites/spr_weapon_mars_plasc/layers/56d53598-e41a-4814-a85d-43df630bc638/c5e2032c-1118-47da-b38a-f1a322a71a20.png new file mode 100644 index 0000000000000000000000000000000000000000..6da895ed1a07beabc2c03580485a8e05f31cf348 GIT binary patch literal 11457 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 TKGg6A#{e&$sVmgUnZ5fjt;MgM literal 0 HcmV?d00001 diff --git a/sprites/spr_weapon_mars_plasc/spr_weapon_mars_plasc.yy b/sprites/spr_weapon_mars_plasc/spr_weapon_mars_plasc.yy new file mode 100644 index 0000000000..1d024c5ae4 --- /dev/null +++ b/sprites/spr_weapon_mars_plasc/spr_weapon_mars_plasc.yy @@ -0,0 +1,92 @@ +{ + "$GMSprite":"v2", + "%Name":"spr_weapon_mars_plasc", + "bboxMode":0, + "bbox_bottom":182, + "bbox_left":64, + "bbox_right":240, + "bbox_top":96, + "collisionKind":1, + "collisionTolerance":0, + "DynamicTexturePage":false, + "edgeFiltering":false, + "For3D":false, + "frames":[ + {"$GMSpriteFrame":"v1","%Name":"56d53598-e41a-4814-a85d-43df630bc638","name":"56d53598-e41a-4814-a85d-43df630bc638","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + ], + "gridX":0, + "gridY":0, + "height":272, + "HTile":false, + "layers":[ + {"$GMImageLayer":"","%Name":"c5e2032c-1118-47da-b38a-f1a322a71a20","blendMode":0,"displayName":"default","isLocked":false,"name":"c5e2032c-1118-47da-b38a-f1a322a71a20","opacity":100.0,"resourceType":"GMImageLayer","resourceVersion":"2.0","visible":true,}, + ], + "name":"spr_weapon_mars_plasc", + "nineSlice":null, + "origin":9, + "parent":{ + "name":"heavy_ranged", + "path":"folders/Sprites/Marine Viewer/weapons/heavy_ranged.yy", + }, + "preMultiplyAlpha":false, + "resourceType":"GMSprite", + "resourceVersion":"2.0", + "sequence":{ + "$GMSequence":"v1", + "%Name":"spr_weapon_mars_plasc", + "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_weapon_mars_plasc", + "playback":1, + "playbackSpeed":1.0, + "playbackSpeedType":1, + "resourceType":"GMSequence", + "resourceVersion":"2.0", + "seqHeight":272.0, + "seqWidth":301.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":"56d53598-e41a-4814-a85d-43df630bc638","path":"sprites/spr_weapon_mars_plasc/spr_weapon_mars_plasc.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"6ec6c55b-a7d7-45d4-9ee2-fb3ead827420","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":39, + "yorigin":21, + }, + "swatchColours":null, + "swfPrecision":2.525, + "textureGroupId":{ + "name":"MarineViewer", + "path":"texturegroups/MarineViewer", + }, + "type":0, + "VTile":false, + "width":301, +} \ No newline at end of file diff --git a/sprites/spr_weapon_phobos_bolt_pistol/7bf54d5b-eb4f-4225-8043-c7bbdfefe28f.png b/sprites/spr_weapon_phobos_bolt_pistol/7bf54d5b-eb4f-4225-8043-c7bbdfefe28f.png deleted file mode 100644 index 2f1285f5f9941bd93f914447b429594c5302c619..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3207 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", "resourceVersion":"2.0", }, - "name":"spr_weapon_phobos_bolt_pistol", + "name":"spr_weapon_phobos_boltpis", "playback":1, "playbackSpeed":1.0, "playbackSpeedType":1, @@ -90,7 +90,7 @@ "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"7bf54d5b-eb4f-4225-8043-c7bbdfefe28f","path":"sprites/spr_weapon_phobos_bolt_pistol/spr_weapon_phobos_bolt_pistol.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"7bf54d5b-eb4f-4225-8043-c7bbdfefe28f","path":"sprites/spr_weapon_phobos_boltpis/spr_weapon_phobos_boltpis.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, },"Disabled":false,"id":"2bc5e8a7-0d4d-416c-a6e4-608bded7e2ae","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,}, ], diff --git a/sprites/spr_weapon_plasp/spr_weapon_plasp.yy b/sprites/spr_weapon_plasp/spr_weapon_plasp.yy index 17926d1558..adae2517b6 100644 --- a/sprites/spr_weapon_plasp/spr_weapon_plasp.yy +++ b/sprites/spr_weapon_plasp/spr_weapon_plasp.yy @@ -63,12 +63,16 @@ "playbackSpeedType":1, "resourceType":"GMSequence", "resourceVersion":"2.0", + "seqHeight":231.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":"8fe8f87d-cc4c-49b1-a8c7-5b595d9a9e9d","path":"sprites/spr_weapon_plasp/spr_weapon_plasp.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"8333a6b3-f6e7-4458-ad54-3d025c953fdb","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"8fe8f87d-cc4c-49b1-a8c7-5b595d9a9e9d","path":"sprites/spr_weapon_plasp/spr_weapon_plasp.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"8333a6b3-f6e7-4458-ad54-3d025c953fdb","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_weapon_ryza_plasg/8baa401d-fcf9-46d7-b840-bd2164b100ef.png b/sprites/spr_weapon_ryza_plasg/8baa401d-fcf9-46d7-b840-bd2164b100ef.png new file mode 100644 index 0000000000000000000000000000000000000000..8474826f38e44fe467c47c3f2d778c266e8066a0 GIT binary patch literal 6110 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 literal 0 HcmV?d00001 diff --git a/sprites/spr_weapon_ryza_plasg/layers/8baa401d-fcf9-46d7-b840-bd2164b100ef/2401f208-6b0e-4e06-8e13-c37a028d23b2.png b/sprites/spr_weapon_ryza_plasg/layers/8baa401d-fcf9-46d7-b840-bd2164b100ef/2401f208-6b0e-4e06-8e13-c37a028d23b2.png new file mode 100644 index 0000000000000000000000000000000000000000..8474826f38e44fe467c47c3f2d778c266e8066a0 GIT binary patch literal 6110 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 literal 0 HcmV?d00001 diff --git a/sprites/spr_weapon_ryza_plasg/spr_weapon_ryza_plasg.yy b/sprites/spr_weapon_ryza_plasg/spr_weapon_ryza_plasg.yy new file mode 100644 index 0000000000..ad0e6873a8 --- /dev/null +++ b/sprites/spr_weapon_ryza_plasg/spr_weapon_ryza_plasg.yy @@ -0,0 +1,92 @@ +{ + "$GMSprite":"v2", + "%Name":"spr_weapon_ryza_plasg", + "bboxMode":0, + "bbox_bottom":218, + "bbox_left":10, + "bbox_right":66, + "bbox_top":102, + "collisionKind":1, + "collisionTolerance":0, + "DynamicTexturePage":false, + "edgeFiltering":false, + "For3D":false, + "frames":[ + {"$GMSpriteFrame":"v1","%Name":"8baa401d-fcf9-46d7-b840-bd2164b100ef","name":"8baa401d-fcf9-46d7-b840-bd2164b100ef","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + ], + "gridX":0, + "gridY":0, + "height":231, + "HTile":false, + "layers":[ + {"$GMImageLayer":"","%Name":"2401f208-6b0e-4e06-8e13-c37a028d23b2","blendMode":0,"displayName":"default","isLocked":false,"name":"2401f208-6b0e-4e06-8e13-c37a028d23b2","opacity":100.0,"resourceType":"GMImageLayer","resourceVersion":"2.0","visible":true,}, + ], + "name":"spr_weapon_ryza_plasg", + "nineSlice":null, + "origin":0, + "parent":{ + "name":"ranged", + "path":"folders/Sprites/Marine Viewer/weapons/ranged.yy", + }, + "preMultiplyAlpha":false, + "resourceType":"GMSprite", + "resourceVersion":"2.0", + "sequence":{ + "$GMSequence":"v1", + "%Name":"spr_weapon_ryza_plasg", + "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_weapon_ryza_plasg", + "playback":1, + "playbackSpeed":1.0, + "playbackSpeedType":1, + "resourceType":"GMSequence", + "resourceVersion":"2.0", + "seqHeight":231.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":"8baa401d-fcf9-46d7-b840-bd2164b100ef","path":"sprites/spr_weapon_ryza_plasg/spr_weapon_ryza_plasg.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"1a1d58e1-a542-4b05-8eef-1f05965010fd","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_weapon_ryza_plasp/187943a3-b1b6-4aee-8064-6942dae163d4.png b/sprites/spr_weapon_ryza_plasp/187943a3-b1b6-4aee-8064-6942dae163d4.png new file mode 100644 index 0000000000000000000000000000000000000000..921dcbadd3e5a820b32bb5a329eb1acbac77c014 GIT binary patch literal 3563 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 CPo6yh literal 0 HcmV?d00001 diff --git a/sprites/spr_weapon_ryza_plasp/layers/187943a3-b1b6-4aee-8064-6942dae163d4/8c36642c-c5e7-4e05-97b8-4b302c6f569a.png b/sprites/spr_weapon_ryza_plasp/layers/187943a3-b1b6-4aee-8064-6942dae163d4/8c36642c-c5e7-4e05-97b8-4b302c6f569a.png new file mode 100644 index 0000000000000000000000000000000000000000..921dcbadd3e5a820b32bb5a329eb1acbac77c014 GIT binary patch literal 3563 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 CPo6yh literal 0 HcmV?d00001 diff --git a/sprites/spr_weapon_ryza_plasp/spr_weapon_ryza_plasp.yy b/sprites/spr_weapon_ryza_plasp/spr_weapon_ryza_plasp.yy new file mode 100644 index 0000000000..e19eef17f5 --- /dev/null +++ b/sprites/spr_weapon_ryza_plasp/spr_weapon_ryza_plasp.yy @@ -0,0 +1,92 @@ +{ + "$GMSprite":"v2", + "%Name":"spr_weapon_ryza_plasp", + "bboxMode":0, + "bbox_bottom":173, + "bbox_left":7, + "bbox_right":54, + "bbox_top":99, + "collisionKind":1, + "collisionTolerance":0, + "DynamicTexturePage":false, + "edgeFiltering":false, + "For3D":false, + "frames":[ + {"$GMSpriteFrame":"v1","%Name":"187943a3-b1b6-4aee-8064-6942dae163d4","name":"187943a3-b1b6-4aee-8064-6942dae163d4","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + ], + "gridX":0, + "gridY":0, + "height":231, + "HTile":false, + "layers":[ + {"$GMImageLayer":"","%Name":"8c36642c-c5e7-4e05-97b8-4b302c6f569a","blendMode":0,"displayName":"default","isLocked":false,"name":"8c36642c-c5e7-4e05-97b8-4b302c6f569a","opacity":100.0,"resourceType":"GMImageLayer","resourceVersion":"2.0","visible":true,}, + ], + "name":"spr_weapon_ryza_plasp", + "nineSlice":null, + "origin":0, + "parent":{ + "name":"ranged", + "path":"folders/Sprites/Marine Viewer/weapons/ranged.yy", + }, + "preMultiplyAlpha":false, + "resourceType":"GMSprite", + "resourceVersion":"2.0", + "sequence":{ + "$GMSequence":"v1", + "%Name":"spr_weapon_ryza_plasp", + "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_weapon_ryza_plasp", + "playback":1, + "playbackSpeed":1.0, + "playbackSpeedType":1, + "resourceType":"GMSequence", + "resourceVersion":"2.0", + "seqHeight":231.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":"187943a3-b1b6-4aee-8064-6942dae163d4","path":"sprites/spr_weapon_ryza_plasp/spr_weapon_ryza_plasp.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"9fb6b57d-3ba5-48c4-bee7-014fefcb6a3f","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_weapon_tigris_combi/7078d58a-3619-44c5-bbe0-4449064aeaa4.png b/sprites/spr_weapon_tigris_combi/7078d58a-3619-44c5-bbe0-4449064aeaa4.png deleted file mode 100644 index 26a2536c5284e35ee10c0a72c614ebe2e50a3dbc..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 4885 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 literal 0 HcmV?d00001 diff --git a/sprites/spr_weapon_tigris_combi/layers/7078d58a-3619-44c5-bbe0-4449064aeaa4/c71b0c2f-0e0d-4b9e-aa10-73d13c7796a6.png b/sprites/spr_weapon_tigris_combi/layers/7078d58a-3619-44c5-bbe0-4449064aeaa4/c71b0c2f-0e0d-4b9e-aa10-73d13c7796a6.png deleted file mode 100644 index 26a2536c5284e35ee10c0a72c614ebe2e50a3dbc..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 4885 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 literal 0 HcmV?d00001 diff --git a/sprites/spr_weapon_tigris_combi/spr_weapon_tigris_combi.yy b/sprites/spr_weapon_tigris_combi/spr_weapon_tigris_combi.yy index e9aa0a0cd1..b524790f40 100644 --- a/sprites/spr_weapon_tigris_combi/spr_weapon_tigris_combi.yy +++ b/sprites/spr_weapon_tigris_combi/spr_weapon_tigris_combi.yy @@ -12,14 +12,14 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"v1","%Name":"7078d58a-3619-44c5-bbe0-4449064aeaa4","name":"7078d58a-3619-44c5-bbe0-4449064aeaa4","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"b3d7b70f-4483-4f84-8860-eab1782faab0","name":"b3d7b70f-4483-4f84-8860-eab1782faab0","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, "height":231, "HTile":false, "layers":[ - {"$GMImageLayer":"","%Name":"c71b0c2f-0e0d-4b9e-aa10-73d13c7796a6","blendMode":0,"displayName":"default","isLocked":false,"name":"c71b0c2f-0e0d-4b9e-aa10-73d13c7796a6","opacity":100.0,"resourceType":"GMImageLayer","resourceVersion":"2.0","visible":true,}, + {"$GMImageLayer":"","%Name":"5ea71bce-75c2-4ee0-b0da-6d7aa5a267c2","blendMode":0,"displayName":"default","isLocked":false,"name":"5ea71bce-75c2-4ee0-b0da-6d7aa5a267c2","opacity":100.0,"resourceType":"GMImageLayer","resourceVersion":"2.0","visible":true,}, ], "name":"spr_weapon_tigris_combi", "nineSlice":{ @@ -90,8 +90,8 @@ "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"7078d58a-3619-44c5-bbe0-4449064aeaa4","path":"sprites/spr_weapon_tigris_combi/spr_weapon_tigris_combi.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"edd0737e-fb8c-439a-88d5-d55cb9bea077","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"b3d7b70f-4483-4f84-8860-eab1782faab0","path":"sprites/spr_weapon_tigris_combi/spr_weapon_tigris_combi.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"6c97b54a-b92f-4c35-851d-c3c9c616fc1e","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_weapon_volkite_caliver/746312be-a5f0-47ac-a783-e19dcde061a8.png b/sprites/spr_weapon_volkite_caliver/746312be-a5f0-47ac-a783-e19dcde061a8.png deleted file mode 100644 index 951feb5a719ce84eaec1149a255f10cc58358f31..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6168 zcmc&&XEa>h*O!7M9z>!<&tHq)2{L#*QDQLqV30|4hA5fQ%_LF;gD9i71eq{~D5D!B zQAQ0>f-ne13(-68eZIVFy&vAs|9kIQXRUMAK47b-?a_v|Gd-4QVKY>AEzB~M4U@`#R3Bb|

dMtF~ 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

dMtF~ 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 bf50":"","Keyframes":[ {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"746312be-a5f0-47ac-a783-e19dcde061a8","path":"sprites/spr_weapon_volkite_caliver/spr_weapon_volkite_caliver.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"73eb5e07-0f91-494b-bbf9-d2628d726607","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"85c35f09-7885-4620-994b-f2cdea15616f","path":"sprites/spr_weapon_volkite_caliver/spr_weapon_volkite_caliver.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"1599d57c-ba2a-41d2-9614-5a630edf1201","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_weapon_volkite_culverin/27b95a4c-b7c0-4f2e-aa03-ece8e4e50432.png b/sprites/spr_weapon_volkite_culverin/27b95a4c-b7c0-4f2e-aa03-ece8e4e50432.png deleted file mode 100644 index 9d9444b122c2f17d523bd2addbf559794b410c9e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 13243 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 literal 0 HcmV?d00001 diff --git a/sprites/spr_weapon_volkite_culverin/layers/27b95a4c-b7c0-4f2e-aa03-ece8e4e50432/7e7d708c-6c89-45d1-b800-7d518f4ba3cd.png b/sprites/spr_weapon_volkite_culverin/layers/27b95a4c-b7c0-4f2e-aa03-ece8e4e50432/7e7d708c-6c89-45d1-b800-7d518f4ba3cd.png deleted file mode 100644 index 9d9444b122c2f17d523bd2addbf559794b410c9e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 13243 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 literal 0 HcmV?d00001 diff --git a/sprites/spr_weapon_volkite_culverin/spr_weapon_volkite_culverin.yy b/sprites/spr_weapon_volkite_culverin/spr_weapon_volkite_culverin.yy index 2d83807135..9ebff9c171 100644 --- a/sprites/spr_weapon_volkite_culverin/spr_weapon_volkite_culverin.yy +++ b/sprites/spr_weapon_volkite_culverin/spr_weapon_volkite_culverin.yy @@ -12,14 +12,14 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"v1","%Name":"27b95a4c-b7c0-4f2e-aa03-ece8e4e50432","name":"27b95a4c-b7c0-4f2e-aa03-ece8e4e50432","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"7b3c2e59-eccf-4cac-a8b2-eae514f15c3c","name":"7b3c2e59-eccf-4cac-a8b2-eae514f15c3c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, "height":272, "HTile":false, "layers":[ - {"$GMImageLayer":"","%Name":"7e7d708c-6c89-45d1-b800-7d518f4ba3cd","blendMode":0,"displayName":"default","isLocked":false,"name":"7e7d708c-6c89-45d1-b800-7d518f4ba3cd","opacity":100.0,"resourceType":"GMImageLayer","resourceVersion":"2.0","visible":true,}, + {"$GMImageLayer":"","%Name":"7be89fef-b0dd-4ad6-b42c-9e1dac1d31b8","blendMode":0,"displayName":"default","isLocked":false,"name":"7be89fef-b0dd-4ad6-b42c-9e1dac1d31b8","opacity":100.0,"resourceType":"GMImageLayer","resourceVersion":"2.0","visible":true,}, ], "name":"spr_weapon_volkite_culverin", "nineSlice":null, @@ -71,8 +71,8 @@ "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"27b95a4c-b7c0-4f2e-aa03-ece8e4e50432","path":"sprites/spr_weapon_volkite_culverin/spr_weapon_volkite_culverin.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"568801a4-4dcc-4f73-a88b-447c31f2e712","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"7b3c2e59-eccf-4cac-a8b2-eae514f15c3c","path":"sprites/spr_weapon_volkite_culverin/spr_weapon_volkite_culverin.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"b2036d21-4883-45d2-b1e5-9c4e107df919","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, From 564390bfa7d5309827662e6072b998ba6671e97d Mon Sep 17 00:00:00 2001 From: EttyKitty <20323032+EttyKitty@users.noreply.github.com> Date: Mon, 23 Jun 2025 02:04:03 +0300 Subject: [PATCH 101/286] feat: Selling items from the armamentarium (#660) --- ChapterMaster.yyp | 2 + objects/obj_shop/Create_0.gml | 17 ++++ objects/obj_shop/Draw_0.gml | 31 ++++-- scripts/macros/macros.gml | 1 + .../f686ba29-c495-47b6-96c4-6b5468d59af7.png | Bin 0 -> 4424 bytes .../d98ba5e0-da02-48fb-8024-c2401b6f0f84.png | Bin 0 -> 284 bytes sprites/spr_buy_tiny/spr_buy_tiny.yy | 93 ++++++++++++++++++ .../f686ba29-c495-47b6-96c4-6b5468d59af7.png | Bin 0 -> 4407 bytes .../d98ba5e0-da02-48fb-8024-c2401b6f0f84.png | Bin 0 -> 4407 bytes sprites/spr_sell_tiny/spr_sell_tiny.yy | 93 ++++++++++++++++++ 10 files changed, 228 insertions(+), 9 deletions(-) create mode 100644 sprites/spr_buy_tiny/f686ba29-c495-47b6-96c4-6b5468d59af7.png create mode 100644 sprites/spr_buy_tiny/layers/f686ba29-c495-47b6-96c4-6b5468d59af7/d98ba5e0-da02-48fb-8024-c2401b6f0f84.png create mode 100644 sprites/spr_buy_tiny/spr_buy_tiny.yy create mode 100644 sprites/spr_sell_tiny/f686ba29-c495-47b6-96c4-6b5468d59af7.png create mode 100644 sprites/spr_sell_tiny/layers/f686ba29-c495-47b6-96c4-6b5468d59af7/d98ba5e0-da02-48fb-8024-c2401b6f0f84.png create mode 100644 sprites/spr_sell_tiny/spr_sell_tiny.yy diff --git a/ChapterMaster.yyp b/ChapterMaster.yyp index 8da6ed12b1..369434b4c2 100644 --- a/ChapterMaster.yyp +++ b/ChapterMaster.yyp @@ -1035,6 +1035,7 @@ {"id":{"name":"spr_build_tiny","path":"sprites/spr_build_tiny/spr_build_tiny.yy",},}, {"id":{"name":"spr_build_tiny2","path":"sprites/spr_build_tiny2/spr_build_tiny2.yy",},}, {"id":{"name":"spr_bullet","path":"sprites/spr_bullet/spr_bullet.yy",},}, + {"id":{"name":"spr_buy_tiny","path":"sprites/spr_buy_tiny/spr_buy_tiny.yy",},}, {"id":{"name":"spr_cancel_small","path":"sprites/spr_cancel_small/spr_cancel_small.yy",},}, {"id":{"name":"spr_cannon","path":"sprites/spr_cannon/spr_cannon.yy",},}, {"id":{"name":"spr_carrion_breath","path":"sprites/spr_carrion_breath/spr_carrion_breath.yy",},}, @@ -1483,6 +1484,7 @@ {"id":{"name":"spr_scout_left","path":"sprites/spr_scout_left/spr_scout_left.yy",},}, {"id":{"name":"spr_scout_new","path":"sprites/spr_scout_new/spr_scout_new.yy",},}, {"id":{"name":"spr_scout_right","path":"sprites/spr_scout_right/spr_scout_right.yy",},}, + {"id":{"name":"spr_sell_tiny","path":"sprites/spr_sell_tiny/spr_sell_tiny.yy",},}, {"id":{"name":"spr_servo_arm","path":"sprites/spr_servo_arm/spr_servo_arm.yy",},}, {"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",},}, diff --git a/objects/obj_shop/Create_0.gml b/objects/obj_shop/Create_0.gml index 7eb63d95fd..d531e510f5 100644 --- a/objects/obj_shop/Create_0.gml +++ b/objects/obj_shop/Create_0.gml @@ -1734,3 +1734,20 @@ item_cost_tooltip_info += $"Chapter tech approach (obj_controller.tech_status) : /* */ /* */ + +/// @description Sells an item and adds resources to the player +/// @param {Real} item_index The index of the item in the global array +/// @param {Real} sell_count The quantity to sell +/// @param {Real} sell_modifier The value modifier (0.0-1.0) +/// @returns {Boolean} Whether the sale was successful +sell_item = function (item_index, sell_count, sell_modifier) { + if (item_stocked[item_index] >= sell_count) { + scr_add_item(item[item_index], (-sell_count), "standard"); + item_stocked[item_index] -= (sell_count); + var sell_price = (item_cost[item_index] * sell_modifier) * sell_count; + obj_controller.requisition += sell_price; + + return true; + } + return false; +} diff --git a/objects/obj_shop/Draw_0.gml b/objects/obj_shop/Draw_0.gml index fa355c09f8..c8c75697da 100644 --- a/objects/obj_shop/Draw_0.gml +++ b/objects/obj_shop/Draw_0.gml @@ -21,7 +21,8 @@ slate_panel.inside_method = function(){ draw_text(xx+1280+10.5+string_width("Stocked"),yy+159.5,string_hash_to_newline("MC")); } } - draw_text(xx+1430.5,yy+159.5,string_hash_to_newline("Cost")); + draw_text(xx+1410,yy+159,string_hash_to_newline("Cost")); + draw_text(xx+1410.5,yy+159.5,string_hash_to_newline("Cost")); draw_set_color(c_gray); @@ -70,7 +71,7 @@ slate_panel.inside_method = function(){ if (obj_controller.in_forge){ draw_sprite_ext( spr_forge_points_icon,0, - xx+1430, + xx+1410, yy+y2+3, 0.3, 0.3, @@ -78,7 +79,7 @@ slate_panel.inside_method = function(){ c_white, 1); } else{ - draw_sprite_ext(spr_requisition,0,xx+1430,yy+y2+6,1,1,0,c_white,1); + draw_sprite_ext(spr_requisition,0,xx+1410,yy+y2+6,1,1,0,c_white,1); } draw_set_color(16291875) if (obj_controller.in_forge){ @@ -94,16 +95,28 @@ slate_panel.inside_method = function(){ if (keyboard_check(vk_shift)) then cost*=5; } - draw_text(xx+1447,yy+y2,cost);// Requisition + draw_text(xx+1427,yy+y2,cost);// Requisition + if (!obj_controller.in_forge ){ + draw_sprite(spr_buy_tiny,0,xx+1530,yy+y2+2); if (obj_controller.requisition< cost) then draw_set_alpha(0.25); - } + draw_set_alpha(1); - draw_sprite(spr_build_tiny2,0,xx+1530,yy+y2+2); + draw_sprite(spr_sell_tiny,0,xx+1480,yy+y2+2); + if (scr_hit(xx + 1480, yy + y2 + 2, xx + 1530, yy + y2 + 14) && shop != "warships" && shop != "vehicles") { + var _sell_mod = SHOP_SELL_MOD; + tooltip = $"Send items back for {_sell_mod * 100}% of the requisition cost."; + tooltip_show=1; + if (scr_click_left()) { + var sell_count = keyboard_check(vk_shift) ? 5 : 1; + sell_item(i, sell_count, _sell_mod) + } + } + } - draw_set_alpha(1); - var clicked =(point_in_rectangle(mouse_x, mouse_y, xx+1520, yy+y2+2, xx+1580, yy+y2+18)&& mouse_check_button_pressed(mb_left)); + var clicked = (point_and_click([xx+1520, yy+y2+2, xx+1570, yy+y2+14])); if (obj_controller.in_forge){ + draw_sprite(spr_build_tiny,0,xx+1530,yy+y2+2); if (clicked){ if (array_length(obj_controller.specialist_point_handler.forge_queue)<20){ var new_queue_item = { @@ -157,7 +170,7 @@ slate_panel.inside_method = function(){ } obj_controller.cooldown=8000; - } + } } if (!obj_controller.in_forge && nobuy[i]=1) || (obj_controller.in_forge && forge_cost[i]=0){ draw_set_alpha(1); diff --git a/scripts/macros/macros.gml b/scripts/macros/macros.gml index aab5e294f3..0fa9ae8aa9 100644 --- a/scripts/macros/macros.gml +++ b/scripts/macros/macros.gml @@ -10,6 +10,7 @@ #macro CM_RED_COLOR #bf4040 #macro MANAGE_MAN_SEE 34 #macro MANAGE_MAN_MAX array_length(obj_controller.display_unit) + 7 +#macro SHOP_SELL_MOD 0.8 #macro STR_ANY_POWER_ARMOUR "Any Power Armour" #macro STR_ANY_TERMINATOR_ARMOUR "Any Terminator Armour" diff --git a/sprites/spr_buy_tiny/f686ba29-c495-47b6-96c4-6b5468d59af7.png b/sprites/spr_buy_tiny/f686ba29-c495-47b6-96c4-6b5468d59af7.png new file mode 100644 index 0000000000000000000000000000000000000000..b775f77840bd6d20f5839762db06411dbeaf54f4 GIT binary patch literal 4424 zcmeHKeNYo;8V@}M0ih^jk@~SNI@Z!nHpwO=dxVGyB`E}Qm}>#?W3#&XUZ>3lPXt^G7X*X*gAptgJUUBFIb1g3 zfn2Q9!q{ktD{;{f?PV+ifw$joOj+CkEoi-8k(?3~k=%t1XYB61<%zkX@4xfw@TM;- zdY_ag56Rne^_R@&uhk0d{mt=bZwytruXIPZ?yWvk^vc7i*tIE3+Vb9da-?1zyb^C> zB~9oTw|{Ppd-8zpTuEhMqcxRzv7s%M9lo*OXWK8-wS9DFIPAXWjjN~0@xMN2b0&Dx zYCPTVw!_y#DhtE(X$@6pBR^XGnr_9Zt~EJ-YE!N7CE6sp>)gNZ9uUU9+f2TVm@uk6t!S@a6 zw_3B76SRJH^16C-sJ!#-{6kxIUC(E82Hsy3f4F|#!Keergw-uI??t@ltyP?8jJp}G zJQUNjx$fF8etZ6I_qJG}HDTH5zPOZU(sl6sMUs(5Us$-fUzVM5bU5kG-&YksUe9*l zII-s)GDy}~xm^8d)#Lh8xplQ%)x|>Sk@=fdM>bfWv&w8^V}H4@dEK7zWzARcCwb8| z|5@|N<;x9e8^-0X!oOX;g07i0vuY} zO|p!OW1J3%=OoO|B2ERvU>ur^&+al9rsy5+2^D}IA}`?*iG`@hZWm4WaC51}fMg<| zAM|jWz&;ga({5)GOVX*uw1bPEPC=1V{;nd{=1+$rMYN5!1E?F!DxNWAn%-cX^57*X zVC*ix7Z7^}l4C4S#hMWtKjKekdLY1kigyNjGIu{1pbQ3F>m-Z#@bp?0%+HTgPLiQ; z|0^aZ&6q-BMwI46If7Ag8KOv3$Po#ON@$rBlbJ2(G%CHr%@Gcg=BWU=kO4dtKqX2j zDMHI=6u~4G6j91iC8D4xz$~N87EC;iB8z1}RT8%8QSnq1pfUqEMw*p~1XCs=m<-$$ zv_ghZQW;GU1c(kZ`>7}rf7!{}39y`uohYD1E=PfXfEOH3G3r&YL>LI%Z!y{k&H^03 z9$*}l)8l>$HZgX36G!lRiW4y@rjUzem{cmp6oIJy{;$%k8`L7tDn^A;x!;{%7#ySn zq$T)D1q6OO$OhN2G{HGplhbKa!8`@Tdrl1-z=om-j?fYu4M6`N26j!AGS zmVioebQ<1CF_x15h32;ploVKW9peV`m-tPAJ++B0415JXZH#|2L6Co2-~<^+!A%s? zls`_u6&NC|grk54{bQnFC+*A+6a$G;ax2At;7SlMEJ3BrD=O#$>ihqVMUE z)1IMgjb9$Oqpci-r+gt8^4bEhOP?s*(Ef9o9 z^H-3dwk{SJLpZ%5HDq{R(EJzSg`~p@Orv^jib>aXt@@{t7tw|L)c1GUQM7Pr&u4q! zU`O}9&QNbm<1!u8)Sn&o=HhO4aaWJ%Qd=}pF8PtM8!LWYkNM4lO99}WomBF z=7E9zHLbeNW4T{RZ2E({w_ezM{N}$m1pA_&&HJ nM|XCVtZRt;aGdMf{Z_)4W7@3`u9_Z$>;?MNOzr87+spq8sbx=n literal 0 HcmV?d00001 diff --git a/sprites/spr_buy_tiny/layers/f686ba29-c495-47b6-96c4-6b5468d59af7/d98ba5e0-da02-48fb-8024-c2401b6f0f84.png b/sprites/spr_buy_tiny/layers/f686ba29-c495-47b6-96c4-6b5468d59af7/d98ba5e0-da02-48fb-8024-c2401b6f0f84.png new file mode 100644 index 0000000000000000000000000000000000000000..94bdb6ed962ab587a040b978f006e63fbdbbf9cf GIT binary patch literal 284 zcmV+%0ptFOP)S>i-i?DE`ieyk z)*uOt1xUdWo_8Uw4xAi;eqap16l@@Uk70Y~rN*L25?8S0Y<0z-In$G-JOnG;9w#BK&pd4s9|s0qcgu3H`X;3xd":"", + "Keyframes":[], + "resourceType":"KeyframeStore", + "resourceVersion":"2.0", + }, + "eventStubScript":null, + "eventToFunction":{}, + "length":1.0, + "lockOrigin":false, + "moments":{ + "$KeyframeStore":"", + "Keyframes":[], + "resourceType":"KeyframeStore", + "resourceVersion":"2.0", + }, + "name":"", + "playback":1, + "playbackSpeed":1.0, + "playbackSpeedType":1, + "resourceType":"GMSequence", + "resourceVersion":"2.0", + "showBackdrop":true, + "showBackdropImage":false, + "timeUnits":1, + "tracks":[ + {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"f686ba29-c495-47b6-96c4-6b5468d59af7","path":"sprites/spr_buy_tiny/spr_buy_tiny.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"aac88065-ea52-440a-b15d-0d3ef7afe71d","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, + }, + "volume":1.0, + "xorigin":0, + "yorigin":0, + }, + "swatchColours":null, + "swfPrecision":2.525, + "textureGroupId":{ + "name":"Default", + "path":"texturegroups/Default", + }, + "type":0, + "VTile":false, + "width":45, +} \ No newline at end of file diff --git a/sprites/spr_sell_tiny/f686ba29-c495-47b6-96c4-6b5468d59af7.png b/sprites/spr_sell_tiny/f686ba29-c495-47b6-96c4-6b5468d59af7.png new file mode 100644 index 0000000000000000000000000000000000000000..a6ae442291f70ff3a4e8543cfd642872b3da2965 GIT binary patch literal 4407 zcmeHKeNYtV8NajW83Y?bMPh8&oW_sFz1`dU;BLe5b%)#)POf;Z_>q#m-S@bycem&6 z0tZ$@Kx34dBqj|Qq-cypMnIdASSmzmWuj)Lenv-WtOhYrq7gLJL`mqo$M-Zd9cG&U zxS8F3-{<4^KF{xco_Fru>{yZ>89pmqCX+?ltd?x}Md1@Mbqajn>()L3KkdcN95I_J zL;^hLX1xFrivj=vLDnsk1v`9>l*f)BQ(NzDNtDZH?4YZ}cayH)El(xiyLFn%>aqEEIZ^XJa|GNnw*eqvuhKIqy&6qVlVIn$wN-IQ|PRey6C+WXzbtQ|7!lJig) z8&>PnRap+LpS*SElhKhsk4`N|=EY}+i7&)dy!-D58*a7D=vGYGypQhxwBE;^ycai* zG^l53X2z8qJ>GU{L*{|}*m_o9zw$4Ox1n8^YnHS<;oZGF|3Z4%7MV=Gku{qgHnVvs zADBh;x~(Sb5y#IqW}U6r;+%bRXXk5glP^E#Z2#5XoUm!Nji>gO9na|BX*0jx*}0%O zW_I852C~`kW%rd|Of5}9zAAlVSNR`;x!Inms~e9#G~BK^vi80_wdrH023OQof!)z- z)Rnn2%=@RdZ9-ncRqCZ#?wF>YhW%^1YY&$9F1mdvsXlArwuqk1?Lub!qRz<9x9k~T zv}VnwfbFTo`8D|U()L$ZRX(@=>MB0x%3D!$w%5#m<Qkc0p}AW}%s=k*I@(4-9El5i}EF(nc*5m%d(Id%tP=6HZ;RazB}rUlsoLYWwj zB=C%z%(g5Zgn%=X(j$ri62l4$3sr?0702gcYNOGJ;RHqyD6~L@BELulQNJ)pf*8QC z0DhDxn@3iq99Y+lS%(!XOKf4=hLpFtrNDd_HWnhajdEK#;+J ze$Yd3!al{afxzYSG)OA|esRud2!RPJH~n__mDBPvfD`uN9Rl7*(@fdv_8pjG|P~o zA+4d*w1L*6TE+-pI-MGI5e$tI1P$1G9mtmkl)&f`rMVZH9^<77#NrFM0HKjH7*9mWjs+` z|2MkAM=n#q5B~ub!mE-sM&^LmtSPRHbc@U;3(B5v>A48+WU@yB*5!gsHZ59u(O%+8PiLXBVIaurzfiNV2|OqnRxZN_UO95 zDe_Yk>AT*UyXd2NwVJ-@JGJO!s_af)h5VTO>#$WNE133;yTqe-*? literal 0 HcmV?d00001 diff --git a/sprites/spr_sell_tiny/layers/f686ba29-c495-47b6-96c4-6b5468d59af7/d98ba5e0-da02-48fb-8024-c2401b6f0f84.png b/sprites/spr_sell_tiny/layers/f686ba29-c495-47b6-96c4-6b5468d59af7/d98ba5e0-da02-48fb-8024-c2401b6f0f84.png new file mode 100644 index 0000000000000000000000000000000000000000..eba685929c69220f97bc6cc9c38902441272b27b GIT binary patch literal 4407 zcmeHKeNYo;8c#elir^KgO08G+qOIDx+0ExBTf$d@kbww?ImM5j-R!<0dnVbCT_C_| zDQG=q&erP{EK;RbD&<43N9%Axm8(pF&S+KCso1L)(JIx7+Ngj$l!>F|ldZ^-m%@b}wZ%?$Wx&9`L;=~OP_ z^>Gf?1rQ<63lQLE9TJJZ%bgZC`vfw*`TmY*sWddYO_TF>%#Hgc@#MR=Pc_!L9L2FO z7$d!pS1v;GI@6Qmif!+lOIbp8^=wh)747Uh+a+t>7I(p3duug%_lJwA`y|*&+p!=v zsA`k8#(Zq^)LrwQ2oL>Dc>G_Gr-<|*%?oo&YcBm~MnT)0UfHzmhvlwQ3FTlEr^0kw~|)CR3WlWE#!~ zW>K+emoe!?+M`=jJ4<)i7Tl`re&tQ_&(GOfe^-+cG_$JybWL$b@<64<^w;k0C5>|z z^slKS8}(oHUU_D%7Qrx44!L%UzMCV$zS zx_|=xhFReNFZJYcmaH zb55)&U3j8}ZJh(Dcu(&SqdgT9#&^!X<@_S|b}K~FbbKUKeJXQvEF zZdiLvI&0R8@6HB?3!0k_7I+4}eecT$zbZ`f)pco!2e9yRSXf{g))bQF+zN`}>_Fjn zdtv2CBvCPbFGX(z0%8Z5tj8$7({x;pu#8c@T5H9vUK4P#N%=moGJl1Q&fiEI70?T<25tFiW*@96nhk9f9W%aa$%@tZ5@2A_bYO z+Z*tLWRJ5HSjQ+?<6;vvfpo?O0^LV&$5{{O9x#ShRx4@d=xi}Oi`gg__a_;SW*IW@ zO53$MTBX*b2B2k7jg|nYUT-H*of@ujLgUao3}c`y9$uh4G!UU6xPpZ^6s=aNa9WMp z?Rq<^F{rdCMHm2zt0;$tAhcSb(u{#f^|7!jDc9JjL?{MA=@?26?7)CJD27HgjG9I% zoxzSeXrKdxp4Jfn1fUq2T+aF26g*DWO=SYi>&Xl#M8e6qG>cKLQsASKG#4c}pabjy z*28eQ{HV&ty1`0;68TgT8ns5R)e;&Vq0`~|QKMDB$HQ6_QI)tttqW+xgCSu$kXlNt zR0t4|!)!>C4^RTMi5M9&em6*d$@36z-<00hNVS`ycgxYCB}Nwtd9YM#N> zBtFKTV^~Mt|FRa_2Z|Q*+yYM;Ug+wFlNL+ zzd;!sU2qa&BcpJLFLCJnf}f#t_yu=>(36`?h~G)NCh3|G0~0cytgcDACd9ymj3=w> z|3+8v=w%9c;6I>TcvU)ofb4+RtZDY-M6<*q@k^d>>bnTMiM0aad`aUT7!eWlICAFO|O`cU08}icedwpSLNBi`DNWm-4w}w~$ zOO_ocOWgm~qGcaFRi*9^zgLA$rHb!mmP*^D-vq5MT*qvg($f;cNRO(V^)IT^5`&G> zb5);it^NLB3KtXg_bEH1Yp>Ot%DL^*gO#fzk1CJvIVgQ(n)6w{`9^GfdBaB~C;5GS z+e$-8T=oYBXv#JFMMLZ`*;ub`z0T2y4YzdZ}`mr zj|)$_FI%YMkDvG^;%0ktKA(SEWt4@T?zfgM{JydMy=%9+Ol5adLk2cnmA-%Z*>>~G SKZe0%C6":"", + "Keyframes":[], + "resourceType":"KeyframeStore", + "resourceVersion":"2.0", + }, + "eventStubScript":null, + "eventToFunction":{}, + "length":1.0, + "lockOrigin":false, + "moments":{ + "$KeyframeStore":"", + "Keyframes":[], + "resourceType":"KeyframeStore", + "resourceVersion":"2.0", + }, + "name":"", + "playback":1, + "playbackSpeed":1.0, + "playbackSpeedType":1, + "resourceType":"GMSequence", + "resourceVersion":"2.0", + "showBackdrop":true, + "showBackdropImage":false, + "timeUnits":1, + "tracks":[ + {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"f686ba29-c495-47b6-96c4-6b5468d59af7","path":"sprites/spr_sell_tiny/spr_sell_tiny.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"aac88065-ea52-440a-b15d-0d3ef7afe71d","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, + }, + "volume":1.0, + "xorigin":0, + "yorigin":0, + }, + "swatchColours":null, + "swfPrecision":2.525, + "textureGroupId":{ + "name":"Default", + "path":"texturegroups/Default", + }, + "type":0, + "VTile":false, + "width":45, +} \ No newline at end of file From 9a8c9155b1957e1d0e48b39cbce0d653ccbc2a2c Mon Sep 17 00:00:00 2001 From: Luke Van Epen Date: Tue, 24 Jun 2025 03:24:26 +1000 Subject: [PATCH 102/286] fix: Misaligned artifact data in librarium (#891) --- scripts/DebugView/DebugView.gml | 41 +++++++++++++++++++++++-- scripts/scr_librarium/scr_librarium.gml | 15 +++++---- 2 files changed, 47 insertions(+), 9 deletions(-) diff --git a/scripts/DebugView/DebugView.gml b/scripts/DebugView/DebugView.gml index 6fc83350f1..588445a1e5 100644 --- a/scripts/DebugView/DebugView.gml +++ b/scripts/DebugView/DebugView.gml @@ -7,47 +7,75 @@ /// @param {Id.Instance|Struct} obj The object being debugged. Can be a regular struct, an instance or a full object function DebugView(view_name, obj) constructor { - view_ptr = dbg_view(view_name, false); // calling dbg_view opens the overlay automatically + + + + obj_ref = obj; - name = view_name; + /// should stop adding duplicate controls if the view already exists + update = false; + + if(struct_exists(obj_ref, view_name)){ + if(dbg_view_exists(obj_ref[$view_name])){ + view_ptr = obj_ref[$view_name]; + update = true; + } + } else { + view_ptr = dbg_view(view_name, false); // calling dbg_view opens the overlay automatically + variable_struct_set(obj_ref, view_name, view_ptr); + } + + + name = view_name; + static add_watch = function (_name, _label = _name){ + if(update) return self; dbg_watch(ref_create(self.obj_ref, _name), _label); return self; } static add_slider_int = function(_name, min, max, label = _name, step = 1){ + if(update) return self; dbg_slider_int(ref_create(self.obj_ref, _name), min, max, label, step); return self; } static add_slider = function(_name, min, max, label = _name, step = 0.01){ + if(update) return self; dbg_slider(ref_create(self.obj_ref, _name), min, max, label = name, step); return self; } static add_checkbox = function(_name, _label = _name){ + if(update) return self; dbg_checkbox(ref_create(self.obj_ref, _name), _label); return self; } static add_button = function(_label, fn){ + if(update) return self; dbg_button(_label, fn); return self; } static add_section = function(_name, _open = true) { + if(update) return self; dbg_section(_name, true); return self; } static show = function(){ + if(update) return self; show_debug_overlay(true); - dbg_set_view(self.view_ptr) + if(struct_exists(self, "view_ptr")){ + dbg_set_view(self.view_ptr) + } return self; } static hide = function(){ + if(update) return self; show_debug_overlay(false); return self; } @@ -57,8 +85,15 @@ function DebugView(view_name, obj) constructor { return self; } + static add_text = function(input, label){ + + dbg_text($"{label}: {input}"); + return self; + } + /// quick and dirty way to display all variables of the given obj in a dbg section static dump_props = function(){ + if(update) return self; dbg_section("Dump Props"); var names = struct_get_names(self.obj_ref); for(var i = 0; i < array_length(names); i++){ diff --git a/scripts/scr_librarium/scr_librarium.gml b/scripts/scr_librarium/scr_librarium.gml index 6d24550393..a74ef6fc2a 100644 --- a/scripts/scr_librarium/scr_librarium.gml +++ b/scripts/scr_librarium/scr_librarium.gml @@ -220,17 +220,17 @@ function scr_librarium(){ } } } - else if (obj_ini.artifact_identified[menu_artifact] < 1) { + else if (cur_arti.identified() < 1) { draw_set_color(881503); artif_descr = ""; try{ - artif_descr = obj_ini.artifact_struct[menu_artifact].description(); + artif_descr = cur_arti.description(); } catch( _exception){ handle_exception(_exception); } tooltip = ""; tooltip_other = ""; - var arti_data = gear_weapon_data("any",obj_ini.artifact[menu_artifact], "all", false, obj_ini.artifact_quality[menu_artifact]); + var arti_data = gear_weapon_data("any",cur_arti.type(), "all", false, cur_arti.quality()); var _can_equip = cur_arti.can_equip(); if (_can_equip){ @@ -347,13 +347,13 @@ function scr_librarium(){ if (obj_controller.artifacts>0){ for (var i = 1; i <= 20; i++) { if (i <= 9 && i Date: Tue, 24 Jun 2025 01:33:34 +0300 Subject: [PATCH 103/286] fix: Add stockpiled Servo-arms for Sieged chapters (#893) --- scripts/scr_initialize_custom/scr_initialize_custom.gml | 1 + 1 file changed, 1 insertion(+) diff --git a/scripts/scr_initialize_custom/scr_initialize_custom.gml b/scripts/scr_initialize_custom/scr_initialize_custom.gml index a5a0ab98f8..9fe1a78ea7 100644 --- a/scripts/scr_initialize_custom/scr_initialize_custom.gml +++ b/scripts/scr_initialize_custom/scr_initialize_custom.gml @@ -3165,6 +3165,7 @@ function scr_initialize_custom() { scr_add_item(wep2[defaults_slot, eROLE.Apothecary], 4); scr_add_item("Psychic Hood", 4); scr_add_item("Crozius Arcanum", 4); + scr_add_item("Servo-arm", 4); scr_add_item("Force Staff", 4); scr_add_item("Plasma Pistol", 4); scr_add_item("Company Standard", 4); From 2d528bb03f97453d2631f60e83a87de37efbce96 Mon Sep 17 00:00:00 2001 From: Blogaugis <105600180+Blogaugis@users.noreply.github.com> Date: Tue, 24 Jun 2025 16:17:44 +0300 Subject: [PATCH 104/286] fix: Cap Small Reclusiam disadv chaplains at 1 (#892) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Мастер Чиф <43174917+MCPO-Spartan-117@users.noreply.github.com> Co-authored-by: EttyKitty <20323032+EttyKitty@users.noreply.github.com> --- scripts/scr_initialize_custom/scr_initialize_custom.gml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/scr_initialize_custom/scr_initialize_custom.gml b/scripts/scr_initialize_custom/scr_initialize_custom.gml index 9fe1a78ea7..3a4adc9cc0 100644 --- a/scripts/scr_initialize_custom/scr_initialize_custom.gml +++ b/scripts/scr_initialize_custom/scr_initialize_custom.gml @@ -1100,7 +1100,7 @@ function scr_initialize_custom() { tenth += 5; } if scr_has_disadv ("Small Reclusiam") { - chaplains -= 5; + chaplains = max(1, chaplains - 5); tenth += 5; } if scr_has_adv ("Reverent Guardians") { From 5aadc2fd8877ae905d8a3eeb233d8decd867f8c9 Mon Sep 17 00:00:00 2001 From: Nelsonh <81228864+OH296@users.noreply.github.com> Date: Sun, 29 Jun 2025 22:54:27 +0100 Subject: [PATCH 105/286] feat: Cataphractii armour added and improve modding (#895) --- ChapterMaster.yyp | 45 +- datafiles/main/visual_sets/use_sets.json | 2 +- scripts/macros/macros.gml | 2 +- scripts/scr_ComplexSet/scr_ComplexSet.gml | 108 ++- .../scr_culture_visuals.gml | 228 ++++- scripts/scr_dialogue/scr_dialogue.gml | 778 +++++++++--------- .../bfc59ee2-c8b5-4e18-9d19-92ee0b8805a4.png | Bin 0 -> 308 bytes .../1b6c16d6-080f-4ab6-96e2-f5318628c178.png | Bin 0 -> 308 bytes sprites/spr_blank/spr_blank.yy | 92 +++ sprites/spr_buy_tiny/spr_buy_tiny.yy | 8 +- .../0fe6bbd7-15a9-4a87-9edd-9a8370587e1e.png | Bin 0 -> 906 bytes .../4f697124-68fb-4fd2-9223-aaf62235ab77.png | Bin 0 -> 906 bytes sprites/spr_cata_belt/spr_cata_belt.yy | 92 +++ .../2583c501-d4e3-4285-b210-347ae21d5657.png | Bin 0 -> 4176 bytes .../1c6df36d-e885-4b8f-a400-731ba5f7a89f.png | Bin 0 -> 4176 bytes sprites/spr_cata_complex/spr_cata_complex.yy | 92 +++ .../eacd6626-c655-4103-80b3-501d635dbecc.png | Bin 0 -> 1060 bytes .../19bbd962-0cda-4b64-9afc-f12938f1660e.png | Bin 0 -> 1060 bytes .../spr_cata_cowl_trim/spr_cata_cowl_trim.yy | 92 +++ .../d14dc785-21d1-4e15-ad83-2b38fa9a79f7.png | Bin 0 -> 1125 bytes .../fe0dd4fc-c973-4418-9c16-c69e04260f36.png | Bin 0 -> 1125 bytes sprites/spr_cata_gorget/spr_cata_gorget.yy | 92 +++ .../cc1bb055-3092-4530-9edd-694aca0796a7.png | Bin 0 -> 1110 bytes .../df8d27d6-66e9-4750-b0dc-950fe74d3e9f.png | Bin 0 -> 1101 bytes .../1875f065-a467-43e5-b1cb-779c58891acc.png | Bin 0 -> 1110 bytes .../1875f065-a467-43e5-b1cb-779c58891acc.png | Bin 0 -> 1101 bytes sprites/spr_cata_head/spr_cata_head.yy | 96 +++ .../8bcf2914-6d8f-4dbe-bdee-bd24eba4637f.png | Bin 0 -> 627 bytes .../b190c650-f0be-4b86-9abb-b96698d6b9ef.png | Bin 0 -> 627 bytes .../spr_cata_heavy_toe_left.yy | 92 +++ .../8bcf2914-6d8f-4dbe-bdee-bd24eba4637f.png | Bin 0 -> 627 bytes .../b190c650-f0be-4b86-9abb-b96698d6b9ef.png | Bin 0 -> 627 bytes .../spr_cata_heavy_toe_right.yy | 92 +++ .../376c95d6-eabe-4c9b-b707-0d65fbbf0454.png | Bin 0 -> 1225 bytes .../97c3abbf-8ea9-4634-b6cd-e3687ebbebb5.png | Bin 0 -> 1225 bytes .../spr_cata_left_arm/spr_cata_left_arm.yy | 92 +++ .../1decac37-9470-4e2d-996d-51927189e93e.png | Bin 0 -> 664 bytes .../fd443310-bc6c-42e5-a251-16624f2f84bf.png | Bin 0 -> 664 bytes .../spr_cata_left_armtrim.yy | 92 +++ .../7d4772f4-ee86-4983-82a3-4b22204b7345.png | Bin 0 -> 1406 bytes .../98c531ee-b2a0-4680-8f1d-9a3271f11bf3.png | Bin 0 -> 1406 bytes .../spr_cata_left_knee/spr_cata_left_knee.yy | 92 +++ .../30845d03-5630-4ea2-b874-e43d1c591f74.png | Bin 0 -> 1623 bytes .../c2171e14-c3fe-4232-ba2e-e302118f9cc4.png | Bin 0 -> 1623 bytes .../spr_cata_left_leg/spr_cata_left_leg.yy | 92 +++ .../1ce219cb-5d0f-4940-a300-ebea3cf690d4.png | Bin 0 -> 825 bytes .../6fa1b1c6-652f-4092-84b5-fe6e33490587.png | Bin 0 -> 825 bytes .../spr_cata_left_trim/spr_cata_left_trim.yy | 92 +++ .../fcefc333-2e12-4b76-a889-59ee344320c8.png | Bin 0 -> 838 bytes .../5ec3c800-6eb0-42fd-bd91-f666b756bab3.png | Bin 0 -> 838 bytes .../spr_cata_left_trim_1.yy | 92 +++ .../3089b56b-6212-4848-9073-c4e15cbc81bb.png | Bin 0 -> 705 bytes .../dfc1dfcf-f929-412a-ae9d-ce4a40087c21.png | Bin 0 -> 705 bytes .../spr_cata_left_trim_2.yy | 92 +++ .../198a5162-01ac-4f12-b555-ac903faa3333.png | Bin 0 -> 1601 bytes .../6ea35a9b-5413-463e-8b97-7147b7812bc6.png | Bin 0 -> 1601 bytes .../spr_cata_right_arm/spr_cata_right_arm.yy | 92 +++ .../82ee5036-1316-4e81-a955-2242e5aa54af.png | Bin 0 -> 700 bytes .../d1b71949-8ac8-4430-9cf8-a761461c4666.png | Bin 0 -> 700 bytes .../spr_cata_right_armtrim.yy | 92 +++ .../494700cd-feb1-4f66-81c1-4dfc8f378e20.png | Bin 0 -> 1426 bytes .../7122732c-409f-4f69-9ad0-33318d42dfe5.png | Bin 0 -> 1426 bytes .../spr_cata_right_knee.yy | 92 +++ .../ecf75db7-6223-4712-8157-c822a10e1617.png | Bin 0 -> 1576 bytes .../f2501eb8-3d15-489b-9adf-21790df0d78a.png | Bin 0 -> 1576 bytes .../spr_cata_right_leg/spr_cata_right_leg.yy | 92 +++ .../1ce219cb-5d0f-4940-a300-ebea3cf690d4.png | Bin 0 -> 839 bytes .../6fa1b1c6-652f-4092-84b5-fe6e33490587.png | Bin 0 -> 839 bytes .../spr_cata_right_trim.yy | 92 +++ .../fcefc333-2e12-4b76-a889-59ee344320c8.png | Bin 0 -> 827 bytes .../5ec3c800-6eb0-42fd-bd91-f666b756bab3.png | Bin 0 -> 827 bytes .../spr_cata_right_trim_1.yy | 92 +++ .../3089b56b-6212-4848-9073-c4e15cbc81bb.png | Bin 0 -> 719 bytes .../dfc1dfcf-f929-412a-ae9d-ce4a40087c21.png | Bin 0 -> 719 bytes .../spr_cata_right_trim_2.yy | 92 +++ .../3fd7e1d5-a9ff-4d84-9e7c-928d601d5549.png | Bin 0 -> 1298 bytes .../12a0ccfa-f3e3-4373-b076-5c445ab4fffe.png | Bin 0 -> 1298 bytes .../spr_cata_shoulder_hanging_leather_left.yy | 92 +++ .../3d17787f-c1c2-47db-992e-a221a37550a1.png | Bin 0 -> 906 bytes .../89d15f31-c097-44dc-98f3-b3d5ed35463c.png | Bin 0 -> 906 bytes ...cata_shoulder_hanging_leather_left_tips.yy | 92 +++ .../0eb5da06-be9b-42af-a45c-5652a70e0363.png | Bin 0 -> 948 bytes .../240582c2-092d-40fa-9caa-ea64c5a2fc69.png | Bin 0 -> 948 bytes ...spr_cata_shoulder_hanging_leather_right.yy | 92 +++ .../41e731d1-cd8b-487b-9fdf-14ab2b776dfd.png | Bin 0 -> 1537 bytes .../e023583f-d2bf-40b8-b5a8-2e634d2b7358.png | Bin 0 -> 1537 bytes ...ata_shoulder_hanging_leather_right_tips.yy | 92 +++ .../96228507-c627-413d-8026-6a20c334f5e5.png | Bin 0 -> 1891 bytes .../2a3cced8-cb88-494c-a915-5cc072e4ee2c.png | Bin 0 -> 1891 bytes .../spr_cata_shoulder_hanging_mail_left.yy | 92 +++ .../9d7300ff-3623-424a-9eaa-57079cf97c42.png | Bin 0 -> 1970 bytes .../c6dc1f20-2c5f-4f34-bb86-be21f432927c.png | Bin 0 -> 1970 bytes .../spr_cata_shoulder_hanging_mail_right.yy | 92 +++ .../b7da30c6-2b5e-4677-92fb-c840f62bb6b0.png | Bin 0 -> 934 bytes .../f7e76e87-6037-4a79-b25a-e22e28f39da2.png | Bin 0 -> 934 bytes .../spr_cata_tabbard_leather.yy | 92 +++ .../16ff2f35-0659-40fa-be7a-7a2942a2c47e.png | Bin 0 -> 647 bytes .../a8907230-deee-4373-af6a-ec8ca94f1d81.png | Bin 0 -> 647 bytes .../spr_cata_tabbard_leather_hangings.yy | 92 +++ .../00c36dff-f59c-419f-acac-bf30655b425b.png | Bin 0 -> 948 bytes .../fdea6507-202f-42a0-9579-5d12967ccbdb.png | Bin 0 -> 948 bytes .../spr_cata_tabbard_mail.yy | 92 +++ .../spr_data_slate_border.yy | 6 +- .../spr_disposition_small.yy | 87 +- sprites/spr_icon_change/spr_icon_change.yy | 11 +- .../spr_indomitus_knightly_robe.yy | 6 +- .../spr_indomitus_left_arm.yy | 6 +- .../spr_indomitus_left_arm_bionic.yy | 6 +- .../spr_inspect_small/spr_inspect_small.yy | 11 +- sprites/spr_loading2/spr_loading2.yy | 34 +- .../spr_master_splash/spr_master_splash.yy | 11 +- sprites/spr_mk5_complex/spr_mk5_complex.yy | 6 +- .../spr_mk5_head_variants.yy | 6 +- sprites/spr_p_name_bg/spr_p_name_bg.yy | 6 +- sprites/spr_penitent_ui/spr_penitent_ui.yy | 11 +- .../spr_popup_dialogue/spr_popup_dialogue.yy | 11 +- sprites/spr_sell_tiny/spr_sell_tiny.yy | 8 +- .../spr_ship_back_black.yy | 18 +- .../spr_ship_back_white.yy | 18 +- 119 files changed, 3807 insertions(+), 482 deletions(-) create mode 100644 sprites/spr_blank/bfc59ee2-c8b5-4e18-9d19-92ee0b8805a4.png create mode 100644 sprites/spr_blank/layers/bfc59ee2-c8b5-4e18-9d19-92ee0b8805a4/1b6c16d6-080f-4ab6-96e2-f5318628c178.png create mode 100644 sprites/spr_blank/spr_blank.yy create mode 100644 sprites/spr_cata_belt/0fe6bbd7-15a9-4a87-9edd-9a8370587e1e.png create mode 100644 sprites/spr_cata_belt/layers/0fe6bbd7-15a9-4a87-9edd-9a8370587e1e/4f697124-68fb-4fd2-9223-aaf62235ab77.png create mode 100644 sprites/spr_cata_belt/spr_cata_belt.yy create mode 100644 sprites/spr_cata_complex/2583c501-d4e3-4285-b210-347ae21d5657.png create mode 100644 sprites/spr_cata_complex/layers/2583c501-d4e3-4285-b210-347ae21d5657/1c6df36d-e885-4b8f-a400-731ba5f7a89f.png create mode 100644 sprites/spr_cata_complex/spr_cata_complex.yy create mode 100644 sprites/spr_cata_cowl_trim/eacd6626-c655-4103-80b3-501d635dbecc.png create mode 100644 sprites/spr_cata_cowl_trim/layers/eacd6626-c655-4103-80b3-501d635dbecc/19bbd962-0cda-4b64-9afc-f12938f1660e.png create mode 100644 sprites/spr_cata_cowl_trim/spr_cata_cowl_trim.yy create mode 100644 sprites/spr_cata_gorget/d14dc785-21d1-4e15-ad83-2b38fa9a79f7.png create mode 100644 sprites/spr_cata_gorget/layers/d14dc785-21d1-4e15-ad83-2b38fa9a79f7/fe0dd4fc-c973-4418-9c16-c69e04260f36.png create mode 100644 sprites/spr_cata_gorget/spr_cata_gorget.yy create mode 100644 sprites/spr_cata_head/cc1bb055-3092-4530-9edd-694aca0796a7.png create mode 100644 sprites/spr_cata_head/df8d27d6-66e9-4750-b0dc-950fe74d3e9f.png create mode 100644 sprites/spr_cata_head/layers/cc1bb055-3092-4530-9edd-694aca0796a7/1875f065-a467-43e5-b1cb-779c58891acc.png create mode 100644 sprites/spr_cata_head/layers/df8d27d6-66e9-4750-b0dc-950fe74d3e9f/1875f065-a467-43e5-b1cb-779c58891acc.png create mode 100644 sprites/spr_cata_head/spr_cata_head.yy create mode 100644 sprites/spr_cata_heavy_toe_left/8bcf2914-6d8f-4dbe-bdee-bd24eba4637f.png create mode 100644 sprites/spr_cata_heavy_toe_left/layers/8bcf2914-6d8f-4dbe-bdee-bd24eba4637f/b190c650-f0be-4b86-9abb-b96698d6b9ef.png create mode 100644 sprites/spr_cata_heavy_toe_left/spr_cata_heavy_toe_left.yy create mode 100644 sprites/spr_cata_heavy_toe_right/8bcf2914-6d8f-4dbe-bdee-bd24eba4637f.png create mode 100644 sprites/spr_cata_heavy_toe_right/layers/8bcf2914-6d8f-4dbe-bdee-bd24eba4637f/b190c650-f0be-4b86-9abb-b96698d6b9ef.png create mode 100644 sprites/spr_cata_heavy_toe_right/spr_cata_heavy_toe_right.yy create mode 100644 sprites/spr_cata_left_arm/376c95d6-eabe-4c9b-b707-0d65fbbf0454.png create mode 100644 sprites/spr_cata_left_arm/layers/376c95d6-eabe-4c9b-b707-0d65fbbf0454/97c3abbf-8ea9-4634-b6cd-e3687ebbebb5.png create mode 100644 sprites/spr_cata_left_arm/spr_cata_left_arm.yy create mode 100644 sprites/spr_cata_left_armtrim/1decac37-9470-4e2d-996d-51927189e93e.png create mode 100644 sprites/spr_cata_left_armtrim/layers/1decac37-9470-4e2d-996d-51927189e93e/fd443310-bc6c-42e5-a251-16624f2f84bf.png create mode 100644 sprites/spr_cata_left_armtrim/spr_cata_left_armtrim.yy create mode 100644 sprites/spr_cata_left_knee/7d4772f4-ee86-4983-82a3-4b22204b7345.png create mode 100644 sprites/spr_cata_left_knee/layers/7d4772f4-ee86-4983-82a3-4b22204b7345/98c531ee-b2a0-4680-8f1d-9a3271f11bf3.png create mode 100644 sprites/spr_cata_left_knee/spr_cata_left_knee.yy create mode 100644 sprites/spr_cata_left_leg/30845d03-5630-4ea2-b874-e43d1c591f74.png create mode 100644 sprites/spr_cata_left_leg/layers/30845d03-5630-4ea2-b874-e43d1c591f74/c2171e14-c3fe-4232-ba2e-e302118f9cc4.png create mode 100644 sprites/spr_cata_left_leg/spr_cata_left_leg.yy create mode 100644 sprites/spr_cata_left_trim/1ce219cb-5d0f-4940-a300-ebea3cf690d4.png create mode 100644 sprites/spr_cata_left_trim/layers/1ce219cb-5d0f-4940-a300-ebea3cf690d4/6fa1b1c6-652f-4092-84b5-fe6e33490587.png create mode 100644 sprites/spr_cata_left_trim/spr_cata_left_trim.yy create mode 100644 sprites/spr_cata_left_trim_1/fcefc333-2e12-4b76-a889-59ee344320c8.png create mode 100644 sprites/spr_cata_left_trim_1/layers/fcefc333-2e12-4b76-a889-59ee344320c8/5ec3c800-6eb0-42fd-bd91-f666b756bab3.png create mode 100644 sprites/spr_cata_left_trim_1/spr_cata_left_trim_1.yy create mode 100644 sprites/spr_cata_left_trim_2/3089b56b-6212-4848-9073-c4e15cbc81bb.png create mode 100644 sprites/spr_cata_left_trim_2/layers/3089b56b-6212-4848-9073-c4e15cbc81bb/dfc1dfcf-f929-412a-ae9d-ce4a40087c21.png create mode 100644 sprites/spr_cata_left_trim_2/spr_cata_left_trim_2.yy create mode 100644 sprites/spr_cata_right_arm/198a5162-01ac-4f12-b555-ac903faa3333.png create mode 100644 sprites/spr_cata_right_arm/layers/198a5162-01ac-4f12-b555-ac903faa3333/6ea35a9b-5413-463e-8b97-7147b7812bc6.png create mode 100644 sprites/spr_cata_right_arm/spr_cata_right_arm.yy create mode 100644 sprites/spr_cata_right_armtrim/82ee5036-1316-4e81-a955-2242e5aa54af.png create mode 100644 sprites/spr_cata_right_armtrim/layers/82ee5036-1316-4e81-a955-2242e5aa54af/d1b71949-8ac8-4430-9cf8-a761461c4666.png create mode 100644 sprites/spr_cata_right_armtrim/spr_cata_right_armtrim.yy create mode 100644 sprites/spr_cata_right_knee/494700cd-feb1-4f66-81c1-4dfc8f378e20.png create mode 100644 sprites/spr_cata_right_knee/layers/494700cd-feb1-4f66-81c1-4dfc8f378e20/7122732c-409f-4f69-9ad0-33318d42dfe5.png create mode 100644 sprites/spr_cata_right_knee/spr_cata_right_knee.yy create mode 100644 sprites/spr_cata_right_leg/ecf75db7-6223-4712-8157-c822a10e1617.png create mode 100644 sprites/spr_cata_right_leg/layers/ecf75db7-6223-4712-8157-c822a10e1617/f2501eb8-3d15-489b-9adf-21790df0d78a.png create mode 100644 sprites/spr_cata_right_leg/spr_cata_right_leg.yy create mode 100644 sprites/spr_cata_right_trim/1ce219cb-5d0f-4940-a300-ebea3cf690d4.png create mode 100644 sprites/spr_cata_right_trim/layers/1ce219cb-5d0f-4940-a300-ebea3cf690d4/6fa1b1c6-652f-4092-84b5-fe6e33490587.png create mode 100644 sprites/spr_cata_right_trim/spr_cata_right_trim.yy create mode 100644 sprites/spr_cata_right_trim_1/fcefc333-2e12-4b76-a889-59ee344320c8.png create mode 100644 sprites/spr_cata_right_trim_1/layers/fcefc333-2e12-4b76-a889-59ee344320c8/5ec3c800-6eb0-42fd-bd91-f666b756bab3.png create mode 100644 sprites/spr_cata_right_trim_1/spr_cata_right_trim_1.yy create mode 100644 sprites/spr_cata_right_trim_2/3089b56b-6212-4848-9073-c4e15cbc81bb.png create mode 100644 sprites/spr_cata_right_trim_2/layers/3089b56b-6212-4848-9073-c4e15cbc81bb/dfc1dfcf-f929-412a-ae9d-ce4a40087c21.png create mode 100644 sprites/spr_cata_right_trim_2/spr_cata_right_trim_2.yy create mode 100644 sprites/spr_cata_shoulder_hanging_leather_left/3fd7e1d5-a9ff-4d84-9e7c-928d601d5549.png create mode 100644 sprites/spr_cata_shoulder_hanging_leather_left/layers/3fd7e1d5-a9ff-4d84-9e7c-928d601d5549/12a0ccfa-f3e3-4373-b076-5c445ab4fffe.png create mode 100644 sprites/spr_cata_shoulder_hanging_leather_left/spr_cata_shoulder_hanging_leather_left.yy create mode 100644 sprites/spr_cata_shoulder_hanging_leather_left_tips/3d17787f-c1c2-47db-992e-a221a37550a1.png create mode 100644 sprites/spr_cata_shoulder_hanging_leather_left_tips/layers/3d17787f-c1c2-47db-992e-a221a37550a1/89d15f31-c097-44dc-98f3-b3d5ed35463c.png create mode 100644 sprites/spr_cata_shoulder_hanging_leather_left_tips/spr_cata_shoulder_hanging_leather_left_tips.yy create mode 100644 sprites/spr_cata_shoulder_hanging_leather_right/0eb5da06-be9b-42af-a45c-5652a70e0363.png create mode 100644 sprites/spr_cata_shoulder_hanging_leather_right/layers/0eb5da06-be9b-42af-a45c-5652a70e0363/240582c2-092d-40fa-9caa-ea64c5a2fc69.png create mode 100644 sprites/spr_cata_shoulder_hanging_leather_right/spr_cata_shoulder_hanging_leather_right.yy create mode 100644 sprites/spr_cata_shoulder_hanging_leather_right_tips/41e731d1-cd8b-487b-9fdf-14ab2b776dfd.png create mode 100644 sprites/spr_cata_shoulder_hanging_leather_right_tips/layers/41e731d1-cd8b-487b-9fdf-14ab2b776dfd/e023583f-d2bf-40b8-b5a8-2e634d2b7358.png create mode 100644 sprites/spr_cata_shoulder_hanging_leather_right_tips/spr_cata_shoulder_hanging_leather_right_tips.yy create mode 100644 sprites/spr_cata_shoulder_hanging_mail_left/96228507-c627-413d-8026-6a20c334f5e5.png create mode 100644 sprites/spr_cata_shoulder_hanging_mail_left/layers/96228507-c627-413d-8026-6a20c334f5e5/2a3cced8-cb88-494c-a915-5cc072e4ee2c.png create mode 100644 sprites/spr_cata_shoulder_hanging_mail_left/spr_cata_shoulder_hanging_mail_left.yy create mode 100644 sprites/spr_cata_shoulder_hanging_mail_right/9d7300ff-3623-424a-9eaa-57079cf97c42.png create mode 100644 sprites/spr_cata_shoulder_hanging_mail_right/layers/9d7300ff-3623-424a-9eaa-57079cf97c42/c6dc1f20-2c5f-4f34-bb86-be21f432927c.png create mode 100644 sprites/spr_cata_shoulder_hanging_mail_right/spr_cata_shoulder_hanging_mail_right.yy create mode 100644 sprites/spr_cata_tabbard_leather/b7da30c6-2b5e-4677-92fb-c840f62bb6b0.png create mode 100644 sprites/spr_cata_tabbard_leather/layers/b7da30c6-2b5e-4677-92fb-c840f62bb6b0/f7e76e87-6037-4a79-b25a-e22e28f39da2.png create mode 100644 sprites/spr_cata_tabbard_leather/spr_cata_tabbard_leather.yy create mode 100644 sprites/spr_cata_tabbard_leather_hangings/16ff2f35-0659-40fa-be7a-7a2942a2c47e.png create mode 100644 sprites/spr_cata_tabbard_leather_hangings/layers/16ff2f35-0659-40fa-be7a-7a2942a2c47e/a8907230-deee-4373-af6a-ec8ca94f1d81.png create mode 100644 sprites/spr_cata_tabbard_leather_hangings/spr_cata_tabbard_leather_hangings.yy create mode 100644 sprites/spr_cata_tabbard_mail/00c36dff-f59c-419f-acac-bf30655b425b.png create mode 100644 sprites/spr_cata_tabbard_mail/layers/00c36dff-f59c-419f-acac-bf30655b425b/fdea6507-202f-42a0-9579-5d12967ccbdb.png create mode 100644 sprites/spr_cata_tabbard_mail/spr_cata_tabbard_mail.yy diff --git a/ChapterMaster.yyp b/ChapterMaster.yyp index 369434b4c2..529fc3263b 100644 --- a/ChapterMaster.yyp +++ b/ChapterMaster.yyp @@ -63,6 +63,7 @@ {"$GMFolder":"","%Name":"bionics","folderPath":"folders/Sprites/Marine Viewer/bionics.yy","name":"bionics","resourceType":"GMFolder","resourceVersion":"2.0",}, {"$GMFolder":"","%Name":"body_types","folderPath":"folders/Sprites/Marine Viewer/body_types.yy","name":"body_types","resourceType":"GMFolder","resourceVersion":"2.0",}, {"$GMFolder":"","%Name":"artificer_complex","folderPath":"folders/Sprites/Marine Viewer/body_types/artificer_complex.yy","name":"artificer_complex","resourceType":"GMFolder","resourceVersion":"2.0",}, + {"$GMFolder":"","%Name":"cata_complex","folderPath":"folders/Sprites/Marine Viewer/body_types/cata_complex.yy","name":"cata_complex","resourceType":"GMFolder","resourceVersion":"2.0",}, {"$GMFolder":"","%Name":"indomitus_complex","folderPath":"folders/Sprites/Marine Viewer/body_types/indomitus_complex.yy","name":"indomitus_complex","resourceType":"GMFolder","resourceVersion":"2.0",}, {"$GMFolder":"","%Name":"mk_3_complex","folderPath":"folders/Sprites/Marine Viewer/body_types/mk_3_complex.yy","name":"mk_3_complex","resourceType":"GMFolder","resourceVersion":"2.0",}, {"$GMFolder":"","%Name":"mk_4_complex","folderPath":"folders/Sprites/Marine Viewer/body_types/mk_4_complex.yy","name":"mk_4_complex","resourceType":"GMFolder","resourceVersion":"2.0",}, @@ -564,6 +565,17 @@ {"$GMIncludedFile":"","%Name":"1.png","CopyToMask":-1,"filePath":"datafiles/main/visual_sets/Company_marks_roman_right_shoulder/ten","name":"1.png","resourceType":"GMIncludedFile","resourceVersion":"2.0",}, {"$GMIncludedFile":"","%Name":"1.png","CopyToMask":-1,"filePath":"datafiles/main/visual_sets/Company_marks_roman_right_shoulder/three","name":"1.png","resourceType":"GMIncludedFile","resourceVersion":"2.0",}, {"$GMIncludedFile":"","%Name":"1.png","CopyToMask":-1,"filePath":"datafiles/main/visual_sets/Company_marks_roman_right_shoulder/two","name":"1.png","resourceType":"GMIncludedFile","resourceVersion":"2.0",}, + {"$GMIncludedFile":"","%Name":"data.json","CopyToMask":-1,"filePath":"datafiles/main/visual_sets/Crusader_bits","name":"data.json","resourceType":"GMIncludedFile","resourceVersion":"2.0",}, + {"$GMIncludedFile":"","%Name":"1.png","CopyToMask":-1,"filePath":"datafiles/main/visual_sets/Crusader_bits/topfhelm","name":"1.png","resourceType":"GMIncludedFile","resourceVersion":"2.0",}, + {"$GMIncludedFile":"","%Name":"2.png","CopyToMask":-1,"filePath":"datafiles/main/visual_sets/Crusader_bits/topfhelm","name":"2.png","resourceType":"GMIncludedFile","resourceVersion":"2.0",}, + {"$GMIncludedFile":"","%Name":"3.png","CopyToMask":-1,"filePath":"datafiles/main/visual_sets/Crusader_bits/topfhelm","name":"3.png","resourceType":"GMIncludedFile","resourceVersion":"2.0",}, + {"$GMIncludedFile":"","%Name":"1.png","CopyToMask":-1,"filePath":"datafiles/main/visual_sets/Crusader_bits/torse_with_hood","name":"1.png","resourceType":"GMIncludedFile","resourceVersion":"2.0",}, + {"$GMIncludedFile":"","%Name":"2.png","CopyToMask":-1,"filePath":"datafiles/main/visual_sets/Crusader_bits/torse_with_hood","name":"2.png","resourceType":"GMIncludedFile","resourceVersion":"2.0",}, + {"$GMIncludedFile":"","%Name":"3.png","CopyToMask":-1,"filePath":"datafiles/main/visual_sets/Crusader_bits/torse_with_hood","name":"3.png","resourceType":"GMIncludedFile","resourceVersion":"2.0",}, + {"$GMIncludedFile":"","%Name":"4.png","CopyToMask":-1,"filePath":"datafiles/main/visual_sets/Crusader_bits/torse_with_hood","name":"4.png","resourceType":"GMIncludedFile","resourceVersion":"2.0",}, + {"$GMIncludedFile":"","%Name":"1.png","CopyToMask":-1,"filePath":"datafiles/main/visual_sets/Crusader_bits/torse","name":"1.png","resourceType":"GMIncludedFile","resourceVersion":"2.0",}, + {"$GMIncludedFile":"","%Name":"2.png","CopyToMask":-1,"filePath":"datafiles/main/visual_sets/Crusader_bits/torse","name":"2.png","resourceType":"GMIncludedFile","resourceVersion":"2.0",}, + {"$GMIncludedFile":"","%Name":"3.png","CopyToMask":-1,"filePath":"datafiles/main/visual_sets/Crusader_bits/torse","name":"3.png","resourceType":"GMIncludedFile","resourceVersion":"2.0",}, {"$GMIncludedFile":"","%Name":"data.json","CopyToMask":-1,"filePath":"datafiles/main/visual_sets/Test_set","name":"data.json","resourceType":"GMIncludedFile","resourceVersion":"2.0",}, {"$GMIncludedFile":"","%Name":"1.png","CopyToMask":-1,"filePath":"datafiles/main/visual_sets/Test_set/test_sprite","name":"1.png","resourceType":"GMIncludedFile","resourceVersion":"2.0",}, {"$GMIncludedFile":"","%Name":"use_sets.json","CopyToMask":-1,"filePath":"datafiles/main/visual_sets","name":"use_sets.json","resourceType":"GMIncludedFile","resourceVersion":"2.0",}, @@ -1028,6 +1040,7 @@ {"id":{"name":"spr_bionics_leg_2","path":"sprites/spr_bionics_leg_2/spr_bionics_leg_2.yy",},}, {"id":{"name":"spr_bionics_leg_3","path":"sprites/spr_bionics_leg_3/spr_bionics_leg_3.yy",},}, {"id":{"name":"spr_bionics_leg","path":"sprites/spr_bionics_leg/spr_bionics_leg.yy",},}, + {"id":{"name":"spr_blank","path":"sprites/spr_blank/spr_blank.yy",},}, {"id":{"name":"spr_blog","path":"sprites/spr_blog/spr_blog.yy",},}, {"id":{"name":"spr_bolt","path":"sprites/spr_bolt/spr_bolt.yy",},}, {"id":{"name":"spr_bonding_studs_left","path":"sprites/spr_bonding_studs_left/spr_bonding_studs_left.yy",},}, @@ -1039,6 +1052,36 @@ {"id":{"name":"spr_cancel_small","path":"sprites/spr_cancel_small/spr_cancel_small.yy",},}, {"id":{"name":"spr_cannon","path":"sprites/spr_cannon/spr_cannon.yy",},}, {"id":{"name":"spr_carrion_breath","path":"sprites/spr_carrion_breath/spr_carrion_breath.yy",},}, + {"id":{"name":"spr_cata_belt","path":"sprites/spr_cata_belt/spr_cata_belt.yy",},}, + {"id":{"name":"spr_cata_complex","path":"sprites/spr_cata_complex/spr_cata_complex.yy",},}, + {"id":{"name":"spr_cata_cowl_trim","path":"sprites/spr_cata_cowl_trim/spr_cata_cowl_trim.yy",},}, + {"id":{"name":"spr_cata_gorget","path":"sprites/spr_cata_gorget/spr_cata_gorget.yy",},}, + {"id":{"name":"spr_cata_head","path":"sprites/spr_cata_head/spr_cata_head.yy",},}, + {"id":{"name":"spr_cata_heavy_toe_left","path":"sprites/spr_cata_heavy_toe_left/spr_cata_heavy_toe_left.yy",},}, + {"id":{"name":"spr_cata_heavy_toe_right","path":"sprites/spr_cata_heavy_toe_right/spr_cata_heavy_toe_right.yy",},}, + {"id":{"name":"spr_cata_left_arm","path":"sprites/spr_cata_left_arm/spr_cata_left_arm.yy",},}, + {"id":{"name":"spr_cata_left_armtrim","path":"sprites/spr_cata_left_armtrim/spr_cata_left_armtrim.yy",},}, + {"id":{"name":"spr_cata_left_knee","path":"sprites/spr_cata_left_knee/spr_cata_left_knee.yy",},}, + {"id":{"name":"spr_cata_left_leg","path":"sprites/spr_cata_left_leg/spr_cata_left_leg.yy",},}, + {"id":{"name":"spr_cata_left_trim_1","path":"sprites/spr_cata_left_trim_1/spr_cata_left_trim_1.yy",},}, + {"id":{"name":"spr_cata_left_trim_2","path":"sprites/spr_cata_left_trim_2/spr_cata_left_trim_2.yy",},}, + {"id":{"name":"spr_cata_left_trim","path":"sprites/spr_cata_left_trim/spr_cata_left_trim.yy",},}, + {"id":{"name":"spr_cata_right_arm","path":"sprites/spr_cata_right_arm/spr_cata_right_arm.yy",},}, + {"id":{"name":"spr_cata_right_armtrim","path":"sprites/spr_cata_right_armtrim/spr_cata_right_armtrim.yy",},}, + {"id":{"name":"spr_cata_right_knee","path":"sprites/spr_cata_right_knee/spr_cata_right_knee.yy",},}, + {"id":{"name":"spr_cata_right_leg","path":"sprites/spr_cata_right_leg/spr_cata_right_leg.yy",},}, + {"id":{"name":"spr_cata_right_trim_1","path":"sprites/spr_cata_right_trim_1/spr_cata_right_trim_1.yy",},}, + {"id":{"name":"spr_cata_right_trim_2","path":"sprites/spr_cata_right_trim_2/spr_cata_right_trim_2.yy",},}, + {"id":{"name":"spr_cata_right_trim","path":"sprites/spr_cata_right_trim/spr_cata_right_trim.yy",},}, + {"id":{"name":"spr_cata_shoulder_hanging_leather_left_tips","path":"sprites/spr_cata_shoulder_hanging_leather_left_tips/spr_cata_shoulder_hanging_leather_left_tips.yy",},}, + {"id":{"name":"spr_cata_shoulder_hanging_leather_left","path":"sprites/spr_cata_shoulder_hanging_leather_left/spr_cata_shoulder_hanging_leather_left.yy",},}, + {"id":{"name":"spr_cata_shoulder_hanging_leather_right_tips","path":"sprites/spr_cata_shoulder_hanging_leather_right_tips/spr_cata_shoulder_hanging_leather_right_tips.yy",},}, + {"id":{"name":"spr_cata_shoulder_hanging_leather_right","path":"sprites/spr_cata_shoulder_hanging_leather_right/spr_cata_shoulder_hanging_leather_right.yy",},}, + {"id":{"name":"spr_cata_shoulder_hanging_mail_left","path":"sprites/spr_cata_shoulder_hanging_mail_left/spr_cata_shoulder_hanging_mail_left.yy",},}, + {"id":{"name":"spr_cata_shoulder_hanging_mail_right","path":"sprites/spr_cata_shoulder_hanging_mail_right/spr_cata_shoulder_hanging_mail_right.yy",},}, + {"id":{"name":"spr_cata_tabbard_leather_hangings","path":"sprites/spr_cata_tabbard_leather_hangings/spr_cata_tabbard_leather_hangings.yy",},}, + {"id":{"name":"spr_cata_tabbard_leather","path":"sprites/spr_cata_tabbard_leather/spr_cata_tabbard_leather.yy",},}, + {"id":{"name":"spr_cata_tabbard_mail","path":"sprites/spr_cata_tabbard_mail/spr_cata_tabbard_mail.yy",},}, {"id":{"name":"spr_chain_mail_tabbard","path":"sprites/spr_chain_mail_tabbard/spr_chain_mail_tabbard.yy",},}, {"id":{"name":"spr_chap_area_pad","path":"sprites/spr_chap_area_pad/spr_chap_area_pad.yy",},}, {"id":{"name":"spr_chap_trim_left","path":"sprites/spr_chap_trim_left/spr_chap_trim_left.yy",},}, @@ -1751,4 +1794,4 @@ {"$GMTextureGroup":"","%Name":"MarineViewer","autocrop":true,"border":2,"compressFormat":"bz2","customOptions":"","directory":"","groupParent":null,"isScaled":true,"loadType":"default","mipsToGenerate":0,"name":"MarineViewer","resourceType":"GMTextureGroup","resourceVersion":"2.0","targets":-1,}, {"$GMTextureGroup":"","%Name":"NavalCombat","autocrop":true,"border":2,"compressFormat":"bz2","customOptions":"","directory":"","groupParent":null,"isScaled":true,"loadType":"default","mipsToGenerate":0,"name":"NavalCombat","resourceType":"GMTextureGroup","resourceVersion":"2.0","targets":-1,}, ], -} +} \ No newline at end of file diff --git a/datafiles/main/visual_sets/use_sets.json b/datafiles/main/visual_sets/use_sets.json index 193d856041..d38400a255 100644 --- a/datafiles/main/visual_sets/use_sets.json +++ b/datafiles/main/visual_sets/use_sets.json @@ -1,3 +1,3 @@ [ - "Company_marks_roman_right_shoulder" + "Company_marks_roman_right_shoulder", ] \ No newline at end of file diff --git a/scripts/macros/macros.gml b/scripts/macros/macros.gml index 0fa9ae8aa9..a792fb19d5 100644 --- a/scripts/macros/macros.gml +++ b/scripts/macros/macros.gml @@ -17,7 +17,7 @@ // Basic, because we don't include Artificer Armour #macro LIST_BASIC_POWER_ARMOUR ["MK7 Aquila", "MK6 Corvus", "MK5 Heresy", "MK8 Errant", "MK4 Maximus", "MK3 Iron Armour","Power Armour"] -#macro LIST_TERMINATOR_ARMOUR ["Terminator Armour", "Tartaros"] +#macro LIST_TERMINATOR_ARMOUR ["Terminator Armour", "Tartaros","Cataphractii Pattern Terminator"] enum luck { diff --git a/scripts/scr_ComplexSet/scr_ComplexSet.gml b/scripts/scr_ComplexSet/scr_ComplexSet.gml index 409eee9345..69da81292f 100644 --- a/scripts/scr_ComplexSet/scr_ComplexSet.gml +++ b/scripts/scr_ComplexSet/scr_ComplexSet.gml @@ -89,6 +89,7 @@ function sprite_get_uvs_transformed(_spr1, _subimg1, _spr2, _subimg2) { function ComplexSet(_unit) constructor { overides = {}; + subcomponents = {}; unit_armour = _unit.armour(); unit = _unit; draw_helms = instance_exists(obj_creation) ? obj_creation.draw_helms : obj_controller.draw_helms; @@ -135,12 +136,15 @@ function ComplexSet(_unit) constructor { 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"; + if (array_contains(blocked, _mod.position)) { continue; } @@ -328,6 +332,10 @@ function ComplexSet(_unit) constructor { _overides = _mod.overides; } + if (struct_exists(_mod, "subcomponents")){ + _sub_comps = _mod.subcomponents; + } + if (struct_exists(_mod, "body_parts")){ var _viable = true; var _body_areas = struct_get_names(_mod.body_parts); @@ -346,7 +354,7 @@ function ComplexSet(_unit) constructor { } if (struct_exists(_mod, "prevent_others")) { - replace_area(_mod.position, _mod.sprite, _overides); + 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++) { @@ -400,10 +408,10 @@ function ComplexSet(_unit) constructor { } } } else { - add_to_area(_mod.position, _mod.sprite, _overides); + add_to_area(_mod.position, _mod.sprite, _overides,_sub_comps); } if (struct_exists(_mod, "prevent_others")) { - replace_area(_mod.position, _mod.sprite, _overides); + 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++) { @@ -466,7 +474,8 @@ function ComplexSet(_unit) constructor { backpack_augment: unit.get_body_data("backpack_augment_variation", "torso"), chest_fastening: unit.get_body_data("chest_fastening", "torso"), left_weapon: unit.get_body_data("weapon_variation", "left_arm"), - right_weapon: unit.get_body_data("weapon_variation", "right_arm") + right_weapon: unit.get_body_data("weapon_variation", "right_arm"), + necklace : unit.get_body_data("hanging_variant", "throat"), }; static draw_component = function(component_name, texture_draws = {}) { @@ -477,8 +486,10 @@ function ComplexSet(_unit) constructor { var _sprite = self[$ component_name]; if (sprite_exists(_sprite)) { var choice = 0; + var _map_choice = 3; if (struct_exists(variation_map, component_name)) { - var choice = variation_map[$ component_name] % sprite_get_number(_sprite); + _map_choice = variation_map[$ component_name]; + var choice = _map_choice % sprite_get_number(_sprite); } if (struct_exists(overides, component_name)) { var _overide_set = overides[$ component_name]; @@ -492,6 +503,7 @@ function ComplexSet(_unit) constructor { } } } + var _tex_names = struct_get_names(texture_draws); if (array_length(_tex_names)) { var _return_surface = surface_get_target(); @@ -545,6 +557,55 @@ function ComplexSet(_unit) constructor { } else { draw_sprite(_sprite, choice ?? 0, x_surface_offset, y_surface_offset); } + if (struct_exists(subcomponents, component_name)) { + var _subcomponents_found = false; + var _component_bulk_set = subcomponents[$ component_name]; + for (var i = 0; i < array_length(_component_bulk_set); i++) { + var _spec_over = _component_bulk_set[i]; + if (_spec_over[0] <= choice && _spec_over[1] > choice) { + _subcomponents_found = true; + var _component_set = _spec_over[2]; + } + } + + if (_subcomponents_found){ + //show_debug_message($"subcomponents : {_component_set}"); + for (var i = 0; i < array_length(_component_set); i++) { + var _subcomponents = _component_set[i]; + //show_debug_message($"subcomponents 2: {_subcomponents}"); + var _sub_choice = 0; + if (_map_choice != 0){ + _sub_choice = sqr(_map_choice + 1) - i; + } + var _total_options = -1; + for (var s=0;s -1){ + if (_total_options == 0){ + _sub_choice_final = 0; + }else { + //show_debug_message($"{_sub_choice},{_total_options+1}") + _sub_choice_final = _sub_choice % (_total_options+1); + } + + //show_debug_message($"{_sub_choice_final}"); + + _choice_count = 0; + for (var s=0;s= _choice_count && _sub_choice_final < _choice_count+sprite_get_number(_subcomponents[s])){ + draw_sprite(_subcomponents[s], _sub_choice_final-_choice_count ?? 0, x_surface_offset, y_surface_offset); + break; + } else { + _choice_count += sprite_get_number(_subcomponents[s]); + } + } + } + } + } + } //sprite_delete(_sprite); } } @@ -857,6 +918,7 @@ function ComplexSet(_unit) constructor { "chest_fastening", "head", "gorget", + "necklace", "left_pauldron_base", "right_pauldron_base", "left_trim", @@ -888,6 +950,7 @@ function ComplexSet(_unit) constructor { "right_knee", "head", "gorget", + "necklace", "left_pauldron_base", "right_pauldron_base", "left_trim", @@ -1117,6 +1180,14 @@ function ComplexSet(_unit) constructor { }); armour_type = ArmourType.Terminator; break; + case "Cataphractii Pattern Terminator": + add_group({ + head: spr_cata_head, + belt : spr_cata_belt, + gorget : spr_cata_gorget, + }); + armour_type = ArmourType.Terminator; + break; case "Dreadnought": add_group({ armour: spr_dreadnought_complex @@ -1194,7 +1265,7 @@ function ComplexSet(_unit) constructor { shader_set(full_livery_shader); }; - static add_to_area = function(area, add_sprite, overide_data = "none") { + static add_to_area = function(area, add_sprite, overide_data = "none", sub_components = "none") { if (sprite_exists(add_sprite)) { var _add_sprite_length = sprite_get_number(add_sprite); if (!struct_exists(self, area)) { @@ -1207,6 +1278,9 @@ function ComplexSet(_unit) constructor { if (overide_data != "none") { add_overide(area, _overide_start, _add_sprite_length, overide_data); } + if (sub_components != "none") { + add_sub_components(area, _overide_start, _add_sprite_length, sub_components); + } } }; @@ -1217,17 +1291,16 @@ function ComplexSet(_unit) constructor { array_push(overides[$ area], [_overide_start, _overide_start + sprite_length, overide_data]); }; - static replace_area = function(area, add_sprite, overide_data = "none") { - if (struct_exists(self, area)) { - sprite_delete(self[$ area]); - if (struct_exists(overides, area)) { - struct_remove(overides, area); - } - } - self[$ area] = sprite_duplicate(add_sprite); - if (overide_data != "none") { - add_overide(area, 0, sprite_get_number(self[$ area]), overide_data); + static add_sub_components = function(area, _overide_start, sprite_length, sub_components) { + if (!struct_exists(subcomponents, area)) { + subcomponents[$ area] = []; } + array_push(subcomponents[$ area], [_overide_start, _overide_start + sprite_length, sub_components]); + }; + + static replace_area = function(area, add_sprite, overide_data = "none", sub_components = "none") { + remove_area(area); + add_to_area(area, add_sprite, overide_data , sub_components) }; static remove_area = function(area) { @@ -1237,6 +1310,9 @@ function ComplexSet(_unit) constructor { if (struct_exists(overides, area)) { struct_remove(overides, area); } + if (struct_exists(subcomponents, area)) { + struct_remove(subcomponents, area); + } } }; diff --git a/scripts/scr_culture_visuals/scr_culture_visuals.gml b/scripts/scr_culture_visuals/scr_culture_visuals.gml index 33d0ad0855..a9280328ce 100644 --- a/scripts/scr_culture_visuals/scr_culture_visuals.gml +++ b/scripts/scr_culture_visuals/scr_culture_visuals.gml @@ -14,7 +14,9 @@ function load_visual_sets(){ } for (var i=0;i=0;g--){ + var _found_sprite = false; + var _subimg = _sub_group[g]; + if (!is_string(_subimg)){ + if (!sprite_exists(_subimg)){ + array_delete(_sub_group,g,1); + } + continue; + } + if (_subimg == "blank"){ + _item.subcomponents[s][g] = spr_blank; + _found_sprite = true; + } else { + for (var m=0;m 0 ? livery_picker.role_set : eROLE.Tactical]; if (array_contains(armours, _armour) || _armour == STR_ANY_POWER_ARMOUR){ _armour = array_random_element(armours); + } else if(array_contains(LIST_TERMINATOR_ARMOUR, _armour)|| _armour == STR_ANY_POWER_ARMOUR){ + _armour = array_random_element(LIST_TERMINATOR_ARMOUR); } if (_armour == "Power Armour"){ _armour = "MK7 Aquila"; @@ -1183,6 +1406,7 @@ function generate_marine_body(){ }, "throat":{ variant : irandom(100), + hanging_variant : irandom(100), }, "jaw":{ variant: irandom(100), diff --git a/scripts/scr_dialogue/scr_dialogue.gml b/scripts/scr_dialogue/scr_dialogue.gml index 0976887efb..2fcc5186d6 100644 --- a/scripts/scr_dialogue/scr_dialogue.gml +++ b/scripts/scr_dialogue/scr_dialogue.gml @@ -2,12 +2,10 @@ function scr_dialogue(diplo_keyphrase) { // diplo_last=""; + with (obj_controller){ // diplo_keyphrase = keyphrase - for(var h=1; h<=4; h++){ - obj_controller.diplo_option[h]=""; - obj_controller.diplo_goto[h]=""; - } + clear_diplo_choices(); var event_log=""; var rando=0,tempd="",sorc=false; var rela,trade_msg; @@ -22,7 +20,7 @@ function scr_dialogue(diplo_keyphrase) { if (diplo_keyphrase=="declare_war") and (faction_status[diplomacy]!="War"){ faction_status[diplomacy]="War"; - event_log=string(obj_controller.faction_title[diplomacy])+" "+string(obj_controller.faction_leader[diplomacy])+" declares war on the "+string(global.chapter_name)+"."; + event_log=string(obj_controller.faction_title[diplomacy])+" "+string(obj_controller.faction_leader[diplomacy])+$" declares war on the {global.chapter_name}."; scr_event_log("red",event_log); if (string_count("|SC|",obj_controller.useful_info)>1) and (diplomacy==4) then sorc=true; @@ -30,42 +28,26 @@ function scr_dialogue(diplo_keyphrase) { if (diplo_keyphrase=="declare_war") and (string_count("|SC|",obj_controller.useful_info)>1) and (diplomacy==4) then sorc=true; if (diplo_keyphrase=="intro") or (diplo_keyphrase=="intro1") or ((diplomacy==10) and (diplo_keyphrase=="intro2")){ - event_log="Chapter Master "+string(obj_ini.master_name)+" meets the "+string(obj_controller.faction[diplomacy])+" "+string(obj_controller.faction_title[diplomacy])+", "+string(obj_controller.faction_leader[diplomacy])+"."; + event_log=$"Chapter Master {obj_ini.master_name} meets the {obj_controller.faction[diplomacy]} {obj_controller.faction_title[diplomacy]}, {obj_controller.faction_leader[diplomacy]}."; scr_event_log("",event_log); } var dip_score=diplomacy; // repeat(3){ // i+=1; - rela="neutral"; - - if (diplomacy>0){ - // if (diplomacy!=8){ - if (disposition[dip_score]>=60) then rela="friendly"; - if (disposition[dip_score]<60) and (disposition[dip_score]>=20) then rela="neutral"; - if (disposition[dip_score]<20) then rela="hostile"; - // } - if (diplomacy==6){ - if (disposition[dip_score]>=60) then rela="friendly"; - if (disposition[dip_score]<60) and (disposition[dip_score]>=0) then rela="neutral"; - if (disposition[dip_score]<0) then rela="hostile"; - } - - if (diplomacy==8){ - if (disposition[dip_score]>=40) then rela="friendly"; - if (disposition[dip_score]<40) and (disposition[dip_score]>=-15) then rela="neutral"; - if (disposition[dip_score]<-15) then rela="hostile"; - }// */ - } + rela="neutral"; + if (diplomacy>0){ + rela=relationship_hostility_matrix(diplomacy); + // */ + } // if (i<=5) and (fleet_type=3) and (rela="hostile") then rela="neutral"; // } // ** Chaos Meetings ** if (diplo_keyphrase=="cs_meeting1"){ diplomacy=10; - diplo_text="So you have brought yourself before me "+string(obj_ini.master_name)+". This pleases me. You are not the first among the Astartes to come to me. Do not look so shocked. Many have gazed upon the decay and decrepitude of the Imperium with open eyes, and heard the empty slogans of the Corpse Emperor with fresh ears and come to the realization I had so many long millennia ago. There is only one truth in the universe, one path worthy of an Astartes to walk. The path of true power. The path of true insight into the nature of reality and what lies beyond. The path of Chaos. Only when free of the pointless bondage of the Imperium can we ascend to our rightful place in the universe."; - diplo_option[1]="[Continue]"; - diplo_goto[1]="cs_meeting2"; + diplo_text=$"So you have brought yourself before me {obj_ini.master_name}. This pleases me. You are not the first among the Astartes to come to me. Do not look so shocked. Many have gazed upon the decay and decrepitude of the Imperium with open eyes, and heard the empty slogans of the Corpse Emperor with fresh ears and come to the realization I had so many long millennia ago. There is only one truth in the universe, one path worthy of an Astartes to walk. The path of true power. The path of true insight into the nature of reality and what lies beyond. The path of Chaos. Only when free of the pointless bondage of the Imperium can we ascend to our rightful place in the universe."; + add_diplomacy_option({option_text:"[Continue]", goto : "cs_meeting2"}); disposition[10]+=10; } // First branch of choices @@ -75,7 +57,11 @@ function scr_dialogue(diplo_keyphrase) { var mos=false,ii=0; repeat(obj_temp_meeting.dudes){ ii+=1; - if (mos=false){if (obj_ini.role[obj_temp_meeting.co[ii],obj_temp_meeting.ide[ii]]="Master of Sanctity") then mos=true;} + if (mos=false){ + if (obj_ini.role[obj_temp_meeting.co[ii],obj_temp_meeting.ide[ii]]="Master of Sanctity"){ + mos=true; + } + } } if (diplo_keyphrase=="cs_meeting2") then disposition[10]+=10; @@ -85,75 +71,77 @@ function scr_dialogue(diplo_keyphrase) { // Meeting20 if (diplo_keyphrase=="cs_meeting20"){ - diplo_text="[[A low rumbling growl issues from "+string(obj_controller.faction_leader[eFACTION.Chaos])+"’s power armour before he speaks.]]##I ask you for the last time Astartes. Why did you seek me out?"; + diplo_text="[[A low rumbling growl issues from "+string(obj_controller.faction_leader[eFACTION.Chaos])+"’s power armour before he speaks.]]\nI ask you for the last time Astartes. Why did you seek me out?"; } if (mos==true) and (diplo_keyphrase!="cs_meeting20"){ - diplo_option[1]="[Continue]"; - diplo_goto[1]="cs_meeting_m1"; + add_diplomacy_option({option_text:"[Continue]", goto : "cs_meeting_m1"}); } if (mos==false) or (diplo_keyphrase=="cs_meeting20"){ - diplo_option[1]="The Imperium has bound us and kept us from our true potential. We seek strength."; - diplo_option[2]="The Imperium and Inquisition's ignorance and hypocrisy will be the death of my Chapter."; - diplo_option[3]="Our enemies are many and our strength is diminished. We need allies to join with us while we rebuild our forces."; - diplo_option[4]="I sought you out to slay you with my own hands."; - - // Set targets for those options - diplo_goto[1]="cs_meeting30"; - - if (obj_controller.disposition[4]<=30) then diplo_goto[2]="cs_meeting40";// Convinced - if (obj_controller.disposition[4]>30) then diplo_goto[2]="cs_meeting45";// Not convinced, high inquisition dispositioin - + add_diplomacy_option( + { + option_text:"The Imperium has bound us and kept us from our true potential. We seek strength.", + goto : "cs_meeting30", + } + ); + + // if over 30 Not convinced due to high inquisition dispositioin + var _goto = obj_controller.disposition[4]>30 ? "cs_meeting45" : "cs_meeting40"; + add_diplomacy_option({option_text:"The Imperium and Inquisition's ignorance and hypocrisy will be the death of my Chapter.", goto: _goto}); + var testy=true; - if (obj_controller.faction_status[eFACTION.Imperium]="War") or (obj_controller.marines<=600) then testy=false; - if (testy=false) then diplo_goto[3]="cs_meeting50";// Scurrying like a rat, accepts - if (testy=true) then diplo_goto[3]="cs_meeting55";// Not convinced - - diplo_goto[4]="cs_meeting60"; + if (obj_controller.faction_status[eFACTION.Imperium]="War" || obj_controller.marines<=600) then testy=false; + if (testy=false) then _goto="cs_meeting50";// Scurrying like a rat, accepts + if (testy=true) then _goto="cs_meeting55";// Not convinced + + add_diplomacy_option({option_text:"Our enemies are many and our strength is diminished. We need allies to join with us while we rebuild our forces.", goto : _goto}); + + add_diplomacy_option({option_text:"I sought you out to slay you with my own hands.", goto: "cs_meeting60"}); + } } if (diplo_keyphrase=="cs_meeting21"){ - event_log=string(obj_ini.master_name)+" kills the "+string(global.chapter_name)+" Master of Sanctity for "+string(obj_controller.faction_leader[eFACTION.Chaos])+"."; + event_log=string(obj_ini.master_name)+$" kills the {global.chapter_name} Master of Sanctity for "+string(obj_controller.faction_leader[eFACTION.Chaos])+"."; scr_event_log("purple",event_log); // scr_alert("purple","lol",string(tix),0,0); - diplo_text="As the echoes fade, it becomes clear that the Master of Sanctity of "+string(global.chapter_name)+" has fallen."; - diplo_option[1]="[Continue]"; - diplo_goto[1]="cs_meeting135"; + diplo_text=$"As the echoes fade, it becomes clear that the Master of Sanctity of {global.chapter_name} has fallen."; + add_diplomacy_option({option_text:"[Continue]", goto : "cs_meeting135"}); } // MoS cuts in if (diplo_keyphrase=="cs_meeting_m1"){ diplomacy=-5.2; - diplo_text="[["+string(obj_ini.name[0,3])+" hisses your name over a private vox channel.]]##"; + diplo_text=$"[[{obj_ini.name[0,3]} hisses your name over a private vox channel.]]\n"; diplo_text+="My lord! What are we doing here, treating with this monster of the Traitor Legions? The very existence of the Archenemy is a threat to everything the Chapter stands for, and we endanger our immortal souls just being here. You know this! I demand to know your intentions! And I warn you, I will not hesitate to do what I must, for the good of the Chapter and the Imperium."; - - diplo_option[1]="Times change and the Chapter must change with them or be ground into the dust of history. (Chaos)"; - diplo_option[2]="We will not serve the Imperium’s crooked ends any longer. Our Chapter will control its own destiny. (Renegade)"; - diplo_option[3]="I haven’t turned traitor and my faith is strong. The Beast has foolishly opened its lair to us. Be ready for my signal."; + + var _goto = "cs_meeting_m2"; + add_diplomacy_option({option_text:"Times change and the Chapter must change with them or be ground into the dust of history. (Chaos)", goto: _goto}); + add_diplomacy_option({option_text:"We will not serve the Imperium’s crooked ends any longer. Our Chapter will control its own destiny. (Renegade)", goto: _goto}); + add_diplomacy_option({option_text:"I haven’t turned traitor and my faith is strong. The Beast has foolishly opened its lair to us. Be ready for my signal.", goto: _goto}); - for(var g=1; g<=3; g++){diplo_goto[g]="cs_meeting_m2";} // Option4 here if all the right conditions are met var born=false; - for(var ii=1; i<=200; i++){if (obj_ini.role[0,ii]==obj_ini.role[100][eROLE.ChapterMaster]) and (string_count("$",obj_ini.spe[0,ii])>0) then born=true;} + for(var ii=1; i<=200; i++){ + if (obj_ini.role[0,ii]==obj_ini.role[100][eROLE.ChapterMaster]) and (string_count("$",obj_ini.spe[0,ii])>0){ + born=true; + } + } if (obj_ini.TTRPG[0][3].corruption>=50) and (born=true){ - diplo_option[4]="Right now I need my Master of Sanctity at my side, trusting that his Chapter Master is doing what is best, what is necessary for the Chapter, during this dangerous moment. All will be made clear in time, I promise you brother. This is the right path."; - diplo_goto[4]="cs_meeting_m3"; + add_diplomacy_option({option_text:"Right now I need my Master of Sanctity at my side, trusting that his Chapter Master is doing what is best, what is necessary for the Chapter, during this dangerous moment. All will be made clear in time, I promise you brother. This is the right path.", goto:"cs_meeting_m3"}); } } if (diplo_keyphrase=="cs_meeting_m2"){ - event_log="The "+string(global.chapter_name)+" Master of Sanctity takes a stand against you."; + event_log=$"The {global.chapter_name} Master of Sanctity takes a stand against you."; scr_event_log("purple",event_log);// scr_alert("purple","lol",string(tix),0,0); - diplo_text="You have besmirched the honor of our chapter this day, and I will not forget it /my lord Chapter Master/.##[["+string(obj_ini.name[0,3])+" strides forward and his shout erupts from his external vox speakers with a boom that shatters the silence in the room.]]##We will not stand idly by and bandy words with heretic scum! To me my brothers! Slay these traitors in the name of our Emperor!"; - diplo_option[1]="[Continue]"; - diplo_goto[1]="cs_meeting9"; + diplo_text="You have besmirched the honor of our chapter this day, and I will not forget it /my lord Chapter Master/.\n[["+string(obj_ini.name[0,3])+" strides forward and his shout erupts from his external vox speakers with a boom that shatters the silence in the room.]]\nWe will not stand idly by and bandy words with heretic scum! To me my brothers! Slay these traitors in the name of our Emperor!"; + add_diplomacy_option({option_text:"[Continue]", goto: "cs_meeting9"}); } if (diplo_keyphrase=="cs_meeting_m3"){ - diplo_text="[["+string(obj_ini.name[0,3])+" is silent for a moment, before giving you an imperceptible nod.]]##I stand with you, Lord "+string(obj_ini.master_name)+". Let us face this together."; - diplo_option[1]="[Continue]"; - diplo_goto[1]="cs_meeting20"; + diplo_text="[["+string(obj_ini.name[0,3])+" is silent for a moment, before giving you an imperceptible nod.]]\nI stand with you, Lord "+string(obj_ini.master_name)+". Let us face this together."; + add_diplomacy_option({option_text:"[Continue]", goto :"cs_meeting20" }); obj_controller.useful_info+="CRMOS|"; } if (diplo_keyphrase=="cs_meeting_m5"){ @@ -161,10 +149,8 @@ function scr_dialogue(diplo_keyphrase) { instance_activate_all(); diplo_text="By the sacred oath I have sworn, I bear witness to your darkest secrets. Know this: I am compelled to report your heresy to the Inquisition. Redemption or retribution, their verdict shall decide. May the Emperor's mercy guide your path."; - diplo_option[1]="Very well. I did what must be done for my brothers, and now accept the price. [Game Over]"; - diplo_option[2]="Never! [Battle Loyalist "+string(global.chapter_name)+"]"; - diplo_goto[1]="cs_meeting_m6"; - diplo_goto[2]="cs_meeting_battle7"; + add_diplomacy_option({option_text:"Very well. I did what must be done for my brothers, and now accept the price. [Game Over]", goto :"cs_meeting_m6" }); + add_diplomacy_option({option_text: $"Never! [Battle Loyalist {global.chapter_name}]", goto :"cs_meeting_battle7" }); } if (diplo_keyphrase=="cs_meeting_m6"){ global.defeat=3; @@ -172,107 +158,103 @@ function scr_dialogue(diplo_keyphrase) { } if (diplo_keyphrase=="cs_meeting9"){ diplomacy=10; - diplomacy=10; - diplo_text="[["+string(obj_controller.faction_leader[eFACTION.Chaos])+" turns to you, his voice even and calm]]##Here is the first step you must take, to prove you’ve truly left the Imperium behind. Kill him. Kill your loyal brothers.##[[His Chaos Terminators raise their weapons as one and point them at you. Somewhere behind them a daemon cackles.]]##Choose now or be obliterated."; - - diplo_option[1]="Stand with me my brothers! Fight for the future of your Chapter, and slay "+string(obj_ini.name[0,3])+"! [Battle loyalist "+string(global.chapter_name)+"]"; - diplo_goto[1]="cs_meeting_battle1"; - diplo_option[2]=string(global.chapter_name)+", I order you to hold your fire! "+string(obj_ini.name[0,3])+", if you doubt my leadership then let it be decided by single combat! [Duel your Master of Sanctity]"; - diplo_goto[2]="cs_meeting_battle2"; - diplo_option[3]="I deny you "+string(obj_controller.faction_leader[eFACTION.Chaos])+". And now I shall destroy you. For the Emperor! [Attack Chaos forces]"; - diplo_goto[3]="cs_meeting_battle5"; + + diplo_text=$"[[{obj_controller.faction_leader[eFACTION.Chaos]} turns to you, his voice even and calm]]\n\nHere is the first step you must take, to prove you’ve truly left the Imperium behind. Kill him. Kill your loyal brothers.\n[[His Chaos Terminators raise their weapons as one and point them at you. Somewhere behind them a daemon cackles.]]\nChoose now or be obliterated."; + + var _master_of_sanct = fetch_unit([0,3]); + + var _string = $"Stand with me my brothers! Fight for the future of your Chapter, and slay {_master_of_sanct.name()}! [Battle loyalist {global.chapter_name}" + add_diplomacy_option({option_text:_string, goto : "cs_meeting_battle1", goto:"cs_meeting_battle1"});; + + var _string = $"{global.chapter_name}, I order you to hold your fire! {_master_of_sanct.name()}, if you doubt my leadership then let it be decided by single combat! [Duel your Master of Sanctity]" + add_diplomacy_option({option_text: _string, goto : "cs_meeting_battle2"}); + + var _string = $"I deny you {obj_controller.faction_leader[eFACTION.Chaos]}. And now I shall destroy you. For the Emperor! [Attack Chaos forces]"; + add_diplomacy_option({option_text:_string, goto :"cs_meeting_battle5" }); } + // First explanation for chaos if (diplo_keyphrase=="cs_meeting30"){ diplo_text="Then you have awakened to the truth the Imperium so hypocritically denies, that there is only one real power in the universe, and it goes to those with the will to seize it."; - diplo_option[1]="[Continue]"; - diplo_goto[1]="cs_meeting135"; + add_diplomacy_option({option_text:"[Continue]", goto : "cs_meeting135"}); disposition[10]+=30; } // Fucking inquisition if (diplo_keyphrase=="cs_meeting40"){ diplo_text="Yes...you do not fit the precious mold the Codex Astartes carves out for you, do you? And the Imperium destroys that which it cannot understand."; - diplo_option[1]="[Continue]"; - diplo_goto[1]="cs_meeting135"; + add_diplomacy_option({option_text:"[Continue]",goto : "cs_meeting135"}); disposition[10]+=30; } // Nah dawg if (diplo_keyphrase=="cs_meeting45"){ - diplo_text="Do you take me as a fool, "+string(obj_ini.master_name)+"? Even in the Eye there are whispers of your running to and fro at the Inquisition’s beck and call, like a dog playing fetch. You’re a well-trained, and maybe even a clever, dog. I’ve killed so many clever dogs in my time. How do I know this isn’t just a hopelessly doomed plot to try and kill me, hatched by your Inquisition masters still holding your leash?"; + diplo_text=$"Do you take me as a fool, {obj_ini.master_name}? Even in the Eye there are whispers of your running to and fro at the Inquisition’s beck and call, like a dog playing fetch. You’re a well-trained, and maybe even a clever, dog. I’ve killed so many clever dogs in my time. How do I know this isn’t just a hopelessly doomed plot to try and kill me, hatched by your Inquisition masters still holding your leash?"; - diplo_option[1]="There are advantages to staying on the Inquisition’s good side, and I’m not one to ignore an advantage."; - diplo_option[2]="Appeasing the Inquisition is no hard choice when your options are obey, or eventually be branded a heretic and be destroyed."; - diplo_option[3]="Given enough time, everyone becomes a heretic in the eyes of the Inquisition. I will not wait for them to make their move against us."; - diplo_option[4]="You have one thing right, "+string(obj_controller.faction_leader[eFACTION.Chaos])+". I am here to kill you. Open fire brothers, NOW! [Battle Chaos forces]"; - diplo_goto[4]="cs_meeting_battle5"; + add_diplomacy_option({ + option_text:"There are advantages to staying on the Inquisition’s good side, and I’m not one to ignore an advantage.", + goto : choose("cs_meeting46","cs_meeting47"), + }); + add_diplomacy_option({option_text:"Appeasing the Inquisition is no hard choice when your options are obey, or eventually be branded a heretic and be destroyed.",goto : choose("cs_meeting46","cs_meeting47"),}); + add_diplomacy_option({option_text:"Given enough time, everyone becomes a heretic in the eyes of the Inquisition. I will not wait for them to make their move against us.",goto : choose("cs_meeting46","cs_meeting47"),}); - for(var q=1; q<=3; q++){diplo_goto[q]=choose("cs_meeting46","cs_meeting47");} + var _string = "You have one thing right, {obj_controller.faction_leader[eFACTION.Chaos]}. I am here to kill you. Open fire brothers, NOW! [Battle Chaos forces]"; + add_diplomacy_option({option_text:_string, goto:"cs_meeting_battle5", goto:"cs_meeting_battle5"}); } // Sorry brah, you're not their homie if (diplo_keyphrase=="cs_meeting46"){ diplo_text="I am not convinced. A shame. I was hoping you might actually be of use- but now it is apparent that your use will only be as a bloody, broken offering to the Dark Gods."; - diplo_option[1]="[Battle Chaos AND any loyalist forces]"; - diplo_option[2]="cs_meeting_battle6"; + add_diplomacy_option({option_text:"[Battle Chaos AND any loyalist forces]"}); + add_diplomacy_option({option_text:"cs_meeting_battle6"}); } // you might be their homie, fine if (diplo_keyphrase=="cs_meeting47"){ diplo_text="You may yet be of use to me. Very well, we will assist you. It will be no trouble at all to exterminate you, should you displease me at a future time."; - diplo_option[1]="[Continue]"; - diplo_goto[1]="cs_meeting135"; + add_diplomacy_option({option_text:"[Continue]", goto:"cs_meeting135"}); disposition[10]+=30; } // mah numbers if (diplo_keyphrase=="cs_meeting50"){ diplo_text="Yes we have seen you struggle alone, scurrying from shadow to shadow like a hunted rat. I won’t lie to you though, I’ve seen the potential in you and your….brothers. Alright, we will assist you. It will be no trouble at all to exterminate you, should you displease me."; - diplo_option[1]="[Continue]"; - diplo_goto[1]="cs_meeting135"; + add_diplomacy_option({option_text:"[Continue]", goto : "cs_meeting135"}); disposition[10]+=30; } // such numbers, wow if (diplo_keyphrase=="cs_meeting55"){ diplo_text="I could overrun this sector with half the warriors you have now. Is your “Chapter” so pathetic you need to throw scores more men into the meatgrinder to succeed? You have not convinced me. I'd have enjoyed making use of your Chapter, but this was clearly not meant to be. Make your peace."; - diplo_option[1]="[Battle Chaos AND any loyalist forces]"; - diplo_option[2]="cs_meeting_battle6"; + add_diplomacy_option({option_text:"[Battle Chaos AND any loyalist forces]"}); + add_diplomacy_option({option_text:"cs_meeting_battle6"}); } // Actually here to kill you if (diplo_keyphrase=="cs_meeting60"){ var chaos_leader = obj_controller.faction_leader[eFACTION.Chaos]; disposition[10]+=10; - diplo_text=$"[[{chaos_leader} is silent for a moment, then a slow chuckle rises from deep within his ancient power armour. The chuckle erupts into hideous laughter that chills your blood with its otherworldly tenor.]]##I thank you, I have not truly laughed in three hundred years. I shall take your skull as a memento of this day and your fine jest. But before I do, indulge my curiosity. Let us say you did kill me, /then/ what would you do? Claim the price on my head? Go crawling back on your belly to your Imperial masters like a whipped cur, dragging your kill behind you? Become master of this sector yourself now that you’ve bested your greatest foe? Or perhaps you’d offer up my soul to the Dark Gods, ignorantly fumbling about in the darkness for their favor? Tell me."; + diplo_text=$"[[{chaos_leader} is silent for a moment, then a slow chuckle rises from deep within his ancient power armour. The chuckle erupts into hideous laughter that chills your blood with its otherworldly tenor.]]\nI thank you, I have not truly laughed in three hundred years. I shall take your skull as a memento of this day and your fine jest. But before I do, indulge my curiosity. Let us say you did kill me, /then/ what would you do? Claim the price on my head? Go crawling back on your belly to your Imperial masters like a whipped cur, dragging your kill behind you? Become master of this sector yourself now that you’ve bested your greatest foe? Or perhaps you’d offer up my soul to the Dark Gods, ignorantly fumbling about in the darkness for their favor? Tell me."; - diplo_option[1]="The reward for one such as you will be great, and I /will/ claim it."; - diplo_goto[1]="cs_meeting61"; - diplo_option[2]="The atrocities you’ve visited on this sector are reason enough."; - diplo_goto[2]="cs_meeting63"; - diplo_option[3]=$"You think me ignorant of the ways of Chaos, {chaos_leader}, but I know one truth. There is power in blood. Your blood. My power. They will hear me."; - diplo_goto[3]="cs_meeting65"; - diplo_option[4]=$"I’m just tired of listening to you talk, {chaos_leader}."; - diplo_goto[4]="cs_meeting67"; + add_diplomacy_option({option_text:"The reward for one such as you will be great, and I /will/ claim it.", goto : "cs_meeting61"}); + + add_diplomacy_option({option_text:"The atrocities you’ve visited on this sector are reason enough.",goto : "cs_meeting63"}); + add_diplomacy_option({option_text:$"You think me ignorant of the ways of Chaos, {chaos_leader}, but I know one truth. There is power in blood. Your blood. My power. They will hear me.",goto : "cs_meeting65"}); + add_diplomacy_option({option_text:$"I’m just tired of listening to you talk, {chaos_leader}.",goto : "cs_meeting67"}); } // Reward if (diplo_keyphrase=="cs_meeting61"){ diplo_text="It is this blind overconfidence that makes killing a Space Marine so satisfying."; - diplo_option[1]="[Battle Chaos forces]"; - diplo_goto[1]="cs_meeting_battle5"; + add_diplomacy_option({option_text:"[Battle Chaos forces]", goto : "cs_meeting_battle5"}); } // Atrocities if (diplo_keyphrase=="cs_meeting63"){ diplo_text="Oh, but I have one more atrocity to commit you simply shouldn’t miss..."; - diplo_option[1]="[Battle Chaos forces]"; - diplo_goto[1]="cs_meeting_battle5"; + add_diplomacy_option({option_text:"[Battle Chaos forces]", goto : "cs_meeting_battle5"}); } // BLOOD BLOOD BLOOD if (diplo_keyphrase=="cs_meeting65"){ diplo_text="You know, I think I would actually enjoy watching you attempt it. But I’ll spare you having your soul torn to shreds by daemons, and just give you an agonizing death instead."; - diplo_option[1]="[Battle Chaos AND any loyalist forces]"; - diplo_goto[1]="cs_meeting_battle6"; + add_diplomacy_option({option_text:"[Battle Chaos AND any loyalist forces]", goto : "cs_meeting_battle6"}); } // stahp talking if (diplo_keyphrase=="cs_meeting67"){ disposition[10]+=10; diplo_text="And I thought we were becoming such fast friends, you and I. Very well, don’t bore me."; - diplo_option[1]="[Battle Chaos forces]"; - diplo_goto[1]="cs_meeting_battle5"; + add_diplomacy_option({option_text:"[Battle Chaos forces]", goto : "cs_meeting_battle5"}); } // Finish the conversation @@ -282,21 +264,20 @@ function scr_dialogue(diplo_keyphrase) { if (diplo_keyphrase=="cs_meeting135"){ disposition[10]=max(disposition[10]+10,10); - diplo_text="[["+string(obj_controller.faction_leader[eFACTION.Chaos])+"’s power armour grinds as he leans forward, his posture predatory.]]##Then we have an accord. We will assist you as you take your first steps on the path toward Chaos. And my payment for all this?##[[He chuckles.]]##Enlisting an entire chapter in the service of the Dark Gods is all the reward I require."; - diplo_text+="##But you cannot simply paint the eight-pointed star on your wargear and begin slaughtering in the name of the Dark Gods. No, some within your chapter will resist the choice you’ve made, either out of loyalty to the Corpse Emperor or out of fear of Chaos. Just think, it will be like your own little heresy. The ''"+string(obj_ini.master_name)+" Heresy!''"; - diplo_option[1]="[Continue]"; - diplo_goto[1]="cs_meeting136"; + diplo_text=$"[[{obj_controller.faction_leader[eFACTION.Chaos]}’s power armour grinds as he leans forward, his posture predatory.]]\nThen we have an accord. We will assist you as you take your first steps on the path toward Chaos. And my payment for all this?\n[[He chuckles.]]\nEnlisting an entire chapter in the service of the Dark Gods is all the reward I require."; + diplo_text+="\nBut you cannot simply paint the eight-pointed star on your wargear and begin slaughtering in the name of the Dark Gods. No, some within your chapter will resist the choice you’ve made, either out of loyalty to the Corpse Emperor or out of fear of Chaos. Just think, it will be like your own little heresy. The ''"+string(obj_ini.master_name)+" Heresy!''"; + add_diplomacy_option({option_text:"[Continue]", goto : "cs_meeting136"}); } if (diplo_keyphrase=="cs_meeting136"){ event_log=string(obj_controller.faction_leader[eFACTION.Chaos])+" gives you an Artifact, meant to help corrupt your marines to the path of Chaos."; scr_event_log("purple",event_log);// scr_alert("purple","lol",string(tix),0,0); - diplo_text="[The tones of his humorless laughter are filled with the bitterness of ancient, poisoned memories. He continues.]##You must emerge victorious from this... \\Civil War\\, and not decimate your ranks in the process, if you are to be of any use to the Gods or to me. "; - diplo_text+="And to that end, I give you this.##[["+string(obj_controller.faction_leader[eFACTION.Chaos])+" gestures to one of his Terminators, who presents you with an Artifact. In your mind, something sinister seems to cling to the lines of its form.]]##The more of your warriors that come to accept Chaos, the fewer holdouts there will be to overcome when the time comes. This object will speed their introduction to its ways. You must also encourage your warriors to...broaden their horizons wherever possible, so they come to their own understanding of the Primordial Truth. But you must tread carefully at the same time, lest you alert the Inquisition. They must not have even a hint of what’s taking place in your Chapter, or they will obliterate you."; - diplo_option[1]="[Continue]"; - diplo_goto[1]="cs_meeting137"; + diplo_text="[The tones of his humorless laughter are filled with the bitterness of ancient, poisoned memories. He continues.]\nYou must emerge victorious from this... \\Civil War\\, and not decimate your ranks in the process, if you are to be of any use to the Gods or to me. "; + diplo_text+=$"And to that end, I give you this.\n[[{obj_controller.faction_leader[eFACTION.Chaos]} gestures to one of his Terminators, who presents you with an Artifact. In your mind, something sinister seems to cling to the lines of its form.]]\nThe more of your warriors that come to accept Chaos, the fewer holdouts there will be to overcome when the time comes. This object will speed their introduction to its ways. You must also encourage your warriors to...broaden their horizons wherever possible, so they come to their own understanding of the Primordial Truth. But you must tread carefully at the same time, lest you alert the Inquisition. They must not have even a hint of what’s taking place in your Chapter, or they will obliterate you."; + add_diplomacy_option({option_text:"[Continue]", goto : "cs_meeting137"}); } + if (diplo_keyphrase=="cs_meeting137"){ - diplo_text="When enough of your warriors have embraced Chaos, assemble them together in one place and then speak with me, and I will show you the beginning of the Eightfold Path. Now, begone.##[[As you leave he calls out to you one more time.]]##And "+string(obj_ini.master_name)+", I expect action within a few years. My patience, unlike Chaos, is not infinite."; + diplo_text=$"When enough of your warriors have embraced Chaos, assemble them together in one place and then speak with me, and I will show you the beginning of the Eightfold Path. Now, begone.\n[[As you leave he calls out to you one more time.]]\nAnd {obj_ini.master_name}, I expect action within a few years. My patience, unlike Chaos, is not infinite."; complex_event=true; current_eventing=""; force_goodbye=1; @@ -309,99 +290,111 @@ function scr_dialogue(diplo_keyphrase) { var born=false; for(var ii=1; ii<200; ii++){ - if (obj_ini.role[0,ii]==obj_ini.role[100][eROLE.ChapterMaster]) then obj_ini.TTRPG[0][ii].corruption+=floor(random_range(30,50)); + if (obj_ini.role[0,ii]==obj_ini.role[100][eROLE.ChapterMaster]){ + fetch_unit([0,ii]).corruption+=floor(random_range(30,50)); + } } obj_controller.chaos_rating+=1; // Casket, Chalice, Tome - if (obj_ini.fleet_type=ePlayerBase.home_world) then scr_add_artifact("chaos_gift","",0,obj_ini.home_name,2); - if (obj_ini.fleet_type != ePlayerBase.home_world) then scr_add_artifact("chaos_gift","",0,obj_ini.ship[0],501); + if (obj_ini.fleet_type=ePlayerBase.home_world){ + scr_add_artifact("chaos_gift","",0,obj_ini.home_name,2); + } + if (obj_ini.fleet_type != ePlayerBase.home_world){ + scr_add_artifact("chaos_gift","",0,obj_ini.ship[0],501); + } } if (string_count("cs_meeting_battle",diplo_keyphrase)>0){ - current_eventing=diplo_keyphrase;combating=1; + var current_eventing=diplo_keyphrase;combating=1; cooldown=30; diplomacy=0; menu=0; instance_activate_all(); with(obj_ground_mission){instance_destroy();} + var _found = false; + var _star, _planet; with(obj_star){ - for (var run=1; run<=4; run++) { - for (var s=1; s<=4; s++) { - if (p_problem[run,s]=="meeting") or (p_problem[run,s]=="meeting_trap"){ - for (var repeatCount=1; repeatCount<=run; repeatCount++){instance_create(x,y,obj_ground_mission);} - } - } - } - } - if (instance_number(obj_ground_mission)==0){ - with(obj_star){ - if (string_count(name,scr_master_loc())>0){ - repeat(obj_ini.TTRPG[0,0].planet_location){ - instance_create(x,y,obj_ground_mission); - } - } - } + if (has_problem_star("meeting")>0 && has_problem_star("meeting")>0){ + _found = true; + _star = id; + _planet = has_problem_star("meeting") > 0 ? has_problem_star("meeting"): has_problem_star("meeting_trap"); + break; + } + } + if (!_found){ + var _master = fetch_unit([0,0]); + if (_master.planet_location > 0){ + var _master_star = star_by_name(obj_ini.loc[0][0]); + if (_master_star != "none"){ + _found = true; + _planet = _master.planet_location; + _star = _master_star; + } + } } // show_message(string(instance_number(obj_ground_mission))); - - instance_create(0,0,obj_ncombat); - obj_ncombat.battle_special=diplo_keyphrase; - obj_ncombat.battle_object=instance_nearest(obj_ground_mission.x,obj_ground_mission.y,obj_star); - obj_ncombat.battle_loc=instance_nearest(obj_ground_mission.x,obj_ground_mission.y,obj_star).name; - obj_ncombat.battle_id=instance_number(obj_ground_mission); - with(obj_ground_mission){instance_destroy();} - obj_ncombat.dropping=0; - obj_ncombat.attacking=1; - obj_ncombat.local_forces=0; - - if (diplo_keyphrase=="cs_meeting_battle1"){ - obj_ncombat.enemy=1; - obj_ncombat.threat=2; - } - if (diplo_keyphrase=="cs_meeting_battle2"){ - obj_ncombat.enemy=1; - obj_ncombat.threat=1; - } - if (diplo_keyphrase=="cs_meeting_battle5"){ - obj_ncombat.enemy=10; - obj_ncombat.threat=3; - } - if (diplo_keyphrase=="cs_meeting_battle6"){ - obj_ncombat.enemy=10; - obj_ncombat.threat=3; - } - if (diplo_keyphrase=="cs_meeting_battle7"){ - obj_ncombat.enemy=1; - obj_ncombat.threat=2; - } - - if (obj_ncombat.enemy=10) and (obj_controller.faction_defeated[10]=0){ - obj_ncombat.leader=1; - - with(obj_star){ - remove_star_problem("meeting"); - remove_star_problem("meeting_trap"); - } - } - - for(var v=1; v=1){ - diplo_option[1]="My Chapter is prepared to join Chaos. [Begin]"; - diplo_goto[1]="civilwar_begin"; - diplo_option[2]="I require more time to corrupt my brethren."; - diplo_goto[2]="civilwar_soon"; + add_diplomacy_option({option_text:"My Chapter is prepared to join Chaos. [Begin]", goto : "civilwar_begin"}); + add_diplomacy_option({option_text:"I require more time to corrupt my brethren.", goto : "civilwar_soon"}); } } if (disposition[10]>-80) and (chaos_rating==0){ @@ -604,10 +589,10 @@ function scr_dialogue(diplo_keyphrase) { } } if (string_count("agree",diplo_keyphrase)==1){ - if (trading_artifact==0) then diplo_text=string(trade_msg)+"##"; - if (trading_artifact!=0) then diplo_text="[[Trade Accepted.]]##"; + if (trading_artifact==0) then diplo_text=string(trade_msg)+"\n"; + if (trading_artifact!=0) then diplo_text="[[Trade Accepted.]]\n"; if (liscensing>0){ - diplo_text="[[Trade Accepted. License(s) Transmitted.]]##"; + diplo_text="[[Trade Accepted. License(s) Transmitted.]]\n"; force_goodbye=1; // something else here; schedule the license and do not go to the next audience } @@ -624,27 +609,6 @@ function scr_dialogue(diplo_keyphrase) { } } if (diplo_keyphrase=="disagree"){ - if (trading_artifact==0) then diplo_text="[[Trade Refused]]##"; - if (trading_artifact==1) then diplo_text=""; - annoyed[diplomacy]+=1; - rando=choose(1,2,3); - if (rela=="hostile"){ - force_goodbye=1; - if (rando==1) then diplo_text+="You would offer me scraps for the keys to a kingdom? You are foolish and, worse, you are unaware of your own incompetence."; - if (rando==2) then diplo_text+="Do not attempt exchanges with those so far above you, lapdog of the Corpse Emperor, it makes you look even more idiotic than you already do."; - if (rando==3) then diplo_text+="I would spit upon this ‘offer' you bring before me but I find myself too amused by it."; - } - if (rela!="hostile"){ - if (rando==1) then diplo_text+="You may consider my response to be a ‘no' and assume my attitude to be whatever you like, Chapter Master."; - if (rando==2) then diplo_text+="Have a care that you do not overstep the mark, Chapter Master, I see no reason to accept such a trade."; - if (rando==3) then diplo_text+="An unreasonable trade, whatever our working relationship might be. I refuse."; - } - if (annoyed[diplomacy]>=10){ - force_goodbye=1; - turns_ignored[diplomacy]=max(turns_ignored[diplomacy],1); - diplo_last=string(diplo_keyphrase); - diplo_char=0;diplo_alpha=0;exit; - } } if (diplo_keyphrase=="attacked"){ // TODO @@ -664,7 +628,9 @@ function scr_dialogue(diplo_keyphrase) { if (rando==3) then diplo_text+="Were we not already engaged in a war 10,000 years old, your declaration might mean something."; } } - if (diplo_keyphrase=="accept_peace"){scr_chaos_alliance_test();} + if (diplo_keyphrase=="accept_peace"){ + scr_chaos_alliance_test(); + } if (diplo_keyphrase=="ignored"){ // TODO @@ -672,17 +638,23 @@ function scr_dialogue(diplo_keyphrase) { if (diplo_keyphrase=="denounced"){ if (faction_gender[10]==1){ disposition[10]-=1; - rando=choose(1,2,3,4,5,6,6,7,8,9); - if (rando==1) then diplo_text="You are nothing."; - if (rando==2) then diplo_text="Pathetic."; - if (rando==3) then diplo_text="I grow weary of your ineptitude."; - if (rando==4) then diplo_text="Judgement comes for all."; - if (rando==5) then diplo_text="Your kind will be destroyed, in time."; - if (rando==6) then diplo_text="["+string(faction_leader[eFACTION.Inquisition])+" lets out an amused, extremely confident chuckle.]"; - if (rando==7) then diplo_text="Your soul will be mine."; - if (rando==8) then diplo_text="Do not trifle with me, worm."; - if (rando==9){ - diplo_text="I have travelled the stars for millennia. Worlds have burned at my command, countless souls damned. The ground trembles with every step. Now I sit here and listen to you. Where did it all go so wrong?"; + + var _diag_opts = [ + "You are nothing.", + "Pathetic.", + "I grow weary of your ineptitude.", + "Judgement comes for all.", + "Your kind will be destroyed, in time.", + $"[{faction_leader[eFACTION.Inquisition]} lets out an amused, extremely confident chuckle.]", + "Your soul will be mine.", + "Do not trifle with me, worm.", + "I have travelled the stars for millennia. Worlds have burned at my command, countless souls damned. The ground trembles with every step. Now I sit here and listen to you. Where did it all go so wrong?" + ] + diplo_text = array_random_element(_diag_opts); + + + + if (irandom(9)==9){ force_goodbye=1; } if (disposition[10]<=-80){ @@ -762,49 +734,51 @@ function scr_dialogue(diplo_keyphrase) { if (rando==2) then diplo_text+="I am not a being of unlimited leisure time, Chapter Master, so you will need to be swift with your words."; if (rando==3) then diplo_text+="Speak but do not be offended if I seem not to be paying attention; I'm probably not."; } - diplo_option1="Demand Requisition"; - diplo_option2="Demand Military Assistance"; - diplo_option3="Cancel"; + add_diplomacy_option({option_text:"Demand Requisition"}); + add_diplomacy_option({option_text:"Demand Military Assistance"}); + add_diplomacy_option({option_text:"Cancel"}); } if (diplo_keyphrase=="propose_alliance") and (obj_controller.faction_gender[10]==1){ - with(obj_temp5){instance_destroy();} + var _found = false; + var _star, _planet; with(obj_star){ - var yeah=0; for(var i=1; i<=4;){ for(var r=1; r<=4; r++){ - if (p_problem[i,r]=="meeting") or (p_problem[i,r]=="meeting_trap") then yeah=r; + if (p_problem[i,r]=="meeting") or (p_problem[i,r]=="meeting_trap"){ + _found = true; + _star = id; + _planet = r; + break + } } } - if (yeah>0){ - for(var j=0; j0){ - diplo_text="[[Trade Accepted. License(s) Transmitted.]]##"; + diplo_text="[[Trade Accepted. License(s) Transmitted.]]\n"; force_goodbye=1; // TODO something else here; schedule the lisence and do not go to the next audience } @@ -852,7 +826,7 @@ function scr_dialogue(diplo_keyphrase) { } } if (diplo_keyphrase=="disagree"){ - if (trading_artifact==0) then diplo_text="[[Trade Refused]]##"; + if (trading_artifact==0) then diplo_text="[[Trade Refused]]\n"; if (trading_artifact==1) then diplo_text=""; annoyed[diplomacy]+=2; if (annoyed[diplomacy]>=10){ @@ -961,11 +935,13 @@ function scr_dialogue(diplo_keyphrase) { if (rando==2) then diplo_text="I believe this trade would be beneficial to us both."; if (rando==3) then diplo_text="What benefits us both benefits the Imperium. Who better for you to trade with than myself?"; } - if (diplo_keyphrase=="open_trade") then diplo_text="Make your proposal, Chapter Master."; - if (diplo_keyphrase=="artifact_thanks"){ + if (diplo_keyphrase=="open_trade"){ + diplo_text="Make your proposal, Chapter Master."; + } + else if (diplo_keyphrase=="artifact_thanks"){ diplo_text="Thank you indeed, Chapter Master. A relic of such magnificence... I thank you more than I can say."; } - if (diplo_keyphrase=="artifact_daemon"){ + else if (diplo_keyphrase=="artifact_daemon"){ diplo_text="Thank you indeed, Chapter Master. A relic of such magnificence... I thank you. This item is precious to me."; } if (diplo_keyphrase=="stc_thanks"){ @@ -997,9 +973,9 @@ function scr_dialogue(diplo_keyphrase) { if (rela=="friendly") then diplo_text=string(obj_ini.master_name)+"?"; if (rela=="neutral") then diplo_text="What is the meaning of this?"; if (rela=="hostile") then diplo_text="Consider your next words carefully."; - diplo_option[1]="Demand Requisition"; - diplo_option[2]="Demand Military Assistance"; - diplo_option[3]="Cancel"; + add_diplomacy_option({option_text:"Demand Requisition"}); + add_diplomacy_option({option_text:"Demand Military Assistance"}); + add_diplomacy_option({option_text:"Cancel"}); } if (string_count("assassination_angryish",diplo_keyphrase)>0){ var ta="",tb="",tc=""; @@ -1020,7 +996,7 @@ function scr_dialogue(diplo_keyphrase) { rando=choose(1,2); if (rando==1) then diplo_text="[["+string(faction_leader[eFACTION.Mechanicus])+" is a name often spoken of on the factory floor of "+string(obj_ini.sector_name)+"'s forgeworlds, though it cursed as often as it's praised. Sometimes referred to as “The Iron Whip”, "+string(faction_leader[eFACTION.Mechanicus])+" is famed for the high level of efficiency he extracts from those working under him, if not particularly for the quality of their works.]]"; if (rando==2) then diplo_text="[[The flesh is weak. "+string(faction_leader[eFACTION.Mechanicus])+" believes in this part of the iron creed above all others, forcing all those under him to mirror his dedication. All meaty parts of his body have been removed, leaving only the most vital parts of his brain. His retinue display their rank by showing how little of their body remains.]]"; - diplo_text+="###"; + diplo_text+="\n#"; if (disposition[3]>30) and (disposition[3]<60) then tempd="Greetings. I wish to see you bring the light of civilization to this sector, Chapter Master."; if (disposition[3]<=30) or (scr_has_disadv("Tech-Heresy")) then tempd="You are impure, illogical and irritating. Keep your army of techno barbarians away from my territory."; if (disposition[3]>=60) or (scr_has_adv("Tech-Brothers")) then tempd="Hail, Chapter Master. Were it not a logical fallacy, I would wish you luck in your coming endeavors."; @@ -1052,8 +1028,8 @@ function scr_dialogue(diplo_keyphrase) { } } if (diplo_keyphrase=="agree"){ - if (trading_artifact==0) then diplo_text=string(trade_msg)+"##"; - if (trading_artifact!=0) then diplo_text="[[Trade Accepted.]]##"; + if (trading_artifact==0) then diplo_text=string(trade_msg)+"\n"; + if (trading_artifact!=0) then diplo_text="[[Trade Accepted.]]\n"; rando=choose(1,2,3); if (rela=="friendly"){ if (rando==1) then diplo_text+="Let it be so, and may the Machine God bless this venture."; @@ -1072,7 +1048,7 @@ function scr_dialogue(diplo_keyphrase) { } } if (diplo_keyphrase=="disagree"){ - if (trading_artifact==0) then diplo_text="[[Trade Refused]]##"; + if (trading_artifact==0) then diplo_text="[[Trade Refused]]\n"; if (trading_artifact==1) then diplo_text=""; rando=choose(1,2,3); if (rela=="friendly"){ @@ -1147,8 +1123,8 @@ function scr_dialogue(diplo_keyphrase) { if (diplo_keyphrase=="open_trade") then diplo_text="..."; if (diplo_keyphrase=="artifact"){ if (rela!="hostile"){ - diplo_option[1]="Propose a trade for the Artifact."; - diplo_option[2]="Leave it be; Exit."; + add_diplomacy_option({option_text:"Propose a trade for the Artifact."}); + add_diplomacy_option({option_text:"Leave it be; Exit."}); diplo_text="The Adeptus Mechanicus is aware of the Artifact. Do not concern yourself with that which is rightly within our territory."; } if (rela=="hostile"){ @@ -1201,8 +1177,8 @@ function scr_dialogue(diplo_keyphrase) { if (randoo==1) then diplo_text="Calculations reveal that depending on your query we may have to beat your ass."; if (randoo!=1) then diplo_text="Certain queries may have to be answered by action."; } - diplo_option[1]="Demand Requisition"; - diplo_option[2]="Cancel"; + add_diplomacy_option({option_text:"Demand Requisition"}); + add_diplomacy_option({option_text:"Cancel"}); } } // ** Inquisition ** @@ -1211,7 +1187,7 @@ function scr_dialogue(diplo_keyphrase) { rando=choose(1,1,2); if (rando==1) then tempd="[[An ancient and well respected Inquistor Lord, "+string(faction_leader[eFACTION.Inquisition])+" has purged heresy and exterminated mutants for well over four centuries. His steely gaze and iron will have broken as many heretics as have the tools of persuasion wielded by his retinue. Were he to die, the Ordo "+choose("Malleus","Xenos","Hereticus")+" would dearly miss his services.]]"; if (rando==2) then tempd="[[A thousand heretics have cursed the name of "+string(faction_leader[eFACTION.Inquisition])+" with their last breath but he is still not satisfied. Remorse is as alien to him as pity and he will stop at nothing to destroy the enemies of purity.]]"; - tempd+="###"; + tempd+="\n#"; if (rela=="friendly") then tempd+="Ave Imperator, Chapter Master. You show great promise and I look forward to seeing you bring the light of the Emperor to "+string(obj_ini.sector_name)+"."; if (rela=="neutral") then tempd+="Greetings, space marine. Serve the Emperor in body and soul and you shall have nothing to fear from the Inquisition."; if (rela=="hostile") then tempd+="I hear worrying rumors about your conduct, astartes. I have no doubt we will meet again soon."; @@ -1243,8 +1219,8 @@ function scr_dialogue(diplo_keyphrase) { } } if (string_count("agree",diplo_keyphrase)>0){ - if (trading_artifact==0) then diplo_text=string(trade_msg)+"##"; - if (trading_artifact!=0) or (liscensing>0) then diplo_text="[[Trade Accepted.]]##"; + if (trading_artifact==0) then diplo_text=string(trade_msg)+"\n"; + if (trading_artifact!=0) or (liscensing>0) then diplo_text="[[Trade Accepted.]]\n"; rando=choose(1,2,3); if (rela=="friendly"){ if (rando==1) then diplo_text+="An interesting proposal. I look forward to the fruition of this deal."; @@ -1263,7 +1239,7 @@ function scr_dialogue(diplo_keyphrase) { } } if (diplo_keyphrase=="disagree"){ - if (trading_artifact==0) then diplo_text="[[Trade Refused]]##"; + if (trading_artifact==0) then diplo_text="[[Trade Refused]]\n"; if (trading_artifact==1) then diplo_text=""; annoyed[diplomacy]+=2; if (rela=="friendly") and (annoyed[diplomacy]>=8){ @@ -1374,8 +1350,8 @@ function scr_dialogue(diplo_keyphrase) { } if (diplo_keyphrase=="open_trade") then diplo_text="Make me an offer and I shall consider it, both for its value and its potential heresy."; if (diplo_keyphrase=="artifact"){ - diplo_option[1]="Propose a trade for the Artifact."; - diplo_option[2]="Leave it be; Exit."; + add_diplomacy_option({option_text:"Propose a trade for the Artifact."}); + add_diplomacy_option({option_text:"Leave it be; Exit."}); diplo_text="The Inquisition is, of course, aware of the artifact in question. What, precisely, are you offering for it?"; } if (diplo_keyphrase=="artifact_thanks"){ @@ -1440,7 +1416,7 @@ function scr_dialogue(diplo_keyphrase) { if (rando==3) then diplo_text="You have handed away the root of the Imperium's most powerful warriors to foul xenos. Did you truly believe a crime of this magnitude would escape the eye of the Imperium?"; faction_status[diplomacy]="War"; var lol=""; - lol=string(obj_controller.faction_title[diplomacy])+" "+string(obj_controller.faction_leader[diplomacy])+" declares war on the "+string(global.chapter_name)+"."; + lol=string(obj_controller.faction_title[diplomacy])+" "+string(obj_controller.faction_leader[diplomacy])+$" declares war on the {global.chapter_name}."; scr_event_log("red",lol); force_goodbye=1; gene_xeno=0; @@ -1449,10 +1425,12 @@ function scr_dialogue(diplo_keyphrase) { if (rela=="friendly") then diplo_text="Remember whom you speak to, Chapter Master."; if (rela=="neutral") then diplo_text="I, Inquisitor Lord "+string(faction_leader[eFACTION.Inquisition])+", on behalf of the Inquisition, am awaiting your words."; if (rela=="hostile") then diplo_text="Speak your next words very carefully, Astartes, for they may be your last."; - diplo_option[1]="Demand Requisition"; - diplo_option[2]="Skip Inspection"; - diplo_option[3]="Cancel"; - if (inspection_passes>0) then diplo_option[2]="Skip Inspection ("+string(inspection_passes)+" pass)"; + add_diplomacy_option({option_text:"Demand Requisition"}); + add_diplomacy_option({option_text:"Skip Inspection"}); + add_diplomacy_option({option_text:"Cancel"}); + if (inspection_passes>0){ + add_diplomacy_option({option_text:"Skip Inspection ({inspection_passes} pass)"}); + } } if (diplo_keyphrase=="penitent_end"){ rando=choose(1,2); @@ -1470,9 +1448,39 @@ function scr_dialogue(diplo_keyphrase) { diplo_text="My patience is wearing thin, Chapter Master. I have many more problems more urgent and, yet, you continue to force me away from the work assigned to me by He on Terra. Your serf on "+string(tb)+" "+scr_roman(tc)+" will be executed along with all the other puppets I ferret out. You are close to treason, Chapter Master. Choose your next words with exceptional care for they may be your last."; - diplo_option[1]="It will not happen again"; - diplo_option[2]="Very well"; - diplo_option[3]="You will not. "+string(tb)+" is MINE!"; + add_diplomacy_option({ + option_text:"It will not happen again", + key : "serf_removal_submit", + method : function(){ + scr_dialogue("you_better"); + force_goodbye=1; + hunt_player_serfs(); + exit; + } + }); + add_diplomacy_option({ + option_text:"Very well", + key : "serf_removal_accept", + method : function(){ + clear_diplo_choices(); + force_goodbye=1; + + hunt_player_serfs(); + cooldown=8; + diplomacy=0; + menu=0; + obj_turn_end.alarm[1]=1; + audience=0; + force_goodbye=0; + exit; + } + }); + add_diplomacy_option({ + option_text:$"You will not. {tb} is MINE!", + key : "serf_removal_defy", + force_goodbye : 1, + goto : "die_heretic", + }); } if (diplo_keyphrase=="you_better"){ rando=choose(1,2); @@ -1526,17 +1534,14 @@ function scr_dialogue(diplo_keyphrase) { diplo_text="Your arrogant, blatant disregard for proper Imperial conduct can no longer go unanswered, Astartes. Time and time again you have ignored the Imperium's call to arms, refusing to strike out at the enemies of man when it was most needed, and callously ignored the Inquisition's wants. It has become clear that you are not in line with the High Lords of Terra and His will. This heresy must be cut from your Chapter like the festering blight it is. You may either atone for your Chapter's crimes, in penitence, or see it ground to dust around you."; // Speak your next words carefully, Chapter Master, for they may damn all the souls of your men to oblivion. - diplo_option[1]="You are right in that we must account for our sins. Let our Penitence begin."; - diplo_goto[1]="loyalty_penitence"; - diplo_option[2]="I answer only to the Emperor himself, not to the likes of you."; - diplo_goto[2]="die_heretic"; - diplo_option[3]="Threaten my Chapter at your own peril."; - diplo_goto[3]="die_heretic"; + add_diplomacy_option({option_text:"You are right in that we must account for our sins. Let our Penitence begin.", goto : "loyalty_penitence"}); + add_diplomacy_option({option_text:"I answer only to the Emperor himself, not to the likes of you.",goto:"die_heretic"}); + add_diplomacy_option({option_text:"Threaten my Chapter at your own peril.", goto:"die_heretic"}); } if (diplo_keyphrase=="loyalty_penitence"){ diplo_text="Brothers, hear my words! It is time to embark on a sacred journey of redemption, a penitence crusade to cleanse our souls. Our past wrongdoings have led us astray form the Emperor, but through unwavering determination and righteous deeds, we shall forge a path to absolution. With every battle fought, every sacrifice made, we shall restore honor to our name and rekindle the flame of righteousness within. "; - var tx="The "+string(global.chapter_name)+" become Penitent."; + var tx=$"The {global.chapter_name} become Penitent."; scr_alert("green","halp",string(tx),0,0); scr_event_log("",string(tx)); @@ -1561,7 +1566,7 @@ function scr_dialogue(diplo_keyphrase) { rando=choose(1,2); if (rando==1) then tempd="[[Old and experienced, this Prioress of the Sisters of Battle is not a woman to be trifled with. Clad in an elaborate set of full power armour and with her face sporting several scars, "+string(faction_leader[eFACTION.Ecclesiarchy])+" exudes battlefield experience.]]"; if (rando==2) then tempd="[[The Ecclesiarchy have assigned one of their militant arm to their dealings with you- Prioress "+string(faction_leader[eFACTION.Ecclesiarchy])+". The woman wears a set of well-used powered armour that has seen many battles, if its charred exterior is to be believed. Incense burners hang from chains on her belt and waft smoke around her body.]]"; - tempd+="###"; + tempd+="\n#"; rando=choose(1,1,2,2,2); if (rando==1) then tempd+="Hail, Chapter Master! As a son of the Emperor, you will no doubt take great joy in bringing his light to this benighted sector. I look forward to watching heretics fall before your armies."; if (rando==2) then tempd+="And the Emperor spoke; “You shall know my servants by the eagle they bear, so the people of old Terra did know the eagle as the symbol of enlightenment and freedom.” Fitting that we, the instruments of His will, still bear the eagle? May the Emperor's gaze be upon you, Space Marine."; @@ -1593,8 +1598,8 @@ function scr_dialogue(diplo_keyphrase) { } } if (diplo_keyphrase=="agree"){ - if (trading_artifact==0) then diplo_text=string(trade_msg)+"##"; - if (trading_artifact!=0) then diplo_text="[[Trade Accepted.]]##"; + if (trading_artifact==0) then diplo_text=string(trade_msg)+"\n"; + if (trading_artifact!=0) then diplo_text="[[Trade Accepted.]]\n"; rando=choose(1,2,3); if (rela=="friendly"){ if (rando==1) then diplo_text+="Let it be so."; @@ -1613,7 +1618,7 @@ function scr_dialogue(diplo_keyphrase) { } } if (diplo_keyphrase=="disagree"){ - if (trading_artifact==0) then diplo_text="[[Trade Refused]]##"; + if (trading_artifact==0) then diplo_text="[[Trade Refused]]\n"; if (trading_artifact==1) then diplo_text=""; annoyed[diplomacy]+=2; if (rela=="neutral") and (annoyed[diplomacy]>=8){ @@ -1719,8 +1724,8 @@ function scr_dialogue(diplo_keyphrase) { } if (diplo_keyphrase=="open_trade") then diplo_text="Make me an offer, Space Marine, and I will pray for the guidance to respond."; if (diplo_keyphrase=="artifact"){ - diplo_option[1]="Propose a trade for the Artifact."; - diplo_option[2]="Leave it be; Exit."; + add_diplomacy_option({option_text:"Propose a trade for the Artifact."}); + add_diplomacy_option({option_text:"Leave it be; Exit."}); diplo_text="You have done a service to us by making us aware of this artifact. It is a little amusing that is was under our noses this whole time, though now I am sure it can be retrieved."; } if (diplo_keyphrase=="artifact_thanks"){ @@ -1739,14 +1744,14 @@ function scr_dialogue(diplo_keyphrase) { diplo_text="How dare you strike at us, the truest and most devoted servants of the Emperor!? That artifact was on our territory! You had no right and you shall pay in blood for your actions!"; } if (diplo_keyphrase=="stc_thanks"){ - diplo_text="On behalf of Imperium, I extend our deepest gratitude to "+string(global.chapter_name)+" for the invaluable gift given to us."; + diplo_text=$"On behalf of Imperium, I extend our deepest gratitude to {global.chapter_name} for the invaluable gift given to us."; } if (diplo_keyphrase=="trading_demand"){ if (rela=="friendly") then diplo_text=string(obj_ini.master_name)+"?"; if (rela=="neutral") then diplo_text="What is the meaning of this?"; if (rela=="hostile") then diplo_text="“The Heretic and Blasphemer can offer no excuse for their crimes. Those who are pardoned merely live to further shroud Humanity from the Light of the Emperor with the Darkness of their souls.”"; - diplo_option[1]="Demand Requisition"; - diplo_option[2]="Cancel"; + add_diplomacy_option({option_text:"Demand Requisition"}); + add_diplomacy_option({option_text:"Cancel"}); } if (diplo_keyphrase=="penitent_end"){ rando=choose(1,2); @@ -1770,7 +1775,7 @@ function scr_dialogue(diplo_keyphrase) { } diplo_text+=" Do not expect futher contact.]]"; } - diplo_text+="###"; + diplo_text+="\n#"; // * Normal craftworld reveal * if (string_count("1",diplo_keyphrase)>0){ if (scr_has_adv("Enemy: Eldar")){ @@ -1838,8 +1843,8 @@ function scr_dialogue(diplo_keyphrase) { } } if (diplo_keyphrase=="agree"){ - if (trading_artifact==0) then diplo_text=string(trade_msg)+"##"; - if (trading_artifact!=0) then diplo_text="[[Trade Accepted.]]##"; + if (trading_artifact==0) then diplo_text=string(trade_msg)+"\n"; + if (trading_artifact!=0) then diplo_text="[[Trade Accepted.]]\n"; rando=choose(1,2,3); if (rela=="friendly"){ if (rando==1) then diplo_text+="We are agreed."; @@ -1858,7 +1863,7 @@ function scr_dialogue(diplo_keyphrase) { } } if (diplo_keyphrase=="disagree"){ - if (trading_artifact==0) then diplo_text="[[Trade Refused]]##"; + if (trading_artifact==0) then diplo_text="[[Trade Refused]]\n"; if (trading_artifact==1) then diplo_text=""; annoyed[diplomacy]+=2; if (rela=="friendly") and (annoyed[diplomacy]>=6){ @@ -1899,7 +1904,7 @@ function scr_dialogue(diplo_keyphrase) { } if (diplo_keyphrase=="attacked"){ if (rela!="friendly") then diplo_text="Normal 'we were attacked' line goes here."; - if (rela=="friendly") then diplo_text="I would say 'you should know better', "+string(obj_ini.master_name)+", but children are incapable of acting with wisdom, as is their nature.##This act of war obliges us to respond in kind. I expect to see you upon the fields of battle."; + if (rela=="friendly") then diplo_text="I would say 'you should know better', "+string(obj_ini.master_name)+", but children are incapable of acting with wisdom, as is their nature.\nThis act of war obliges us to respond in kind. I expect to see you upon the fields of battle."; } if (diplo_keyphrase=="declare_war"){ force_goodbye=1; @@ -1962,7 +1967,7 @@ function scr_dialogue(diplo_keyphrase) { } if (diplo_keyphrase=="open_trade") then diplo_text="Speak."; if (diplo_keyphrase=="artifact"){ - diplo_text="Representatives of the Imperium, as the Chapter Master of "+string(global.chapter_name)+", I inform you of a potential artifact within our possession, one that we are willing to trade."; + diplo_text=$"Representatives of the Imperium, as the Chapter Master of {global.chapter_name}, I inform you of a potential artifact within our possession, one that we are willing to trade."; } if (diplo_keyphrase=="artifact_thanks"){ diplo_text="We... thank you, for the gift of this imperial curio. I am sure it will prove useful for something. What, I am not sure."; @@ -1997,9 +2002,9 @@ function scr_dialogue(diplo_keyphrase) { if (rando==2) then diplo_text="You may not always have what you wish for, Mon'keigh."; if (rando==3) then diplo_text="Were I a lesser being, such as yourself, spitting in your face might prove tempting."; } - diplo_option[1]="Demand Requisition"; - diplo_option[2]="Demand Useful Information"; - diplo_option[3]="Cancel"; + add_diplomacy_option({option_text:"Demand Requisition"}); + add_diplomacy_option({option_text:"Demand Useful Information"}); + add_diplomacy_option({option_text:"Cancel"}); } if (diplo_keyphrase=="mission1"){ diplo_text="The good that might come from simple acts of benevolence are oft underestimated. A token goodwill gesture can go far, "; @@ -2007,12 +2012,30 @@ function scr_dialogue(diplo_keyphrase) { if (rela!="hostile") then diplo_text+="human"; diplo_text+=". Even something as small as water, raw material, and sustenance can have a profound efect."; - diplo_option[1]="Give 500 Requisition"; - diplo_option[2]="Maybe"; - diplo_option[3]="Refuse"; + add_diplomacy_option({ + option_text:"Give 500 Requisition", + goto : "elder_mission1_thanks", + method : function(){ + scr_loyalty("Xeno Trade","+"); + scr_quest(2,"fund_elder",6,0); + requisition-=500; + } + }); + add_diplomacy_option({ + option_text:"Maybe", + goto : "quest_maybe", + }); + add_diplomacy_option({ + option_text:"Refuse", + goto : "mission1_refused", + method : function(){ + scr_quest(3,"fund_elder",6,0); + questing=0; + } + }); questing=1; } - if (diplo_keyphrase=="mission1_thanks"){ + if (diplo_keyphrase=="elder_mission1_thanks"){ scr_recent("eldar_mission","completed",1); rando=choose(1,1,1,2,2,3,3,3); if (rando==1) then diplo_text="You intend to hand over these resources? Without a promise of compensation? You are a strange human, Chapter Master. Few would do this, and it will not be forgotten."; @@ -2038,10 +2061,7 @@ function scr_dialogue(diplo_keyphrase) { if (rando==2) then diplo_text="While this is not the gesture I was referring to, I suppose the fact you are yet to scream and shout about ‘Xenos Scum' must be taken as a minor miracle."; if (rando==3) then diplo_text="Not hard to see why your species is so universally viewed as foolish. Still, perhaps you will manage to be a little more enlightened than the rest."; questing=0; - for(var h=1; h<=4; h++){ - obj_controller.diplo_option[h]=""; - obj_controller.diplo_goto[h]=""; - } + clear_diplo_choices(); } if (diplo_keyphrase=="useful_information"){ var found=0; @@ -2117,11 +2137,11 @@ function scr_dialogue(diplo_keyphrase) { var you,nuum,plan=0; you=instance_nearest(obj_temp5.x,obj_temp5.y,obj_star); nuum=you.name; - for(var i=1; i<=4; i++){ + for(var i=1; i<=you.planets; i++){ if (planet_feature_bool(you.p_feature[1], P_features.Warlord10)==1) then plan=i; } found=1; - diplo_text="The fallen warlord of your kind is located somewhere within the "+string(nuum)+" system. More I cannot say. It would be prudent to deal with this soon- that abomination may not remain there long."; + diplo_text=$"The fallen warlord of your kind is located somewhere within the {nuum} system. More I cannot say. It would be prudent to deal with this soon- that abomination may not remain there long."; } }} } @@ -2145,7 +2165,7 @@ function scr_dialogue(diplo_keyphrase) { var you,nuum,plan=0; you=instance_nearest(obj_temp5.x,obj_temp5.y,obj_star); nuum=you.name; - for(var i=1; i<=4; i++){ + for(var i=1; i<=you.planets; i++){ if (planet_feature_bool(you.p_feature[1], P_features.OrkWarboss)==1) then plan=i; } if (you.p_orks[plan]<6) then you.p_orks[plan]=6; @@ -2190,10 +2210,7 @@ function scr_dialogue(diplo_keyphrase) { array_push(p_feature[onceh], new NewPlanetFeature(P_features.Webway)); obj_controller.temp[90]=name; good=1; - if (onceh==1) then obj_controller.temp[90]+=" I"; - if (onceh==2) then obj_controller.temp[90]+=" II"; - if (onceh==3) then obj_controller.temp[90]+=" III"; - if (onceh==4) then obj_controller.temp[90]+=" IV"; + obj_controller.temp[90]+=scr_roman(onceh) } } } @@ -2259,7 +2276,7 @@ function scr_dialogue(diplo_keyphrase) { rando=choose(1,2); if (rando==1) then diplo_text="[["+string(faction_leader[diplomacy])+" is the scourge of the sector, a colossal green brute infamous for the destruction of a dozen worlds. He rules his vicious horde of xenos savages the only way greenskins know how; with brute force. Trophies from the champions of a score of races bedeck his armour, including many from "+string(choose("other Astartes","the Tyranids","the Tau Empire"))+".]]"; if (rando==2) then diplo_text="[["+string(faction_leader[diplomacy])+" is a veteran of countless engagements, leading his tribe into battle with an almost manic giddiness. His name is synonymous with extended campaigns of looting and senseless violence, even more so than the other members of his barbaric race. He and the rest of his tribe hail from the "+string(choose("Goffs","Blood Axes","Bad Moons","Death Skulls","Death Skulls"))+" clan.]]"; - diplo_text+="###"; + diplo_text+="\n#"; if (scr_has_adv("Enemy: Orks")){ diplo_text+="Oi Beaky! I ain't heard your name round here before! If ya eva get bored of havin' your ‘ead attached to your shouldas, good old "+string(faction_leader[diplomacy])+" can sort dat out for ya!"; } else { @@ -2274,7 +2291,7 @@ function scr_dialogue(diplo_keyphrase) { if (diplo_keyphrase=="new_warboss"){ rando=choose(1,1,1,2); diplo_text="[["+string(faction_leader[diplomacy])+" is the scourge of many sectors, a colossal green brute infamous for the destruction of dozens of worlds. His name is synonymous with extended campaigns of looting and senseless violence, even more so than the other members of his barbaric race. He and the rest of his tribe hail from the "+string(choose("Goffs","Blood Axes","Bad Moons","Death Skulls","Death Skulls"))+" clan. He is recently arrived to the sector, bringing with him a massive invasion fleet.]]"; - diplo_text+="###"; + diplo_text+="\n#"; if (rando==1) then diplo_text+="I've got good news, humie! "+string(faction_leader[diplomacy])+" is da warboss now! An' ya know wot dat means? It means yer krumped! Krumped good an' well, just as soon as me Mekboys get dis piece o junk movin'. Thaz right! Get ready fer a foight, humies; me an' da boyz'll be antsy when we gets there, and it'd be downroight inhorspitotalibile not to give us a good one!" if (rando==2) then diplo_text+="Tasty humie worldz. All dat loot. All dat MEAT. By Gork an Mork, we's gonna smash it all up wiv an ax, burn it to da ground and have a proppa meal! "+string(faction_leader[diplomacy])+" is da warboss now, and I's commin for you humie! Git ready for da WWWAAAGGGGGGGGGGHHHHHHH!" } @@ -2316,8 +2333,8 @@ function scr_dialogue(diplo_keyphrase) { } } if (string_count("agree",diplo_keyphrase)>0){ - if (trading_artifact==0) then diplo_text=string(trade_msg)+"##"; - if (trading_artifact!=0) or (liscensing>0) then diplo_text="[[Trade Accepted.]]##"; + if (trading_artifact==0) then diplo_text=string(trade_msg)+"\n"; + if (trading_artifact!=0) or (liscensing>0) then diplo_text="[[Trade Accepted.]]\n"; rando=choose(1,2,3); if (rela=="friendly"){ if (rando==1) then diplo_text+="Ha, this is gunna be a whole lot of fun! I'm in!"; @@ -2336,7 +2353,7 @@ function scr_dialogue(diplo_keyphrase) { } } if (diplo_keyphrase=="disagree"){ - if (trading_artifact==0) then diplo_text="[[Trade Refused]]##"; + if (trading_artifact==0) then diplo_text="[[Trade Refused]]\n"; if (trading_artifact==1) then diplo_text=""; annoyed[diplomacy]+=2; if (annoyed[diplomacy]>=6){ @@ -2472,9 +2489,9 @@ function scr_dialogue(diplo_keyphrase) { if (diplo_keyphrase=="open_trade") then diplo_text="Wut?"; if (diplo_keyphrase=="trading_demand"){ diplo_text="Yeah? Wut?"; - diplo_option[1]="Demand Requisition"; - diplo_option[2]="Demand Military Assistance"; - diplo_option[3]="Cancel"; + add_diplomacy_option({option_text:"Demand Requisition"}); + add_diplomacy_option({option_text:"Demand Military Assistance"}); + add_diplomacy_option({option_text:"Cancel"}); } } // ** Tau ** @@ -2483,7 +2500,7 @@ function scr_dialogue(diplo_keyphrase) { rando=choose(1,2); if (rando==1) then tempd="[[Tall and slender, its skin is blue and clammy-looking. Disgusting. Its face contains two large, expressionless eyes, a slit-like mouth, and a bizarre I-shaped gash between its eyes that must function as a nose. So this is "+string(faction_title[8])+" "+string(faction_leader[eFACTION.Tau])+". This particular xenos is said to "+choose("have quite the silver tongue","have negotiated the surrender of many Imperial worlds","have a great deal of military backing.")+".]]"; if (rando==2) then tempd="[[Tall and slender, its skin is a light blue and looks almost reptilian. A Y-shaped slit nestles between its eyes, and a mouth like a slit sits below that. This must be "+string(faction_title[8])+" "+string(faction_leader[eFACTION.Tau])+". The Ordo Xenos tells us that this particular xeno "+choose("can sense weakness in a rock","knows more than it will let on","uses its words like a scalpel")+".]]"; - tempd+="###"; + tempd+="\n#"; rando=choose(1,2); if (rando==1) then tempd+="Greetings, Chapter Master. As you know, we have claimed for ourselves planets along the borders of your Imperium. I wish to clarify that we of the Tau do not seek a war. Rather, we hope to cooperate with you so that we may both work towards a Greater Good."; if (rando==2) then tempd+="Salutations, "+string(obj_ini.master_name)+". I represent the interests of the Tau Empire. We wish to exist in peace beside you for now, and hope that one day you will see the wisdom of the Greater Good. We will be more than happy to accept you into the fold, for the way of the Tau is one of benevolence and acceptance."; @@ -2515,8 +2532,8 @@ function scr_dialogue(diplo_keyphrase) { } } if (diplo_keyphrase=="agree"){ - if (trading_artifact==0) then diplo_text=string(trade_msg)+"##"; - if (trading_artifact!=0) then diplo_text="[[Trade Accepted.]]##"; + if (trading_artifact==0) then diplo_text=string(trade_msg)+"\n"; + if (trading_artifact!=0) then diplo_text="[[Trade Accepted.]]\n"; rando=choose(1,2,3); if (rela=="friendly"){ if (rando==1) then diplo_text+="Yes! We wholeheartedly agree to this deal. The Tau Empire thanks you for your continuing support."; @@ -2535,7 +2552,7 @@ function scr_dialogue(diplo_keyphrase) { } } if (diplo_keyphrase=="disagree"){ - if (trading_artifact==0) then diplo_text="[[Trade Refused]]##"; + if (trading_artifact==0) then diplo_text="[[Trade Refused]]\n"; if (trading_artifact==1) then diplo_text=""; rando=choose(1,2,3); if (rela=="friendly"){ @@ -2639,11 +2656,14 @@ function scr_dialogue(diplo_keyphrase) { if (diplo_keyphrase=="trade_error_2") then diplo_text="[Error 2: "+string(obj_controller.faction[diplomacy])+" has no valid origin for a fleet.]"; // ** Sets ignored turns when kicked out of diplomacy screen ** - if (force_goodbye==1) then turns_ignored[diplomacy]=max(turns_ignored[diplomacy],1); + if (force_goodbye==1){ + turns_ignored[diplomacy]=max(turns_ignored[diplomacy],1); + } // ** Resets global vars ** diplo_last=string(diplo_keyphrase); diplo_char=0; diplo_alpha=0; + } } diff --git a/sprites/spr_blank/bfc59ee2-c8b5-4e18-9d19-92ee0b8805a4.png b/sprites/spr_blank/bfc59ee2-c8b5-4e18-9d19-92ee0b8805a4.png new file mode 100644 index 0000000000000000000000000000000000000000..f9de873a621898b6aff7f82420a1bf70c1b9ea89 GIT binary patch literal 308 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=3dtTpz6=aiY77hwEes65fI|H(?D5CD^;uunK>+L~CULfz# zg75yheC7*)Ok~hd&g|g8z_`AO4`?uhYKdz^NlIc#s#S7PDv)9@GB7gLH89gPvJ5da zv@$fcGPTq;Ft9Q($UKq!14Tn_eoAIqC2kE8Q*XNfHE6(XD9OxCEiOsSEx@hEzv0(x PkYhbv{an^LB{Ts5n3PX) literal 0 HcmV?d00001 diff --git a/sprites/spr_blank/layers/bfc59ee2-c8b5-4e18-9d19-92ee0b8805a4/1b6c16d6-080f-4ab6-96e2-f5318628c178.png b/sprites/spr_blank/layers/bfc59ee2-c8b5-4e18-9d19-92ee0b8805a4/1b6c16d6-080f-4ab6-96e2-f5318628c178.png new file mode 100644 index 0000000000000000000000000000000000000000..f9de873a621898b6aff7f82420a1bf70c1b9ea89 GIT binary patch literal 308 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=3dtTpz6=aiY77hwEes65fI|H(?D5CD^;uunK>+L~CULfz# zg75yheC7*)Ok~hd&g|g8z_`AO4`?uhYKdz^NlIc#s#S7PDv)9@GB7gLH89gPvJ5da zv@$fcGPTq;Ft9Q($UKq!14Tn_eoAIqC2kE8Q*XNfHE6(XD9OxCEiOsSEx@hEzv0(x PkYhbv{an^LB{Ts5n3PX) literal 0 HcmV?d00001 diff --git a/sprites/spr_blank/spr_blank.yy b/sprites/spr_blank/spr_blank.yy new file mode 100644 index 0000000000..32f634c19f --- /dev/null +++ b/sprites/spr_blank/spr_blank.yy @@ -0,0 +1,92 @@ +{ + "$GMSprite":"v2", + "%Name":"spr_blank", + "bboxMode":0, + "bbox_bottom":0, + "bbox_left":0, + "bbox_right":0, + "bbox_top":0, + "collisionKind":1, + "collisionTolerance":0, + "DynamicTexturePage":false, + "edgeFiltering":false, + "For3D":false, + "frames":[ + {"$GMSpriteFrame":"v1","%Name":"bfc59ee2-c8b5-4e18-9d19-92ee0b8805a4","name":"bfc59ee2-c8b5-4e18-9d19-92ee0b8805a4","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + ], + "gridX":0, + "gridY":0, + "height":64, + "HTile":false, + "layers":[ + {"$GMImageLayer":"","%Name":"1b6c16d6-080f-4ab6-96e2-f5318628c178","blendMode":0,"displayName":"default","isLocked":false,"name":"1b6c16d6-080f-4ab6-96e2-f5318628c178","opacity":100.0,"resourceType":"GMImageLayer","resourceVersion":"2.0","visible":true,}, + ], + "name":"spr_blank", + "nineSlice":null, + "origin":0, + "parent":{ + "name":"Sprites", + "path":"folders/Sprites.yy", + }, + "preMultiplyAlpha":false, + "resourceType":"GMSprite", + "resourceVersion":"2.0", + "sequence":{ + "$GMSequence":"v1", + "%Name":"spr_blank", + "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_blank", + "playback":1, + "playbackSpeed":30.0, + "playbackSpeedType":0, + "resourceType":"GMSequence", + "resourceVersion":"2.0", + "seqHeight":64.0, + "seqWidth":64.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":"bfc59ee2-c8b5-4e18-9d19-92ee0b8805a4","path":"sprites/spr_blank/spr_blank.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"01fdc18f-a97b-4a62-9359-98655fe497a3","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":0.5, + "textureGroupId":{ + "name":"Default", + "path":"texturegroups/Default", + }, + "type":0, + "VTile":false, + "width":64, +} \ No newline at end of file diff --git a/sprites/spr_buy_tiny/spr_buy_tiny.yy b/sprites/spr_buy_tiny/spr_buy_tiny.yy index bbc7d6fb93..37bb71e84e 100644 --- a/sprites/spr_buy_tiny/spr_buy_tiny.yy +++ b/sprites/spr_buy_tiny/spr_buy_tiny.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_buy_tiny", "bboxMode":0, "bbox_bottom":11, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"f686ba29-c495-47b6-96c4-6b5468d59af7","name":"f686ba29-c495-47b6-96c4-6b5468d59af7","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"f686ba29-c495-47b6-96c4-6b5468d59af7","name":"f686ba29-c495-47b6-96c4-6b5468d59af7","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"f686ba29-c495-47b6-96c4-6b5468d59af7","path":"sprites/spr_buy_tiny/spr_buy_tiny.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"aac88065-ea52-440a-b15d-0d3ef7afe71d","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"f686ba29-c495-47b6-96c4-6b5468d59af7","path":"sprites/spr_buy_tiny/spr_buy_tiny.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"aac88065-ea52-440a-b15d-0d3ef7afe71d","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":{ diff --git a/sprites/spr_cata_belt/0fe6bbd7-15a9-4a87-9edd-9a8370587e1e.png b/sprites/spr_cata_belt/0fe6bbd7-15a9-4a87-9edd-9a8370587e1e.png new file mode 100644 index 0000000000000000000000000000000000000000..6d26ac33870804b4514538898f6d3f9c0ce0ac55 GIT binary patch literal 906 zcmeAS@N?(olHy`uVBq!ia0vp^%Ypa>2OE&=lK2t|q!f}pf_xbms?-=58d?|_egTCV zUNA6}8Za=tN?>5Hn!&&zUNC1@pbb!hEy>&6h2cL4F4((#G6Mrst*47)NX4zUw+#Jm z2gtBLh@Tb5aAj+?YMWoqTep6J(l?x1Q(6Tl_2_VXW$6)hZ&B)8p6@QB#?rY`|DxN(3wA_J7Th?{WHve6GyJz>}%-y{y->>IQdQ$PYB5nVo z*wcpVYAUYl&Y7(8^TW5VXWY`o!#yW`&)=u!si&{M`MSOAxmU#%SFCUBxp_YBe@O+9 zsUbJn`}ihtHR3GuQtpSI=8udwT<0#omG$SUf#7~uFB7lj}fUe?u4B^-u~5*t+#B^ z?t*o1WcEdTWB4cj_??EUsZZ@uZKjzz5auT=xnguM$HO9emhgqjslf)( z0_RvmShjFv#y;JXuRP=I+PhbO-8XvIx9MlW%8VJextAWF`q^%Z=i6Coq9NzhCCc4H zL$}0O%7=I#%t^nimA-sS#a*wB3jg08KW=|ddsW8Oq~B`}|Mzm0Xkxq!^40j7)V6%yf+`LJW+oOiZi{ z4YUmmtPBh?ls*H~Ig*Cl{FKbJO57SG>%A?28Z_WGlw{_n7MCRE7U0(7mzDJ#s literal 0 HcmV?d00001 diff --git a/sprites/spr_cata_belt/layers/0fe6bbd7-15a9-4a87-9edd-9a8370587e1e/4f697124-68fb-4fd2-9223-aaf62235ab77.png b/sprites/spr_cata_belt/layers/0fe6bbd7-15a9-4a87-9edd-9a8370587e1e/4f697124-68fb-4fd2-9223-aaf62235ab77.png new file mode 100644 index 0000000000000000000000000000000000000000..6d26ac33870804b4514538898f6d3f9c0ce0ac55 GIT binary patch literal 906 zcmeAS@N?(olHy`uVBq!ia0vp^%Ypa>2OE&=lK2t|q!f}pf_xbms?-=58d?|_egTCV zUNA6}8Za=tN?>5Hn!&&zUNC1@pbb!hEy>&6h2cL4F4((#G6Mrst*47)NX4zUw+#Jm z2gtBLh@Tb5aAj+?YMWoqTep6J(l?x1Q(6Tl_2_VXW$6)hZ&B)8p6@QB#?rY`|DxN(3wA_J7Th?{WHve6GyJz>}%-y{y->>IQdQ$PYB5nVo z*wcpVYAUYl&Y7(8^TW5VXWY`o!#yW`&)=u!si&{M`MSOAxmU#%SFCUBxp_YBe@O+9 zsUbJn`}ihtHR3GuQtpSI=8udwT<0#omG$SUf#7~uFB7lj}fUe?u4B^-u~5*t+#B^ z?t*o1WcEdTWB4cj_??EUsZZ@uZKjzz5auT=xnguM$HO9emhgqjslf)( z0_RvmShjFv#y;JXuRP=I+PhbO-8XvIx9MlW%8VJextAWF`q^%Z=i6Coq9NzhCCc4H zL$}0O%7=I#%t^nimA-sS#a*wB3jg08KW=|ddsW8Oq~B`}|Mzm0Xkxq!^40j7)V6%yf+`LJW+oOiZi{ z4YUmmtPBh?ls*H~Ig*Cl{FKbJO57SG>%A?28Z_WGlw{_n7MCRE7U0(7mzDJ#s literal 0 HcmV?d00001 diff --git a/sprites/spr_cata_belt/spr_cata_belt.yy b/sprites/spr_cata_belt/spr_cata_belt.yy new file mode 100644 index 0000000000..7185f14855 --- /dev/null +++ b/sprites/spr_cata_belt/spr_cata_belt.yy @@ -0,0 +1,92 @@ +{ + "$GMSprite":"v2", + "%Name":"spr_cata_belt", + "bboxMode":0, + "bbox_bottom":112, + "bbox_left":59, + "bbox_right":111, + "bbox_top":97, + "collisionKind":1, + "collisionTolerance":0, + "DynamicTexturePage":false, + "edgeFiltering":false, + "For3D":false, + "frames":[ + {"$GMSpriteFrame":"v1","%Name":"0fe6bbd7-15a9-4a87-9edd-9a8370587e1e","name":"0fe6bbd7-15a9-4a87-9edd-9a8370587e1e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + ], + "gridX":0, + "gridY":0, + "height":232, + "HTile":false, + "layers":[ + {"$GMImageLayer":"","%Name":"4f697124-68fb-4fd2-9223-aaf62235ab77","blendMode":0,"displayName":"default","isLocked":false,"name":"4f697124-68fb-4fd2-9223-aaf62235ab77","opacity":100.0,"resourceType":"GMImageLayer","resourceVersion":"2.0","visible":true,}, + ], + "name":"spr_cata_belt", + "nineSlice":null, + "origin":0, + "parent":{ + "name":"cata_complex", + "path":"folders/Sprites/Marine Viewer/body_types/cata_complex.yy", + }, + "preMultiplyAlpha":false, + "resourceType":"GMSprite", + "resourceVersion":"2.0", + "sequence":{ + "$GMSequence":"v1", + "%Name":"spr_cata_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_cata_belt", + "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":"0fe6bbd7-15a9-4a87-9edd-9a8370587e1e","path":"sprites/spr_cata_belt/spr_cata_belt.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"65692ebc-8c79-4a8e-9c99-8784ebfb2a34","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":0.5, + "textureGroupId":{ + "name":"Default", + "path":"texturegroups/Default", + }, + "type":0, + "VTile":false, + "width":167, +} \ No newline at end of file diff --git a/sprites/spr_cata_complex/2583c501-d4e3-4285-b210-347ae21d5657.png b/sprites/spr_cata_complex/2583c501-d4e3-4285-b210-347ae21d5657.png new file mode 100644 index 0000000000000000000000000000000000000000..0f188724293959f309ea03d417e5e109d8704499 GIT binary patch literal 4176 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 w@pJKX3;oZ4{z3B$Izam0D+GD^xCRFO":"", + "Keyframes":[], + "resourceType":"KeyframeStore", + "resourceVersion":"2.0", + }, + "eventStubScript":null, + "eventToFunction":{}, + "length":1.0, + "lockOrigin":false, + "moments":{ + "$KeyframeStore":"", + "Keyframes":[], + "resourceType":"KeyframeStore", + "resourceVersion":"2.0", + }, + "name":"spr_cata_complex", + "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":"2583c501-d4e3-4285-b210-347ae21d5657","path":"sprites/spr_cata_complex/spr_cata_complex.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"d4d335e1-2dbe-493a-ac0e-28104bb3d6e2","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":0.5, + "textureGroupId":{ + "name":"Default", + "path":"texturegroups/Default", + }, + "type":0, + "VTile":false, + "width":167, +} \ No newline at end of file diff --git a/sprites/spr_cata_cowl_trim/eacd6626-c655-4103-80b3-501d635dbecc.png b/sprites/spr_cata_cowl_trim/eacd6626-c655-4103-80b3-501d635dbecc.png new file mode 100644 index 0000000000000000000000000000000000000000..57eeb84234489b7a9496cdd4f95af7fe3edd29d1 GIT binary patch literal 1060 zcmeAS@N?(olHy`uVBq!ia0vp^%Ypa>2OE&=lK2t|q!f}pf_xbms?-=58d?|_egTCV zUNA6}8Za=tN?>5Hn!&&zUNC1@pbb!hEy>&6h2cL4F4((#G6Ms%xTlL_NX4zUcWldU zIf$@bP*j(`V0CBdH?s&1Uftumz2b+=VwQil+QJef@l@lKhf~4?llS*d*-MxlK3=_; zQCk&gXhNh}vAjd(s#R9z@z+ap>)t1P+UF^J>hHTR-_wtO&-L>3$WOiW?!vlBcLSa| z&6>2pFL9CDEAEuXKlb_R>+8S#{CV^D@4Sw(X+`U%WZ%}!f1BU;{`TRz@~YE!-d)%k z3)KF5#uPzer%H*PtMA?B%A9xdMPata?cCq9v}XUVR{WbJWCXPOzSOB*>&(}$U%%hZ z&aSSXWlwEA(=5R{rd{heo;{gXlPW59q3=TT`(3Itf|Tq zo7s3nZJk>;FV9+c)c&ol(^no*phVc&V-eN*u`>$zLeHwQZ8qF+G^FM$kMOx3)9{5` zbv^ThEazx0O$|Tmw!CWHPghgVBL!_MtW-NB&P~y~n$8=#d17R>*ng$yqr%1OSFH;2 z(yV^8VOl}lv5V!OioZYip8n$b9rh0@&o^?*tZ_YWac<=SC*gH#*Beey?N9btQD8Q` zEAqE+^eKyDE}5@2m#&|7WABM;Qsx_rA8P~_zMe9tv0hF4(5y1qWgMZFmnUzFXVZJ~ zmE&mMsrIO1yTc!At9Ptn@8&(bnd7S za_)k)ORL5wStVf78W@leSI-b`RH5Qs90$x;45}rr5hW>!C8<`)MX5lF!N|bKRM)^v z*T^!&(9p`r)XLOU+rYrez`(pKzZXSAZhlH;S|x4`Zr86H0ySvBZ79jiO)V}-%q_sJ UNAS?Mcc5_bboFyt=akR{0Gd*gs{jB1 literal 0 HcmV?d00001 diff --git a/sprites/spr_cata_cowl_trim/layers/eacd6626-c655-4103-80b3-501d635dbecc/19bbd962-0cda-4b64-9afc-f12938f1660e.png b/sprites/spr_cata_cowl_trim/layers/eacd6626-c655-4103-80b3-501d635dbecc/19bbd962-0cda-4b64-9afc-f12938f1660e.png new file mode 100644 index 0000000000000000000000000000000000000000..57eeb84234489b7a9496cdd4f95af7fe3edd29d1 GIT binary patch literal 1060 zcmeAS@N?(olHy`uVBq!ia0vp^%Ypa>2OE&=lK2t|q!f}pf_xbms?-=58d?|_egTCV zUNA6}8Za=tN?>5Hn!&&zUNC1@pbb!hEy>&6h2cL4F4((#G6Ms%xTlL_NX4zUcWldU zIf$@bP*j(`V0CBdH?s&1Uftumz2b+=VwQil+QJef@l@lKhf~4?llS*d*-MxlK3=_; zQCk&gXhNh}vAjd(s#R9z@z+ap>)t1P+UF^J>hHTR-_wtO&-L>3$WOiW?!vlBcLSa| z&6>2pFL9CDEAEuXKlb_R>+8S#{CV^D@4Sw(X+`U%WZ%}!f1BU;{`TRz@~YE!-d)%k z3)KF5#uPzer%H*PtMA?B%A9xdMPata?cCq9v}XUVR{WbJWCXPOzSOB*>&(}$U%%hZ z&aSSXWlwEA(=5R{rd{heo;{gXlPW59q3=TT`(3Itf|Tq zo7s3nZJk>;FV9+c)c&ol(^no*phVc&V-eN*u`>$zLeHwQZ8qF+G^FM$kMOx3)9{5` zbv^ThEazx0O$|Tmw!CWHPghgVBL!_MtW-NB&P~y~n$8=#d17R>*ng$yqr%1OSFH;2 z(yV^8VOl}lv5V!OioZYip8n$b9rh0@&o^?*tZ_YWac<=SC*gH#*Beey?N9btQD8Q` zEAqE+^eKyDE}5@2m#&|7WABM;Qsx_rA8P~_zMe9tv0hF4(5y1qWgMZFmnUzFXVZJ~ zmE&mMsrIO1yTc!At9Ptn@8&(bnd7S za_)k)ORL5wStVf78W@leSI-b`RH5Qs90$x;45}rr5hW>!C8<`)MX5lF!N|bKRM)^v z*T^!&(9p`r)XLOU+rYrez`(pKzZXSAZhlH;S|x4`Zr86H0ySvBZ79jiO)V}-%q_sJ UNAS?Mcc5_bboFyt=akR{0Gd*gs{jB1 literal 0 HcmV?d00001 diff --git a/sprites/spr_cata_cowl_trim/spr_cata_cowl_trim.yy b/sprites/spr_cata_cowl_trim/spr_cata_cowl_trim.yy new file mode 100644 index 0000000000..f6e6d92409 --- /dev/null +++ b/sprites/spr_cata_cowl_trim/spr_cata_cowl_trim.yy @@ -0,0 +1,92 @@ +{ + "$GMSprite":"v2", + "%Name":"spr_cata_cowl_trim", + "bboxMode":0, + "bbox_bottom":43, + "bbox_left":57, + "bbox_right":113, + "bbox_top":6, + "collisionKind":1, + "collisionTolerance":0, + "DynamicTexturePage":false, + "edgeFiltering":false, + "For3D":false, + "frames":[ + {"$GMSpriteFrame":"v1","%Name":"eacd6626-c655-4103-80b3-501d635dbecc","name":"eacd6626-c655-4103-80b3-501d635dbecc","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + ], + "gridX":0, + "gridY":0, + "height":232, + "HTile":false, + "layers":[ + {"$GMImageLayer":"","%Name":"19bbd962-0cda-4b64-9afc-f12938f1660e","blendMode":0,"displayName":"default","isLocked":false,"name":"19bbd962-0cda-4b64-9afc-f12938f1660e","opacity":100.0,"resourceType":"GMImageLayer","resourceVersion":"2.0","visible":true,}, + ], + "name":"spr_cata_cowl_trim", + "nineSlice":null, + "origin":0, + "parent":{ + "name":"cata_complex", + "path":"folders/Sprites/Marine Viewer/body_types/cata_complex.yy", + }, + "preMultiplyAlpha":false, + "resourceType":"GMSprite", + "resourceVersion":"2.0", + "sequence":{ + "$GMSequence":"v1", + "%Name":"spr_cata_cowl_trim", + "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_cata_cowl_trim", + "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":"eacd6626-c655-4103-80b3-501d635dbecc","path":"sprites/spr_cata_cowl_trim/spr_cata_cowl_trim.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"dd9d5e2a-e1f0-4998-93af-4d70aa530ab5","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":0.5, + "textureGroupId":{ + "name":"Default", + "path":"texturegroups/Default", + }, + "type":0, + "VTile":false, + "width":167, +} \ No newline at end of file diff --git a/sprites/spr_cata_gorget/d14dc785-21d1-4e15-ad83-2b38fa9a79f7.png b/sprites/spr_cata_gorget/d14dc785-21d1-4e15-ad83-2b38fa9a79f7.png new file mode 100644 index 0000000000000000000000000000000000000000..ff80aaffa48d20e8f87f3515a0600bfd1e01db52 GIT binary patch literal 1125 zcmeAS@N?(olHy`uVBq!ia0vp^%Ypa>2OE&=lK2t|q!f}pf_xbms?-=58d?|_egTCV zUNA6}8Za=tN?>5Hn!&&zUNC1@pbb!hEy>&6h2cL4F4((#G6Ms1gr|#RNX4zUw;hWf zg^93U@SenbVrpy!uTHb)v+4GOZG4N<=%{hPme6oI{xyHh^%h&Di z*~?O0-L9mS9(q@I^{c#{k?(^;uRi>L|M8DitE_5npWnW>ckjGx4W&7ra>wEt{_c&{ ze0Zj8`>dzj7T0T4SzC)Y-_xIbX3T zdwN-nZFK17kCnTl&%V37en~^Yw;88XtZ$dy(=eRlxh&GQdeyTvqJrnjvg>E&EswLE z4s>sE+MP?2oetgnX0+A3-hWwD+3K`v`QlI?i)yyTEBEa&x5NRMu?yykG10nO}3wQ&v=|Z4Y*= zj;ag{HP+ly^sK~U*G#TkmrtF)=c1}%G-vHe+n;sMY_dPvTP-=8%(vy!Y&+?AXTjMr zMg}=5bIs<*e4jr1?CgXEz4F(CgA67gIy^IGUfbmNjXT{ub}xKm^Gs!(T1;@@Y}rfK zz23inKUt-}zh7PSt+LataLw(zL#_IE`W!sy!}YWAc6Qvk1-=fy+xn6Nto94r@9bar z`~AGwYP}Wm@Aof#k)WpaytB+Td+UvRo8yajyJa8nioM=lrtmxOdik~7w)x*4PnSC5 zVp08d%iYNgyj%ZFzipdSzWUqFk10D|W!~+b{9wAwskUwR7IV5?-evy!@6y-Zcl9Ue z#LwRK`=9u!;&~naA52}jtMFyCU%KL+XQ2%{KeX&QXw5czv*YqwGvAg^LjGs0W$XTG zm&gBqAzQWUR^y*fpXYZUwcp>r_m8K*IsT%Ti~X(&Vo#t{7nS&=|NC?O(-MOv2Y_a) zmbgZgq$HN4S|t~y0x1R~10z#i12bJCix2}ND-$y-Qv+=S11kfA7jt!;Q8eV{r(~v8 r;?^+pz|{Xh4H|G8N-}d(i%Sx73vlZ>cXf*bP!EHrtDnm{r-UW|bPCK& literal 0 HcmV?d00001 diff --git a/sprites/spr_cata_gorget/layers/d14dc785-21d1-4e15-ad83-2b38fa9a79f7/fe0dd4fc-c973-4418-9c16-c69e04260f36.png b/sprites/spr_cata_gorget/layers/d14dc785-21d1-4e15-ad83-2b38fa9a79f7/fe0dd4fc-c973-4418-9c16-c69e04260f36.png new file mode 100644 index 0000000000000000000000000000000000000000..ff80aaffa48d20e8f87f3515a0600bfd1e01db52 GIT binary patch literal 1125 zcmeAS@N?(olHy`uVBq!ia0vp^%Ypa>2OE&=lK2t|q!f}pf_xbms?-=58d?|_egTCV zUNA6}8Za=tN?>5Hn!&&zUNC1@pbb!hEy>&6h2cL4F4((#G6Ms1gr|#RNX4zUw;hWf zg^93U@SenbVrpy!uTHb)v+4GOZG4N<=%{hPme6oI{xyHh^%h&Di z*~?O0-L9mS9(q@I^{c#{k?(^;uRi>L|M8DitE_5npWnW>ckjGx4W&7ra>wEt{_c&{ ze0Zj8`>dzj7T0T4SzC)Y-_xIbX3T zdwN-nZFK17kCnTl&%V37en~^Yw;88XtZ$dy(=eRlxh&GQdeyTvqJrnjvg>E&EswLE z4s>sE+MP?2oetgnX0+A3-hWwD+3K`v`QlI?i)yyTEBEa&x5NRMu?yykG10nO}3wQ&v=|Z4Y*= zj;ag{HP+ly^sK~U*G#TkmrtF)=c1}%G-vHe+n;sMY_dPvTP-=8%(vy!Y&+?AXTjMr zMg}=5bIs<*e4jr1?CgXEz4F(CgA67gIy^IGUfbmNjXT{ub}xKm^Gs!(T1;@@Y}rfK zz23inKUt-}zh7PSt+LataLw(zL#_IE`W!sy!}YWAc6Qvk1-=fy+xn6Nto94r@9bar z`~AGwYP}Wm@Aof#k)WpaytB+Td+UvRo8yajyJa8nioM=lrtmxOdik~7w)x*4PnSC5 zVp08d%iYNgyj%ZFzipdSzWUqFk10D|W!~+b{9wAwskUwR7IV5?-evy!@6y-Zcl9Ue z#LwRK`=9u!;&~naA52}jtMFyCU%KL+XQ2%{KeX&QXw5czv*YqwGvAg^LjGs0W$XTG zm&gBqAzQWUR^y*fpXYZUwcp>r_m8K*IsT%Ti~X(&Vo#t{7nS&=|NC?O(-MOv2Y_a) zmbgZgq$HN4S|t~y0x1R~10z#i12bJCix2}ND-$y-Qv+=S11kfA7jt!;Q8eV{r(~v8 r;?^+pz|{Xh4H|G8N-}d(i%Sx73vlZ>cXf*bP!EHrtDnm{r-UW|bPCK& literal 0 HcmV?d00001 diff --git a/sprites/spr_cata_gorget/spr_cata_gorget.yy b/sprites/spr_cata_gorget/spr_cata_gorget.yy new file mode 100644 index 0000000000..8df3fe81b7 --- /dev/null +++ b/sprites/spr_cata_gorget/spr_cata_gorget.yy @@ -0,0 +1,92 @@ +{ + "$GMSprite":"v2", + "%Name":"spr_cata_gorget", + "bboxMode":0, + "bbox_bottom":71, + "bbox_left":56, + "bbox_right":114, + "bbox_top":39, + "collisionKind":1, + "collisionTolerance":0, + "DynamicTexturePage":false, + "edgeFiltering":false, + "For3D":false, + "frames":[ + {"$GMSpriteFrame":"v1","%Name":"d14dc785-21d1-4e15-ad83-2b38fa9a79f7","name":"d14dc785-21d1-4e15-ad83-2b38fa9a79f7","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + ], + "gridX":0, + "gridY":0, + "height":232, + "HTile":false, + "layers":[ + {"$GMImageLayer":"","%Name":"fe0dd4fc-c973-4418-9c16-c69e04260f36","blendMode":0,"displayName":"default","isLocked":false,"name":"fe0dd4fc-c973-4418-9c16-c69e04260f36","opacity":100.0,"resourceType":"GMImageLayer","resourceVersion":"2.0","visible":true,}, + ], + "name":"spr_cata_gorget", + "nineSlice":null, + "origin":0, + "parent":{ + "name":"cata_complex", + "path":"folders/Sprites/Marine Viewer/body_types/cata_complex.yy", + }, + "preMultiplyAlpha":false, + "resourceType":"GMSprite", + "resourceVersion":"2.0", + "sequence":{ + "$GMSequence":"v1", + "%Name":"spr_cata_gorget", + "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_cata_gorget", + "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":"d14dc785-21d1-4e15-ad83-2b38fa9a79f7","path":"sprites/spr_cata_gorget/spr_cata_gorget.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"9025f767-32aa-41d1-b84d-9c8e405bc766","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":0.5, + "textureGroupId":{ + "name":"Default", + "path":"texturegroups/Default", + }, + "type":0, + "VTile":false, + "width":167, +} \ No newline at end of file diff --git a/sprites/spr_cata_head/cc1bb055-3092-4530-9edd-694aca0796a7.png b/sprites/spr_cata_head/cc1bb055-3092-4530-9edd-694aca0796a7.png new file mode 100644 index 0000000000000000000000000000000000000000..3fea25957307e4532187d829eae652a6ee6d1b3d GIT binary patch literal 1110 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 L`njxgN@xNAN`<;M literal 0 HcmV?d00001 diff --git a/sprites/spr_cata_head/layers/cc1bb055-3092-4530-9edd-694aca0796a7/1875f065-a467-43e5-b1cb-779c58891acc.png b/sprites/spr_cata_head/layers/cc1bb055-3092-4530-9edd-694aca0796a7/1875f065-a467-43e5-b1cb-779c58891acc.png new file mode 100644 index 0000000000000000000000000000000000000000..3fea25957307e4532187d829eae652a6ee6d1b3d GIT binary patch literal 1110 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 L`njxgN@xNAN`<;M literal 0 HcmV?d00001 diff --git a/sprites/spr_cata_head/spr_cata_head.yy b/sprites/spr_cata_head/spr_cata_head.yy new file mode 100644 index 0000000000..5e8f0e23e2 --- /dev/null +++ b/sprites/spr_cata_head/spr_cata_head.yy @@ -0,0 +1,96 @@ +{ + "$GMSprite":"v2", + "%Name":"spr_cata_head", + "bboxMode":0, + "bbox_bottom":38, + "bbox_left":67, + "bbox_right":103, + "bbox_top":14, + "collisionKind":1, + "collisionTolerance":0, + "DynamicTexturePage":false, + "edgeFiltering":false, + "For3D":false, + "frames":[ + {"$GMSpriteFrame":"v1","%Name":"cc1bb055-3092-4530-9edd-694aca0796a7","name":"cc1bb055-3092-4530-9edd-694aca0796a7","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"df8d27d6-66e9-4750-b0dc-950fe74d3e9f","name":"df8d27d6-66e9-4750-b0dc-950fe74d3e9f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + ], + "gridX":0, + "gridY":0, + "height":232, + "HTile":false, + "layers":[ + {"$GMImageLayer":"","%Name":"1875f065-a467-43e5-b1cb-779c58891acc","blendMode":0,"displayName":"default","isLocked":false,"name":"1875f065-a467-43e5-b1cb-779c58891acc","opacity":100.0,"resourceType":"GMImageLayer","resourceVersion":"2.0","visible":true,}, + ], + "name":"spr_cata_head", + "nineSlice":null, + "origin":0, + "parent":{ + "name":"cata_complex", + "path":"folders/Sprites/Marine Viewer/body_types/cata_complex.yy", + }, + "preMultiplyAlpha":false, + "resourceType":"GMSprite", + "resourceVersion":"2.0", + "sequence":{ + "$GMSequence":"v1", + "%Name":"spr_cata_head", + "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_cata_head", + "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":"cc1bb055-3092-4530-9edd-694aca0796a7","path":"sprites/spr_cata_head/spr_cata_head.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"069ee915-10c4-4346-a73b-1cf1afb569e8","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"df8d27d6-66e9-4750-b0dc-950fe74d3e9f","path":"sprites/spr_cata_head/spr_cata_head.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"eb49f865-1ead-49e0-8353-ad11bf319dda","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":0.5, + "textureGroupId":{ + "name":"Default", + "path":"texturegroups/Default", + }, + "type":0, + "VTile":false, + "width":167, +} \ No newline at end of file diff --git a/sprites/spr_cata_heavy_toe_left/8bcf2914-6d8f-4dbe-bdee-bd24eba4637f.png b/sprites/spr_cata_heavy_toe_left/8bcf2914-6d8f-4dbe-bdee-bd24eba4637f.png new file mode 100644 index 0000000000000000000000000000000000000000..af06873a052c2d0b946f3ba59e4a97c6087356af GIT binary patch literal 627 zcmeAS@N?(olHy`uVBq!ia0vp^%Ypa>2OE&=lK2t|q!f}pf_xbms?-=58d?|_egTCV zUNA6}8Za=tN?>5Hn!&&zUNC1@pbb!hEy>&6h2cL4F4((#G6Mr+nx~6nNX4zU*AM0% zRuEyhFn?8h-^IjD?$1xCuGm-6_vT^Z9@qXa7o3B;&6au?hPbz6^5J9o!*-twnHg0D-TzN|U(ap%v6N zc-#N}k503*CKb!9447`+7at}5=Ykc(@0rV0pJl!@yLW1SvCQpc~>+Bg+s& zLn{+QD^pW#0|P4qgKJkcptHiBgdFNgZpau=N4JDbmsl_FUxdpiOe3&!m QIw&SRUHx3vIVCg!01f!P_W%F@ literal 0 HcmV?d00001 diff --git a/sprites/spr_cata_heavy_toe_left/layers/8bcf2914-6d8f-4dbe-bdee-bd24eba4637f/b190c650-f0be-4b86-9abb-b96698d6b9ef.png b/sprites/spr_cata_heavy_toe_left/layers/8bcf2914-6d8f-4dbe-bdee-bd24eba4637f/b190c650-f0be-4b86-9abb-b96698d6b9ef.png new file mode 100644 index 0000000000000000000000000000000000000000..af06873a052c2d0b946f3ba59e4a97c6087356af GIT binary patch literal 627 zcmeAS@N?(olHy`uVBq!ia0vp^%Ypa>2OE&=lK2t|q!f}pf_xbms?-=58d?|_egTCV zUNA6}8Za=tN?>5Hn!&&zUNC1@pbb!hEy>&6h2cL4F4((#G6Mr+nx~6nNX4zU*AM0% zRuEyhFn?8h-^IjD?$1xCuGm-6_vT^Z9@qXa7o3B;&6au?hPbz6^5J9o!*-twnHg0D-TzN|U(ap%v6N zc-#N}k503*CKb!9447`+7at}5=Ykc(@0rV0pJl!@yLW1SvCQpc~>+Bg+s& zLn{+QD^pW#0|P4qgKJkcptHiBgdFNgZpau=N4JDbmsl_FUxdpiOe3&!m QIw&SRUHx3vIVCg!01f!P_W%F@ literal 0 HcmV?d00001 diff --git a/sprites/spr_cata_heavy_toe_left/spr_cata_heavy_toe_left.yy b/sprites/spr_cata_heavy_toe_left/spr_cata_heavy_toe_left.yy new file mode 100644 index 0000000000..4ada33c507 --- /dev/null +++ b/sprites/spr_cata_heavy_toe_left/spr_cata_heavy_toe_left.yy @@ -0,0 +1,92 @@ +{ + "$GMSprite":"v2", + "%Name":"spr_cata_heavy_toe_left", + "bboxMode":0, + "bbox_bottom":230, + "bbox_left":104, + "bbox_right":151, + "bbox_top":221, + "collisionKind":1, + "collisionTolerance":0, + "DynamicTexturePage":false, + "edgeFiltering":false, + "For3D":false, + "frames":[ + {"$GMSpriteFrame":"v1","%Name":"8bcf2914-6d8f-4dbe-bdee-bd24eba4637f","name":"8bcf2914-6d8f-4dbe-bdee-bd24eba4637f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + ], + "gridX":0, + "gridY":0, + "height":232, + "HTile":false, + "layers":[ + {"$GMImageLayer":"","%Name":"b190c650-f0be-4b86-9abb-b96698d6b9ef","blendMode":0,"displayName":"default","isLocked":false,"name":"b190c650-f0be-4b86-9abb-b96698d6b9ef","opacity":100.0,"resourceType":"GMImageLayer","resourceVersion":"2.0","visible":true,}, + ], + "name":"spr_cata_heavy_toe_left", + "nineSlice":null, + "origin":0, + "parent":{ + "name":"cata_complex", + "path":"folders/Sprites/Marine Viewer/body_types/cata_complex.yy", + }, + "preMultiplyAlpha":false, + "resourceType":"GMSprite", + "resourceVersion":"2.0", + "sequence":{ + "$GMSequence":"v1", + "%Name":"spr_cata_heavy_toe_left", + "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_cata_heavy_toe_left", + "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":"8bcf2914-6d8f-4dbe-bdee-bd24eba4637f","path":"sprites/spr_cata_heavy_toe_left/spr_cata_heavy_toe_left.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"a8eb0e58-24d5-4dad-989b-5d0e545d216e","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":0.5, + "textureGroupId":{ + "name":"Default", + "path":"texturegroups/Default", + }, + "type":0, + "VTile":false, + "width":167, +} \ No newline at end of file diff --git a/sprites/spr_cata_heavy_toe_right/8bcf2914-6d8f-4dbe-bdee-bd24eba4637f.png b/sprites/spr_cata_heavy_toe_right/8bcf2914-6d8f-4dbe-bdee-bd24eba4637f.png new file mode 100644 index 0000000000000000000000000000000000000000..9a6c928a8776b005d8f667ca596978ec163f0b10 GIT binary patch literal 627 zcmeAS@N?(olHy`uVBq!ia0vp^%Ypa>2OE&=lK2t|q!f}pf_xbms?-=58d?|_egTCV zUNA6}8Za=tN?>5Hn!&&zUNC1@pbb!hEy>&6h2cL4F4((#G6Mr+nx~6nNX4zUHxA}D z8;Gzy*dMBYw<&Rx`?C|OD`I9SR~z^od(kU5`%*|&sXe;{EK8)Y_;$;ySnuk z=YIC}p7;Lm7CyjN%W&E=eff=`$P2(QQ!R0gC`m~yNwrEYN(E93Mg~Tvx&~&tMwTIl zhE^tqR>mgU1_o9J2HVcCx1(st%}>cptHiD0_{9CzKn)sj8%i>BQ;SOya|>|mnb0!t Q2`DB#UHx3vIVCg!0Bdl(N&o-= literal 0 HcmV?d00001 diff --git a/sprites/spr_cata_heavy_toe_right/layers/8bcf2914-6d8f-4dbe-bdee-bd24eba4637f/b190c650-f0be-4b86-9abb-b96698d6b9ef.png b/sprites/spr_cata_heavy_toe_right/layers/8bcf2914-6d8f-4dbe-bdee-bd24eba4637f/b190c650-f0be-4b86-9abb-b96698d6b9ef.png new file mode 100644 index 0000000000000000000000000000000000000000..9a6c928a8776b005d8f667ca596978ec163f0b10 GIT binary patch literal 627 zcmeAS@N?(olHy`uVBq!ia0vp^%Ypa>2OE&=lK2t|q!f}pf_xbms?-=58d?|_egTCV zUNA6}8Za=tN?>5Hn!&&zUNC1@pbb!hEy>&6h2cL4F4((#G6Mr+nx~6nNX4zUHxA}D z8;Gzy*dMBYw<&Rx`?C|OD`I9SR~z^od(kU5`%*|&sXe;{EK8)Y_;$;ySnuk z=YIC}p7;Lm7CyjN%W&E=eff=`$P2(QQ!R0gC`m~yNwrEYN(E93Mg~Tvx&~&tMwTIl zhE^tqR>mgU1_o9J2HVcCx1(st%}>cptHiD0_{9CzKn)sj8%i>BQ;SOya|>|mnb0!t Q2`DB#UHx3vIVCg!0Bdl(N&o-= literal 0 HcmV?d00001 diff --git a/sprites/spr_cata_heavy_toe_right/spr_cata_heavy_toe_right.yy b/sprites/spr_cata_heavy_toe_right/spr_cata_heavy_toe_right.yy new file mode 100644 index 0000000000..9a1dfa67d1 --- /dev/null +++ b/sprites/spr_cata_heavy_toe_right/spr_cata_heavy_toe_right.yy @@ -0,0 +1,92 @@ +{ + "$GMSprite":"v2", + "%Name":"spr_cata_heavy_toe_right", + "bboxMode":0, + "bbox_bottom":230, + "bbox_left":15, + "bbox_right":62, + "bbox_top":221, + "collisionKind":1, + "collisionTolerance":0, + "DynamicTexturePage":false, + "edgeFiltering":false, + "For3D":false, + "frames":[ + {"$GMSpriteFrame":"v1","%Name":"8bcf2914-6d8f-4dbe-bdee-bd24eba4637f","name":"8bcf2914-6d8f-4dbe-bdee-bd24eba4637f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + ], + "gridX":0, + "gridY":0, + "height":232, + "HTile":false, + "layers":[ + {"$GMImageLayer":"","%Name":"b190c650-f0be-4b86-9abb-b96698d6b9ef","blendMode":0,"displayName":"default","isLocked":false,"name":"b190c650-f0be-4b86-9abb-b96698d6b9ef","opacity":100.0,"resourceType":"GMImageLayer","resourceVersion":"2.0","visible":true,}, + ], + "name":"spr_cata_heavy_toe_right", + "nineSlice":null, + "origin":0, + "parent":{ + "name":"cata_complex", + "path":"folders/Sprites/Marine Viewer/body_types/cata_complex.yy", + }, + "preMultiplyAlpha":false, + "resourceType":"GMSprite", + "resourceVersion":"2.0", + "sequence":{ + "$GMSequence":"v1", + "%Name":"spr_cata_heavy_toe_right", + "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_cata_heavy_toe_right", + "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":"8bcf2914-6d8f-4dbe-bdee-bd24eba4637f","path":"sprites/spr_cata_heavy_toe_right/spr_cata_heavy_toe_right.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"a8eb0e58-24d5-4dad-989b-5d0e545d216e","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":0.5, + "textureGroupId":{ + "name":"Default", + "path":"texturegroups/Default", + }, + "type":0, + "VTile":false, + "width":167, +} \ No newline at end of file diff --git a/sprites/spr_cata_left_arm/376c95d6-eabe-4c9b-b707-0d65fbbf0454.png b/sprites/spr_cata_left_arm/376c95d6-eabe-4c9b-b707-0d65fbbf0454.png new file mode 100644 index 0000000000000000000000000000000000000000..0baca51e9eaa0d7fabe8ee8eec5fe0fe8f217426 GIT binary patch literal 1225 zcmeAS@N?(olHy`uVBq!ia0vp^%Ypa>2OE&=lK2t|q!f}pf_xbms?-=58d?|_egTCV zUNA6}8Za=tN?>5Hn!&&zUNC1@pbb!hEy>&6h2cL4F4((#G6Mti9#0p?kcwMx@A~I0 z_7Guz;C?=5m%hQI_Y*(=5W2U0(|5&V&p+DknZaF>zig)KfrF_UTs{B4e5jqIdc3hq z`0tlh6%E3SK!XW`4Ov$=-)GQYu6N^^;!Z(7y+aZ6zb&>7nSJ+X=BEGGJAT}>`LC?> zZ|~Dy&gWHE1yd7cf^y5mf159i)d{Y*d!K)J@*SB|pB=b+CMwT)9dzG1;G^I_*Hz04 z)*X*+x*1uo=Vvi_~$*!bIzD0X8kuzuX*@HZ_=xkMUz7B{$@~fe){C8@2T0wF0X?^XWw0N zc}C{ey&pwhtk;z0R!>*GTzB8><FVVLLV|}Cy_v%|vAif@;u93Snr8lb zpVH-DRRpt^1SZuR43bZ|lliY*2n^ zXWZs@pCvh-{66sP{^a%i!G|)>o}Bt?i~X0q_h!!8eb3l=@9|QHZeY;QwSS(W(32_f zd)rCY&F8n-z2#rZ?r~^m-b?nv+~<5#40l)Unm0Mg_v-A;udi@P3m)>^Ssij!=i!o9 zGB0HEq*k8U7WufZjJsv>bk#XNpH7r6FEH}F^m@+S!#av{TvD#hy_$BtHm6{&51I**YCZ0uh~Q(;9<(7d(2Zd{=VMLwvXpU#@8*+RI)XuES| z<@t-lPjIWR%wt_`y)Y+!y>i~alKw@?)oWFX{&n>Slrcwt-4nKE=ArIczYckxvsb>q zUd_g?{1?xQ;Bz*PtKL;#S^oF_-1YhvQO_qHdndi?#Ny1k)0Y-~^2t=4>K^CyzDk&I zJ|R}cga6O$cTY62C@neJ0Mw&e;u=wsl30>zm0Xkxq!^40j7)V6%yf+`Lktb9jLoe~ z47CjmtPBjqo90%aXvob^$xN%nts(8c>Jgv@4Y&;@nYpROC5gEOxb+yGVvz>wVeoYI Kb6Mw<&;$U^1O=l2 literal 0 HcmV?d00001 diff --git a/sprites/spr_cata_left_arm/layers/376c95d6-eabe-4c9b-b707-0d65fbbf0454/97c3abbf-8ea9-4634-b6cd-e3687ebbebb5.png b/sprites/spr_cata_left_arm/layers/376c95d6-eabe-4c9b-b707-0d65fbbf0454/97c3abbf-8ea9-4634-b6cd-e3687ebbebb5.png new file mode 100644 index 0000000000000000000000000000000000000000..0baca51e9eaa0d7fabe8ee8eec5fe0fe8f217426 GIT binary patch literal 1225 zcmeAS@N?(olHy`uVBq!ia0vp^%Ypa>2OE&=lK2t|q!f}pf_xbms?-=58d?|_egTCV zUNA6}8Za=tN?>5Hn!&&zUNC1@pbb!hEy>&6h2cL4F4((#G6Mti9#0p?kcwMx@A~I0 z_7Guz;C?=5m%hQI_Y*(=5W2U0(|5&V&p+DknZaF>zig)KfrF_UTs{B4e5jqIdc3hq z`0tlh6%E3SK!XW`4Ov$=-)GQYu6N^^;!Z(7y+aZ6zb&>7nSJ+X=BEGGJAT}>`LC?> zZ|~Dy&gWHE1yd7cf^y5mf159i)d{Y*d!K)J@*SB|pB=b+CMwT)9dzG1;G^I_*Hz04 z)*X*+x*1uo=Vvi_~$*!bIzD0X8kuzuX*@HZ_=xkMUz7B{$@~fe){C8@2T0wF0X?^XWw0N zc}C{ey&pwhtk;z0R!>*GTzB8><FVVLLV|}Cy_v%|vAif@;u93Snr8lb zpVH-DRRpt^1SZuR43bZ|lliY*2n^ zXWZs@pCvh-{66sP{^a%i!G|)>o}Bt?i~X0q_h!!8eb3l=@9|QHZeY;QwSS(W(32_f zd)rCY&F8n-z2#rZ?r~^m-b?nv+~<5#40l)Unm0Mg_v-A;udi@P3m)>^Ssij!=i!o9 zGB0HEq*k8U7WufZjJsv>bk#XNpH7r6FEH}F^m@+S!#av{TvD#hy_$BtHm6{&51I**YCZ0uh~Q(;9<(7d(2Zd{=VMLwvXpU#@8*+RI)XuES| z<@t-lPjIWR%wt_`y)Y+!y>i~alKw@?)oWFX{&n>Slrcwt-4nKE=ArIczYckxvsb>q zUd_g?{1?xQ;Bz*PtKL;#S^oF_-1YhvQO_qHdndi?#Ny1k)0Y-~^2t=4>K^CyzDk&I zJ|R}cga6O$cTY62C@neJ0Mw&e;u=wsl30>zm0Xkxq!^40j7)V6%yf+`Lktb9jLoe~ z47CjmtPBjqo90%aXvob^$xN%nts(8c>Jgv@4Y&;@nYpROC5gEOxb+yGVvz>wVeoYI Kb6Mw<&;$U^1O=l2 literal 0 HcmV?d00001 diff --git a/sprites/spr_cata_left_arm/spr_cata_left_arm.yy b/sprites/spr_cata_left_arm/spr_cata_left_arm.yy new file mode 100644 index 0000000000..7928892304 --- /dev/null +++ b/sprites/spr_cata_left_arm/spr_cata_left_arm.yy @@ -0,0 +1,92 @@ +{ + "$GMSprite":"v2", + "%Name":"spr_cata_left_arm", + "bboxMode":0, + "bbox_bottom":115, + "bbox_left":122, + "bbox_right":162, + "bbox_top":59, + "collisionKind":1, + "collisionTolerance":0, + "DynamicTexturePage":false, + "edgeFiltering":false, + "For3D":false, + "frames":[ + {"$GMSpriteFrame":"v1","%Name":"376c95d6-eabe-4c9b-b707-0d65fbbf0454","name":"376c95d6-eabe-4c9b-b707-0d65fbbf0454","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + ], + "gridX":0, + "gridY":0, + "height":232, + "HTile":false, + "layers":[ + {"$GMImageLayer":"","%Name":"97c3abbf-8ea9-4634-b6cd-e3687ebbebb5","blendMode":0,"displayName":"default","isLocked":false,"name":"97c3abbf-8ea9-4634-b6cd-e3687ebbebb5","opacity":100.0,"resourceType":"GMImageLayer","resourceVersion":"2.0","visible":true,}, + ], + "name":"spr_cata_left_arm", + "nineSlice":null, + "origin":0, + "parent":{ + "name":"cata_complex", + "path":"folders/Sprites/Marine Viewer/body_types/cata_complex.yy", + }, + "preMultiplyAlpha":false, + "resourceType":"GMSprite", + "resourceVersion":"2.0", + "sequence":{ + "$GMSequence":"v1", + "%Name":"spr_cata_left_arm", + "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_cata_left_arm", + "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":"376c95d6-eabe-4c9b-b707-0d65fbbf0454","path":"sprites/spr_cata_left_arm/spr_cata_left_arm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"e66bc47f-42d9-4c67-ada4-f9e8c4151c7d","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":0.5, + "textureGroupId":{ + "name":"Default", + "path":"texturegroups/Default", + }, + "type":0, + "VTile":false, + "width":167, +} \ No newline at end of file diff --git a/sprites/spr_cata_left_armtrim/1decac37-9470-4e2d-996d-51927189e93e.png b/sprites/spr_cata_left_armtrim/1decac37-9470-4e2d-996d-51927189e93e.png new file mode 100644 index 0000000000000000000000000000000000000000..e3d59895a8ceea7ea017a197b63378505b6f1445 GIT binary patch literal 664 zcmeAS@N?(olHy`uVBq!ia0vp^%Ypa>2OE&=lK2t|q!f}pf_xbms?-=58d?|_egTCV zUNA6}8Za=tN?>5Hn!&&zUNC1@pbb!hEy>&6h2cL4F4((#G6Mr+x2KC^NX4zUH#g=U za*$|y*sl@#%*ll3po|Gih7G&(1(!8bZ)I+HG=XEsVLlGqewXGFc8~RS#br!D(?|p# zPTYF@dTrXr*L(Nd`mfI2)*d@aC;akxmC2WQQtKmJLIWeDJ8{Ns__bf6z z_4l~d=bO8JH6J}`d3W!rRl(nDw!LGjTOaw};Yj_8U0-I;>B-wUt8DV-45seMO4tAO zzhRvjVzbNVi08uML_WckwmS{Wugm#AUv75tgX6cEb3~%oEt_0(KS?V0z|1)@kJr2R z-C`us)5I!oaR1J_MBgs{SIU_*pdQr{*NBpo#FA92=A+ge}M? Mp00i_>zopr0FArRu>b%7 literal 0 HcmV?d00001 diff --git a/sprites/spr_cata_left_armtrim/layers/1decac37-9470-4e2d-996d-51927189e93e/fd443310-bc6c-42e5-a251-16624f2f84bf.png b/sprites/spr_cata_left_armtrim/layers/1decac37-9470-4e2d-996d-51927189e93e/fd443310-bc6c-42e5-a251-16624f2f84bf.png new file mode 100644 index 0000000000000000000000000000000000000000..e3d59895a8ceea7ea017a197b63378505b6f1445 GIT binary patch literal 664 zcmeAS@N?(olHy`uVBq!ia0vp^%Ypa>2OE&=lK2t|q!f}pf_xbms?-=58d?|_egTCV zUNA6}8Za=tN?>5Hn!&&zUNC1@pbb!hEy>&6h2cL4F4((#G6Mr+x2KC^NX4zUH#g=U za*$|y*sl@#%*ll3po|Gih7G&(1(!8bZ)I+HG=XEsVLlGqewXGFc8~RS#br!D(?|p# zPTYF@dTrXr*L(Nd`mfI2)*d@aC;akxmC2WQQtKmJLIWeDJ8{Ns__bf6z z_4l~d=bO8JH6J}`d3W!rRl(nDw!LGjTOaw};Yj_8U0-I;>B-wUt8DV-45seMO4tAO zzhRvjVzbNVi08uML_WckwmS{Wugm#AUv75tgX6cEb3~%oEt_0(KS?V0z|1)@kJr2R z-C`us)5I!oaR1J_MBgs{SIU_*pdQr{*NBpo#FA92=A+ge}M? Mp00i_>zopr0FArRu>b%7 literal 0 HcmV?d00001 diff --git a/sprites/spr_cata_left_armtrim/spr_cata_left_armtrim.yy b/sprites/spr_cata_left_armtrim/spr_cata_left_armtrim.yy new file mode 100644 index 0000000000..03318887bb --- /dev/null +++ b/sprites/spr_cata_left_armtrim/spr_cata_left_armtrim.yy @@ -0,0 +1,92 @@ +{ + "$GMSprite":"v2", + "%Name":"spr_cata_left_armtrim", + "bboxMode":0, + "bbox_bottom":94, + "bbox_left":135, + "bbox_right":156, + "bbox_top":78, + "collisionKind":1, + "collisionTolerance":0, + "DynamicTexturePage":false, + "edgeFiltering":false, + "For3D":false, + "frames":[ + {"$GMSpriteFrame":"v1","%Name":"1decac37-9470-4e2d-996d-51927189e93e","name":"1decac37-9470-4e2d-996d-51927189e93e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + ], + "gridX":0, + "gridY":0, + "height":232, + "HTile":false, + "layers":[ + {"$GMImageLayer":"","%Name":"fd443310-bc6c-42e5-a251-16624f2f84bf","blendMode":0,"displayName":"default","isLocked":false,"name":"fd443310-bc6c-42e5-a251-16624f2f84bf","opacity":100.0,"resourceType":"GMImageLayer","resourceVersion":"2.0","visible":true,}, + ], + "name":"spr_cata_left_armtrim", + "nineSlice":null, + "origin":0, + "parent":{ + "name":"cata_complex", + "path":"folders/Sprites/Marine Viewer/body_types/cata_complex.yy", + }, + "preMultiplyAlpha":false, + "resourceType":"GMSprite", + "resourceVersion":"2.0", + "sequence":{ + "$GMSequence":"v1", + "%Name":"spr_cata_left_armtrim", + "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_cata_left_armtrim", + "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":"1decac37-9470-4e2d-996d-51927189e93e","path":"sprites/spr_cata_left_armtrim/spr_cata_left_armtrim.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"d1589904-03a8-4827-ac74-26acce06d111","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":0.5, + "textureGroupId":{ + "name":"Default", + "path":"texturegroups/Default", + }, + "type":0, + "VTile":false, + "width":167, +} \ No newline at end of file diff --git a/sprites/spr_cata_left_knee/7d4772f4-ee86-4983-82a3-4b22204b7345.png b/sprites/spr_cata_left_knee/7d4772f4-ee86-4983-82a3-4b22204b7345.png new file mode 100644 index 0000000000000000000000000000000000000000..fc5f609d3c8571a7c80880a3ecb0e23a58e7802a GIT binary patch literal 1406 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":"", + "Keyframes":[], + "resourceType":"KeyframeStore", + "resourceVersion":"2.0", + }, + "eventStubScript":null, + "eventToFunction":{}, + "length":1.0, + "lockOrigin":false, + "moments":{ + "$KeyframeStore":"", + "Keyframes":[], + "resourceType":"KeyframeStore", + "resourceVersion":"2.0", + }, + "name":"spr_cata_left_knee", + "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":"7d4772f4-ee86-4983-82a3-4b22204b7345","path":"sprites/spr_cata_left_knee/spr_cata_left_knee.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"b1247465-eefa-4366-af6b-4a8eb1b39fb4","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":0.5, + "textureGroupId":{ + "name":"Default", + "path":"texturegroups/Default", + }, + "type":0, + "VTile":false, + "width":167, +} \ No newline at end of file diff --git a/sprites/spr_cata_left_leg/30845d03-5630-4ea2-b874-e43d1c591f74.png b/sprites/spr_cata_left_leg/30845d03-5630-4ea2-b874-e43d1c591f74.png new file mode 100644 index 0000000000000000000000000000000000000000..75a3f6e4e11fce8de4e986edf41f2f6ea5faf0f8 GIT binary patch literal 1623 zcmb`Hdpy%?9LIm^MWH*Lp%lv9G-NGzHJ1%zSm`#T(P*~J-D@|-zxzquZGf*L^{UPXj8Y6DyaW9JfNBB&DQN((tUOAY27m+z0K5$Y0Ea>V0Fl^t z&`wH++G!szIPmpbFKg%L0)Q$K0e27nQ6hWklT&g;TkZ7-q9#!H%8~5}k*t?MDf>L=?QvGGZ$}JCcOeHLr7W zSN+vZ@#<0+MqRP_N@*A3Mu=e4oUQoeTKy@bS1K$SZrvjnROX6fOXS+AMq_)yW99wV zSP3hfE&(klyE!OJl5W>(nCY5$7`8~A4a+xTJ5kR{A}Z*7(tAWH3+mC?Q0BJD*^7vgvqBC3%j41%>1?G7NOePH+|s?wSnw{^=@ElC`E zQ-lE-XiDXEuRe=CU=&V_kBz}>NdsDV2^0s^zu4v&RNPNL%d{s>|6^=2Ss6=+(E9*w~ zcT|_lPF%nQHWRt=hp@0Di~PF8CQ*`xG~1)D#`FIE!OIb?1a2)=L+UaY*V(8tnC-!| z(A~ENt3R7)+c6(tf~_@T6RqpD-uGC$9&PV%@>(1~*-Dikm%y3*Y}L=TA+qC{+1J_> zii!T1%&gJp=X|8sk8^dOVK|q1ZqM!bNc5xn8|RTj^=?F&f3cjjME4oit2pm-DrJ%8 z2M)XOYFGqEIMYI(UqiXP61fU3Pg=;bnOSx;v7g%YPWsHVAX=AsN$(}$a{dN+>*{XUV$AK84D)2ctA_t^aj(jp4G zl!w@N1It2T=GtV?UuX@GmiqXs@@O#I@reM>9IDf0#@wvD^M*1k1Xm=Wf?-LOK`>t1 zrbyr2eRne4L+%Sc^p%jNd={mcq&A69GpRUncdmr!CZ1+w_RDbQ<4(*Mb5*X~o z;Dh932eYd~^nS$TfNHY*>k)4BxUo{}Dq4aB|->h{OW z$SQYmGbuJ;!@?s!h2Z+1uDrc$fwL7SSuQPXJsA475Y#15IbXxd=%pk-_ybL6Y-ku< zhPIt--tp*YzlmQG-_g!MQq7d`9yYlL{Olhk$8K+kiybfuHFf5Ri^%C`Q%}pZLZ;j7 zXUmP*{|=l5KKWIoh5FF)ZW7OXUUvxw+H#?tcIR@eDqa@_nGw{lhvXVD`@q@puA`93M^~eV@q>e)e3+ O00<8hy#7$wPk#ejV9hB2 literal 0 HcmV?d00001 diff --git a/sprites/spr_cata_left_leg/layers/30845d03-5630-4ea2-b874-e43d1c591f74/c2171e14-c3fe-4232-ba2e-e302118f9cc4.png b/sprites/spr_cata_left_leg/layers/30845d03-5630-4ea2-b874-e43d1c591f74/c2171e14-c3fe-4232-ba2e-e302118f9cc4.png new file mode 100644 index 0000000000000000000000000000000000000000..75a3f6e4e11fce8de4e986edf41f2f6ea5faf0f8 GIT binary patch literal 1623 zcmb`Hdpy%?9LIm^MWH*Lp%lv9G-NGzHJ1%zSm`#T(P*~J-D@|-zxzquZGf*L^{UPXj8Y6DyaW9JfNBB&DQN((tUOAY27m+z0K5$Y0Ea>V0Fl^t z&`wH++G!szIPmpbFKg%L0)Q$K0e27nQ6hWklT&g;TkZ7-q9#!H%8~5}k*t?MDf>L=?QvGGZ$}JCcOeHLr7W zSN+vZ@#<0+MqRP_N@*A3Mu=e4oUQoeTKy@bS1K$SZrvjnROX6fOXS+AMq_)yW99wV zSP3hfE&(klyE!OJl5W>(nCY5$7`8~A4a+xTJ5kR{A}Z*7(tAWH3+mC?Q0BJD*^7vgvqBC3%j41%>1?G7NOePH+|s?wSnw{^=@ElC`E zQ-lE-XiDXEuRe=CU=&V_kBz}>NdsDV2^0s^zu4v&RNPNL%d{s>|6^=2Ss6=+(E9*w~ zcT|_lPF%nQHWRt=hp@0Di~PF8CQ*`xG~1)D#`FIE!OIb?1a2)=L+UaY*V(8tnC-!| z(A~ENt3R7)+c6(tf~_@T6RqpD-uGC$9&PV%@>(1~*-Dikm%y3*Y}L=TA+qC{+1J_> zii!T1%&gJp=X|8sk8^dOVK|q1ZqM!bNc5xn8|RTj^=?F&f3cjjME4oit2pm-DrJ%8 z2M)XOYFGqEIMYI(UqiXP61fU3Pg=;bnOSx;v7g%YPWsHVAX=AsN$(}$a{dN+>*{XUV$AK84D)2ctA_t^aj(jp4G zl!w@N1It2T=GtV?UuX@GmiqXs@@O#I@reM>9IDf0#@wvD^M*1k1Xm=Wf?-LOK`>t1 zrbyr2eRne4L+%Sc^p%jNd={mcq&A69GpRUncdmr!CZ1+w_RDbQ<4(*Mb5*X~o z;Dh932eYd~^nS$TfNHY*>k)4BxUo{}Dq4aB|->h{OW z$SQYmGbuJ;!@?s!h2Z+1uDrc$fwL7SSuQPXJsA475Y#15IbXxd=%pk-_ybL6Y-ku< zhPIt--tp*YzlmQG-_g!MQq7d`9yYlL{Olhk$8K+kiybfuHFf5Ri^%C`Q%}pZLZ;j7 zXUmP*{|=l5KKWIoh5FF)ZW7OXUUvxw+H#?tcIR@eDqa@_nGw{lhvXVD`@q@puA`93M^~eV@q>e)e3+ O00<8hy#7$wPk#ejV9hB2 literal 0 HcmV?d00001 diff --git a/sprites/spr_cata_left_leg/spr_cata_left_leg.yy b/sprites/spr_cata_left_leg/spr_cata_left_leg.yy new file mode 100644 index 0000000000..79a9d4b091 --- /dev/null +++ b/sprites/spr_cata_left_leg/spr_cata_left_leg.yy @@ -0,0 +1,92 @@ +{ + "$GMSprite":"v2", + "%Name":"spr_cata_left_leg", + "bboxMode":0, + "bbox_bottom":230, + "bbox_left":98, + "bbox_right":155, + "bbox_top":122, + "collisionKind":1, + "collisionTolerance":0, + "DynamicTexturePage":false, + "edgeFiltering":false, + "For3D":false, + "frames":[ + {"$GMSpriteFrame":"v1","%Name":"30845d03-5630-4ea2-b874-e43d1c591f74","name":"30845d03-5630-4ea2-b874-e43d1c591f74","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + ], + "gridX":0, + "gridY":0, + "height":232, + "HTile":false, + "layers":[ + {"$GMImageLayer":"","%Name":"c2171e14-c3fe-4232-ba2e-e302118f9cc4","blendMode":0,"displayName":"default","isLocked":false,"name":"c2171e14-c3fe-4232-ba2e-e302118f9cc4","opacity":100.0,"resourceType":"GMImageLayer","resourceVersion":"2.0","visible":true,}, + ], + "name":"spr_cata_left_leg", + "nineSlice":null, + "origin":0, + "parent":{ + "name":"cata_complex", + "path":"folders/Sprites/Marine Viewer/body_types/cata_complex.yy", + }, + "preMultiplyAlpha":false, + "resourceType":"GMSprite", + "resourceVersion":"2.0", + "sequence":{ + "$GMSequence":"v1", + "%Name":"spr_cata_left_leg", + "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_cata_left_leg", + "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":"30845d03-5630-4ea2-b874-e43d1c591f74","path":"sprites/spr_cata_left_leg/spr_cata_left_leg.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"47dd624a-04c1-4e99-81c2-ea31115a7ba0","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":0.5, + "textureGroupId":{ + "name":"Default", + "path":"texturegroups/Default", + }, + "type":0, + "VTile":false, + "width":167, +} \ No newline at end of file diff --git a/sprites/spr_cata_left_trim/1ce219cb-5d0f-4940-a300-ebea3cf690d4.png b/sprites/spr_cata_left_trim/1ce219cb-5d0f-4940-a300-ebea3cf690d4.png new file mode 100644 index 0000000000000000000000000000000000000000..371022e2b1e0d10247cdf601c8b9e33f0888c01a GIT binary patch literal 825 zcmeAS@N?(olHy`uVBq!ia0vp^%Ypa>2OE&=lK2t|q!f}pf_xbms?-=58d?|_egTCV zUNA6}8Za=tN?>5Hn!&&zUNC1@pbb!hEy>&6h2cL4F4((#G6MsXj;D)bNX4zUcN~Lm z8;CSKbU)2{W%pBsoQO#aPv;Z~ybGJZz}bB3#MsA2`gB)6`5o41aOBLN&n-`Ulz_$| zgM^*!d-WUEt1kUAul}yd*+<9rz5RRq!&e*oy?gC|_};JTBc5Af$ImhM5^Wft32FiE#r5u`< z=r&`{ksnv?SfAmTJehyB?7a1^bDs1GminCKD7?3KzjxKYwOMK_EM8j9<##=Aw7lbU zU$4*ERUMPFLJjw6CO?UNz4v)`)Fq%iuHTmf5*=x;RA1#?IFTVC;@pd6~ zLBo13E3ZX6yn{Dhxzba>alXOYC1ibD^=pI7^X00H=uV;{U*|LXs)uv$UE1NT3^Y}> z#5JNMC9x#cD!C{XNHG{07@6uCnCTi>h8UV#8CqJIm}wgrSQ!|+{H${aMMG|WN@iLm rZVfZmO-TT1(16=el9`)YT#}eufLqV`-COqq^)Pt4`njxgN@xNAML{Y= literal 0 HcmV?d00001 diff --git a/sprites/spr_cata_left_trim/layers/1ce219cb-5d0f-4940-a300-ebea3cf690d4/6fa1b1c6-652f-4092-84b5-fe6e33490587.png b/sprites/spr_cata_left_trim/layers/1ce219cb-5d0f-4940-a300-ebea3cf690d4/6fa1b1c6-652f-4092-84b5-fe6e33490587.png new file mode 100644 index 0000000000000000000000000000000000000000..371022e2b1e0d10247cdf601c8b9e33f0888c01a GIT binary patch literal 825 zcmeAS@N?(olHy`uVBq!ia0vp^%Ypa>2OE&=lK2t|q!f}pf_xbms?-=58d?|_egTCV zUNA6}8Za=tN?>5Hn!&&zUNC1@pbb!hEy>&6h2cL4F4((#G6MsXj;D)bNX4zUcN~Lm z8;CSKbU)2{W%pBsoQO#aPv;Z~ybGJZz}bB3#MsA2`gB)6`5o41aOBLN&n-`Ulz_$| zgM^*!d-WUEt1kUAul}yd*+<9rz5RRq!&e*oy?gC|_};JTBc5Af$ImhM5^Wft32FiE#r5u`< z=r&`{ksnv?SfAmTJehyB?7a1^bDs1GminCKD7?3KzjxKYwOMK_EM8j9<##=Aw7lbU zU$4*ERUMPFLJjw6CO?UNz4v)`)Fq%iuHTmf5*=x;RA1#?IFTVC;@pd6~ zLBo13E3ZX6yn{Dhxzba>alXOYC1ibD^=pI7^X00H=uV;{U*|LXs)uv$UE1NT3^Y}> z#5JNMC9x#cD!C{XNHG{07@6uCnCTi>h8UV#8CqJIm}wgrSQ!|+{H${aMMG|WN@iLm rZVfZmO-TT1(16=el9`)YT#}eufLqV`-COqq^)Pt4`njxgN@xNAML{Y= literal 0 HcmV?d00001 diff --git a/sprites/spr_cata_left_trim/spr_cata_left_trim.yy b/sprites/spr_cata_left_trim/spr_cata_left_trim.yy new file mode 100644 index 0000000000..341b317350 --- /dev/null +++ b/sprites/spr_cata_left_trim/spr_cata_left_trim.yy @@ -0,0 +1,92 @@ +{ + "$GMSprite":"v2", + "%Name":"spr_cata_left_trim", + "bboxMode":0, + "bbox_bottom":49, + "bbox_left":123, + "bbox_right":151, + "bbox_top":24, + "collisionKind":1, + "collisionTolerance":0, + "DynamicTexturePage":false, + "edgeFiltering":false, + "For3D":false, + "frames":[ + {"$GMSpriteFrame":"v1","%Name":"1ce219cb-5d0f-4940-a300-ebea3cf690d4","name":"1ce219cb-5d0f-4940-a300-ebea3cf690d4","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + ], + "gridX":0, + "gridY":0, + "height":232, + "HTile":false, + "layers":[ + {"$GMImageLayer":"","%Name":"6fa1b1c6-652f-4092-84b5-fe6e33490587","blendMode":0,"displayName":"default","isLocked":false,"name":"6fa1b1c6-652f-4092-84b5-fe6e33490587","opacity":100.0,"resourceType":"GMImageLayer","resourceVersion":"2.0","visible":true,}, + ], + "name":"spr_cata_left_trim", + "nineSlice":null, + "origin":0, + "parent":{ + "name":"cata_complex", + "path":"folders/Sprites/Marine Viewer/body_types/cata_complex.yy", + }, + "preMultiplyAlpha":false, + "resourceType":"GMSprite", + "resourceVersion":"2.0", + "sequence":{ + "$GMSequence":"v1", + "%Name":"spr_cata_left_trim", + "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_cata_left_trim", + "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":"1ce219cb-5d0f-4940-a300-ebea3cf690d4","path":"sprites/spr_cata_left_trim/spr_cata_left_trim.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"2b86d343-2fe9-46af-bdad-24dcbffe8ffc","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":0.5, + "textureGroupId":{ + "name":"Default", + "path":"texturegroups/Default", + }, + "type":0, + "VTile":false, + "width":167, +} \ No newline at end of file diff --git a/sprites/spr_cata_left_trim_1/fcefc333-2e12-4b76-a889-59ee344320c8.png b/sprites/spr_cata_left_trim_1/fcefc333-2e12-4b76-a889-59ee344320c8.png new file mode 100644 index 0000000000000000000000000000000000000000..011827e5a64e45d995c5ed8b69468247823968e7 GIT binary patch literal 838 zcmeAS@N?(olHy`uVBq!ia0vp^%Ypa>2OE&=lK2t|q!f}pf_xbms?-=58d?|_egTCV zUNA6}8Za=tN?>5Hn!&&zUNC1@pbb!hEy>&6h2cL4F4((#G6MsXrKgKyNX4zUcQ>xR z6(G{^aIyyX9m^L%*0Et96il{sTMWg-`r7heyMHwQfxljwrxWY{2?-kZ{53lNxqWSV)w2F*{tq2N zr>-f7EZzED`R%EjxB4m$TtBV8bjpn9m9J;cQ_7vQ_DzF&v{Ih^j>!G*E+0F&_UrfO zTNB?*@2HvBwORMR(xZ~CZ*^ZgPPULX?fGk{^k{?q`q}rk&3hTY)Gq4z`L>Pr@5*-H zcw4q#sdqK=a-JieTaVmaaQI)%tYw}q+5uI%wD~^Q{|=kxa9GT?|+}( zsj||1{KRxg&*j+O`_J!Kg`Spqs`d2L$!r1jt6s(R1$lQrpU<87j*}l8&e(_vPS;EK z+g@Asde`~r^8wA%e^(#8b@PeQ6xWT4}Qn9E{%uyG!_1~Uf{|#uAYKdz^NlIc# zs#S7PDv)9@GB7gLH89gPvJ5daw=y!YGBVaSFt9Q(kO+1+N70a*pOTqYiCaS^-~Vo) i1`W6kC7HRY#U+Wk1-SLtN#6?rdC=3<&t;ucLK6ThDK|X; literal 0 HcmV?d00001 diff --git a/sprites/spr_cata_left_trim_1/layers/fcefc333-2e12-4b76-a889-59ee344320c8/5ec3c800-6eb0-42fd-bd91-f666b756bab3.png b/sprites/spr_cata_left_trim_1/layers/fcefc333-2e12-4b76-a889-59ee344320c8/5ec3c800-6eb0-42fd-bd91-f666b756bab3.png new file mode 100644 index 0000000000000000000000000000000000000000..011827e5a64e45d995c5ed8b69468247823968e7 GIT binary patch literal 838 zcmeAS@N?(olHy`uVBq!ia0vp^%Ypa>2OE&=lK2t|q!f}pf_xbms?-=58d?|_egTCV zUNA6}8Za=tN?>5Hn!&&zUNC1@pbb!hEy>&6h2cL4F4((#G6MsXrKgKyNX4zUcQ>xR z6(G{^aIyyX9m^L%*0Et96il{sTMWg-`r7heyMHwQfxljwrxWY{2?-kZ{53lNxqWSV)w2F*{tq2N zr>-f7EZzED`R%EjxB4m$TtBV8bjpn9m9J;cQ_7vQ_DzF&v{Ih^j>!G*E+0F&_UrfO zTNB?*@2HvBwORMR(xZ~CZ*^ZgPPULX?fGk{^k{?q`q}rk&3hTY)Gq4z`L>Pr@5*-H zcw4q#sdqK=a-JieTaVmaaQI)%tYw}q+5uI%wD~^Q{|=kxa9GT?|+}( zsj||1{KRxg&*j+O`_J!Kg`Spqs`d2L$!r1jt6s(R1$lQrpU<87j*}l8&e(_vPS;EK z+g@Asde`~r^8wA%e^(#8b@PeQ6xWT4}Qn9E{%uyG!_1~Uf{|#uAYKdz^NlIc# zs#S7PDv)9@GB7gLH89gPvJ5daw=y!YGBVaSFt9Q(kO+1+N70a*pOTqYiCaS^-~Vo) i1`W6kC7HRY#U+Wk1-SLtN#6?rdC=3<&t;ucLK6ThDK|X; literal 0 HcmV?d00001 diff --git a/sprites/spr_cata_left_trim_1/spr_cata_left_trim_1.yy b/sprites/spr_cata_left_trim_1/spr_cata_left_trim_1.yy new file mode 100644 index 0000000000..ea8d0b409a --- /dev/null +++ b/sprites/spr_cata_left_trim_1/spr_cata_left_trim_1.yy @@ -0,0 +1,92 @@ +{ + "$GMSprite":"v2", + "%Name":"spr_cata_left_trim_1", + "bboxMode":0, + "bbox_bottom":91, + "bbox_left":101, + "bbox_right":123, + "bbox_top":8, + "collisionKind":1, + "collisionTolerance":0, + "DynamicTexturePage":false, + "edgeFiltering":false, + "For3D":false, + "frames":[ + {"$GMSpriteFrame":"v1","%Name":"fcefc333-2e12-4b76-a889-59ee344320c8","name":"fcefc333-2e12-4b76-a889-59ee344320c8","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + ], + "gridX":0, + "gridY":0, + "height":232, + "HTile":false, + "layers":[ + {"$GMImageLayer":"","%Name":"5ec3c800-6eb0-42fd-bd91-f666b756bab3","blendMode":0,"displayName":"default","isLocked":false,"name":"5ec3c800-6eb0-42fd-bd91-f666b756bab3","opacity":100.0,"resourceType":"GMImageLayer","resourceVersion":"2.0","visible":true,}, + ], + "name":"spr_cata_left_trim_1", + "nineSlice":null, + "origin":0, + "parent":{ + "name":"cata_complex", + "path":"folders/Sprites/Marine Viewer/body_types/cata_complex.yy", + }, + "preMultiplyAlpha":false, + "resourceType":"GMSprite", + "resourceVersion":"2.0", + "sequence":{ + "$GMSequence":"v1", + "%Name":"spr_cata_left_trim_1", + "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_cata_left_trim_1", + "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":"fcefc333-2e12-4b76-a889-59ee344320c8","path":"sprites/spr_cata_left_trim_1/spr_cata_left_trim_1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"fa1c653e-09fe-4222-8748-5168e956a722","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":0.5, + "textureGroupId":{ + "name":"Default", + "path":"texturegroups/Default", + }, + "type":0, + "VTile":false, + "width":167, +} \ No newline at end of file diff --git a/sprites/spr_cata_left_trim_2/3089b56b-6212-4848-9073-c4e15cbc81bb.png b/sprites/spr_cata_left_trim_2/3089b56b-6212-4848-9073-c4e15cbc81bb.png new file mode 100644 index 0000000000000000000000000000000000000000..19336ab1210987e2162e4492271b04b028caf3fb GIT binary patch literal 705 zcmeAS@N?(olHy`uVBq!ia0vp^%Ypa>2OE&=lK2t|q!f}pf_xbms?-=58d?|_egTCV zUNA6}8Za=tN?>5Hn!&&zUNC1@pbb!hEy>&6h2cL4F4((#G6MtS7Ec$)kcwMx@A&35 z1&B0U%)ZRK=jcWOb-zwOpBWnjwm+D6Pw2%GlPgPfpSs6=m?NpCpcb#k64wJX3xD*riW zF1havnc(~=Ws>RQH=UE~C8bj@hkd>Ce$$N^7lBsX&{(c#ASa~0_>btbNrB&Du9a&o zz4CNUyS%QTudLvGrdZ`u^PbPKF57$Oan(+Dugq(OcFWWD|18zNxg~UNvE3TMw3d@6 zO-e6^t@b&sIC*lstr`yBm;C3{>ihuxj>cbm#N@r^DS z=jY54)O#&*MtafQsz3V|soE50F=2!QO$8iWj<7EfOgs~*-qHxPNVUW@q9i4;B-JXp zC>2OC7#SFu>Kd5o8d-)Inp+teS{WE=8yHv_7ziI$IDn!dH$NpatrE9}qmdKI;Vst03rG1o&W#< literal 0 HcmV?d00001 diff --git a/sprites/spr_cata_left_trim_2/layers/3089b56b-6212-4848-9073-c4e15cbc81bb/dfc1dfcf-f929-412a-ae9d-ce4a40087c21.png b/sprites/spr_cata_left_trim_2/layers/3089b56b-6212-4848-9073-c4e15cbc81bb/dfc1dfcf-f929-412a-ae9d-ce4a40087c21.png new file mode 100644 index 0000000000000000000000000000000000000000..19336ab1210987e2162e4492271b04b028caf3fb GIT binary patch literal 705 zcmeAS@N?(olHy`uVBq!ia0vp^%Ypa>2OE&=lK2t|q!f}pf_xbms?-=58d?|_egTCV zUNA6}8Za=tN?>5Hn!&&zUNC1@pbb!hEy>&6h2cL4F4((#G6MtS7Ec$)kcwMx@A&35 z1&B0U%)ZRK=jcWOb-zwOpBWnjwm+D6Pw2%GlPgPfpSs6=m?NpCpcb#k64wJX3xD*riW zF1havnc(~=Ws>RQH=UE~C8bj@hkd>Ce$$N^7lBsX&{(c#ASa~0_>btbNrB&Du9a&o zz4CNUyS%QTudLvGrdZ`u^PbPKF57$Oan(+Dugq(OcFWWD|18zNxg~UNvE3TMw3d@6 zO-e6^t@b&sIC*lstr`yBm;C3{>ihuxj>cbm#N@r^DS z=jY54)O#&*MtafQsz3V|soE50F=2!QO$8iWj<7EfOgs~*-qHxPNVUW@q9i4;B-JXp zC>2OC7#SFu>Kd5o8d-)Inp+teS{WE=8yHv_7ziI$IDn!dH$NpatrE9}qmdKI;Vst03rG1o&W#< literal 0 HcmV?d00001 diff --git a/sprites/spr_cata_left_trim_2/spr_cata_left_trim_2.yy b/sprites/spr_cata_left_trim_2/spr_cata_left_trim_2.yy new file mode 100644 index 0000000000..81323a212a --- /dev/null +++ b/sprites/spr_cata_left_trim_2/spr_cata_left_trim_2.yy @@ -0,0 +1,92 @@ +{ + "$GMSprite":"v2", + "%Name":"spr_cata_left_trim_2", + "bboxMode":0, + "bbox_bottom":59, + "bbox_left":118, + "bbox_right":152, + "bbox_top":31, + "collisionKind":1, + "collisionTolerance":0, + "DynamicTexturePage":false, + "edgeFiltering":false, + "For3D":false, + "frames":[ + {"$GMSpriteFrame":"v1","%Name":"3089b56b-6212-4848-9073-c4e15cbc81bb","name":"3089b56b-6212-4848-9073-c4e15cbc81bb","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + ], + "gridX":0, + "gridY":0, + "height":232, + "HTile":false, + "layers":[ + {"$GMImageLayer":"","%Name":"dfc1dfcf-f929-412a-ae9d-ce4a40087c21","blendMode":0,"displayName":"default","isLocked":false,"name":"dfc1dfcf-f929-412a-ae9d-ce4a40087c21","opacity":100.0,"resourceType":"GMImageLayer","resourceVersion":"2.0","visible":true,}, + ], + "name":"spr_cata_left_trim_2", + "nineSlice":null, + "origin":0, + "parent":{ + "name":"cata_complex", + "path":"folders/Sprites/Marine Viewer/body_types/cata_complex.yy", + }, + "preMultiplyAlpha":false, + "resourceType":"GMSprite", + "resourceVersion":"2.0", + "sequence":{ + "$GMSequence":"v1", + "%Name":"spr_cata_left_trim_2", + "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_cata_left_trim_2", + "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":"3089b56b-6212-4848-9073-c4e15cbc81bb","path":"sprites/spr_cata_left_trim_2/spr_cata_left_trim_2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"c305edf8-9d2a-4e6f-9195-bb6b63279ba9","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":0.5, + "textureGroupId":{ + "name":"Default", + "path":"texturegroups/Default", + }, + "type":0, + "VTile":false, + "width":167, +} \ No newline at end of file diff --git a/sprites/spr_cata_right_arm/198a5162-01ac-4f12-b555-ac903faa3333.png b/sprites/spr_cata_right_arm/198a5162-01ac-4f12-b555-ac903faa3333.png new file mode 100644 index 0000000000000000000000000000000000000000..cd37c09aab3d64c5db0c6280b2bdef9bea86b159 GIT binary patch literal 1601 zcmbtUX)xOf6#rX_s7``=X8t6 zh;201U5XZMQb%2h)o3M1DP>n1r2Freo!Jka*_nNB-uu0IZ+`Fi^0M7r9UwAFG5`QT zoE&Z4L97RDSy~eGISShzAe;AOQgYs{sIDRtf+oaO955 z=3qfG@PdOa@cE0@bk~yr;DDi%?Riw<+}gaAJKIY|YJ>j{Sur%JLR7}3p-gR*WI|2E zUh20#K3G~?Gpy*o^i7YLlp_Sn8DOqT`CFo`M@_IDMpSKM5gd}L{8VG!8!jy zlCa2^f>asU9=qj5Z0_z;Y1x>K&(g3x635lXB)2WPYF){H`NMKDba%8sNf@9zAve^r zBtdsM<_Vh@SB7BxGvcje@i=`VQuCd=zg-igu(0RL1PqWmdx`(v^8n}vUL-`!q8>uR*Gmn z=-bW8YMokmdSQsNzgi^*9mLR-+#@dF52H41PZlM>euqXs@``@ZWS2@d?R#E)%LqaVST6+&gR8Ul{`?@u;ZS#@ zvIYeX#WI}aYvS#-5L?))$fZGm-5VpUJML@6ot<#{4%!*EIZ*JauS>56 z>ngEwt;zsSbkY>+wbN!;hJosh9WSxhj)_ugNN^-KM%X}gnqE-JBEL~hafzbQ5ZZsK9=q5bf50V%s@-pHo zL-$ioPBH@R2L-R-)>@@d5;KM`n>TfkpVfCMOV^@Q)sk~-aK&!Zc($yCGbWrPZ3vKj z|J3B_%mpzQ8?Wo?&`BPf%JyU~5>E@|D7scXnBHaX6YR$X!f)KdZ0zuUNUu&pD@HIBx6k>sb5(+K9E$HVhg^|o1kn$~Yy9g^NZL|op8eXFFyZixQ*qyu zG6Px}@_oN^D|}imQ%-{9QQ7}#OVBnqQrf9>>h9f@kZ=9S?hkE;!v-vuz(v=#?=+rv zzj^rfI6a>-#X3-Q-pFI1nQfz+Qw#6Z0bk+&m&oTg`easL=b~4}!Dgr9?Y!cHuf~U% z1;vJd0O%w1jdT!59eq=jo}QVWiJ87B9Dy)HAWF8lm;Xh;MhAz7;=fMdH+!#vgzx{E f5Fd^WiHpCA#eJRA(wV6L7``=X8t6 zh;201U5XZMQb%2h)o3M1DP>n1r2Freo!Jka*_nNB-uu0IZ+`Fi^0M7r9UwAFG5`QT zoE&Z4L97RDSy~eGISShzAe;AOQgYs{sIDRtf+oaO955 z=3qfG@PdOa@cE0@bk~yr;DDi%?Riw<+}gaAJKIY|YJ>j{Sur%JLR7}3p-gR*WI|2E zUh20#K3G~?Gpy*o^i7YLlp_Sn8DOqT`CFo`M@_IDMpSKM5gd}L{8VG!8!jy zlCa2^f>asU9=qj5Z0_z;Y1x>K&(g3x635lXB)2WPYF){H`NMKDba%8sNf@9zAve^r zBtdsM<_Vh@SB7BxGvcje@i=`VQuCd=zg-igu(0RL1PqWmdx`(v^8n}vUL-`!q8>uR*Gmn z=-bW8YMokmdSQsNzgi^*9mLR-+#@dF52H41PZlM>euqXs@``@ZWS2@d?R#E)%LqaVST6+&gR8Ul{`?@u;ZS#@ zvIYeX#WI}aYvS#-5L?))$fZGm-5VpUJML@6ot<#{4%!*EIZ*JauS>56 z>ngEwt;zsSbkY>+wbN!;hJosh9WSxhj)_ugNN^-KM%X}gnqE-JBEL~hafzbQ5ZZsK9=q5bf50V%s@-pHo zL-$ioPBH@R2L-R-)>@@d5;KM`n>TfkpVfCMOV^@Q)sk~-aK&!Zc($yCGbWrPZ3vKj z|J3B_%mpzQ8?Wo?&`BPf%JyU~5>E@|D7scXnBHaX6YR$X!f)KdZ0zuUNUu&pD@HIBx6k>sb5(+K9E$HVhg^|o1kn$~Yy9g^NZL|op8eXFFyZixQ*qyu zG6Px}@_oN^D|}imQ%-{9QQ7}#OVBnqQrf9>>h9f@kZ=9S?hkE;!v-vuz(v=#?=+rv zzj^rfI6a>-#X3-Q-pFI1nQfz+Qw#6Z0bk+&m&oTg`easL=b~4}!Dgr9?Y!cHuf~U% z1;vJd0O%w1jdT!59eq=jo}QVWiJ87B9Dy)HAWF8lm;Xh;MhAz7;=fMdH+!#vgzx{E f5Fd^WiHpCA#eJRA(wV6L":"", + "Keyframes":[], + "resourceType":"KeyframeStore", + "resourceVersion":"2.0", + }, + "eventStubScript":null, + "eventToFunction":{}, + "length":1.0, + "lockOrigin":false, + "moments":{ + "$KeyframeStore":"", + "Keyframes":[], + "resourceType":"KeyframeStore", + "resourceVersion":"2.0", + }, + "name":"spr_cata_right_arm", + "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":"198a5162-01ac-4f12-b555-ac903faa3333","path":"sprites/spr_cata_right_arm/spr_cata_right_arm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"4599239b-9184-4224-9fc1-5f0c6a6b142e","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":0.5, + "textureGroupId":{ + "name":"Default", + "path":"texturegroups/Default", + }, + "type":0, + "VTile":false, + "width":167, +} \ No newline at end of file diff --git a/sprites/spr_cata_right_armtrim/82ee5036-1316-4e81-a955-2242e5aa54af.png b/sprites/spr_cata_right_armtrim/82ee5036-1316-4e81-a955-2242e5aa54af.png new file mode 100644 index 0000000000000000000000000000000000000000..c141ab28e30bfa0b09654898e9bace70287393d5 GIT binary patch literal 700 zcmeAS@N?(olHy`uVBq!ia0vp^%Ypa>2OE&=lK2t|q!f}pf_xbms?-=58d?|_egTCV zUNA6}8Za=tN?>5Hn!&&zUNC1@pbb!hEy>&6h2cL4F4((#G6MtSdQTU}kcwMxZ`}1g zlpwYF4W(&^h9W91J!W?%d2uv&BXDeX)_F>mO2VMK17XH;gY&<6~%bm6U?Cj#I zSwJI61pm*)PRiQqD7d}#-DkVGI&qUz4Bmu$R>j&&)Zh1QtPXjd;N-bfD}9np$zOw* z>BZX1SDidMNBG>{gLC}EPChS4ad?!n^wuvo?|4=dPg{kxl2a_AIt$+Yz9zH2oR7s+ zFpN*bQXtjfO@2$^?UGFr=Idlrx4-4q-n!^v3~TY9-fZ(9?q0#2|K}74J`Y>DOV>R5 zo1oioKEAfULfMbJ=G?yaTEVn^ZgSJDZ?#<0R|VxdhFWHZmMCOdY+b~qwsk(A^VAy4 zmE{}dZUpA$Z+^Pxwdu#xF{{>Ye`&ja?;Bgg=yRV-{@=JO%}8RH5UqTNm^}CP5Z{Qc zd7VH#swJ)wB`Jv|saDBFsX&Us$iT={*T78I$TGyx+{(zv%E(;Xz`)AD;Kj?$k|-K- v^HVa@DsgL=xrKWvP=f~ChLX(O)Z&uF+ydNs&Mnlc0{O(#)z4*}Q$iB}s!Y@7 literal 0 HcmV?d00001 diff --git a/sprites/spr_cata_right_armtrim/layers/82ee5036-1316-4e81-a955-2242e5aa54af/d1b71949-8ac8-4430-9cf8-a761461c4666.png b/sprites/spr_cata_right_armtrim/layers/82ee5036-1316-4e81-a955-2242e5aa54af/d1b71949-8ac8-4430-9cf8-a761461c4666.png new file mode 100644 index 0000000000000000000000000000000000000000..c141ab28e30bfa0b09654898e9bace70287393d5 GIT binary patch literal 700 zcmeAS@N?(olHy`uVBq!ia0vp^%Ypa>2OE&=lK2t|q!f}pf_xbms?-=58d?|_egTCV zUNA6}8Za=tN?>5Hn!&&zUNC1@pbb!hEy>&6h2cL4F4((#G6MtSdQTU}kcwMxZ`}1g zlpwYF4W(&^h9W91J!W?%d2uv&BXDeX)_F>mO2VMK17XH;gY&<6~%bm6U?Cj#I zSwJI61pm*)PRiQqD7d}#-DkVGI&qUz4Bmu$R>j&&)Zh1QtPXjd;N-bfD}9np$zOw* z>BZX1SDidMNBG>{gLC}EPChS4ad?!n^wuvo?|4=dPg{kxl2a_AIt$+Yz9zH2oR7s+ zFpN*bQXtjfO@2$^?UGFr=Idlrx4-4q-n!^v3~TY9-fZ(9?q0#2|K}74J`Y>DOV>R5 zo1oioKEAfULfMbJ=G?yaTEVn^ZgSJDZ?#<0R|VxdhFWHZmMCOdY+b~qwsk(A^VAy4 zmE{}dZUpA$Z+^Pxwdu#xF{{>Ye`&ja?;Bgg=yRV-{@=JO%}8RH5UqTNm^}CP5Z{Qc zd7VH#swJ)wB`Jv|saDBFsX&Us$iT={*T78I$TGyx+{(zv%E(;Xz`)AD;Kj?$k|-K- v^HVa@DsgL=xrKWvP=f~ChLX(O)Z&uF+ydNs&Mnlc0{O(#)z4*}Q$iB}s!Y@7 literal 0 HcmV?d00001 diff --git a/sprites/spr_cata_right_armtrim/spr_cata_right_armtrim.yy b/sprites/spr_cata_right_armtrim/spr_cata_right_armtrim.yy new file mode 100644 index 0000000000..718a52b8c8 --- /dev/null +++ b/sprites/spr_cata_right_armtrim/spr_cata_right_armtrim.yy @@ -0,0 +1,92 @@ +{ + "$GMSprite":"v2", + "%Name":"spr_cata_right_armtrim", + "bboxMode":0, + "bbox_bottom":93, + "bbox_left":14, + "bbox_right":35, + "bbox_top":77, + "collisionKind":1, + "collisionTolerance":0, + "DynamicTexturePage":false, + "edgeFiltering":false, + "For3D":false, + "frames":[ + {"$GMSpriteFrame":"v1","%Name":"82ee5036-1316-4e81-a955-2242e5aa54af","name":"82ee5036-1316-4e81-a955-2242e5aa54af","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + ], + "gridX":0, + "gridY":0, + "height":232, + "HTile":false, + "layers":[ + {"$GMImageLayer":"","%Name":"d1b71949-8ac8-4430-9cf8-a761461c4666","blendMode":0,"displayName":"default","isLocked":false,"name":"d1b71949-8ac8-4430-9cf8-a761461c4666","opacity":100.0,"resourceType":"GMImageLayer","resourceVersion":"2.0","visible":true,}, + ], + "name":"spr_cata_right_armtrim", + "nineSlice":null, + "origin":0, + "parent":{ + "name":"cata_complex", + "path":"folders/Sprites/Marine Viewer/body_types/cata_complex.yy", + }, + "preMultiplyAlpha":false, + "resourceType":"GMSprite", + "resourceVersion":"2.0", + "sequence":{ + "$GMSequence":"v1", + "%Name":"spr_cata_right_armtrim", + "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_cata_right_armtrim", + "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":"82ee5036-1316-4e81-a955-2242e5aa54af","path":"sprites/spr_cata_right_armtrim/spr_cata_right_armtrim.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"bfea0ffe-8e22-470b-a22d-d49be049e96c","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":0.5, + "textureGroupId":{ + "name":"Default", + "path":"texturegroups/Default", + }, + "type":0, + "VTile":false, + "width":167, +} \ No newline at end of file diff --git a/sprites/spr_cata_right_knee/494700cd-feb1-4f66-81c1-4dfc8f378e20.png b/sprites/spr_cata_right_knee/494700cd-feb1-4f66-81c1-4dfc8f378e20.png new file mode 100644 index 0000000000000000000000000000000000000000..1078082e167c4714d791e0a1b4270cb9fdcadabd GIT binary patch literal 1426 zcmeAS@N?(olHy`uVBq!ia0vp^%Ypa>2OE&=lK2t|q!f}pf_xbms?-=58d?|_egTCV zUNA6}8Za=tN?>5Hn!&&zUNC1@pbb!hEy>&6h2cL4F4((#G6MrktEY=&NX4zUclPJq zc9UWMFu%F1hciERj~<1er1e z+9$l5siqrQevzWf{&x1ah5i41KaIYNJl*mBvqRfH%Qr9Mop#2pfAs3t)4glMudiRE^RMUm`TgCw zjIGOT5C1IC2;ThDn=w_tpXd3zg+5;eF8FSGW1qC3jOTgXLLb{e2XjHe&o_$#*K3^m z_-u;)iI+K?&mS)InQO4%Y=GY@UZ9lXg2PuXM%(9U%$~()yI}i0$y05vfqm+V3z{!+ zJdaoBP1WLkA@{IGV@j#O>$j7SRWZtTShIcwx^%~`y00nvaqL?(>hFEkyq$IG^dcF5 zeLX!TrAN=6Ewe1sUcmfGr}o2?gFQcrcz4CEFS}VPEI9jT&Q6c4!zMGPU-h3|@^?wq zKeZG08k;|~N3XTB-%>d}`;_&Q1|B^{<3%?)w`LTWeqsPnnb7z}b zmz3|vC_5P z&i72#^Q?{KpA4DkZx3x6Z#SGzKfP^ZfYHQg3-ez8(jfP>rrAw1*WWpG^XZL)Hl7zO z*D1Dq)@({SW9+=M{qvNAA=PPm%M0?9oX*dTwrn+C)hYXR!EYrcx7z={U({C@Tw8Tg zx|G+->Y#Ves`fA3@*o6T@9_aNDf1Dwby)^`|ci^xKL)j<#w<2j{YUSFV%MNe5rkOxw=*9QK8~$rmCI*KkI9&9jm7t zRj9F5-aBim-QBO1$GOtJY6jk4-q@yd=;rcc_HOs<`8stDS=*BOZvs!y?;GyVVG7_Nou z8~T*~aX;OCUH_btQr+Lj^Y@)+pXhI)T*Z-LoAdSE*KXs+GyZ-Ldny(+s3ou5xwl@( zQtaGGCao!lCuJ+zN?g#5=exbL{@DBJVwU1z*$&bBKG$Y<7}w7)IZ-+1^BRrg)utbv zewIo&J-o}E5x!Y(O8oSNB1!4Iw`LqQnezQGUt7qG*!XVSCExLu1u_TsuS@%SYmu{E zCs3VgiEBhjN@7W>RdP`(kYX@0Ff!FOFw-@%3^6pcGPbZXG0-+Jure^1n;~)pMMG|W uN@iLmZVhit*Hi#CXuxeK$;?eHE=kNSz^!MuLNBPqW$<+Mb6Mw<&;$UF_*m-z literal 0 HcmV?d00001 diff --git a/sprites/spr_cata_right_knee/layers/494700cd-feb1-4f66-81c1-4dfc8f378e20/7122732c-409f-4f69-9ad0-33318d42dfe5.png b/sprites/spr_cata_right_knee/layers/494700cd-feb1-4f66-81c1-4dfc8f378e20/7122732c-409f-4f69-9ad0-33318d42dfe5.png new file mode 100644 index 0000000000000000000000000000000000000000..1078082e167c4714d791e0a1b4270cb9fdcadabd GIT binary patch literal 1426 zcmeAS@N?(olHy`uVBq!ia0vp^%Ypa>2OE&=lK2t|q!f}pf_xbms?-=58d?|_egTCV zUNA6}8Za=tN?>5Hn!&&zUNC1@pbb!hEy>&6h2cL4F4((#G6MrktEY=&NX4zUclPJq zc9UWMFu%F1hciERj~<1er1e z+9$l5siqrQevzWf{&x1ah5i41KaIYNJl*mBvqRfH%Qr9Mop#2pfAs3t)4glMudiRE^RMUm`TgCw zjIGOT5C1IC2;ThDn=w_tpXd3zg+5;eF8FSGW1qC3jOTgXLLb{e2XjHe&o_$#*K3^m z_-u;)iI+K?&mS)InQO4%Y=GY@UZ9lXg2PuXM%(9U%$~()yI}i0$y05vfqm+V3z{!+ zJdaoBP1WLkA@{IGV@j#O>$j7SRWZtTShIcwx^%~`y00nvaqL?(>hFEkyq$IG^dcF5 zeLX!TrAN=6Ewe1sUcmfGr}o2?gFQcrcz4CEFS}VPEI9jT&Q6c4!zMGPU-h3|@^?wq zKeZG08k;|~N3XTB-%>d}`;_&Q1|B^{<3%?)w`LTWeqsPnnb7z}b zmz3|vC_5P z&i72#^Q?{KpA4DkZx3x6Z#SGzKfP^ZfYHQg3-ez8(jfP>rrAw1*WWpG^XZL)Hl7zO z*D1Dq)@({SW9+=M{qvNAA=PPm%M0?9oX*dTwrn+C)hYXR!EYrcx7z={U({C@Tw8Tg zx|G+->Y#Ves`fA3@*o6T@9_aNDf1Dwby)^`|ci^xKL)j<#w<2j{YUSFV%MNe5rkOxw=*9QK8~$rmCI*KkI9&9jm7t zRj9F5-aBim-QBO1$GOtJY6jk4-q@yd=;rcc_HOs<`8stDS=*BOZvs!y?;GyVVG7_Nou z8~T*~aX;OCUH_btQr+Lj^Y@)+pXhI)T*Z-LoAdSE*KXs+GyZ-Ldny(+s3ou5xwl@( zQtaGGCao!lCuJ+zN?g#5=exbL{@DBJVwU1z*$&bBKG$Y<7}w7)IZ-+1^BRrg)utbv zewIo&J-o}E5x!Y(O8oSNB1!4Iw`LqQnezQGUt7qG*!XVSCExLu1u_TsuS@%SYmu{E zCs3VgiEBhjN@7W>RdP`(kYX@0Ff!FOFw-@%3^6pcGPbZXG0-+Jure^1n;~)pMMG|W uN@iLmZVhit*Hi#CXuxeK$;?eHE=kNSz^!MuLNBPqW$<+Mb6Mw<&;$UF_*m-z literal 0 HcmV?d00001 diff --git a/sprites/spr_cata_right_knee/spr_cata_right_knee.yy b/sprites/spr_cata_right_knee/spr_cata_right_knee.yy new file mode 100644 index 0000000000..6afc7d423d --- /dev/null +++ b/sprites/spr_cata_right_knee/spr_cata_right_knee.yy @@ -0,0 +1,92 @@ +{ + "$GMSprite":"v2", + "%Name":"spr_cata_right_knee", + "bboxMode":0, + "bbox_bottom":187, + "bbox_left":31, + "bbox_right":72, + "bbox_top":142, + "collisionKind":1, + "collisionTolerance":0, + "DynamicTexturePage":false, + "edgeFiltering":false, + "For3D":false, + "frames":[ + {"$GMSpriteFrame":"v1","%Name":"494700cd-feb1-4f66-81c1-4dfc8f378e20","name":"494700cd-feb1-4f66-81c1-4dfc8f378e20","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + ], + "gridX":0, + "gridY":0, + "height":232, + "HTile":false, + "layers":[ + {"$GMImageLayer":"","%Name":"7122732c-409f-4f69-9ad0-33318d42dfe5","blendMode":0,"displayName":"default","isLocked":false,"name":"7122732c-409f-4f69-9ad0-33318d42dfe5","opacity":100.0,"resourceType":"GMImageLayer","resourceVersion":"2.0","visible":true,}, + ], + "name":"spr_cata_right_knee", + "nineSlice":null, + "origin":0, + "parent":{ + "name":"cata_complex", + "path":"folders/Sprites/Marine Viewer/body_types/cata_complex.yy", + }, + "preMultiplyAlpha":false, + "resourceType":"GMSprite", + "resourceVersion":"2.0", + "sequence":{ + "$GMSequence":"v1", + "%Name":"spr_cata_right_knee", + "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_cata_right_knee", + "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":"494700cd-feb1-4f66-81c1-4dfc8f378e20","path":"sprites/spr_cata_right_knee/spr_cata_right_knee.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"84d653df-e281-4206-9baa-69963a44556a","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":0.5, + "textureGroupId":{ + "name":"Default", + "path":"texturegroups/Default", + }, + "type":0, + "VTile":false, + "width":167, +} \ No newline at end of file diff --git a/sprites/spr_cata_right_leg/ecf75db7-6223-4712-8157-c822a10e1617.png b/sprites/spr_cata_right_leg/ecf75db7-6223-4712-8157-c822a10e1617.png new file mode 100644 index 0000000000000000000000000000000000000000..fa6fe28eaa2c6d5fd6d5056f546ae2376c334874 GIT binary patch literal 1576 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":"", + "Keyframes":[], + "resourceType":"KeyframeStore", + "resourceVersion":"2.0", + }, + "eventStubScript":null, + "eventToFunction":{}, + "length":1.0, + "lockOrigin":false, + "moments":{ + "$KeyframeStore":"", + "Keyframes":[], + "resourceType":"KeyframeStore", + "resourceVersion":"2.0", + }, + "name":"spr_cata_right_leg", + "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":"ecf75db7-6223-4712-8157-c822a10e1617","path":"sprites/spr_cata_right_leg/spr_cata_right_leg.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"fcd28e0a-0fb2-4958-b925-f032588cfc06","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":0.5, + "textureGroupId":{ + "name":"Default", + "path":"texturegroups/Default", + }, + "type":0, + "VTile":false, + "width":167, +} \ No newline at end of file diff --git a/sprites/spr_cata_right_trim/1ce219cb-5d0f-4940-a300-ebea3cf690d4.png b/sprites/spr_cata_right_trim/1ce219cb-5d0f-4940-a300-ebea3cf690d4.png new file mode 100644 index 0000000000000000000000000000000000000000..d447b9011e3b202af06ae0f9a50cff02be5c1ee3 GIT binary patch literal 839 zcmeAS@N?(olHy`uVBq!ia0vp^%Ypa>2OE&=lK2t|q!f}pf_xbms?-=58d?|_egTCV zUNA6}8Za=tN?>5Hn!&&zUNC1@pbb!hEy>&6h2cL4F4((#G6MsXm8XkiNX4zUcYX7u z3?&*8FMnftch`bLdRp&`NxbY2^S*K_?K;^blg-6*=7wLToaUt`{ElBiE49RKGpf84UQV{)FZ*z>w_yCV|% zKiyxmAHV)B`J}Y={AxM>+lB$%s?VZK&IQT67Fgx6^ZKG_&+lt)^)G*WyFe#oU8G5$ z%{9w~T~jnyyBexrd7SxMEx;?ZNy2Hb*h&Y@(B6k(OPEx{ONH&0Zt>L2{p2e6$9uD; zX!0H(-+;@L9XFqzuBNfwWPU)f@RctrEq3ug5@!iHy-+y!=!>3@+u6rwdJ^B2KYtMF zTO#=U_?Mho^A|qig?@&%FU|a3WbJ;I9R2e0^;4Jk>Mpy!@l|*4^a;mbRldwFj9MOj zcdk;tZquA=jL0DYWIqrzJa(kOmZ>YQ zk$JwjTe@4xX+=rY`R(1)eptpGepPr5D5ut(745lw*`k%6CqV!57XZysEpd$~Nl7e8wMs5Z1yT$~21cg324=cOmLZ1bRz{{)rsmoP z237_J3?CL&qG-s?PsvQH#I2!lt>jUl1`W6kC7HRY#U+Wk1-SL7?XZvn>S6G7^>bP0 Hl+XkKeVQiw literal 0 HcmV?d00001 diff --git a/sprites/spr_cata_right_trim/layers/1ce219cb-5d0f-4940-a300-ebea3cf690d4/6fa1b1c6-652f-4092-84b5-fe6e33490587.png b/sprites/spr_cata_right_trim/layers/1ce219cb-5d0f-4940-a300-ebea3cf690d4/6fa1b1c6-652f-4092-84b5-fe6e33490587.png new file mode 100644 index 0000000000000000000000000000000000000000..d447b9011e3b202af06ae0f9a50cff02be5c1ee3 GIT binary patch literal 839 zcmeAS@N?(olHy`uVBq!ia0vp^%Ypa>2OE&=lK2t|q!f}pf_xbms?-=58d?|_egTCV zUNA6}8Za=tN?>5Hn!&&zUNC1@pbb!hEy>&6h2cL4F4((#G6MsXm8XkiNX4zUcYX7u z3?&*8FMnftch`bLdRp&`NxbY2^S*K_?K;^blg-6*=7wLToaUt`{ElBiE49RKGpf84UQV{)FZ*z>w_yCV|% zKiyxmAHV)B`J}Y={AxM>+lB$%s?VZK&IQT67Fgx6^ZKG_&+lt)^)G*WyFe#oU8G5$ z%{9w~T~jnyyBexrd7SxMEx;?ZNy2Hb*h&Y@(B6k(OPEx{ONH&0Zt>L2{p2e6$9uD; zX!0H(-+;@L9XFqzuBNfwWPU)f@RctrEq3ug5@!iHy-+y!=!>3@+u6rwdJ^B2KYtMF zTO#=U_?Mho^A|qig?@&%FU|a3WbJ;I9R2e0^;4Jk>Mpy!@l|*4^a;mbRldwFj9MOj zcdk;tZquA=jL0DYWIqrzJa(kOmZ>YQ zk$JwjTe@4xX+=rY`R(1)eptpGepPr5D5ut(745lw*`k%6CqV!57XZysEpd$~Nl7e8wMs5Z1yT$~21cg324=cOmLZ1bRz{{)rsmoP z237_J3?CL&qG-s?PsvQH#I2!lt>jUl1`W6kC7HRY#U+Wk1-SL7?XZvn>S6G7^>bP0 Hl+XkKeVQiw literal 0 HcmV?d00001 diff --git a/sprites/spr_cata_right_trim/spr_cata_right_trim.yy b/sprites/spr_cata_right_trim/spr_cata_right_trim.yy new file mode 100644 index 0000000000..39fd8a2a72 --- /dev/null +++ b/sprites/spr_cata_right_trim/spr_cata_right_trim.yy @@ -0,0 +1,92 @@ +{ + "$GMSprite":"v2", + "%Name":"spr_cata_right_trim", + "bboxMode":0, + "bbox_bottom":49, + "bbox_left":15, + "bbox_right":43, + "bbox_top":24, + "collisionKind":1, + "collisionTolerance":0, + "DynamicTexturePage":false, + "edgeFiltering":false, + "For3D":false, + "frames":[ + {"$GMSpriteFrame":"v1","%Name":"1ce219cb-5d0f-4940-a300-ebea3cf690d4","name":"1ce219cb-5d0f-4940-a300-ebea3cf690d4","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + ], + "gridX":0, + "gridY":0, + "height":232, + "HTile":false, + "layers":[ + {"$GMImageLayer":"","%Name":"6fa1b1c6-652f-4092-84b5-fe6e33490587","blendMode":0,"displayName":"default","isLocked":false,"name":"6fa1b1c6-652f-4092-84b5-fe6e33490587","opacity":100.0,"resourceType":"GMImageLayer","resourceVersion":"2.0","visible":true,}, + ], + "name":"spr_cata_right_trim", + "nineSlice":null, + "origin":0, + "parent":{ + "name":"cata_complex", + "path":"folders/Sprites/Marine Viewer/body_types/cata_complex.yy", + }, + "preMultiplyAlpha":false, + "resourceType":"GMSprite", + "resourceVersion":"2.0", + "sequence":{ + "$GMSequence":"v1", + "%Name":"spr_cata_right_trim", + "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_cata_right_trim", + "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":"1ce219cb-5d0f-4940-a300-ebea3cf690d4","path":"sprites/spr_cata_right_trim/spr_cata_right_trim.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"2b86d343-2fe9-46af-bdad-24dcbffe8ffc","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":0.5, + "textureGroupId":{ + "name":"Default", + "path":"texturegroups/Default", + }, + "type":0, + "VTile":false, + "width":167, +} \ No newline at end of file diff --git a/sprites/spr_cata_right_trim_1/fcefc333-2e12-4b76-a889-59ee344320c8.png b/sprites/spr_cata_right_trim_1/fcefc333-2e12-4b76-a889-59ee344320c8.png new file mode 100644 index 0000000000000000000000000000000000000000..4d5f8e4ef9d5f1c1fb9e5663dd86546cbfa28c84 GIT binary patch literal 827 zcmeAS@N?(olHy`uVBq!ia0vp^%Ypa>2OE&=lK2t|q!f}pf_xbms?-=58d?|_egTCV zUNA6}8Za=tN?>5Hn!&&zUNC1@pbb!hEy>&6h2cL4F4((#G6MsXo~MgrNX4zUcMbb) zIfyhooUS20qj-n6@2{-l*^k$Ebo@=Mjhgl}`u)ru=fB@$wh78! z`<=u2gA8%RyC+eEU`AbJD`#$Yi|0kzD;{Q8a z<^G9U=U#Wu<)80=fA>A(PZld5?fE1oxY2%1xuD?fvmf_@86YiGHp_6N^sP3@n2$mn?HRUN(TIlDnVk^Oym*LNKo&tn$) ziE*~)Z&s_#Q-E8wqiWvf?-n+W-=14m_a6{m8f&@Ie-4i~D$*{U^KR|+X=Z-kujNnw z%6mNX@sfR83U_U<+r1{=qAY)IB2=69RrV$Cem1rBr!azp7aMWmXx7$WH>=z9pZ$LR zJ#^2X=dAX8Kjz;nzGI<|O*wVM&VLsFa5>Q@@_)h-pn<9-t`Q|Ei6yC4$wjF^iowXh z$W+(BOxMUV#L(Qz$jr*fNZY``%D`Z=mCX?p4Y~O#nQ4`{H5^KBsQ_xwfZI@#nVVW% Zl9*e7ThG*@rJ$_A;OXk;vd$@?2>{%(FslFn literal 0 HcmV?d00001 diff --git a/sprites/spr_cata_right_trim_1/layers/fcefc333-2e12-4b76-a889-59ee344320c8/5ec3c800-6eb0-42fd-bd91-f666b756bab3.png b/sprites/spr_cata_right_trim_1/layers/fcefc333-2e12-4b76-a889-59ee344320c8/5ec3c800-6eb0-42fd-bd91-f666b756bab3.png new file mode 100644 index 0000000000000000000000000000000000000000..4d5f8e4ef9d5f1c1fb9e5663dd86546cbfa28c84 GIT binary patch literal 827 zcmeAS@N?(olHy`uVBq!ia0vp^%Ypa>2OE&=lK2t|q!f}pf_xbms?-=58d?|_egTCV zUNA6}8Za=tN?>5Hn!&&zUNC1@pbb!hEy>&6h2cL4F4((#G6MsXo~MgrNX4zUcMbb) zIfyhooUS20qj-n6@2{-l*^k$Ebo@=Mjhgl}`u)ru=fB@$wh78! z`<=u2gA8%RyC+eEU`AbJD`#$Yi|0kzD;{Q8a z<^G9U=U#Wu<)80=fA>A(PZld5?fE1oxY2%1xuD?fvmf_@86YiGHp_6N^sP3@n2$mn?HRUN(TIlDnVk^Oym*LNKo&tn$) ziE*~)Z&s_#Q-E8wqiWvf?-n+W-=14m_a6{m8f&@Ie-4i~D$*{U^KR|+X=Z-kujNnw z%6mNX@sfR83U_U<+r1{=qAY)IB2=69RrV$Cem1rBr!azp7aMWmXx7$WH>=z9pZ$LR zJ#^2X=dAX8Kjz;nzGI<|O*wVM&VLsFa5>Q@@_)h-pn<9-t`Q|Ei6yC4$wjF^iowXh z$W+(BOxMUV#L(Qz$jr*fNZY``%D`Z=mCX?p4Y~O#nQ4`{H5^KBsQ_xwfZI@#nVVW% Zl9*e7ThG*@rJ$_A;OXk;vd$@?2>{%(FslFn literal 0 HcmV?d00001 diff --git a/sprites/spr_cata_right_trim_1/spr_cata_right_trim_1.yy b/sprites/spr_cata_right_trim_1/spr_cata_right_trim_1.yy new file mode 100644 index 0000000000..7ab112ea78 --- /dev/null +++ b/sprites/spr_cata_right_trim_1/spr_cata_right_trim_1.yy @@ -0,0 +1,92 @@ +{ + "$GMSprite":"v2", + "%Name":"spr_cata_right_trim_1", + "bboxMode":0, + "bbox_bottom":91, + "bbox_left":43, + "bbox_right":65, + "bbox_top":8, + "collisionKind":1, + "collisionTolerance":0, + "DynamicTexturePage":false, + "edgeFiltering":false, + "For3D":false, + "frames":[ + {"$GMSpriteFrame":"v1","%Name":"fcefc333-2e12-4b76-a889-59ee344320c8","name":"fcefc333-2e12-4b76-a889-59ee344320c8","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + ], + "gridX":0, + "gridY":0, + "height":232, + "HTile":false, + "layers":[ + {"$GMImageLayer":"","%Name":"5ec3c800-6eb0-42fd-bd91-f666b756bab3","blendMode":0,"displayName":"default","isLocked":false,"name":"5ec3c800-6eb0-42fd-bd91-f666b756bab3","opacity":100.0,"resourceType":"GMImageLayer","resourceVersion":"2.0","visible":true,}, + ], + "name":"spr_cata_right_trim_1", + "nineSlice":null, + "origin":0, + "parent":{ + "name":"cata_complex", + "path":"folders/Sprites/Marine Viewer/body_types/cata_complex.yy", + }, + "preMultiplyAlpha":false, + "resourceType":"GMSprite", + "resourceVersion":"2.0", + "sequence":{ + "$GMSequence":"v1", + "%Name":"spr_cata_right_trim", + "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_cata_right_trim", + "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":"fcefc333-2e12-4b76-a889-59ee344320c8","path":"sprites/spr_cata_right_trim_1/spr_cata_right_trim_1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"fa1c653e-09fe-4222-8748-5168e956a722","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":0.5, + "textureGroupId":{ + "name":"Default", + "path":"texturegroups/Default", + }, + "type":0, + "VTile":false, + "width":167, +} \ No newline at end of file diff --git a/sprites/spr_cata_right_trim_2/3089b56b-6212-4848-9073-c4e15cbc81bb.png b/sprites/spr_cata_right_trim_2/3089b56b-6212-4848-9073-c4e15cbc81bb.png new file mode 100644 index 0000000000000000000000000000000000000000..e7380e52b55ac152f4859d8c8051ef5d04f68c28 GIT binary patch literal 719 zcmeAS@N?(olHy`uVBq!ia0vp^%Ypa>2OE&=lK2t|q!f}pf_xbms?-=58d?|_egTCV zUNA6}8Za=tN?>5Hn!&&zUNC1@pbb!hEy>&6h2cL4F4((#G6MtSAx{^_kcwMxZ#i}y zGLUGvXmN)1-{Hy$dAmgKa^%@~tbZ`KsO8)-FZPy|W@{IImfI2FvGkK*(yS>!!!Ur@ z_UiHkmoJaMTRz{up7ngqS;;$QcQ@wldb~WpDR-8rx{l|Z5O3UQwa1*?%d*Og<)U@Yv)gz>~$ts=iElckcmd_6F<+Xmz}*k=6m}Tms8nYM~qsmRD&9g zLN5j^bI}S|rnT#t%p&P)v;388MSiV1K1oSQN8BuHV(qy(pY@*a0ZNp&PYKGJt#|fr zUROtn-Q7z+OQJt6Ps;7iJJiplYnuG2U*})T3%M8T&wHJjmoxwP^pNbS7H8+}NuH?g z61>&-`;YYhuPnCZU)7z_@xr^kbmzNV)!Zqj>Q|#`k3}ZU&3wj!5h^qlXvqD=*cnuG zlDQ!_0BDhFiEBhjN@7W>RdP`(kYX@0Ff!FOFw-@%3^6pfGBUF=w$wH-ure^Hou07( yMMG|WN@iLmZVf!AF312iXuxeK$;?eHE=kNSz^y0x{>Q^WJq(_%elF{r5}E+qs_0Ar literal 0 HcmV?d00001 diff --git a/sprites/spr_cata_right_trim_2/layers/3089b56b-6212-4848-9073-c4e15cbc81bb/dfc1dfcf-f929-412a-ae9d-ce4a40087c21.png b/sprites/spr_cata_right_trim_2/layers/3089b56b-6212-4848-9073-c4e15cbc81bb/dfc1dfcf-f929-412a-ae9d-ce4a40087c21.png new file mode 100644 index 0000000000000000000000000000000000000000..e7380e52b55ac152f4859d8c8051ef5d04f68c28 GIT binary patch literal 719 zcmeAS@N?(olHy`uVBq!ia0vp^%Ypa>2OE&=lK2t|q!f}pf_xbms?-=58d?|_egTCV zUNA6}8Za=tN?>5Hn!&&zUNC1@pbb!hEy>&6h2cL4F4((#G6MtSAx{^_kcwMxZ#i}y zGLUGvXmN)1-{Hy$dAmgKa^%@~tbZ`KsO8)-FZPy|W@{IImfI2FvGkK*(yS>!!!Ur@ z_UiHkmoJaMTRz{up7ngqS;;$QcQ@wldb~WpDR-8rx{l|Z5O3UQwa1*?%d*Og<)U@Yv)gz>~$ts=iElckcmd_6F<+Xmz}*k=6m}Tms8nYM~qsmRD&9g zLN5j^bI}S|rnT#t%p&P)v;388MSiV1K1oSQN8BuHV(qy(pY@*a0ZNp&PYKGJt#|fr zUROtn-Q7z+OQJt6Ps;7iJJiplYnuG2U*})T3%M8T&wHJjmoxwP^pNbS7H8+}NuH?g z61>&-`;YYhuPnCZU)7z_@xr^kbmzNV)!Zqj>Q|#`k3}ZU&3wj!5h^qlXvqD=*cnuG zlDQ!_0BDhFiEBhjN@7W>RdP`(kYX@0Ff!FOFw-@%3^6pfGBUF=w$wH-ure^Hou07( yMMG|WN@iLmZVf!AF312iXuxeK$;?eHE=kNSz^y0x{>Q^WJq(_%elF{r5}E+qs_0Ar literal 0 HcmV?d00001 diff --git a/sprites/spr_cata_right_trim_2/spr_cata_right_trim_2.yy b/sprites/spr_cata_right_trim_2/spr_cata_right_trim_2.yy new file mode 100644 index 0000000000..594a72a08b --- /dev/null +++ b/sprites/spr_cata_right_trim_2/spr_cata_right_trim_2.yy @@ -0,0 +1,92 @@ +{ + "$GMSprite":"v2", + "%Name":"spr_cata_right_trim_2", + "bboxMode":0, + "bbox_bottom":59, + "bbox_left":14, + "bbox_right":48, + "bbox_top":31, + "collisionKind":1, + "collisionTolerance":0, + "DynamicTexturePage":false, + "edgeFiltering":false, + "For3D":false, + "frames":[ + {"$GMSpriteFrame":"v1","%Name":"3089b56b-6212-4848-9073-c4e15cbc81bb","name":"3089b56b-6212-4848-9073-c4e15cbc81bb","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + ], + "gridX":0, + "gridY":0, + "height":232, + "HTile":false, + "layers":[ + {"$GMImageLayer":"","%Name":"dfc1dfcf-f929-412a-ae9d-ce4a40087c21","blendMode":0,"displayName":"default","isLocked":false,"name":"dfc1dfcf-f929-412a-ae9d-ce4a40087c21","opacity":100.0,"resourceType":"GMImageLayer","resourceVersion":"2.0","visible":true,}, + ], + "name":"spr_cata_right_trim_2", + "nineSlice":null, + "origin":0, + "parent":{ + "name":"cata_complex", + "path":"folders/Sprites/Marine Viewer/body_types/cata_complex.yy", + }, + "preMultiplyAlpha":false, + "resourceType":"GMSprite", + "resourceVersion":"2.0", + "sequence":{ + "$GMSequence":"v1", + "%Name":"spr_cata_right_trim", + "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_cata_right_trim", + "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":"3089b56b-6212-4848-9073-c4e15cbc81bb","path":"sprites/spr_cata_right_trim_2/spr_cata_right_trim_2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"c305edf8-9d2a-4e6f-9195-bb6b63279ba9","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":0.5, + "textureGroupId":{ + "name":"Default", + "path":"texturegroups/Default", + }, + "type":0, + "VTile":false, + "width":167, +} \ No newline at end of file diff --git a/sprites/spr_cata_shoulder_hanging_leather_left/3fd7e1d5-a9ff-4d84-9e7c-928d601d5549.png b/sprites/spr_cata_shoulder_hanging_leather_left/3fd7e1d5-a9ff-4d84-9e7c-928d601d5549.png new file mode 100644 index 0000000000000000000000000000000000000000..a401b891d93ded12e53dfb75fe04df23f0303c69 GIT binary patch literal 1298 zcmeAS@N?(olHy`uVBq!ia0vp^%Ypa>2OE&=lK2t|q!f}pf_xbms?-=58d?|_egTCV zUNA6}8Za=tN?>5Hn!&&zUNC1@pbb!hEy>&6h2cL4F4((#G6Mq(tEY=&NX4zUckQ#K z(`DE{#CP!+$*48y#R_$J?k?eJ;feLy=D_hqwB(KViAmEhm^!!bYtn077wcWFzwE|? zlZ$&SE;RDIx)4)s_4=LM%aGR_?B@IK+U;&s^V9af-*XP2op^xU4)@>xm~3h$pG=9Y zwVmrXxybz1ck$;BSG9dQI$1|aNpIaUL*G4d7B_chX{euet@(RZ+)%%(_qL#4*|L>E zd9OFu{&%$DNi_hpIJEnAgdmPs)w(>ZU@+OEJt~b3U56$VBR>=QP#U6)V?n%3i;}ysU2T zCW-r|nnLH8H+#DJaAxe?TYCM<>gOLT=4|QJoWri6y5Om0E@SNVb9!ZMUWYsvPiZJy zdH#v{O6R+wFSj_eM?+Fh^KN!Cw3 z^>@z4%l+?_tjaoCJ~wP-U8CKQ8(Ui$TkE;9>g-eBe=j~QvwhIaxxDrJ@2jRaGo`Y( z{T0(l71vy9t5o5Aip zuFS0byLlI%`o8Ow|6=_5Mza3ul*{?es}}n3rc5o^6n6PvRjE!S+xC4SUtXO(-qB%U zUB5k4!@F6c_>h&Bdhe}WUp86&`*@pQ`~CTDrMmx5f6uMiSFp)AdtUdI*MhT~dD3rR zy0qF{{_)@T>(^YXGgeitJU+Yct7QB-;}ZqjD*r$Hx^MrXgIez=_1}2Aw$PVN5)@(P zVg90<_iyXEQT8Xpr0elVi?qspS3jGXo31F}y7%F1cT#HXW|{PNyS)1)0xWV9@9mFt z7QY)Jdfk@e+kcMKOoN9{>dp!s@2f4Z{Pp3!3Ez>;$8T=R&i}JdJ6Zgpjllf6w%cDl zW}U0nVZ@V%D3^M7_I^f0y3V;X0uzCTsg}4#l%yn~>+Bg+s& zGb=*_D2OE&=lK2t|q!f}pf_xbms?-=58d?|_egTCV zUNA6}8Za=tN?>5Hn!&&zUNC1@pbb!hEy>&6h2cL4F4((#G6Mq(tEY=&NX4zUckQ#K z(`DE{#CP!+$*48y#R_$J?k?eJ;feLy=D_hqwB(KViAmEhm^!!bYtn077wcWFzwE|? zlZ$&SE;RDIx)4)s_4=LM%aGR_?B@IK+U;&s^V9af-*XP2op^xU4)@>xm~3h$pG=9Y zwVmrXxybz1ck$;BSG9dQI$1|aNpIaUL*G4d7B_chX{euet@(RZ+)%%(_qL#4*|L>E zd9OFu{&%$DNi_hpIJEnAgdmPs)w(>ZU@+OEJt~b3U56$VBR>=QP#U6)V?n%3i;}ysU2T zCW-r|nnLH8H+#DJaAxe?TYCM<>gOLT=4|QJoWri6y5Om0E@SNVb9!ZMUWYsvPiZJy zdH#v{O6R+wFSj_eM?+Fh^KN!Cw3 z^>@z4%l+?_tjaoCJ~wP-U8CKQ8(Ui$TkE;9>g-eBe=j~QvwhIaxxDrJ@2jRaGo`Y( z{T0(l71vy9t5o5Aip zuFS0byLlI%`o8Ow|6=_5Mza3ul*{?es}}n3rc5o^6n6PvRjE!S+xC4SUtXO(-qB%U zUB5k4!@F6c_>h&Bdhe}WUp86&`*@pQ`~CTDrMmx5f6uMiSFp)AdtUdI*MhT~dD3rR zy0qF{{_)@T>(^YXGgeitJU+Yct7QB-;}ZqjD*r$Hx^MrXgIez=_1}2Aw$PVN5)@(P zVg90<_iyXEQT8Xpr0elVi?qspS3jGXo31F}y7%F1cT#HXW|{PNyS)1)0xWV9@9mFt z7QY)Jdfk@e+kcMKOoN9{>dp!s@2f4Z{Pp3!3Ez>;$8T=R&i}JdJ6Zgpjllf6w%cDl zW}U0nVZ@V%D3^M7_I^f0y3V;X0uzCTsg}4#l%yn~>+Bg+s& zGb=*_D":"", + "Keyframes":[], + "resourceType":"KeyframeStore", + "resourceVersion":"2.0", + }, + "eventStubScript":null, + "eventToFunction":{}, + "length":1.0, + "lockOrigin":false, + "moments":{ + "$KeyframeStore":"", + "Keyframes":[], + "resourceType":"KeyframeStore", + "resourceVersion":"2.0", + }, + "name":"spr_cata_shoulder_hanging_leather_left", + "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":"3fd7e1d5-a9ff-4d84-9e7c-928d601d5549","path":"sprites/spr_cata_shoulder_hanging_leather_left/spr_cata_shoulder_hanging_leather_left.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"f201e4eb-30df-45e3-9a5b-90a48b734e8a","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":0.5, + "textureGroupId":{ + "name":"Default", + "path":"texturegroups/Default", + }, + "type":0, + "VTile":false, + "width":167, +} \ No newline at end of file diff --git a/sprites/spr_cata_shoulder_hanging_leather_left_tips/3d17787f-c1c2-47db-992e-a221a37550a1.png b/sprites/spr_cata_shoulder_hanging_leather_left_tips/3d17787f-c1c2-47db-992e-a221a37550a1.png new file mode 100644 index 0000000000000000000000000000000000000000..0826db2751dbd1b283312ef83882b37c8cb4ff66 GIT binary patch literal 906 zcmeAS@N?(olHy`uVBq!ia0vp^%Ypa>2OE&=lK2t|q!f}pf_xbms?-=58d?|_egTCV zUNA6}8Za=tN?>5Hn!&&zUNC1@pbb!hEy>&6h2cL4F4((#G6Mrst*47)NX4zUw+-{8 z97Wh3xKBBx9az9<9&>=bK>B;kq1=?nB0*QLhsRij7CjfrQ{MTMEi>py(5fkgiJe8k z2Np1v`EF?3y5+w5+9P_+Hy&NDHa;xG2(*bvpfj~Q`EdKP_dR9O{L8n#=Tz^VbvEtg zQ@5`oep2P-zXK{`Ei8A{t&jdzeb-27kw(|8!b6_Qdh6dSE1gGoO z*ZsKhh4+$Q<<>u+-UdIFm^!(6mxcA+h*tfmsyIXI?&Q`}Cl7w9zWeF=`~5GsoC$wg zx>lxd(f!xc%D3}Bt+4Rj&lD=VHN>xP<>u1~4^!S>l1n>!r%3(K$+)jTds~f?_GyXx zNljdp;&SBq`upZhKc=^UJSSJyY6Yt=p#5vbprv-n>Zh1FJSxrpDyo)|`>8xMowa zfpW{{(4Y%yiw_ztsAN!Ie9$Z4bF1$Wo0dui?Wk|7og&;VqF;RaWd~Gns?7h$p3?sI z%e}8=%zw`48+Uu#cENMgDr&0YIHT^C`G?;2`*s&B6ggjg-;)cu)zbc|TRpDY6z;VW zb1mGmZEx?Xn@*YcB1EqNgK<^AjO~oxTFqX~*Z+L3g_PEu+`UV(Z_ztL(?}wtksM_S z=KmQM#$9UIqUrGvs9&|jHKHUXu_V2OE&=lK2t|q!f}pf_xbms?-=58d?|_egTCV zUNA6}8Za=tN?>5Hn!&&zUNC1@pbb!hEy>&6h2cL4F4((#G6Mrst*47)NX4zUw+-{8 z97Wh3xKBBx9az9<9&>=bK>B;kq1=?nB0*QLhsRij7CjfrQ{MTMEi>py(5fkgiJe8k z2Np1v`EF?3y5+w5+9P_+Hy&NDHa;xG2(*bvpfj~Q`EdKP_dR9O{L8n#=Tz^VbvEtg zQ@5`oep2P-zXK{`Ei8A{t&jdzeb-27kw(|8!b6_Qdh6dSE1gGoO z*ZsKhh4+$Q<<>u+-UdIFm^!(6mxcA+h*tfmsyIXI?&Q`}Cl7w9zWeF=`~5GsoC$wg zx>lxd(f!xc%D3}Bt+4Rj&lD=VHN>xP<>u1~4^!S>l1n>!r%3(K$+)jTds~f?_GyXx zNljdp;&SBq`upZhKc=^UJSSJyY6Yt=p#5vbprv-n>Zh1FJSxrpDyo)|`>8xMowa zfpW{{(4Y%yiw_ztsAN!Ie9$Z4bF1$Wo0dui?Wk|7og&;VqF;RaWd~Gns?7h$p3?sI z%e}8=%zw`48+Uu#cENMgDr&0YIHT^C`G?;2`*s&B6ggjg-;)cu)zbc|TRpDY6z;VW zb1mGmZEx?Xn@*YcB1EqNgK<^AjO~oxTFqX~*Z+L3g_PEu+`UV(Z_ztL(?}wtksM_S z=KmQM#$9UIqUrGvs9&|jHKHUXu_V":"", + "Keyframes":[], + "resourceType":"KeyframeStore", + "resourceVersion":"2.0", + }, + "eventStubScript":null, + "eventToFunction":{}, + "length":1.0, + "lockOrigin":false, + "moments":{ + "$KeyframeStore":"", + "Keyframes":[], + "resourceType":"KeyframeStore", + "resourceVersion":"2.0", + }, + "name":"spr_cata_shoulder_hanging_leather_left_tips", + "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":"3d17787f-c1c2-47db-992e-a221a37550a1","path":"sprites/spr_cata_shoulder_hanging_leather_left_tips/spr_cata_shoulder_hanging_leather_left_tips.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"bdcc1b80-0078-4aeb-ac8e-225dc22f11b4","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":0.5, + "textureGroupId":{ + "name":"Default", + "path":"texturegroups/Default", + }, + "type":0, + "VTile":false, + "width":167, +} \ No newline at end of file diff --git a/sprites/spr_cata_shoulder_hanging_leather_right/0eb5da06-be9b-42af-a45c-5652a70e0363.png b/sprites/spr_cata_shoulder_hanging_leather_right/0eb5da06-be9b-42af-a45c-5652a70e0363.png new file mode 100644 index 0000000000000000000000000000000000000000..e0400ec79ac591eceefdaa5f33c64028519ecd83 GIT binary patch literal 948 zcmeAS@N?(olHy`uVBq!ia0vp^%Ypa>2OE&=lK2t|q!f}pf_xbms?-=58d?|_egTCV zUNA6}8Za=tN?>5Hn!&&zUNC1@pbb!hEy>&6h2cL4F4((#G6MtCa!(h>kcwMxZ*S}p z4isUyAic42LQ*vM?A#m{`vYZ1ug$*^rjoFcBbr6!Xp_#ie=bpmZ|fQok{>ojM9fM` z+$KGHZsDZ4C;bx43?~;q5S_{Mur=o0-uGv{S%9_?2M+L^%4f?t)4a`m-u&2{>UD2s znjM_!e{A!KO*yxVQ_pWXH)liU+GgXWB7%bL?1%q+NLcaz$-S*y=cWYhsr+rDq+~DW zyWKYZo6G74I={}Itl0MU=O%Z#Z988+`J$opZ)(|%7PFbf1;(d%qQY;*+f=XNUmDzO z`tI!OQ@?z}WJS7{oc?*$YCh-Oldq5cyyBgOVZq@&NR~!R$%JMT%q&qGL{(e~hWA?GN zo8rGLIemTADqEeuTTY(YdFs@r`0z(B_s8C7%B*1umAQWV8_Q1l-JcGdrCyDlX-`~i zlcnm*`S_4G*IOj{vlamLtCqM%l%yn~>+Bg+s&Gb>XwD?+oZUJsR73b@-fqED`UHx3v IIVCg!038i%-v9sr literal 0 HcmV?d00001 diff --git a/sprites/spr_cata_shoulder_hanging_leather_right/layers/0eb5da06-be9b-42af-a45c-5652a70e0363/240582c2-092d-40fa-9caa-ea64c5a2fc69.png b/sprites/spr_cata_shoulder_hanging_leather_right/layers/0eb5da06-be9b-42af-a45c-5652a70e0363/240582c2-092d-40fa-9caa-ea64c5a2fc69.png new file mode 100644 index 0000000000000000000000000000000000000000..e0400ec79ac591eceefdaa5f33c64028519ecd83 GIT binary patch literal 948 zcmeAS@N?(olHy`uVBq!ia0vp^%Ypa>2OE&=lK2t|q!f}pf_xbms?-=58d?|_egTCV zUNA6}8Za=tN?>5Hn!&&zUNC1@pbb!hEy>&6h2cL4F4((#G6MtCa!(h>kcwMxZ*S}p z4isUyAic42LQ*vM?A#m{`vYZ1ug$*^rjoFcBbr6!Xp_#ie=bpmZ|fQok{>ojM9fM` z+$KGHZsDZ4C;bx43?~;q5S_{Mur=o0-uGv{S%9_?2M+L^%4f?t)4a`m-u&2{>UD2s znjM_!e{A!KO*yxVQ_pWXH)liU+GgXWB7%bL?1%q+NLcaz$-S*y=cWYhsr+rDq+~DW zyWKYZo6G74I={}Itl0MU=O%Z#Z988+`J$opZ)(|%7PFbf1;(d%qQY;*+f=XNUmDzO z`tI!OQ@?z}WJS7{oc?*$YCh-Oldq5cyyBgOVZq@&NR~!R$%JMT%q&qGL{(e~hWA?GN zo8rGLIemTADqEeuTTY(YdFs@r`0z(B_s8C7%B*1umAQWV8_Q1l-JcGdrCyDlX-`~i zlcnm*`S_4G*IOj{vlamLtCqM%l%yn~>+Bg+s&Gb>XwD?+oZUJsR73b@-fqED`UHx3v IIVCg!038i%-v9sr literal 0 HcmV?d00001 diff --git a/sprites/spr_cata_shoulder_hanging_leather_right/spr_cata_shoulder_hanging_leather_right.yy b/sprites/spr_cata_shoulder_hanging_leather_right/spr_cata_shoulder_hanging_leather_right.yy new file mode 100644 index 0000000000..8427ffcab1 --- /dev/null +++ b/sprites/spr_cata_shoulder_hanging_leather_right/spr_cata_shoulder_hanging_leather_right.yy @@ -0,0 +1,92 @@ +{ + "$GMSprite":"v2", + "%Name":"spr_cata_shoulder_hanging_leather_right", + "bboxMode":0, + "bbox_bottom":90, + "bbox_left":8, + "bbox_right":48, + "bbox_top":65, + "collisionKind":1, + "collisionTolerance":0, + "DynamicTexturePage":false, + "edgeFiltering":false, + "For3D":false, + "frames":[ + {"$GMSpriteFrame":"v1","%Name":"0eb5da06-be9b-42af-a45c-5652a70e0363","name":"0eb5da06-be9b-42af-a45c-5652a70e0363","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + ], + "gridX":0, + "gridY":0, + "height":232, + "HTile":false, + "layers":[ + {"$GMImageLayer":"","%Name":"240582c2-092d-40fa-9caa-ea64c5a2fc69","blendMode":0,"displayName":"default","isLocked":false,"name":"240582c2-092d-40fa-9caa-ea64c5a2fc69","opacity":100.0,"resourceType":"GMImageLayer","resourceVersion":"2.0","visible":true,}, + ], + "name":"spr_cata_shoulder_hanging_leather_right", + "nineSlice":null, + "origin":0, + "parent":{ + "name":"cata_complex", + "path":"folders/Sprites/Marine Viewer/body_types/cata_complex.yy", + }, + "preMultiplyAlpha":false, + "resourceType":"GMSprite", + "resourceVersion":"2.0", + "sequence":{ + "$GMSequence":"v1", + "%Name":"spr_cata_shoulder_hanging_leather_right", + "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_cata_shoulder_hanging_leather_right", + "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":"0eb5da06-be9b-42af-a45c-5652a70e0363","path":"sprites/spr_cata_shoulder_hanging_leather_right/spr_cata_shoulder_hanging_leather_right.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"75c64297-842d-4cd1-b9fd-698ef5956138","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":0.5, + "textureGroupId":{ + "name":"Default", + "path":"texturegroups/Default", + }, + "type":0, + "VTile":false, + "width":167, +} \ No newline at end of file diff --git a/sprites/spr_cata_shoulder_hanging_leather_right_tips/41e731d1-cd8b-487b-9fdf-14ab2b776dfd.png b/sprites/spr_cata_shoulder_hanging_leather_right_tips/41e731d1-cd8b-487b-9fdf-14ab2b776dfd.png new file mode 100644 index 0000000000000000000000000000000000000000..ff635b0545efd76901d63675b65118836e2bd9a2 GIT binary patch literal 1537 zcmeAS@N?(olHy`uVBq!ia0vp^%Ypa>2OE&=lK2t|q!f}pf_xbms?-=58d?|_egTCV zUNA6}8Za=tN?>5Hn!&&zUNC1@pbb!hEy>&6h2cL4F4((#G6Mt47f%<*kcwMx@9fRH z9VWr{V6hXMOoM@wg7eLgGnP6}TNBIlgv;t%+NQD-6SQC4*qS}PC)UcMVRK2y z1ECH^=>YcM9PTFde43}WJ$XJ;$6G}6@ExplvS)*jMY;*zNmZ>#Ubp*Uxru2Y#9?agQh*zn(_2gk?5I)ZsF(DJ}QJECxcI`s3W zS6Xwzul{Ph9}@5_`dwvT^9vbi)7R{uD=oCTw%%ULzP{?+(qASQr>IG;{r~s;{?+?0 zZ*U9#>R2)3*SYsM951Ro|Y>UrI*XO*%t=Sr5u z$qTd!9NOO9eeP}O`M(=7u+AYpHt;?>yLTv?ehA+hF@-Pt^2=%F>p?f z|LiXU>kbRqD_SPz7RQD5{=KQD_Ve?dufMN^Xtsx)cYN5>ys+fc-j!#}|GwX|DsQcv zspa}r1tB7Hg@5flfAsH(vo7}+WE4ELvDDi<>q}L|EVbvqx4oS7xyB~O^7H(~&n;j3 zR>cNa>|zpao+)f~@J_7rtZ%()4=;boH?oiv@+rH1;p(E^@QzDrwQr9K%Y%jdJZ`+FCES+Uap)Z@$M@xPwkJ$~=Ggw(m4?cejmt^Jo*7ul=M?%UFPsoeW= zOAUwO5t&j+k#pzcSAY1Ky){Z}jrq~SXdP#chsWjj z<=4~%Z;sg?+S1et9|x8Z|J!}Ozoz@D4COf+Zu**9NuHm>n^UJ~Et{Wa7@w79so_RzxGV=HHW&UpQBPv))g+KZDP8_Aq` zzHiPpcC)$1-xP~aEncgC%Pip)_v)=*e_sz#+%9zq>1S2tUVDf(-W%SSx;EW{?}N~JUFQK^RmsqYnaPj->v7Y z)@Q_1Zcr@M!2Y;CEs5pNt3c(eK*Ll^Tq82OE&=lK2t|q!f}pf_xbms?-=58d?|_egTCV zUNA6}8Za=tN?>5Hn!&&zUNC1@pbb!hEy>&6h2cL4F4((#G6Mt47f%<*kcwMx@9fRH z9VWr{V6hXMOoM@wg7eLgGnP6}TNBIlgv;t%+NQD-6SQC4*qS}PC)UcMVRK2y z1ECH^=>YcM9PTFde43}WJ$XJ;$6G}6@ExplvS)*jMY;*zNmZ>#Ubp*Uxru2Y#9?agQh*zn(_2gk?5I)ZsF(DJ}QJECxcI`s3W zS6Xwzul{Ph9}@5_`dwvT^9vbi)7R{uD=oCTw%%ULzP{?+(qASQr>IG;{r~s;{?+?0 zZ*U9#>R2)3*SYsM951Ro|Y>UrI*XO*%t=Sr5u z$qTd!9NOO9eeP}O`M(=7u+AYpHt;?>yLTv?ehA+hF@-Pt^2=%F>p?f z|LiXU>kbRqD_SPz7RQD5{=KQD_Ve?dufMN^Xtsx)cYN5>ys+fc-j!#}|GwX|DsQcv zspa}r1tB7Hg@5flfAsH(vo7}+WE4ELvDDi<>q}L|EVbvqx4oS7xyB~O^7H(~&n;j3 zR>cNa>|zpao+)f~@J_7rtZ%()4=;boH?oiv@+rH1;p(E^@QzDrwQr9K%Y%jdJZ`+FCES+Uap)Z@$M@xPwkJ$~=Ggw(m4?cejmt^Jo*7ul=M?%UFPsoeW= zOAUwO5t&j+k#pzcSAY1Ky){Z}jrq~SXdP#chsWjj z<=4~%Z;sg?+S1et9|x8Z|J!}Ozoz@D4COf+Zu**9NuHm>n^UJ~Et{Wa7@w79so_RzxGV=HHW&UpQBPv))g+KZDP8_Aq` zzHiPpcC)$1-xP~aEncgC%Pip)_v)=*e_sz#+%9zq>1S2tUVDf(-W%SSx;EW{?}N~JUFQK^RmsqYnaPj->v7Y z)@Q_1Zcr@M!2Y;CEs5pNt3c(eK*Ll^Tq8":"", + "Keyframes":[], + "resourceType":"KeyframeStore", + "resourceVersion":"2.0", + }, + "eventStubScript":null, + "eventToFunction":{}, + "length":1.0, + "lockOrigin":false, + "moments":{ + "$KeyframeStore":"", + "Keyframes":[], + "resourceType":"KeyframeStore", + "resourceVersion":"2.0", + }, + "name":"spr_cata_shoulder_hanging_leather_right_tips", + "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":"41e731d1-cd8b-487b-9fdf-14ab2b776dfd","path":"sprites/spr_cata_shoulder_hanging_leather_right_tips/spr_cata_shoulder_hanging_leather_right_tips.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"83ebed24-9ba0-43c8-9a9c-6b4290f7c2df","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":0.5, + "textureGroupId":{ + "name":"Default", + "path":"texturegroups/Default", + }, + "type":0, + "VTile":false, + "width":167, +} \ No newline at end of file diff --git a/sprites/spr_cata_shoulder_hanging_mail_left/96228507-c627-413d-8026-6a20c334f5e5.png b/sprites/spr_cata_shoulder_hanging_mail_left/96228507-c627-413d-8026-6a20c334f5e5.png new file mode 100644 index 0000000000000000000000000000000000000000..cd6a0acd6a7e88997bc279a2798f423c2807e9b4 GIT binary patch literal 1891 zcmbtT3s93+7XI6!SmfbK3XbyV(p0bzje;~hBvL^9m52`>l28hU5Tif{fyO9LTgxLL zO^`q!P+!1;iJ~9^CIy8+6^J#FAPEo&hJX+(6o`Zd_jh(@r@J%lOlR+%d%ttfx!*Z+ z?tC}z@S#96lg%ao0GNUM{f|Oe3$4j@YoR@V(?Tc&ALI8Q#Q?zBtpJeqEdb~tSJor| zq#^;}RWty2mH~iu61VM$HxyWV;$WaZ@b=xjEUYbt9ATipZ^#+Bb_A2C2!nk$7M!rv zPNMCSCT)obz_sPAM>XK6#)w;ZFZ5oM+^oj;%*t!_R=U~5T2`H{=LptxpUi@N@qX%y z+$$%+Rz2EXX}rN@^!uh68|Aek*8UHnl7C@jop!p2U*mh(4fByvwh9$iUenoqj#R#+ zLd~x6{rT4+UHFaFu_RZwihflF3$D(5mEIQG)1Is9ibQGhS4iats;}}2&Rs+8yq(-D zz7uo=2C}X?9c2^tfWp6zvqI7qeJLkS`C;kgt~Vu%>4&*x*yf6M*0|>K3)&v=$YR64$FcA{*)6~ zT_rUjd$}oD;`yD)`ODTuzB@3|s0~KKSEomc3y2Xis@O0T?=HmAQ-?itqM>3Hk3+)E zwai5{+lOC<5&MJ6>(g-yJcWfHMfTJ6Iyo(kt?jvjIvp3q7o6RjF4N}x?;*B|FYxy1 zT^c{k-Hk`^iy)#Y$#yGK7PFaT8wbHgl5GtHveX09U)|D|UQi#$;m+9vFlB>-cW>Xm z;?kR<5!*ry_j}IXADx=2lWUvdQws|rtV16 z^9Q@+a`|{+q1lC)$;!voPwLu65{n|09^rjl?brABtEJ+ye{fbEoj(2O2i}ZwU!e}2 z7G}HU?yA7vH9;6>#gsW>#(qrXFNI$qJo;7e6upI;vZ$qsTbXrf&-H}jDw@>Vl_+%c z8G-k+Wxd7{BKY#%!$`>wBG}v3op)}GCJ1il!e$w6Yj&tR{7j60C&`X}OQQ!J;ln|L zO9n1%qMw$)pt3A9AK*)Nd}H%(5n2{ri(>mwx2wD_ws6={+%TW7O-utAIYlLF9kAZr z5hRL474tsdrr3es=_2twyblUhKjEqeyGV1Ja+=H=Co<$()Wy_{jGKeBiOD|hP6`OOUJjP;TW55 zSfvqRu!per&8D~@7;#{iMBhMoe&P-alEp)$%dD4XqDt0_uyf~Z6T4xINaw84oAhCC-vBT-#*j_BQAQ> z27A?rl<{%-jZf~`29LjZko^#OiFzormGdJgIYmatjTQh&A zWsV|dU(d{*B+>$7Hd*EHqZv?E6`z7U#vMrvA4#NLAs4Ppix{evN-lTu<;&Osw0k!c z424t5wuu>xdu=Uea4tI>^2o~euZER!xkM(D)n~>R#HbKdf}wQd3K>6b9bPMCUUv|L zl&-kG6Y1u;)72S?^h6?ia1rGHA|#Mw tNpbW)CN!@dlR^Zi|5QjJB@n17F$qb3%o(%nFn!k_7;wn{<`>cD{|WaHXBz+j literal 0 HcmV?d00001 diff --git a/sprites/spr_cata_shoulder_hanging_mail_left/layers/96228507-c627-413d-8026-6a20c334f5e5/2a3cced8-cb88-494c-a915-5cc072e4ee2c.png b/sprites/spr_cata_shoulder_hanging_mail_left/layers/96228507-c627-413d-8026-6a20c334f5e5/2a3cced8-cb88-494c-a915-5cc072e4ee2c.png new file mode 100644 index 0000000000000000000000000000000000000000..cd6a0acd6a7e88997bc279a2798f423c2807e9b4 GIT binary patch literal 1891 zcmbtT3s93+7XI6!SmfbK3XbyV(p0bzje;~hBvL^9m52`>l28hU5Tif{fyO9LTgxLL zO^`q!P+!1;iJ~9^CIy8+6^J#FAPEo&hJX+(6o`Zd_jh(@r@J%lOlR+%d%ttfx!*Z+ z?tC}z@S#96lg%ao0GNUM{f|Oe3$4j@YoR@V(?Tc&ALI8Q#Q?zBtpJeqEdb~tSJor| zq#^;}RWty2mH~iu61VM$HxyWV;$WaZ@b=xjEUYbt9ATipZ^#+Bb_A2C2!nk$7M!rv zPNMCSCT)obz_sPAM>XK6#)w;ZFZ5oM+^oj;%*t!_R=U~5T2`H{=LptxpUi@N@qX%y z+$$%+Rz2EXX}rN@^!uh68|Aek*8UHnl7C@jop!p2U*mh(4fByvwh9$iUenoqj#R#+ zLd~x6{rT4+UHFaFu_RZwihflF3$D(5mEIQG)1Is9ibQGhS4iats;}}2&Rs+8yq(-D zz7uo=2C}X?9c2^tfWp6zvqI7qeJLkS`C;kgt~Vu%>4&*x*yf6M*0|>K3)&v=$YR64$FcA{*)6~ zT_rUjd$}oD;`yD)`ODTuzB@3|s0~KKSEomc3y2Xis@O0T?=HmAQ-?itqM>3Hk3+)E zwai5{+lOC<5&MJ6>(g-yJcWfHMfTJ6Iyo(kt?jvjIvp3q7o6RjF4N}x?;*B|FYxy1 zT^c{k-Hk`^iy)#Y$#yGK7PFaT8wbHgl5GtHveX09U)|D|UQi#$;m+9vFlB>-cW>Xm z;?kR<5!*ry_j}IXADx=2lWUvdQws|rtV16 z^9Q@+a`|{+q1lC)$;!voPwLu65{n|09^rjl?brABtEJ+ye{fbEoj(2O2i}ZwU!e}2 z7G}HU?yA7vH9;6>#gsW>#(qrXFNI$qJo;7e6upI;vZ$qsTbXrf&-H}jDw@>Vl_+%c z8G-k+Wxd7{BKY#%!$`>wBG}v3op)}GCJ1il!e$w6Yj&tR{7j60C&`X}OQQ!J;ln|L zO9n1%qMw$)pt3A9AK*)Nd}H%(5n2{ri(>mwx2wD_ws6={+%TW7O-utAIYlLF9kAZr z5hRL474tsdrr3es=_2twyblUhKjEqeyGV1Ja+=H=Co<$()Wy_{jGKeBiOD|hP6`OOUJjP;TW55 zSfvqRu!per&8D~@7;#{iMBhMoe&P-alEp)$%dD4XqDt0_uyf~Z6T4xINaw84oAhCC-vBT-#*j_BQAQ> z27A?rl<{%-jZf~`29LjZko^#OiFzormGdJgIYmatjTQh&A zWsV|dU(d{*B+>$7Hd*EHqZv?E6`z7U#vMrvA4#NLAs4Ppix{evN-lTu<;&Osw0k!c z424t5wuu>xdu=Uea4tI>^2o~euZER!xkM(D)n~>R#HbKdf}wQd3K>6b9bPMCUUv|L zl&-kG6Y1u;)72S?^h6?ia1rGHA|#Mw tNpbW)CN!@dlR^Zi|5QjJB@n17F$qb3%o(%nFn!k_7;wn{<`>cD{|WaHXBz+j literal 0 HcmV?d00001 diff --git a/sprites/spr_cata_shoulder_hanging_mail_left/spr_cata_shoulder_hanging_mail_left.yy b/sprites/spr_cata_shoulder_hanging_mail_left/spr_cata_shoulder_hanging_mail_left.yy new file mode 100644 index 0000000000..1e65f79f2d --- /dev/null +++ b/sprites/spr_cata_shoulder_hanging_mail_left/spr_cata_shoulder_hanging_mail_left.yy @@ -0,0 +1,92 @@ +{ + "$GMSprite":"v2", + "%Name":"spr_cata_shoulder_hanging_mail_left", + "bboxMode":0, + "bbox_bottom":87, + "bbox_left":122, + "bbox_right":160, + "bbox_top":48, + "collisionKind":1, + "collisionTolerance":0, + "DynamicTexturePage":false, + "edgeFiltering":false, + "For3D":false, + "frames":[ + {"$GMSpriteFrame":"v1","%Name":"96228507-c627-413d-8026-6a20c334f5e5","name":"96228507-c627-413d-8026-6a20c334f5e5","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + ], + "gridX":0, + "gridY":0, + "height":232, + "HTile":false, + "layers":[ + {"$GMImageLayer":"","%Name":"2a3cced8-cb88-494c-a915-5cc072e4ee2c","blendMode":0,"displayName":"default","isLocked":false,"name":"2a3cced8-cb88-494c-a915-5cc072e4ee2c","opacity":100.0,"resourceType":"GMImageLayer","resourceVersion":"2.0","visible":true,}, + ], + "name":"spr_cata_shoulder_hanging_mail_left", + "nineSlice":null, + "origin":0, + "parent":{ + "name":"cata_complex", + "path":"folders/Sprites/Marine Viewer/body_types/cata_complex.yy", + }, + "preMultiplyAlpha":false, + "resourceType":"GMSprite", + "resourceVersion":"2.0", + "sequence":{ + "$GMSequence":"v1", + "%Name":"spr_cata_shoulder_hanging_mail_left", + "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_cata_shoulder_hanging_mail_left", + "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":"96228507-c627-413d-8026-6a20c334f5e5","path":"sprites/spr_cata_shoulder_hanging_mail_left/spr_cata_shoulder_hanging_mail_left.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"f0fc2abe-dfd7-4f83-800f-3700b431f400","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":0.5, + "textureGroupId":{ + "name":"Default", + "path":"texturegroups/Default", + }, + "type":0, + "VTile":false, + "width":167, +} \ No newline at end of file diff --git a/sprites/spr_cata_shoulder_hanging_mail_right/9d7300ff-3623-424a-9eaa-57079cf97c42.png b/sprites/spr_cata_shoulder_hanging_mail_right/9d7300ff-3623-424a-9eaa-57079cf97c42.png new file mode 100644 index 0000000000000000000000000000000000000000..dcb80960931b78a601cdbea5ead8b13c484cc2be GIT binary patch literal 1970 zcmb7FX;hPE7XGGMwJz8?MHWfX8fla*P(c#5vBMUDP(T4AL1hbJjgSNa2)F89E(wG9b-+lXzo$$8Cl zAI=V){Y)v7-+IrDc*4{m^XqTlP9-F0+1){EsvG+9O0Pib#v7hRQBOjD+@Gg&=7AhO z^wk;p?w07BEn`RazYZmSWRsZbD9a8;Xs-G#QRV(0WDU?e=gD`4e+)C*|k<2gE zSvAS9J2h6MnRwG=?RLCxsv4Fj-fHiJGvnG~MfzL1H(uzNhZ{2n<|#$Pb^=?vjoOE5 z(P`tckpZ>67uU=Vzo?MII7*GU)D+H|^WfK-g1p&VK8c?Vr=GQlLwZwt9F+qHKQD;_ z%lDPkRq*B) zx^i~>ZynOf;zvY|fo$_|bsrn4tnY+_G?ne~=G=&!$lBNSL!}Xpue3gvzTy1k-Wr$9 zpQCHW$9VGoSmoTS7rI|BDL*s~KaLXDj5I%8E{qOm)coz7pu$H|Sx{(jn<14l#aXPcUWQr&hlby|*2Jk_Bjsk3`3NM0-z&R9%jc^q8}v}ZP3{~2R z`R#4bW%9L)UzUysqoEQawtvUpWnkURd{@%MR%{ZzccP%;{rIOn6TOsZxdVqYL>Hgo zEY4@S=0MGV+q_dOEnNgv6zx~51pNw)nP-a5$V_d>kR*3BD}=(m<>GrL}cCzrX+Jt7;mwJ$^TCEjBF7DJCYyFOE$38H35_ zN$@R=DVYNPTWt`pmL7c4uRawxAD1Ik7FWpb)RL z$_@<;hhR;f^TZDS4y7WEc|Gj*X_Q=%yaGjqd38L5?nFhp(>LTihE%g6ZPzkZv5lhF z%0|smBjc7;TG^s@2y_yqMedeLsdomtG>Ouu0W*TaY?>w zI=d3Df!2wapa15prnyBn6rySV$Yb~2Z!<3?M~~i15zi1{sOTu-`RPIF>4FJWgl=D> z5qerTqETk%rY#J<_1EqU3dyslcM(`P{N`c=hBz9rFL$;UO0RB???9S`4HV!E$YPFoF^ufO({JZ{Yy!>X#kpLCm|0rvsHcQ3&kYR z-w*nkd|h}q?7-coGPA1bz&iQ|nM_vK(!$to9enjFCAw`o?LC97P($d>B-MQc$%I21 zTLFW2QwagE^dLe}NZTJgUiuQTc{k&Wd$&SpeGJPVz}3^WTi03hmNt=DJ;5X|-&NO^PenGzjD) zASbz#&+}HZ!8S=q);w~fg26*S{-WcZ+B$8lp`qbQmEeP7XRF$h+Np|gKRL~mz3bKyqJ(D&ily_yg%iS2{Os> kr|Am&j{*@N;uk@@8AAADPQGF_>QhfBYqVA64>#`q4u4dY+yDRo literal 0 HcmV?d00001 diff --git a/sprites/spr_cata_shoulder_hanging_mail_right/layers/9d7300ff-3623-424a-9eaa-57079cf97c42/c6dc1f20-2c5f-4f34-bb86-be21f432927c.png b/sprites/spr_cata_shoulder_hanging_mail_right/layers/9d7300ff-3623-424a-9eaa-57079cf97c42/c6dc1f20-2c5f-4f34-bb86-be21f432927c.png new file mode 100644 index 0000000000000000000000000000000000000000..dcb80960931b78a601cdbea5ead8b13c484cc2be GIT binary patch literal 1970 zcmb7FX;hPE7XGGMwJz8?MHWfX8fla*P(c#5vBMUDP(T4AL1hbJjgSNa2)F89E(wG9b-+lXzo$$8Cl zAI=V){Y)v7-+IrDc*4{m^XqTlP9-F0+1){EsvG+9O0Pib#v7hRQBOjD+@Gg&=7AhO z^wk;p?w07BEn`RazYZmSWRsZbD9a8;Xs-G#QRV(0WDU?e=gD`4e+)C*|k<2gE zSvAS9J2h6MnRwG=?RLCxsv4Fj-fHiJGvnG~MfzL1H(uzNhZ{2n<|#$Pb^=?vjoOE5 z(P`tckpZ>67uU=Vzo?MII7*GU)D+H|^WfK-g1p&VK8c?Vr=GQlLwZwt9F+qHKQD;_ z%lDPkRq*B) zx^i~>ZynOf;zvY|fo$_|bsrn4tnY+_G?ne~=G=&!$lBNSL!}Xpue3gvzTy1k-Wr$9 zpQCHW$9VGoSmoTS7rI|BDL*s~KaLXDj5I%8E{qOm)coz7pu$H|Sx{(jn<14l#aXPcUWQr&hlby|*2Jk_Bjsk3`3NM0-z&R9%jc^q8}v}ZP3{~2R z`R#4bW%9L)UzUysqoEQawtvUpWnkURd{@%MR%{ZzccP%;{rIOn6TOsZxdVqYL>Hgo zEY4@S=0MGV+q_dOEnNgv6zx~51pNw)nP-a5$V_d>kR*3BD}=(m<>GrL}cCzrX+Jt7;mwJ$^TCEjBF7DJCYyFOE$38H35_ zN$@R=DVYNPTWt`pmL7c4uRawxAD1Ik7FWpb)RL z$_@<;hhR;f^TZDS4y7WEc|Gj*X_Q=%yaGjqd38L5?nFhp(>LTihE%g6ZPzkZv5lhF z%0|smBjc7;TG^s@2y_yqMedeLsdomtG>Ouu0W*TaY?>w zI=d3Df!2wapa15prnyBn6rySV$Yb~2Z!<3?M~~i15zi1{sOTu-`RPIF>4FJWgl=D> z5qerTqETk%rY#J<_1EqU3dyslcM(`P{N`c=hBz9rFL$;UO0RB???9S`4HV!E$YPFoF^ufO({JZ{Yy!>X#kpLCm|0rvsHcQ3&kYR z-w*nkd|h}q?7-coGPA1bz&iQ|nM_vK(!$to9enjFCAw`o?LC97P($d>B-MQc$%I21 zTLFW2QwagE^dLe}NZTJgUiuQTc{k&Wd$&SpeGJPVz}3^WTi03hmNt=DJ;5X|-&NO^PenGzjD) zASbz#&+}HZ!8S=q);w~fg26*S{-WcZ+B$8lp`qbQmEeP7XRF$h+Np|gKRL~mz3bKyqJ(D&ily_yg%iS2{Os> kr|Am&j{*@N;uk@@8AAADPQGF_>QhfBYqVA64>#`q4u4dY+yDRo literal 0 HcmV?d00001 diff --git a/sprites/spr_cata_shoulder_hanging_mail_right/spr_cata_shoulder_hanging_mail_right.yy b/sprites/spr_cata_shoulder_hanging_mail_right/spr_cata_shoulder_hanging_mail_right.yy new file mode 100644 index 0000000000..ca9fff2bd8 --- /dev/null +++ b/sprites/spr_cata_shoulder_hanging_mail_right/spr_cata_shoulder_hanging_mail_right.yy @@ -0,0 +1,92 @@ +{ + "$GMSprite":"v2", + "%Name":"spr_cata_shoulder_hanging_mail_right", + "bboxMode":0, + "bbox_bottom":87, + "bbox_left":10, + "bbox_right":48, + "bbox_top":48, + "collisionKind":1, + "collisionTolerance":0, + "DynamicTexturePage":false, + "edgeFiltering":false, + "For3D":false, + "frames":[ + {"$GMSpriteFrame":"v1","%Name":"9d7300ff-3623-424a-9eaa-57079cf97c42","name":"9d7300ff-3623-424a-9eaa-57079cf97c42","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + ], + "gridX":0, + "gridY":0, + "height":232, + "HTile":false, + "layers":[ + {"$GMImageLayer":"","%Name":"c6dc1f20-2c5f-4f34-bb86-be21f432927c","blendMode":0,"displayName":"default","isLocked":false,"name":"c6dc1f20-2c5f-4f34-bb86-be21f432927c","opacity":100.0,"resourceType":"GMImageLayer","resourceVersion":"2.0","visible":true,}, + ], + "name":"spr_cata_shoulder_hanging_mail_right", + "nineSlice":null, + "origin":0, + "parent":{ + "name":"cata_complex", + "path":"folders/Sprites/Marine Viewer/body_types/cata_complex.yy", + }, + "preMultiplyAlpha":false, + "resourceType":"GMSprite", + "resourceVersion":"2.0", + "sequence":{ + "$GMSequence":"v1", + "%Name":"spr_cata_shoulder_hanging_mail_right", + "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_cata_shoulder_hanging_mail_right", + "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":"9d7300ff-3623-424a-9eaa-57079cf97c42","path":"sprites/spr_cata_shoulder_hanging_mail_right/spr_cata_shoulder_hanging_mail_right.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"931584ff-4240-467d-9557-240c64a7aecb","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":0.5, + "textureGroupId":{ + "name":"Default", + "path":"texturegroups/Default", + }, + "type":0, + "VTile":false, + "width":167, +} \ No newline at end of file diff --git a/sprites/spr_cata_tabbard_leather/b7da30c6-2b5e-4677-92fb-c840f62bb6b0.png b/sprites/spr_cata_tabbard_leather/b7da30c6-2b5e-4677-92fb-c840f62bb6b0.png new file mode 100644 index 0000000000000000000000000000000000000000..f3c4fd08f517178ecf997de55fb3d6f2005a1e71 GIT binary patch literal 934 zcmeAS@N?(olHy`uVBq!ia0vp^%Ypa>2OE&=lK2t|q!f}pf_xbms?-=58d?|_egTCV zUNA6}8Za=tN?>5Hn!&&zUNC1@pbb!hEy>&6h2cL4F4((#G6MtCOivfbkcwMx@7f1N z1&SPa=&h!j_G0eF1o3Y#W1Ph%s4h7vwWfqO(xGdOLTmMggtoZWdm)KJhiVJfJ^!2d zsdnn8gau~3Z*k0@BJ&F zK3Vmg%CdC3LbDtEh5t(eua{cRwGfu&y14U9ncpGxm$T-@-d#?Y&tUY#FsNbgZi{T165^PahXiFU{AT(F9-i)nVLuz4)1Mx{}~CA&_I{RT^FKo8zt{ z{`vZ?@wC^^>Yo^ChXa|xYwdN>R+4Q0kcOkGgJ5a&0$n~umR-#Vuh_wZ=0+W zhJ-wrzL@)W+P7bHo5Q@KRr^KWzeL9a=ikqt zy$vX$UUmBT*(-cueqViY0?}=G!KG%F*YxRS&%^S;0vi>;um6ZPu z@X~zx^XbkhL8qp#mtTE7Rt_64!{5l*E!$tK_0oAjM#0U}UOmV5Vzi8DeN?Wn^JxV5)6kU}a#?HRV+#iiX_$ ul+3hB+!}tL40;OGpaHj`Br`X)xFj*R0JokscZ#h*-tctwb6Mw<&;$TbDQCR^ literal 0 HcmV?d00001 diff --git a/sprites/spr_cata_tabbard_leather/layers/b7da30c6-2b5e-4677-92fb-c840f62bb6b0/f7e76e87-6037-4a79-b25a-e22e28f39da2.png b/sprites/spr_cata_tabbard_leather/layers/b7da30c6-2b5e-4677-92fb-c840f62bb6b0/f7e76e87-6037-4a79-b25a-e22e28f39da2.png new file mode 100644 index 0000000000000000000000000000000000000000..f3c4fd08f517178ecf997de55fb3d6f2005a1e71 GIT binary patch literal 934 zcmeAS@N?(olHy`uVBq!ia0vp^%Ypa>2OE&=lK2t|q!f}pf_xbms?-=58d?|_egTCV zUNA6}8Za=tN?>5Hn!&&zUNC1@pbb!hEy>&6h2cL4F4((#G6MtCOivfbkcwMx@7f1N z1&SPa=&h!j_G0eF1o3Y#W1Ph%s4h7vwWfqO(xGdOLTmMggtoZWdm)KJhiVJfJ^!2d zsdnn8gau~3Z*k0@BJ&F zK3Vmg%CdC3LbDtEh5t(eua{cRwGfu&y14U9ncpGxm$T-@-d#?Y&tUY#FsNbgZi{T165^PahXiFU{AT(F9-i)nVLuz4)1Mx{}~CA&_I{RT^FKo8zt{ z{`vZ?@wC^^>Yo^ChXa|xYwdN>R+4Q0kcOkGgJ5a&0$n~umR-#Vuh_wZ=0+W zhJ-wrzL@)W+P7bHo5Q@KRr^KWzeL9a=ikqt zy$vX$UUmBT*(-cueqViY0?}=G!KG%F*YxRS&%^S;0vi>;um6ZPu z@X~zx^XbkhL8qp#mtTE7Rt_64!{5l*E!$tK_0oAjM#0U}UOmV5Vzi8DeN?Wn^JxV5)6kU}a#?HRV+#iiX_$ ul+3hB+!}tL40;OGpaHj`Br`X)xFj*R0JokscZ#h*-tctwb6Mw<&;$TbDQCR^ literal 0 HcmV?d00001 diff --git a/sprites/spr_cata_tabbard_leather/spr_cata_tabbard_leather.yy b/sprites/spr_cata_tabbard_leather/spr_cata_tabbard_leather.yy new file mode 100644 index 0000000000..322fbaf862 --- /dev/null +++ b/sprites/spr_cata_tabbard_leather/spr_cata_tabbard_leather.yy @@ -0,0 +1,92 @@ +{ + "$GMSprite":"v2", + "%Name":"spr_cata_tabbard_leather", + "bboxMode":0, + "bbox_bottom":166, + "bbox_left":72, + "bbox_right":98, + "bbox_top":112, + "collisionKind":1, + "collisionTolerance":0, + "DynamicTexturePage":false, + "edgeFiltering":false, + "For3D":false, + "frames":[ + {"$GMSpriteFrame":"v1","%Name":"b7da30c6-2b5e-4677-92fb-c840f62bb6b0","name":"b7da30c6-2b5e-4677-92fb-c840f62bb6b0","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + ], + "gridX":0, + "gridY":0, + "height":232, + "HTile":false, + "layers":[ + {"$GMImageLayer":"","%Name":"f7e76e87-6037-4a79-b25a-e22e28f39da2","blendMode":0,"displayName":"default","isLocked":false,"name":"f7e76e87-6037-4a79-b25a-e22e28f39da2","opacity":100.0,"resourceType":"GMImageLayer","resourceVersion":"2.0","visible":true,}, + ], + "name":"spr_cata_tabbard_leather", + "nineSlice":null, + "origin":0, + "parent":{ + "name":"cata_complex", + "path":"folders/Sprites/Marine Viewer/body_types/cata_complex.yy", + }, + "preMultiplyAlpha":false, + "resourceType":"GMSprite", + "resourceVersion":"2.0", + "sequence":{ + "$GMSequence":"v1", + "%Name":"spr_cata_tabbard_leather", + "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_cata_tabbard_leather", + "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":"b7da30c6-2b5e-4677-92fb-c840f62bb6b0","path":"sprites/spr_cata_tabbard_leather/spr_cata_tabbard_leather.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"c2da563d-1a99-41bc-9c06-51e9619bf7a0","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":0.5, + "textureGroupId":{ + "name":"Default", + "path":"texturegroups/Default", + }, + "type":0, + "VTile":false, + "width":167, +} \ No newline at end of file diff --git a/sprites/spr_cata_tabbard_leather_hangings/16ff2f35-0659-40fa-be7a-7a2942a2c47e.png b/sprites/spr_cata_tabbard_leather_hangings/16ff2f35-0659-40fa-be7a-7a2942a2c47e.png new file mode 100644 index 0000000000000000000000000000000000000000..a9b3ff5720b1574f225353737866c7a59104d5bd GIT binary patch literal 647 zcmeAS@N?(olHy`uVBq!ia0vp^%Ypa>2OE&=lK2t|q!f}pf_xbms?-=58d?|_egTCV zUNA6}8Za=tN?>5Hn!&&zUNC1@pbb!hEy>&6h2cL4F4((#G6Mr+m8XkiNX4zUS2p?{ zb`W8EVBevp;X21?(J6^DjW3#A`X@v%am`TBaX2W_BQkxNgW5p}>xm9(FMez7um1M( z-Jjc>KvU@hKFrryHaW|1Zb)uv`1<^F+p^92+TsoT@1>*r~o%y@D3pX#BV?b94ezpkpyzxcqR?E0VEy=5;-TW87fz5HIq{Lsu-^bAiu`%CFCP={)XYeY#( zVo9o1a#1RfVlXl=GSxLO(>1aTF*LL?HncJ{);2J(GBA)R)&7p6AvZrIGp!Q0hD?pg k-ari+a2rZ8b5n~;5_1c1>#?)lGzH`jPgg&ebxsLQ08NU)D*ylh literal 0 HcmV?d00001 diff --git a/sprites/spr_cata_tabbard_leather_hangings/layers/16ff2f35-0659-40fa-be7a-7a2942a2c47e/a8907230-deee-4373-af6a-ec8ca94f1d81.png b/sprites/spr_cata_tabbard_leather_hangings/layers/16ff2f35-0659-40fa-be7a-7a2942a2c47e/a8907230-deee-4373-af6a-ec8ca94f1d81.png new file mode 100644 index 0000000000000000000000000000000000000000..a9b3ff5720b1574f225353737866c7a59104d5bd GIT binary patch literal 647 zcmeAS@N?(olHy`uVBq!ia0vp^%Ypa>2OE&=lK2t|q!f}pf_xbms?-=58d?|_egTCV zUNA6}8Za=tN?>5Hn!&&zUNC1@pbb!hEy>&6h2cL4F4((#G6Mr+m8XkiNX4zUS2p?{ zb`W8EVBevp;X21?(J6^DjW3#A`X@v%am`TBaX2W_BQkxNgW5p}>xm9(FMez7um1M( z-Jjc>KvU@hKFrryHaW|1Zb)uv`1<^F+p^92+TsoT@1>*r~o%y@D3pX#BV?b94ezpkpyzxcqR?E0VEy=5;-TW87fz5HIq{Lsu-^bAiu`%CFCP={)XYeY#( zVo9o1a#1RfVlXl=GSxLO(>1aTF*LL?HncJ{);2J(GBA)R)&7p6AvZrIGp!Q0hD?pg k-ari+a2rZ8b5n~;5_1c1>#?)lGzH`jPgg&ebxsLQ08NU)D*ylh literal 0 HcmV?d00001 diff --git a/sprites/spr_cata_tabbard_leather_hangings/spr_cata_tabbard_leather_hangings.yy b/sprites/spr_cata_tabbard_leather_hangings/spr_cata_tabbard_leather_hangings.yy new file mode 100644 index 0000000000..8acf0ccdcc --- /dev/null +++ b/sprites/spr_cata_tabbard_leather_hangings/spr_cata_tabbard_leather_hangings.yy @@ -0,0 +1,92 @@ +{ + "$GMSprite":"v2", + "%Name":"spr_cata_tabbard_leather_hangings", + "bboxMode":0, + "bbox_bottom":170, + "bbox_left":72, + "bbox_right":98, + "bbox_top":163, + "collisionKind":1, + "collisionTolerance":0, + "DynamicTexturePage":false, + "edgeFiltering":false, + "For3D":false, + "frames":[ + {"$GMSpriteFrame":"v1","%Name":"16ff2f35-0659-40fa-be7a-7a2942a2c47e","name":"16ff2f35-0659-40fa-be7a-7a2942a2c47e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + ], + "gridX":0, + "gridY":0, + "height":232, + "HTile":false, + "layers":[ + {"$GMImageLayer":"","%Name":"a8907230-deee-4373-af6a-ec8ca94f1d81","blendMode":0,"displayName":"default","isLocked":false,"name":"a8907230-deee-4373-af6a-ec8ca94f1d81","opacity":100.0,"resourceType":"GMImageLayer","resourceVersion":"2.0","visible":true,}, + ], + "name":"spr_cata_tabbard_leather_hangings", + "nineSlice":null, + "origin":0, + "parent":{ + "name":"cata_complex", + "path":"folders/Sprites/Marine Viewer/body_types/cata_complex.yy", + }, + "preMultiplyAlpha":false, + "resourceType":"GMSprite", + "resourceVersion":"2.0", + "sequence":{ + "$GMSequence":"v1", + "%Name":"spr_cata_tabbard_leather_hangings", + "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_cata_tabbard_leather_hangings", + "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":"16ff2f35-0659-40fa-be7a-7a2942a2c47e","path":"sprites/spr_cata_tabbard_leather_hangings/spr_cata_tabbard_leather_hangings.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"64be6f6e-7313-418a-a91f-e3568f378b03","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":0.5, + "textureGroupId":{ + "name":"Default", + "path":"texturegroups/Default", + }, + "type":0, + "VTile":false, + "width":167, +} \ No newline at end of file diff --git a/sprites/spr_cata_tabbard_mail/00c36dff-f59c-419f-acac-bf30655b425b.png b/sprites/spr_cata_tabbard_mail/00c36dff-f59c-419f-acac-bf30655b425b.png new file mode 100644 index 0000000000000000000000000000000000000000..f3c17eb3545c4075b564839622adb69532eda292 GIT binary patch literal 948 zcmeAS@N?(olHy`uVBq!ia0vp^%Ypa>2OE&=lK2t|q!f}pf_xbms?-=58d?|_egTCV zUNA6}8Za=tN?>5Hn!&&zUNC1@pbb!hEy>&6h2cL4F4((#G6MtCa!(h>kcwMx@7&J4 z?I6&0F>wOhHj8Zs#Lfu4iHeZ%PKfhypQ3+@af#xTIm|2uV*4~su;=|_*Jc75Miuai zCw+fI`o*Z*a$omeFa7%dLu))pU_-m*`C=EBp2rfOZH`;?750C2Z~K4d$jlGFe*OCR z@$~7_ch6f2r62ltq`RY{x_b9-OZP`_w#1)&Y;kOpj-cR1ozt=Be$KKGmMfeZKd)Hj zT#I|m)9KG;IyYb5yZ+PZ;(co8ShDv{vk+eMHR{oul(pA|)0?)&dC%dzR;625w&~jI zPUC}7>s29&tRr84Ju)+4?R6oDqPc6nRz33Ba4j3E$nRQ}ZJ}Dk>#a~l>e+keK}-fK z+B|t{oIk{5u%b%m?A+=jp>?(I=03ASvA5z%XkF#GbY!#nM6>6fN48vc&DY`%WXDCk zelCFQ_zl<2Dsr+9Wtm+a9htN2&gIR?7u@K3c}wj4_wm=G ze*f59FaPh;lRXdrp0se0S@-O)uzvN__2OE&=lK2t|q!f}pf_xbms?-=58d?|_egTCV zUNA6}8Za=tN?>5Hn!&&zUNC1@pbb!hEy>&6h2cL4F4((#G6MtCa!(h>kcwMx@7&J4 z?I6&0F>wOhHj8Zs#Lfu4iHeZ%PKfhypQ3+@af#xTIm|2uV*4~su;=|_*Jc75Miuai zCw+fI`o*Z*a$omeFa7%dLu))pU_-m*`C=EBp2rfOZH`;?750C2Z~K4d$jlGFe*OCR z@$~7_ch6f2r62ltq`RY{x_b9-OZP`_w#1)&Y;kOpj-cR1ozt=Be$KKGmMfeZKd)Hj zT#I|m)9KG;IyYb5yZ+PZ;(co8ShDv{vk+eMHR{oul(pA|)0?)&dC%dzR;625w&~jI zPUC}7>s29&tRr84Ju)+4?R6oDqPc6nRz33Ba4j3E$nRQ}ZJ}Dk>#a~l>e+keK}-fK z+B|t{oIk{5u%b%m?A+=jp>?(I=03ASvA5z%XkF#GbY!#nM6>6fN48vc&DY`%WXDCk zelCFQ_zl<2Dsr+9Wtm+a9htN2&gIR?7u@K3c}wj4_wm=G ze*f59FaPh;lRXdrp0se0S@-O)uzvN__":"", + "Keyframes":[], + "resourceType":"KeyframeStore", + "resourceVersion":"2.0", + }, + "eventStubScript":null, + "eventToFunction":{}, + "length":1.0, + "lockOrigin":false, + "moments":{ + "$KeyframeStore":"", + "Keyframes":[], + "resourceType":"KeyframeStore", + "resourceVersion":"2.0", + }, + "name":"spr_cata_tabbard_mail", + "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":"00c36dff-f59c-419f-acac-bf30655b425b","path":"sprites/spr_cata_tabbard_mail/spr_cata_tabbard_mail.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"6b7ccbf8-79af-453d-b7a3-0d2465ae44b4","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":0.5, + "textureGroupId":{ + "name":"Default", + "path":"texturegroups/Default", + }, + "type":0, + "VTile":false, + "width":167, +} \ No newline at end of file diff --git a/sprites/spr_data_slate_border/spr_data_slate_border.yy b/sprites/spr_data_slate_border/spr_data_slate_border.yy index 7c7257dbef..de6a44a80a 100644 --- a/sprites/spr_data_slate_border/spr_data_slate_border.yy +++ b/sprites/spr_data_slate_border/spr_data_slate_border.yy @@ -63,12 +63,16 @@ "playbackSpeedType":0, "resourceType":"GMSequence", "resourceVersion":"2.0", + "seqHeight":378.0, + "seqWidth":572.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":"88d208ab-efc3-4c8a-a23a-ac1685249362","path":"sprites/spr_data_slate_border/spr_data_slate_border.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"04c63da1-0ff3-4f5f-96b4-c76aef79bd9a","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"88d208ab-efc3-4c8a-a23a-ac1685249362","path":"sprites/spr_data_slate_border/spr_data_slate_border.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"04c63da1-0ff3-4f5f-96b4-c76aef79bd9a","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_disposition_small/spr_disposition_small.yy b/sprites/spr_disposition_small/spr_disposition_small.yy index ece05031eb..7ad3a04694 100644 --- a/sprites/spr_disposition_small/spr_disposition_small.yy +++ b/sprites/spr_disposition_small/spr_disposition_small.yy @@ -82,37 +82,76 @@ "playbackSpeedType":1, "resourceType":"GMSequence", "resourceVersion":"2.0", + "seqHeight":12.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":"265ceb15-4b8f-4dc9-a884-5dcda1fe699c","path":"sprites/spr_disposition_small/spr_disposition_small.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"8e307151-41a5-41b6-b862-4438a5c7e325","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"2a2f2dcc-2dc9-4455-a25a-f8101ce83a5d","path":"sprites/spr_disposition_small/spr_disposition_small.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"df11f753-ac31-414a-be21-2408615ab6ef","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"da8c652b-5cd4-4a77-82fb-c4e5ddf12bcb","path":"sprites/spr_disposition_small/spr_disposition_small.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"26d46a87-74b7-47e4-be7a-f40c00f59ded","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"14e2bb36-0557-44c7-adc4-29fd8416ae52","path":"sprites/spr_disposition_small/spr_disposition_small.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"034fe571-6a88-44e9-86e2-2f1fbabd8bae","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"bb0286e5-715d-48cd-ae8d-55cc23aa8338","path":"sprites/spr_disposition_small/spr_disposition_small.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"5d2099ab-553c-41bf-85f9-d53de7c07705","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"94e48fa1-3322-45ba-92cf-f110f2459f0c","path":"sprites/spr_disposition_small/spr_disposition_small.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"98b1c16e-3a59-41f0-bff7-9dce3191cf08","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"0c040a23-c32e-44fa-9fcd-d9d73c08aae1","path":"sprites/spr_disposition_small/spr_disposition_small.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"c761ef3d-888c-4e34-b1a7-ca0e49826e0d","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"b28fff07-5ae9-4bd1-83ec-d132ebe19539","path":"sprites/spr_disposition_small/spr_disposition_small.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"bf5050c4-b78b-4cc5-895c-11b56e379d37","IsCreationKey":false,"Key":7.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"ccd4090d-a362-4e5a-ae92-93f64fd8f6eb","path":"sprites/spr_disposition_small/spr_disposition_small.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"0871f803-6f6a-4da9-b743-2bc6371e9901","IsCreationKey":false,"Key":8.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"6afb8843-a801-4150-bc19-748f64616e10","path":"sprites/spr_disposition_small/spr_disposition_small.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"3515c2e0-ed2e-4b09-9f8b-5ad40ee7b27e","IsCreationKey":false,"Key":9.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"e008a202-76e4-4962-a956-7a8b9821ad70","path":"sprites/spr_disposition_small/spr_disposition_small.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"4c2701ed-b5ac-430c-8e0d-237d677ad22e","IsCreationKey":false,"Key":10.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"d85dac91-f7e9-4bd7-b6fd-785c29834763","path":"sprites/spr_disposition_small/spr_disposition_small.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"a2679063-8d43-4cdb-aa80-e81608c9e268","IsCreationKey":false,"Key":11.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"ca49fe1f-56fa-4fc1-afc2-e9800609be80","path":"sprites/spr_disposition_small/spr_disposition_small.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"44ecbdf1-4beb-4b25-b137-5488f3afde8c","IsCreationKey":false,"Key":12.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"3f2bfa1c-4599-4db1-b938-6b2ef778ad28","path":"sprites/spr_disposition_small/spr_disposition_small.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"f6627939-2067-44e2-a27e-b929a9c7df9f","IsCreationKey":false,"Key":13.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"abc1f8ae-d1a3-4d6c-8ee3-5bd5f8787746","path":"sprites/spr_disposition_small/spr_disposition_small.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"ef18068d-97ab-4f38-a98a-26e303a5fa09","IsCreationKey":false,"Key":14.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"088f95db-0409-472a-97f2-bc8310ee706f","path":"sprites/spr_disposition_small/spr_disposition_small.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"82aee3c2-3e31-4660-8fbb-bbe314340aa9","IsCreationKey":false,"Key":15.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"202f3a87-4a57-4f10-a8cb-da641e276729","path":"sprites/spr_disposition_small/spr_disposition_small.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"3444a467-5735-4b89-b4f9-86a3bbbf2ce4","IsCreationKey":false,"Key":16.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"c9e74c28-ba7e-48b8-b057-aa75cf9c695d","path":"sprites/spr_disposition_small/spr_disposition_small.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"e77b6427-c350-4160-b06a-346aaf89d2fb","IsCreationKey":false,"Key":17.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"bfe18a47-5559-4a67-9b4a-bcbe2f79dee6","path":"sprites/spr_disposition_small/spr_disposition_small.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"3f713e9d-6c7e-423d-be83-7e2036f7a12f","IsCreationKey":false,"Key":18.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"d713f514-9693-4f7f-b0c0-f6019b536321","path":"sprites/spr_disposition_small/spr_disposition_small.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"b8e98a57-b0f0-4f37-ba00-4a66bb6db318","IsCreationKey":false,"Key":19.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"265ceb15-4b8f-4dc9-a884-5dcda1fe699c","path":"sprites/spr_disposition_small/spr_disposition_small.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"8e307151-41a5-41b6-b862-4438a5c7e325","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"2a2f2dcc-2dc9-4455-a25a-f8101ce83a5d","path":"sprites/spr_disposition_small/spr_disposition_small.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"df11f753-ac31-414a-be21-2408615ab6ef","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"da8c652b-5cd4-4a77-82fb-c4e5ddf12bcb","path":"sprites/spr_disposition_small/spr_disposition_small.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"26d46a87-74b7-47e4-be7a-f40c00f59ded","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"14e2bb36-0557-44c7-adc4-29fd8416ae52","path":"sprites/spr_disposition_small/spr_disposition_small.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"034fe571-6a88-44e9-86e2-2f1fbabd8bae","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"bb0286e5-715d-48cd-ae8d-55cc23aa8338","path":"sprites/spr_disposition_small/spr_disposition_small.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"5d2099ab-553c-41bf-85f9-d53de7c07705","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"94e48fa1-3322-45ba-92cf-f110f2459f0c","path":"sprites/spr_disposition_small/spr_disposition_small.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"98b1c16e-3a59-41f0-bff7-9dce3191cf08","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"0c040a23-c32e-44fa-9fcd-d9d73c08aae1","path":"sprites/spr_disposition_small/spr_disposition_small.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"c761ef3d-888c-4e34-b1a7-ca0e49826e0d","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"b28fff07-5ae9-4bd1-83ec-d132ebe19539","path":"sprites/spr_disposition_small/spr_disposition_small.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"bf5050c4-b78b-4cc5-895c-11b56e379d37","IsCreationKey":false,"Key":7.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"ccd4090d-a362-4e5a-ae92-93f64fd8f6eb","path":"sprites/spr_disposition_small/spr_disposition_small.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"0871f803-6f6a-4da9-b743-2bc6371e9901","IsCreationKey":false,"Key":8.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"6afb8843-a801-4150-bc19-748f64616e10","path":"sprites/spr_disposition_small/spr_disposition_small.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"3515c2e0-ed2e-4b09-9f8b-5ad40ee7b27e","IsCreationKey":false,"Key":9.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"e008a202-76e4-4962-a956-7a8b9821ad70","path":"sprites/spr_disposition_small/spr_disposition_small.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"4c2701ed-b5ac-430c-8e0d-237d677ad22e","IsCreationKey":false,"Key":10.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"d85dac91-f7e9-4bd7-b6fd-785c29834763","path":"sprites/spr_disposition_small/spr_disposition_small.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"a2679063-8d43-4cdb-aa80-e81608c9e268","IsCreationKey":false,"Key":11.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"ca49fe1f-56fa-4fc1-afc2-e9800609be80","path":"sprites/spr_disposition_small/spr_disposition_small.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"44ecbdf1-4beb-4b25-b137-5488f3afde8c","IsCreationKey":false,"Key":12.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"3f2bfa1c-4599-4db1-b938-6b2ef778ad28","path":"sprites/spr_disposition_small/spr_disposition_small.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"f6627939-2067-44e2-a27e-b929a9c7df9f","IsCreationKey":false,"Key":13.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"abc1f8ae-d1a3-4d6c-8ee3-5bd5f8787746","path":"sprites/spr_disposition_small/spr_disposition_small.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"ef18068d-97ab-4f38-a98a-26e303a5fa09","IsCreationKey":false,"Key":14.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"088f95db-0409-472a-97f2-bc8310ee706f","path":"sprites/spr_disposition_small/spr_disposition_small.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"82aee3c2-3e31-4660-8fbb-bbe314340aa9","IsCreationKey":false,"Key":15.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"202f3a87-4a57-4f10-a8cb-da641e276729","path":"sprites/spr_disposition_small/spr_disposition_small.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"3444a467-5735-4b89-b4f9-86a3bbbf2ce4","IsCreationKey":false,"Key":16.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"c9e74c28-ba7e-48b8-b057-aa75cf9c695d","path":"sprites/spr_disposition_small/spr_disposition_small.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"e77b6427-c350-4160-b06a-346aaf89d2fb","IsCreationKey":false,"Key":17.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"bfe18a47-5559-4a67-9b4a-bcbe2f79dee6","path":"sprites/spr_disposition_small/spr_disposition_small.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"3f713e9d-6c7e-423d-be83-7e2036f7a12f","IsCreationKey":false,"Key":18.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"d713f514-9693-4f7f-b0c0-f6019b536321","path":"sprites/spr_disposition_small/spr_disposition_small.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"b8e98a57-b0f0-4f37-ba00-4a66bb6db318","IsCreationKey":false,"Key":19.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_icon_change/spr_icon_change.yy b/sprites/spr_icon_change/spr_icon_change.yy index 66a47febe1..8eafa3e05b 100644 --- a/sprites/spr_icon_change/spr_icon_change.yy +++ b/sprites/spr_icon_change/spr_icon_change.yy @@ -63,18 +63,19 @@ "playbackSpeedType":1, "resourceType":"GMSequence", "resourceVersion":"2.0", + "seqHeight":80.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":"7f321054-1d52-47c4-a451-9447c52b8931","path":"sprites/spr_icon_change/spr_icon_change.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"c6ec8eee-1414-4a10-82fc-83027463d27d","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"7f321054-1d52-47c4-a451-9447c52b8931","path":"sprites/spr_icon_change/spr_icon_change.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"c6ec8eee-1414-4a10-82fc-83027463d27d","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_indomitus_knightly_robe/spr_indomitus_knightly_robe.yy b/sprites/spr_indomitus_knightly_robe/spr_indomitus_knightly_robe.yy index 93cbdfc0b7..88ad31c5d4 100644 --- a/sprites/spr_indomitus_knightly_robe/spr_indomitus_knightly_robe.yy +++ b/sprites/spr_indomitus_knightly_robe/spr_indomitus_knightly_robe.yy @@ -63,12 +63,16 @@ "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":"05afe988-9760-4afd-a9a3-082287887f4a","path":"sprites/spr_indomitus_knightly_robe/spr_indomitus_knightly_robe.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"2e9b4aa7-44d1-4787-b28e-c7cd47428006","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"05afe988-9760-4afd-a9a3-082287887f4a","path":"sprites/spr_indomitus_knightly_robe/spr_indomitus_knightly_robe.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"2e9b4aa7-44d1-4787-b28e-c7cd47428006","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_left_arm/spr_indomitus_left_arm.yy b/sprites/spr_indomitus_left_arm/spr_indomitus_left_arm.yy index c0f008b684..5d3fe8a32c 100644 --- a/sprites/spr_indomitus_left_arm/spr_indomitus_left_arm.yy +++ b/sprites/spr_indomitus_left_arm/spr_indomitus_left_arm.yy @@ -63,12 +63,16 @@ "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":"8165f8b1-f548-43db-a12f-9fb5d46a8ce1","path":"sprites/spr_indomitus_left_arm/spr_indomitus_left_arm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"fe3823bf-9117-481b-bdf0-d43733cc0e54","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"8165f8b1-f548-43db-a12f-9fb5d46a8ce1","path":"sprites/spr_indomitus_left_arm/spr_indomitus_left_arm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"fe3823bf-9117-481b-bdf0-d43733cc0e54","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_left_arm_bionic/spr_indomitus_left_arm_bionic.yy b/sprites/spr_indomitus_left_arm_bionic/spr_indomitus_left_arm_bionic.yy index e3c7f27e5a..d2152c4349 100644 --- a/sprites/spr_indomitus_left_arm_bionic/spr_indomitus_left_arm_bionic.yy +++ b/sprites/spr_indomitus_left_arm_bionic/spr_indomitus_left_arm_bionic.yy @@ -63,12 +63,16 @@ "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":"a3ac1d6f-e781-440e-a110-6fad27f8a376","path":"sprites/spr_indomitus_left_arm_bionic/spr_indomitus_left_arm_bionic.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"a3bc2eae-f410-482e-92ff-a37c8899ad31","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"a3ac1d6f-e781-440e-a110-6fad27f8a376","path":"sprites/spr_indomitus_left_arm_bionic/spr_indomitus_left_arm_bionic.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"a3bc2eae-f410-482e-92ff-a37c8899ad31","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_inspect_small/spr_inspect_small.yy b/sprites/spr_inspect_small/spr_inspect_small.yy index aca5279750..383fc5964c 100644 --- a/sprites/spr_inspect_small/spr_inspect_small.yy +++ b/sprites/spr_inspect_small/spr_inspect_small.yy @@ -63,18 +63,19 @@ "playbackSpeedType":1, "resourceType":"GMSequence", "resourceVersion":"2.0", + "seqHeight":14.0, + "seqWidth":14.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":"0090d381-ea2b-4d42-9d2d-e45e1b50b1f9","path":"sprites/spr_inspect_small/spr_inspect_small.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"25439a65-c8e8-427a-99ad-76bb9aa6510a","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"0090d381-ea2b-4d42-9d2d-e45e1b50b1f9","path":"sprites/spr_inspect_small/spr_inspect_small.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"25439a65-c8e8-427a-99ad-76bb9aa6510a","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_loading2/spr_loading2.yy b/sprites/spr_loading2/spr_loading2.yy index 0d5c7e90f5..79048779ae 100644 --- a/sprites/spr_loading2/spr_loading2.yy +++ b/sprites/spr_loading2/spr_loading2.yy @@ -70,19 +70,37 @@ "playbackSpeedType":1, "resourceType":"GMSequence", "resourceVersion":"2.0", + "seqHeight":31.0, + "seqWidth":31.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":"cfe64c72-788d-4d52-bbd4-58b53f3c2e49","path":"sprites/spr_loading2/spr_loading2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"975627ff-8df0-4e31-9c0d-3a165e9ffa3e","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"8b470910-b621-490a-a783-411ee078b812","path":"sprites/spr_loading2/spr_loading2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"dff72920-d2c1-4bcb-84ea-e539caa245f8","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"05f5f018-2f5d-40a3-a69e-4ef342b4279a","path":"sprites/spr_loading2/spr_loading2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"ec783239-b271-4744-bb34-213183fb1a9d","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"cf510d03-7a34-4777-a6e6-009ebcd6fccc","path":"sprites/spr_loading2/spr_loading2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"736d229f-771c-4808-9b47-82ef5d3714cc","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"37a52a8f-f010-4987-8d6a-4b83e1ff1186","path":"sprites/spr_loading2/spr_loading2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"b15ab235-87fe-4537-8c07-baf077dc99db","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"91f77803-fdbf-45b9-ba2a-d6a00911d13f","path":"sprites/spr_loading2/spr_loading2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"9384749d-c62a-421f-91b2-eab291a261f3","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"41726c78-4d1d-46a5-9941-be0886823037","path":"sprites/spr_loading2/spr_loading2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"e3389ee4-0d85-4801-9fd2-4a1a3975b2cf","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"039f8acb-ac48-46ba-beb3-62711c4d69f8","path":"sprites/spr_loading2/spr_loading2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"2600ef86-25f5-4f17-8f93-e74a66748e6d","IsCreationKey":false,"Key":7.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"cfe64c72-788d-4d52-bbd4-58b53f3c2e49","path":"sprites/spr_loading2/spr_loading2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"975627ff-8df0-4e31-9c0d-3a165e9ffa3e","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"8b470910-b621-490a-a783-411ee078b812","path":"sprites/spr_loading2/spr_loading2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"dff72920-d2c1-4bcb-84ea-e539caa245f8","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"05f5f018-2f5d-40a3-a69e-4ef342b4279a","path":"sprites/spr_loading2/spr_loading2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"ec783239-b271-4744-bb34-213183fb1a9d","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"cf510d03-7a34-4777-a6e6-009ebcd6fccc","path":"sprites/spr_loading2/spr_loading2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"736d229f-771c-4808-9b47-82ef5d3714cc","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"37a52a8f-f010-4987-8d6a-4b83e1ff1186","path":"sprites/spr_loading2/spr_loading2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"b15ab235-87fe-4537-8c07-baf077dc99db","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"91f77803-fdbf-45b9-ba2a-d6a00911d13f","path":"sprites/spr_loading2/spr_loading2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"9384749d-c62a-421f-91b2-eab291a261f3","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"41726c78-4d1d-46a5-9941-be0886823037","path":"sprites/spr_loading2/spr_loading2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"e3389ee4-0d85-4801-9fd2-4a1a3975b2cf","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"039f8acb-ac48-46ba-beb3-62711c4d69f8","path":"sprites/spr_loading2/spr_loading2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"2600ef86-25f5-4f17-8f93-e74a66748e6d","IsCreationKey":false,"Key":7.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_master_splash/spr_master_splash.yy b/sprites/spr_master_splash/spr_master_splash.yy index 431f0e9700..069460fbbd 100644 --- a/sprites/spr_master_splash/spr_master_splash.yy +++ b/sprites/spr_master_splash/spr_master_splash.yy @@ -63,18 +63,19 @@ "playbackSpeedType":1, "resourceType":"GMSequence", "resourceVersion":"2.0", + "seqHeight":480.0, + "seqWidth":214.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":"139198e3-1db0-4dfc-8fd5-2b19c54b05ba","path":"sprites/spr_master_splash/spr_master_splash.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"6ff8d8db-ce0f-44a4-b676-62c6aa9da21d","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"139198e3-1db0-4dfc-8fd5-2b19c54b05ba","path":"sprites/spr_master_splash/spr_master_splash.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"6ff8d8db-ce0f-44a4-b676-62c6aa9da21d","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_mk5_complex/spr_mk5_complex.yy b/sprites/spr_mk5_complex/spr_mk5_complex.yy index 98fc288dd9..44729e5ed3 100644 --- a/sprites/spr_mk5_complex/spr_mk5_complex.yy +++ b/sprites/spr_mk5_complex/spr_mk5_complex.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":"48f72680-cb96-4361-9276-5e8d8552ae9f","path":"sprites/spr_mk5_complex/spr_mk5_complex.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"efd749b6-b89e-48c1-99df-bde59481c13f","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"48f72680-cb96-4361-9276-5e8d8552ae9f","path":"sprites/spr_mk5_complex/spr_mk5_complex.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"efd749b6-b89e-48c1-99df-bde59481c13f","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_mk5_head_variants/spr_mk5_head_variants.yy b/sprites/spr_mk5_head_variants/spr_mk5_head_variants.yy index 0bfe7a9246..3624aadb5a 100644 --- a/sprites/spr_mk5_head_variants/spr_mk5_head_variants.yy +++ b/sprites/spr_mk5_head_variants/spr_mk5_head_variants.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":"6ae9cb2a-6253-4261-9f21-88688afd2163","path":"sprites/spr_mk5_head_variants/spr_mk5_head_variants.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"a7a73431-ca07-41d9-b12f-d718a5984fc6","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"6ae9cb2a-6253-4261-9f21-88688afd2163","path":"sprites/spr_mk5_head_variants/spr_mk5_head_variants.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"a7a73431-ca07-41d9-b12f-d718a5984fc6","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_p_name_bg/spr_p_name_bg.yy b/sprites/spr_p_name_bg/spr_p_name_bg.yy index 0694b71d9f..635a960ec0 100644 --- a/sprites/spr_p_name_bg/spr_p_name_bg.yy +++ b/sprites/spr_p_name_bg/spr_p_name_bg.yy @@ -63,12 +63,16 @@ "playbackSpeedType":0, "resourceType":"GMSequence", "resourceVersion":"2.0", + "seqHeight":272.0, + "seqWidth":415.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":"a11f2334-9852-4e7b-b697-8d03d2b129a2","path":"sprites/spr_p_name_bg/spr_p_name_bg.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"a5f223cb-8fe5-4bd4-bb65-4996f34d2fb3","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"a11f2334-9852-4e7b-b697-8d03d2b129a2","path":"sprites/spr_p_name_bg/spr_p_name_bg.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"a5f223cb-8fe5-4bd4-bb65-4996f34d2fb3","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_penitent_ui/spr_penitent_ui.yy b/sprites/spr_penitent_ui/spr_penitent_ui.yy index d80ed92237..5dd3e84514 100644 --- a/sprites/spr_penitent_ui/spr_penitent_ui.yy +++ b/sprites/spr_penitent_ui/spr_penitent_ui.yy @@ -63,18 +63,19 @@ "playbackSpeedType":1, "resourceType":"GMSequence", "resourceVersion":"2.0", + "seqHeight":25.0, + "seqWidth":194.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":"ce5f6285-54f8-4aef-8e6f-596e2e822426","path":"sprites/spr_penitent_ui/spr_penitent_ui.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"e43885ff-f49c-42e0-9d0c-cfc22ce51284","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"ce5f6285-54f8-4aef-8e6f-596e2e822426","path":"sprites/spr_penitent_ui/spr_penitent_ui.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"e43885ff-f49c-42e0-9d0c-cfc22ce51284","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_popup_dialogue/spr_popup_dialogue.yy b/sprites/spr_popup_dialogue/spr_popup_dialogue.yy index 62bd897e94..2795a77436 100644 --- a/sprites/spr_popup_dialogue/spr_popup_dialogue.yy +++ b/sprites/spr_popup_dialogue/spr_popup_dialogue.yy @@ -63,18 +63,19 @@ "playbackSpeedType":1, "resourceType":"GMSequence", "resourceVersion":"2.0", + "seqHeight":147.0, + "seqWidth":301.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":"e9f89fec-8957-4b51-af6e-afe30a3bec04","path":"sprites/spr_popup_dialogue/spr_popup_dialogue.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"aa362568-b6a2-4a5b-be4a-271695972d87","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"e9f89fec-8957-4b51-af6e-afe30a3bec04","path":"sprites/spr_popup_dialogue/spr_popup_dialogue.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"aa362568-b6a2-4a5b-be4a-271695972d87","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_sell_tiny/spr_sell_tiny.yy b/sprites/spr_sell_tiny/spr_sell_tiny.yy index fc1426eb82..693e29dd37 100644 --- a/sprites/spr_sell_tiny/spr_sell_tiny.yy +++ b/sprites/spr_sell_tiny/spr_sell_tiny.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_sell_tiny", "bboxMode":0, "bbox_bottom":11, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"f686ba29-c495-47b6-96c4-6b5468d59af7","name":"f686ba29-c495-47b6-96c4-6b5468d59af7","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"f686ba29-c495-47b6-96c4-6b5468d59af7","name":"f686ba29-c495-47b6-96c4-6b5468d59af7","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"f686ba29-c495-47b6-96c4-6b5468d59af7","path":"sprites/spr_sell_tiny/spr_sell_tiny.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"aac88065-ea52-440a-b15d-0d3ef7afe71d","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"f686ba29-c495-47b6-96c4-6b5468d59af7","path":"sprites/spr_sell_tiny/spr_sell_tiny.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"aac88065-ea52-440a-b15d-0d3ef7afe71d","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":{ diff --git a/sprites/spr_ship_back_black/spr_ship_back_black.yy b/sprites/spr_ship_back_black/spr_ship_back_black.yy index 14a5f76c8d..56de7d6ac3 100644 --- a/sprites/spr_ship_back_black/spr_ship_back_black.yy +++ b/sprites/spr_ship_back_black/spr_ship_back_black.yy @@ -66,15 +66,25 @@ "playbackSpeedType":0, "resourceType":"GMSequence", "resourceVersion":"2.0", + "seqHeight":142.0, + "seqWidth":268.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":"41b410c3-01c1-440c-bd9d-40498f3ee679","path":"sprites/spr_ship_back_black/spr_ship_back_black.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"d5b49c97-eb68-44d9-85f7-56308f784f56","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"00dd47db-65d6-4276-90cd-12c8e6708bcc","path":"sprites/spr_ship_back_black/spr_ship_back_black.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"6a3f9dfb-09e6-49d7-9e49-459c61fb20c5","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"f84f2a39-f16e-4874-809b-e99be35df387","path":"sprites/spr_ship_back_black/spr_ship_back_black.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"439c05d6-5612-440b-bd9b-3221d09bd73b","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"7f115bba-8dfa-467c-b850-6053b3321a30","path":"sprites/spr_ship_back_black/spr_ship_back_black.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"0b8203b0-1a34-40c1-b27e-a6d7d549bb87","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"41b410c3-01c1-440c-bd9d-40498f3ee679","path":"sprites/spr_ship_back_black/spr_ship_back_black.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"d5b49c97-eb68-44d9-85f7-56308f784f56","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"00dd47db-65d6-4276-90cd-12c8e6708bcc","path":"sprites/spr_ship_back_black/spr_ship_back_black.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"6a3f9dfb-09e6-49d7-9e49-459c61fb20c5","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"f84f2a39-f16e-4874-809b-e99be35df387","path":"sprites/spr_ship_back_black/spr_ship_back_black.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"439c05d6-5612-440b-bd9b-3221d09bd73b","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"7f115bba-8dfa-467c-b850-6053b3321a30","path":"sprites/spr_ship_back_black/spr_ship_back_black.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"0b8203b0-1a34-40c1-b27e-a6d7d549bb87","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_ship_back_white/spr_ship_back_white.yy b/sprites/spr_ship_back_white/spr_ship_back_white.yy index 8403fc60ff..1b067cd323 100644 --- a/sprites/spr_ship_back_white/spr_ship_back_white.yy +++ b/sprites/spr_ship_back_white/spr_ship_back_white.yy @@ -66,15 +66,25 @@ "playbackSpeedType":0, "resourceType":"GMSequence", "resourceVersion":"2.0", + "seqHeight":142.0, + "seqWidth":268.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":"1aa71696-4ad5-412d-9f14-342cd38f5631","path":"sprites/spr_ship_back_white/spr_ship_back_white.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"7305107d-cd32-473d-89ec-c95e03ea3123","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"36a2218b-dff1-41ce-890d-520e37171b31","path":"sprites/spr_ship_back_white/spr_ship_back_white.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"0746d0f4-e483-44c7-b37f-73d286bbe7f1","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"5af2c4c0-c4b0-47ad-a7f1-8ec1d4aea4cf","path":"sprites/spr_ship_back_white/spr_ship_back_white.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"f452a7af-801c-4f84-b0f4-dc73532f0037","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"965b4909-9ecd-4504-9ac1-ad7559c50805","path":"sprites/spr_ship_back_white/spr_ship_back_white.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"6d495220-6a63-4ead-840b-771b34989d14","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"1aa71696-4ad5-412d-9f14-342cd38f5631","path":"sprites/spr_ship_back_white/spr_ship_back_white.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"7305107d-cd32-473d-89ec-c95e03ea3123","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"36a2218b-dff1-41ce-890d-520e37171b31","path":"sprites/spr_ship_back_white/spr_ship_back_white.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"0746d0f4-e483-44c7-b37f-73d286bbe7f1","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"5af2c4c0-c4b0-47ad-a7f1-8ec1d4aea4cf","path":"sprites/spr_ship_back_white/spr_ship_back_white.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"f452a7af-801c-4f84-b0f4-dc73532f0037","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"965b4909-9ecd-4504-9ac1-ad7559c50805","path":"sprites/spr_ship_back_white/spr_ship_back_white.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"6d495220-6a63-4ead-840b-771b34989d14","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, From 6de1e643ff1f32cd8b8ef621bedda2e7632e6af9 Mon Sep 17 00:00:00 2001 From: Werwolf-12 Date: Mon, 30 Jun 2025 00:30:00 +0200 Subject: [PATCH 106/286] feat: More 30k weapons, ruins loot and minor fixes (#894) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: EttyKitty <20323032+EttyKitty@users.noreply.github.com> Co-authored-by: Мастер Чиф <43174917+MCPO-Spartan-117@users.noreply.github.com> Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com> Co-authored-by: Nelsonh --- ChapterMaster.yyp | 6 + objects/obj_creation/Create_0.gml | 4 +- objects/obj_shop/Create_0.gml | 34 +++- .../scr_culture_visuals.gml | 81 ++++++++- .../scr_initialize_custom.gml | 40 ++++- scripts/scr_ruins_reward/scr_ruins_reward.gml | 155 +++++++++++------- scripts/scr_weapon/scr_weapon.gml | 132 ++++++++++++--- .../2ed06758-6cd0-4527-9927-973e6e725413.png | Bin 3280 -> 0 bytes .../c4e4f840-8ea0-4c85-bb84-84e04542593d.png | Bin 0 -> 4022 bytes .../66d899f0-585a-4030-a5a2-ef609d560ae4.png | Bin 884 -> 0 bytes .../cb494c49-00cb-493b-af38-95df8d096948.png | Bin 3010 -> 0 bytes .../59449464-4def-425e-b64e-b57eb4ac3d47.png | Bin 0 -> 4022 bytes .../spr_weapon_autocannon.yy | 19 ++- .../spr_weapon_autocannon2.yy | 6 +- .../aa914076-5f16-4d9a-8ffd-af365eab523c.png | Bin 0 -> 7334 bytes .../9b762d64-5050-4c57-83db-1af2276db342.png | Bin 0 -> 7334 bytes .../spr_weapon_cthon_autocannon.yy | 92 +++++++++++ .../98934121-510d-447a-ad2c-d09856d6ea01.png | Bin 8078 -> 8068 bytes .../4264355a-06ac-4588-8864-b741565dcd32.png | Bin 0 -> 3834 bytes .../e33dd1a2-cee4-48aa-a3b4-db455a74ccc8.png | Bin 0 -> 3834 bytes .../spr_weapon_ph_flmr/spr_weapon_ph_flmr.yy | 111 +++++++++++++ .../79186301-baf7-450c-883c-ee1e52cb08c9.png | Bin 0 -> 6606 bytes .../aa6942f2-99bf-4276-913b-132d5bf1e522.png | Bin 0 -> 6606 bytes .../spr_weapon_powscythe.yy | 92 +++++++++++ .../a551c05b-4094-4e7e-bd14-4c22162e3033.png | Bin 0 -> 4528 bytes .../94f7586f-b8fe-4a7c-abbe-fa4777dff1ce.png | Bin 0 -> 4528 bytes .../spr_weapon_prim_mltg.yy | 111 +++++++++++++ .../da81bce1-5ee4-40cf-81c1-38b2a9f6e905.png | Bin 0 -> 7951 bytes .../061823a4-a3eb-4de5-891f-4ed134331f63.png | Bin 0 -> 7951 bytes .../spr_weapon_prot_mmlt.yy | 92 +++++++++++ .../067bef0d-fca7-4bad-89fe-62dbd91dcd48.png | Bin 0 -> 12861 bytes .../3cc59cbf-fb62-4db5-a101-7c1c9698e24a.png | Bin 0 -> 12861 bytes .../spr_weapon_ryza_lasca.yy | 92 +++++++++++ 33 files changed, 967 insertions(+), 100 deletions(-) delete mode 100644 sprites/spr_weapon_autocannon/2ed06758-6cd0-4527-9927-973e6e725413.png create mode 100644 sprites/spr_weapon_autocannon/c4e4f840-8ea0-4c85-bb84-84e04542593d.png delete mode 100644 sprites/spr_weapon_autocannon/layers/2ed06758-6cd0-4527-9927-973e6e725413/66d899f0-585a-4030-a5a2-ef609d560ae4.png delete mode 100644 sprites/spr_weapon_autocannon/layers/2ed06758-6cd0-4527-9927-973e6e725413/cb494c49-00cb-493b-af38-95df8d096948.png create mode 100644 sprites/spr_weapon_autocannon/layers/c4e4f840-8ea0-4c85-bb84-84e04542593d/59449464-4def-425e-b64e-b57eb4ac3d47.png create mode 100644 sprites/spr_weapon_cthon_autocannon/aa914076-5f16-4d9a-8ffd-af365eab523c.png create mode 100644 sprites/spr_weapon_cthon_autocannon/layers/aa914076-5f16-4d9a-8ffd-af365eab523c/9b762d64-5050-4c57-83db-1af2276db342.png create mode 100644 sprites/spr_weapon_cthon_autocannon/spr_weapon_cthon_autocannon.yy create mode 100644 sprites/spr_weapon_ph_flmr/4264355a-06ac-4588-8864-b741565dcd32.png create mode 100644 sprites/spr_weapon_ph_flmr/layers/4264355a-06ac-4588-8864-b741565dcd32/e33dd1a2-cee4-48aa-a3b4-db455a74ccc8.png create mode 100644 sprites/spr_weapon_ph_flmr/spr_weapon_ph_flmr.yy create mode 100644 sprites/spr_weapon_powscythe/79186301-baf7-450c-883c-ee1e52cb08c9.png create mode 100644 sprites/spr_weapon_powscythe/layers/79186301-baf7-450c-883c-ee1e52cb08c9/aa6942f2-99bf-4276-913b-132d5bf1e522.png create mode 100644 sprites/spr_weapon_powscythe/spr_weapon_powscythe.yy create mode 100644 sprites/spr_weapon_prim_mltg/a551c05b-4094-4e7e-bd14-4c22162e3033.png create mode 100644 sprites/spr_weapon_prim_mltg/layers/a551c05b-4094-4e7e-bd14-4c22162e3033/94f7586f-b8fe-4a7c-abbe-fa4777dff1ce.png create mode 100644 sprites/spr_weapon_prim_mltg/spr_weapon_prim_mltg.yy create mode 100644 sprites/spr_weapon_prot_mmlt/da81bce1-5ee4-40cf-81c1-38b2a9f6e905.png create mode 100644 sprites/spr_weapon_prot_mmlt/layers/da81bce1-5ee4-40cf-81c1-38b2a9f6e905/061823a4-a3eb-4de5-891f-4ed134331f63.png create mode 100644 sprites/spr_weapon_prot_mmlt/spr_weapon_prot_mmlt.yy create mode 100644 sprites/spr_weapon_ryza_lasca/067bef0d-fca7-4bad-89fe-62dbd91dcd48.png create mode 100644 sprites/spr_weapon_ryza_lasca/layers/067bef0d-fca7-4bad-89fe-62dbd91dcd48/3cc59cbf-fb62-4db5-a101-7c1c9698e24a.png create mode 100644 sprites/spr_weapon_ryza_lasca/spr_weapon_ryza_lasca.yy diff --git a/ChapterMaster.yyp b/ChapterMaster.yyp index 529fc3263b..2bf05b7988 100644 --- a/ChapterMaster.yyp +++ b/ChapterMaster.yyp @@ -1685,6 +1685,7 @@ {"id":{"name":"spr_weapon_commelta","path":"sprites/spr_weapon_commelta/spr_weapon_commelta.yy",},}, {"id":{"name":"spr_weapon_complas","path":"sprites/spr_weapon_complas/spr_weapon_complas.yy",},}, {"id":{"name":"spr_weapon_crozarc","path":"sprites/spr_weapon_crozarc/spr_weapon_crozarc.yy",},}, + {"id":{"name":"spr_weapon_cthon_autocannon","path":"sprites/spr_weapon_cthon_autocannon/spr_weapon_cthon_autocannon.yy",},}, {"id":{"name":"spr_weapon_eldsword","path":"sprites/spr_weapon_eldsword/spr_weapon_eldsword.yy",},}, {"id":{"name":"spr_weapon_evisc","path":"sprites/spr_weapon_evisc/spr_weapon_evisc.yy",},}, {"id":{"name":"spr_weapon_flamer","path":"sprites/spr_weapon_flamer/spr_weapon_flamer.yy",},}, @@ -1710,6 +1711,7 @@ {"id":{"name":"spr_weapon_melta","path":"sprites/spr_weapon_melta/spr_weapon_melta.yy",},}, {"id":{"name":"spr_weapon_missile","path":"sprites/spr_weapon_missile/spr_weapon_missile.yy",},}, {"id":{"name":"spr_weapon_mmelta","path":"sprites/spr_weapon_mmelta/spr_weapon_mmelta.yy",},}, + {"id":{"name":"spr_weapon_ph_flmr","path":"sprites/spr_weapon_ph_flmr/spr_weapon_ph_flmr.yy",},}, {"id":{"name":"spr_weapon_phobos_bolter","path":"sprites/spr_weapon_phobos_bolter/spr_weapon_phobos_bolter.yy",},}, {"id":{"name":"spr_weapon_phobos_boltpis","path":"sprites/spr_weapon_phobos_boltpis/spr_weapon_phobos_boltpis.yy",},}, {"id":{"name":"spr_weapon_plasc","path":"sprites/spr_weapon_plasc/spr_weapon_plasc.yy",},}, @@ -1723,12 +1725,16 @@ {"id":{"name":"spr_weapon_powfist4","path":"sprites/spr_weapon_powfist4/spr_weapon_powfist4.yy",},}, {"id":{"name":"spr_weapon_powmace","path":"sprites/spr_weapon_powmace/spr_weapon_powmace.yy",},}, {"id":{"name":"spr_weapon_powmaul","path":"sprites/spr_weapon_powmaul/spr_weapon_powmaul.yy",},}, + {"id":{"name":"spr_weapon_powscythe","path":"sprites/spr_weapon_powscythe/spr_weapon_powscythe.yy",},}, {"id":{"name":"spr_weapon_powspear","path":"sprites/spr_weapon_powspear/spr_weapon_powspear.yy",},}, {"id":{"name":"spr_weapon_powspear2","path":"sprites/spr_weapon_powspear2/spr_weapon_powspear2.yy",},}, {"id":{"name":"spr_weapon_powspear3","path":"sprites/spr_weapon_powspear3/spr_weapon_powspear3.yy",},}, {"id":{"name":"spr_weapon_powswo","path":"sprites/spr_weapon_powswo/spr_weapon_powswo.yy",},}, + {"id":{"name":"spr_weapon_prim_mltg","path":"sprites/spr_weapon_prim_mltg/spr_weapon_prim_mltg.yy",},}, + {"id":{"name":"spr_weapon_prot_mmlt","path":"sprites/spr_weapon_prot_mmlt/spr_weapon_prot_mmlt.yy",},}, {"id":{"name":"spr_weapon_relbla","path":"sprites/spr_weapon_relbla/spr_weapon_relbla.yy",},}, {"id":{"name":"spr_weapon_relic_blade","path":"sprites/spr_weapon_relic_blade/spr_weapon_relic_blade.yy",},}, + {"id":{"name":"spr_weapon_ryza_lasca","path":"sprites/spr_weapon_ryza_lasca/spr_weapon_ryza_lasca.yy",},}, {"id":{"name":"spr_weapon_ryza_plasg","path":"sprites/spr_weapon_ryza_plasg/spr_weapon_ryza_plasg.yy",},}, {"id":{"name":"spr_weapon_ryza_plasp","path":"sprites/spr_weapon_ryza_plasp/spr_weapon_ryza_plasp.yy",},}, {"id":{"name":"spr_weapon_sbolter","path":"sprites/spr_weapon_sbolter/spr_weapon_sbolter.yy",},}, diff --git a/objects/obj_creation/Create_0.gml b/objects/obj_creation/Create_0.gml index 1a31c0cfc5..a0ebb5e54b 100644 --- a/objects/obj_creation/Create_0.gml +++ b/objects/obj_creation/Create_0.gml @@ -774,8 +774,8 @@ var all_advantages = [ }, { name : "Ancient Armoury", - description : "Your chapter is dedicated to preserving ancient wargear and as such have substantially higher amounts of rare Heresy-era armour than normal.", - value: 20, + description : "Your chapter is dedicated to preserving ancient wargear and as such have substantially higher amounts of rare Heresy-era armour and weapons than normal.", + value: 20,//I'm not sure, but it could be higher since now this trait will bring much more benefits. meta : ["Gear Quality"] }, { diff --git a/objects/obj_shop/Create_0.gml b/objects/obj_shop/Create_0.gml index d531e510f5..0cd7724481 100644 --- a/objects/obj_shop/Create_0.gml +++ b/objects/obj_shop/Create_0.gml @@ -111,8 +111,8 @@ if (shop = "equipment") { item_cost[i] = 10; forge_cost[i] = 40; i += 1; - if (global.cheat_debug) { - //Debug space for 30k weapons + //Debug space for 30k weapons + if (global.cheat_debug) { //Volkite Pack item[i] = "Volkite Serpenta"; item_stocked[i] = scr_item_count(item[i]); @@ -170,6 +170,36 @@ if (shop = "equipment") { item_stocked[i] = scr_item_count(item[i]); item_cost[i] = 0; forge_cost[i] = 0; + i += 1; + item[i] = "Primus Melta Gun"; + item_stocked[i] = scr_item_count(item[i]); + item_cost[i] = 0; + forge_cost[i] = 0; + i += 1; + item[i] = "Proteus Multi-Melta"; + item_stocked[i] = scr_item_count(item[i]); + item_cost[i] = 0; + forge_cost[i] = 0; + i += 1; + item[i] = "Phaestos Flamer"; + item_stocked[i] = scr_item_count(item[i]); + item_cost[i] = 0; + forge_cost[i] = 0; + i += 1; + item[i] = "Power Scythe"; + item_stocked[i] = scr_item_count(item[i]); + item_cost[i] = 0; + forge_cost[i] = 0; + i += 1; + item[i] = "Ryza Lascannon"; + item_stocked[i] = scr_item_count(item[i]); + item_cost[i] = 0; + forge_cost[i] = 0; + i += 1; + item[i] = "Cthon Autocannon"; + item_stocked[i] = scr_item_count(item[i]); + item_cost[i] = 0; + forge_cost[i] = 0; i += 1; //End of debug space for 30k weapons } diff --git a/scripts/scr_culture_visuals/scr_culture_visuals.gml b/scripts/scr_culture_visuals/scr_culture_visuals.gml index a9280328ce..1ee4cdfb7e 100644 --- a/scripts/scr_culture_visuals/scr_culture_visuals.gml +++ b/scripts/scr_culture_visuals/scr_culture_visuals.gml @@ -1610,6 +1610,83 @@ global.weapon_visual_data = { sprite: spr_weapon_mars_plasc, }] }, +//Melta Pack +"Proteus Multi-Melta": { + base: { + weapon_data: { + display_type: "ranged_twohand", + new_weapon_draw: true + }, + body_types: [0,1] + }, + variants: [{ + sprite: spr_weapon_prot_mmlt, + }] +}, +"Primus Melta Gun": { +base: { + weapon_data: { + display_type: "normal_ranged", + new_weapon_draw: true + }, + }, + variants: [{ + sprite: spr_weapon_prim_mltg, + }] +}, +//Flamer Pack +"Phaestos Flamer": { +base: { + weapon_data: { + display_type: "normal_ranged", + new_weapon_draw: true + }, + }, + variants: [{ + sprite: spr_weapon_ph_flmr, + }] +}, +//melee pack +"Power Scythe": { +base: { + weapon_data: { + display_type: "melee_onehand", + hand_type: 2, + new_weapon_draw: true + }, + }, + variants: [ + { + sprite: spr_weapon_powscythe + } + ] +}, +//Laser pack +"Ryza Lascannon": { + base: { + weapon_data: { + display_type: "ranged_twohand", + new_weapon_draw: true + }, + body_types: [0,1] + }, + variants: [{ + sprite: spr_weapon_ryza_lasca, + }] +}, +//misc pack +"Cthon Autocannon": { + base: { + weapon_data: { + display_type: "ranged_twohand", + new_weapon_draw: true + }, + body_types: [0,1] + }, + variants: [{ + sprite: spr_weapon_cthon_autocannon, + }] +}, //40k weapons "Assault Cannon": { @@ -1645,7 +1722,7 @@ global.weapon_visual_data = { }, "Lascannon":{ base: { - body_types: [0, 1, 2], + body_types: [0, 1], weapon_data: { display_type: "ranged_twohand", }, @@ -1658,7 +1735,7 @@ global.weapon_visual_data = { }, "Multi-Melta" : { base: { - body_types: [0, 1, 2], + body_types: [0, 1], weapon_data: { display_type: "ranged_twohand", }, diff --git a/scripts/scr_initialize_custom/scr_initialize_custom.gml b/scripts/scr_initialize_custom/scr_initialize_custom.gml index 3a4adc9cc0..ad95bd0ea7 100644 --- a/scripts/scr_initialize_custom/scr_initialize_custom.gml +++ b/scripts/scr_initialize_custom/scr_initialize_custom.gml @@ -3206,15 +3206,41 @@ function scr_initialize_custom() { scr_add_item("MK4 Maximus", irandom_range(3, 18)); } - if(scr_has_adv("Ancient Armoury")){ - scr_add_item("MK4 Maximus", irandom_range(5, 10)); - scr_add_item("MK5 Heresy", irandom_range(5, 10)); - scr_add_item("MK3 Iron Armour", irandom_range(1, 5)); - scr_add_item("MK6 Corvus", irandom_range(10, 15)); - scr_add_item("MK7 Aquila", -10); - scr_add_item("MK8 Errant", -1); + //Fixed Loot tagble +if(scr_has_adv("Ancient Armoury")){ +//armour + scr_add_item("Tartaros",1)//When Cata is added I will replace tartaros with that. + scr_add_item("MK3 Iron Armour",irandom_range(2,5)); + scr_add_item("MK4 Maximus",irandom_range(5,10)); + scr_add_item("MK5 Heresy",irandom_range(5,10)); + scr_add_item("MK6 Corvus",irandom_range(5,10));//Lowered to balance other buffs + scr_add_item("MK7 Aquila", -10); + scr_add_item("MK8 Errant", -1); +//weapons (I'm not sure about replacing all 40k weapons with 30k) + var armm1="",armk1=0,armm2="",armk2=0,armm3="",armk3=0,armm4="",armk4=0; + scr_add_item("Bolter", -15); + scr_add_item("Bolt Pistol", -5); + scr_add_item("Lascannon",-5); + scr_add_item("Heavy Bolter",-5) + scr_add_item("Phobos Bolter",10); + scr_add_item("Phobos Bolt Pistol",3); + scr_add_item("Mars Heavy Bolter",5); + armm1=choose("Volkite Culverin","Volkite Caliver","Mars Plasma Cannon","Ryza Lascannon","Grav-Cannon","Proteus Multi-Melta","Cthon Autocannon"); + armk1=irandom_range(2,5); + armm2=choose("Primus Melta Gun","Ryza Plasma Gun","Volkite Charger","Grav-Gun"); + armk2=irandom_range(2,5) + armm3=choose("Ryza Plasma Pistol","Volkite Serpenta") + armk3=irandom_range(1,3) + armk4=choose("Power Sword","Power Fist", "Lightining Claw","Power Axe","Power Scythe") + armk4=irandom_range(1,3) + scr_add_item(armm1,armk1); + scr_add_item(armm2,armk2); + scr_add_item(armm3,armk3); + scr_add_item(armm4,armk4); + } + gene_slaves = []; var bloo = 0, diff --git a/scripts/scr_ruins_reward/scr_ruins_reward.gml b/scripts/scr_ruins_reward/scr_ruins_reward.gml index 534403cda6..e544619721 100644 --- a/scripts/scr_ruins_reward/scr_ruins_reward.gml +++ b/scripts/scr_ruins_reward/scr_ruins_reward.gml @@ -79,73 +79,116 @@ function scr_ruins_reward(star_system, planet, _ruins) { scr_event_log("","STC Fragment recovered from Ancient Ruins."); } else if (loot="gear"){ - var wep1="",wen1=0,wep2="",wen2=0,wep3="",wen3=0; + var wep1="",wen1=0,wep2="",wen2=0,wep3="",wen3=0,wep4="",wen4=0,wep5="",wen5=0,wep6="",wen6=0,wep7="",wen7=0,wep8="",wen8=0; - if (ruins_type<=2) or (ruins_type>=10){ - wep1=choose("Power Fist","Chainfist","Power Axe","Power Sword"); - wen1=choose(2,3,4,5); - wep2=choose("Flamer","Meltagun","Combiflamer","Sniper Rifle"); - wen2=choose(3,4,5,6,7,8); - wep3=choose("Missile Launcher","Heavy Bolter","Lascannon","Plasma Pistol"); - wen3=choose(1,2,3); - }else if (ruins_type=3){ - wep1=choose("Terminator Armour"); - wen1=choose(1,2); - wep2=choose("Bionics"); - wen2=choose(5,6,7); - wep3=choose("Narthecium","Psychic Hood","Rosarius"); - wen3=choose(1); - } - else if (ruins_type=4){ - wep1=choose("MK4 Maximus"); - wen1=choose(2,3); - wep2=choose("MK6 Corvus"); - wen2=choose(4,5,6); - wep3=choose("MK8 Errant"); - wen3=choose(1,2); - } - else if (ruins_type=5){ - wep1=choose("Eviscerator","Underslung Flamer"); - wen1=choose(2,3,4,5); - wep2=choose("Flamer","Meltagun","Combiflamer"); - wen2=choose(3,4,5,6,7,8); - wep3=choose("Heavy Flamer","Heavy Bolter","Plasma Pistol"); - wen3=choose(1,2,3); - } - else if (ruins_type=6){ - wep1=choose("Eldar Power Sword","Power Spear"); - wen1=choose(1,2); - wep2=choose("Storm Shield","Twin Linked Bolters"); - wen2=choose(1,2); - wep3=choose("Archeotech Laspistol","Plasma Pistol"); - wen3=choose(1,2); - } - else if (ruins_type=7){ - wep1=choose("Autocannon"); - wen1=choose(1,2); - wep2=choose("Heavy Bolters","Twin Linked Heavy Bolter"); - wen2=choose(1,2,3); - wep3=choose("Twin Linked Lascannon","Lascannon"); - wen3=choose(1,2); - }else if (ruins_type=8){ - wep1=choose("Iron Halo"); - wen1=choose(1,2); - wep2=choose("Company Standard"); - wen2=choose(1); - wep3=choose("Servo-harness"); - wen3=choose(1); - } + +//Fallen Terminator Squad +if (ruins_type<=2) or (ruins_type>=10){ + wep1=choose("Tartaros","Terminator Armour"); + wen1=choose(1,2,3); + wep2=choose("Tigris Combi Bolter","Volkite Charger"); + wen2=choose(1,2,); + wep3=choose("Power Fist","Chainfist","Power Mace","Relic Blade","Power Spear","Lightning Claw","Power Scythe"); + wen3=choose(1,2,3); + wep4=choose("Assault Cannon","Plasma Cannon",); + wen4=choose(0,1); + wep5=choose("Company Standard","Narthecium","Psychic Hood","Rosarius"); + wen5=choose(0,1); + wep6=choose("Storm Shield"); + wen6=choose(1,2,3); +} +//Fallen Tactical Squad +else if (ruins_type=3){ + wep1=choose("MK3 Iron Armour","MK4 Maximus","MK5 Heresy"); + wen1=choose(3,4,5,6); + wep2=choose("Phobos Bolter"); + wen2=choose(2,3); + wep3=choose("Ryza Plasma Gun","Volkite Charger","Volkite Caliver"); + wen3=choose(1,2); + wep4=choose("Primus Melta Gun", "Phaestos Flamer"); + wen4=choose(1,2); + wep5=choose("Ryza Plasma Pistol","Phobos Bolt Pistol","Volkite Serpenta"); + wen5=choose(0,1) + wep6=choose("Power Sword","Chain Axe","Power Axe","Power Fist"); + wen6=choose(0,1); + wep7=choose("Company Standard","Narthecium","Psychic Hood","Rosarius"); + wen7=choose(0,1); + wep8=choose("Bionics"); + wen8=choose(1,2,3); +} +//Fallen Devastator Squad +else if (ruins_type=4){ + wep1=choose("MK3 Iron","MK4 Maximus","MK6 Corvus"); + wen1=choose(3,4,5); + wep2=choose("Mars Heavy Bolter"); + wen2=choose(2,3); + wep3=choose("Mars Plasma Cannon","Volkite Culverin",); + wen3=choose(1,2); + wep4=choose("Ryza Las Cannon","Cthon Auto Cannon"); + wen4=choose(1,2); + wep5=choose("Ryza Plasma Pistol","Phobos Bolt Pistol","Volkite Serpenta"); + wen5=choose(0,1) + wep6=choose("Power Sword","Chain Axe","Power Axe","Power Fist"); + wen6=choose(0,1); + wep7=choose("Company Standard","Narthecium","Psychic Hood","Rosarius"); + wen7=choose(0,1); + wep8=choose("Heavy Weapons Pack"); + wen8=choose(1,2,3); +} +//Fallen Assault Squad +else if (ruins_type=5){ + wep1=choose("MK4 Maximus","MK6 Corvus","MK5 Heresy"); + wen1=choose(3,4,5); + wep2=choose("Chainsword","Chain Axe"); + wen2=choose(2,3); + wep3=choose("Power Sword","Power Axe","Power Fist"); + wen3=choose(1,2); + wep4=choose("Lightning Claws ","Power Scythe"); + wen4=choose(1,2); + wep5=choose("Ryza Plasma Pistol","Phobos Bolt Pistol","Volkite Serpenta"); + wen5=choose(0,1) + wep6=choose("Primus Melta Gun","Phaestos Flamer"); + wen6=choose(0,1); + wep7=choose("Company Standard","Narthecium","Psychic Hood","Rosarius"); + wen7=choose(0,1); + wep8=choose("Jump Pack"); + wen8=choose(1,2,3); +} +//Fallen Breacher Squad +else if (ruins_type=6){ +wep1=choose("MK3 Iron Armour","MK4 Maximus","MK5 Heresy"); + wen1=choose(3,4,5,6); + wep2=choose("Primus Melta Gun"); + wen2=choose(2,3); + wep3=choose("Ryza Plasma Gun","Volkite Charger","Volkite Caliver"); + wen3=choose(1,2); + wep4=choose("Phobos Bolter", "Phaestos Flamer"); + wen4=choose(1,2); + wep5=choose("Ryza Plasma Pistol","Phobos Bolt Pistol","Volkite Serpenta"); + wen5=choose(0,1) + wep6=choose("Power Sword","Chain Axe","Power Axe","Power Fist"); + wen6=choose(0,1); + wep7=choose("Company Standard","Narthecium","Psychic Hood","Rosarius"); + wen7=choose(0,1); + wep8=choose("Boarding Shield"); + wen8=choose(1,2,3); +} scr_add_item(wep1,wen1); scr_add_item(wep2,wen2); scr_add_item(wep3,wen3); + scr_add_item(wep4,wen4); + scr_add_item(wep5,wen5); + scr_add_item(wep6,wen6); + scr_add_item(wep7,wen7); + scr_add_item(wep8,wen8); var pop; pop=instance_create(0,0,obj_popup); pop.image="ancient_ruins"; pop.title="Ancient Ruins: Gear"; - pop.text="These ruins were once an armoury. We found some weapons and pieces of wargear. "+string(wen1)+"x "+string(wep1)+", "+string(wen2)+"x "+string(wep2)+", and "+string(wen3)+"x "+string(wep3)+" have been added to the Armamentarium."; + pop.text="My lord, your brothers have found sealed chamber in these ruins. It bears symbols of one of the ancient legions. After your tech-marines managed to open this chamber, they've found a number of relics that can be brought back to service. They've found: "+string(wen1)+"x "+string(wep1)+", "+string(wen2)+"x "+string(wep2)+","+string(wen3)+"x "+string(wep3)+","+string(wen4)+"x "+string(wep4)+","+string(wen5)+"x "+string(wep5)+","+string(wen6)+"x "+string(wep6)+","+string(wen7)+"x "+string(wep7)+", and "+string(wen8)+"x "+string(wep8)+" have been added to the Armamentarium."; } else if (loot="gene_seed"){// Requisition var gene,pop;gene=floor(random_range(20,40))+1; diff --git a/scripts/scr_weapon/scr_weapon.gml b/scripts/scr_weapon/scr_weapon.gml index 3f0d355506..807ec6a557 100644 --- a/scripts/scr_weapon/scr_weapon.gml +++ b/scripts/scr_weapon/scr_weapon.gml @@ -59,7 +59,7 @@ global.weapons = { "master_crafted": 270, "artifact": 290 }, - "description": "Ancient one-handed thermal ray weapon, preferred by melee specialists, and officers .", + "description": "Ancient one-handed thermal ray weapon, preferred by melee specialists and officers.", "melee_hands": 0, "ranged_hands": 1, "ammo": 10, @@ -133,7 +133,7 @@ global.weapons = { "ammo": 14, "range": 19, "spli": 11, - "arp": 1, + "arp": 0, "tags": [ "bolt"] }, @@ -186,29 +186,117 @@ global.weapons = { "arp": 1, "tags": [ "plasma","energy"] }, - //40K Weapons - "Storm Shield": { - "description": "Protects twice as well when boarding. A powered shield that must be held with a hand. While powered by the marines armour it shimmers with blue energy.", - "abbreviation": "StrmShld", - "attack": { - "standard": 5, - "master_crafted": 5, - "artifact": 10 + + //Melta Pack +"Primus Melta Gun":{ +"abbreviation": "PrimMltGn", +"attack": { + "standard": 560, + "master_crafted": 585, + "artifact": 610 + }, + "description": "The Primus MK II Meltagun's origins have been lost to history, but the knowledge of its power and their bearers who served in the Legiones Astartes remains. Some theories have been made to its Ryzan origins due to the curvature of the body, but the famous Forge World denies those claims.", + "melee_hands": 1, + "ranged_hands": 2, + "ammo": 6, + "range": 2.5, + "spli": 2, + "arp": 1, + "tags": ["melta","energy","boarding"] + }, +"Proteus Multi-Melta":{ +"abbreviation": "ProtMltMelt", +"attack": { + "standard": 1000, + "master_crafted": 1100, + "artifact": 1200 }, - "armour_value": { - "standard": 8, - "master_crafted": 10, - "artifact": 12 + "description": "This Multi-Melta design originates, like many others used by Legiones Astartes, in the Dark Age of Technology. Deadlier than the current designs fielded by the Space Marine Chapters, it is a relic of both of the zenith of mankind's science and the last moments of the Emperor's true vision", + "melee_hands": 1, + "ranged_hands": 2, + "ammo": 6, + "range": 4.5, + "spli": 2, + "arp": 1, + "tags": ["melta","energy","boarding"] + }, + +//Flamer Pack +"Phaestos Flamer":{ +"abbreviation": "PhFlmr", +"attack": { + "standard": 430, + "master_crafted": 585, + "artifact": 610 + }, + "description": "The Phaestos-pattern Flamer is a stark reminder of the time where Mankind's future was yet unmolested by the decaying stench of the Horus Heresy. Oddly shaped for the modern users, it is nonetheless not to be underestimated and its potent promethium-fueled flame has burned through armours of unnumbered heroes", + "melee_hands": 1, + "ranged_hands": 2, + "ammo": 6, + "range": 2.5, + "spli": 6, + "arp": -1, + "tags": ["flame",]//Shouldn't it also feature "boarding"? + }, +//Melle Pack +"Power Scythe" :{ +"abbreviation": "PwrSct", +"attack": { + "standard": 250, + "master_crafted": 300, + "artifact": 350 }, - "melee_hands": 0.75, - "ranged_hands": 1, - "tags": ["shield"], - "hp_mod": { - "standard": 30, - "master_crafted": 35, - "artifact": 40 + "melee_mod": { + "standard": 1, + "master_crafted": 1.1, + "artifact": 1.2 }, + "description": "An unpopular power weapon, once a signature of the cursed 14th Legion, now fielded by a handful of loyalist Chapters.", + "melee_hands": 2, + "ranged_hands": 1, + "ammo": 0, + "range": 1.5, + "spli": 6, + "arp": 1, + "tags": ["power",] }, + //Laser Pack +"Ryza Lascannon":{ +"abbreviation": "RyzLascnn", +"attack": { + "standard": 750, + "master_crafted": 800, + "artifact": 850 + }, + "description": "PH", + "melee_hands": 1, + "ranged_hands": 2.25, + "ammo": 10, + "range": 24, + "spli": 1, + "arp": 1, + "tags": ["heavy_ranged","las","energy",] +}, + //misc pack +"Cthon Autocannon":{ +"abbreviation": "CthAutocnn", +"attack": { + "standard": 480, + "master_crafted": 520, + "artifact": 560 + }, + "description": "PH", + "melee_hands": 1, + "ranged_hands": 2.25, + "ammo": 30, + "range": 20, + "spli": 15, + "arp": 1, + "tags": ["heavy_ranged","dreadnought",] +}, + + //40k weapons + "Boarding Shield": { "description": "Protects twice as well when boarding. Used in siege or boarding operations, this shield offers additional protection. It may be used with a 2-handed ranged weapon.", "abbreviation": "BrdShld", @@ -1133,7 +1221,7 @@ global.weapons = { "artifact": 430 }, "description": "A rapid-firing weapon able to use a wide variety of ammunition, from mass-reactive explosive to solid shells. It has been found to be incredibly effective against large groups of targets and even Traitor Astartes to an extent.", - "melee_hands": 0, + "melee_hands": 1, "ranged_hands": 2.25, "ammo": 25, "range": 18, diff --git a/sprites/spr_weapon_autocannon/2ed06758-6cd0-4527-9927-973e6e725413.png b/sprites/spr_weapon_autocannon/2ed06758-6cd0-4527-9927-973e6e725413.png deleted file mode 100644 index cfc76adfad7593577815cb4e18de2b2af2a57a5e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3280 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 diff --git a/sprites/spr_weapon_autocannon/c4e4f840-8ea0-4c85-bb84-84e04542593d.png b/sprites/spr_weapon_autocannon/c4e4f840-8ea0-4c85-bb84-84e04542593d.png new file mode 100644 index 0000000000000000000000000000000000000000..493441a536a3fca27a9aea504cb0d7e1ab1b9d9d GIT binary patch literal 4022 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 PKhRB$&5cS8?!WjaIbU5C literal 0 HcmV?d00001 diff --git a/sprites/spr_weapon_autocannon/layers/2ed06758-6cd0-4527-9927-973e6e725413/66d899f0-585a-4030-a5a2-ef609d560ae4.png b/sprites/spr_weapon_autocannon/layers/2ed06758-6cd0-4527-9927-973e6e725413/66d899f0-585a-4030-a5a2-ef609d560ae4.png deleted file mode 100644 index 2057c0a1b165baf8d076fd631cffd8fb19eff280..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 884 zcmeAS@N?(olHy`uVBq!ia0y~yVAKU-0S-2x$WwNuxj;%G*(1o8fuTx`fuW&=f#DZW zsNn?zL#Y7+!>a@a2CEqi4B`cIb_Lo1CD@X@-CY>|gW!U_%O^81Fr|CCIEGZ*dV43j zugO4!;eyebyg!AWn^~qAc_(=O*&%cJ=Z98T_c+~Ib0$xSV0D^xC%ZbDml0^x;0H67 z-}=S)p!aCKov^j^#g7HW)0ZUOj)@Pq-``y3q$B!i?^osnvpe)BUHZ`U`*ZSy9bG?w z>KT?z*pgsd_*0kRSZ8tn4YQZkDJgt>>K{WN{*Bxn|Gz7@IJ0}Lj}L$1!a5^mdr$5# zleDW7Q&n^$Hu9xjnL2+7D}(&AmtGI1l;zB>o9(lv;DDE>TBNT?^vo9#7V2wNzphxq zpuf&2=yH>>cKw0n6jk>R-{Qna}`t-YRcHh;L;cMS;|GjhUb^i0Va{UWm z?|Qv+o7I%$cf9H!FP<-Qi(SDGKV_nr$}u(l#jA6Fgf+~zFc*|eow|7P!+TGTs3uNb zx;Qc8%D%Ptz68pMF4_EWXZUULBm4syUk6I+w-&GH%h_+b9q0_z64!{5l*E!$tK_0o zAjM#0U}UOmV61Ck9%5)_Wnf@sY^n_;4Gexf{|QQJ2o1UUDVb@NxHWX{a@-5lpaHj` eBr`X)xFj*R0Jold>l2bdf#d1w=d#Wzp$P!=gy^OK diff --git a/sprites/spr_weapon_autocannon/layers/2ed06758-6cd0-4527-9927-973e6e725413/cb494c49-00cb-493b-af38-95df8d096948.png b/sprites/spr_weapon_autocannon/layers/2ed06758-6cd0-4527-9927-973e6e725413/cb494c49-00cb-493b-af38-95df8d096948.png deleted file mode 100644 index 765337daec2d78718f23b163320c95496d8bc5b6..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3010 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 akv`XM{51yFqvyY=fVHK)MVYzxpML{$LzuY$ diff --git a/sprites/spr_weapon_autocannon/layers/c4e4f840-8ea0-4c85-bb84-84e04542593d/59449464-4def-425e-b64e-b57eb4ac3d47.png b/sprites/spr_weapon_autocannon/layers/c4e4f840-8ea0-4c85-bb84-84e04542593d/59449464-4def-425e-b64e-b57eb4ac3d47.png new file mode 100644 index 0000000000000000000000000000000000000000..493441a536a3fca27a9aea504cb0d7e1ab1b9d9d GIT binary patch literal 4022 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 PKhRB$&5cS8?!WjaIbU5C literal 0 HcmV?d00001 diff --git a/sprites/spr_weapon_autocannon/spr_weapon_autocannon.yy b/sprites/spr_weapon_autocannon/spr_weapon_autocannon.yy index 1ddf815fef..8fec19ce9d 100644 --- a/sprites/spr_weapon_autocannon/spr_weapon_autocannon.yy +++ b/sprites/spr_weapon_autocannon/spr_weapon_autocannon.yy @@ -2,25 +2,24 @@ "$GMSprite":"v2", "%Name":"spr_weapon_autocannon", "bboxMode":0, - "bbox_bottom":188, - "bbox_left":49, - "bbox_right":300, - "bbox_top":115, + "bbox_bottom":169, + "bbox_left":52, + "bbox_right":298, + "bbox_top":89, "collisionKind":1, "collisionTolerance":0, "DynamicTexturePage":false, "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"v1","%Name":"2ed06758-6cd0-4527-9927-973e6e725413","name":"2ed06758-6cd0-4527-9927-973e6e725413","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"c4e4f840-8ea0-4c85-bb84-84e04542593d","name":"c4e4f840-8ea0-4c85-bb84-84e04542593d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, "height":272, "HTile":false, "layers":[ - {"$GMImageLayer":"","%Name":"66d899f0-585a-4030-a5a2-ef609d560ae4","blendMode":0,"displayName":"pasteLayer","isLocked":false,"name":"66d899f0-585a-4030-a5a2-ef609d560ae4","opacity":100.0,"resourceType":"GMImageLayer","resourceVersion":"2.0","visible":true,}, - {"$GMImageLayer":"","%Name":"cb494c49-00cb-493b-af38-95df8d096948","blendMode":0,"displayName":"pasteLayer","isLocked":false,"name":"cb494c49-00cb-493b-af38-95df8d096948","opacity":100.0,"resourceType":"GMImageLayer","resourceVersion":"2.0","visible":true,}, + {"$GMImageLayer":"","%Name":"59449464-4def-425e-b64e-b57eb4ac3d47","blendMode":0,"displayName":"default","isLocked":false,"name":"59449464-4def-425e-b64e-b57eb4ac3d47","opacity":100.0,"resourceType":"GMImageLayer","resourceVersion":"2.0","visible":true,}, ], "name":"spr_weapon_autocannon", "nineSlice":null, @@ -64,12 +63,16 @@ "playbackSpeedType":1, "resourceType":"GMSequence", "resourceVersion":"2.0", + "seqHeight":272.0, + "seqWidth":301.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":"2ed06758-6cd0-4527-9927-973e6e725413","path":"sprites/spr_weapon_autocannon/spr_weapon_autocannon.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"f9022dec-ead4-4be3-bd89-24d1a6fa9782","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"c4e4f840-8ea0-4c85-bb84-84e04542593d","path":"sprites/spr_weapon_autocannon/spr_weapon_autocannon.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"cec24aa7-f692-404c-91a0-df1a7dab023a","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_weapon_autocannon2/spr_weapon_autocannon2.yy b/sprites/spr_weapon_autocannon2/spr_weapon_autocannon2.yy index d720811d75..cb4dd301f4 100644 --- a/sprites/spr_weapon_autocannon2/spr_weapon_autocannon2.yy +++ b/sprites/spr_weapon_autocannon2/spr_weapon_autocannon2.yy @@ -63,12 +63,16 @@ "playbackSpeedType":1, "resourceType":"GMSequence", "resourceVersion":"2.0", + "seqHeight":281.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":"49d770e0-45f5-4f6a-932b-88984416b02a","path":"sprites/spr_weapon_autocannon2/spr_weapon_autocannon2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"55f330f1-2ff0-4f47-b37b-c68126f5ee37","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"49d770e0-45f5-4f6a-932b-88984416b02a","path":"sprites/spr_weapon_autocannon2/spr_weapon_autocannon2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"55f330f1-2ff0-4f47-b37b-c68126f5ee37","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_weapon_cthon_autocannon/aa914076-5f16-4d9a-8ffd-af365eab523c.png b/sprites/spr_weapon_cthon_autocannon/aa914076-5f16-4d9a-8ffd-af365eab523c.png new file mode 100644 index 0000000000000000000000000000000000000000..6b44754be7386745e64b7502f056fa1cc7b73dea GIT binary patch literal 7334 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":"", + "Keyframes":[], + "resourceType":"KeyframeStore", + "resourceVersion":"2.0", + }, + "eventStubScript":null, + "eventToFunction":{}, + "length":1.0, + "lockOrigin":false, + "moments":{ + "$KeyframeStore":"", + "Keyframes":[], + "resourceType":"KeyframeStore", + "resourceVersion":"2.0", + }, + "name":"spr_weapon_cthon_autocannon", + "playback":1, + "playbackSpeed":1.0, + "playbackSpeedType":1, + "resourceType":"GMSequence", + "resourceVersion":"2.0", + "seqHeight":272.0, + "seqWidth":301.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":"aa914076-5f16-4d9a-8ffd-af365eab523c","path":"sprites/spr_weapon_cthon_autocannon/spr_weapon_cthon_autocannon.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"00b42439-99d9-4f31-9d0d-55a01f286dcb","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":39, + "yorigin":21, + }, + "swatchColours":null, + "swfPrecision":2.525, + "textureGroupId":{ + "name":"MarineViewer", + "path":"texturegroups/MarineViewer", + }, + "type":0, + "VTile":false, + "width":301, +} \ No newline at end of file diff --git a/sprites/spr_weapon_mars_hbolt/98934121-510d-447a-ad2c-d09856d6ea01.png b/sprites/spr_weapon_mars_hbolt/98934121-510d-447a-ad2c-d09856d6ea01.png index c9a37497c30ab6475078ee8fa4fe2138ba92f1f3..1fa17157f54609b33052cee69ae936671fa80a50 100644 GIT binary patch literal 8068 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

dY9 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 X_@8aaS<{X{8^G|ksb1AB=fwX47g1?I diff --git a/sprites/spr_weapon_ph_flmr/4264355a-06ac-4588-8864-b741565dcd32.png b/sprites/spr_weapon_ph_flmr/4264355a-06ac-4588-8864-b741565dcd32.png new file mode 100644 index 0000000000000000000000000000000000000000..c28c7fb7ae1de103c9cd651f242539958beb9efe GIT binary patch literal 3834 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":"", + "Keyframes":[], + "resourceType":"KeyframeStore", + "resourceVersion":"2.0", + }, + "eventStubScript":null, + "eventToFunction":{}, + "length":1.0, + "lockOrigin":false, + "moments":{ + "$KeyframeStore":"", + "Keyframes":[], + "resourceType":"KeyframeStore", + "resourceVersion":"2.0", + }, + "name":"spr_weapon_ph_flmr", + "playback":1, + "playbackSpeed":1.0, + "playbackSpeedType":1, + "resourceType":"GMSequence", + "resourceVersion":"2.0", + "seqHeight":231.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":"4264355a-06ac-4588-8864-b741565dcd32","path":"sprites/spr_weapon_ph_flmr/spr_weapon_ph_flmr.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"35a6740c-1144-45e2-9cac-778ff2991598","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_weapon_powscythe/79186301-baf7-450c-883c-ee1e52cb08c9.png b/sprites/spr_weapon_powscythe/79186301-baf7-450c-883c-ee1e52cb08c9.png new file mode 100644 index 0000000000000000000000000000000000000000..1b559548ec667502ebf92241b3cec6a640272d95 GIT binary patch literal 6606 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 Ls#kT@CH}tvzx|w! literal 0 HcmV?d00001 diff --git a/sprites/spr_weapon_powscythe/layers/79186301-baf7-450c-883c-ee1e52cb08c9/aa6942f2-99bf-4276-913b-132d5bf1e522.png b/sprites/spr_weapon_powscythe/layers/79186301-baf7-450c-883c-ee1e52cb08c9/aa6942f2-99bf-4276-913b-132d5bf1e522.png new file mode 100644 index 0000000000000000000000000000000000000000..1b559548ec667502ebf92241b3cec6a640272d95 GIT binary patch literal 6606 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 Ls#kT@CH}tvzx|w! literal 0 HcmV?d00001 diff --git a/sprites/spr_weapon_powscythe/spr_weapon_powscythe.yy b/sprites/spr_weapon_powscythe/spr_weapon_powscythe.yy new file mode 100644 index 0000000000..bafdcad1e2 --- /dev/null +++ b/sprites/spr_weapon_powscythe/spr_weapon_powscythe.yy @@ -0,0 +1,92 @@ +{ + "$GMSprite":"v2", + "%Name":"spr_weapon_powscythe", + "bboxMode":0, + "bbox_bottom":261, + "bbox_left":2, + "bbox_right":154, + "bbox_top":7, + "collisionKind":1, + "collisionTolerance":0, + "DynamicTexturePage":false, + "edgeFiltering":false, + "For3D":false, + "frames":[ + {"$GMSpriteFrame":"v1","%Name":"79186301-baf7-450c-883c-ee1e52cb08c9","name":"79186301-baf7-450c-883c-ee1e52cb08c9","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + ], + "gridX":0, + "gridY":0, + "height":281, + "HTile":false, + "layers":[ + {"$GMImageLayer":"","%Name":"aa6942f2-99bf-4276-913b-132d5bf1e522","blendMode":0,"displayName":"default","isLocked":false,"name":"aa6942f2-99bf-4276-913b-132d5bf1e522","opacity":100.0,"resourceType":"GMImageLayer","resourceVersion":"2.0","visible":true,}, + ], + "name":"spr_weapon_powscythe", + "nineSlice":null, + "origin":9, + "parent":{ + "name":"melee", + "path":"folders/Sprites/Marine Viewer/weapons/melee.yy", + }, + "preMultiplyAlpha":false, + "resourceType":"GMSprite", + "resourceVersion":"2.0", + "sequence":{ + "$GMSequence":"v1", + "%Name":"spr_weapon_powscythe", + "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_weapon_powscythe", + "playback":1, + "playbackSpeed":1.0, + "playbackSpeedType":1, + "resourceType":"GMSequence", + "resourceVersion":"2.0", + "seqHeight":281.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":"79186301-baf7-450c-883c-ee1e52cb08c9","path":"sprites/spr_weapon_powscythe/spr_weapon_powscythe.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"4920967f-fc97-4d08-b57c-737bf686efb0","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":-3, + "yorigin":50, + }, + "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_weapon_prim_mltg/a551c05b-4094-4e7e-bd14-4c22162e3033.png b/sprites/spr_weapon_prim_mltg/a551c05b-4094-4e7e-bd14-4c22162e3033.png new file mode 100644 index 0000000000000000000000000000000000000000..7c3a0a9ddaaaa1362feb23b1edf6a5a05fa4c6d3 GIT binary patch literal 4528 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 literal 0 HcmV?d00001 diff --git a/sprites/spr_weapon_prim_mltg/layers/a551c05b-4094-4e7e-bd14-4c22162e3033/94f7586f-b8fe-4a7c-abbe-fa4777dff1ce.png b/sprites/spr_weapon_prim_mltg/layers/a551c05b-4094-4e7e-bd14-4c22162e3033/94f7586f-b8fe-4a7c-abbe-fa4777dff1ce.png new file mode 100644 index 0000000000000000000000000000000000000000..7c3a0a9ddaaaa1362feb23b1edf6a5a05fa4c6d3 GIT binary patch literal 4528 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 literal 0 HcmV?d00001 diff --git a/sprites/spr_weapon_prim_mltg/spr_weapon_prim_mltg.yy b/sprites/spr_weapon_prim_mltg/spr_weapon_prim_mltg.yy new file mode 100644 index 0000000000..9dd3d21360 --- /dev/null +++ b/sprites/spr_weapon_prim_mltg/spr_weapon_prim_mltg.yy @@ -0,0 +1,111 @@ +{ + "$GMSprite":"v2", + "%Name":"spr_weapon_prim_mltg", + "bboxMode":0, + "bbox_bottom":227, + "bbox_left":24, + "bbox_right":58, + "bbox_top":101, + "collisionKind":1, + "collisionTolerance":0, + "DynamicTexturePage":false, + "edgeFiltering":false, + "For3D":false, + "frames":[ + {"$GMSpriteFrame":"v1","%Name":"a551c05b-4094-4e7e-bd14-4c22162e3033","name":"a551c05b-4094-4e7e-bd14-4c22162e3033","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + ], + "gridX":0, + "gridY":0, + "height":231, + "HTile":false, + "layers":[ + {"$GMImageLayer":"","%Name":"94f7586f-b8fe-4a7c-abbe-fa4777dff1ce","blendMode":0,"displayName":"default","isLocked":false,"name":"94f7586f-b8fe-4a7c-abbe-fa4777dff1ce","opacity":100.0,"resourceType":"GMImageLayer","resourceVersion":"2.0","visible":true,}, + ], + "name":"spr_weapon_prim_mltg", + "nineSlice":{ + "$GMNineSliceData":"", + "bottom":0, + "enabled":false, + "guideColour":[4294902015,4294902015,4294902015,4294902015,], + "highlightColour":1728023040, + "highlightStyle":0, + "left":0, + "resourceType":"GMNineSliceData", + "resourceVersion":"2.0", + "right":0, + "tileMode":[ + 0, + 0, + 0, + 0, + 0, + ], + "top":0, + }, + "origin":0, + "parent":{ + "name":"ranged", + "path":"folders/Sprites/Marine Viewer/weapons/ranged.yy", + }, + "preMultiplyAlpha":false, + "resourceType":"GMSprite", + "resourceVersion":"2.0", + "sequence":{ + "$GMSequence":"v1", + "%Name":"spr_weapon_prim_mltg", + "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_weapon_prim_mltg", + "playback":1, + "playbackSpeed":1.0, + "playbackSpeedType":1, + "resourceType":"GMSequence", + "resourceVersion":"2.0", + "seqHeight":231.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":"a551c05b-4094-4e7e-bd14-4c22162e3033","path":"sprites/spr_weapon_prim_mltg/spr_weapon_prim_mltg.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"07480215-0913-4f6f-b8bb-e9248d2cdd68","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_weapon_prot_mmlt/da81bce1-5ee4-40cf-81c1-38b2a9f6e905.png b/sprites/spr_weapon_prot_mmlt/da81bce1-5ee4-40cf-81c1-38b2a9f6e905.png new file mode 100644 index 0000000000000000000000000000000000000000..c6d19936ac6941d4de69926691717130441a8867 GIT binary patch literal 7951 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":"", + "Keyframes":[], + "resourceType":"KeyframeStore", + "resourceVersion":"2.0", + }, + "eventStubScript":null, + "eventToFunction":{}, + "length":1.0, + "lockOrigin":false, + "moments":{ + "$KeyframeStore":"", + "Keyframes":[], + "resourceType":"KeyframeStore", + "resourceVersion":"2.0", + }, + "name":"spr_weapon_prot_mmlt", + "playback":1, + "playbackSpeed":1.0, + "playbackSpeedType":1, + "resourceType":"GMSequence", + "resourceVersion":"2.0", + "seqHeight":272.0, + "seqWidth":301.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":"da81bce1-5ee4-40cf-81c1-38b2a9f6e905","path":"sprites/spr_weapon_prot_mmlt/spr_weapon_prot_mmlt.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"029e1c78-88c8-4933-99cc-a72eacd7faac","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":39, + "yorigin":21, + }, + "swatchColours":null, + "swfPrecision":2.525, + "textureGroupId":{ + "name":"MarineViewer", + "path":"texturegroups/MarineViewer", + }, + "type":0, + "VTile":false, + "width":301, +} \ No newline at end of file diff --git a/sprites/spr_weapon_ryza_lasca/067bef0d-fca7-4bad-89fe-62dbd91dcd48.png b/sprites/spr_weapon_ryza_lasca/067bef0d-fca7-4bad-89fe-62dbd91dcd48.png new file mode 100644 index 0000000000000000000000000000000000000000..4730b04dbbf636830b4732ef58619fb20607291e GIT binary patch literal 12861 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":"", + "Keyframes":[], + "resourceType":"KeyframeStore", + "resourceVersion":"2.0", + }, + "eventStubScript":null, + "eventToFunction":{}, + "length":1.0, + "lockOrigin":false, + "moments":{ + "$KeyframeStore":"", + "Keyframes":[], + "resourceType":"KeyframeStore", + "resourceVersion":"2.0", + }, + "name":"spr_weapon_ryza_lasca", + "playback":1, + "playbackSpeed":1.0, + "playbackSpeedType":1, + "resourceType":"GMSequence", + "resourceVersion":"2.0", + "seqHeight":272.0, + "seqWidth":301.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":"067bef0d-fca7-4bad-89fe-62dbd91dcd48","path":"sprites/spr_weapon_ryza_lasca/spr_weapon_ryza_lasca.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"19660636-e8a8-4fcd-9358-1991c58309e0","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":39, + "yorigin":21, + }, + "swatchColours":null, + "swfPrecision":2.525, + "textureGroupId":{ + "name":"MarineViewer", + "path":"texturegroups/MarineViewer", + }, + "type":0, + "VTile":false, + "width":301, +} \ No newline at end of file From 42cbca2e4755d8e465d7b8a090ffe195006d6638 Mon Sep 17 00:00:00 2001 From: Nelsonh <81228864+OH296@users.noreply.github.com> Date: Mon, 30 Jun 2025 01:33:44 +0100 Subject: [PATCH 107/286] fix: Make auto compiles work (#896) --- ChapterMaster.yyp | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/ChapterMaster.yyp b/ChapterMaster.yyp index 2bf05b7988..c594358915 100644 --- a/ChapterMaster.yyp +++ b/ChapterMaster.yyp @@ -565,17 +565,6 @@ {"$GMIncludedFile":"","%Name":"1.png","CopyToMask":-1,"filePath":"datafiles/main/visual_sets/Company_marks_roman_right_shoulder/ten","name":"1.png","resourceType":"GMIncludedFile","resourceVersion":"2.0",}, {"$GMIncludedFile":"","%Name":"1.png","CopyToMask":-1,"filePath":"datafiles/main/visual_sets/Company_marks_roman_right_shoulder/three","name":"1.png","resourceType":"GMIncludedFile","resourceVersion":"2.0",}, {"$GMIncludedFile":"","%Name":"1.png","CopyToMask":-1,"filePath":"datafiles/main/visual_sets/Company_marks_roman_right_shoulder/two","name":"1.png","resourceType":"GMIncludedFile","resourceVersion":"2.0",}, - {"$GMIncludedFile":"","%Name":"data.json","CopyToMask":-1,"filePath":"datafiles/main/visual_sets/Crusader_bits","name":"data.json","resourceType":"GMIncludedFile","resourceVersion":"2.0",}, - {"$GMIncludedFile":"","%Name":"1.png","CopyToMask":-1,"filePath":"datafiles/main/visual_sets/Crusader_bits/topfhelm","name":"1.png","resourceType":"GMIncludedFile","resourceVersion":"2.0",}, - {"$GMIncludedFile":"","%Name":"2.png","CopyToMask":-1,"filePath":"datafiles/main/visual_sets/Crusader_bits/topfhelm","name":"2.png","resourceType":"GMIncludedFile","resourceVersion":"2.0",}, - {"$GMIncludedFile":"","%Name":"3.png","CopyToMask":-1,"filePath":"datafiles/main/visual_sets/Crusader_bits/topfhelm","name":"3.png","resourceType":"GMIncludedFile","resourceVersion":"2.0",}, - {"$GMIncludedFile":"","%Name":"1.png","CopyToMask":-1,"filePath":"datafiles/main/visual_sets/Crusader_bits/torse_with_hood","name":"1.png","resourceType":"GMIncludedFile","resourceVersion":"2.0",}, - {"$GMIncludedFile":"","%Name":"2.png","CopyToMask":-1,"filePath":"datafiles/main/visual_sets/Crusader_bits/torse_with_hood","name":"2.png","resourceType":"GMIncludedFile","resourceVersion":"2.0",}, - {"$GMIncludedFile":"","%Name":"3.png","CopyToMask":-1,"filePath":"datafiles/main/visual_sets/Crusader_bits/torse_with_hood","name":"3.png","resourceType":"GMIncludedFile","resourceVersion":"2.0",}, - {"$GMIncludedFile":"","%Name":"4.png","CopyToMask":-1,"filePath":"datafiles/main/visual_sets/Crusader_bits/torse_with_hood","name":"4.png","resourceType":"GMIncludedFile","resourceVersion":"2.0",}, - {"$GMIncludedFile":"","%Name":"1.png","CopyToMask":-1,"filePath":"datafiles/main/visual_sets/Crusader_bits/torse","name":"1.png","resourceType":"GMIncludedFile","resourceVersion":"2.0",}, - {"$GMIncludedFile":"","%Name":"2.png","CopyToMask":-1,"filePath":"datafiles/main/visual_sets/Crusader_bits/torse","name":"2.png","resourceType":"GMIncludedFile","resourceVersion":"2.0",}, - {"$GMIncludedFile":"","%Name":"3.png","CopyToMask":-1,"filePath":"datafiles/main/visual_sets/Crusader_bits/torse","name":"3.png","resourceType":"GMIncludedFile","resourceVersion":"2.0",}, {"$GMIncludedFile":"","%Name":"data.json","CopyToMask":-1,"filePath":"datafiles/main/visual_sets/Test_set","name":"data.json","resourceType":"GMIncludedFile","resourceVersion":"2.0",}, {"$GMIncludedFile":"","%Name":"1.png","CopyToMask":-1,"filePath":"datafiles/main/visual_sets/Test_set/test_sprite","name":"1.png","resourceType":"GMIncludedFile","resourceVersion":"2.0",}, {"$GMIncludedFile":"","%Name":"use_sets.json","CopyToMask":-1,"filePath":"datafiles/main/visual_sets","name":"use_sets.json","resourceType":"GMIncludedFile","resourceVersion":"2.0",}, From f9c6837c0136a79fedd2f80b49865fe2f3c37c7a Mon Sep 17 00:00:00 2001 From: Nelsonh <81228864+OH296@users.noreply.github.com> Date: Mon, 30 Jun 2025 23:30:29 +0100 Subject: [PATCH 108/286] refactor: Diplomacy and trade codebase (#858) Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com> --- ChapterMaster.yyp | 4 + .../mycrusaderbits/crusader_helm/1.png | Bin 0 -> 322 bytes .../main/visual_sets/mycrusaderbits/data.json | 82 ++ fonts/fnt_Embossed_metal/MessingLettern.ttf | Bin 0 -> 120520 bytes .../fnt_Embossed_metal.old.png | Bin 0 -> 25841 bytes .../fnt_Embossed_metal.old.yy | 143 +++ .../fnt_Embossed_metal/fnt_Embossed_metal.png | Bin 0 -> 21898 bytes .../fnt_Embossed_metal/fnt_Embossed_metal.yy | 143 +++ objects/obj_controller/Alarm_5.gml | 39 +- objects/obj_controller/Alarm_8.gml | 32 +- objects/obj_controller/Alarm_9.gml | 3 +- objects/obj_controller/Create_0.gml | 81 +- objects/obj_controller/Draw_0.gml | 7 +- objects/obj_controller/Draw_64.gml | 23 +- objects/obj_controller/Mouse_50.gml | 725 +---------- objects/obj_controller/Step_0.gml | 7 +- objects/obj_crusade/Alarm_0.gml | 2 +- objects/obj_en_fleet/Alarm_1.gml | 39 +- objects/obj_en_fleet/Destroy_0.gml | 2 +- objects/obj_en_fleet/Draw_0.gml | 2 +- objects/obj_en_fleet/Step_0.gml | 4 +- objects/obj_fleet/Alarm_4.gml | 6 +- objects/obj_garbage_collector/Step_0.gml | 2 +- objects/obj_ground_mission/Alarm_2.gml | 7 +- objects/obj_ground_mission/Alarm_3.gml | 6 +- objects/obj_ground_mission/Alarm_4.gml | 6 +- objects/obj_ground_mission/Alarm_5.gml | 14 +- objects/obj_ground_mission/Alarm_6.gml | 6 +- objects/obj_img/Step_0.gml | 10 +- objects/obj_ncombat/Alarm_0.gml | 4 +- objects/obj_ncombat/Alarm_5.gml | 2 +- objects/obj_ncombat/Alarm_7.gml | 32 +- objects/obj_popup/Destroy_0.gml | 2 +- objects/obj_popup/Draw_0.gml | 2 +- objects/obj_popup/Mouse_50.gml | 2 +- objects/obj_popup/Step_0.gml | 6 +- objects/obj_popup_dialogue/CleanUp_0.gml | 1 + objects/obj_popup_dialogue/Draw_0.gml | 82 -- objects/obj_popup_dialogue/Draw_64.gml | 87 ++ objects/obj_popup_dialogue/Step_0.gml | 71 +- .../obj_popup_dialogue/obj_popup_dialogue.yy | 3 +- objects/obj_star/Mouse_50.gml | 38 +- objects/obj_star_select/Mouse_50.gml | 6 +- objects/obj_turn_end/Alarm_1.gml | 55 +- objects/obj_turn_end/Alarm_2.gml | 4 +- objects/obj_turn_end/Create_0.gml | 116 +- objects/obj_turn_end/Destroy_0.gml | 7 +- scripts/macros/macros.gml | 14 + scripts/scr_DataSlate/scr_DataSlate.gml | 96 +- scripts/scr_audience/scr_audience.gml | 38 +- scripts/scr_bomb_world/scr_bomb_world.gml | 32 +- scripts/scr_buttons/scr_buttons.gml | 16 +- .../scr_company_struct/scr_company_struct.gml | 2 +- .../scr_controller_helpers.gml | 241 ++-- scripts/scr_demand/scr_demand.gml | 18 +- .../scr_destroy_planet/scr_destroy_planet.gml | 89 +- .../scr_diplomacy_helpers.gml | 150 ++- .../scr_draw_armentarium.gml | 1 + scripts/scr_draw_rainbow/scr_draw_rainbow.gml | 43 +- .../scr_drop_select_function.gml | 6 +- scripts/scr_enemy_ai_a/scr_enemy_ai_a.gml | 4 +- scripts/scr_enemy_ai_c/scr_enemy_ai_c.gml | 11 +- scripts/scr_enemy_ai_e/scr_enemy_ai_e.gml | 2 +- .../scr_fleet_functions.gml | 54 +- scripts/scr_hit/scr_hit.gml | 6 + .../scr_inquisition_fleet_functions.gml | 11 + .../scr_khornate_fleet_functions.gml | 71 +- .../scr_load_controller.gml | 3 - .../scr_mechanicus_missions.gml | 4 +- .../scr_ork_fleet_functions.gml | 9 +- .../scr_planetary_feature.gml | 16 +- scripts/scr_purge_world/scr_purge_world.gml | 24 +- scripts/scr_quest/scr_quest.gml | 7 +- scripts/scr_random_event/scr_random_event.gml | 35 +- .../scr_save_controller.gml | 3 - scripts/scr_trade/scr_trade.gml | 1113 ++++++++++------- scripts/scr_trade_add/scr_trade_add.gml | 66 - scripts/scr_trade_dep/scr_trade_dep.gml | 217 +--- scripts/scr_ui_advisors/scr_ui_advisors.gml | 18 +- scripts/scr_ui_diplomacy/scr_ui_diplomacy.gml | 1071 +++++++--------- .../58ee1e71-509f-4b0e-ab39-17c8da2a0687.png | Bin 884 -> 884 bytes .../88d208ab-efc3-4c8a-a23a-ac1685249362.png | Bin 9977 -> 9977 bytes .../0c20ae10-2b03-43f4-b05e-7cb2256d0b71.png | Bin 9977 -> 9977 bytes sprites/spr_loading2/spr_loading2.yy | 10 +- .../b6ba8600-fb6b-4fa9-abc7-bdc2311eb79e.png | Bin 1143 -> 1143 bytes .../0135cb67-e9d4-47f9-ae29-035c8a8dfafa.png | Bin 4037 -> 3933 bytes .../dbd2f6e9-16f8-4d28-b0ee-9c4c7c1666c3.png | Bin 4037 -> 3933 bytes .../3b549580-f553-4212-b6bb-c41c3ff18e19.png | Bin 15960 -> 16554 bytes .../6f5088c2-6f2d-4a04-8639-918cc91d0e0f.png | Bin 15960 -> 16554 bytes .../76267b7c-4ed6-4e13-80f8-12d83c354c19.png | Bin 0 -> 29394 bytes .../b201671b-7405-4bb4-ab4e-e9c0d0be9fe7.png | Bin 0 -> 29394 bytes .../spr_shutter_button_cover.yy | 92 ++ 92 files changed, 2498 insertions(+), 3010 deletions(-) create mode 100644 datafiles/main/visual_sets/mycrusaderbits/crusader_helm/1.png create mode 100644 datafiles/main/visual_sets/mycrusaderbits/data.json create mode 100644 fonts/fnt_Embossed_metal/MessingLettern.ttf create mode 100644 fonts/fnt_Embossed_metal/fnt_Embossed_metal.old.png create mode 100644 fonts/fnt_Embossed_metal/fnt_Embossed_metal.old.yy create mode 100644 fonts/fnt_Embossed_metal/fnt_Embossed_metal.png create mode 100644 fonts/fnt_Embossed_metal/fnt_Embossed_metal.yy create mode 100644 objects/obj_popup_dialogue/CleanUp_0.gml delete mode 100644 objects/obj_popup_dialogue/Draw_0.gml create mode 100644 objects/obj_popup_dialogue/Draw_64.gml create mode 100644 sprites/spr_shutter_button_cover/76267b7c-4ed6-4e13-80f8-12d83c354c19.png create mode 100644 sprites/spr_shutter_button_cover/layers/76267b7c-4ed6-4e13-80f8-12d83c354c19/b201671b-7405-4bb4-ab4e-e9c0d0be9fe7.png create mode 100644 sprites/spr_shutter_button_cover/spr_shutter_button_cover.yy diff --git a/ChapterMaster.yyp b/ChapterMaster.yyp index c594358915..dd7555182f 100644 --- a/ChapterMaster.yyp +++ b/ChapterMaster.yyp @@ -565,6 +565,8 @@ {"$GMIncludedFile":"","%Name":"1.png","CopyToMask":-1,"filePath":"datafiles/main/visual_sets/Company_marks_roman_right_shoulder/ten","name":"1.png","resourceType":"GMIncludedFile","resourceVersion":"2.0",}, {"$GMIncludedFile":"","%Name":"1.png","CopyToMask":-1,"filePath":"datafiles/main/visual_sets/Company_marks_roman_right_shoulder/three","name":"1.png","resourceType":"GMIncludedFile","resourceVersion":"2.0",}, {"$GMIncludedFile":"","%Name":"1.png","CopyToMask":-1,"filePath":"datafiles/main/visual_sets/Company_marks_roman_right_shoulder/two","name":"1.png","resourceType":"GMIncludedFile","resourceVersion":"2.0",}, + {"$GMIncludedFile":"","%Name":"1.png","CopyToMask":-1,"filePath":"datafiles/main/visual_sets/mycrusaderbits/crusader_helm","name":"1.png","resourceType":"GMIncludedFile","resourceVersion":"2.0",}, + {"$GMIncludedFile":"","%Name":"data.json","CopyToMask":-1,"filePath":"datafiles/main/visual_sets/mycrusaderbits","name":"data.json","resourceType":"GMIncludedFile","resourceVersion":"2.0",}, {"$GMIncludedFile":"","%Name":"data.json","CopyToMask":-1,"filePath":"datafiles/main/visual_sets/Test_set","name":"data.json","resourceType":"GMIncludedFile","resourceVersion":"2.0",}, {"$GMIncludedFile":"","%Name":"1.png","CopyToMask":-1,"filePath":"datafiles/main/visual_sets/Test_set/test_sprite","name":"1.png","resourceType":"GMIncludedFile","resourceVersion":"2.0",}, {"$GMIncludedFile":"","%Name":"use_sets.json","CopyToMask":-1,"filePath":"datafiles/main/visual_sets","name":"use_sets.json","resourceType":"GMIncludedFile","resourceVersion":"2.0",}, @@ -586,6 +588,7 @@ {"id":{"name":"fnt_40k_30b","path":"fonts/fnt_40k_30b/fnt_40k_30b.yy",},}, {"id":{"name":"fnt_cul_14","path":"fonts/fnt_cul_14/fnt_cul_14.yy",},}, {"id":{"name":"fnt_cul_18","path":"fonts/fnt_cul_18/fnt_cul_18.yy",},}, + {"id":{"name":"fnt_Embossed_metal","path":"fonts/fnt_Embossed_metal/fnt_Embossed_metal.yy",},}, {"id":{"name":"fnt_fancy","path":"fonts/fnt_fancy/fnt_fancy.yy",},}, {"id":{"name":"fnt_info","path":"fonts/fnt_info/fnt_info.yy",},}, {"id":{"name":"fnt_large","path":"fonts/fnt_large/fnt_large.yy",},}, @@ -1568,6 +1571,7 @@ {"id":{"name":"spr_ship_veng","path":"sprites/spr_ship_veng/spr_ship_veng.yy",},}, {"id":{"name":"spr_ship_void","path":"sprites/spr_ship_void/spr_ship_void.yy",},}, {"id":{"name":"spr_ship_warden","path":"sprites/spr_ship_warden/spr_ship_warden.yy",},}, + {"id":{"name":"spr_shutter_button_cover","path":"sprites/spr_shutter_button_cover/spr_shutter_button_cover.yy",},}, {"id":{"name":"spr_shutter_button","path":"sprites/spr_shutter_button/spr_shutter_button.yy",},}, {"id":{"name":"spr_sister_hospitaler","path":"sprites/spr_sister_hospitaler/spr_sister_hospitaler.yy",},}, {"id":{"name":"spr_sister_of_battle","path":"sprites/spr_sister_of_battle/spr_sister_of_battle.yy",},}, diff --git a/datafiles/main/visual_sets/mycrusaderbits/crusader_helm/1.png b/datafiles/main/visual_sets/mycrusaderbits/crusader_helm/1.png new file mode 100644 index 0000000000000000000000000000000000000000..6c13d1e5c853e68e4869bde9188b508f3f381bd0 GIT binary patch literal 322 zcmeAS@N?(olHy`uVBq!ia0vp^OMv(V2OE$~)b|eqQjEnx?oJHr&dIz4a{hR_IEGZr zd3(!{uR(!_;Xqc6h5hlPjIvibj_&5%W@hp>KnbXdMnK~FCF_RWUY)n*Tz+;i@>P3I z_op4p&$V}~EoaCN==dB_&CU?4q57&cW%7K!lK~bP0l+XkKHugja literal 0 HcmV?d00001 diff --git a/datafiles/main/visual_sets/mycrusaderbits/data.json b/datafiles/main/visual_sets/mycrusaderbits/data.json new file mode 100644 index 0000000000..46cdc8347b --- /dev/null +++ b/datafiles/main/visual_sets/mycrusaderbits/data.json @@ -0,0 +1,82 @@ +[ + { + "name" : "one", + "data" : { + "body_types" :[0], + "position" : "right_pauldron", + "company" : [1], + }, + }, + { + "name" : "two", + "data" : { + "body_types" :[0], + "position" : "right_pauldron", + "company" : [2], + }, + }, + { + "name" : "three", + "data" : { + "body_types" :[0], + "position" : "right_pauldron", + "company" : [3], + }, + }, + { + "name" : "four", + "data" : { + "body_types" :[0], + "position" : "right_pauldron", + "company" : [4], + }, + }, + { + "name" : "five", + "data" : { + "body_types" :[0], + "position" : "right_pauldron", + "company" : [5], + }, + }, + { + "name" : "six", + "data" : { + "body_types" :[0], + "position" : "right_pauldron", + "company" : [6], + }, + }, + { + "name" : "seven", + "data" : { + "body_types" :[0], + "position" : "right_pauldron", + "company" : [7], + }, + }, + { + "name" : "eight", + "data" : { + "body_types" :[0], + "position" : "right_pauldron", + "company" : [8], + }, + }, + { + "name" : "nine", + "data" : { + "body_types" :[0], + "position" : "right_pauldron", + "company" : [9], + }, + }, + { + "name" : "ten", + "data" : { + "body_types" :[0], + "position" : "right_pauldron", + "company" : [10], + }, + }, +] \ No newline at end of file diff --git a/fonts/fnt_Embossed_metal/MessingLettern.ttf b/fonts/fnt_Embossed_metal/MessingLettern.ttf new file mode 100644 index 0000000000000000000000000000000000000000..bf538802da50b4f4eccfde091acb400020b4310b GIT binary patch literal 120520 zcmeFa2YeG}wmv+sM%_i48Od_DWw{q@u#HSJa>1BtsxihkfdHmsg8|bCE%eX=gc=f( z5E3?!%_gKn%7*M_Q#RSn-GsE=>}Jz$+HSJh8;!r`ydxQd9WU8?@BjOKzwd8JqtR$a zmgYV0DbIP%8G#9cU=!8~qR=#a+}O$k`w#TMmLKr=xN2-}uN!|jTPz6duXsK3#(7hk zTK=fMDG0hEJo0W_(vm1l6M6}PekR`6&uD6#_x%gMiN)$%I=*r4vKfY-y*^nG3^f8f zzi;NWd96=;@$-QKd-5|u2;V$&`jlyJkNU&!1@=-4_U}Ct8!To+3tr!k*U2;IwY1(b zP#J*NuL^>=Z|;H{ryT!UIw!DKr{O!jG;d04lUQOLDzM+?VgJPWQ|3*dIdj0Lcs&Z= zuc~RmqLzoUd~XTtjob0s*tBqZ)5keA-wEvZr?7tl9)FIy^2e^M{(pLnUGqa&6n-eq z*KgP^!GM*Qa1&U3`|}JPHtGa}5zjh7zZRz&8`}TM$Bq*OpI~@j5?8mC3!}x=!sGl+ zoj|f92oCIzH5QGBk#E6@4jc6bqbcy3p3D|2J%xmZh1=|stT>zzuE?n9nAo`ZghY3e zCpjfGEj=SMD?6u0ZeGt``2~f&y+wWc_Uk{Oc%ZMOw5)tk#o)>zLx&9?F|umZ=rLo* zjjx_iGqHA3U46sk8>URXaoY45jWcKAKg^ypci#L3P0hl>Mf49_7B5-ax@`H1mBOmk zg0Mzdd(*o08-$IUZr;3QtFUeRj-7&V%dXvf_6qxM#oqf59K7w&;Uhu%wmQ}>>}@BTACd*JN32Y)U+^oxfdIsfQmk3aF`Q%_&G_{_7<3D5uXg-b8~>eny* z=H*vjeNFhSpl1>IoFXAn&+oSuX z?sB3dF)1-MF)y*NJ1HsZeW|StpI{KILKHsbgm91WGvOiOG2v<9HQ_zsD;znd{YWJ- zk{{WJA1Tn0ZU1chqV3bR_uAfVd#CN~wzt~eZ2NuN@7msIdmZnY)Ia!7`;WgrLlE8{ z{CBgFvomg>JOsN=C92|n(w@$<-%np14p82L+KXx)?4@*2NrjDu^U2}GAdCXZ~`NSBv zJ8{t23!`ezUMP=oPn?LojP2hP-+0xm$iR0t;X4~MbMV7)P6lEcJS=A8%$S5IpIs*y z^(KMo4NTNCX3}S630YZrJ@eg?Taogmfo!R|rTCv>wqMab;2$j*+rHC1$<~OCf)R2c z3lT!J5HFo71M`#Olclhewr!G>oR%L z@?H7fGSu30Xo_brbXUdV9CsyZXGwIR8AC)vC*Za<4SzteKIrqWaJo&O%XLUq2*FSOo5zPsw}cY z&k2(50&5oMwx6Tmujt`(g@?z7hQ?Ve(ecsvAu)`}LR?H74IqY%zB7#=zvGZM=D<%HxX3~hfc-l!<+9lPXNGiJE&w{%#C z&9_R|8~gUXdsB8;zN?|3yxgp;bZ&DBp_mtf@LTpt z`!8`qV%(6IT)~SuI9TZAi!+;zMp0xTVtQVL(QY({=P{$+!Y5)lxjY4)JplhS?K?nUfJX z6JfT~l7y3?mUq}_!-v_;X7g0tA^!|ri~pRiO5j>S(AoKKwLlNKpe0hEBl3lQ z7RDY&I^y%{)iF$js zJ(*>jvYA8A91aK|<~?RU-2*oW<7K>rNRs~KH;5+Q)Pxi(nzAQFahdjj*tRPU9Le=9 z7h&p)6J1`Y~bV7)bAetD#3DN$XhM7e+!0DDe zin}ns&|`w}!>zBPB&4ULB*wtM;NlbAd6WE#a@G-&DzRSBXe?e*FYkHutfIs< zH#;!P8ZgT|c(`bSvFNzC=n$JE*%(bV$ezW-XwmONYudRRSkC-?>g$vL+V|PT=M!aJ zWr(APB=wLWiE&|JT$}*f%TvOoRIB=pO?_TszfpdD#ek`w{j^ETj7)t{mzg$U zoLa}8myh-HpI{@^2e~{8?7yy(@2ltXFkv*LdvXWa-X$Crw)#dN-MDq@#+wg|8#it{ zuuUuzcE!i<*|SSL!Zz(2vgg1p+qSU-`h#q%ezX24+o<0(OdP^)E!P(~lJ!Zq?qIj- z?RoZeXqCLKgtT1>HAxGoP6#lUN^FGa(ZhZ@ujjuKKo^9pTOowtaUqnvlJf5gGGxom zMXb|7rS^RCM_tZ?K&-{vzn_quQv33w!D1( zy@Lj|rm;EAKPqB<6!qR87c&1Z*e4EE(WPh_k!$~;MpQ?3P?JI3$!=5ixt)D z>_jeK{&Rw0hZhN38L$uJy^*c-kY^RJl|h|3+Lt$G%!HA`u+hWBp%X-#)hbl!VMW7@ z;#f9hG#jR`3>{)&Lrg=4Ob~TeE3-k9K}A6U*Cw%A zc4v>2LXT5(N(%FBtkCt8+@x5P<<0va@6$dk+@``{nE9}9jnY0+vz|CDEtWSgUc6dS zbh{Kq?Zci@)EVrMI+Gn#%h;dPIJT#YQ~h6EjF9@5qeu5B%Dge-q@^}xIO zWZ_2WmpO>y79pZrA*^9O-|1DWa+WR2nKf(v%$WA+~@2jH05PUcJ1%diBoBE9}w3+oMPC`9g1fW@f+4%)Y6q#l=FSzPLCo zIXNRKsb5l3-x)$*ePUuxeEitx=&@;I#mLABk&&?x5vGU;qr)*-maTSsXn43av{1Bq z;XqH;>nG^-v9S{}AcnfhIg@d6fjIzoSfDrdBQNKQb)?nc$qa7S-tD*y9Dq$%)~yNw4LvP?Gy#zpfnTQ zas#=~cpxfB&}qRz3PKq-J{NEEXB!*H@X)0VWF|b=#Ko?b5sj9{NIVj=6Bpw#+dA7d z%Q7oIJAQF|_U24eR#aBP()ig?v(2-jW+g6hXX4Qq)o8*ae#vBKmTh!ImMzoP5YD9V zXxn4qQQ^B>lFe(Yvl$|!a2922h+<-NL(~pios;RJ>LNC|5+j~=CAiLpn_Um$!Je3Z zD0_a^0sLjn&)&X$dz;`{vSY^*&r;g76zf(6e>-G3#IZtI>R6&YB3H?nu!E&4+SiQPn z^5oL``qF^|_YW9QI=V>A%`J%Zig2>+`^E55F+D`g6s&qtj46l_d+NmfhxV^LH2F|% z@u1C{*&%(e;=Gc6u$KnbL$3=DXC-<;DrSn8;J}eHrwJw^50a+fqm!tR*Od>? zyf7atX&y{>a@C!*;!hzAev~33W4kX~PStMa`wTt<}$_ z4QwvSx>=G8(({sZz`n+QZ$x;(Tqx~SZZczH5G(|}y_jnZFJhWXjPryE6AE7+;Bekp zT3g%a`J$M}`K9c|WOJ_0ZhtHMjJcO>MDaZ-W5@O=c8vGlmc}MbVA<-&Qj&a1w#(|5 zraH-Cx4Z1@QOHjhioI(a`fi0%;eV$}0g&8Rh-+&T2Scg|i^zekEEM`cQw~CeFHutB}N+SQC~v;5HNc4Pn#xvW^YL zZ5m(J;SeCz3oqdIAzxm` zw|*Auw7e`_#O*`Ayo_Hc2%CW*j21?-P{deOER==e^Fy&MA2&i#FXQ$h{=a=5V#!!4 zUT+p|#t|!o`+zOpiz8P8b-WvoyMQ#_iPv}Iwh?;_!aIYoS1F!L@w^f@h6qp(PlzEd z*7N@hoR-f+OiOK=27)nq>M(N&uG8i#dABrYq4Mb|FoUm|y&YfjojY#mavi1t^OA#9 zN`5#4F2&KRLeaxbLYf{Z3VL%rED}y#c%y>06rr`qkA5K&5Rr?1J0&n0Mb_n6t>d+Rc7W_>0=hB^a@Y?G9%-wjIm21eNy~m zKJ~k@viB!mbd)elNy(okJ{9e7>~OWnrlN?5$p|+SFTfkLUq- zjUYC)jyv);z7z+>uUr}0D3#u={F#3$fwN&@m-w520&suHZV$)lvOUY+2LOl9K7`LT z;c=AEssLg|BYdm;bX%KlNqeMaho>DW#3GxM3awWl^oKsG6h;X(LIW}* zbCEY$jvVY}VHdEev%=4XN09A#!Pj)+!~-Wz{Oq11;{N@Q?B2a^-vi>>wd+@}UO#8f z&5e!gr%hWwb?W+?*Nc^v!zwC<<>y!B<_^ow9+sIotZJAT74^u^9}y#jpXu+oiyhP7 z#!l<^vordAH|<+?C)=&xIAX|6Lzc0dd^fQX0~R|Mvk@cgK+w7F!$Q-6P+X(~vjE~jdAV-!@|Y#ft6;(z$R$bh=BIVzig>$u&(O_#-5m$7i7VPb zLcnFBZvp=b`W1IKUbq1F=EGxRi%n-NY=lxX)ZsWaVe7iFp(8x^Dl^sZ6~!Rm5R=x~ zUwPx2O(fcHa8KtdSo9yAcY9_^LBS{ET8EB4H>UReg-6-1%VxhmJO75+%;tF`H9fQT zKgvpUyB&_`;pPc`%U#CJ6LL1xjSU~6Zgj+1W?3zkDfjTXa5at^-Nm*aXq$XB$`#ec zwgUwP)ni+S?HN6K;ly{Bvz@;w**9m-L%pXgo0GIQHMM3^GTT&I3L6^BUKC!?y$)My zLdM1>xP6M%YO{!<&UQ^)t9iXhY*749KB#7KTrb>rK%V57J8|MvV4^QFtNJYy9FDi2 zd|dex9G7q*qU|wOp!+NTbcJVw2-7YE(pv@}Y%CDo$-*FChBHJoMTzD8eU-i}R+*N= z`X^Vi{!t126)}QY^+xy=aY(%-P-aTA?3$o!vW_p8*ApRi8t_R%CE;NMv7l$Z39h%~ z%7+K-4OrO@wpO~XWPpfRjTICpCzPFTnS0!^&~$^t@%yFY>ldVZ`+K4lx5)j7Sfj2y#J_yJu4nzEB6aY9IC$XS z^Ktk8k*hG>aIO*k4|Bzc?--lY$4S+`UUxJA0@~7A*5s=Z547wX zzY*=wCXJ_0{KjOPN=nI4*HG8y8tw;1WZ|v1D^4 zOV&?Io(9#zl?q3;xptv3plv)D(vn^9Xj~m}ArWJNL<@y2`AX1(2zU;nGoRcbXFftt zL^`xyh;>tU%7kK|pPS}5LKJ0ka84Q=4qcuxDK){-V@!M2;=qG*TTYk7Bc2-I&1kBx z_5}C7lGs=V_~<={8}oQ6XJ~+rn3jM*Qg}QfS@73EEjI=Nj=C~Ake0S3BBs_PMK;1 z(S-=Sffc7w$c<;bLiU<6B89FLr~tAb5LSfPlov!66B$8Mz{O4rxY&Oi)7Us>cKOl9 z#-lTSa5Tt(G+3EDMK;Nk6}zHLLMo6aDR}s6A@_j^IAYeUF|E_5ADub#XoxH?0InD# z%QFE}J|<6768Wr#gAx}S3R$t)Fn@_B64}-){27su0oijKpS9_}NMv#i5lpl(5K=-z znOz@-bd%r$z(`pm+_(t2@C);uS{Ok;n;U5a7JvTDfR)M`$E`l!+O1CKKC?xZ z&ZV_=$~s3ml0&`Zgs`v#j*3%G5oe0{IN*E{A(f;jPt``6YV>? z{`{Lq>9nk+vx5KUa4eZf|4;b;Rqizko~*z=f_F<6KWHTa9F4#%588@Zz>b%Kb+wUa zUJncR_$F`LwsXstoeLH$T(H19Z{EUr^SrgSd#bBjb&N-RF|kQz?=p>^Ry%A+SDgy zklUUWZJ+Z$ssOY-Ae<5cZpq~aYU*XkLm_A6V%U&^b@E@lWSc+_AV;=aysR51wWF>3 zDS3DHQJMN!X$c#wUd(XzX45m&*U~dsj|_Dw=IIQx`lj)Zy8yYx3?6KsB~|{Wv#%M) z?HR}3V4rxV^^0rvf@+DoW)mERQk}D`)c>@fEZ*FK>z3Oo=G}YIZ6?9hRs&H1(iU9i|&{z2~Et zy^>lx9IS}y5ta$Sz!jXE6Yv`}OF&3?E>JlyJh+k$KHMB+be3UW-YncAEb$HLE!a{7 ztJ8_Q#cdPA!mMFomQ;9#r9xgHZwS5-N^WPSeQN}R!n0Sy}>1l z{Y1uc2}+|so(Y7SryEo$pM{uO!D$Eclh@M?gM+vWxE5JklSD(}f+-~*26o8B+<2QX zZH|OdK!&&x*4M`1l#{JU(CjbvFZ3p0qQVNN1+1{^8f)wdSY?g4(6z;8CtmnvAN8w2 z&p2LSUh`+ByJh*Fbg5?wvT0T7r574nv;Q;W*%#J6VSD_P^px#3Std%)?&P$z2?Y7f zCy#waH~@hK_96tiG+gMN!@~50mOM z&4u?V>&*T?e0ykd$&FcQ7Y;3Dz4w^*s&7ef1DMmy4B4`rExnRsx93Pd0I3KK{ee%c z*D;A-!$1B4_{PVWxawPkpxEPWwixaxgoR=1!uEL}8J7dICg|OhXQ{DfD3;O~Gxf;& zk$h|hpWp;g)oNd#&0EEdJJ#(ISMC>&ED?7I6ZGSS#rovrXpgW#&xAF5_kxeNW#3M= zLBE_G)Gq}Ore*a$wwh-^X!OAkxU8`QH1Xh5kkb1EI1>FxQ-;LSBd|aN6X9~fktJAB z47mTnFd!`u1_WtJBsX*%L@1wJGKfc)bfz??8}E_SL3$`-0+5x+b(CJwmTvqz+}&RI zdK56QaVEt3VTzInrP+w^%mdFq)0*@YjrWlu%4i*}Y@m653oULY=1Afg?StsImeebOTF-i1ozZw3GTDc6?#XE?CpJq8OBxARI8uPQIy5_1jPJn zJpie{K=!`GW3xqXNz9Uyyh>p( z(C9#IsW~<0kgw;XbM9slPWQRQFn3Bpc2Q$NLGGl{2P!7CRDUh+R@5Uhf)QvH21=_N zvSUR&0?s05*kyzJUj!_Rvc^N&b0G_W#IJ(ApXV!%jm>ts6uaH$w1`HdRk0#}1}#xs zoK1OJpJ39DtQI3O9I*^;qD5yKn860>#r|LvFof!m8m_QOiSQWxa)A3pii9*tP@8DZ zq(^d#F7nky2my47*QMpd6tIgJuw55-FHO+*0lk3~8Zr5>;5$RhXd42m-^dU>C`#-`q4xk)ieqclf?tB7`v z(6?RagJ)>RYk)yyJjvI88)F~D_sHLmgDnYSaO71~1(;}>uYa?!UpOQjL-zBW@Ro1& z0pXDTR`4hH0gK*yQoMV&xcxry_!hCDVMcB3)R7~rM~*BSI&{q7!C;zCEh(8gaNyJ# zQ^nrBt9$n@>eZ{dSFfVHyz0EXB1t%{*9k>M)nlr~`%j)Zq8vQIZaV;*bFY5uUUp{l zZJWatwr?N1L%;9P8Jie>8#{d1L5Kil>v+(~6$xGh;B8HvaH~Y})!}|cvvl05t&X#4(?hl`>~vJ2?Acgbc99+ofEBj3*#dox}OWWZkNS z7@stJh&XtpSWzX02qW~BY=mA*3KP{)ffy9JaI)b){J8tkoqkckr1lho4**ZMB>HId zX}jIZmPe>Rd%1HQc28%u@a0ph?|k5%->D5J?(oR$FN#fCEk#P#O|I5S{s-B26Z|`L zx813tP%8m*T=N#g1Y-1S(S0zIxWW@7-A~>kF(4?K*a3d^VPxU&6&^qq>uIL=jz93g zgJ;e>c<9i>`}aS%ckhF{cR%>>gW}Sq%NH+RK6UEqhKA*nCM};harx@yNMz+^3R(K7 zsN9H%+#W)%-W4Ve5<>Nc1aaj_pyVcHnW4i!Tkmo zmJ|%`*&}aYW^QJ2ZV3XB^z3Xl7`Ei#L9i8FXI-b*S@zIF@Gqi(8^$uTUSw`$13W=9 zLmmd%7Fu5BaSO#Rfg9e`?zDmS)Na>AHeG0qE;bSH)gj-6u!dMXgfdX}A9u?8180C^ z4C_XGM@_i^-i8(HxK2S5Jmvr62{d*Yj_VtH(Z&((yMF_g1L~%B@Dzvos&j}u5i8M_tsz$H!2jv&8RdW}-uj?j zr%*f|g?ZI6-l|3ZcPi%2V#MOBgqs5M=Qc!L_ri8Q%0hhyZomE1ks~K>yY1wG11I8NK`VM)F|V@M&TrinRn`yD(?m9C3}jV&u%`y4p#mNi$eOO+$^f z8r2MQN3v%9@Os-+R$I%a>qF*R8%z!Ch8tvYu92f`ml5T|w$gkEn%9oAg9m*?lF_DB zJNdFJliJP{4%pbv`{eZ;$nsrjUMGS>?y={C!)DT=Mor}!uGrLE7O2O$QDP`ZtavtKr z-$J<6zmRGDp12tQNx|bk$(ViJZc8)Y$joAH*wc427YA(VV~_TKx|H=RDN&yG+`?YA^?|Xk6-0u5^`1QO9OcfY-!M@38=RSEGir8H;d5=QBi4uZ>~)vvM!Xf!qlNy2R{O( zc=!Qbq-cP+1P%Iu}ptHHKEu5Mr}AA3w) z6~c~%t4qV#U11Lwuf8fZ#=W_^QwcHmHJuw&zi#sE)R?R_A&t_!)waX)!ZP#`T*}}Y zLSn;-jzbYERXXfq{qbvpQA;o{74%?&QOi8vz~W+WFCn)u$15UZRR~a`JtdSlJaGUU z9$TplWR>>etTMD;Wk1nUX!h!I3*ll2IXTF92PBUxK`wyYKcEGPA&)L-AfeH&q`U&m zhX4@KH5};;q{psjU)EoJiz(8(^4IUZ_g6)^v-26;@~?K-b>v8}mO&}z(P8{m=X6Sk z_Xl)!&aJ=+>ey>sf`S#xK?&+hGGx@*Lv_YbND<0j;dW_a&d*8;QE!+jB`u5*BwQGV zV4Vi+b;RujIhM6gz2I1TV(2T02VMi4FpW{hf(1Q z+_a-K1v6fRoKmgCVPAbOK}r#fE*I{GLP@lF#n8mW)>a{3kF>VMVn{WL4#A+;Ws0+{ zGpx1NYHMXbFS8XU^-9WOERlt|vh7w|KQU~Dm;?rk2LOpF8-P3VTv3$Br9YfSs=Cpz z_5k9}&n$m0$WFaXJMs{hL+=32gRnb7MDAn4`y>#Rz;|XM&>iZ9L+^B&JF;~&2whuh zWv~GtEr6Q^!`UFmG{`x{AZoDw>AvchWfvXIkFzH}Fn?yeOOo!+07REEZ((zNYt|PT z>d$5Q8>vOnigdy-it8cIgJ~oiC?=gl!#SDa&qfM8CsVkWG*g)cFpaJHW54qKm6gp0 zC#YW?IilOGDE|R$y&=O~ptj8$GN)-t>5bXxbES1AwL+HXju|htDok_z)X%w4vl4Ep z)C*krnTtZpPY5E*Cy4BID3@CsO*8)}tw)(j3^FQA9HRSsyOvQP6IW^uCJKb4QwEeI zLi6u#5e^8)!3?M9=%jD@{{6@H>^Zby!?AVijxAq)thM#np<`lBPHswp7~fCqA16kZ zhz>_)ZfQu|Pl)6OBbh!eITRdbVWASaA&NTgF^{Sz=F?uJ^JeeK9Ocq9VFX zqLKCXu-?#6u!STJBqmTuKU^j>KA08_!fGAy)OPnvLpd0nr4$kjx7Td|#)juWdK4%e zYUzkPN9?E+PazLt07#(hPI5anR6>Hc1!RP>H-yrIL!m*jkT7k2YgmaUMufp)p8yz} z2I7i_n0N!?)y}gBidz5`p<-pCHV07>ooetOHtB{Uv-V(y)JwO;e_GMi_=_PV3t2%$ znST}BmNWjN?2EM0Pg+V^lbGlGNpnvH%V!{S(e{H za&-g*v1IvsSe^$g`*)JYDY6`sm$!me8|$3j8MN|S5>7^ocL*@~9f>JP={vNd`_yh% zJ%rg+W?J(7%N+@3UA@Ks{UG++(h~nIrK^~#o>a>gsb7}54Rv)Hf3M9{zh<}jpX!;R z8wX#oid8wIYOOQW1#)z{*`QkWTyT31eYOu*+Zu0`NnDO+7*i#0&oQrZY2H|uRdkB4 z{RLwEXHdYvA_-?Ym{>mqo7_%Vee}g)A4AVscxFEqnbma8Jn{+yz@{g(w;nYQ(;?SX zQ@spP%NFDiZ$+-?F5#SS>aDjP+`ISS+OqtsO;CT z((A1(EUX+}DQ3os;o%Mocs?N(5&8U{$S&rv5G3>?Lm~j>v2d0Z0+kmMWy&;WWz7SZ z1&U8&u)O+eAn4HCB@%4JB4lubKykYWx32^>Ua*lxHjYO?dCo9 z@v2K3pDjP$x_e3U$=U1Sr<4z!hWOzfKtnfFcs#N4s}w^pBZU(@h+qa1Kb6Lm8E9E0 zEs$2+VSe!E3*=?96~)~-BlRhdwy)x;vcKJZr)v51Q}<_|vKO{(SNkgODwA)TShH?3 zmpKipTRAZ^%eYXQ6yAX%&4K0))aV*XVrEC=X7gVEK81Z?QV(!hZD*@;=38_Z+XP5t zFmGuF%Z7SOXfZS~K&cMr>f94aWH6E@nJn>T%tbL^tdO7&H;V>I?6o96ZhqXH`7A$r zUVap0$^@rYflK1#NDxft50@cZC}ZX5P7tkuHWLA|0`rx4hLF@CfL_8{`M7mVUm}p? z&Wk1~gxY|gcRfi={&^JMg0~m=44}5%CNwz~qh4U;3Z*I8x_ame!#IF2+rT#ykx@K@ zQEkCsM<`0X+Yylv+n&2Da70*1UUpODd4v}GNKlT@A_qricQ_&mJ9m-9)Swr1WdQ8r z|D;-1MR3cnCEa4>QbEy)*SL_Ve*QGt5@wEaS0|((Z@H7}rhAl9{tV_0@|G$Ve}s+w z1bXrS4le1if1!emH-xQSTzHcRNCM?1UV*L(avg#m*#IsTSF#cs*CEJ3x>LB1<@+9h z;oY-m-Oio+w{FeYy!p`P&FeO8I<#rix(ypL)~-FYcI~=mVcohz`wxlL)eY6v!%r5#SP|z;~3qTfVFzrq*9|B>5xqMNyonOOphMV zl&P?(EZ1yQzcOBQIG#t^gN?{gKL%YYBBK?5z$ncV<$~YCDWErdEleyQoZ|Qr@Z1jzfYLuy4?DpR{$0F%r&i6m3F{d`ws|%VN z9kU$s9Gwy%6wwCnVfY60EkO9>f9fUWLI+!~8wWv?CN*C9Us}L73OT7xh6>~u|s_$a)bkT^)2^=w_ z#qZEe#G|+pVscHM)E71m4BzYrjNmtTsKdL` zezM?3M7j#vuOrX8W5$ZQgG}d4o)to~Z|IOAa;gyG6w>q(=+$8$<=RBMS&SmYLlzx+ z5fzx^Uk#2g8kZG6j>YR0m(3N1bP13jMC^K|V-YZvE*`rF6cH&T+{pC`{!uKN%WEkL z0juKSmQpAfAQ%e|1zN)d{0J`*-x_ghUI)422+triEg@3`M6DN)z zmlgFh#eh*CB=48^D0`K)owI6Dod;FhbhS^kr)KY#Tm92hbfbp8KI9HvvZ9z||Gf&E zt|*`2A6(Q1i_hI4#ifvyG>xi%L@by2(jO}Jt(V-Uowg8ZzJzJihx$qv^B zM0r!VXfujVzzKRuRCHoI@O_Et!IXy!4W4|I$Z7HzO>Piq*wA7k@W%(t)jnJb)Vwxc z9S2Kubbk6^bT?3M96xbFJ$Y~ulTVzG_z*!8m&^N=oA_8jJ0ki&ANmsC_|FP446 zM~B%y;p4;Bbr_yE|2spYc^kxp!1Uq$=zbjip$-ES6$NAc-}{zpk^c7W$F^=gwrSHb zg#3u~!GEZ&9R>el?Z_pN+-vAZO zr|lIP_!m9^KH^&c0oVYa(j7bkbWFhPrpyX45#R@S3Q2;3PQs6|Bz}rv=S4#Qu2b;# zdr1QaJ{ja9q_h(iHg8T@Lez-Y6y;5)nu zRDgw&>%g&rzmn1Z8$ke{kv0As_a9cC%wVIZo)7R3qSe1?)P#+7YSYZ=tQWil$Cw~B zB3r5MOpWN$+y_Yy4=XzyYTNZX2gppoH@I+(4IwW&SY3B*kEwuEGnensjvae;?6_t5 z^8HJe>{+tpmPL#9ELwC+bMv0&=36FAs2xAPwzRaNxVW}ozuG>1Y8z_B`1n*5`v|w( zvS+xD*Xpa;RkNAxs@lcshHqeX{agCaWi9zF%$GNl z`BJm$!1hnJ`B22?3{x_g!{#tU%b8%C9C}>{*{XK?q!}g>_kj3gRl5hD`BcFBT1T~x z0#4G7%q5mx$bH8huURKNfwK-fA`0X%qZ6mr|A?~u091Jo4H2PXch;|4M4%hX*zIu_ z9?yUL@%;TwtDBowH@z!2$rhO{=S`FpB~q%FyHLEp>#Swf?>g(}E_Tx$`u1D@jDP$i z<@@h-Re%3GcmV$Ox)#NMRyS8sKKqmMp}OW{$HxrCbm|9Pn8U8hS6Nqu0)ZW`vbj`~ z1L^Lz-&MXZ)@nl^A!=+DTNG-~3Dufep*=@vDCz|uFeFBo>8?qMR;hTsovgYW-KTNV zt;+JITeZ$rgx~OjPwwGIqbHJ^Y~29@3wC>2?;E~Qm|R~!wZ4Ax(4jLbDyCLc zOfD;%T2?k0G`*6N$&-nwXEOl4TMoly5bRWz6UpomlEMT#L&+It<`Pk&%Ci`ru;37M z(DTsRXmqkGSLPJ5pNJlSFMEjP2}44;dWouVwO(S~%z^ICe0PoveKyTcu!p_uW|8R{pQt*y(<67?FpwkIJpZ-;ssmCH5MF7Dfj7cS@~NqN`!5vhbbK zQJI-%o7qRvkpFo02SrU|KkLFp>9R#lS99ZGMS0~p`Sf_1`mEUCN2>5vG{$xW_gN@9 z2==a_x@nE)ze4c(65CnJG>n0`~w?;LQ&~yr<=0=+JVN>qB)8BaOewubsFZRC6gxPoCkwo1^*LPNEN7o2AO5mHDmwll2}K)%mo^Du6IH(^E^5XA)elnrLlq8CRZLcRl3l{XLtJ_yovuphLU1P`Y+P6#e`C9wK+34TL>uvFR`?%dH2?+V4j2+jUiDXB0LS2BBn4n-VS0CnjDS{F%da!Av5S`BN@@rqqyQrTv2R6 zo%b)i3+_&!kvF^vq#goQx`5kghM|rDZ{V#M25LJX6##J>tkQLa)}2E9caQ5%k?N+t zHFWxOkIkNc+HpX!)DC;fw%(zW7kK6^@HA~)H*LTFTSR)hB}qNn*^}teg*46Ryv^A8 z$oD#{UEOW3yy9>C0Drn&4oBpF<^KU==D(FiefXjJk!~btOHTiNvTm*HKPi8f$K2Pe zfV*@=x>VIKad#ZX7@m8;7$bWe!RP*)+#2(a*}Tf1dU29eQ?~_@YQp45s;PpOr22wy z_Qs8y*RS8)*f_Vban`tT+eeMsJYvM=VZ%0W-z*jtH5C-hEhw1Pv*+BNJ!j?S&dtr8 z6&suEawQ70X3cGyi)3=L(MSn5pai;PD#HmkiHQne9+NeJF;g5eB1Sz@2YQwqu-M#P z4!A!YONJbGC)9zrJ4-vZXby5fqS4rj1egkRu62*QldSF}SxdwG8#Ca|CmQa4Y~G?t zHzzM>T%O$YH_b8L#V!6vT+Xfn`!tJx6+A)hovze)@s=H3RM6@U{pKZ-##9!`rSHEG zzhC7Q|LUUhkKg>y%b*a*mi*tU?f+Y~{r^tYwi8SOfxQEL7wj6KRS|ZFHca#t+K`8k z#X4XAn*O6$O@0lKfZ@!S+#`ym>3zVWi6;;no)~NB(Syb65p?L8TeHLzwn2As&s7Wj zwSb>zB^b{-6ms@GVsgrB!Gs2Lx}9^d{~HR4z4Ou+Px>MZ7i6~S_~bGqaanW?d@#ov<$>m8tB8$d$GREFv&mTP3nHBK0WqLT~(F8P0}q< z{=O{ZwZ0)kLdM769Ct&CBes|0t?O1g^R+#%swgAM7=q7Q=*!il(_uq6;=HROW~2UlGN-MSNCvlV}IFL>(iZ z%Pi!=0u^5yse6Qv%a*oOybd1f_)f& z=J6GM5w#2p{*6%1iZ6o_u&hABl%$hbBp*XMsh*X%&B@?3Wus?A0Xn?;csIUkp^kUs zTZq1*)QxYauunK5oD}x?#<#YvSh8frjW@2DJb6W3-HO`U6>CUl+xfkLf`G!2H>8jw69KJe$rr9$~9x;_O<dvj|4pHpR zE<+9m6j%O6{Zgw9S@ z;(9s$<9an;SC|W%$&Yq+^zP9CGJ;nWQZMRYe;lm`hsIaZm?^>BEYOF!zLO{iUXvq?Fz2K+Y?TT9wH%Xi9>!tN}-ZyH+&cf;Et zGI2IAXS9K!jV;}ces>bp-EqX2VrR?LFL`HaCZW;v660rR4=VM#SC(%=HFfGIdFU;j z@kN&UkSs4>Z@Y89EWawtNu3SgXPv$BA)Pm6^^qdkh5hCI{&=FKcz;>%FAi5$zN#n@ z;A)&vie+!LNrr%*u?$7_?b5@b+F{QfVZ%4qy<~z@S*3 za8n7_Gs3NqL#YIED*ufuYp|Ep$_{SB%zyNl zs%L(;DzYCYMa%M*bxMQ(EB2+VO1i8r&QX_9HO(>Vb@MKdpgUHjYuA1Hv8(^w@0+}6 z5oJGS&Rjlo=4|AtgxST#>-zRx-Mjbl-o0n{>a`>{cXdwA>ecJS)YRpvsk4)lmnSFB zp1pj@a+tkPqzXjQ9BKw@P#j~RM8Q}Pt;5m#9R<-yvh&ggPRt4tQfao)qk}(jm43%t zfxDJ-YJUy*8`)GExqMuVipGw-iL@Y~s&&C3k_I5$gDyl6JZ&f8r_u2qu>V2# z*BlgW`4c_^X8N`C)?LfuOP{HDwgl~Q=EHeN!_?!Kwz3c_CW6ecm8`K$u0RM;W*(H~ zh4LDOosrhcOOYqljvy$O@*Gam-Btn*WzyhQIwCbwm!?Ltzxw|$s#I5_D(rLry=CLg zx?-t;3yG@rNMc%FVAY|~YMvoipcwy}eSi;A)8Gl@NbEhyMHdcO{L>B;fYDIY@;PMe zO6L5Hu92j6k@^wABXf`f;WE($n&`TLxMGCX0u`c%{#YDh zr0yBilBc`IyZ^4v@9sGE`E!ZM&u+Yw-CLLBRFrkIPcB+Eyu4Lif~5O8<(}`>$@i$M zx$6H{7)_U5&N?xP_rfMJ?L8m0eN?)=Xp<)P7d>foz66 zRd%JVp5Pm=_6S((_3kM^;$qP~`b)^196-8>sn-YcR?>~c9S8rOt~c;F`t;NF2HwPV zM*l2)&W8HVzVpueZ@>Ni(@#J5^wSsbzyHHir{2HouJ`Y}^Zi}BE^Xib-1hAkw`_TC z%a)5b-~8OoH(zXN`LLx?P)NS7z{momPD1n zixI^X(HEMHW?zx0Yzb%4`cM`ZmxKP02{_A1Nj(X7Bz_rJpxjyEy#9bxw=2qyE0;UI z=wA8*AJaY?e$onN2&vA%gy6FRy=T3sdy%LOoVLL1@oJNYBEjH{QM66;^8fVY>CVyW zcG5jn(Cg&FR?M@J<*l>7ce^jGy68!{=t+Kd(_zd*7x08{6=gG@f6A%Z*c9n-Y`RIg z$G_~lrs99Ld+qHRqxjB_+1KrRk$w0vP&K)%Y+L)>)MjYWwv^1wlk7XDX3h)TuO&wiWwxi$D!FF_MUOK#g^_0}68O5wf7vtI$bQKHu zD^wa|qE{~T(4_2^V#?KtrWoSLxc<%D{=X~kx*lhbzf#cW#pCDR95BEzKtpf%uwh4hX-}>h5q+7{{*&)mGI?F{<=S|Z) zD^|9JNnd4WeXV|W|6A{~bF%!o=>s`JmcJbon-_ZD^S`?5PjA;ueCtDFo9sWO{MyQ< zcjbj#xAdShK(J4eslDc=Ge0@Q7lRAzAg`E!M!kB}_Mu|~b)q)vL%>MoEuc9Lk%y~a zqhA$b(=@jTs)FL7K5d5ofnG|H?8NPNpcT>zR(Z$I)bn>fz{VemIG`T+>1~znVt>1H zl^R+LmvF9(Hk^O?sg0Eo-MiWzW-+=y@+#rZSLG$%RexXdSYb@%7|aj4b_Wwi>c>hR3%EpKk%ZPKwMFvVVfC7?BjT{E( z{rS+30ZIw3aZ!ku$c9nnjfU<8!G)g=56J3&4Iccp^0;DCl&61QQu6bapy2nGdS@xh zIiwoW5&JtRvB2xBa0cymo=pfL%pP1!vw5hPz0d#MEn#z) zuk14%Ee>5N?}O@pkfh75TftAPe*;czSeR}MPOSed7CQ9bwfGNWfiC&DM)?I?qkIND zEGzG5#;;Khh7T?*pwj_M5)J6N(r!Y)^Mq%Q+F%qW;aUoqA{wGj4*$BoeYW0JeAln6 zIr`A@^6ZA>hH68aen###z3xJvK6l?;9G_BovnNL?Aa5}xeB@&ub)YX8r6!ufvc%oc%KW+0}XPmw61Sj7LTqw9PIWu&DVFv zjQLZi&K@^z{+KcIhYp=zSvi09d?+)E0__hsQZPA9VkxS-E3(j(t-=EY1BH&L<}M=% z<*{A>#L%=_C-;$fBLJmW{{Hj2~HcDpEoSh3R2#Htq70^;{1aNiLSD+m! z3nbfu#fU+~EO;&VcG}?^rES8(l5Os#ADF)SW|A_UB`mF5kUsIFOq6ARi5>ye6}n{k zyXgA-5+2M%sk0l<=k-dHfZoeUjr@h+F-D88NR50XOJku-aNSdEaP%g5RW*tP7wy-I1ofy5#Kk1yk{q~z zX_hh3lk0HyUL_r;lIkmYDAHQyF0Kpxhid`_==eD-WYIbQ4ED0D9!A0R*?RR6S+`PA z2QM!Aq|7+kGTVJTaZZ*!vA4qhWFK_B?ppf=q@e(V7m^9qNAoU7!7P+kvvh5J^kVd@ z31*?FJIQ^*fBJ4-w{HKsbsJW%-nn{p#mbdCSFWsRXxQJ-utB?8Lv?k))FU( z!?!;NQuIM>qG>A4HPMiJAV>&H+V>A=qac1Cd#FYYljh65bh!lmL^Ux;%KeNI#L@;w|eLDGNw0 zv=S|bfVcSqlKE=m@xqhE`$|jHL#3lEtlBul;ZQ$TwnOI)$;i0D`$0h#T9NdWpXH`n z{f>(=L-SVXC-p_m2cp7e^>4(B&LCYxj?i~MZTH7z^aTb=4j# z(p}q7=bQ_@C5k0u{3%>X47v(0V5zW$@~UtoJPJM1kU{-76`58!-8Ico$v1h} zi%+duGMP4@-2jJ+OT0L*K9*OX||!AG}};3 zr}Y+~;h@u~Ijvjp>ca!N4SaAAW)t-&yM=Ig#O?dsS?O6~yoa%9U>XL-_G#)%DIAr?Zrk*?wzjTBZ_-SdBDD?PR%pVy%9} zn1PO5eGXLX82wlvwkMJ{5XRh5UJf4*-0{$u!(fXBY4wN zh1i9fRzp6zQ9v#z5_Ew>cO+iO+nr;Df^jF|2XtK|9EF14w7!axaE;2qd7BTm_oBb{ zeYU)OOXoN5yxY%2`K9s+1_}DnlIH$-SC7-$%(h*3W-}jXWZ&tGjq#=a?{d zqWYjNGc8sLmr||3tekCwaAC=hJLGWF(5dZ8R_({w_CtMnNWmtclcxzjNo1semeFxy zF)K=Cxw*J9GwZ33?}OZ|6SX+eL_O^j@Nwy!1HB|Sm$zWyAvfkKP7-jgz=XxbEkubl zrY5}KG)!l1EXb?i#sbj_r`XU{NXUeAhwpTkRqF0I_M-aeyhZDuWECDo{kz#X#?inM zQ`Em*I9OlJ>}!7^{UUbo0B^sZW|!zn@F;I6%9o1rsKfD;62OM8%DAdsSPUfHgM zD;@{CNwXhU5l>fge*qGrdA__ekouywBgX^U%O8?Z_u1M z^JmSPUtPTrQEgS#{1GGOFPtwX3r>eYHW_fi8@-dK=MgH4NzlVOCo_bDhXqGUFH_lE zf~fOwkAY7~k_M=7pmxOfL)xBRU2}(K&zEwcwQ14;mLZBCL32>xkPAvFg3`w!n*Ws; zDC!9WLC?4n_RTFCu^1sx!zO8!`jMi1j|<(cwjaB`pyzUD?}05@#2)ZBvhqZ=jfEGf zPv}NIP(RbI4y4e>f1i`ZTG+_zk9NA^;nCGgQSJLW7@k2KBpCBh{|sUwYhK_4p~2S| z#z2V@<>&;&uF(RzEt!p=^`Nz|uPD)&U~w9psRkL@X*3zuo5PC$RcKc*MDJVDrZj>b zR4NT5pXhi7sErX*(BK4YD_n>H+7JN)?;efGPp<=B|Bu>W=^EcZ7&H9#yhTyA&Y!=2 zpVX9e{sBM=&CSYQsi^^0Q1k8Kv2)*^yX^$5U2*L{Q6tzNWVJz(*zK{(ua6#e$m68x zW9G@~XFt)3$!!j2LrvZWU)9i|BM0Prz5NRNi6v-#D$64U zV<^tHP1M)+SXajbznP)vPvRD60+WAHu9?JU&w=vg@7&CL!Bq4PF*@mfXM-FdGiy2+~k z*hZOsEBk+&R?U7;LuK|z7nY8>u8iYhSq+nG<;7j>CV(fWv7bA79@lo2p{pp*=ACQT z2xELbo15p&m@#|aY;pP`aq3cWA)BGUkuCmz*n1PWChqiqd_I|wkZ>iLgmB*w2q-85 ziWLKR;Z+qpK*0+^DPE`uXtipsTCMkeR_jr<*4nPE)$O+SuDy@7dvx1vx7}XbZ;#z= z_bB84{d^`90^-@r{l9)dCX>m`B+NXY=kpxz=ly64s;j{YpJ6qnnG#r$JTWN}`AE0*wkjA}(WXT+Y0>TrwE+c<~~faVbZwL`F>qLWCR;O|{~%dqwQyMDMhV z^JnewI1#U6ELG#TRJYpCB&_N-+~}HqKJv_|{FjH9%_lVTtni-Qla1YX>@dyOthO}o zwajkk+Oxm3v+?70=COx^+mj0X4kWqR>|)Jxjah#W_(&+U?~ejpAvtr z>>}d979bM%}knMgt?@pdKOvv?{@UppY;$5>FSAnxe;b-jv6AZCu05&8Mpt0!13dA4jr1acki)XyN(Id!Cz8#`|X=XPMz8~ zb?Wp9;4+vna{TzR^73)zPUrNbq&Z<> zjbUNaLqZxuLZ(}-jaKV)g!<92cY5QTMsecq6}y)0I>44~WTk7CtU1Y+u;EKFek$2A z?Fu$QTl%oLiH+0_KPYxd%jlXBz`7cOSemXYL(7uwZO0K*9Vt7m;kaE7MW-YxE;1gJ zp?2|-Zai*1Utat!W-{JeibtezLK#VeaVZDP=Q~8)ONs9Ck|$=WaFJg02n|C8zJ#^L=XvSyJ^eNWe|z zV_qTR{hp6?mdc$;*r-VT5eqriK#`#^@LnLVGJ<~%c$S~Rvt0N=qWo`mZ+==@SeR^Q ze{sm)xligQWv3%?z{b~D=H!>yj^2GzBKsgWz%u1?R`#+KY(*??sKm4>qf=rmc55z{ zatXbrxd3(&dxghP$OTjGPp~ZjE)@#ckGyvF}VL=QSwpPd=w6eVB~##K`=MVTo+W=#Da$O8(1B_~GN~bcFv>h4 zMY04A*B@QXX}a;2PxeYa#OiFuZnp%;%b)JW)PL$OjOR zWY)R*CAPaC{& zdu0ce%9fq3vIPt7sIT8vUA?%vx@pp+#gisAjUT^w{P?D^V;7Gd+mtCZH7&klu^1IB zZbKV*H2g?qiFUMs41tLez!J6oJCe{<)KFy9^<_q5iYWFH3x#~vs~21>w}2?mO2`B2 zN`l~uSph^s_!Q{2GAOX7Bmi;})gCcCQUWVpp?}ur!~&AdNeSJwm0rh-ZfZ(TcQ)_+ zteKs&pd;<>=eC{RRQhQ3SQ4X&&}2{IF*Y^zseJjjg@r6NU#?FD$iZj_X?Do znG{?KchRB#u*(GjpN(K1oGK!T_9BY@9&%r>4*Wm+)O(JGz z*o}%fNXR~Br7Hn4MKqB52ck^Mv8AIE5tT*p*X?sVdv38?93=O%-Tkabh>Wv?BNh~l zVErxfSvYjeGy=hTD?(%45U@XhTlfMV^54jkLVPmM5+7w>!0#?CKB4(cL$~%Dx{Y5@ z8dv0Zl@>+Tj=p||EZZG{^0%Sv)8;An&t`r#0hZ>YX3e*)FJO(V`Q9X>qdN4uAzBSnqHV(*#WqRtm8V zP(o}JS5t;~OKc6%Z(t^n$wNk&qH0RK1d%hYTL$-gbLRI&&}QARTK;bbKo%ME2a7?@eCWtK_@<1aQDgUC}+qZO|b!4Udix&T+#eobmg&b-7AX03s^s(24s)IKA>dD&t@NRT1?C!KcRi_?m4%8 zkeXcb6IchYOG$3qz@pTzTKL&uu-YE`q)@)ubyu8>>mR7DJBMQba81)#ZzfnU+!ZKhvU zH>*=O_CyouEEIAelYva_qN2yLIBKcn z^d8dBPm$Vwl~nW7G=g6wt^71CHk+R@o41%2nhpmCc403h_@-~2SkUd6u3`3R1zB(Q zu-dkpOn(SG=G!@FP~M@$^d8pXIolj*@~7rFOR+MD1C=5DqN1s9;u>21l5{hLyXDuQ zA(#Vt*=R9Y6k?C72;RiEGeti}S=IZ=I9=SuDz*=_GC6F+<3Qd)X>De>nN-BKL@1SsxUz& zVX}M?w~py(PUL~@uV}jbfaXLE&5mEuUHmIehn#ofEAr?|_e;0^L6ZC@gyaUZPvz2r zurT)N`wr%tEWa}OMR`)6zD~AMl2_^22C0hQRd<65H|IoWWj1`3KfzQbsIDIFw)}6! zP7P%7G#`F|1r23ZBLzq=o9x3f(!X;!x+2HqgZus)AShe<=tY5R!U?8{Y#~qRBMcUZ zXJP_kt#!gUSEsRKr;Hujp}c%bd3lE(J*M>N(V<(nNvWw*Qd2wFY+-0IH)YZk(TMJQ zh?pbW6bPs&?xXtfj@h)iy?BWz4zIV#L~mhK*<^xMU-U#zC`n5wI-6bOOSj3xVMrcB zN4>dLrMZ%7_$b2Ae$+7&=W zx)K}?4uYIWahXwc8!PFqj;4z`kroBG@w}cmfNnH(OVhE>R;@x7;{|yXyZ80i<>Dar zsyP_y&R}}6Z)`_&zcjn=B*Q%lY6jws`R11uoZO)RLoe zJT%mT+-6Xa1z%hj0@^@-L~kwr%H4C{K+g?pcW}bT$mDQG#J6cxxsw1TqlSw8NcWLp zkdqt`m_r%tm$;|V%bd~av#Qs2%~?k`_07lmEsl(Oy76?J{9wTB;GmrW^FP{Q<9B!u z2JUbS;I%Ybo9GTtqnp@7cesvjZWAq7GIqBIcF+zDh~1}#+x$rs4E*iqUwch1{on(3 z=(VqL-|chfvQJmZj|Z_=Ou@8I(2ITIyoWE{bc(Gh1GibFUBtAhbgv9xO+8kNXS?3xW-Cwc5DD^$Ahjht5&TOl2)t;s;sP^ zFrmJpVp>H-(wH&R#*9hI%d5}Lt;^1ymYto{xpPfgTD{X*Uso?CBuq<4NJ=7g|Y+N3`0mKw)4uc5rF3 z>vaN(GLQQGb9w&;yYB*C}}RHC9lE>a_xLNluIU`+Zw30>(!c~RtPG`?FlpUccT zw`I$@&e`ji-oCJ3;lkT*U)ZO2H^>JECXz%klBo8;K5Ma8>qKZfAjg2EvFpNDMLfXt z%luA!+{uvpk8g($|MnjvMzC||-Hx&5VoE2dVKB3CadQ-P6`$+x6Tl4u%u z4~u^)M#0tYzVHp($M2zZd~|WpM8!|;jabKLt+Li?UZX8?u?g$~cY$AElq+Z6ygL>& ziuH@cIg4v+XU@DsTuc}=p+UQ5#r)N*b|Guf-p*zr-!M&Ut*s3b1DCOxGyN!323z1A zZYXePiOe>{|M?R9bC{_W+7+=Umjxs8$k-)-ib%>TbOQv6$q~VEq2OVV zBe3%fEmbVA_><;`jh%h%Z%fkGl62aGJ&7R`yM5`?MlofBUhNBFqR0mNb*ibvh+vUNHw}-?ef5j$6b;u;U8D*REc?!Wl0X;!k?8ZfWHa%z5PyM7w1VMfgtQge>xh30OW=b9x^`u+>elkLc6^IL7J8%ba- zr~*C1mTNw_qP$Y?V3#Wax;N5KoZ3*?kPsUZ!GeOLOknbF5YcoEkx;=H1%NSRRQV$l z0RqZ@k@bLQ2gDflR3;oS1QZe}VuFVqscb~Zn{SLqBwK$m9;tQo)8h=dodDINgKYqZ z0{nBCHrNv|RcW2NWah;W7@$aK?K&yTH`ZH1nQe#$X;ZthWuJEa6kG)f!m=C2^7C=0Z3VQqc}pQX78!rBaaAcH0WpCs#2gJMzHyUN!5 zAD6ChnY_ZX%*qb-)WIJRHIJ~d;vi%qRLyK~X~4ctz0VoK7=LvMDuZWjDHb#f*r zcaa42YY>Biv>p6J-wad$1~>ymZ5NT{h?TXKH;j#g35f&ZxQ&eS!Hx*E!8lHhFSi_`m44P9b0ZAS1>t^ltfA zU-7Y^0K_=x9wrVqa40&W#6i^9FQAr)_wpDB(m>R(h)4a%AjUlbL<%M zgV6Y(TemCxom3oz^@~j4tJCl7)=zSwzdz3H)oZZyfd4~MrgUqPIV~C`vo4eC-#|ns zoftb{fa8Sxro}P27$HIwBN8KUFGE8eVq`}a z?qop@1|64>0BCz6vUVZq;$=nM6Xrso%M%KLRJbEtmmUU~v2i15mPYIyHeEz|}7-EHxw~#b!$~ zn`2F;c%uNkTjdj$%_0=!;K@7dwU{tDAx{q}X&Z$`4r7P&8dMM}zMV4QgQR z2O$;4%PCQfL~Cw@F-Apt%hhlTe9OgwkaLwrL?<750qRJ4cS7FuA^TjI`Lg=o0G!fYL!14zQbnU-S297nSjzP@_~^Jj+!8 z#Hb{h%wR!4eKra{wAvy|k*Lw=O?r_9iy?iPt+1%TYO$L_10aTIJ!1q9W|1gDG1_6i zQ7d1X8r@|#ZY4poLYIbL9)3C8YnU!+Py=O6fFlPe5GbKQO2JNjC>;{Qm6+VzFsSw; zB%tThqoNBgHL+LfQ-F51(zuAireH$}2;MQ;J} zEC1`V;+|qwxtNxg zk(xR(H&@8e_8vQ_BCoW3Tb=-I1B!Og5d+r8Hy)=S$h zyIWQcbb7fqB`x%z7j@|Gb=>^l1^2aecU8k!bZvfSl#x2LjjcO)g4#?TXoYw}5dZ=4FK` z!!1Vl#*+ZXA2>RC%#rvfbGn`_oldejy}@$Qmt}(f^f4=>v9ra}*#c4Yl1A_rA)5M& zaxN4Lkrys#zlN?MlpFDoEB(S-I2(zDd@k=6uE_s7^w-z{Hu6K9NAEG=DS>$OelNT) zd@6h`{9CvHdJO~cYG%~?gtJ)Y0HHw^(CdW^77$TJYL7ApTYeVgm>s;giY8h6I(OW&)^FS%%6X_KepbCtv9EiVzfRK z>qD`}G3;?4-{U@P9fPf7(oeH>Y&m@*TaInBv2AwxX^p?em$qqqO{X-tEE*yGQTC`H z;PNlV9*glER^U4<=ilKS9QPr%eu!^+7SCt#Oxx7;53&9fwm;?GuCCMe=dk@b_jYxi zw!eVwFSxg>>rQNc3EN-7cG~9?T#-NH^`G%SOlFn*f2hRe#{b2};QOMM`ukHF{QoQt zTjJ7{^(3q(x!04ip6p&v!+IL7*BH|&mXGy(tkc=lb=qEt?S<~`>N;)ji|u{g+tqd2 zUWDyM?(OROWNaUY?c?xYKn&Rotj}<-LwH#O_TOZBl>LLgJ!`_2CcfnqyZs%0H`yPs z?GM;S|Jl1(e;4a?)(^1$fqNbIgW-N?1Z@8Z>mOkq_tLXY+dszkkKNnd>-;>QVEZTT z^L&Q&&)nzv9P6LE_gB~HJYQh@7w+xub^hJH#rALA-}66M{}1-Tch+bjPg?RjF=N36 z0e^F5AgEoiLK~3c!wf>uMH`~0i0sD_LA(T%GyqW8ffBAtj_2C*ecmWIa)S75X7d6> zV&+nUyc`hO3N_aj)Cf-*^P~ct)VmYy+a95SKaXv`hZ3 zu<*~NXRZ0nke~mT(%*zxt#{dHTl8IngU2FfSck`blw9EqS9emnZZjqBR#QHXGhE5k zAiE(T|+Z2TgK;yBL{#Pn77K7S&2^m&TxyyAS#Q+Vf9 z&%0+m+aAZ6_u%M~$jJOEqj}z63}2WiM)W)#|El}VKT(+Ic{=({&wD57jL*?|UiG~D zglAiJPji&~Mse6EabfZ|DJkD1FTvHg^(K}_*TWy5cL%2jxwQ2tv_ zmy59i7SjBPF1VUKYq131H>Yqcce>^7itnv75tIXY^ol)C>8EbEG3-MMT*Xm2ywXG? zh-V`-c}sMk`F5W-&%er?uV8Z(cI+q~KYxy&Q$aesh_je*I;FmykPZO>+wgDr;>5dg z)9A*T+_40C437r{@uk=^YW{rxYIDIs=_7ttoEw?c=lPpT(ZfrKuiI?=F|e|O8*u+y#Sg&AsNp z`>Rf54_-X1CNwf?wqKcf+=8GTV*|ppHhyW^WUs?HYxD}Q+Ax(9pDLuN42Z(7WdvI&YjydXHL`T z(G{adCzX~~l$Iv->9e4qps8oirXD?-7Bq=Y=Y;t9ium}X*w~8L*rcS22^ENiY+12I z1i!3767Sx&bK7>dQM+!_TDIq|P21Qe?Mil!)@0v<6r~@t_`-p=pz|)Acfu@@!%i_f zdQu{J-;+P51~b}vbIR*BOGJy59|EEwv<;sg#oDMP$^m)UFVzjq?t>4H<-Q~QM<2Ti zkOTdqo|6t?YN3=*mDAQK8le{RTA&NV`}Q@V8_&y7M=jh_JjdqMffmD-Z)&F&zny+` zU&wxGsqEXmd-v>Vezcb+YKjguzKve~j;+8}9~oVw1G3tQk&?Uv&3HDM**#nwy>gz=O6?NOUVY2No^Y-Ho!bA+qJ1g7){ok-VpBm^)S`SK zNuNm)?0<>PMg{UQtf@ROQ7(&7BO(q2P@=C^6G$;K!o%?hAg9tb6Nt&Pal%I!Th|ej zmk><4x}f8iM-Q)K9j(^2Jxh5Y?Npb#U_@5&-=fQf_kY{MZZy`_EjYNN5N0%DE{H{B zH6j+;Dl9HcjC960m@$rpMWFFeSQ5x8LeVewqRYdt5e+e~NUActI8+3Qq;@YHu4KF0 zFTSAj-^#1$nNOG4XHIyp>KsdZmpJU=i;jpg8^>O3bXGgP;y_6aT)oUTx-KU5nE<|T0M8F_~(Aq7RH zp)Cbcr~>BMLE_KL0qPyDLQW$0C1BAar2*p{4h4{(WTd;zc-07340qKu_n7K#4DMY} zN}KYJ7Ze=Nm%mBbl9I9ow0UMS4)+^3bRm35RqW})&sR_im4 z)YQ<(=;+9nknWd=f!l0z%P1b+3s(XGvVZ^t$nbUP3!|2Te`C$aALSdn%NX0YIy57j zk7;^J&EH!!;m!Zi=$gNT?Da^#_OJX)WJ8nDM?PL011->!fu)L7!sV%`OzJ5(mLoH# z3bQyaa|Q3GMIAAY3J>v)7|#i>@{SmP5k43G4s$L*qsf05!73xu^QA9hdp?NmiTDi= zn(_NBUmAsf;rDytJNz1Pwxg&fr=^20XCZiY7+YxR;LBO4K5s(3c|Csb=Sv4)&O)ql zCbrPh!I!hZ_cUCnKs0C;?9Gli#);qi`O?9cvygjD#1>jQ_;MEZy&sQRcpZ%2QHXj8 zSa)FSgLsI*5(Q$bKYk6IpTmg%<6HbkBLCH6tDc7$8Pg-8#u(VN@ZX8d7e|SLj4eJG zN#Efa5iuOgmen@V{2HdIY@ppNEb9ZC@dO{U4rrB8-O3ZPOsO6 z#2`dqx7qB50Du1gonEKYYc`k~4Vt2YBU4Q1QO5EE1LY5CFFMdb2lBlVFFqHGy7**1 zF;P)%&i`PWy?lK1y`7~~CJ${aOX)vq#K_HuU1Qg5)I{ET>v!LUefw<@rkQDzg9gg~ z{UY!S7MTzjm=I_&8tq1-KfZAQ{)aP(fq{tuP{ejWKXn_61YEl@yjB|&Bp(T469VNk zLAThCwsZ7jv@O8g>Wm*><$k5{fr0UXt&e35tox!x@-uTM^`0|l4x2l5s=NXtHBy+w z#GS)JtGnl;FdNbLyFOZKNxXj>;n0dn3aerJPUFP>RifQ zp+f4?Qj4kI7TLW!E0F(u;lhLo&a~11-=Mv~aVt(KMS(b%&>KPQPlwH>`zJq;1HZH? zGBT=@PpE(AHNiDXP@%O?diNUhba>NFpsI;|t;Jd=UTL-Nh*+7_z9v);L%8~7KvwVZ zc%}~tj|fUOhIIIQ!pFjw!ndw9&pvzp*=MVse){~=Pgfm*hq_OwIv{M*o)k7~w`>sC z36E&kZWnjmCDzrwF>TuUY167|YTlSIVX3fb#U`=1_OCu0?i98yTefA(Uh$4Qw(YsJSh#j0GAszyJiGB@2aw$&Td+m3LaSJc$b4 zc!x(De;lqYiavPVWc%Zm8R*W^G;{Nru5Dt02pzYuHOy(CQ?R$`uu*cfRH z9ecGE@1n}skqP7|^(>*j@8$5&TITnanBC6^j{{@z9P92naq{Ge<2w!GEF*%e561brluk%F1fW%Hl?i zsu?vZ4uw{^x#Li4g+i;&o#Q%otU^jFIeA=CQe9HgxR{uln3%Y@nyMOc2Po(b!nkpD z)9S>hcc0z;t24(B9X_`Ip}TkPX7_Es=Mdu2TOZr9bJLpj?38x(&buCah&`rVer63j zqm_>BWXH7k@c^|l#kayGacNLcNi9>pqG`OQ@m9L!vfEXy;}$9GOR7lGT;wXX#Itz` z72(e?`63?*uj1;Dd%ca4N5f%R7HqVJNOhZ41j*JBP&fPIs!r= zq6BVRyd+=C!KwM+7%3r9s%;?L9Ff{5ATCi40{iVhI%j=`rHjvBZ2j~sVlbOIGC5_$ zOg1>B0YAm8OCe{{@4`;y7vvWl;G}khq0+>HEn1%C%ZB^BD)myB?D+_}B9lGBQVNs( zwe8Nztjub|L+(3#I5_m3BStuhMSs@*lES;Q!L(mEd^pkYlxS7}3;0{hK(i*;(wlNT zL71_dq2Xwq(6(w!P|<5N?$myP)MuP(7I(n9{+Darx^>%ykhN>K*4Hnnudl7EYpSVP zP*YP|Rkfh1s^u5cEqlZyVG{<0;fZKa(HSAIwJ>#1q}-`4Pz!h6H86qjbL09 z*m7fHibWBMDOqu16r&kK2@>wk{6PLa7BrWBGLN~MrDe+uPOmQahY1`*27*XkV-)$c zQE(n574X(6qRmA#R!?-HHsoX=ndl#PX}>8E@Q-uaJ*s?jmZn zGCs#WeAJ3~&;St}8NDXrb3{ZQ8uIfKFQin~H#UAI-@_cb|LU6>8q)47kpBvhI6LyU zUs*zs3U5=_#)_mrNdv9cr;^Q`SQ@g4Pav89UqXg|NY(Sdqp5(Wum4EN{10g{QR-mz z1EhC|G}HQkg&C4rxWjoz`IpH%`)O)SCV6Pnp^1+c-XwqD^yl?Y$bRyFpHlKXJow5Z znK(%jdJJ^46-$#Gz8O>b`z?+jPbni%OI;p#KAF!&zP?{ut^F)RZ7B7Z&-^L)Jw%WU z!bEmA`xf9gs+1?WEk~{G3`Ejy6HxnL*WXsd>L-ABw4RO7#?R}D2)D@Q(e$ejZ7WGx zM|MsZM78xvjwDoML@~S0X0_|>c`PT`9-NIbR!Yyt>2tEtXvU#)BsqYdapWXrb;;>S z9q+U4!L+YkA8f-LQ4G-E9DWK1?P8}|Rh${;#%XcFoNR}cPSPbiGuUp8&+44T?#}ZQ z{c=X92Rodhokm&04S{}XrT!LuNW3-PlqEVfskI4lEXuJeqN5`zI@!!R zb0#FkCInf1qS7RdpV1WZU213{D5-2g*1(v^l;3MC_N3%cn=>iRZgU0)r?3!Pa@2s_ zC(^bs8RM^Nov-iB2yyBORn+KKe{HIn&-HCrApEzmMtwhKLYTuuoXB zBRW3K-=Yh3NE&8CVOdlvn9`H1Aej}N`PK0$vC%#eF-dXjW5twy@wPC=!b1|`GBlcq z(0EW(X`GfYmNLN76%jw~D|p#f?PZ*cg=v5-w&`JN#*O#f zcH13b7@RSqan3Zcws!cGDZvvbR#e;}mX-#O99dJ-C=MS!wSKDDqenrH9zA>Xh<7^s zBqbFjCG|{7ijR#gh>h(T8yg=yZ{AAS6>{-yKKwQQu79CnVe{SQP znRiZ~%}Scp^ zFLt$wB@jlaLAiY2%ACt6FJRhHwFIq4t>DpKp2L?R4>quJK>dMg040nR7{#njIu6Pa znh^839SmrS(u&r!=q|E7E*E)ZziZtC^V>_czWkEZ8@c!`47?9pEPL3LDJbDjp?;dF zhT7WNO|)U=3v5~AnpFXc%nStn# zDR(i4x8EVt%{R{VnOcI{{I#vWt!8kO1%TgdwFze?URat2e>Na_*s$aw5=&uIcmvK4 zYOvZHYEK$!ok~x`Y=^DZl~(HnZX>idx{=?bdf*4RMcvXTLg85~Lo9n0>9d|+qst(YdWG0D#Y+$-nCR01+QAZBuF_cSy%?IbZoIFr?5)&rx z&8nQpGb`JfR^d`=L&Pk9-@=>ZFg^F2^=u0(ll*U@Y4THunZU1fw9QS2S+?0+Fucw~ z*97XO#U4f_Pth??C;F+3N$*Da06NANgOh1uVXnN2Q#5HB;(a@6FhkA?U}JsdKZL{t z{jQz+=m+kl+s1{BliyG%oLE0cT6*B1JY@c&HD_6Ov7^T)CA~>8(Og%w(HQRQ8|vc| zjI=+BTEbyWNuiP$C7LAUa0nRV4q}jU@B}1a)xg5`auJckZ1vi{ojd2Q)YNQp)T=ES z=qdO1 zl<=bPCgQdqxYpFx?jPN0)TsR_*fIg?_tJ6u?uN{OQJBiU^ zl+afj=@7$&B#W6%!K~6&(%R${q|J$>3n4e_$ZeH3+uokg{R4co#cGMa9NiY<9bicI4S5 zhQ0iioqT+KeYyt)6>6-71jOz#KHjE!Z+*x12o4?E+75(ATicJoZn z+mt~HZ1(fB8w}s`OwjKG0{rms{|evab08g`zsmi#1a=5SE;j`AB;z$(VG9SKM*QkJ zZ|1lFtC2i?HdCp?rqW$gN^9w_3DG7I_as{>bm_)^c$#U#DT3N2BnVjrWLYTD0F+6# zYNn|;HY7RNClgLTi4ccV(OQmMh&)2*etnV4;}$YDzVq1;ou-7A9`-r;NbkTwZw& zW%2w^k{lcd2{m&0I-Sq2xY#&Y&(0%0>l7Nw%1oACz60fxy?aN$)hk;5G|(EY)Be#{ zjQ97C4{#OV?~L>Jj|&Lk%TEl3V1r?bPuGCnNoAlpMHymcpIGNYzV-q>>v?=8eeQcY zo$e2K&=2zAz>{kBwTmb1A*dCO6bqXqOclnsGRw*;M~$lN(4i6?^Wx(xV`D4FRf^qn z@_YA$O3UrqmG#yd1NDPgTNo9=f931H9Bl@Eb9id>L3Q>OVhuMSI z-e)L8v=~;H4EQCduF9B%(Y%+eW>C>yzUB{3e-7IwFMNBmB)@EB{mXyHvgETi+lht&Y&6>YN(w((i}DEp2hX8d?eNYN!^KV}IoFwhMYh6p9VdyE01 zgE}V6M$UB+a;|HT!y(MfG2vn1*TR#+IpGaqnQQpapi&!bW_)^sUn}7OD>+9 zi&^x|EV_5Pi^cYcN-q%;Qe$tTdDlJXS|S1>XbNtbdzC4cG?OC8Jm7=rlwVKxHNC#6 zHJxFyBRW@@t8i0z4-0XG&Ik%5wfm-u6#1?|-dT{(Cdv0;R%J_^@~_YnZ-7%SMI3aAUVc=^2Fnk# ze9WpBfT1zT@0wBC+%aR~)RDH5tkk^Npl+i_WT%A3SVDY#!u>U)eRW1-qtPfvh`}Ki zqpr6FS$otC1p0u2&Y<jn5FtY&M~5EI=B*z9_I}8WDH`GiLLkK(M1> zM)md8($D{~DTM{{mR{^-YX3Ri>12a2sXpS%ifK}nE7@3iFDBI_Nq&jN$6T>E? z$^Y!o;g0aKzI{JU%!!uk~nGJzFL{q%Z1{o||Q%i_Cfs3JVr*K0e|5H0ljwwv*Vfj$b+oMIVbvd7Z4xC|aBAWewy zdk6(YK8sop&obmsm{vMxegCDG&ci@HHDksktM#VnSgEfSv$LH&$&5Va(ROroaz$8- z=wKcO13nz>!5l)U)+b0z4D$;O3-g87^$r37B;JaqCZq9GQ|bGEwqUe+Al6tjSYsuvU|=>|D#uOGB~kPNnc3e&`Zo zo@+s~%gGosr!AFI3=f+s#VV+p2?7_OLEhKch(JN_WT#~a?;mg0JR!U%)_UaF=t6Ql zK%`M2z&Pz^4 zAg&-Tt{^6+Ag@52!xq)CCE97M2@RuWvfCGp7jI|0po0hYd2md*ah@f=$+V#Rj6V#F zpOJwUF*PvGxyf(+7<#sGOdL43oIfTR?T+YL&T;z~dp;(S+JUe?O3mjjn&CeI4Xu6| z)5NHJx9q9rO^a0)TmjaN?ZOt#UazPvWyE7)^N?!RT_N?|4dqMj!d-272Vk3&* zpSPo3X3+D`XOSi(hlHknU_jjoO?8YzA-ie(IiZx^+={;6JFCg3ZN+JU@@!37b;(>M zxxvKP1aGCS%L@kT>+Xid63wW!MNtvHPofV#0!`*5JT!~sFujH~{|C(ghPUbga15H` zBKrRd%Ghw`f5eyEr2ir%YhFh>Czuocc(8b^!4iIPjH~S?QYPi>lbLJ^IuU3poBxak z1;1g@r!=?n#sTtsevkP!@3gW}R_4!xSX&SD$ml9BN;8|&%$h#D?C_k`5EB|#XPani z{w5$G9AsKx>`y6 zxHQOWi(eB}<(PQe-Yu4D)2cwyrYwn7VSFigN2SZJ61}}rmz+XZssj-(^uSU2->^Wn z15RMP*t!7@OF_1j+(7OJk|o0}XQ)nYt-1rbZu^3GzP-vkT0sWs-%+5Z`$Bi2U&gkwn-Nl?+n4!NRFaIXy(&lu}M+pC7)Gww^{80$=q9QJ@BoY^m z>j4I%`u}Krp|H+X+OcD%Q!t|eytzXMVXoGcDf&f{84M>zhj!6E@nWJV)<<`b z?G}_Blu_r5j?Il`zTk3X>Dqvf%s+zp1HTOzM2M(ofG~m9D?#f}ixsDR1_iInW^BcG~@KIf4#)ALz2;eA)>Z!W<^8lSIOU)XIqv7gJ!Wji(8zF8Ep>D zXcYudAR=7TSV9Smpy{rH7Eez$SC6(>&{)$_VzFdd!zC8^L2lvZe*I?dD4Vfsm;98) zQfzq4@Zz+7x6EkhH8Cw&S;?KV+oA%uPk{MJL*iMU@HmiQ*k`JKFZJ#{yw=C7IwIYM~f?yp&b!oObqsiEtiU?`326CWR8d5uUT zn2t&i|3k18=0lPv^BP1STHb7)Zl1T#_rZszTN-O5w3PBLw&n%rAAO>gvp+ z5oLi?Dl7>cSK}^fq%kncY-YaJkmbG`nm0=9eZ9Oz%{1Z=?94fm!`j)V8T7ydd#$zB z?UHo+WWgiL+^bhbMUx~o+3vJ@Mnc|ojf7*cP##5f-C5xw*Ti;3|Ek3P&`&S+9_jY1{I7_) z1a$DFc*1`nd!>Vip1i7?bx?JeoeDjJoxD2 zkBaS%h~Hf8WbjD;#fKL^efZ#EvH!y~KpuYhQStgMc{1w}B!#!9dVn+%p!b#OLRJ3C z@Mw1%-r|#o2R4Qc|0{z?Y#qysZi{dGrDlvfy|8o_yo%v&fKfEis}intRb0G#1TDDE z5p=>mXFLOj+?Tj+Xa@G8(=W)iwG+y zxG1&W%N*@Vt)qG+`oaaxN}gHs1rLi-4UxzrMk@F8ATX#@q4(o7bbo9R76^9;tA&li zc3~g-1v~)U&2NNfft5Y$YIyTa(_@bf+_@nnP?IdqU-WA5P(TE(x@ zijI#F%Hg?xl&ObLDv51EMbsCjB}mkkG$op$^a+4i4jXR|ZQ~9bNgl>LD$YVs%9|=r z;X6=L8ErqHT?mgFi@MAQ;tL@J=Ecs(3Oq5T11<5SmO#+Mh#qBJGIHc%$BAiA{&-!z zrjtb;;mgihHcRWI^_GPfmvq7K@uK8RW9 zWY*^K>VI_kHR}CIqGH_tkz=0)+iE)XEvB5$~N!5fZw4yd^0|TX4Ni;e|-?TJg zp0*>>e;T2amSu`}kDI^0a)0GAwtvjdF^kyFQCo{vuyK9%vvGw>Tszs;t-w2sV?DK5 zETdD0)JzmivCs?$3qWn7mSt!)`VMH>gcdl00Ru}JTr`f};rTmCg1c8R!f150Eci&n z;Bxop<3=3@VvDEW?m7+2EAK_LXEcO7B^;S(2Z<(5u>_5SI}Ug{5`)Nkau_?IYiKAS zac(D1of-ss7d$5NjQZ6TJW|U?2K+FGq`M0yuj%+#dC9K)MnOTYWl8oRU!DB5?ks57 zoFFk8lv36`OBx3xT`;fkT_j1qrIs$|QKv{)o#&BtU?Qa*{zhqsKU47c3rahDM4YQ% zP{@^~+-lh`e~50>^3@$s@ZL-|6s3{{&7T*RmuuFTOfRD%vO2{#6Ug(46I0l~ov5pn zr_ZdmPC@xkiLXX$NaLgA%C(a6^OF3zeYEK?5AiDOx(Zat3ot~WAw;ezdQBZAV=r7_ zw<2rdjqvJ#F-EocMX0W%@ioa^i%*@Wmtll8xrW>-EYubiS&{@lo8Zuzf$0hWU0x7P zDxnw)I*Vx4VxS;FWfxaQ_KoaXk``5h%#~yhvIhX!1*Tk-_-X;i3kForu2g3#GYL5@ z>cpW=7Ua(GOamwsfzzS~DkM-HVWZ+RJS2#s9ylO~AreiPATFb)uUEfIZSx1W?%8wq z-SU2xBY(-vq^m8G{5Q!5ps(I;F4VTgWVqnJB*|nW%RSUMZ}&YMJO8)wLw` z8YF^L9i^t!pBq9R+Q#31LV0*SvV)&DPVXm`hp$^j&+X{Va)GTDM_!dYEQXazU1v85 z8(rlqR;*vPZ2f`-^Vci7Vm$y~SJoGc*4kF-E-fG;sI@Lu8C*a}ZE%QKD>0$4hcfr^ zHk`kl{N|ubm4vQI=ula=SsXz;6*M%eW{1k$$<8mdQoFEq8O3e;=s+(ohCRww7*CoP~bTE z<1!Y<<*bpmR>f~TbWPnZ_UXbe_Wb&nHjeBU&CvuAw*gJS8+I+x%$AxT&tO z9M>)fGv}qQ-C$uDYV(P|WS|QiJ{85q!;6b6`uFcwQ8C;jgu`J*5AyAQktp)1&aHPm zQygCZc(Mtyrc2~puk}i&^IYkHbFF8g%Je(6Km3}vKh+4<3!mcZYr#%sBq2G`QuMzTMbJM;pAtHIJzJ*A{%)sP{}2Mt<2 zV8HTK%f+r;XLRXO+oj8tPMvByb()f%UYnjiB_blhZjTYBOsSnwD_X4yD0c&NPHPr5 z35bX41NGvT7zsYA-Wbi8J`#XA9e4l;X-OrVJo-X07dLp8M_JrA+I#B9ChtEk1FbhH zZ&Pj{-sUbqL{lzICcG4Ys*h-Pfj^6)df+CncXqkn<1Ukie*4!I2TxC(HF{aX^y;RB z8UL`%uox_CEoVdf_+sx?X*bf!yQR)h-c3mmnrx@tNUpP}3T?5g@_S9nl?Ewov9)2r znnQ)gZkp{cztmj){`*NRME+PaSpF|idM#pFD@o_hO8OJc!LIgIafP245y(XL#%dc}&>)2G)>pPn;yYTeYS zIb~(*M~qlqT)cYd(ADc#i+OqVoW(FFE2}OmD+jf?$EY~jHGv4zTLVMi=q zA+(6+HC80e2(@ry7UD>;#nv*~_I2C05f;1*iv?Llzhv8-i}0Qw7s{tmL)%wAOEt8U zQsmbW`RkY>&xK)HTUbFjVktzaox~5`H~*RFDK(CyLY|wKpuRP4v3KTN-a;QARK2EaGW=Uw72ix zs8XMI9a2wqxyMnN`-pJZHSYRk{bD)ab!8b>LbHl|w~^l~i1&?cXj~4n`HN}pPM5Ks zZwR@*yd@p$*6I=0A>XPct;qNp;bYg*U;XO9!Gn+N-+yxN-Uo%_yLKHr_K3K1=kb%r z#p{#*1MTYi(|hhaF7Dg|KAS7q+%UD3Ao6u-dm1f##CW@$H})90A|&${8z{G50+e|} z43bNRPW(_iJd-V9@3+dNDBLUsV9__YGW19+<^ z1GOe#9JCH72U=ay0-Nng@o_|oOytGc!FtdaXLVuPqTC|<_0R1;Aa`ls>3xf)7xkas zzu)vD;f0|iG$moL_qv%ChJVBQI%ASdG09qEq|HBEgL-Fw9T?Ceef+_-CbAT-vn2GJ z-Vc8`QPK3%te{_L3HvUzcWCdh!gs>@hL4O1Oo=fkL>R3Reik1;oe!NxhtueFK%tTC zci~C)vE~n+7@y*E6GMe}*Ef~_bPn$rv=ZD^N*`OA1J4MLx@varJh6TIiH#@3)qD2r z-;d5f^X4sRY+NvQ?1b|23H|#oM(5hX!Ug&H3l=W`#Z47D*E$>%5)&tc3U_I3L1KU% zWxPj(2~`t7>2vRT;a=@-w)OzqqP2#vl|)Mr3-)K>THnB6Gy@=%gBv#I&L&XOh(b$V z&UdR9ZQme_9fg-DmZ;$1azI@3OS{{|+;4V(_<-ms^{hJs9D@pV^uPoWT{-n#CvGBq zWxEJO&m=hEVDbOX@8zG&?>=dLwa{g2w7pi47tFNish#p}a0h!Ly#8FH#a=urIK!4^ zP3vPY`F$BCg(%+mb3dyWzBdnQCcnT1I8e_5%?YQhcQTiYQ9vM4lJYD?`JGLf0nNqc z95Z3z&_aW~>!~rO&aNq3&Z#e!!r-qkv8cTbDYB$6_}?R(K+TS@MLTQOf|)ZHOrG2{ zd2-G0;blTiUf$x|+y&X$P1)IKg;AfLzMw;g1q&97Nl8sfNi_)xO$iA#HBI$RqRHeR zh*2l{`umDZ5{LOv^t)Kpp|^<-Gnwq@a$@oDq^gC)B&zhdvTS?LWpohcGq9q976re0 zFi!Jd6n&wI73XE~W_M}L=OVdjnnX8qq~v}^Fbc=VgM%0ZUe|e!i-JmP5k+cP+Za{w zWS^(<6D^i$0F5~i1q~s{n1Pt7g9$Qbr21hC;ja7$di9{iQfFBxv18`jEOXH+N;v{Z zGXoVH^UkM6>P~MVD5sH*7(QxVX@4(7P?A&QkVDuf&A%T~pcy4g?2G2Zg~NR{dFBcp z_LP-`A5(gt%T|uNWKU8ddmfcCzmF5k4&c~2nAv+~I~d$7bFS?`O<^nCkSd*O)$lb- z=RLyS|0kV4P&(TNj(#rb3{~(+hSbc|F5nSsxB;Z|udPr_;cnfj)&O6fbZ!@RyV)7u zcGVv^a0DQ~y?c*r-n}l9JJTgwfjT)u-F8s8E&St*h3k+)8MpRiRkl@lwS% zsE)mKkm%=<=NH|mDFelXyirry8$hxP+Qn8yxg}h!bi6tVSFHop9{!i>&fU9@@7#H8 z+qNUZp-r0(95^m++<53%d(wXF2T1$=L*iD`)}UcNH*LA;!7UrN@KpMxj0rf)9(

z5AY8g1sDUZN5>615U!BoN1o{CF+TQs;Q?eXY}bu27%qkSqHdJbowEFzyHg%?jol<{ zfGyH6Yu21uvwHOEHQ(iGaJlBVTs^vXZ|L5APWSFT;^R~7LXRE|J$lT!sPkkBW6{jt z79%Axoqs1Wh8eYSAT7~#5FLahuyQ1UJNpVGvkEGMa(0(uxSz1$QhzXyZ;YOj=zP?g zh2&#uy0ZH8?A8rjHZGaDiW;xT^_S}8GQ$IRBg5C1Y~D#1qX`Uc42_?+cO-*>-$E=x z8dlI0@ftqry`t3csj&z0$rOZ<8hs!pur=<;!%26yi}|iWM~)oYv19$JP2!T>;%$3x z-7hvYEZr*YUa=7!GYMv8yIs7Yb~ z26YOi?O;0w4L4tMvQ5ONF30@D&g#L?l>s5D2D&63P5Dv{alavNYG;u&gwe|FRKSCZ z8h71vZjX+gP>ILyYV$kQ$j{d8npMhz zOZto)vFGNjoI!)LbL5j!v2KJV{o*rd)>*Axcs-8%uMQSV2lD_!fFU{66t|T-WGAdW zc<~$aflns?8)Qy@g^TzV9?K0{LrkhA4veP!@YaQM&so+<@=nW2X({^$3%13chzW?j z_m=IhPLJL)yZH~AP}!gTYvj-^eMZh6QPCx>Yju|{>CJ!FNIF@ssj&{%$?gKZR)u$n zFT_A&zNI-1G}hJkl~DV2&2$y45LRlds-{htP*YMeZP>7B{rgYr*KbR0b?*Y|KatA%YLy-oEgdL$i5nCkmtIJ&D!y$rp@()1bd{dY6pVMKaMO=LB+*WV z`}u7x;|gk1zP1ov_EzDAy8Jui=6<02 z>hERJBo;My^z@Xnk5j-g_7$pw#vw$I-}D{|#$KWdGhd1nj0g8!M#g+9Hme?E%We#d zj12pT0tY0EU(?E`yxxo!U(wZGUein7yEa!k_G=I;iQ9D?_? zqVW1TB!{uc)}-I;XBQn!2B#U9CRbI(-3Jt?qIdRRljN)x*1P+N-{l&zY16h%n|5#5 zu=~zCm+#)atz9JqvQBLqMReENzE_qdK6xr?s2yp7aJBZR6*9ydKr3C^i~c#J%+(!!6H%{nb#GVD+6dW-D~Om1 zC59xmBVQ_e$S*HY>@t|(pF^Tp93TygUF`#ce*vL-vLZ17#8U}H2}$9hNeSUelGDfF z6BRNlJ|qg6Nkz7%Uz2R9wv>tne%v)}{rY>>uDyHh+P!z(wOiP+V#T&?_lV1v@7TLT zY*+T~zF5g^v<}-c?BEtiVaKg*n=4`K)*Yf^c%fI&^5rWzIN?Ci0?hZKJ9U2cu=s}uHbIJSa3J& zZKFAjd-v^I>n*AfO}D!MG!5xb&%#?c`5UTgeMfoc29izkalvefHW1{0U$(E$&myO5 zImc3AA({uJj7muv)mf5KrWnn(;0{g-Ht#fvFdwX3m_{C`{2#np9UkK^zBncWjL~ZH!n_GIC@cTHGAT&5g>= zJ{S>kBm#{Hj~qNA-cmhoAu5f_CseZu+EQ>TB`_OHMz>#WvL7$PaI0EX!?yNT6mf2G zff2%K6&h3!Akm)jG?ALRF{{;k^gq^)1;lb8j+#GK=!glCvt0)Y|_ z#8A`GOmMwW*E&clg{Scbg?|7bQs}_!1_2d?h<8HB4^@#sUS@dr_-tgDth-$**&10q~m$E-NyFB)F^S|{q?DUuS6&A{Y zb@?k}*(_h#>BE{vo4Ut0lyvNfUP?Qpzeo?j@lJpP&a?DP>6PMkwteZOj4xi`ezf8~ z#~Zag4l`oLr(HXmOdZWE3lSWD|5dsHmhz0bCFO9L5l->_mLl0UJY z+!L3d#8W^3vywyp1)V*EobmHGyN4x-ecB2K)iwh(+^bK|LNK}PP*A|cYI$Vs&YgSj z*&^CrqfHFrl)dVp>H-(wH&R#*9fq`B7e8B`T1z zv!`WeCw1;zla^MWmR9L>);pb*2?^5@5|Y*mLD~RtjMdlGi$)5 z(M{_%vO{aOvZE{6ajpH{b?jcPd4uVZqmPJ(fRcjbb2=CZJlP=J1R-mLt9c&DhDmK^$p-$xo#bOv~$*hKGE8>lK z5*Kd>rO5=84g#Ab+C*T)%oqgmc-Se}M5E20Mi!$55ApCpaN3I>DW$yYn(me*U2ZN^ zNtNyd^U(&-B|S%7{$?B42wjoYDt{{V0{c)W%Tqk!DSxNPaZW%0#*6%d5?Bhrr^x@H zpi&Brl6UZl-(B18$HA6Vggz)a?{}G%GV!MJ^1?k?`|~#bf9+ifd{xD{pE>8;d+u`X zdhX55p4`ObW`Pir+$1c4n*aeL1PD6<0U-ns0oi0%5kZuq?3Gd#1dCEs-0Hrzw$-+% z&uU%TK5X^Xr7o|V`pC)qe{=4IBm$zg#rONYNzOgz%$e<*`R1FMZ@&4yx>{p*4YVNf z)&6Q<{B+1s@HCxq4!wCAk8E~Uv6>EAj#^=>gX9BE>z1Ytv4oub(b&@4*&$`!x}EFR zHLP8`bM4xOHETAnSyR7i)#g>J>ZeTEIb}+Nc|LFK*!rfXYljZqIdo{lz=4|w4y>k}<;+~pQ?X-Y;e2~s zT2N@%GtcP>?8TTtBSWX5;A~Le3`6{{I6Wt8>_p9p=})qGuwX!Ts0CNvA|$OkQFzQx zXk6)t*k|q#3B>+lhd8@ZdRC_TFPWDU^6sJo>S5 zLm=?!vQdK4@6rDlsD^aadAO2^$am-pWEu;GB4LY4ka{NtqrM=5QHO9+h%TL>x{DB& zpyI%{I{u%*U`m0t`a!SpNfBY?+UThM4s?fQ39|lpAn@c@BkRUj3(j|RWXGE4Lyk&^ zzA4`Sh~5AHc>iz5`>uT9bBy;qvFmD@iCp$=!h5M#M_zK4*!4du?f+VMeI+|MrRAlxNsac}nc&C!aiW&pppT zNB-f%kF!T^zx|GA)=1#ewG|B3<+T5j3Mq?)tGMu>(cna(VLlfvr zcvsr99ET*x9C8)Z$Y9}^`^8fZo#)+MIWma_Y*&efmmak1`nB`sUA5h}fLJtVVx7>^ zvbu{>GX9>C#9#9pQ=m}#mUMmQH<{UbA*TY3WSH5WMJvU699U1o7#wH6n5QBU^G zYO(V?$=7}awb%>uq|?>nN!?`QVm&8Jm@;O}s4-(q-DIOifmwf|T8DiZcAk{sIWhGB zy8iR9_4I1WzG{v4@1zO&)PuB`vb(GDC^@D;k zXd&yYqiou=jxCZxGM&e*e`51|$)NI88%bX=({Cy&3j{h@QTb*> z=CouRwxo&T{7Tw}SyD*sC`815LN92cr*n4+9rOuHuNxrcX`Z_~8e6n#Rl~xCOIc}s zePexnXNlPUAQ65|=nY!^d0wO=|njTMzI!`ETy(#`nyGa`!49#u!zogvUkz2Op_}hWGdh zJ#+uT+;cD)poyJ_ghX91E@7A0fk;TyCB`8cV;I?-)>UYd!jWX0TJCHe3u3BS5{$xm zIR91cbve&IReIC%<;zIi&iD=_?Z$%-`W%f{xVVK_J0B5ihps;mFZ3hg@zC{OG-`cB zoFKYJ+!R>${3_erpsrt}7pdPRxr5sJmf8U`O+{p5Q{~ijTmL=q zMEOM!J~c)LxTSDnQI>DcnZymCzo`gXnqR}*;;UN{Pv}e78=FF!$JVS_zjW!1t*vWY zTUWHStZivoF>Tt~Y139TH?M7OUQy0gtXR8#tqi;4H?p8&+8$3>9(VCPrL*brLRlUt z4`8)?;6NxHizB0XC$1(P>l6SicrVM-j#a8(|0Eq$Z|9;ZXWIaf^+ zvuagX4P$fwmI!<05mOPX8DEYIF;~U!ox;ThokQ_^LI67Po-k3Hh)Y=7bnH7{H5bjirTLFDx|vTowpixy0drzrtQz%)<`j6EB?L!e3OU8}|#b8(@AlgdpHwDx&*8H}*Tb+MbCRg;E#`UOkgA#-Lk!|y zzE9M7UjA*SvZtTxpBro*(rLxeQF+)o#A`n9lhvR56&>l=L42({$ZxYDl#`v6-DFn;Cc&U%C;$C~>6pI8Mz+!$Bx_f;eEp$Os9D zR0(M(HF10{E)~^92peJ~oeY$O_&DP!UaWr-;I_Z~r7ajd5-BcD$;iseaC`lJuU&OG z)YztFdcVNv{{7Dn2IqBn{s{Uwg2BrsPSV!~20~u7%%A0QWeGEev>>q?|FdDk%0Qqg zTCFz+xkbE;s;t(h1Q=;P7COX=PSoJp>Ja-r+slp!o9Oq(TKDa{Yx`aD=G$&Nbm;4; z58D%0AGUid+pQenH~jElsy^(b(3{X5Moj?;H9B=mazK%ste1J!*@lF^Fg~-kHU^m^=nKmt6=4muk~fuxH5AsBdCN3IB6VTO zbUK~CDkR^CYncT(Xj4BRNxhLA^o6jjaB&w&XyRNhj}5w-ZBUw;CN?&Xjm0MR>o>7? z?}^pb6UR;jo6@IBlEoqiWw0p0vUIxSm3)JrtF8^);YfwO1iPXxhmbxe(qS?o<6@iU z_(UR?uu+M@smnk3J35IM2eFG4RDEi>uPTa1l0}w*2zrNz)6Y5e^`Mbv=+*V-xYS!~cOa0&?ew}V?vhr>EOo1nH9EzXcEfY*d<7fxoB3Hps zG(Jn5+RX)z#&`=q#3|x)beH~1h#Qyo_(vpC&41sKNt3`Ck{bJJICFVy$Tqg+>~ZFL z*R{4~+zq^O3$*b{6Sr>Nef{-YuD^cw`t|E}@7{7s(vzOPWD8rOoQeW%+`N1x zUq?h}-5H3GSVDs6bj7Aq&?1ED%oF)GP^Q!KKK_-Mw&1i9PXB(K@Y;x`Jq(R?ZUp$aFr3W@Iba#<&gD8*wUaFKdqV-HUy>l`Ge;SuQWV zQeLul?%Yc+T`#Yta|3Lda{b0toB7W1Gm z_u8=kOWSQgorIlm7)8aAmnzKq=?s}3@r7il=%LlXnbhs%onfYbrg%E^xJDqQ6e6?D z;VK!rUBhINl{CGE%4L*<)DDrB)=qjca_{#&;3%_&Ue)zabp7E#;Bj3iV~E+bW9B@e zFv|F_5Z0AR*N-^wqLPN6mkV=qO|KKdmOP!D`PibX9^-?f-&>Mr{N>5-PQIk7am`ZS zu0JgC@9H|V_Vga|CENK7-T0}_`v%&!>YH@8o)h3}#d(#Gn0UdWJx%3psbBO{jS6$l zFE-T>kQM?qX_)Z{3^N(mEKJ#3AvLx=op;fc$-Lh9sG2un()e`8!4*3b!S+G?=N;rk zz6$;vV7Ch^CkJCKQ0ylTHXhow>mWO@ZQHH49+tOmJ#grNylK-7cd#2yk7Rf6IJj}& z0eR~V`TC8kyI|YgIHt+lnFn|W>=J6IXqrze0NUmyLA5T32OK0k6u5YTpb47xEkwx9 zyoxUv+v7mc`yD+6fYtpqc561dl`7#CD@XuLs^d!g4PQJ{i{IGVXFy2 zalP0<17An$s%73E5~5DmVF;f0Ng!%&fM0ovHD}5xaPoAB`e+uEoeK+ zXB)c;U;osP(I4{6(rRfd>&NQYDz=VY!#1%S*mme~J;d&0*T%+OdF7p#Uw)VsG&e6B zKYn0i`95&Kva{9TC9=9q<~%>2-Kj8EP|$B+KY15#xQ36Pwq0)GJqGc9N&~M_dfX-# z@$opyTcET+`o;x{%lRs?)-~6=gzyk)03yfn+eC7RX^I7}iRnW0-py5OF^^VORYof! z`Sh2Yqgqv=bUze?nza%h0g;U4_blPjimJ-;vQSbmV8x2b!-?qzPEBQ1KYTJH1_Mc< zq%5ewD#yJKr}QWm{ZUL2*Tc)pD#70gkiNb%Nf8K=t#Gz8axKkvA14luwZ{ zAV{m5xWpAlle$*?ACqgaEBsEyoq<$Dw4B`(xVj_MOn$NWS5(# z!-8S>cdjf?@_7{ngNEc+=$)Q={zQ3MFko{g zCYiYO0=+G@$l^ zShOJ3?aj~6jz#-lP+OalqT|!EpQU&Ql@BjWODk+FulHIt>*o*q{o5YaG<{^>i^}u! zdQPut3OL*kElaoCCS{ga$D+mOfu3h&<@PLz#%5hd}!a;l{lMsmn^GtMwmq4}t+!7E;l|>_j#qjJe zN!BS6mn^aZgAFalgE=`Fo{ZEfAaxFPa0&~a))qBqHTDg0FSq;3PrMb~_c}iY=&eni0si?UpU+3~b zgG*jI%9WfiJBHL;)@Q^;<-K&TyLdB@Q1V~vJ8b-Za;n|#jg*XAHD!Hq)bI4WEe;Ei zEvO$!4MjuwwPh2E3VbeyO;cRX2ll7rrFXX|isDEuOw9^z{+{OY*m_pyrmu{oZ%WG^ z76AX5)-K1S8<`t6J(4h2%!G7dPZkw8R0}LRA2NpK*=^GfDxFaM4)}C8Vs3alIM5IA z^4OiX+;Z^78~5LM@+qUi5vSt64Eqi9oS}?^vzzle#DRK2%r7`#7z}G3yJu z{!)Rv$8UaaeQTjDCzipIx{CQlM_YEe)-8#`|^BX0NxMX|wfd1&&hV zQ?Ky^%v-X;+Xl=nDq4`VMLSB~&pKf`;-L*2w7~iLg!-v^ftZY#49z4lO(r2pmrG2R z;}d3aWc`mF19p%@6I(qbfhKsIc9l862Vl|`^eWQ+5rvE{S$UohZubhD@ZKMrJZ8*{ z`ucGL2UZOjFs^s+8P(O}qES~#$qW`c?>t_UC8wnDq$KVfE;}5q0`v(!4*c#=D6c9{ zF7MWjpQrTY*-A=(o|!pc_VWf;Lqn467{y0%t2HW?T*TuB5`&Cm7EG%yLBIu?#!0xi zb)5N{m~8&i3;{Gb>Z5@lyKFS}`-r**cJP&x3 za-JM$JL=SFn2?9uJTAYCt~MimATNBCA}c@i-|rjPV&Gc1X?FLzF58 zUTlL%GbaS?TIvt)xOH}+%kCLvGuAq{aNT&XW+3X!8uDb~XuIUfb-EOHu4>%sL6NYh znv&<@6D>ZsCltN^iC-B0w1D6K$G>&s?sexC=W83R{8Il4J=GS*FxkfusCz5&NT0Oo z4BxQ|hv%7>b!X24J!>ud{n&m_tiJfcKZ=OS`)RpS@@GXC|*P-bv*Z zyw0X-c7HtvVXZJQ%(x|Zfxi(pY%J~V?allr@Sh7-Q`o9<+k~wu9rIB=C|7Y+ zj;Q5n9OwU`u11dD-P~hy)dUv~{U3|`Xx+sRKQW~5fSMgUc;3|DW@A?sxBI1sc-!Xj z_ZyGN_a6V$ z(63)(@7{x}s|WS$87(cX8dfEHJlJk;Y=}nLU?t5ZXFB9T%&u5+Whq~-sFF*|q3qj+ zX+=aV2x!4enDHjYsg4u3j{Q8*+o2*MSB}^J#kTb*d)LB#D>;bnP z()0Dw_&rzbZb3&#rlw)Hlyopdw~eR$_wCbpv(U0lR<&srnG)a4EN6YhUgj9k_Df>} zFKik!UT$obNtKC~#zssYfu7o=j0uh66P1yCk}{SLQ%b8#)4Ek;gwl9*pqf{>rcB|( z6(_GyL%gCwH)Yht9E4^cVk$!143mU|m?tJ1P#Z(qTSGJ_Af6ef4Ad-f-592x3?T;5 zS@p~5PTa}Z^Mw5@%r|7rI&iK6ZO9w-yEQrA*A4r;YNK!10A2qXwj1+s2{je8*QilF zkwaY(x65v8netz~oBtGy9GRMbM7lxOlky$i+otK#SYO+%{>%L9bbgz;i#Sk>rTjfp zEej31P+s&Twl0lYQp-XbS&TybNNd~ne!p6pc2nCRXK^RrGboLOEvC+gIZjH#@fpSEx4`y09l7Wg7}i>`hmT34GZzQz z?7c2M!#94#8KlMzOv%qP6*lIjrRL|Q=j+8*yEQX3E;p3PK#7uAA@3^>6_-o0u`I=6vD+JP&PS7FXE#mGU`|CEfysrpmU)#Kb7u^nI%_zed%?&d zbNQ^kgZqpuuj*b{Jd)3vHCT3d3USPbmMv9SAI2xp=Cql9#RNHyvtqs>&{oWjL1t)# z612!9Iby&%%}kjDdq7KY!JJzVbOl#=6%i%q`J#<+=*$LX#z)fsB`yRA=BnT%kZD28 zmE-*Z6Js?PKM!OQBOJznDx}1&eBuO9BrYTrOb826zrtw1`%ZQ?g|p{}cT9JV&krvO zFH7p?9P5h&hp+Rm-H>!)YV4Zq+^q6pIrBG$bF%5aD%Is1tLx|2`UmyV^;^HZ!xW~u zGA<1#W#6zTyl3W2{Is_6`~Cizr2G9bUB6`J%%+Q*=x6FkUrCzpGW|Y%zJHm1h3Gzq zMPGVDbe`A5?_KCTbUlx*^DHhN8||8Cv`+U-Wf+A#?XUA+bkNh4gwfwit)lPns+qlfl z54axaw(?_zDw44zITbM zP)QQ?l_BcLO`-{?8-_J+05$R=YQzefVy=I)Q6D9!joyNbSI-)#PHGu(XAqIYGZ}V_1FXMtA7RAj}VD`xJb}L=+mOpT>OeJR^`u*EI5>wb&#hxr}>Ug zo>iQdKd0H{xxs&Xp)31T6>^{ZdcX0P4i!psRDb(%{-!wDMSA&7>9j1GHCZH+#>%;} zUQUKMFbrYRL~mfErqOy8T)is(=6zEicwnjpTP(JHfrEd#rF8G!()sH*te-UL!V6a{ zpUEfkF~%WdpLEdgPc~lUHOAw{bLe_Kj2F0Uv>Bgr_1=5$KJroCbBrm>+5VbkgPe`| zTQSyDo7n2u=xeT7IB60e$;K-eV7MK}1}fG4570wZ!HM{~*^Kq+05KP1I zmcd2vAeRw=!eegUgXa@F6nXUFV6;(w=E|%rizguhxT;avvf=Y}mg(Ixw&v2a-Oo>Hc|9S+x7#hq}rFp}!Uu{=Iv- zVd2G@*#(?SW18JAhic0m>C&R^{!QakL*cM~ZlPj|+GQU- z*=8P644JwvAQhOB^3Ka$mLSI}dX?qC>>aQ(^dvdG}w(VX96QShVKtdcA%;NIg! zCQtm~z^Vd2n*~mhDVze<9K9&`h4oi_m1V0)1CJD(Y{DWcg{CJ&p#)ViELtI8hVT~I zCaV_86K_@-2_j?3g0HeliNjeb2XLQ}pm>jai)YF>@zwOe$y(uhk$^A;56S7a8iOc z6wF20Q#w%TfNzu*VyFsWL&h@I1w|3AD#R>u)?8y1PY3R7bF7Z<`ffg0Vnw&5`xQ6RUsrUhEf#=um`^QQ*6K%Q4XsOaN=1w8?r-0f<(MSUq3n3yrF{O=&Si2 z|BBI4MF>?D)rt}-UZ(j7PGUL(e&nfI95#Ye_yChoF(#bgAj7OM96?5Sfzs0(E<0+D zP}F8-hun~{4Cv`QqES7dA_z_gO6@^Fgd{j|8e61AaDtZ%KZ{Io0&_%cYgb6(-f=k1 zEKUh0N@r71t;ip_`GC*aZI)G*<4DzRE;p_r61tj7f zXWYrz%$q~NOJB|R_*a!F!upfVijIb2s}`NP0|1iXQ~*Env{^MUVo+`5LvY&SaH;@L zzzM8Z2`^B3I4X}5HD|&pyzm`uB?Edmgtk&WplT>V4RHD`z+S4aIGmISx(j**%7J=8 zo71y!T_HIEe*7!l2(!g2ifB5fnA}RM1KGjL8epEFjYuq@!l7D-=-XA718|Cht2PUH z;t%A55^<6GLP7|ni_+r-iP&JC*M_g?zA^>JBL!ESA}aa_>OoWlRVBfx6ZRqoYTIRX zLJHG{6wxOfRusjm*qlHoCnXN&5WPb{BHpdy*M@~BIaDwleKp_XUu}TXA*|SX4q7u1V`m@*#(?dCv0xRS*TiU z3ZRE0I5m7n4wRq^h#s^85=zHmbz3!&7QQ?gTKvzI=Ais7f#TQ?d$3$ON<#GVyK)vLS=e1SiI4o5ewJx+!ru>^i~;NW?oD zgPdmGP{DBY)qKZ^8sV5lb0Mx~$C3=icG%KbAcNo(P&u6r0jCSS^NVmg0G^*xLGJ)< zq*fwF>hlN!|4N@sj8a_reZ7AuX>P{li+mQ02{E(f*G0x zJw(KIxKF@ozITSx%;FSqS~Zu`;U+lIDkyRW3uZcP7W8%-`USxWmbIJUMAKUAPV7f( zcBkEmVUOU{op2y?D4WCXa^MAUI-Oq4N$qLFJ}`U`kb+x0c*b{_`^FQ&NeKc@TN(md zKqPD~n+|F~Gy^8VJ%G)L+P6AA7Arjq=SFsBds1#lNBlxfjBu!6ID*rBx0yF5v%1_) zCzcN$&=CjH&tyqi0FvOeIyB7*U>!Q(LgcLYGFzT*LocQJa@hhluM>TVNQReS!;%?rqT6^) zu$&&z6Hh|Y6;8?nqz%cDI|--Tqd7fp2biBIjnkgRLSc=j1_YH$b6U|#0S~I)gj2IQ zfan@(04V{ypausbh%ta#2`_+C)BG+i0VjM=Ar#!|!!uQY=D-snHsI8Bz?o_HVrm6A z-L?RzffZG$0ZzcC5u6&nf)Y?xn&uVMPCz2w?c!H+n>SQ29DOz4ZRSm5D&W+-ZYK#C zI#G{dmYf41U7%D}r^}^T9d2h3`r!Z*VUT8X0?|=i6kM}u&Y%kk5g|h{9Y_fdsc1TC z2t>v1wFocdhTsGzeMdAOzB@pVfHDD4`78k^0Pxs@c0a}wR3-M;2sU7u6*F$t?n7zF zc?HEe2}vA$GjGi=vN-uQUJHQJ<8^6XkAM?l961n-z$%n8?f5HKS2lb4{*9%`e}WHt zBMI|yv_g0`ty11|6s>in&e=c z_?67Zeasp6OXW|oWGSCzNj{bZ{uE;$u_V5grQ)n5=TEa_c{aMqg<2!HziDa*ifF7imGi~pHb-VzN)QtN49OXF0CA|-SN{8C4!-e)b7H_vBc>WM^QxUG{ z3m4%s#iuswcu||7U8!SnlD%BORO!1YOAz%3e3otn9?nAD9)&FEORNW9(*ApXIkO4e z{s3VJzyA)Hc4BLID|Yu7>HDziVPv4pTVaE83Co-33{weFf!;^9j z)mhb;VV7A=f<+-wnG4o3(d#WcGt|d~@c^*?&p+lB?%WTJYmbmn@1d-nnGqWtq#|%Pv}xyyAaWzPzet z^)stKSTpqU$mPSX7+uF9PUR(Fp`XL+c-Wa|1&P~I=^ZE6gx72JMylwdQ zB|Glk*|_tAU5CEA`o_1vSGVWpn^JGSc5mw5@825OKmEWxKgd0J==L`c4gBHs!<- z=w0s}slR9cec}7>{87<^w>@0*$X_4b^;qx6+8%%5$(*MaJ^kY!SNvr6Pcwh|#LtVL z8}$4|zu5cBPmcOtxLEuhc=7F*+F!oo*N?rj^p(S}UjLhkzj@}hzrDWZ4bK~6-x&L5 zgP^!?OPSa?BPWSp8$Bq6cqYp3hD*LQ7_}^pV&oaVKia#p|GbjFR z0exB?f3_mbYVfAHg3SeRr>~1Ya|Y>)__M^^JQ{zNfzt!x&kDjc$Db|0(L_2{gt>aa z`~}Mw&TgHxIJ;naVfN_d3+A^joVH+A%fjqoEi-1f%xi5~w0PRw#Y^V3cFQg+EiEm{ zuAMtKTf|tDy|86b%fh8CGfIZFELt>sUTgNymc@%(7S3yGX9m58qlK z2(=jB=i+yX@acvyW!QwGzY;vx;@e!@Pv)^myirU_aj8hJM5Mb2ezQd?*=#8M7vqn@ z%wtWsw<3qR$ZKJju$@Cv`A(lsPn4-A%GWtm=M>@?#@e?F-ZkM=XZJQ<-(YXD-?HDc z|76G5tL#zsBzp=iu0TQ^^6J>rwqqB{30ZX)@W_L7eAttM)H*0!5~y=BBo9(?mO33$ zo0-B^S{S=`x$HbhndL*aqyS9-GasxQBsigI0aZzbE@u^xK&!-Vay4W+dt*--!k5_F z>d#`R<~lUzKuCGkL;h$8WIY>jHhU-lZG_b42sRQ`I0}tAhK+>`+j#6jPsFavBsQ5% zfy~2HRO^q~ZR{tIZePouX1`(2vd7uo>;d*8b{{koY=A!dd)aH~2Twpw^bwqMTgR?u zkFlL>Jx*U#)8TmQ;DSGHdK&=~qJkO(v ze#V|-N7*mfFWIlyO!gn_1@`+z-+o-DD0>}J>}`YziIDc1wA z^tuOj)31jd{|@Nq{~=ebmrR?!aQ-~^f|iA|=g*klG7r6}WrjR()M(5N(aaJdLvisV SNGlU9V8Ih4Nzi(hV)nlZ3zv2P literal 0 HcmV?d00001 diff --git a/fonts/fnt_Embossed_metal/fnt_Embossed_metal.old.png b/fonts/fnt_Embossed_metal/fnt_Embossed_metal.old.png new file mode 100644 index 0000000000000000000000000000000000000000..63e2c6aca4fafc234d9e83f54938209818af07d5 GIT binary patch literal 25841 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 literal 0 HcmV?d00001 diff --git a/fonts/fnt_Embossed_metal/fnt_Embossed_metal.old.yy b/fonts/fnt_Embossed_metal/fnt_Embossed_metal.old.yy new file mode 100644 index 0000000000..9b6a778347 --- /dev/null +++ b/fonts/fnt_Embossed_metal/fnt_Embossed_metal.old.yy @@ -0,0 +1,143 @@ +{ + "$GMFont":"", + "%Name":"fnt_Embossed_metal", + "AntiAlias":1, + "applyKerning":0, + "ascender":30, + "ascenderOffset":0, + "bold":false, + "canGenerateBitmap":true, + "charset":0, + "first":0, + "fontName":"Messing Lettern", + "glyphOperations":0, + "glyphs":{ + "32":{"character":32,"h":37,"offset":0,"shift":16,"w":16,"x":2,"y":2,}, + "33":{"character":33,"h":37,"offset":0,"shift":8,"w":7,"x":104,"y":80,}, + "34":{"character":34,"h":37,"offset":0,"shift":13,"w":12,"x":90,"y":80,}, + "35":{"character":35,"h":37,"offset":0,"shift":18,"w":18,"x":70,"y":80,}, + "36":{"character":36,"h":37,"offset":0,"shift":14,"w":14,"x":54,"y":80,}, + "37":{"character":37,"h":37,"offset":0,"shift":28,"w":27,"x":25,"y":80,}, + "38":{"character":38,"h":37,"offset":0,"shift":21,"w":21,"x":2,"y":80,}, + "39":{"character":39,"h":37,"offset":0,"shift":7,"w":7,"x":497,"y":41,}, + "40":{"character":40,"h":37,"offset":0,"shift":11,"w":10,"x":485,"y":41,}, + "41":{"character":41,"h":37,"offset":0,"shift":11,"w":10,"x":473,"y":41,}, + "42":{"character":42,"h":37,"offset":0,"shift":14,"w":14,"x":113,"y":80,}, + "43":{"character":43,"h":37,"offset":0,"shift":13,"w":13,"x":458,"y":41,}, + "44":{"character":44,"h":37,"offset":0,"shift":8,"w":8,"x":432,"y":41,}, + "45":{"character":45,"h":37,"offset":0,"shift":12,"w":11,"x":419,"y":41,}, + "46":{"character":46,"h":37,"offset":0,"shift":8,"w":8,"x":409,"y":41,}, + "47":{"character":47,"h":37,"offset":0,"shift":14,"w":14,"x":393,"y":41,}, + "48":{"character":48,"h":37,"offset":0,"shift":16,"w":16,"x":375,"y":41,}, + "49":{"character":49,"h":37,"offset":-1,"shift":11,"w":12,"x":361,"y":41,}, + "50":{"character":50,"h":37,"offset":0,"shift":14,"w":14,"x":345,"y":41,}, + "51":{"character":51,"h":37,"offset":1,"shift":16,"w":15,"x":328,"y":41,}, + "52":{"character":52,"h":37,"offset":0,"shift":18,"w":18,"x":308,"y":41,}, + "53":{"character":53,"h":37,"offset":0,"shift":14,"w":14,"x":442,"y":41,}, + "54":{"character":54,"h":37,"offset":0,"shift":16,"w":16,"x":129,"y":80,}, + "55":{"character":55,"h":37,"offset":0,"shift":14,"w":15,"x":147,"y":80,}, + "56":{"character":56,"h":37,"offset":0,"shift":16,"w":16,"x":164,"y":80,}, + "57":{"character":57,"h":37,"offset":1,"shift":16,"w":15,"x":2,"y":119,}, + "58":{"character":58,"h":37,"offset":0,"shift":8,"w":8,"x":496,"y":80,}, + "59":{"character":59,"h":37,"offset":0,"shift":8,"w":8,"x":486,"y":80,}, + "60":{"character":60,"h":37,"offset":0,"shift":16,"w":15,"x":469,"y":80,}, + "61":{"character":61,"h":37,"offset":0,"shift":11,"w":11,"x":456,"y":80,}, + "62":{"character":62,"h":37,"offset":0,"shift":16,"w":15,"x":439,"y":80,}, + "63":{"character":63,"h":37,"offset":0,"shift":14,"w":14,"x":423,"y":80,}, + "64":{"character":64,"h":37,"offset":2,"shift":29,"w":25,"x":396,"y":80,}, + "65":{"character":65,"h":37,"offset":0,"shift":17,"w":16,"x":378,"y":80,}, + "66":{"character":66,"h":37,"offset":1,"shift":16,"w":15,"x":361,"y":80,}, + "67":{"character":67,"h":37,"offset":0,"shift":16,"w":15,"x":344,"y":80,}, + "68":{"character":68,"h":37,"offset":1,"shift":16,"w":15,"x":327,"y":80,}, + "69":{"character":69,"h":37,"offset":1,"shift":13,"w":12,"x":313,"y":80,}, + "70":{"character":70,"h":37,"offset":0,"shift":12,"w":12,"x":299,"y":80,}, + "71":{"character":71,"h":37,"offset":0,"shift":16,"w":16,"x":281,"y":80,}, + "72":{"character":72,"h":37,"offset":0,"shift":15,"w":15,"x":264,"y":80,}, + "73":{"character":73,"h":37,"offset":0,"shift":8,"w":7,"x":255,"y":80,}, + "74":{"character":74,"h":37,"offset":0,"shift":16,"w":15,"x":238,"y":80,}, + "75":{"character":75,"h":37,"offset":0,"shift":15,"w":17,"x":219,"y":80,}, + "76":{"character":76,"h":37,"offset":0,"shift":13,"w":13,"x":204,"y":80,}, + "77":{"character":77,"h":37,"offset":0,"shift":20,"w":20,"x":182,"y":80,}, + "78":{"character":78,"h":37,"offset":0,"shift":16,"w":16,"x":290,"y":41,}, + "79":{"character":79,"h":37,"offset":0,"shift":16,"w":16,"x":272,"y":41,}, + "80":{"character":80,"h":37,"offset":1,"shift":16,"w":15,"x":255,"y":41,}, + "81":{"character":81,"h":37,"offset":0,"shift":16,"w":16,"x":373,"y":2,}, + "82":{"character":82,"h":37,"offset":1,"shift":16,"w":15,"x":344,"y":2,}, + "83":{"character":83,"h":37,"offset":0,"shift":14,"w":14,"x":328,"y":2,}, + "84":{"character":84,"h":37,"offset":0,"shift":15,"w":15,"x":311,"y":2,}, + "85":{"character":85,"h":37,"offset":0,"shift":16,"w":16,"x":293,"y":2,}, + "86":{"character":86,"h":37,"offset":1,"shift":16,"w":15,"x":276,"y":2,}, + "87":{"character":87,"h":37,"offset":0,"shift":25,"w":25,"x":249,"y":2,}, + "88":{"character":88,"h":37,"offset":0,"shift":18,"w":18,"x":229,"y":2,}, + "89":{"character":89,"h":37,"offset":0,"shift":16,"w":16,"x":211,"y":2,}, + "90":{"character":90,"h":37,"offset":0,"shift":14,"w":15,"x":194,"y":2,}, + "91":{"character":91,"h":37,"offset":0,"shift":10,"w":10,"x":361,"y":2,}, + "92":{"character":92,"h":37,"offset":0,"shift":14,"w":14,"x":178,"y":2,}, + "93":{"character":93,"h":37,"offset":0,"shift":10,"w":9,"x":154,"y":2,}, + "94":{"character":94,"h":37,"offset":-1,"shift":12,"w":14,"x":138,"y":2,}, + "95":{"character":95,"h":37,"offset":0,"shift":22,"w":22,"x":114,"y":2,}, + "96":{"character":96,"h":37,"offset":-1,"shift":7,"w":8,"x":104,"y":2,}, + "97":{"character":97,"h":37,"offset":1,"shift":16,"w":14,"x":88,"y":2,}, + "98":{"character":98,"h":37,"offset":1,"shift":16,"w":15,"x":71,"y":2,}, + "99":{"character":99,"h":37,"offset":0,"shift":16,"w":15,"x":54,"y":2,}, + "100":{"character":100,"h":37,"offset":0,"shift":16,"w":15,"x":37,"y":2,}, + "101":{"character":101,"h":37,"offset":0,"shift":16,"w":15,"x":20,"y":2,}, + "102":{"character":102,"h":37,"offset":0,"shift":10,"w":11,"x":165,"y":2,}, + "103":{"character":103,"h":37,"offset":0,"shift":16,"w":15,"x":391,"y":2,}, + "104":{"character":104,"h":37,"offset":1,"shift":16,"w":15,"x":61,"y":41,}, + "105":{"character":105,"h":37,"offset":0,"shift":8,"w":7,"x":408,"y":2,}, + "106":{"character":106,"h":37,"offset":-3,"shift":8,"w":11,"x":226,"y":41,}, + "107":{"character":107,"h":37,"offset":1,"shift":16,"w":15,"x":209,"y":41,}, + "108":{"character":108,"h":37,"offset":0,"shift":8,"w":7,"x":200,"y":41,}, + "109":{"character":109,"h":37,"offset":0,"shift":23,"w":23,"x":175,"y":41,}, + "110":{"character":110,"h":37,"offset":0,"shift":16,"w":15,"x":158,"y":41,}, + "111":{"character":111,"h":37,"offset":1,"shift":16,"w":15,"x":141,"y":41,}, + "112":{"character":112,"h":37,"offset":0,"shift":16,"w":15,"x":124,"y":41,}, + "113":{"character":113,"h":37,"offset":0,"shift":16,"w":15,"x":107,"y":41,}, + "114":{"character":114,"h":37,"offset":0,"shift":16,"w":15,"x":90,"y":41,}, + "115":{"character":115,"h":37,"offset":0,"shift":14,"w":14,"x":239,"y":41,}, + "116":{"character":116,"h":37,"offset":0,"shift":10,"w":10,"x":78,"y":41,}, + "117":{"character":117,"h":37,"offset":1,"shift":16,"w":15,"x":44,"y":41,}, + "118":{"character":118,"h":37,"offset":0,"shift":14,"w":15,"x":27,"y":41,}, + "119":{"character":119,"h":37,"offset":0,"shift":23,"w":23,"x":2,"y":41,}, + "120":{"character":120,"h":37,"offset":0,"shift":17,"w":17,"x":490,"y":2,}, + "121":{"character":121,"h":37,"offset":0,"shift":16,"w":15,"x":473,"y":2,}, + "122":{"character":122,"h":37,"offset":0,"shift":14,"w":15,"x":456,"y":2,}, + "123":{"character":123,"h":37,"offset":0,"shift":13,"w":13,"x":441,"y":2,}, + "124":{"character":124,"h":37,"offset":0,"shift":8,"w":7,"x":432,"y":2,}, + "125":{"character":125,"h":37,"offset":0,"shift":13,"w":13,"x":417,"y":2,}, + "126":{"character":126,"h":37,"offset":0,"shift":12,"w":12,"x":19,"y":119,}, + "9647":{"character":9647,"h":37,"offset":5,"shift":19,"w":10,"x":33,"y":119,}, + }, + "hinting":0, + "includeTTF":true, + "interpreter":0, + "italic":false, + "kerningPairs":[], + "last":0, + "lineHeight":37, + "maintainGms1Font":false, + "name":"fnt_Embossed_metal", + "parent":{ + "name":"New Fonts", + "path":"folders/Fonts/New Fonts.yy", + }, + "pointRounding":0, + "ranges":[ + {"lower":32,"upper":127,}, + {"lower":9647,"upper":9647,}, + ], + "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)", + "sdfSpread":8, + "size":14.0, + "styleName":"Regular", + "textureGroupId":{ + "name":"Default", + "path":"texturegroups/Default", + }, + "TTFName":"/Users/admin/Documents/ChapterMaster/fonts/fnt_Embossed_metal/MessingLettern.ttf", + "usesSDF":false, +} \ No newline at end of file diff --git a/fonts/fnt_Embossed_metal/fnt_Embossed_metal.png b/fonts/fnt_Embossed_metal/fnt_Embossed_metal.png new file mode 100644 index 0000000000000000000000000000000000000000..466c59a937dd0096362025acca39df98d8303749 GIT binary patch literal 21898 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\"'&!?\nthe quick brown fox jumps over the lazy dog\nTHE QUICK BROWN FOX JUMPS OVER THE LAZY DOG\nDefault character: ▯ (9647)", + "sdfSpread":8, + "size":12.0, + "styleName":"Regular", + "textureGroupId":{ + "name":"Default", + "path":"texturegroups/Default", + }, + "TTFName":"/Users/admin/Documents/ChapterMaster/fonts/fnt_Embossed_metal/MessingLettern.ttf", + "usesSDF":false, +} \ No newline at end of file diff --git a/objects/obj_controller/Alarm_5.gml b/objects/obj_controller/Alarm_5.gml index 808b31d09b..cd5d0cf30b 100644 --- a/objects/obj_controller/Alarm_5.gml +++ b/objects/obj_controller/Alarm_5.gml @@ -366,39 +366,26 @@ if ((turn>=irandom(200)+100) or (obj_ini.fleet_type==eFACTION.Mechanicus)) and ( } -// if (known[eFACTION.Ecclesiarchy]=1){var spikky;spikky=choose(0,0,0,1,1);if (spikky=1) then with(obj_turn_end){audiences+=1;audien[audiences]=5;audien_topic[audiences]="intro";}} if (known[eFACTION.Ecclesiarchy]==1){ spikky=choose(0,1,1); - if (spikky==1) then with(obj_turn_end){ - audiences+=1; - audien[audiences]=eFACTION.Ecclesiarchy; - known[eFACTION.Ecclesiarchy] = 2; - audien_topic[audiences]="intro"; - if (obj_controller.faction_status[eFACTION.Ecclesiarchy]=="War") then audien_topic[audiences]="declare_war"; + if (spikky){ + var _topic = faction_status[eFACTION.Ecclesiarchy]=="War" ? "declare_war" : "intro"; + scr_audience(eFACTION.Ecclesiarchy, _topic); } } if (known[eFACTION.Eldar]==1) and (faction_defeated[eFACTION.Eldar]==0){ spikky=choose(0,1); - if (spikky==1) then with(obj_turn_end){ - audiences+=1; - audien[audiences]= eFACTION.Eldar; - audien_topic[audiences]="intro1"; + if (spikky==1){ + scr_audience(eFACTION.Eldar, "intro1"); } } if (known[eFACTION.Ork]==0.5) and (faction_defeated[eFACTION.Ork]==0){ - spikky=floor(random(7)); - if (spikky==1) then with(obj_turn_end){ - audiences+=1; - audien[audiences]=eFACTION.Ork; - audien_topic[audiences]="intro"; + if (1==irandom(7)){ + scr_audience(eFACTION.Ork, "intro"); } } if (known[eFACTION.Tau]==1) and (faction_defeated[eFACTION.Tau]==0){ - with(obj_turn_end){ - audiences+=1; - audien[audiences]=8; - audien_topic[audiences]="intro"; - } + scr_audience(eFACTION.Tau, "intro"); } // ** Quests here ** // 135 ; quests @@ -469,7 +456,9 @@ for(var i=1; i<=99; i++){ event_duration[i]-=1; if (event_duration[i]==0){ - if (event[i]=="game_over_man") then obj_controller.alarm[8]=1; + if (event[i]=="game_over_man"){ + obj_controller.alarm[8]=1; + } // Removes planetary governor installed by the chapter if (string_count("remove_serf",event[i])>0){ explode_script(event[i],"|"); @@ -530,11 +519,13 @@ for(var i=1; i<=99; i++){ flee.capital_number=choose(0,1); flee.frigate_number=choose(2,3); flee.escort_number=choose(4,5,6); - flee.trade_goods="csm"; + flee.cargo_data.csm = true; obj_controller.chaos_fleets+=1; flee.action_x=star_id.x; flee.action_y=star_id.y; - flee.alarm[4]=1; + with(flee){ + set_fleet_movement(); + } } } } diff --git a/objects/obj_controller/Alarm_8.gml b/objects/obj_controller/Alarm_8.gml index ff278b80a4..3131d23158 100644 --- a/objects/obj_controller/Alarm_8.gml +++ b/objects/obj_controller/Alarm_8.gml @@ -3,40 +3,12 @@ instance_activate_object(obj_star); var witch=obj_controller; if (instance_exists(obj_turn_end)) then witch=obj_turn_end; -witch.audiences+=1; -witch.audien[witch.audiences]=4; -witch.audien_topic[witch.audiences]="declare_war"; -if (gene_xeno>99995) then witch.audien_topic[witch.audiences]="gene_xeno"; -obj_controller.disposition[4]-=50; -obj_controller.faction_status[eFACTION.Inquisition]="War"; -obj_controller.turns_ignored[4]=9999; -if (known[eFACTION.Inquisition]>0) then known[eFACTION.Inquisition]=4; -witch.audiences+=1; -witch.audien[witch.audiences]=2; -witch.audien_topic[witch.audiences]="declare_war"; -obj_controller.disposition[2]-=40; -obj_controller.faction_status[eFACTION.Imperium]="War"; -obj_controller.turns_ignored[2]=9999; -if (known[eFACTION.Imperium]>0) then known[eFACTION.Imperium]=2; -obj_controller.faction_status[eFACTION.Mechanicus]="War"; -obj_controller.turns_ignored[3]=9999; -obj_controller.disposition[3]-=30; -if (known[eFACTION.Mechanicus]>0) then known[eFACTION.Mechanicus]=2; - -if (known[eFACTION.Ecclesiarchy]>0){ - witch.audiences+=1;witch.audien[witch.audiences]=5; - witch.audien_topic[witch.audiences]="declare_war";known[eFACTION.Ecclesiarchy]=2; -} -obj_controller.faction_status[eFACTION.Ecclesiarchy]="War"; -obj_controller.turns_ignored[5]=9999; -obj_controller.disposition[5]-=40; +decare_war_on_imperium_audiences() if (obj_controller.faction_gender[10]==1) and (obj_controller.known[eFACTION.Chaos]==0) and (obj_controller.faction_defeated[10]==0){ - witch.audiences+=1; - witch.audien[witch.audiences]=10; - witch.audien_topic[witch.audiences]="intro"; + scr_audience(10, "intro"); } with(obj_star){ diff --git a/objects/obj_controller/Alarm_9.gml b/objects/obj_controller/Alarm_9.gml index c179d77b5c..f93ed73539 100644 --- a/objects/obj_controller/Alarm_9.gml +++ b/objects/obj_controller/Alarm_9.gml @@ -66,7 +66,8 @@ with(obj_temp_inq){ nav.capital_number=choose(1,2,3); nav.frigate_number=(nav.capital_number*2)+3; nav.escort_number=12; - nav.home_x=x;nav.home_y=y; + nav.home_x=x; + nav.home_y=y; nav.orbiting=instance_nearest(x,y,obj_star); nav.orbiting.present_fleet[eFACTION.Imperium] += 1; nav.warp_able=true; diff --git a/objects/obj_controller/Create_0.gml b/objects/obj_controller/Create_0.gml index 15011e9b8b..33a827fcc3 100644 --- a/objects/obj_controller/Create_0.gml +++ b/objects/obj_controller/Create_0.gml @@ -396,6 +396,7 @@ hide_banner=0; // ui stuff var xx=__view_get( e__VW.XView, 0 ); var yy=__view_get( e__VW.YView, 0 ); +menu_lock = false; menu_buttons = { "chapter_manage":new MainMenuButton(spr_ui_but_1, spr_ui_hov_1,,,ord("M"),scr_toggle_manage), "chapter_settings":new MainMenuButton(spr_ui_but_1, spr_ui_hov_1,,,ord("S"),scr_toggle_setting), @@ -754,37 +755,9 @@ array_set_range(temp, 0, 199, ""); temp[90] = 0; temp[9000] = ""; // ** Resets all audiences ** +audience_stack = []; audiences=0; -audien[0]=0; -audien[1]=0; -audien[2]=0; -audien[3]=0; -audien[4]=0; -audien[5]=0; -audien[6]=0; -audien[7]=0; -audien[8]=0; -audien[9]=0; -audien[10]=0; -audien[11]=0; -audien[12]=0; -audien[13]=0; -audien[14]=0; -audien_topic[0]=""; -audien_topic[1]=""; -audien_topic[2]=""; -audien_topic[3]=""; -audien_topic[4]=""; -audien_topic[5]=""; -audien_topic[6]=""; -audien_topic[7]=""; -audien_topic[8]=""; -audien_topic[9]=""; -audien_topic[10]=""; -audien_topic[11]=""; -audien_topic[12]=""; -audien_topic[13]=""; -audien_topic[14]=""; + // ** Sets default recruiting vars ** recruits=0; recruiting_worlds=""; @@ -824,10 +797,8 @@ diplo_last=""; diplo_text=""; diplo_txt=""; diplo_char=0; -for(var q=0; q<6; q++){ - diplo_option[q]=""; - diplo_goto[q]=""; -} +diplo_option = []; + diplo_alpha=0; // ** Sets combat to not true ** combat=0; @@ -872,46 +843,6 @@ inqis_flag_lair=0; inqis_flag_gene=0; faction_justmet=0; - -trade_mine[0]=""; -trade_mine[1]="Requisition"; -trade_mine[2]="Gene-Seed"; -trade_mine[3]="STC Fragment"; -trade_mine[4]="Info Chip"; -trade_theirs[0]=""; -trade_theirs[1]=""; -trade_theirs[2]=""; -trade_theirs[3]=""; -trade_theirs[4]=""; -trade_theirs[5]=""; -trade_theirs[6]=""; -trade_disp[0]=0; -trade_disp[1]=0; -trade_disp[2]=0; -trade_disp[3]=0; -trade_disp[4]=0; -trade_disp[5]=0; -trade_disp[6]=0; -trade_take[0]=""; -trade_take[1]=""; -trade_take[2]=""; -trade_take[3]=""; -trade_take[4]=""; -trade_tnum[0]=0; -trade_tnum[1]=0; -trade_tnum[2]=0; -trade_tnum[3]=0; -trade_tnum[4]=0; -trade_give[0]=""; -trade_give[1]=""; -trade_give[2]=""; -trade_give[3]=""; -trade_give[4]=""; -trade_mnum[0]=0; -trade_mnum[1]=0; -trade_mnum[2]=0; -trade_mnum[3]=0; -trade_mnum[4]=0; // ** Sets up starting requisition ** requisition=500; if (instance_exists(obj_ini)){ @@ -923,6 +854,8 @@ if (instance_exists(obj_ini)){ } } if (is_test_map==true) then requisition=50000; + +trade_attempt = false; // ** Sets income ** income=0; income_last=0; diff --git a/objects/obj_controller/Draw_0.gml b/objects/obj_controller/Draw_0.gml index 1b20b40b28..acff72bd7b 100644 --- a/objects/obj_controller/Draw_0.gml +++ b/objects/obj_controller/Draw_0.gml @@ -16,7 +16,12 @@ try{ menu = 0; } try{ - scr_ui_diplomacy(); + /*if (audience > 0 && instance_exists(obj_turn_end)){ + menu = 20; + }*/ + if (menu == MENU.Diplomacy){ + scr_ui_diplomacy(); + } } catch(_exception){ handle_exception(_exception); manage = 0; diff --git a/objects/obj_controller/Draw_64.gml b/objects/obj_controller/Draw_64.gml index 010f6ddc99..8c50b1bfb8 100644 --- a/objects/obj_controller/Draw_64.gml +++ b/objects/obj_controller/Draw_64.gml @@ -143,8 +143,8 @@ if (!zoomed && !zui){ // Draws the current marines in your command draw_sprite(spr_new_resource,3,475-10,17); draw_set_color(16291875); - draw_text(495-10,16,string_hash_to_newline(string(marines)+"/"+string(command))); - draw_text(495.5-10,16.5,string_hash_to_newline(string(marines)+"/"+string(command))); + draw_text(495-10,16,string(marines)+"/"+string(command)); + draw_text(495.5-10,16.5,string(marines)+"/"+string(command)); if (menu==0){ location_viewer.draw(); @@ -159,6 +159,25 @@ if (global.cheat_debug == true){ draw_text(1124, 7, string_hash_to_newline("DEBUG MODE")); } +if (menu == MENU.Diplomacy){ + if (diplomacy != 0){ + draw_diplomacy_diplo_text(); + if (trading==true){ + if ((diplomacy>1) && is_struct(trade_attempt)){ + try { + trade_attempt.draw_trade_screen(); + } catch(_exception){ + handle_exception(_exception); + delete trade_attempt; + trading = false; + + } + } + } else if (diplomacy!=10.1){ + draw_character_diplomacy_base_page() + } + } +} function draw_line(x1, y1, y_slide, variable) { l_hei = 37; diff --git a/objects/obj_controller/Mouse_50.gml b/objects/obj_controller/Mouse_50.gml index 1476e5f7f9..b665233380 100644 --- a/objects/obj_controller/Mouse_50.gml +++ b/objects/obj_controller/Mouse_50.gml @@ -169,434 +169,15 @@ else if (menu==15) and (cooldown<=0){ // ** Diplomacy ** -if (menu==20) and (diplomacy>0) or ((diplomacy<-5) and (diplomacy>-6)) and (cooldown<=0) and (diplomacy<10){ - if (trading==0) and (diplo_option[1]=="") and (diplo_option[2]=="") and (diplo_option[3]=="") and (diplo_option[4]==""){ - if (force_goodbye<=0){ - if (audience==0){ - // Trade - if (mouse_x>=xx+442) and (mouse_y>=yy+718) and (mouse_x=xx+561) and (mouse_y>=yy+718) and (mouse_x=xx+682) and (mouse_y>=yy+718) and (mouse_x=xx+442) and (mouse_y>=yy+752) and (mouse_x=xx+561) and (mouse_y>=yy+752) and (mouse_x=xx+682) and (mouse_y>=yy+752) and (mouse_x=xx+818) and (mouse_y>=yy+795) and (mouse_x0) and (!instance_exists(obj_turn_end)){ - cooldown=8; - diplomacy=0; - menu=0; - audience=0; - force_goodbye=0; - exit; - } - if (audience>0) and (instance_exists(obj_turn_end)){ - if (complex_event==false){ - cooldown=8; - diplomacy=0; - menu=0; - obj_turn_end.alarm[1]=1; - audience=0; - force_goodbye=0; - exit; - } - if (complex_event=true){ - // TODO - } - }// Have this check for the next audience, if any - } - // Trade goods go here - if (trading==1) or (trading==2){ - for(var i=0;i<7;i++){ - trade_theirs[i]=""; - trade_disp[i]=-100; - } - - trade_req=requisition; - trade_gene=gene_seed; - trade_chip=stc_wargear_un+stc_vehicles_un+stc_ships_un; - trade_info=info_chips; - - // Imperium trade goods - if (diplomacy==2){ - cooldown=8; - trade_theirs[1]="Requisition"; - trade_theirs[2]="Recruiting Planet"; - trade_theirs[3]="License: Repair"; - trade_theirs[4]="License: Crusade"; - } - // Mechanicus trade goods - if (diplomacy==3){ - cooldown=8; - trade_theirs[1]="Terminator Armour"; - trade_theirs[2]="Land Raider"; - trade_theirs[3]="Minor Artifact"; - trade_theirs[4]="Skitarii"; - trade_theirs[5]="Techpriest"; - trade_disp[1]=30; - trade_disp[2]=20; - trade_disp[3]=40; - trade_disp[4]=25; - trade_disp[5]=55; - } - // Inquisition trade goods - if (diplomacy==4){ - cooldown=8; - // TODO: Condemnor Boltgun trade is temporarily disabled due to crashes as the item doesn't exist in other parts of the game. - // To re-enable: Implement the Condemnor Boltgun item in the game's inventory, equipment, and combat systems. - // trade_theirs[1]="Condemnor Boltgun"; - trade_theirs[1]="Hellrifle"; - trade_theirs[2]="Incinerator"; - trade_theirs[3]="Crusader"; - trade_theirs[4]="Exterminatus"; - trade_theirs[5]="Cyclonic Torpedo"; - // trade_disp[1]=20; - trade_disp[1]=30; - trade_disp[2]=20; - trade_disp[3]=25; - trade_disp[4]=40; - trade_disp[5]=60; - } - // Ecclesiarchy trade goods - if (diplomacy==5){ - cooldown=8; - trade_theirs[1]="Eviscerator"; - trade_theirs[2]="Heavy Flamer"; - trade_theirs[3]="Inferno Bolts"; - trade_theirs[4]="Sister of Battle"; - trade_theirs[5]="Sister Hospitaler"; - trade_disp[1]=20; - trade_disp[2]=30; - trade_disp[3]=30; - trade_disp[4]=40; - trade_disp[5]=45; - } - // Eldar trade goods - if (diplomacy==6){ - cooldown=8; - trade_theirs[1]="Master Crafted Power Sword"; - trade_theirs[2]="Archeotech Laspistol"; - trade_theirs[3]="Ranger"; - trade_theirs[4]="Useful Information"; - trade_disp[1]=-10; - trade_disp[2]=-10; - trade_disp[3]=10; - trade_disp[4]=-15; - if (random_event_next != EVENT.none) and ((string_count("WL10|",useful_info)>0) or (turn0) or (known[eFACTION.Ork]<1)) and (string_count("WG|",useful_info)>1) and (string_count("CM|",useful_info)>0) then trade_disp[4]=1000; - } - // Ork trade goods - if (diplomacy==7){ - cooldown=8; - trade_theirs[1]="Power Klaw"; - trade_theirs[2]="Ork Sniper"; - trade_theirs[3]="Flash Git"; - } - if (diplomacy==8) then trade_theirs[1]="Test"; - } - } - if (trading==0) and ((diplo_option[1]!="") or (diplo_option[2]!="") or (diplo_option[3]!="") or (diplo_option[4]!="")){ +if (menu==MENU.Diplomacy) and (diplomacy>0) or ((diplomacy<-5) and (diplomacy>-6)) and (cooldown<=0) and (diplomacy<10){ + if (trading==0) and (valid_diplomacy_options()){ if (force_goodbye==0) and (cooldown<=0){ - var diplo_pressed=0; - yy=__view_get( e__VW.YView, 0 )+0; - - var opts=0; - for(var dp=1; dp<=4; dp++){if (diplo_option[dp]!="") then opts+=1;} - if (opts==4) then yy-=30; - if (opts==2) then yy+=30; - if (opts==1) then yy+=60; - for(var slot=1; slot<=4; slot++){ - if (diplo_option[slot]!=""){ - if (mouse_x>=xx+354) and (mouse_y>=yy+694) and (mouse_x0) and (diplo_goto[diplo_pressed]!="") and (cooldown<=0){ - click2=1; - scr_dialogue(diplo_goto[diplo_pressed]); - cooldown=4000; - exit; - } - if (diplo_pressed==1){ - click2=1; - if (questing==0) and (trading_artifact==0) and (trading_demand==0){ - if (diplomacy==4) and (diplo_option[1]=="It will not happen again"){// It will not happen again mang - scr_dialogue("you_better"); - diplo_option[1]=""; - diplo_option[2]=""; - diplo_option[3]=""; - force_goodbye=1; - - var tb,tc; - explode_script(obj_controller.temp[1008],"|"); - tb=string(explode[0]); - tc=real(explode[1]); - var ev=0; - for(var v=1; v<=99; v++){if (ev==0) and (event[v]=="") then ev=v;} - event[ev]="remove_serf|"+string(tb)+"|"+string(tc)+"|"; - event_duration[ev]=choose(1,2); - exit; - } - } - if (questing!=0){ - cooldown=8; - if (questing==1) and (diplomacy==6){ - if (requisition>=500){ - scr_loyalty("Xeno Trade","+"); - scr_dialogue("mission1_thanks"); - scr_quest(2,"fund_elder",6,0); - requisition-=500;questing=0; - diplo_option[1]=""; - diplo_option[2]=""; - diplo_option[3]=""; - exit; - } - } - } - if ((diplomacy==3) or (diplomacy==5)) and (trading_artifact!=0){ - trading=1; - scr_dialogue("open_trade"); - trade_take[1]="Artifact"; - trade_tnum[1]=1; - trade_req=requisition; - trade_gene=gene_seed; - trade_chip=info_chips; - trade_info=stc_wargear_un+stc_vehicles_un+stc_ships_un; - } - if (trading_demand>0) and (diplo_option[1]!="Cancel") and (diplo_option[1]!="") then scr_demand(1); - } - if (diplo_pressed==2){ - click2=1; - - if (questing==0) and (trading_artifact==0) and (trading_demand==0){// Don't want no trabble - if (diplomacy==4) and (diplo_option[2]=="Very well"){ - diplo_option[1]=""; - diplo_option[2]=""; - diplo_option[3]=""; - force_goodbye=1; - - var tb,tc; - explode_script(obj_controller.temp[1008],"|"); - tb=string(explode[0]); - tc=real(explode[1]); - var ev=0; - for(var v=1; v<=99; v++){if (ev==0) and (event[v]=="") then ev=v;} - event[ev]="remove_serf|"+string(tb)+"|"+string(tc)+"|"; - event_duration[ev]=choose(1,2); - cooldown=8; - diplomacy=0; - menu=0; - obj_turn_end.alarm[1]=1; - audience=0; - force_goodbye=0; - exit; - } - } - if (questing!=0){ - cooldown=8; - if (questing==1) and (diplomacy==6){ - scr_dialogue("quest_maybe"); - questing=0; - diplo_option[1]=""; - diplo_option[2]=""; - diplo_option[3]=""; - exit; - } - } - if (trading_demand>0) and (diplo_option[2]!="Cancel") and (diplo_option[2]!="") then scr_demand(2); - if (trading_demand>0) and (diplo_option[2]=="Cancel"){ - cooldown=8000; - trading_demand=0; - diplo_option[1]=""; - diplo_option[2]=""; - diplo_option[3]=""; - diplo_text="..."; - diplo_txt="..."; - } - if (diplomacy>0) and (trading_artifact>0) and (menu==20){ - cooldown=8; - obj_ground_mission.alarm[1]=2; - trading_artifact=0; - menu=0; - diplomacy=0; - diplo_option[1]=""; - diplo_option[2]=""; - diplo_option[3]=""; - } - } - if (diplo_pressed==3){ - click2=1; - if (questing==0) and (trading_artifact==0) and (trading_demand==0){ - if (diplomacy==4) and (string_count("You will not",diplo_option[3])>0){// MIIIIINE!!!1 - scr_dialogue("die_heretic"); - diplo_option[1]=""; - diplo_option[2]=""; - diplo_option[3]=""; - force_goodbye=1; - exit; - } - } - if (questing!=0){ - cooldown=8; - if (questing==1) and (diplomacy==6){// That +2 counteracts the WAITED TOO LONG penalty - scr_dialogue("mission1_refused"); - scr_quest(3,"fund_elder",6,0); - questing=0; - diplo_option[1]=""; - diplo_option[2]=""; - diplo_option[3]=""; - exit; - } - } - if (trading_demand>0) and (diplo_option[3]!="Cancel") and (diplo_option[3]!="") then scr_demand(3); - if (trading_demand>0) and (diplo_option[3]=="Cancel"){ - cooldown=8; - trading_demand=0; - diplo_option[1]=""; - diplo_option[2]=""; - diplo_option[3]=""; - diplo_text="..."; - diplo_txt="..."; - } - } } if (force_goodbye!=0) and (cooldown<=0){// Want to check to see if the deal went fine here if (trading_artifact!=0){ click2=1; - obj_controller.diplo_option[1]=""; - obj_controller.diplo_option[2]=""; - diplo_option[3]=""; + clear_diplo_choices(); diplomacy=0; menu=0; force_goodbye=0; @@ -607,304 +188,20 @@ if (menu==20) and (diplomacy>0) or ((diplomacy<-5) and (diplomacy>-6)) and (cool } } } - // - if (trading==1) or (trading==2){ - // Exit - if (scr_hit(xx+818,yy+796,xx+897,yy+815)==true){ - cooldown=8; - trading=0; - scr_dialogue("trade_close"); - click2=1; - - for(var i=0;i<6;i++){ - trade_take[i]=""; - trade_tnum[i]=0; - trade_give[i]=""; - trade_mnum[i]=0; - } - if (trading_artifact!=0){ - diplomacy=0; - menu=0; - force_goodbye=0; - with(obj_popup){instance_destroy();} - obj_ground_mission.alarm[1]=1; - exit; - } - // Also need to disable the popup OFFER TERMS option - } - // Clear Terms - if (scr_hit(xx+510,yy+649,xx+615,yy+668)==true){ - cooldown=8; - click2=1; - trade_likely=""; - trade_req=requisition; - trade_gene=gene_seed; - trade_chip=stc_wargear_un+stc_vehicles_un+stc_ships_un; - trade_info=info_chips; - - for(var i=0;i<6;i++){ - if (trading_artifact==0){ - trade_take[i]=""; - trade_tnum[i]=0; - } - trade_give[i]=""; - trade_mnum[i]=0; - } - } - // Trade Here? - if (scr_hit(xx+630,yy+649,xx+735,yy+668)==true){ - cooldown=8; - click2=1; - if (diplo_last!="offer") then scr_trade(true); - } - - var minz=0; - if (trade_give[4]=="") then minz=4; - if (trade_give[3]=="") then minz=3; - if (trade_give[2]=="") then minz=2; - if (trade_give[1]=="") then minz=1; - - // Opponent things to offer - if (trading_artifact==0){ - if (scr_hit(xx+342,yy+371,xx+485,yy+422)==true) and (cooldown<=0) and (disposition[diplomacy]>=trade_disp[1]){ - cooldown=8; - click2=1; - scr_trade_add(string(trade_theirs[1])); - } - if (scr_hit(xx+342,yy+422,xx+485,yy+470)==true) and (cooldown<=0) and (disposition[diplomacy]>=trade_disp[2]){ - cooldown=8; - click2=1; - scr_trade_add(string(trade_theirs[2])); - } - if (scr_hit(xx+342,yy+470,xx+485,yy+517)==true) and (cooldown<=0) and (disposition[diplomacy]>=trade_disp[3]){ - cooldown=8; - click2=1; - scr_trade_add(string(trade_theirs[3])); - } - if (scr_hit(xx+342,yy+517,xx+485,yy+564)==true) and (cooldown<=0) and (disposition[diplomacy]>=trade_disp[4]){ - cooldown=8; - click2=1; - scr_trade_add(string(trade_theirs[4])); - } - if (scr_hit(xx+342,yy+564,xx+485,yy+611)==true) and (cooldown<=0) and (disposition[diplomacy]>=trade_disp[5]){ - cooldown=8; - click2=1; - scr_trade_add(string(trade_theirs[5])); - } - } - xx+=419; - // Player Things to Offer - // Requisition - if (!instance_exists(obj_popup_dialogue)){ - if (scr_hit(xx+342,yy+371,xx+485,yy+422)==true) and (minz!=0) and (cooldown<=0) and (trade_req>0){ - cooldown=8000; - click2=1; - get_diag_integer("Requisition offered?",trade_req,"m"+string(minz),"Requisition"); - scr_trade(false); - } - // Gene-seed - else if (scr_hit(xx+342,yy+422,xx+485,yy+470)==true) and (minz!=0) and (cooldown<=0) and (trade_gene>0){ - cooldown=8000; - click2=1; - get_diag_integer("Gene-Seed offered?",trade_gene,"m"+string(minz),"Gene-Seed"); - scr_trade(false); - } - // STC Fragment - else if (scr_hit(xx+342,yy+470,xx+485,yy+517)==true) and (minz!=0) and (cooldown<=0) and (trade_chip>0){ - cooldown=8000; - click2=1; - get_diag_integer("STC Fragments offered?",trade_chip,"m"+string(minz),"STC Fragment"); - scr_trade(false); - } - // Info Chips - if (scr_hit(xx+342,yy+517,xx+485,yy+564)==true) and (minz!=0) and (cooldown<=0) and (trade_info>0){ - cooldown=8000; - click2=1; - get_diag_integer("Info Chips offered?",trade_info,"m"+string(minz),"Info Chip"); - scr_trade(false); - } - } - xx-=419; - // Remove items buttons - if (trading_artifact==0){ - if (scr_hit(xx+507,yy+399,xx+527,yy+418)==true) and (trade_tnum[2]==0) and (trade_tnum[1]!=0) and (cooldown<=0){ - trade_tnum[1]=0; - trade_take[1]=""; - cooldown=8000; - click2=1; - scr_trade(false); - } - if (scr_hit(xx+507,yy+419,xx+527,yy+438)==true) and (trade_tnum[3]==0) and (trade_tnum[2]!=0) and (cooldown<=0){ - trade_tnum[2]=0; - trade_take[2]=""; - cooldown=8000; - click2=1; - scr_trade(false); - } - if (scr_hit(xx+507,yy+439,xx+527,yy+458)==true) and (trade_tnum[4]==0) and (trade_tnum[3]!=0) and (cooldown<=0){ - trade_tnum[3]=0; - trade_take[3]=""; - cooldown=8000; - click2=1; - scr_trade(false); - } - if (scr_hit(xx+507,yy+459,xx+527,yy+478)==true) and (trade_tnum[4]!=0) and (cooldown<=0){ - trade_tnum[4]=0; - trade_take[4]=""; - cooldown=8000; - click2=1; - scr_trade(false); - } - } - if (scr_hit(xx+507,yy+547,xx+527,yy+566)==true) and (trade_mnum[2]==0) and (trade_mnum[1]!=0) and (cooldown<=0){ - if (trade_give[1]=="Requisition") then trade_req+=trade_mnum[1]; - if (trade_give[1]=="Gene-Seed") then trade_gene+=trade_mnum[1]; - if (trade_give[1]=="STC Fragment") then trade_chip+=trade_mnum[1]; - if (trade_give[1]=="Info Chip") then trade_info+=trade_mnum[1]; - trade_mnum[1]=0; - trade_give[1]=""; - cooldown=8000; - click2=1; - scr_trade(false); - } - if (scr_hit(xx+507,yy+567,xx+527,yy+586)==true) and (trade_mnum[3]==0) and (trade_mnum[2]!=0) and (cooldown<=0){ - if (trade_give[2]=="Requisition") then trade_req+=trade_mnum[2]; - if (trade_give[2]=="Gene-Seed") then trade_gene+=trade_mnum[2]; - if (trade_give[2]=="STC Fragment") then trade_chip+=trade_mnum[2]; - if (trade_give[2]=="Info Chip") then trade_info+=trade_mnum[2]; - trade_mnum[2]=0; - trade_give[2]=""; - cooldown=8000; - click2=1; - scr_trade(false); - } - if (scr_hit(xx+507,yy+587,xx+527,yy+606)==true) and (trade_mnum[4]==0) and (trade_mnum[3]!=0) and (cooldown<=0){ - if (trade_give[3]=="Requisition") then trade_req+=trade_mnum[3]; - if (trade_give[3]=="Gene-Seed") then trade_gene+=trade_mnum[3]; - if (trade_give[3]=="STC Fragment") then trade_chip+=trade_mnum[3]; - if (trade_give[3]=="Info Chip") then trade_info+=trade_mnum[3]; - trade_mnum[3]=0; - trade_give[3]=""; - cooldown=8000; - click2=1; - scr_trade(false); - } - if (scr_hit(xx+507,yy+607,xx+527,yy+626)==true) and (trade_mnum[4]!=0) and (cooldown<=0){ - if (trade_give[4]=="Requisition") then trade_req+=trade_mnum[4]; - if (trade_give[4]=="Gene-Seed") then trade_gene+=trade_mnum[4]; - if (trade_give[4]=="STC Fragment") then trade_chip+=trade_mnum[4]; - if (trade_give[4]=="Info Chip") then trade_info+=trade_mnum[4]; - trade_mnum[4]=0; - trade_give[4]=""; - cooldown=8000; - click2=1; - scr_trade(false); - } - } } // Diplomacy -if (zoomed==0) and (cooldown<=0) and (menu==20) and (diplomacy==0){ +if (zoomed==0) and (cooldown<=0) and (menu==MENU.Diplomacy) and (diplomacy==0){ xx+=55; yy-=20; var onceh=0 // Daemon emmissary - if (point_in_rectangle(mouse_x, mouse_y, xx+688,yy+181,xx+1028,yy+281)){ - diplomacy=10.1; - diplomacy_pathway="intro"; - scr_dialogue(diplomacy_pathway); - onceh=1; - cooldown = 1; - } - var faction_interact_coords=[ - [ - [xx+194,yy+355,xx+288,yy+369],//imperium - [xx+292,yy+355,xx+350,yy+369], - 2 - ], - [ - [xx+194,yy+491,xx+288,yy+503],//mechanicus - [xx+292,yy+491,xx+350,yy+503], - 3 - ], - [ - [xx+194,yy+630,xx+288,yy+644],//Inquisition - [xx+292,yy+630,xx+350,yy+644], - 4 - ], - [ - [xx+194,yy+760,xx+288,yy+774],//sisters - [xx+292,yy+760,xx+350,yy+774], - 5 - ], - [ - [xx+1203,yy+355,xx+1300,yy+369],//eldar - [xx+1303,yy+355,xx+1350,yy+369], - 6 - ], - [ - [xx+1203,yy+491,xx+1300,yy+503],//orks - [xx+1303,yy+491,xx+1350,yy+503], - 7 - ], - [ - [xx+1203,yy+630,xx+1300,yy+644],//Tau - [xx+1303,yy+630,xx+1350,yy+644], - 8 - ], - [ - [xx+1203,yy+760,xx+1300,yy+774],//heretic - [xx+1303,yy+760,xx+1350,yy+774], - 10 - ], - ] - for (var i=0;i0) and (cooldown==8000){ - onceh=0; - if (known[diplomacy]==1) and (diplomacy!=4) and (onceh==0){ - scr_dialogue("intro"); - onceh=1; - known[diplomacy]=2; - faction_justmet=1; - } - if (known[diplomacy]>=2) and (diplomacy!=4) and (onceh==0){ - scr_dialogue("hello"); - onceh=1; - } - if (known[eFACTION.Inquisition]==1) and (diplomacy==4) and (onceh==0){ - scr_dialogue("intro"); - onceh=1; - known[diplomacy]=2; - faction_justmet=1; - obj_controller.last_mission=turn+1; - } - if (known[eFACTION.Inquisition]==3) and (diplomacy==4) and (onceh==0){ - scr_dialogue("intro"); - onceh=1; - known[diplomacy]=4; - faction_justmet=1; - obj_controller.last_mission=turn+1; - } - if (known[diplomacy]>=4) and (diplomacy==4) and (onceh==0){ - scr_dialogue("hello"); - onceh=1; - } - } + if (point_in_rectangle(mouse_x, mouse_y, xx+688,yy+181,xx+1028,yy+281)){ + diplomacy=10.1; + diplomacy_pathway="intro"; + scr_dialogue(diplomacy_pathway); + onceh=1; + cooldown = 1; + } } diff --git a/objects/obj_controller/Step_0.gml b/objects/obj_controller/Step_0.gml index 07f08714e6..39c652e45b 100644 --- a/objects/obj_controller/Step_0.gml +++ b/objects/obj_controller/Step_0.gml @@ -727,15 +727,12 @@ try { } if ((trading_artifact == 0) && (trading == 0) && (trading_artifact == 0) && (faction_justmet == 1) && (questing == 0) && (trading_demand == 0) && (complex_event == false)) { - for (var h = 1; h <= 4; h++) { - obj_controller.diplo_option[h] = ""; - obj_controller.diplo_goto[h] = ""; - } + clear_diplo_choices(); } income = income_base + income_home + income_forge + income_agri + income_training + income_fleet + income_trade + income_tribute; - if ((menu == 20) && ((diplomacy > 0) || ((diplomacy < -5) && (diplomacy > -6)))) { + if ((menu == MENU.Diplomacy) && ((diplomacy > 0) || ((diplomacy < -5) && (diplomacy > -6)))) { if (string_length(diplo_txt) < string_length(diplo_text)) { diplo_char += 2; diplo_txt = string_copy(diplo_text, 0, diplo_char); diff --git a/objects/obj_crusade/Alarm_0.gml b/objects/obj_crusade/Alarm_0.gml index 0d47095150..3c279c6dab 100644 --- a/objects/obj_crusade/Alarm_0.gml +++ b/objects/obj_crusade/Alarm_0.gml @@ -7,7 +7,7 @@ if (duration=0){ if (owner=ns.owner) and (action="") and (home_x+home_y!=0) and (point_distance(x,y,ns.x,ns.y)<=ns.radius){ action_x=home_x; action_y=home_y; - alarm[4]=1; + set_fleet_movement(); } } if (instance_exists(obj_turn_end)){ diff --git a/objects/obj_en_fleet/Alarm_1.gml b/objects/obj_en_fleet/Alarm_1.gml index 3816de9b42..ec65d11fc1 100644 --- a/objects/obj_en_fleet/Alarm_1.gml +++ b/objects/obj_en_fleet/Alarm_1.gml @@ -20,8 +20,8 @@ if (orbiting != 0 && action=="" && owner!=noone){ orbiting.present_fleet[owner]++; } } - -if ((trade_goods="Khorne_warband") or (trade_goods="Khorne_warband_landing_force")) and (owner=eFACTION.Chaos) { +var _khorne_cargo = fleet_has_cargo("warband"); +if (_khorne_cargo && owner=eFACTION.Chaos) { khorne_fleet_cargo(); } @@ -232,7 +232,7 @@ if (navy && action=="") { if (homeworld_distance40) {// Go towards planet action_x=homeworld_nearby.x; action_y=homeworld_nearby.y; - alarm[4]=1;// show_message("B"); + set_fleet_movement();// show_message("B"); with(obj_temp7){instance_destroy();} with(obj_temp8){instance_destroy();} exit; @@ -260,7 +260,7 @@ if (navy && action=="") { if (goto.present_fleet[eFACTION.Player]=0) { action_x=goto.x; action_y=goto.y; - alarm[4]=1; + set_fleet_movement(); } with(obj_temp7){instance_destroy();} @@ -285,7 +285,7 @@ if (navy && action=="") { with(obj_p_fleet){if (y<-10000) then y+=20000;}// Enable non-stationary player fleets if (homeworld_distance<=fleet_distance) and (homeworld_distance<7000) and (instance_exists(homeworld_nearby)){// Go towards planet - action_x=homeworld_nearby.x;action_y=homeworld_nearby.y;alarm[4]=1;exit; + action_x=homeworld_nearby.x;action_y=homeworld_nearby.y;set_fleet_movement();;exit; } @@ -389,7 +389,8 @@ if (navy && action=="") { if (guard_wanted>50000) then planet_needed=2;// Feudal and up if (guard_wanted>200000) then planet_needed=3;// Temperate and up if (guard_wanted>2000000) then planet_needed=4;// Hive - obj_controller.temp[200]=guard_wanted;trade_goods=""; + obj_controller.temp[200]=guard_wanted; + trade_goods=""; if (planet_needed=1) or (planet_needed=2){ var good @@ -499,7 +500,9 @@ if (navy && action=="") { } scr_navy_planet_action(); - if (trade_goods="recruited") then trade_goods=""; + if (trade_goods="recruited"){ + trade_goods=""; + } /* */ } } @@ -540,7 +543,8 @@ if (action=="" && _is_orbiting){ var ns=instance_nearest(x,y,obj_star); if (ns.owner != eFACTION.Ork) and (point_distance(x,y,ns.x,ns.y)<=max_dis) and (point_distance(x,y,ns.x,ns.y)>40) and (instance_exists(obj_crusade)) and (image_index>3){ action_x=ns.x; - action_y=ns.y;alarm[4]=1; + action_y=ns.y; + set_fleet_movement(); home_x=orbiting.x; home_y=orbiting.y; exit; @@ -579,7 +583,7 @@ if (action=="" && _is_orbiting){ action_x=you.x;action_y=you.y; home_x=instance_nearest(x,y,obj_star).x; home_y=instance_nearest(x,y,obj_star).y; - alarm[4]=1;with(obj_temp3){instance_destroy();} + set_fleet_movement();with(obj_temp3){instance_destroy();} exit; } if (dis>=300) then ret=1; @@ -595,7 +599,7 @@ if (action=="" && _is_orbiting){ if ((cls.x!=home_x) or (cls.y!=home_y)) and (home_x+home_y>0){ action_x=home_x; action_y=home_y; - alarm[4]=1; + set_fleet_movement(); } } @@ -808,7 +812,7 @@ if (action=="" && _is_orbiting){ action_x=exit_star.x; action_y=exit_star.y; orbiting=exit_star; - alarm[4]=1; + set_fleet_movement(); trade_goods="|DELETE|"; exit; } @@ -832,7 +836,7 @@ if (action=="" && _is_orbiting){ if (wop!=0) and (point_distance(x,y,wop.x,wop.y)<300) and (wop.x>5) and (wop.y>5){ target_x=wop.x;target_y=wop.y; home_x=x;home_y=y; - alarm[4]=1; + set_fleet_movement(); } } with(obj_temp5){instance_destroy();} @@ -914,12 +918,19 @@ if (action=="" && _is_orbiting){ new_fleet.action_x=plin2.x; new_fleet.action_y=plin2.y; - new_fleet.alarm[4]=1; + with(new_fleet){ + set_fleet_movement(); + } break; } - if (good=1) and (instance_exists(plin)){action_x=plin.x;action_y=plin.y;alarm[4]=1;if (n!=5) then good=5;} + if (good=1) and (instance_exists(plin)){ + action_x=plin.x; + action_y=plin.y; + set_fleet_movement(); + if (n!=5) then good=5; + } } } instance_activate_object(obj_star); diff --git a/objects/obj_en_fleet/Destroy_0.gml b/objects/obj_en_fleet/Destroy_0.gml index 77f4f92ff7..fc746b0f66 100644 --- a/objects/obj_en_fleet/Destroy_0.gml +++ b/objects/obj_en_fleet/Destroy_0.gml @@ -15,7 +15,7 @@ if (action="") and (orbiting!=0){ if (instance_exists(obj_controller)){ - if ((trade_goods="Khorne_warband") or (trade_goods="Khorne_warband_landing_force")) and (obj_controller.faction_defeated[10]=0){ + if (fleet_has_cargo("warband")) and (obj_controller.faction_defeated[10]=0){ destroy_khorne_fleet(); } if (fleet_has_cargo("ork_warboss")) and (obj_controller.faction_defeated[7]<=0) and (safe=0){ diff --git a/objects/obj_en_fleet/Draw_0.gml b/objects/obj_en_fleet/Draw_0.gml index cd13719538..9070c00942 100644 --- a/objects/obj_en_fleet/Draw_0.gml +++ b/objects/obj_en_fleet/Draw_0.gml @@ -113,7 +113,7 @@ if (within=1) or (selected>0){ break; case eFACTION.Chaos: fleet_descript="Heretic Fleet"; - if (trade_goods="Khorne_warband" || trade_goods="Khorne_warband_landing_force"){ + if (fleet_has_cargo("warband") || fleet_has_cargo("csm")){ fleet_descript=string(obj_controller.faction_leader[eFACTION.Chaos])+"'s Fleet"; if (string_count("s's Fleet",fleet_descript)>0) then fleet_descript=string_replace(fleet_descript,"s's Fleet","s' Fleet"); } diff --git a/objects/obj_en_fleet/Step_0.gml b/objects/obj_en_fleet/Step_0.gml index 48c73dfb25..00144c38dc 100644 --- a/objects/obj_en_fleet/Step_0.gml +++ b/objects/obj_en_fleet/Step_0.gml @@ -98,7 +98,9 @@ if (owner = eFACTION.Tau) and (action="") and (obj_controller.tau_messenger>=30) if (good=1){ fleet.action_x=stir.x; fleet.action_y=stir.y; - fleet.alarm[4]=1; + with(fleet){ + set_fleet_movement(); + } } } diff --git a/objects/obj_fleet/Alarm_4.gml b/objects/obj_fleet/Alarm_4.gml index dada200d89..605cd4a9b5 100644 --- a/objects/obj_fleet/Alarm_4.gml +++ b/objects/obj_fleet/Alarm_4.gml @@ -35,16 +35,14 @@ if (player_started=1){ if (instance_exists(obj_star_select)) then with(obj_star_select){ alarm[1]=1;player_fleet=0; - var i;i=-1;repeat(15){i+=1;en_fleet[i]=0;} + var i=-1;repeat(15){i+=1;en_fleet[i]=0;} } if (instance_exists(pla_fleet)){ pla_fleet.acted=2; if (capital+frigate+escort=0) then with(pla_fleet){instance_destroy();} } if (enemy[1]!=4) and (obj_controller.faction_status[enemy[1]]!="War"){ - obj_controller.audiences+=1;obj_controller.audien[obj_controller.audiences]=enemy[1]; - obj_controller.audien_topic[obj_controller.audiences]="declare_war"; - obj_controller.disposition[enemy[1]]-=20; + scr_audience(enemy[1], "declare_war", obj_controller.disposition[enemy[1]]-20, "War", 3, 2); } } diff --git a/objects/obj_garbage_collector/Step_0.gml b/objects/obj_garbage_collector/Step_0.gml index 88117f46f7..973cb5e1fc 100644 --- a/objects/obj_garbage_collector/Step_0.gml +++ b/objects/obj_garbage_collector/Step_0.gml @@ -4,7 +4,7 @@ if (gc_timer > 0) { } else { - gc_timer = 50; // Default is every frame, so de-facto 1; + gc_timer = 50000; // Default is every frame, so de-facto 1; gc_collect(); wait_and_execute(0, function(){ diff --git a/objects/obj_ground_mission/Alarm_2.gml b/objects/obj_ground_mission/Alarm_2.gml index 05dd140bec..1b4b08e0b1 100644 --- a/objects/obj_ground_mission/Alarm_2.gml +++ b/objects/obj_ground_mission/Alarm_2.gml @@ -19,11 +19,6 @@ scr_event_log("","Artifact recovered."); corrupt_artifact_collectors(last_artifact); obj_controller.trading_artifact=0; -var h=0; -repeat(4){ - h+=1; - obj_controller.diplo_option[h]=""; - obj_controller.diplo_goto[h]=""; -} +clear_diplo_choices(); instance_destroy(); diff --git a/objects/obj_ground_mission/Alarm_3.gml b/objects/obj_ground_mission/Alarm_3.gml index 8894266c93..80661c62a8 100644 --- a/objects/obj_ground_mission/Alarm_3.gml +++ b/objects/obj_ground_mission/Alarm_3.gml @@ -29,10 +29,6 @@ corrupt_artifact_collectors(last_artifact); obj_controller.trading_artifact=0; var h=0; -repeat(4){ - h+=1; - obj_controller.diplo_option[h]=""; - obj_controller.diplo_goto[h]=""; -} +clear_diplo_choices(); instance_destroy(); diff --git a/objects/obj_ground_mission/Alarm_4.gml b/objects/obj_ground_mission/Alarm_4.gml index 8dd5679466..90a96c32eb 100644 --- a/objects/obj_ground_mission/Alarm_4.gml +++ b/objects/obj_ground_mission/Alarm_4.gml @@ -51,9 +51,7 @@ if (mission="bad"){ if (planet.p_owner[num]=8) then obj_controller.disposition[8]-=8; if (planet.p_owner[num]>=3) and (planet.p_owner[num]<=6){ - obj_controller.audiences+=1; - obj_controller.audien[obj_controller.audiences]=planet.p_owner[num]; - obj_controller.audien_topic[obj_controller.audiences]="artifact_angry"; + scr_audience(planet.p_owner[num], "artifact_angry",); } } @@ -109,7 +107,7 @@ delete_features(planet.p_feature[num], P_features.Artifact); corrupt_artifact_collectors(last_artifact); obj_controller.trading_artifact=0; -var h;h=0;repeat(4){h+=1;obj_controller.diplo_option[h]="";obj_controller.diplo_goto[h]="";} +clear_diplo_choices(); obj_controller.menu=0; instance_destroy(); diff --git a/objects/obj_ground_mission/Alarm_5.gml b/objects/obj_ground_mission/Alarm_5.gml index ea06f43fbc..c353d62d6e 100644 --- a/objects/obj_ground_mission/Alarm_5.gml +++ b/objects/obj_ground_mission/Alarm_5.gml @@ -53,13 +53,17 @@ if (mission="bad") and (plan.p_first[num]=3) and (plan.p_type[num]="Forge"){ if (plan.p_owner[num]=6) then obj_controller.disposition[6]-=15; if (plan.p_owner[num]=8) then obj_controller.disposition[8]-=8;*/ - if (plan.p_owner[num]>3) and (plan.p_owner[num]<=6){obj_controller.audiences+=1;obj_controller.audien[obj_controller.audiences]=plan.p_owner[num];obj_controller.audien_topic[obj_controller.audiences]="artifact_angry";} - if (plan.p_owner[num]=3) and (obj_controller.faction_status[eFACTION.Mechanicus]!="War"){obj_controller.audiences+=1;obj_controller.audien[obj_controller.audiences]=plan.p_owner[num];obj_controller.audien_topic[obj_controller.audiences]="declare_war";} + if (plan.p_owner[num]>3) and (plan.p_owner[num]<=6){ + scr_audience(plan.p_owner[num], "artifact_angry",); + } + if (plan.p_owner[num]=3) and (obj_controller.faction_status[eFACTION.Mechanicus]!="War"){ + scr_audience(plan.p_owner[num], "declare_war", -20); + } // Start battle pop.battle_special=3.1; obj_controller.trading_artifact=0; - var h;h=0;repeat(4){h+=1;obj_controller.diplo_option[h]="";obj_controller.diplo_goto[h]="";} + clear_diplo_choices(); obj_controller.menu=0; pop.loc=plan.name; @@ -106,8 +110,8 @@ delete_features(plan.p_feature[num], P_features.STC_Fragment); scr_add_stc_fragment();// STC here -obj_controller.trading_artifact=0;obj_controller.diplo_option1=""; -obj_controller.diplo_option2="";obj_controller.diplo_option3=""; +obj_controller.trading_artifact=0; +clear_diplo_choices(); obj_controller.menu=0; instance_destroy(); diff --git a/objects/obj_ground_mission/Alarm_6.gml b/objects/obj_ground_mission/Alarm_6.gml index 180cd1a41a..6ef5ce8e14 100644 --- a/objects/obj_ground_mission/Alarm_6.gml +++ b/objects/obj_ground_mission/Alarm_6.gml @@ -11,7 +11,7 @@ with (obj_fleet_select) { instance_destroy(); } -obj_controller.menu = 20; +scr_toggle_diplomacy(); obj_controller.diplomacy = 3; obj_controller.force_goodbye = 5; @@ -119,7 +119,9 @@ if (is_struct(_target)) { _enemy_fleet.action_y = _target.y; } - _enemy_fleet.alarm[4] = 1; + with(_enemy_fleet){ + set_fleet_movement(); + } } instance_activate_all(); diff --git a/objects/obj_img/Step_0.gml b/objects/obj_img/Step_0.gml index 9520e4a3ef..089596a41e 100644 --- a/objects/obj_img/Step_0.gml +++ b/objects/obj_img/Step_0.gml @@ -7,8 +7,14 @@ if (!instance_exists(obj_fleet)) and (!instance_exists(obj_ncombat)){ if (instance_exists(obj_controller)){ - if (obj_controller.diplomacy=0) and (obj_controller.menu=20) and (diplomacy_icon_good=false){scr_image("diplomacy_icon",-50,0,0,0,0);scr_image("symbol",-50,0,0,0,0);} - if (obj_controller.menu!=20) and (diplomacy_icon_good=true){scr_image("diplomacy_icon",-666,0,0,0,0);scr_image("symbol",-666,0,0,0,0);} + if (obj_controller.diplomacy=0) and (obj_controller.menu==MENU.Diplomacy) and (diplomacy_icon_good=false){ + scr_image("diplomacy_icon",-50,0,0,0,0); + scr_image("symbol",-50,0,0,0,0); + } + if (obj_controller.menu!=20) and (diplomacy_icon_good=true){ + scr_image("diplomacy_icon",-666,0,0,0,0); + scr_image("symbol",-666,0,0,0,0); + } if (obj_controller.diplomacy>0) and (diplomacy_splash_good=false) then scr_image("diplomacy_splash",-50,0,0,0,0); if (obj_controller.diplomacy=0) and (diplomacy_splash_good=true) then scr_image("diplomacy_splash",-666,0,0,0,0); diff --git a/objects/obj_ncombat/Alarm_0.gml b/objects/obj_ncombat/Alarm_0.gml index e9eb6c9766..7ada1b0cc9 100644 --- a/objects/obj_ncombat/Alarm_0.gml +++ b/objects/obj_ncombat/Alarm_0.gml @@ -2230,7 +2230,7 @@ if (enemy = 10) and(battle_special != "ship_demon") and(battle_special != "falle } // ** Chaos Space Marines Forces ** -if (enemy = 11) and(battle_special != "world_eaters") and(string_count("cs_meeting_battle", battle_special) = 0) { +if (enemy = 11) and(battle_special != "ChaosWarband") and(string_count("cs_meeting_battle", battle_special) = 0) { // Small CSM Group if (threat = 1) { u = instance_nearest(xxx, 240, obj_enunit); @@ -2452,7 +2452,7 @@ if (enemy = 11) and(battle_special != "world_eaters") and(string_count("cs_meeti } // ** World Eaters Forces ** -if (enemy = 11) and(battle_special = "world_eaters") { +if (enemy = 11) and(battle_special = "ChaosWarband") { // Small WE Group if (threat = 1) { u = instance_nearest(xxx, 240, obj_enunit); diff --git a/objects/obj_ncombat/Alarm_5.gml b/objects/obj_ncombat/Alarm_5.gml index 0674c4cb17..d53ba26ed3 100644 --- a/objects/obj_ncombat/Alarm_5.gml +++ b/objects/obj_ncombat/Alarm_5.gml @@ -659,7 +659,7 @@ scr_newtext(); newline=line_break; scr_newtext(); -if (((leader)) or ((battle_special="world_eaters") and (!obj_controller.faction_defeated[10]))) and (!defeat){ +if (((leader)) or ((battle_special="ChaosWarband") and (!obj_controller.faction_defeated[10]))) and (!defeat){ var nep;nep=false; newline="The enemy Leader has been killed!";newline_color="yellow";scr_newtext(); newline=line_break; diff --git a/objects/obj_ncombat/Alarm_7.gml b/objects/obj_ncombat/Alarm_7.gml index 8caf6ca151..72b2217d65 100644 --- a/objects/obj_ncombat/Alarm_7.gml +++ b/objects/obj_ncombat/Alarm_7.gml @@ -157,7 +157,7 @@ try { if (defeat=1) and (battle_special="WL10_reveal"){ obj_controller.audience=10; - obj_controller.menu=20; + scr_toggle_diplomacy(); obj_controller.diplomacy=10; obj_controller.known[eFACTION.Chaos]=2; with(obj_controller){scr_dialogue("intro2");} @@ -213,22 +213,9 @@ try { if (enemy=5) and (obj_controller.faction_status[eFACTION.Ecclesiarchy]!="War"){ - obj_controller.loyalty-=50;obj_controller.loyalty_hidden-=50; - obj_controller.disposition[2]-=50;obj_controller.disposition[3]-=80; - obj_controller.disposition[4]-=40;obj_controller.disposition[5]-=30; - - obj_controller.faction_status[eFACTION.Imperium]="War";obj_controller.faction_status[eFACTION.Mechanicus]="War"; - obj_controller.faction_status[eFACTION.Inquisition]="War";obj_controller.faction_status[eFACTION.Ecclesiarchy]="War"; - - if (!instance_exists(obj_turn_end)){ - obj_controller.audiences+=1;obj_controller.audien[obj_controller.audiences]=5;obj_controller.audien_topic[obj_controller.audiences]="declare_war"; - if (obj_controller.known[eFACTION.Inquisition]>1){obj_controller.audiences+=1;obj_controller.audien[obj_controller.audiences]=4;obj_controller.audien_topic[obj_controller.audiences]="declare_war";} - obj_controller.audiences+=1;obj_controller.audien[obj_controller.audiences]=2;obj_controller.audien_topic[obj_controller.audiences]="declare_war"; - }else{ - obj_turn_end.audiences+=1;obj_turn_end.audien[obj_turn_end.audiences]=5;obj_turn_end.audien_topic[obj_turn_end.audiences]="declare_war"; - if (obj_turn_end.known[eFACTION.Inquisition]>1){obj_turn_end.audiences+=1;obj_turn_end.audien[obj_turn_end.audiences]=4;obj_turn_end.audien_topic[obj_turn_end.audiences]="declare_war";} - obj_turn_end.audiences+=1;obj_turn_end.audien[obj_turn_end.audiences]=2;obj_turn_end.audien_topic[obj_turn_end.audiences]="declare_war"; - } + obj_controller.loyalty-=50; + obj_controller.loyalty_hidden-=50; + decare_war_on_imperium_audiences(); } @@ -510,7 +497,8 @@ try { if (enemy=1){ if (battle_special="cs_meeting_battle1") or (battle_special="cs_meeting_battle2"){ - obj_controller.diplomacy=10;obj_controller.menu=20; + obj_controller.diplomacy=10; + scr_toggle_diplomacy(); with(obj_controller){scr_dialogue("cs_meeting21");} } @@ -555,7 +543,7 @@ try { } // Master of Sanctity present, wishes to take in the player if (instance_exists(obj_ground_mission)) and (string_count("CRMOS|",obj_controller.useful_info)=0){ - obj_controller.menu=20; + scr_toggle_diplomacy(); with(obj_controller){ scr_dialogue("cs_meeting_m5"); } @@ -644,18 +632,18 @@ try { - if ((leader=1) or (battle_special="world_eaters")) and (obj_controller.faction_defeated[10]=0) and (defeat=0) and (battle_special!="WL10_reveal") and (battle_special!="WL10_later"){ + if ((leader=1) or (battle_special="ChaosWarband")) and (obj_controller.faction_defeated[10]=0) and (defeat=0) and (battle_special!="WL10_reveal") and (battle_special!="WL10_later"){ if (battle_special!="WL10_reveal") and (battle_special!="WL10_later"){ // prolly schedule a popup congratulating obj_controller.faction_defeated[enemy]=1; if (obj_controller.known[enemy]=0) then obj_controller.known[enemy]=1; - if (battle_special!="world_eaters") then with(obj_star){ + if (battle_special!="ChaosWarband") then with(obj_star){ if (string_count("WL"+string(obj_ncombat.enemy),p_feature[obj_ncombat.battle_id])>0){ p_feature[obj_ncombat.battle_id]=string_replace(p_feature[obj_ncombat.battle_id],"WL"+string(obj_ncombat.enemy)+"|",""); } } - if (battle_special="world_eaters"){ + if (battle_special="ChaosWarband"){ obj_controller.faction_defeated[10]=1;// show_message("WL10 defeated"); if (instance_exists(obj_turn_end)){ scr_event_log("","Enemy Leader Assassinated: Chaos Lord"); diff --git a/objects/obj_popup/Destroy_0.gml b/objects/obj_popup/Destroy_0.gml index 17621f119c..6df6c19e55 100644 --- a/objects/obj_popup/Destroy_0.gml +++ b/objects/obj_popup/Destroy_0.gml @@ -30,7 +30,7 @@ if (image="chaos_symbol") and (title="Concealed Heresy") and (instance_exists(ob if (instance_exists(obj_controller)){ if (obj_controller.current_eventing="chaos_meeting_1"){ - obj_controller.menu=20; + scr_toggle_diplomacy(); obj_controller.diplomacy=10; obj_controller.cooldown=5000; with(obj_controller){scr_dialogue("cs_meeting1");} diff --git a/objects/obj_popup/Draw_0.gml b/objects/obj_popup/Draw_0.gml index 5225f9aa40..03b5058c34 100644 --- a/objects/obj_popup/Draw_0.gml +++ b/objects/obj_popup/Draw_0.gml @@ -110,7 +110,7 @@ try { obj_controller.menu_artifact = obj_controller.artifacts; } - obj_controller.menu = 20; + scr_toggle_diplomacy(); obj_controller.diplomacy = giveto; obj_controller.force_goodbye = -1; var the = ""; diff --git a/objects/obj_popup/Mouse_50.gml b/objects/obj_popup/Mouse_50.gml index 876c23571e..d90eae607c 100644 --- a/objects/obj_popup/Mouse_50.gml +++ b/objects/obj_popup/Mouse_50.gml @@ -603,7 +603,7 @@ if (type=9.1) and (mouse_x>=xx+240+420) and (mouse_x 2) && (target_comp != 7) && (target_comp < 9)) { - obj_controller.menu = 20; + scr_toggle_diplomacy(); obj_controller.cooldown = 10; obj_controller.diplomacy = target_comp; obj_controller.trading_artifact = 1; @@ -1639,7 +1639,7 @@ try { // Set disposition // 135 - obj_controller.menu = 20; + scr_toggle_diplomacy(); obj_controller.cooldown = 10; obj_controller.diplomacy = target_comp; with (obj_controller) { diff --git a/objects/obj_popup_dialogue/CleanUp_0.gml b/objects/obj_popup_dialogue/CleanUp_0.gml new file mode 100644 index 0000000000..e254457844 --- /dev/null +++ b/objects/obj_popup_dialogue/CleanUp_0.gml @@ -0,0 +1 @@ +global.ui_click_lock = false; \ No newline at end of file diff --git a/objects/obj_popup_dialogue/Draw_0.gml b/objects/obj_popup_dialogue/Draw_0.gml deleted file mode 100644 index 0ce795a17c..0000000000 --- a/objects/obj_popup_dialogue/Draw_0.gml +++ /dev/null @@ -1,82 +0,0 @@ -xx = __view_get(e__VW.XView, 0) + x; -yy = __view_get(e__VW.YView, 0) + y; - -cancel_button={ - x1: xx + 26, - y1: yy + 103, - x2: xx + 126, - y2: yy + 123, -} - -accept_button={ - x1: xx + 175, - y1: yy + 103, - x2: xx + 275, - y2: yy + 123, -} - -draw_sprite(spr_popup_dialogue, 0, xx, yy); - -draw_set_font(fnt_40k_14b); -draw_set_color(c_gray); -draw_set_halign(fa_center); - -draw_text_ext(xx + 150, yy + 7, string_hash_to_newline(question), 18, 260); - -if (scr_hit(xx + 19, yy + 46, xx + 280, yy + 70)) { - if (instance_exists(obj_cursor)) obj_cursor.image_index = 2; -} else { - if (instance_exists(obj_cursor)) obj_cursor.image_index = 0; -} - -draw_set_font(fnt_40k_14); -draw_set_color(c_gray); -if (blink >= 1) { - draw_text(xx + 152, yy + 50, string_hash_to_newline(string(inputting) + "|")); -} else { - draw_text(xx + 150, yy + 50, string_hash_to_newline(string(inputting))); -} - -// Button 1 -draw_set_alpha(0.25); -draw_set_color(c_black); -draw_rectangle(xx + 26, yy + 103, xx + 126, yy + 123, 0); -draw_set_color(c_gray); -draw_set_alpha(0.5); -draw_rectangle(xx + 26, yy + 103, xx + 126, yy + 123, 1); -draw_set_alpha(0.25); -draw_rectangle(xx + 27, yy + 104, xx + 125, yy + 122, 1); -draw_set_alpha(1); -draw_text(xx + 76, yy + 105, string_hash_to_newline("Cancel")); -if (scr_hit(cancel_button.x1, cancel_button.y1, cancel_button.x2, cancel_button.y2)) { - draw_set_alpha(0.1); - draw_set_color(c_white); - draw_rectangle(xx + 26, yy + 103, xx + 126, yy + 123, 0); - if (instance_exists(obj_cursor)) obj_cursor.image_index = 1; - if (mouse_check_button_pressed(mb_left) && obj_controller.cooldown <= 0) { - instance_destroy(); - } -} - -// Button 2 -draw_set_alpha(0.25); -draw_set_color(c_black); -draw_rectangle(xx + 175, yy + 103, xx + 275, yy + 123, 0); -draw_set_color(c_gray); -draw_set_alpha(0.5); -draw_rectangle(xx + 175, yy + 103, xx + 275, yy + 123, 1); -draw_set_alpha(0.25); -draw_rectangle(xx + 176, yy + 104, xx + 274, yy + 122, 1); -draw_set_alpha(1); -draw_text(xx + 225, yy + 105, string_hash_to_newline("Accept")); -if (scr_hit(accept_button.x1, accept_button.y1, accept_button.x2, accept_button.y2)) { - draw_set_alpha(0.1); - draw_set_color(c_white); - draw_rectangle(xx + 175, yy + 103, xx + 275, yy + 123, 0); - if (instance_exists(obj_cursor)) obj_cursor.image_index = 1; - if (mouse_check_button_pressed(mb_left) && obj_controller.cooldown <= 0) { - execute = true; - } -} - -draw_set_alpha(1); \ No newline at end of file diff --git a/objects/obj_popup_dialogue/Draw_64.gml b/objects/obj_popup_dialogue/Draw_64.gml new file mode 100644 index 0000000000..fdd1ea73e7 --- /dev/null +++ b/objects/obj_popup_dialogue/Draw_64.gml @@ -0,0 +1,87 @@ +global.ui_click_lock = true; +cancel_button={ + x1: x + 26, + y1: y + 103, + x2: x + 126, + y2: y + 123, +} + +accept_button={ + x1: x + 175, + y1: y + 103, + x2: x + 275, + y2: y + 123, +} + +draw_sprite(spr_popup_dialogue, 0, x, y); + +draw_set_font(fnt_40k_14b); +draw_set_color(c_gray); +draw_set_halign(fa_center); + +draw_text_ext(x + 150, y + 7, question, 18, 260); + +if (scr_hit(x + 19, y + 46, x + 280, y + 70)) { + if (instance_exists(obj_cursor)) obj_cursor.image_index = 2; +} else { + if (instance_exists(obj_cursor)) obj_cursor.image_index = 0; +} + +draw_set_font(fnt_40k_14); +draw_set_color(c_gray); + +draw_text(x + 150 + (blink?2:0), y + 50, $"{inputting}{blink?"|":""}"); + +// Button 1s +draw_set_alpha(0.25); +draw_set_color(c_black); +draw_rectangle(x + 26, y + 103, x + 126, y + 123, 0); +draw_set_color(c_gray); +draw_set_alpha(0.5); +draw_rectangle(x + 26, y + 103, x + 126, y + 123, 1); +draw_set_alpha(0.25); +draw_rectangle(x + 27, y + 104, x + 125, y + 122, 1); +draw_set_alpha(1); +draw_text(x + 76, y + 105, "Cancel"); +if (scr_hit(cancel_button.x1, cancel_button.y1, cancel_button.x2, cancel_button.y2)) { + draw_set_alpha(0.1); + draw_set_color(c_white); + draw_rectangle(x + 26, y + 103, x + 126, y + 123, 0); + if (instance_exists(obj_cursor)){ + obj_cursor.image_index = 1; + } + if (mouse_check_button_pressed(mb_left) && obj_controller.cooldown <= 0) { + global.ui_click_lock = false; + instance_destroy(); + } +} + +// Button 2 +draw_set_alpha(0.25); +draw_set_color(c_black); +draw_rectangle(x + 175, y + 103, x + 275, y + 123, 0); +draw_set_color(c_gray); +draw_set_alpha(0.5); +draw_rectangle(x + 175, y + 103, x + 275, y + 123, 1); +draw_set_alpha(0.25); +draw_rectangle(x + 176, y + 104, x + 274, y + 122, 1); +draw_set_alpha(1); +draw_text(x + 225, y + 105, "Accept"); +if (scr_hit(accept_button.x1, accept_button.y1, accept_button.x2, accept_button.y2)) { + draw_set_alpha(0.1); + draw_set_color(c_white); + draw_rectangle(x + 175, y + 103, x + 275, y + 123, 0); + if (instance_exists(obj_cursor)) obj_cursor.image_index = 1; + if (mouse_check_button_pressed(mb_left) && obj_controller.cooldown <= 0) { + if (is_struct(target)){ + if (inputting != 0){ + target.number = inputting; + } + global.ui_click_lock = false; + instance_destroy(); + } + execute = true; + } +} + +draw_set_alpha(1); \ No newline at end of file diff --git a/objects/obj_popup_dialogue/Step_0.gml b/objects/obj_popup_dialogue/Step_0.gml index 7bd04e8c97..21707a638c 100644 --- a/objects/obj_popup_dialogue/Step_0.gml +++ b/objects/obj_popup_dialogue/Step_0.gml @@ -50,72 +50,7 @@ if (input_type = 2) { } if (execute = true) { - if (inputting != 0) { // All checks out captain - if (target = "t1") { - obj_controller.trade_tnum[1] = inputting; - obj_controller.trade_take[1] = target2; - with(obj_controller) { - scr_trade(false); - } - } - if (target = "t2") { - obj_controller.trade_tnum[2] = inputting; - obj_controller.trade_take[2] = target2; - with(obj_controller) { - scr_trade(false); - } - } - if (target = "t3") { - obj_controller.trade_tnum[3] = inputting; - obj_controller.trade_take[3] = target2; - with(obj_controller) { - scr_trade(false); - } - } - if (target = "t4") { - obj_controller.trade_tnum[4] = inputting; - obj_controller.trade_take[4] = target2; - with(obj_controller) { - scr_trade(false); - } - } - - if (target = "m1") { - obj_controller.trade_mnum[1] = inputting; - obj_controller.trade_give[1] = target2; - with(obj_controller) { - scr_trade(false); - } - } - if (target = "m2") { - obj_controller.trade_mnum[2] = inputting; - obj_controller.trade_give[2] = target2; - with(obj_controller) { - scr_trade(false); - } - } - if (target = "m3") { - obj_controller.trade_mnum[3] = inputting; - obj_controller.trade_give[3] = target2; - with(obj_controller) { - scr_trade(false); - } - } - if (target = "m4") { - obj_controller.trade_mnum[4] = inputting; - obj_controller.trade_give[4] = target2; - with(obj_controller) { - scr_trade(false); - } - } - - if (string_count("m", target) > 0) { - if (target2 = "Requisition") then obj_controller.trade_req -= inputting; - if (target2 = "Gene-Seed") then obj_controller.trade_gene -= inputting; - if (target2 = "STC Fragment") then obj_controller.trade_chip -= inputting; - if (target2 = "Info Chip") then obj_controller.trade_info -= inputting; - } - } - instance_destroy(); + } -} \ No newline at end of file +} + diff --git a/objects/obj_popup_dialogue/obj_popup_dialogue.yy b/objects/obj_popup_dialogue/obj_popup_dialogue.yy index 9ea10959a7..c81f66dedc 100644 --- a/objects/obj_popup_dialogue/obj_popup_dialogue.yy +++ b/objects/obj_popup_dialogue/obj_popup_dialogue.yy @@ -7,10 +7,11 @@ {"$GMEvent":"v1","%Name":"","collisionObjectId":null,"eventNum":0,"eventType":3,"isDnD":false,"name":"","resourceType":"GMEvent","resourceVersion":"2.0",}, {"$GMEvent":"v1","%Name":"","collisionObjectId":null,"eventNum":56,"eventType":6,"isDnD":false,"name":"","resourceType":"GMEvent","resourceVersion":"2.0",}, {"$GMEvent":"v1","%Name":"","collisionObjectId":null,"eventNum":53,"eventType":6,"isDnD":false,"name":"","resourceType":"GMEvent","resourceVersion":"2.0",}, - {"$GMEvent":"v1","%Name":"","collisionObjectId":null,"eventNum":0,"eventType":8,"isDnD":false,"name":"","resourceType":"GMEvent","resourceVersion":"2.0",}, {"$GMEvent":"v1","%Name":"","collisionObjectId":null,"eventNum":27,"eventType":9,"isDnD":false,"name":"","resourceType":"GMEvent","resourceVersion":"2.0",}, {"$GMEvent":"v1","%Name":"","collisionObjectId":null,"eventNum":13,"eventType":9,"isDnD":false,"name":"","resourceType":"GMEvent","resourceVersion":"2.0",}, {"$GMEvent":"v1","%Name":"","collisionObjectId":null,"eventNum":1,"eventType":9,"isDnD":false,"name":"","resourceType":"GMEvent","resourceVersion":"2.0",}, + {"$GMEvent":"v1","%Name":"","collisionObjectId":null,"eventNum":64,"eventType":8,"isDnD":false,"name":"","resourceType":"GMEvent","resourceVersion":"2.0",}, + {"$GMEvent":"v1","%Name":"","collisionObjectId":null,"eventNum":0,"eventType":12,"isDnD":false,"name":"","resourceType":"GMEvent","resourceVersion":"2.0",}, ], "managed":true, "name":"obj_popup_dialogue", diff --git a/objects/obj_star/Mouse_50.gml b/objects/obj_star/Mouse_50.gml index 76cc360422..998c37ff51 100644 --- a/objects/obj_star/Mouse_50.gml +++ b/objects/obj_star/Mouse_50.gml @@ -1,21 +1,27 @@ // Checks which systems you can see the planets -if (!instance_exists(obj_saveload) && !instance_exists(obj_drop_select) && !instance_exists(obj_bomb_select) && !global.ui_click_lock) { - var m_dist=point_distance(x,y,mouse_x,mouse_y); - var allow_click_distance = 20*scale; +if (obj_controller.menu != MENU.Default){ + exit; +} +if (instances_exist([obj_drop_select,obj_saveload,obj_bomb_select])){ + exit; +} +if (!global.ui_click_lock) { + var m_dist=point_distance(x,y,mouse_x,mouse_y); + var allow_click_distance = 20*scale; - if (obj_controller.location_viewer.is_entered) then exit; - // if ((obj_controller.zoomed==0) and (mouse_y <__view_get( e__VW.YView, 0 )+62)) or (obj_controller.menu!=0) then exit; - // if ((obj_controller.zoomed==0) and (mouse_y>__view_get( e__VW.YView, 0 )+830)) or (obj_controller.menu!=0) then exit; - if (p_type[1]=="Craftworld") and (obj_controller.known[eFACTION.Eldar]==0) then exit; - if (vision==0) then exit; - if (!scr_void_click()) then exit; + if (obj_controller.location_viewer.is_entered) then exit; + // if ((obj_controller.zoomed==0) and (mouse_y <__view_get( e__VW.YView, 0 )+62)) or (obj_controller.menu!=0) then exit; + // if ((obj_controller.zoomed==0) and (mouse_y>__view_get( e__VW.YView, 0 )+830)) or (obj_controller.menu!=0) then exit; + if (p_type[1]=="Craftworld") and (obj_controller.known[eFACTION.Eldar]==0) then exit; + if (vision==0) then exit; + if (!scr_void_click()) then exit; - if ((obj_controller.zoomed==0) and (m_dist0) and (imperial_fleet+mechanicus_fleet+inquisitor_fleet+eldar_ en_capitals+=capital_number; en_frigates+=frigate_number; en_escorts+=escort_number; - if (string_count("BLOOD",trade_goods)>0) then khorne_count++; - if (string_lower(trade_goods)="csm") then chaos_space_marine_count++; + if (fleet_has_cargo("warband")) then khorne_count++; + if (fleet_has_cargo("csm")){ + chaos_space_marine_count++; + } } } diff --git a/objects/obj_turn_end/Alarm_1.gml b/objects/obj_turn_end/Alarm_1.gml index cba193f995..9952ce410c 100644 --- a/objects/obj_turn_end/Alarm_1.gml +++ b/objects/obj_turn_end/Alarm_1.gml @@ -1,28 +1,48 @@ -if (current_audience<=audiences) then current_audience+=1; +var _is_audience = false; +if (array_length(audience_stack) > 0){ + var current_audience = audience_stack[0]; + _is_audience = true; +} + + +if (_is_audience){ + with(obj_controller){ + if (zoomed=1){ + scr_zoom(); + } + } -if (audien[current_audience]!=0){ - with(obj_controller){if (zoomed=1) then scr_zoom();} + show_debug_message(current_audience); - obj_controller.audience=self.audien[self.current_audience]; - obj_controller.menu=20; - obj_controller.diplomacy=obj_controller.audience; + if (obj_controller.menu != MENU.Diplomacy){ + scr_toggle_diplomacy(); + } + obj_controller.audience=current_audience.faction; + obj_controller.diplomacy=current_audience.faction; - if (obj_controller.diplomacy=10) and (obj_controller.faction_gender[10]=2) then scr_music("blood",60); + if (obj_controller.diplomacy=10) and (obj_controller.faction_gender[10]=2){ + scr_music("blood",60); + } - if (string_count("intro",audien_topic[current_audience])>0){ + if (string_count("intro",current_audience.topic)>0){ obj_controller.known[obj_controller.diplomacy]=2; obj_controller.faction_justmet=1; - if (obj_controller.diplomacy=6) then with(obj_controller){scr_dialogue("intro1");} - if (obj_controller.diplomacy!=6) then with(obj_controller){scr_dialogue("intro");} - } - - if (audien_topic[current_audience]!="intro"){ - with(obj_controller){scr_dialogue(obj_turn_end.audien_topic[obj_turn_end.current_audience]);} - - // "mission1" + if (obj_controller.diplomacy=6){ + + scr_dialogue("intro1"); + + } + if (obj_controller.diplomacy!=6){ + show_debug_message("new_intro"); + scr_dialogue("intro"); + + } + }else { + scr_dialogue(current_audience.topic); } + array_delete(audience_stack, 0, 1); exit; } @@ -37,7 +57,7 @@ if (audien[current_audience]!=0){ // if (current_audience<=audiences) then alarm[1]=5; -if (audien[1]=0) or (current_audience>audiences){ +if (!_is_audience){ current_popup+=1; @@ -101,6 +121,7 @@ if (audien[1]=0) or (current_audience>audiences){ // if (current_popup>popups) or (popup[1]=0) then popups_end=1; if (popups_end=1){ + show_debug_message("end turn final sequence"); /*if (popups=0){ diff --git a/objects/obj_turn_end/Alarm_2.gml b/objects/obj_turn_end/Alarm_2.gml index 53638fb70f..4fb43bdb8b 100644 --- a/objects/obj_turn_end/Alarm_2.gml +++ b/objects/obj_turn_end/Alarm_2.gml @@ -24,5 +24,7 @@ if (fast>=alerts){ alarm[3]=min(alarm[3],360); } -if (alerts=0) then instance_destroy(); +if (alerts=0){ + instance_destroy(); +} diff --git a/objects/obj_turn_end/Create_0.gml b/objects/obj_turn_end/Create_0.gml index d635fe5838..4c47903192 100644 --- a/objects/obj_turn_end/Create_0.gml +++ b/objects/obj_turn_end/Create_0.gml @@ -15,7 +15,6 @@ fadeout=0; popups_end=0; current_battle=1; -current_audience=0; current_popup=0; fast=0;// This is increased, once the alert[i]=1 and >=fast then it begins to fade in and get letters @@ -59,54 +58,53 @@ repeat(91){ battle_special[i]=""; - if (i<16) then strin[i]=""; - if (i<16){ - audien[i]=0; - audien_topic[i]=""; - } - - - - + if (i<16) then strin[i]=""; } audiences = 0; audience = 0; -audien[0]=0;audien[1]=0;audien[2]=0;audien[3]=0;audien[4]=0;audien[5]=0; -audien[6]=0;audien[7]=0;audien[8]=0;audien[9]=0;audien[10]=0;audien[11]=0; -audien_topic[0]="";audien_topic[1]="";audien_topic[2]="";audien_topic[3]="";audien_topic[4]="";audien_topic[5]=""; -audien_topic[6]="";audien_topic[7]="";audien_topic[8]="";audien_topic[9]="";audien_topic[10]="";audien_topic[11]=""; - - - - +audience_stack = []; alert_alpha[1]=0.2; alert_char[1]=1; - -var i;i=0; -repeat(11){i+=1; - if (obj_controller.audien[i]!=0){audiences+=1;audien[audiences]=obj_controller.audien[i];audien_topic[audiences]=obj_controller.audien_topic[i];} -}i=0;// LOLOLOLOLOL - - -repeat(99){i+=1; +i=-1 +for (var i=0;i0) and (dispo[o]<90) then dispo[o]=max(dispo[o]-2,0);}} - obj_controller.disposition[2]-=7;obj_controller.disposition[4]-=10;obj_controller.disposition[5]-=4; - if (obj_controller.disposition[4]<=0) or (obj_controller.disposition[2]<=0) then obj_controller.alarm[8]=1; + with(obj_star){ + var o=0; + repeat(4){ + o+=1; + if (dispo[o]>0) and (dispo[o]<90){ + dispo[o]=max(dispo[o]-2,0); + } + } + } + obj_controller.disposition[2]-=7; + obj_controller.disposition[4]-=10; + obj_controller.disposition[5]-=4; + if (obj_controller.disposition[4]<=0) or (obj_controller.disposition[2]<=0){ + obj_controller.alarm[8]=1; + } if (obj_controller.disposition[4]>0) and (obj_controller.disposition[2]>0){ - var top;top=string_replace(obj_controller.event[i],"governor_assassination_1","assassination_angryish"); + var top=string_replace(obj_controller.event[i],"governor_assassination_1","assassination_angryish"); scr_audience(4,top,0,"",0,0); } } if (string_count("governor_assassination_2",obj_controller.event[i])>0) and (obj_controller.faction_status[eFACTION.Inquisition]!="War"){ - with(obj_star){var o;o=0;repeat(4){o+=1;if (dispo[o]>0) and (dispo[o]<90) then dispo[o]=max(dispo[o]-4,0);}} + with(obj_star){ + var o=0; + repeat(4){ + o+=1; + if (dispo[o]>0) and (dispo[o]<90){ + dispo[o]=max(dispo[o]-4,0); + } + } + } obj_controller.disposition[2]-=15;obj_controller.disposition[4]-=30;obj_controller.disposition[5]-=10; if (obj_controller.disposition[4]<=0) or (obj_controller.disposition[2]<=0) then obj_controller.alarm[8]=1; if (obj_controller.disposition[4]>0) and (obj_controller.disposition[2]>0){ - var top;top=string_replace(obj_controller.event[i],"governor_assassination_2","assassination_angry"); + var top=string_replace(obj_controller.event[i],"governor_assassination_2","assassination_angry"); scr_audience(4,top,0,"",0,0); } } @@ -119,51 +117,23 @@ repeat(99){i+=1; if (audiences>0){// This is a one-off change all messages to declare war - var i;i=0; - var war;repeat(11){i+=1;war[i]=0;} - - i=0; - repeat(10){i+=1; - if (audien_topic[i]!="declare_war") and (audien_topic[i]!="gene_xeno") and (audien_topic[i]!="") and (war[audien[i]]=1) and (audien[i]!=10){ - audien[i]=obj_controller.audien[i+1]; - audien_topic[i]=obj_controller.audien_topic[i+1]; - audien[i+1]=0; - audien_topic[i+1]=""; - audiences-=1; - } - - // show_message(string(audien_topic[i])+"|"+string(war[audien[i]])+"|"+string(obj_controller.faction_status[self.audien[i]])); - - if (audien_topic[i]!="declare_war") and (audien_topic[i]!="gene_xeno") and (audien_topic[i]!="") and (war[audien[i]]=0) and (obj_controller.faction_status[self.audien[i]]!="War") and (audien[i]!=10){ - if (obj_controller.disposition[self.audien[i]]<=0) and (audien[i]<6){ - /*obj_controller.audien[i]=obj_controller.audien[i+1]; - obj_controller.audien_topic[i]=obj_controller.audien_topic[i+1]; - obj_controller.audien[i+1]=0; - obj_controller.audien_topic[i+1]=""; - audiences-=1;*/ - audien_topic[i]="declare_war"; - war[audien[i]]=1; - } - } - - /*if (obj_controller.audien_topic[i]!="declare_war") and (obj_controller.disposition[obj_controller.audien[i]]<=0) and (war[i]=0) and (obj_controller.faction_status[obj_controller.audien[i]]!="War"){ - war[i]=1;obj_controller.audien_topic[i]="declare_war"; - }*/ + var i=0; + var war; + repeat(15){ + i+=1; + war[i]=0; } -} -var i;i=0; -if (audiences>0){ - repeat(10){i+=1; - if (audien_topic[i]="") and (audien_topic[i+1]!=""){ - audien_topic[i]=audien_topic[i+1]; - } + for (var i=0;i0){ + draw_text_transformed(text_draw, yy+(24*scale), text, 3*scale, 3*scale, 0); + } else { + draw_text_transformed(text_draw, yy+(20*scale), text, 3*scale, 3*scale, 0); + } + } + background.style = "plain"; + style = "plain"; /*draw_with_dimensions = function(xx,yy, ,width, entered){ draw_shutter(); }*/ + inside_method = function(){ + var yy = YY; + var xx = XX; + var text_draw = xx+(width/2)-(string_width(text)*(3*scale)/2); + if (point_and_click([XX, YY, XX+width, YY+height]) || click_timer>0 ){ + shutter_backdrop = 7; + click_timer++; + } else { + shutter_backdrop = 6; + } + draw_sprite_ext(spr_shutter_button, shutter_backdrop, XX, YY, scale, scale, 0, c_white, 1); + draw_set_halign(fa_left); + draw_set_color(c_red); + if (click_timer>0){ + draw_text_transformed(text_draw, yy+(24*scale), text, 3*scale, 3*scale, 0); + } else { + draw_text_transformed(text_draw, yy+(20*scale), text, 3*scale, 3*scale, 0); + } + } - draw_shutter = function(xx,yy,text, scale=1, entered = ""){ - XX=xx; - YY=yy; + draw_shutter = function(xx=-1,yy=-1,text, scale=1, entered = ""){ + if (xx != -1){ + XX=xx; + } + if (yy != -1){ + YY=yy; + } draw_set_alpha(1); self.scale = scale; self.text = text; @@ -346,7 +393,10 @@ function ShutterButton() constructor{ entered=entered; } - var shutter_backdrop = 5; + if (tooltip!= "" && scr_hit(xx, yy, xx+width, yy+height)){ + tooltip_draw(tooltip); + } + var shutter_backdrop = 6; if (entered || click_timer>0){ if (time_open<24){ time_open++; @@ -356,10 +406,6 @@ function ShutterButton() constructor{ right_rack.draw(xx+width, yy, true); left_rack.draw(xx, yy, true); } - if (point_and_click([xx, yy, xx+width, yy+height]) || click_timer>0 ){ - shutter_backdrop = 6; - click_timer++; - } } else if (time_open>0){ time_open--; right_rack.draw(xx+width, yy, false, true); @@ -371,29 +417,27 @@ function ShutterButton() constructor{ var main_sprite = 0; if (time_open<2){ - draw_sprite_ext(spr_shutter_button, main_sprite, xx, yy, scale, scale, 0, c_white, 1) + draw_sprite_ext(spr_shutter_button, main_sprite, xx, yy, scale, scale, 0, c_white, 1); + if (cover_text != ""){ + draw_set_font(fnt_Embossed_metal); + var _cover_scale = 3*scale; + while (string_width(cover_text) * _cover_scale > width-(5*scale)){ + _cover_scale -= 0.1; + } + var text_draw = xx+(width/2)-((string_width(cover_text)*(_cover_scale))/2); + draw_set_color(c_black); + draw_text_transformed(text_draw, yy+(_cover_scale*1), cover_text, _cover_scale, _cover_scale, 0); + } } else if (time_open>=2){ main_sprite=floor(time_open/6) + 1; - //draw_sprite_ext(spr_shutter_button, shutter_backdrop, xx, yy, scale, scale, 0, c_white, 1) - background.inside_method = function(){ - var yy = YY; - var xx = XX; - var text_draw = xx+(width/2)-(string_width(text)*(3*scale)/2); - if (scr_hit(xx, yy, xx+width, yy+height)){ - draw_rectangle_color_simple(xx, yy, xx+width, yy+height, false, CM_GREEN_COLOR, 0.35) - } - draw_set_halign(fa_left); - draw_set_color(c_red); - if (click_timer>0){ - draw_text_transformed(text_draw, yy+(24*scale), text, 3*scale, 3*scale, 0); - } else { - draw_text_transformed(text_draw, yy+(20*scale), text, 3*scale, 3*scale, 0); - } + if (style == "plain"){ + inside_method(); + } else if (style == "slate"){ + background.draw_with_dimensions(xx, yy, width, height); } - background.draw_with_dimensions(xx, yy, width, height); - draw_sprite_ext(spr_shutter_button, main_sprite, xx, yy, scale, scale, 0, c_white, 1); + draw_sprite_ext(spr_shutter_button, main_sprite, xx, yy, scale, scale, 0, c_white, 1); } draw_set_color(c_grey); if (click_timer>7){ diff --git a/scripts/scr_audience/scr_audience.gml b/scripts/scr_audience/scr_audience.gml index 0e4ad48824..149dcc5ed8 100644 --- a/scripts/scr_audience/scr_audience.gml +++ b/scripts/scr_audience/scr_audience.gml @@ -1,21 +1,27 @@ -function scr_audience(argument0, argument1, argument2, argument3, argument4, argument5) { +function scr_audience(faction_enum, topic, new_disposition = 0, new_status = "", turns_ignored = 0, new_known_value = 0) { - // argument0: faction - // argument1: topic - // argument2: new disposition - // argument3: new status - // argument4: turns ignored - // argument5: new known + var _audience_instance = instance_exists(obj_turn_end) ? obj_turn_end : obj_controller; - var witch;witch=obj_controller; - if (instance_exists(obj_turn_end)) then witch=obj_turn_end; - - witch.audiences+=1;witch.audien[witch.audiences]=argument0; - witch.audien_topic[witch.audiences]=argument1; - if (argument2!=0) then obj_controller.disposition[argument0]+=argument2; - if (argument3!="") then obj_controller.faction_status[argument0]=argument3; - if (argument4!=0) then obj_controller.turns_ignored[argument0]+=argument4; - if (argument5!=0) then obj_controller.known[argument0]+=argument5; + with (_audience_instance){ + audiences+=1; + array_push(audience_stack,{faction : faction_enum,topic : topic}); + } + obj_controller.disposition[faction_enum]+=new_disposition; + if (new_status!="") then obj_controller.faction_status[faction_enum]=new_status; + if (turns_ignored!=0) then obj_controller.turns_ignored[faction_enum]+=turns_ignored; + if (new_known_value!=0) then obj_controller.known[faction_enum]+=new_known_value; } + + +function decare_war_on_imperium_audiences(){ + var _topic = gene_xeno>99995 ? "gene_xeno" : "declare_war"; + scr_audience(eFACTION.Inquisition, _topic, -50, "War", 9999, 4); + + scr_audience(eFACTION.Imperium, "declare_war", -40, "War", 9999, 2); + + scr_audience(eFACTION.Mechanicus, "declare_war", -30, "War", 9999, 2); + + scr_audience(eFACTION.Ecclesiarchy, "declare_war", -40, "War", 9999, 2); +} \ No newline at end of file diff --git a/scripts/scr_bomb_world/scr_bomb_world.gml b/scripts/scr_bomb_world/scr_bomb_world.gml index ea63482868..70662fab14 100644 --- a/scripts/scr_bomb_world/scr_bomb_world.gml +++ b/scripts/scr_bomb_world/scr_bomb_world.gml @@ -274,25 +274,24 @@ function scr_bomb_world(bombard_target_faction, bombard_ment_power, target_stren if (pop_after==0 && pop_before>0){ if (current_owner=2) and (obj_controller.faction_status[eFACTION.Imperium]!="War"){ if (planet_type="Temperate" || planet_type="Hive" || planet_type="Desert"){ - obj_controller.audiences+=1; - obj_controller.audien[obj_controller.audiences]=2; - obj_controller.audien_topic[obj_controller.audiences]="bombard_angry"; - } - if (planet_type="Temperate"){ - obj_controller.disposition[2]-=5; - }else if (planet_type="Desert"){ - obj_controller.disposition[2]-=3; - }else if (planet_type="Hive"){ - obj_controller.disposition[2]-=10; + var _disp_neg = 0; + if (planet_type="Temperate"){ + _disp_neg-=5; + }else if (planet_type="Desert"){ + _disp_neg-=3; + }else if (planet_type="Hive"){ + _disp_neg-=10; + } + scr_audience(eFACTION.Imperium, "bombard_angry", _disp_neg,); } }else if (current_owner=3) and (obj_controller.faction_status[eFACTION.Mechanicus]!="War"){ - obj_controller.audiences+=1;obj_controller.audien[obj_controller.audiences]=3; - obj_controller.audien_topic[obj_controller.audiences]="bombard_angry"; + var _disp_neg = 0; if (planet_type="Forge"){ - obj_controller.disposition[3]-=15; + _disp_neg-=15; }else if (planet_type="Ice"){ - obj_controller.disposition[3]-=7; + _disp_neg-=7; } + scr_audience(eFACTION.Mechanicus, "bombard_angry", _disp_neg,); } if (planet_feature_bool(system.p_feature[planet], P_features.Gene_Stealer_Cult)) { delete_features(system.p_feature[planet], P_features.Gene_Stealer_Cult); @@ -303,10 +302,7 @@ function scr_bomb_world(bombard_target_faction, bombard_ment_power, target_stren } } if (bombard_target_faction=8) and (obj_controller.faction_status[eFACTION.Tau]!="War"){ - obj_controller.audiences+=1; - obj_controller.audien[obj_controller.audiences]=8; - obj_controller.audien_topic[obj_controller.audiences]=choose("declare_war","bombard_angry"); - obj_controller.disposition[8]-=15; + scr_audience(eFACTION.Tau, choose("declare_war","bombard_angry"), -15,); } diff --git a/scripts/scr_buttons/scr_buttons.gml b/scripts/scr_buttons/scr_buttons.gml index 40fe67c43d..b9762c2e5b 100644 --- a/scripts/scr_buttons/scr_buttons.gml +++ b/scripts/scr_buttons/scr_buttons.gml @@ -64,8 +64,10 @@ function UnitButtonObject(data = false) constructor{ keystroke = false; tooltip = ""; bind_method = ""; + bind_scope = false; style = "standard"; font=fnt_40k_14b + set_height_width = false; static update_loc = function(){ @@ -81,7 +83,9 @@ function UnitButtonObject(data = false) constructor{ for (i=0;i= 500) && (menu <= 510)) { if (mouse_y >= __view_get(e__VW.YView, 0) + 27) { cooldown = 8000; @@ -45,15 +41,13 @@ function scr_menu_clear_up(specific_area_function) { } } - if (menu >= 500) { + /*if (menu >= 500 && array_length(obj_turn_end.audience_stack) == 0) { exit; - } + }*/ - var zoomeh = 0, - diyst = 999; + diyst = 999; xx = __view_get(e__VW.XView, 0); yy = __view_get(e__VW.YView, 0); - zoomeh = zoomed; if (menu == 0) { hide_banner = 0; @@ -70,14 +64,22 @@ function scr_menu_clear_up(specific_area_function) { return false; } -function scr_change_menu(specific_area_function) { +function scr_change_menu(wanted_menu, specific_area_function=false) { var continue_sequence = false; + if (obj_controller.menu_lock){ + return false; + } + if (wanted_menu == obj_controller.menu){ + main_map_defualts(); + return true; + } with(obj_controller) { + main_map_defualts(); set_zoom_to_default(); continue_sequence = scr_menu_clear_up(function() { - if ((zoomed == 0) && (diplomacy == 0)) { + //if ((zoomed == 0) && (diplomacy == 0)) { return true; - } + //} }); if (continue_sequence) { with(obj_fleet_select) { @@ -89,47 +91,54 @@ function scr_change_menu(specific_area_function) { } } close_popups = true; - specific_area_function(); + if (is_callable(specific_area_function)){ + specific_area_function(); + } } } } +function main_map_defualts(){ + with (obj_controller){ + menu = 0; + hide_banner = 0; + location_viewer.update_garrison_log(); + managing = 0; + managing = 0; + menu_adept = 0; + view_squad = false; + unit_profile = false; + force_goodbye = 0; + hide_banner = 0; + diplomacy = 0; + audience = 0; + zoomed = 0; + } +} + function scr_in_game_help() { - scr_change_menu(function() { + scr_change_menu(MENU.GameHelp,function() { with(obj_controller) { if ((zoomed == 0) && (!instance_exists(obj_ingame_menu)) && (!instance_exists(obj_popup))) { set_zoom_to_default(); - if (menu != 17.5) { - menu = 17.5; + if (menu != 30) { + menu = 30; cooldown = 8000; click = 1; hide_banner = 0; instance_activate_object(obj_event_log); obj_event_log.top = 1; obj_event_log.help = 1; - } else { - menu = 0; - click = 1; - hide_banner = 0; - } - managing = 0; - view_squad = false; - unit_profile = false; + } } } }); } function scr_in_game_menu() { - scr_change_menu(function() { + scr_change_menu(-1,function() { if ((!instance_exists(obj_ingame_menu)) && (!instance_exists(obj_popup)) && (!obj_controller.zoomed)) { - // Main Menu - with(obj_controller) { - menu = 0; - hide_banner = 0; - location_viewer.update_garrison_log(); - managing = 0; - } + // Main MENU set_zoom_to_default(); instance_create(0, 0, obj_ingame_menu); } @@ -137,13 +146,10 @@ function scr_in_game_menu() { } function basic_manage_settings() { - menu = 1; + menu = MENU.Manage; popup = 0; selected = 0; - hide_banner = 1; diplomacy = 0; - zoomed = 0; - view_squad = false; management_buttons = { squad_toggle: new UnitButtonObject({ style: "pixel", @@ -164,48 +170,36 @@ function basic_manage_settings() { } function scr_toggle_manage() { - scr_change_menu(function() { + scr_change_menu(MENU.Manage,function() { with(obj_controller) { - if (menu != 1) { + if (menu != MENU.Manage) { basic_manage_settings(); scr_management(1); - } else if (menu == 1) { - menu = 0; - hide_banner = 0; - location_viewer.update_garrison_log(); } - managing = 0; } }); } function scr_toggle_setting() { - scr_change_menu(function() { + scr_change_menu(MENU.Settings,function() { with(obj_controller) { - if (menu != 21) { - menu = 21; + if (menu != MENU.Settings) { + menu = MENU.Settings; popup = 0; selected = 0; hide_banner = 1; - } else if (menu == 21) { - if (!settings) { - menu = 0; - cooldown = 8000; - click = 1; - hide_banner = 0; - } else if (settings) { - menu = 21; - cooldown = 8000; - click = 1; - settings = 0; - } + } else if (settings) { + menu = MENU.Settings; + cooldown = 8000; + click = 1; + settings = 0; } } }); } function scr_toggle_apothecarion() { - scr_change_menu(function() { + scr_change_menu(MENU.Apothecarion,function() { with(obj_controller) { menu_adept = 0; hide_banner = 1; @@ -216,24 +210,21 @@ function scr_toggle_apothecarion() { menu = 11; temp[36] = scr_role_count(obj_ini.role[100][15], ""); - } else if (menu == 11) { - menu = 0; } - managing = 0; } }); } function scr_toggle_reclu() { - scr_change_menu(function() { + scr_change_menu(MENU.Reclusiam,function() { with(obj_controller) { menu_adept = 0; hide_banner = 1; if (scr_role_count("Master of Sanctity", "0") == 0) { menu_adept = 1; } - if (menu != 12) { - menu = 12; + if (menu != MENU.Reclusiam) { + menu = MENU.Reclusiam; temp[36] = string(scr_role_count(obj_ini.role[100][14], "field")); temp[37] = string(scr_role_count(obj_ini.role[100][14], "home")); @@ -251,26 +242,21 @@ function scr_toggle_reclu() { } } } - } else if (menu == 12) { - menu = 0; - - location_viewer.update_garrison_log(); - } - managing = 0; + } } }); } function scr_toggle_lib() { - scr_change_menu(function() { + scr_change_menu(MENU.Librarium,function() { with(obj_controller) { menu_adept = 0; hide_banner = 1; if (scr_role_count("Chief " + string(obj_ini.role[100][17]), "0") == 0) { menu_adept = 1; } - if (menu != 13) { - menu = 13; + if (menu != MENU.Librarium) { + menu = MENU.Librarium; if ((artifacts > 0) && (menu_artifact == 0)) { menu_artifact = 1; @@ -283,36 +269,27 @@ function scr_toggle_lib() { artifact_destroy = new ShutterButton(); artifact_namer = new TextBarArea(xx + 622, yy + 460, 350); set_chapter_arti_data(); - } else if (menu == 13) { - menu = 0; - - location_viewer.update_garrison_log(); - } - managing = 0; + } } }); } function scr_toggle_armamentarium() { - scr_change_menu(function() { + scr_change_menu(MENU.Armamentarium,function() { with(obj_controller) { - menu_adept = 0; - hide_banner = 1; - if (scr_role_count("Forge Master", "0") == 0) { - menu_adept = 1; - } - if (menu != 14) { + if (menu != MENU.Armamentarium) { + if (scr_role_count("Forge Master", "0") == 0) { + menu_adept = 1; + } + hide_banner = 1; set_up_armentarium(); - } else if (menu == 14) { - menu = 0; } - managing = 0; } }); } function scr_toggle_recruiting() { - scr_change_menu(function() { + scr_change_menu(MENU.Recruiting,function() { with(obj_controller) { var geh = 0, good = 0; @@ -324,27 +301,19 @@ function scr_toggle_recruiting() { } } } - menu_adept = 0; - hide_banner = 1; - if (menu != 15) { + if (menu != MENU.Recruiting) { set_up_recruitment_view(); - } else if (menu == 15) { - menu = 0; - - location_viewer.update_garrison_log(); - } - - managing = 0; + hide_banner = 1; + } } }); } function scr_toggle_fleet_area() { - scr_change_menu(function() { + scr_change_menu(MENU.Fleet,function() { with(obj_controller) { menu_adept = 0; - hide_banner = 1; var geh = 0, good = 0; for (geh = 1; geh <= 50; geh++) { @@ -354,9 +323,10 @@ function scr_toggle_fleet_area() { } } } - if (menu != 16) { + if (menu != MENU.Fleet) { + hide_banner = 1; //TODO rewrite all this shit when fleets finally become OOP - menu = 16; + menu = MENU.Fleet; cooldown = 8000; click = 1; @@ -416,58 +386,47 @@ function scr_toggle_fleet_area() { } man_max = m; man_current = 0; - } else if (menu == 16) { - menu = 0; - - cooldown = 8000; - click = 1; } - managing = 0; } }); } function scr_toggle_diplomacy() { - scr_change_menu(function() { + scr_change_menu(MENU.Diplomacy, function() { with(obj_controller) { - if (menu != 20) { - menu = 20; - + if (menu != MENU.Diplomacy) { + set_up_diplomacy_buttons(); + menu = MENU.Diplomacy; + audience = 0; + diplomacy = 0; hide_banner = 1; - } else if (menu == 20) { - menu = 0; - - hide_banner = 0; - location_viewer.update_garrison_log(); + show_debug_message("set_diplo") } - managing = 0; } }); } function scr_toggle_event_log() { - scr_change_menu(function() { + scr_change_menu(MENU.EventLog,function() { with(obj_controller) { - if (menu != 17) { - menu = 17; + if (menu != MENU.EventLog) { + menu = MENU.EventLog; hide_banner = 1; instance_activate_object(obj_event_log); obj_event_log.top = 1; - } else if (menu == 17) { - menu = 0; - - hide_banner = 0; } - managing = 0; } }); } function scr_end_turn() { - scr_change_menu(function() { + if (instance_exists(obj_turn_end)){ + return false; + } + scr_change_menu(-1,function() { with(obj_controller) { - if ((menu == 0) && (cooldown <= 0)) { + if ((menu == MENU.Default) && (cooldown <= 0)) { if (location_viewer.hide_sequence == 0) { location_viewer.hide_sequence++; } @@ -477,11 +436,11 @@ function scr_end_turn() { if (!instance_exists(obj_turn_end)) { ok = 1; } - if (instance_exists(obj_turn_end)) { + /*if (instance_exists(obj_turn_end)) { if (obj_turn_end.popups_end == 1) { ok = 1; } - } + }*/ if (ok == 1) { if(settings_autosave == true){ @@ -566,20 +525,6 @@ function scr_end_turn() { scr_turn_first(); } } - - if (menu == 1) { - menu = 0; - cooldown = 8000; - click = 1; - hide_banner = 0; - } - managing = 0; - /*with(obj_ini){ - for (var i=0;i<11;i++){ - scr_company_order(i); - } - }*/ - location_viewer.update_garrison_log(); } }); } diff --git a/scripts/scr_demand/scr_demand.gml b/scripts/scr_demand/scr_demand.gml index 02d1c8c1c6..5dad788e6e 100644 --- a/scripts/scr_demand/scr_demand.gml +++ b/scripts/scr_demand/scr_demand.gml @@ -221,7 +221,7 @@ function scr_demand(argument0) { if (worked=true){ - var h;h=0;repeat(4){h+=1;obj_controller.diplo_option[h]="";obj_controller.diplo_goto[h]="";} + clear_diplo_choices(); if (rela="friendly") and (no_penalty=false){disposition[trading_demand]-=8;turns_ignored[trading_demand]+=3;if (trading_demand=8) then disposition[trading_demand]+=6;} if (rela="neutral") and (no_penalty=false){disposition[trading_demand]-=10;turns_ignored[trading_demand]+=6;if (trading_demand=8) then disposition[trading_demand]+=6;} if (rela="hostile") and (no_penalty=false){disposition[trading_demand]-=15;turns_ignored[trading_demand]+=9;if (trading_demand=8) then disposition[trading_demand]+=9;} @@ -240,10 +240,18 @@ function scr_demand(argument0) { force_goodbye=1; } if (worked=false){ - var h;h=0;repeat(4){h+=1;obj_controller.diplo_option[h]="";obj_controller.diplo_goto[h]="";} - if (rela="friendly") and (no_penalty=false){disposition[trading_demand]-=2;turns_ignored[trading_demand]+=1;} - if (rela="neutral") and (no_penalty=false){disposition[trading_demand]-=4;turns_ignored[trading_demand]+=3;} - if (rela="hostile") and (no_penalty=false){disposition[trading_demand]-=8;turns_ignored[trading_demand]+=6;} + var h=0; + clear_diplo_choices(); + if (rela="friendly") and (no_penalty=false){ + disposition[trading_demand]-=2; + turns_ignored[trading_demand]+=1; + } + if (rela="neutral") and (no_penalty=false){ + disposition[trading_demand]-=4; + turns_ignored[trading_demand]+=3; + } + if (rela="hostile") and (no_penalty=false){ + disposition[trading_demand]-=8;turns_ignored[trading_demand]+=6;} if (disposition[trading_demand]<-100) then disposition[trading_demand]=-100; trading_demand=0;force_goodbye=1; diff --git a/scripts/scr_destroy_planet/scr_destroy_planet.gml b/scripts/scr_destroy_planet/scr_destroy_planet.gml index 900d7ce210..d6c6634a2d 100644 --- a/scripts/scr_destroy_planet/scr_destroy_planet.gml +++ b/scripts/scr_destroy_planet/scr_destroy_planet.gml @@ -99,97 +99,30 @@ function scr_destroy_planet(destruction_method) { } else if ((you.p_owner[baid] == eFACTION.Mechanicus || you.p_first[baid] == eFACTION.Mechanicus) && obj_controller.faction_status[eFACTION.Mechanicus] != "War") { obj_controller.loyalty -= 50; obj_controller.loyalty_hidden -= 50; - obj_controller.disposition[eFACTION.Imperium] -= 50; - obj_controller.disposition[3] -= 80; - obj_controller.disposition[4] -= 40; - obj_controller.disposition[5] -= 30; - - obj_controller.faction_status[eFACTION.Imperium] = "War"; - obj_controller.faction_status[eFACTION.Mechanicus] = "War"; - obj_controller.faction_status[eFACTION.Inquisition] = "War"; - obj_controller.faction_status[eFACTION.Ecclesiarchy] = "War"; - - obj_controller.audiences += 1; - obj_controller.audien[obj_controller.audiences] = 3; - obj_controller.audien_topic[obj_controller.audiences] = "declare_war"; - obj_controller.audiences += 1; - obj_controller.audien[obj_controller.audiences] = 2; - obj_controller.audien_topic[obj_controller.audiences] = "declare_war"; - if (obj_controller.known[eFACTION.Inquisition] > 1) { - obj_controller.audiences += 1; - obj_controller.audien[obj_controller.audiences] = 4; - obj_controller.audien_topic[obj_controller.audiences] = "declare_war"; - } - if (obj_controller.known[eFACTION.Ecclesiarchy] > 1) { - obj_controller.audiences += 1; - obj_controller.audien[obj_controller.audiences] = 5; - obj_controller.audien_topic[obj_controller.audiences] = "declare_war"; - } - - if (planet_feature_bool(you.p_feature[baid], P_features.Sororitas_Cathedral) == 1) { - obj_controller.disposition[5] -= 30; - if (obj_controller.known[eFACTION.Mechanicus] > 1) { - obj_controller.audiences += 1; - obj_controller.audien[obj_controller.audiences] = 3; - obj_controller.audien_topic[obj_controller.audiences] = "declare_war"; - } - } + decare_war_on_imperium_audiences(); } else if (enemy9 == eFACTION.Ecclesiarchy && obj_controller.faction_status[eFACTION.Ecclesiarchy] != "War") { obj_controller.loyalty -= 50; obj_controller.loyalty_hidden -= 50; - obj_controller.disposition[eFACTION.Imperium] -= 50; + obj_controller.disposition[3] -= 80; - obj_controller.disposition[4] -= 40; - obj_controller.disposition[5] -= 30; - obj_controller.faction_status[eFACTION.Imperium] = "War"; + + obj_controller.faction_status[eFACTION.Mechanicus] = "War"; - obj_controller.faction_status[eFACTION.Inquisition] = "War"; - obj_controller.faction_status[eFACTION.Ecclesiarchy] = "War"; - obj_controller.audiences += 1; - obj_controller.audien[obj_controller.audiences] = 5; - obj_controller.audien_topic[obj_controller.audiences] = "declare_war"; + scr_audience(eFACTION.Ecclesiarchy, "declare_war", -30, "War", 9999, 0); + if (obj_controller.known[eFACTION.Inquisition] > 1) { - obj_controller.audiences += 1; - obj_controller.audien[obj_controller.audiences] = 4; - obj_controller.audien_topic[obj_controller.audiences] = "declare_war"; + scr_audience(eFACTION.Inquisition, "declare_war", -40, "War", 9999, 0); } - obj_controller.audiences += 1; - obj_controller.audien[obj_controller.audiences] = 2; - obj_controller.audien_topic[obj_controller.audiences] = "declare_war"; + scr_audience(eFACTION.Imperium, "declare_war", -50, "War", 9999, 2); + } else if (obj_controller.faction_status[eFACTION.Imperium] != "War" && planet_feature_bool(you.p_feature[baid], P_features.Daemonic_Incursion) == 0 && you.p_tyranids[baid] < 5) { if (you.p_first[baid] == eFACTION.Imperium && you.p_type[baid] == "Hive") { obj_controller.loyalty -= 50; obj_controller.loyalty_hidden -= 50; - obj_controller.disposition[eFACTION.Imperium] -= 60; - obj_controller.disposition[eFACTION.Mechanicus] -= 30; - obj_controller.disposition[eFACTION.Inquisition] -= 40; - obj_controller.disposition[eFACTION.Ecclesiarchy] -= 40; - - obj_controller.faction_status[eFACTION.Imperium] = "War"; - obj_controller.faction_status[eFACTION.Mechanicus] = "War"; - obj_controller.faction_status[eFACTION.Inquisition] = "War"; - obj_controller.faction_status[eFACTION.Ecclesiarchy] = "War"; - - obj_controller.audiences += 1; - obj_controller.audien[obj_controller.audiences] = 2; - obj_controller.audien_topic[obj_controller.audiences] = "declare_war"; - if (obj_controller.known[eFACTION.Inquisition] > 1) { - obj_controller.audiences += 1; - obj_controller.audien[obj_controller.audiences] = 4; - obj_controller.audien_topic[obj_controller.audiences] = "declare_war"; - } - if (obj_controller.known[eFACTION.Ecclesiarchy] > 1) { - obj_controller.audiences += 1; - obj_controller.audien[obj_controller.audiences] = 5; - obj_controller.audien_topic[obj_controller.audiences] = "declare_war"; - } - if (obj_controller.known[eFACTION.Mechanicus] > 1) { - obj_controller.audiences += 1; - obj_controller.audien[obj_controller.audiences] = 3; - obj_controller.audien_topic[obj_controller.audiences] = "declare_war"; - } + + decare_war_on_imperium_audiences() if (planet_feature_bool(you.p_feature[baid], P_features.Sororitas_Cathedral) == 1) { obj_controller.disposition[5] -= 30; diff --git a/scripts/scr_diplomacy_helpers/scr_diplomacy_helpers.gml b/scripts/scr_diplomacy_helpers/scr_diplomacy_helpers.gml index 5f2c08908a..0bb0294efb 100644 --- a/scripts/scr_diplomacy_helpers/scr_diplomacy_helpers.gml +++ b/scripts/scr_diplomacy_helpers/scr_diplomacy_helpers.gml @@ -1,60 +1,124 @@ // Script assets have changed for v2.3.0 see // https://help.yoyogames.com/hc/en-us/articles/360005277377 for more information +function relationship_hostility_matrix(faction){ + var _rela="neutral"; + var _disp = disposition[faction]; + with (obj_controller){ + // if (diplomacy!=8){ + if (_disp>=60) then _rela="friendly"; + if (_disp<60) and (_disp>=20) then _rela="neutral"; + if (_disp<20) then _rela="hostile"; + // } + if (diplomacy==6){ + if (_disp>=60) then _rela="friendly"; + if (_disp<60) and (_disp>=0) then _rela="neutral"; + if (_disp<0) then _rela="hostile"; + } + + if (diplomacy==8){ + if (_disp>=40) then _rela="friendly"; + if (_disp<40) and (_disp>=-15) then _rela="neutral"; + if (_disp<-15) then _rela="hostile"; + } + } + return _rela; +} + +function clear_diplo_choices(){ + obj_controller.diplo_option = []; +} + +function valid_diplomacy_options(){ + var valid = false; + if (array_length(obj_controller.diplo_option)){ + for (var i=array_length(obj_controller.diplo_option)-1;i>=0;i--){ + if (obj_controller.diplo_option[i] != ""){ + valid = true; + } else { + array_delete(obj_controller.diplo_option, i, 1); + } + } + }else{ + return false; + } + return valid; +} +function add_diplomacy_option(option={}){ + if (!struct_exists(option, "goto")){ + option.goto = ""; + } + if (!struct_exists(option, "key")){ + option.key = option.option_text; + } + array_push(obj_controller.diplo_option, option); +} function basic_diplomacy_screen(){ var yy=__view_get( e__VW.YView, 0 ); var xx=__view_get( e__VW.XView, 0 ); - if (trading=0) and ((diplo_option[1]!="") or (diplo_option[2]!="") or (diplo_option[3]!="") or (diplo_option[4]!="")){ - if (force_goodbye=0){ + if (trading=0 && valid_diplomacy_options()){ + if (!force_goodbye){ draw_set_halign(fa_center); var opts=0,slot=0,dp=0,opt_cord=0; - for (dp=1;dp<5;dp++){ - if (diplo_option[dp]!="") then opts+=1; - } - if (opts=4) then yy-=30; - if (opts=2) then yy+=30; - if (opts=1) then yy+=60; + var opts = array_length(diplo_option); + if (opts==4) then yy-=30; + if (opts==2) then yy+=30; + if (opts==1) then yy+=60; + var left,top,right,base,opt; option_selections = []; - for (slot=1;slot<5;slot++){ - if (diplo_option[slot]!=""){ - left = xx+354; - top = yy+694; - right = xx+887; - base = yy+717; - draw_set_color(38144); + var diplo_pressed = -1; + for (var slot=0; slot530) then sw-=0.05; + } + if (string_width(string_hash_to_newline(_opt))*sw<=530) and (sw=1){ + draw_text_transformed(xx+620,yy+696,string_hash_to_newline(_opt),sw,sw,0); + draw_text_transformed(xx+620,yy+696+2,string_hash_to_newline(_opt),sw,sw,0); + } + + if (string_width(string_hash_to_newline(_opt))*sw>530){ + draw_text_ext_transformed(xx+620,yy+696-4,string_hash_to_newline(_opt),16,530/sw,sw,sw,0); + } + if scr_hit(left,top,right,base){ + draw_set_alpha(0.2); draw_rectangle(left,top,right,base,0); - draw_set_color(0); - - var sw=1; - for (var i=1;i<5;i++){ - if (string_width(string_hash_to_newline(diplo_option[slot]))*sw>530) then sw-=0.05; - } - if (string_width(string_hash_to_newline(diplo_option[slot]))*sw<=530) and (sw=1) then draw_text_transformed(xx+620,yy+696,string_hash_to_newline(string(diplo_option[slot])),sw,sw,0); - if (string_width(string_hash_to_newline(diplo_option[slot]))*sw<=530) and (sw<1) then draw_text_transformed(xx+620,yy+696+2,string_hash_to_newline(string(diplo_option[slot])),sw,sw,0); - if (string_width(string_hash_to_newline(diplo_option[slot]))*sw>530){ - draw_text_ext_transformed(xx+620,yy+696-4,string_hash_to_newline(string(diplo_option[slot])),16,530/sw,sw,sw,0); - } - if point_in_rectangle(mouse_x, mouse_y,left,top,right,base){ - draw_set_alpha(0.2);draw_rectangle(left,top,right,base,0);draw_set_alpha(1); - } - opt = [left,top,right,base]; - array_push(option_selections,opt); - opt_cord+=1; - yy+=30; + draw_set_alpha(1); } + opt = [left,top,right,base]; + array_push(option_selections,opt); + if (point_and_click(opt)){ + diplo_pressed = slot; + } + opt_cord+=1; + yy+=30; + + } + if (diplo_pressed>-1){ + evaluate_chosen_diplomacy_option(diplo_pressed); } yy=__view_get( e__VW.YView, 0 ); } - if (menu==20) and (diplomacy==10.1){ + if (menu==MENU.Diplomacy) and (diplomacy==10.1){ scr_emmisary_diplomacy_routes(); } if (force_goodbye=1){ draw_rectangle(xx+818,yy+796,xx+897,yy+815,0); draw_set_color(0); - draw_text(xx+857.5,yy+797,string_hash_to_newline("Exit")); + draw_text(xx+857.5,yy+797,"Exit"); draw_set_alpha(0.2); if (mouse_x>=xx+818) and (mouse_y>=yy+796) and (mouse_x<=xx+897) and (mouse_y<=yy+815) then draw_rectangle(xx+818,yy+796,xx+897,yy+815,0); draw_set_alpha(1); @@ -62,6 +126,22 @@ function basic_diplomacy_screen(){ } } + +function evaluate_chosen_diplomacy_option(){ + var _opt = diplo_option[diplo_pressed]; + if (_opt.goto != ""){ + scr_dialogue(_opt.goto); + exit; + } + + var _pressed_option = _opt.key; + if (struct_exists(_opt, "method")){ + if (is_callable(_opt.method)){ + script_execute(_opt.method); + } + } +} + function scr_diplomacy_hit(selection, new_path, complex_path="none"){ if (array_length(option_selections)>selection){ if (point_and_click(option_selections[selection])){ diff --git a/scripts/scr_draw_armentarium/scr_draw_armentarium.gml b/scripts/scr_draw_armentarium/scr_draw_armentarium.gml index f7234ffdb5..e5b60ac8e0 100644 --- a/scripts/scr_draw_armentarium/scr_draw_armentarium.gml +++ b/scripts/scr_draw_armentarium/scr_draw_armentarium.gml @@ -21,6 +21,7 @@ function set_up_armentarium(){ specialist_point_handler.calculate_research_points(); in_forge=false forge_button = new ShutterButton(); + forge_button.cover_text = "FORGE"; stc_flashes = new GlowDot(); /*for (var i =0;i<3;i++){ for (var f =0;f<7;f++){ diff --git a/scripts/scr_draw_rainbow/scr_draw_rainbow.gml b/scripts/scr_draw_rainbow/scr_draw_rainbow.gml index 45e2539659..d884a8d05e 100644 --- a/scripts/scr_draw_rainbow/scr_draw_rainbow.gml +++ b/scripts/scr_draw_rainbow/scr_draw_rainbow.gml @@ -1,31 +1,28 @@ -function scr_draw_rainbow(argument0, argument1, argument2, argument3, argument4) { +function scr_draw_rainbow(x1, y1, x2, y2, colour_ratio) { - // argument0: x1 - // argument1: y1 - // argument2: x2 - // argument3: y2 - // argument4: ratio // Draws a variable length and color rectangle based on a ratio of two variables - var wid,rat;wid=argument2-argument0;rat=argument4; + with (obj_controller){ + var wid,rat;wid=x2-x1;rat=colour_ratio; - if (menu!=20) or (diplomacy!=0){ - if (argument4<=0.15) then draw_set_color(c_red); - if (argument4>=0.15) and (argument4<=0.4) then draw_set_color(c_orange); - if (argument4>=0.4) and (argument4<=0.7) then draw_set_color(c_yellow); - if (argument4>=0.7) then draw_set_color(c_green); - } - if (menu=20) and (diplomacy=0){ - if (argument4<=0.5) then draw_set_color(c_red); - if (argument4>=0.5) and (argument4<=0.65) then draw_set_color(c_orange); - if (argument4>=0.65) and (argument4<=0.85) then draw_set_color(c_yellow); - if (argument4>=0.85) then draw_set_color(c_green); - } - if (rat>1) then rat=1;if (rat<-1) then rat=-1; - draw_rectangle(argument0,argument1,argument0+(wid*rat),argument3,0); - draw_set_color(c_gray); - draw_rectangle(argument0,argument1,argument2,argument3,1); + if (menu!=MENU.Diplomacy) or (diplomacy!=0){ + if (colour_ratio<=0.15) then draw_set_color(c_red); + if (colour_ratio>=0.15) and (colour_ratio<=0.4) then draw_set_color(c_orange); + if (colour_ratio>=0.4) and (colour_ratio<=0.7) then draw_set_color(c_yellow); + if (colour_ratio>=0.7) then draw_set_color(c_green); + } + if (menu=MENU.Diplomacy) and (diplomacy=0){ + if (colour_ratio<=0.5) then draw_set_color(c_red); + if (colour_ratio>=0.5) and (colour_ratio<=0.65) then draw_set_color(c_orange); + if (colour_ratio>=0.65) and (colour_ratio<=0.85) then draw_set_color(c_yellow); + if (colour_ratio>=0.85) then draw_set_color(c_green); + } + if (rat>1) then rat=1;if (rat<-1) then rat=-1; + draw_rectangle(x1,y1,x1+(wid*rat),y2,0); + draw_set_color(c_gray); + draw_rectangle(x1,y1,x2,y2,1); + } } diff --git a/scripts/scr_drop_select_function/scr_drop_select_function.gml b/scripts/scr_drop_select_function/scr_drop_select_function.gml index e565148666..574867809f 100644 --- a/scripts/scr_drop_select_function/scr_drop_select_function.gml +++ b/scripts/scr_drop_select_function/scr_drop_select_function.gml @@ -293,8 +293,8 @@ function drop_select_draw() { } if (obj_ncombat.enemy == 11) { - if (planet_feature_bool(obj_ncombat.battle_object.p_feature[obj_ncombat.battle_id], P_features.World_Eaters) == 1) { - obj_ncombat.battle_special = "world_eaters"; + if (planet_feature_bool(obj_ncombat.battle_object.p_feature[obj_ncombat.battle_id], P_features.ChaosWarband) == 1) { + obj_ncombat.battle_special = "ChaosWarband"; obj_ncombat.leader = 1; } } @@ -328,7 +328,7 @@ function drop_select_draw() { } // if (obj_ncombat.threat>1) and (obj_ncombat.enemy!=13) then obj_ncombat.threat-=1; - if ((obj_ncombat.threat > 1) && (obj_ncombat.battle_special != "world_eaters") && (attack == 0)) { + if ((obj_ncombat.threat > 1) && (obj_ncombat.battle_special != "ChaosWarband") && (attack == 0)) { obj_ncombat.threat -= 1; } if (obj_ncombat.threat < 1) { diff --git a/scripts/scr_enemy_ai_a/scr_enemy_ai_a.gml b/scripts/scr_enemy_ai_a/scr_enemy_ai_a.gml index a25e88a361..f50f664b6e 100644 --- a/scripts/scr_enemy_ai_a/scr_enemy_ai_a.gml +++ b/scripts/scr_enemy_ai_a/scr_enemy_ai_a.gml @@ -31,8 +31,8 @@ function scr_enemy_ai_a() { repeat(planets){ cur_planet+=1; if (array_length(p_feature[cur_planet])!=0){ - if (planet_feature_bool(p_feature[cur_planet], P_features.World_Eaters)==1) and (p_chaos[cur_planet]<=0){ - delete_features(p_feature[cur_planet],P_features.World_Eaters); + if (planet_feature_bool(p_feature[cur_planet], P_features.ChaosWarband)==1) and (p_chaos[cur_planet]<=0){ + delete_features(p_feature[cur_planet],P_features.ChaosWarband); } } } diff --git a/scripts/scr_enemy_ai_c/scr_enemy_ai_c.gml b/scripts/scr_enemy_ai_c/scr_enemy_ai_c.gml index 62cdffeac2..33b4d73bf4 100644 --- a/scripts/scr_enemy_ai_c/scr_enemy_ai_c.gml +++ b/scripts/scr_enemy_ai_c/scr_enemy_ai_c.gml @@ -173,11 +173,16 @@ function scr_enemy_ai_c() { var aler=0; if (present_fleet[10]>0) and (present_fleet[1]+present_fleet[2]=0) and (boat!="none") and (planets>0) { - var ii,gud;ii=0;gud=0; - repeat(planets){ii+=1;if (gud=0){if (planets>=ii) and (p_type[ii]!="Dead") and (p_owner[ii]!=10) then gud=ii;}} + var ii=0,gud=0; + repeat(planets){ + ii+=1; + if (gud=0){ + if (planets>=ii) and (p_type[ii]!="Dead") and (p_owner[ii]!=10) then gud=ii; + } + } if (gud!=0) and (instance_exists(boat)){ - if (boat.trade_goods="csm"){ + if (fleet_has_cargo("csm", boat)){ if (p_chaos[gud]<4){ p_chaos[gud]+=max(1,floor(boat.image_index*0.5)); if (p_chaos[gud]>4) then p_chaos[gud]=4; diff --git a/scripts/scr_enemy_ai_e/scr_enemy_ai_e.gml b/scripts/scr_enemy_ai_e/scr_enemy_ai_e.gml index e600b40464..1c97668e94 100644 --- a/scripts/scr_enemy_ai_e/scr_enemy_ai_e.gml +++ b/scripts/scr_enemy_ai_e/scr_enemy_ai_e.gml @@ -416,7 +416,7 @@ function scr_enemy_ai_e() { } with(obj_en_fleet) { if (action = "") and(orbiting = obj_controller.temp[1049]) and(owner = 10) { - if (string_count("Khorne_warband", trade_goods) > 0) then instance_create(x, y, obj_temp2); + if (string_count("warband", trade_goods) > 0) then instance_create(x, y, obj_temp2); if (string_lower(trade_goods) = "csm") then instance_create(x, y, obj_temp3); } } diff --git a/scripts/scr_fleet_functions/scr_fleet_functions.gml b/scripts/scr_fleet_functions/scr_fleet_functions.gml index ec8a7501a9..5f0ee9b227 100644 --- a/scripts/scr_fleet_functions/scr_fleet_functions.gml +++ b/scripts/scr_fleet_functions/scr_fleet_functions.gml @@ -180,7 +180,9 @@ function set_fleet_movement(fastest_route = true, new_action="move"){ action_eta = eta; if (action_eta<=0) or (owner != eFACTION.Inquisition){ action_eta=eta; - if (owner = eFACTION.Inquisition) and (action_eta<2) and (string_count("_her",trade_goods)=0) then action_eta=2; + + } else if (owner = eFACTION.Inquisition) and (action_eta<2) and (string_count("_her",trade_goods)=0){ + action_eta=2; } if (owner != eFACTION.Eldar && mine.storm) then action_eta+=10000; @@ -346,10 +348,14 @@ function scr_efleet_arrive_at_trade_loc(){ scr_event_log("",bleh,cur_star.name); // Drop off here - if (trade_goods!="stuff") and (trade_goods!="none") then scr_trade_dep(); + if (fleet_has_cargo("player_goods")){ + scr_trade_dep(); + } trade_goods="return"; - if (target!=noone) then target=noone; + if (target!=noone){ + target=noone; + } if (owner==eFACTION.Eldar){ cur_star = nearest_star_with_ownership(xx,yy, eFACTION.Eldar); @@ -359,18 +365,19 @@ function scr_efleet_arrive_at_trade_loc(){ } } else { action_x=home_x; - action_y=home_y; + action_y=home_y; + set_fleet_movement(); } - - action_eta=0; - action=""; - set_fleet_movement(); if (action_eta==0){ instance_destroy(); } + return true; } + return false; } + + function scr_orbiting_fleet(faction, system="none"){ var _found_fleet = "none"; var _faction_list = is_array(faction); @@ -595,12 +602,15 @@ function fleet_arrival_logic(){ if (string_count("_her",trade_goods)>0) then cancel=true; if (string_count("investigate_dead",trade_goods)>0) then cancel=true; if (string_count("spelunk",trade_goods)>0) then cancel=true; - if (string_count("BLOOD",trade_goods)>0) then cancel=true; + if (fleet_has_cargo("warband")) then cancel=true; if (fleet_has_cargo("ork_warboss")) cancel=true; - if (trade_goods="csm") then cancel=true; + if (fleet_has_cargo("csm")) then cancel=true; + + if (!cancel && ((trade_goods!="" && trade_goods!="return" && owner!=eFACTION.Tyranids && owner!=eFACTION.Chaos) || (fleet_has_cargo("player_goods")))){ + if (scr_efleet_arrive_at_trade_loc()){ + exit; + } - if (!cancel && trade_goods!="" && trade_goods!="return" && owner!=eFACTION.Tyranids && owner!=eFACTION.Chaos){ - scr_efleet_arrive_at_trade_loc(); } } @@ -621,7 +631,7 @@ function fleet_arrival_logic(){ orbiting=instance_nearest(x,y,obj_star); action_x=orbiting.x; action_y=orbiting.y; - alarm[4]=1; + set_fleet_movement(); instance_activate_object(obj_star); trade_goods+="|DELETE|"; exit; @@ -665,10 +675,6 @@ function fleet_arrival_logic(){ } }*/ - - - - action=""; if (owner= eFACTION.Inquisition){ @@ -735,7 +741,9 @@ function fleet_arrival_logic(){ // show_message("Tau||| Other Owner: "+string(cur_star.owner)+" ret: "+string(ret)+" mergus: "+string(mergus)); } - if (owner=eFACTION.Chaos) and (trade_goods="csm") or (trade_goods="Khorne_warband") then mergus=0; + if (owner=eFACTION.Chaos) and (fleet_has_cargo("csm")) or ( fleet_has_cargo("warband")){ + mergus=0; + } // if (cur_star.owner!=owner) then mergus=0; @@ -817,7 +825,9 @@ function fleet_arrival_logic(){ if (new_star.owner=eFACTION.Tau){ // show_message("Tau fleet actually fleeing"); - action="";action_x=new_star.x;action_y=new_star.y;alarm[4]=1; + action_x=new_star.x; + action_y=new_star.y; + set_fleet_movement(); } instance_activate_object(obj_star); @@ -832,7 +842,9 @@ function fleet_arrival_logic(){ x=old_x; y=old_y; - if (cur_star.x=old_x) and (cur_star.y=old_y) and (cur_star.owner=self.owner) and (cur_star.action="") and ((owner = eFACTION.Tau) or (owner = eFACTION.Chaos)) and (mergus=10) and (trade_goods!="csm") and (trade_goods!="Khorne_warband"){// Move somewhere new + var _csm = fleet_has_cargo("warband"); + + if (cur_star.x=old_x) and (cur_star.y=old_y) and (cur_star.owner=self.owner) and (cur_star.action="") and ((owner = eFACTION.Tau) or (owner = eFACTION.Chaos)) and (mergus=10) and (!_csm){// Move somewhere new var stue, stue2;stue=0;stue2=0; var goood=0; @@ -1020,7 +1032,7 @@ function fleet_respond_crusade(){ if (ok){ action_x=ns.x; action_y=ns.y; - alarm[4]=1; + set_fleet_movement(); orbiting.present_fleet[owner]-=1; home_x=orbiting.x; home_y=orbiting.y; diff --git a/scripts/scr_hit/scr_hit.gml b/scripts/scr_hit/scr_hit.gml index 0e6210750d..ae3fea5849 100644 --- a/scripts/scr_hit/scr_hit.gml +++ b/scripts/scr_hit/scr_hit.gml @@ -89,6 +89,12 @@ function point_and_click(rect, cooldown = 60, lock_bypass = false) { return true; } +function point_and_click_sprite(x1, y1, sprite, x_scale = 1, y_scale = 1){ + var _width = sprite_get_width(sprite) * x_scale; + var _height = sprite_get_height(sprite) * y_scale; + return point_and_click([x1, y1, x1 +_width, y1 + _height]); +} + function scr_click_left(cooldown = 60, lock_bypass = false){ if (lock_bypass == false && global.ui_click_lock == true) { return false; diff --git a/scripts/scr_inquisition_fleet_functions/scr_inquisition_fleet_functions.gml b/scripts/scr_inquisition_fleet_functions/scr_inquisition_fleet_functions.gml index 3910912628..f8b49b665c 100644 --- a/scripts/scr_inquisition_fleet_functions/scr_inquisition_fleet_functions.gml +++ b/scripts/scr_inquisition_fleet_functions/scr_inquisition_fleet_functions.gml @@ -13,6 +13,17 @@ function base_inquis_fleet (){ } } +function hunt_player_serfs(){ + explode_script(obj_controller.temp[1008],"|"); + var tb=string(explode[0]); + var tc=real(explode[1]); + var ev=0; + for(var v=1; v<=99; v++){ + if (ev==0) and (event[v]=="") then ev=v; + } + event[ev]="remove_serf|"+string(tb)+"|"+string(tc)+"|"; + event_duration[ev]=choose(1,2); +} function inquisition_fleet_inspection_chase(){ var good=0,acty=""; diff --git a/scripts/scr_khornate_fleet_functions/scr_khornate_fleet_functions.gml b/scripts/scr_khornate_fleet_functions/scr_khornate_fleet_functions.gml index f28e62c35f..fb7a8ec4bb 100644 --- a/scripts/scr_khornate_fleet_functions/scr_khornate_fleet_functions.gml +++ b/scripts/scr_khornate_fleet_functions/scr_khornate_fleet_functions.gml @@ -2,24 +2,32 @@ // https://help.yoyogames.com/hc/en-us/articles/360005277377 for more information function khorne_fleet_cargo(){ //This handles khorne fleets killing planet popultions moving planet and then choosing a new target ot chase - var orb=orbiting; - if (orb!=0) and (instance_exists(orb)) and (action=""){ - if (orb.present_fleet[1]+orb.present_fleet[2]+orb.present_fleet[3]+orb.present_fleet[6]+orb.present_fleet[7]+orb.present_fleet[9]+orb.present_fleet[13]=0){ + warband = cargo_data.warband; + var _is_orbiting = is_orbiting(); + if (_is_orbiting) and (action=""){ + _orb = orbiting; + if (_orb.present_fleet[1]+_orb.present_fleet[2]+_orb.present_fleet[3]+_orb.present_fleet[6]+_orb.present_fleet[7]+_orb.present_fleet[9]+_orb.present_fleet[13]=0){ var ii=0,good=0,part=0,find_new_planet=false; // No forces already landed - with (orb){ + var _fleet = self; + + with (_orb){ repeat(planets){ ii+=1; - if (planet_feature_bool(p_feature[ii], P_features.World_Eaters)==1) { + if (planet_feature_bool(p_feature[ii], P_features.ChaosWarband)==1) { good-=1; if (planet_imperium_ground_total(ii)<=0){ if (p_population[ii]>p_max_population[ii]/20){ p_population[ii]=round(p_population[ii]/2); - if (p_population[ii]<=p_max_population[ii]/20) then find_new_planet=true; + if (p_population[ii]<=p_max_population[ii]/20){ + find_new_planet=true; + } } - } else if (p_population[ii]<=p_max_population[ii]/20) then find_new_planet=true; + } else if (p_population[ii]<=p_max_population[ii]/20){ + find_new_planet=true; + } } } // Next planet; rembark the chaos forces @@ -28,10 +36,10 @@ function khorne_fleet_cargo(){ find_new_planet=false; repeat(planets){ ii+=1; - if (planet_feature_bool(p_feature[ii], P_features.World_Eaters)==1){ + if (planet_feature_bool(p_feature[ii], P_features.ChaosWarband)==1){ p_chaos[ii]=0; p_traitors[ii]=max(4,p_traitors[ii]+1); - delete_features(p_feature[ii], P_features.World_Eaters); + delete_features(p_feature[ii], P_features.ChaosWarband); find_new_planet=true; } } @@ -42,12 +50,12 @@ function khorne_fleet_cargo(){ if ((good=0) or (find_new_planet=true)){ ii=0; var landing_planet=0; - with (orb){ + with (_orb){ repeat(planets) { ii+=1; if (landing_planet=0){ if (planet_imperium_ground_total(ii)>0) and (p_population[ii]>p_max_population[ii]/20){ - array_push(p_feature[ii], new NewPlanetFeature(P_features.World_Eaters)); + array_push(p_feature[ii], new NewPlanetFeature(P_features.ChaosWarband)); landing_planet=ii; p_chaos[ii]=6; break; @@ -57,17 +65,17 @@ function khorne_fleet_cargo(){ if (p_player[ii]>0) and (p_population[ii]>p_max_population[ii]/20){ landing_planet=ii; p_chaos[ii]=6; - array_push(p_feature[ii], new NewPlanetFeature(P_features.World_Eaters)); + array_push(p_feature[ii], new NewPlanetFeature(P_features.ChaosWarband)); break; }// Forces landed } } } - if (landing_planet=0) and (trade_goods!="Khorne_warband_landing_force"){// Nothing to see here, continue to next star*/ + if (landing_planet=0) and (trade_goods!="khorne_warband_landing_force"){// Nothing to see here, continue to next star*/ ii=0; - with(orb) { + with(_orb) { instance_deactivate_object(id); } @@ -75,7 +83,7 @@ function khorne_fleet_cargo(){ if (owner=eFACTION.Chaos) or (owner=eFACTION.Ork) or (owner=eFACTION.Necrons) or (owner=eFACTION.Eldar){ instance_deactivate_object(id) } else { - for (var p =1;p<=planets;p++){ + for (var p = 1;p <= planets;p++){ if (p_type[p] != "Dead") then break; if (p == planets) then instance_deactivate_object(id); } @@ -102,11 +110,11 @@ function khorne_fleet_cargo(){ if !point_in_rectangle(n2,yy2, 50,50,room_width,room_height) { - trade_goods="Khorne_warband_landing_force"; - // show_message("Khorne_warband_landing_force"); + trade_goods="khorne_warband_landing_force"; + // show_message("khorne_warband_landing_force"); } - if (trade_goods!="Khorne_warband_landing_force") { + if (trade_goods!="khorne_warband_landing_force") { next_star=instance_nearest(nx,ny,obj_star); action_x=next_star.x; action_y=next_star.y; @@ -118,7 +126,7 @@ function khorne_fleet_cargo(){ - if (landing_planet=0 && trade_goods="Khorne_warband_landing_force"){ + if (landing_planet=0 && trade_goods="khorne_warband_landing_force"){ log_message("BLOOD: A"); // Go after the player now @@ -209,6 +217,8 @@ function khorne_fleet_cargo(){ } } } + + function spawn_chaos_fleet_at_system(system){ var _new_fleet = instance_create(system.x,system.y,obj_en_fleet); with (_new_fleet){ @@ -220,13 +230,7 @@ function spawn_chaos_fleet_at_system(system){ } function spawn_chaos_warlord(){ with (obj_controller){ - with(obj_turn_end){ - audiences+=1; - audien[audiences]=10; - known[eFACTION.Chaos]=2; - audien_topic[audiences]="intro"; - did_so=true; - } + scr_audience(eFACTION.Chaos, "intro", 0, "", 0, 2); fdir=terra_direction+choose(-90,90); fdir+=floor(random_range(-35,35)); var len,width,height,t,c,s; @@ -250,7 +254,7 @@ function spawn_chaos_warlord(){ image_index=9; home_x=x+lengthdir_x(5000,point_direction(x,y,room_width/2,room_height/2)); home_y=y+lengthdir_y(5000,point_direction(x,y,room_width/2,room_height/2)); - trade_goods="Khorne_warband"; + cargo_data.warband = {}; capital_number=10; frigate_number=20; escort_number=40; @@ -275,10 +279,13 @@ function spawn_chaos_warlord(){ var curr_dist = point_distance(curr.x, curr.y, nfleet.x, nfleet.y) return (prev_dist > curr_dist) ? curr : prev; - }),noone) - nfleet.action_x=fleet_target.x; - nfleet.action_y=fleet_target.y; - nfleet.alarm[4]=1; + }),noone); + + with (nfleet){ + nfleet.action_x=fleet_target.x; + nfleet.action_y=fleet_target.y; + set_fleet_movement() + } var tix=$"Chaos Lord {faction_leader[eFACTION.Chaos]} continues his Black Crusade into Sector {obj_ini.sector_name}."; scr_alert("purple","lol",tix,nfleet.x,nfleet.y); @@ -291,7 +298,7 @@ function spawn_chaos_warlord(){ function destroy_khorne_fleet(){ var chaos_lord_killed=false; with(instance_nearest(x, y, obj_star)){ - if system_feature_bool(p_feature, P_features.World_Eaters == 1) then chaos_lord_killed=true; + if system_feature_bool(p_feature, P_features.ChaosWarband == 1) then chaos_lord_killed=true; } if (chaos_lord_killed){ obj_controller.faction_defeated[10]=1; diff --git a/scripts/scr_load_controller/scr_load_controller.gml b/scripts/scr_load_controller/scr_load_controller.gml index 9f87a65514..230b49383b 100644 --- a/scripts/scr_load_controller/scr_load_controller.gml +++ b/scripts/scr_load_controller/scr_load_controller.gml @@ -100,7 +100,6 @@ function scr_load_controller(save_id){ obj_controller.unload=ini_read_real("Controller","unload",0); obj_controller.diplomacy=0; obj_controller.trading=0; - obj_controller.audience=0; obj_controller.force_goodbye=0; obj_controller.combat=0; obj_controller.new_vehicles=ini_read_real("Controller","new_vehicles",0); @@ -324,8 +323,6 @@ function scr_load_controller(save_id){ obj_controller.annoyed[g]=ini_read_real("Factions","annoyed"+string(g),0); obj_controller.ignore[g]=ini_read_real("Factions","ignore"+string(g),0); obj_controller.turns_ignored[g]=ini_read_real("Factions","turns_ignored"+string(g),0); - obj_controller.audien[g]=ini_read_real("Factions","audience"+string(g),0); - obj_controller.audien_topic[g]=ini_read_string("Factions","audience_topic"+string(g),""); } // var g;g=0; diff --git a/scripts/scr_mechanicus_missions/scr_mechanicus_missions.gml b/scripts/scr_mechanicus_missions/scr_mechanicus_missions.gml index cbaa18098a..3308d81625 100644 --- a/scripts/scr_mechanicus_missions/scr_mechanicus_missions.gml +++ b/scripts/scr_mechanicus_missions/scr_mechanicus_missions.gml @@ -49,8 +49,8 @@ function mechanicus_missions_end_turn(planet){ if (battli=2) then obj_turn_end.battle_special[obj_turn_end.battles]="study2b"; if (obj_turn_end.battle_opponent[obj_turn_end.battles]==11){ - if (planet_feature_bool(p_feature[planet],P_features.World_Eaters)==1){ - obj_turn_end.battle_special[obj_turn_end.battles]="world_eaters"; + if (planet_feature_bool(p_feature[planet],P_features.ChaosWarband)==1){ + obj_turn_end.battle_special[obj_turn_end.battles]="ChaosWarband"; } } } diff --git a/scripts/scr_ork_fleet_functions/scr_ork_fleet_functions.gml b/scripts/scr_ork_fleet_functions/scr_ork_fleet_functions.gml index bc256e013e..b12529f015 100644 --- a/scripts/scr_ork_fleet_functions/scr_ork_fleet_functions.gml +++ b/scripts/scr_ork_fleet_functions/scr_ork_fleet_functions.gml @@ -236,18 +236,11 @@ function out_of_system_warboss(){ known[eFACTION.Ork] = 0; var _warboss = new NewPlanetFeature(P_features.OrkWarboss); if (faction_defeated[7]=1){ - with(obj_turn_end){ - audiences+=1; - audien[audiences] = 7; - known[eFACTION.Chaos] = 2; - audien_topic[audiences] = "new_warboss"; - did_so=true; - } faction_defeated[7] =-1; faction_leader[eFACTION.Ork] = _warboss.name; faction_title[7]="Warboss"; faction_status[eFACTION.Ork]="War"; - disposition[7]=-40; + scr_audience(eFACTION.Ork, "new_warboss", -40,"War", 0, 2); } else { known[eFACTION.Ork] = 0.5; } diff --git a/scripts/scr_planetary_feature/scr_planetary_feature.gml b/scripts/scr_planetary_feature/scr_planetary_feature.gml index 81046481ca..ff6f41fc84 100644 --- a/scripts/scr_planetary_feature/scr_planetary_feature.gml +++ b/scripts/scr_planetary_feature/scr_planetary_feature.gml @@ -11,7 +11,7 @@ enum P_features { OrkWarboss, Warlord10, Special_Force, - World_Eaters, + ChaosWarband, Webway, Secret_Base, Starship, @@ -163,6 +163,12 @@ function NewPlanetFeature(feature_type, other_data={}) constructor{ recruit_type = 0; recruit_cost = 0; break; + case P_features.ChaosWarband: + if !(struct_exists(data, "patron")){ + patron = choose("slaanesh", "tzeentch", "khorne", "nurgle", "undivided"); + } else { + self.patron = data.patron; + } default: player_hidden = 1; planet_display = 0; @@ -177,7 +183,15 @@ function NewPlanetFeature(feature_type, other_data={}) constructor{ } } } +function move_feature_to_fleet(planet, feature_slot, fleet, cargo_key){ + var _feat = p_feature[planet][feature_slot]; + array_delete(p_feature[planet], feature_slot, 1); + fleet.cargo_data[$ cargo_key] = _feat; +} +function move_feature_to_planet(cargo_key, star, planet){ + +} // returns an array of all the positions that a certain planet feature occurs on th p_feature array of a planet // this works for both planet_Features and planet upgrades function search_planet_features(planet, search_feature){ diff --git a/scripts/scr_purge_world/scr_purge_world.gml b/scripts/scr_purge_world/scr_purge_world.gml index fd62e46881..be5f2955d0 100644 --- a/scripts/scr_purge_world/scr_purge_world.gml +++ b/scripts/scr_purge_world/scr_purge_world.gml @@ -89,23 +89,23 @@ function scr_purge_world(star, planet, action_type, action_score) { var _displayed_killed = star.p_large[planet] == 1 ? $"{kill} billion" : scr_display_number(floor(kill)); txt1 += $"##The world had {_displayed_population} Imperium subjects. {_displayed_killed} were purged over the duration of the bombardment.##Heresy has fallen down to {max(0, heres_after)}%."; - if (pop_after=0){ + if (pop_after<=0){ if (star.p_owner[planet]=2) and (obj_controller.faction_status[2]!="War"){ - if (star.p_type[planet]="Temperate") or (star.p_type[planet]="Hive") or (star.p_type[planet]="Desert"){ - obj_controller.audiences+=1;obj_controller.audien[obj_controller.audiences]=2; - obj_controller.audien_topic[obj_controller.audiences]="bombard_angry"; + if (star.p_type[planet]="Temperate" || star.p_type[planet]="Hive" || star.p_type[planet]="Desert"){ + var _disp_hit = -10; + if (star.p_type[planet]="Temperate") then _disp_hit = -5; + if (star.p_type[planet]="Desert") then _disp_hit = -3; + + scr_audience(eFACTION.Imperium, "bombard_angry", _disp_hit, "", 0, 0); } - if (star.p_type[planet]="Temperate") then obj_controller.disposition[2]-=5; - if (star.p_type[planet]="Desert") then obj_controller.disposition[2]-=3; - if (star.p_type[planet]="Hive") then obj_controller.disposition[2]-=10; } } if (star.p_owner[planet]=3) and (obj_controller.faction_status[3]!="War"){ - obj_controller.audiences+=1; - obj_controller.audien[obj_controller.audiences]=3; - obj_controller.audien_topic[obj_controller.audiences]="bombard_angry"; - if (star.p_type[planet]="Forge") then obj_controller.disposition[3]-=15; - if (star.p_type[planet]="Ice") then obj_controller.disposition[3]-=7; + + if (star.p_type[planet]="Forge") then _disp_hit =-15; + if (star.p_type[planet]="Ice") then _disp_hit =-7; + scr_audience(eFACTION.Inquisition, "bombard_angry", _disp_hit, "", 0, 0); + } diff --git a/scripts/scr_quest/scr_quest.gml b/scripts/scr_quest/scr_quest.gml index 6c8e6ef2e3..7a7fd51995 100644 --- a/scripts/scr_quest/scr_quest.gml +++ b/scripts/scr_quest/scr_quest.gml @@ -152,12 +152,13 @@ function scr_quest(quest_satus=0, quest_name, quest_fac, quest_end) { flit.image_index=0; flit.capital_number=1; - flit.trade_goods="none"; + flit.trade_goods=""; if (instance_exists(obj_temp2)){flit.action_x=obj_temp2.x;flit.action_y=obj_temp2.y;flit.target=instance_nearest(flit.action_x,flit.action_y,obj_p_fleet);} if (!instance_exists(obj_temp2)) and (instance_exists(obj_ground_mission)){flit.action_x=obj_ground_mission.x;flit.action_y=obj_ground_mission.y;flit.target=instance_nearest(flit.action_x,flit.action_y,obj_p_fleet);} - - flit.alarm[4]=1; + with(flit){ + set_fleet_movement(); + } with(obj_temp2){instance_destroy();} with(obj_temp3){instance_destroy();} diff --git a/scripts/scr_random_event/scr_random_event.gml b/scripts/scr_random_event/scr_random_event.gml index 658ea0c3e5..ed854578ac 100644 --- a/scripts/scr_random_event/scr_random_event.gml +++ b/scripts/scr_random_event/scr_random_event.gml @@ -1,27 +1,26 @@ function scr_random_event(execute_now) { var evented = false; - // This is some eldar mission, it should be fixed - // var rando4=floor(random(200))+1; - //if (obj_controller.turns_ignored[6]<=0) and (obj_controller.faction_gender[6]=2) then rando4-=2; - //if (obj_controller.turns_ignored[6]<=0) and (rando4<=3) and execute_now and (faction_defeated[6]=0){ - // if (obj_controller.known[eFACTION.Eldar]=2) and (obj_controller.disposition[6]>=-10) and (string_count("Eldar",obj_ini.strin)=0){ - // log_message("RE: Eldar Mission 1"); - // // Need something else here that prevents them from asking missions when they are pissed + /*This is some eldar mission, it should be fixed + var rando4=floor(random(200))+1; + if (obj_controller.turns_ignored[6]<=0) and (obj_controller.faction_gender[6]=2) then rando4-=2; + if (obj_controller.turns_ignored[6]<=0) and (rando4<=3) and execute_now and (faction_defeated[6]=0){ + if (obj_controller.known[eFACTION.Eldar]=2) and (obj_controller.disposition[6]>=-10) and (string_count("Eldar",obj_ini.strin)=0){ + log_message("RE: Eldar Mission 1"); + // Need something else here that prevents them from asking missions when they are pissed - // obj_turn_end.audiences+=1;// obj_turn_end.audiences+=1; - // obj_turn_end.audien[obj_turn_end.audiences]=6; + obj_turn_end.audiences+=1;// obj_turn_end.audiences+=1; + obj_turn_end.audience_stack[obj_turn_end.audiences]=6; - // // if (obj_controller.known[eFACTION.Eldar]>2) then obj_turn_end.audien_topic[obj_turn_end.audiences]="mission";// Random mission? - // if (obj_controller.known[eFACTION.Eldar]=2){ - // obj_turn_end.audien_topic[obj_turn_end.audiences]="mission1"; - // obj_controller.known[eFACTION.Eldar]=2.2; - // scr_quest(0,"fund_elder",6,24); - // } + // if (obj_controller.known[eFACTION.Eldar]>2) then obj_turn_end.audien_topic[obj_turn_end.audiences]="mission";// Random mission? + if (obj_controller.known[eFACTION.Eldar]=2){ + scr_audience(eFACTION.Eldar, "mission1", 0, "", 0, 2.2); + scr_quest(0,"fund_elder",6,24); + } - // exit; - // } - //} + exit; + } + }*/ var chosen_event; var inquisition_mission_roll = irandom(100); diff --git a/scripts/scr_save_controller/scr_save_controller.gml b/scripts/scr_save_controller/scr_save_controller.gml index 961e42aaf8..803248e04f 100644 --- a/scripts/scr_save_controller/scr_save_controller.gml +++ b/scripts/scr_save_controller/scr_save_controller.gml @@ -216,9 +216,6 @@ function scr_save_controller(save_id){ ini_write_real("Factions","annoyed"+string(g),obj_controller.annoyed[g]); ini_write_real("Factions","ignore"+string(g),obj_controller.ignore[g]); ini_write_real("Factions","turns_ignored"+string(g),obj_controller.turns_ignored[g]); - - ini_write_real("Factions","audience"+string(g),obj_controller.audien[g]); - ini_write_string("Factions","audience_topic"+string(g),obj_controller.audien_topic[g]); } // var g;g=0; diff --git a/scripts/scr_trade/scr_trade.gml b/scripts/scr_trade/scr_trade.gml index 72913a506d..3415c7134d 100644 --- a/scripts/scr_trade/scr_trade.gml +++ b/scripts/scr_trade/scr_trade.gml @@ -1,517 +1,658 @@ -function scr_trade(argument0) { - - - - - // argument0: true for trade, false for just tabulate score - - var my_worth, their_worth, rando4, rando5; - my_worth=0; - their_worth=0; - rando4=floor(random(100))+1; - rando5=floor(random(100))+1; - - - - - - for (var i = 1; i < 5; i++) { - if (trade_give[i]="Requisition") and (trade_mnum[i]>0) then my_worth+=trade_mnum[i]; - - if (trade_give[i]="Gene-Seed") and (trade_mnum[i]>0){ - if (diplomacy=3) or (diplomacy=4) then my_worth+=trade_mnum[i]*30; - if (diplomacy=2) or (diplomacy=5) then my_worth+=trade_mnum[i]*20; - if (diplomacy=8) or (diplomacy=10) then my_worth+=trade_mnum[i]*50; - } - - if (trade_give[i]="Info Chip") and (trade_mnum[i]>0) then my_worth+=trade_mnum[i]*80; - if (diplomacy=3) and (trade_give[i]="Info Chip") and (trade_mnum[i]>0) then my_worth+=trade_mnum[i]*10;// 20% bonus - - if (trade_give[i]="STC Fragment") and (trade_mnum[i]>0){ - if (diplomacy=2) then my_worth+=trade_mnum[i]*900;if (diplomacy=3) then my_worth+=trade_mnum[i]*1000;if (diplomacy=4) then my_worth+=trade_mnum[i]*1000; - if (diplomacy=5) then my_worth+=trade_mnum[i]*900;if (diplomacy=10) then my_worth+=trade_mnum[i]*900; - - if (diplomacy=6) then my_worth+=trade_mnum[i]*500;if (diplomacy=7) then my_worth+=trade_mnum[i]*500;if (diplomacy=8) then my_worth+=trade_mnum[i]*1000; - } - - - if (trade_take[i]="Test") then their_worth+=trade_tnum[i]*5000; - - if (trade_take[i]="Requisition") then their_worth+=trade_tnum[i]; - - // if (trade_take[i]="Storm Trooper") then their_worth+=trade_tnum[i]*20; - if (trade_take[i]="Recruiting Planet"){ - if (disposition[2]<70) then their_worth+=trade_tnum[i]*4000; - if (disposition[2]>=70) then their_worth+=trade_tnum[i]*2000; - } - if (trade_take[i]="License: Repair") then their_worth+=trade_tnum[i]*750; - if (trade_take[i]="License: Crusade") then their_worth+=trade_tnum[i]*1500; - - if (trade_take[i]="Terminator Armour") then their_worth+=trade_tnum[i]*400; - if (trade_take[i]="Tartaros") then their_worth+=trade_tnum[i]*900; - if (trade_take[i]="Land Raider") then their_worth+=trade_tnum[i]*600; - if (trade_take[i]="Castellax Battle Automata") then their_worth+=trade_tnum[i]*1200; - if (trade_take[i]="Minor Artifact") then their_worth+=trade_tnum[i]*450; - if (trade_take[i]="Skitarii") then their_worth+=trade_tnum[i]*15; - if (trade_take[i]="Techpriest") then their_worth+=trade_tnum[i]*150; - - // TODO: Condemnor Boltgun trade is temporarily disabled due to crashes as the item doesn't exist in other parts of the game. - // To re-enable: Implement the Condemnor Boltgun item in the game's inventory, equipment, and combat systems. - // if (trade_take[i]="Condemnor Boltgun") then their_worth+=trade_tnum[i]*15; - if (trade_take[i]="Hellrifle") then their_worth+=trade_tnum[i]*20; - if (trade_take[i]="Incinerator") then their_worth+=trade_tnum[i]*20; - if (trade_take[i]="Crusader") then their_worth+=trade_tnum[i]*20; - if (trade_take[i]="Exterminatus") then their_worth+=trade_tnum[i]*1500; - if (trade_take[i]="Cyclonic Torpedo") then their_worth+=trade_tnum[i]*3000; - - if (trade_take[i]="Eviscerator") then their_worth+=trade_tnum[i]*20; - if (trade_take[i]="Heavy Flamer") then their_worth+=trade_tnum[i]*12; - if (trade_take[i]="Inferno Bolts") then their_worth+=trade_tnum[i]*5; - if (trade_take[i]="Sister of Battle") then their_worth+=trade_tnum[i]*40; - if (trade_take[i]="Sister Hospitaler") then their_worth+=trade_tnum[i]*50; - - if (trade_take[i]="Eldar Power Sword") then their_worth+=trade_tnum[i]*50; - if (trade_take[i]="Archeotech Laspistol") then their_worth+=trade_tnum[i]*150; - if (trade_take[i]="Ranger") then their_worth+=trade_tnum[i]*100; - if (trade_take[i]="Useful Information") then their_worth+=trade_tnum[i]*600; - - if (trade_take[i]="Power Klaw") then their_worth+=trade_tnum[i]*50; - if (trade_take[i]="Ork Sniper") then their_worth+=trade_tnum[i]*30; - if (trade_take[i]="Flash Git") then their_worth+=trade_tnum[i]*60; - - - if (trade_take[i]="Artifact"){ - if (diplomacy=2) then their_worth+=300; - if (diplomacy=3) then their_worth+=800; - if (diplomacy=4) then their_worth+=600; - if (diplomacy=5) then their_worth+=500; - if (diplomacy>5) then their_worth=1200; - } +function TradeAttempt(diplomacy) constructor{ + diplomacy_faction = diplomacy; + relative_trade_values = { + "Test" : 5000, + "Requisition" : 1, + "Recruiting Planet" : obj_controller.disposition[2]<70 ? 4000 : 2000, + "License: Repair" : 750, + "License: Crusade" : 1500, + "Terminator Armour" : 400, + "Tartaros" : 900, + "Land Raider" : 800, + "Castellax Battle Automata" : 1200, + "Minor Artifact" : 250, + "Skitarii" : 15, + "Techpriest" : 450, + //"Condemnor Boltgun" : 20, + "Hellrifle" : 20, + "Incinerator" : 20, + "Crusader" : 20, + "Exterminatus" : 1500, + "Cyclonic Torpedo" : 3000, + "Eviscerator" : 20, + "Heavy Flamer" : 12, + "Inferno Bolts" : 5, + "Sister of Battle" : 40, + "Sister Hospitaler" : 75, + "Eldar Power Sword" : 50, + "Archeotech Laspistol" : 150, + "Ranger" : 100, + "Useful Information" : 600, + "Power Klaw" : 50, + "Ork Sniper" : 30, + "Flash Git" : 60, } - - - var ss1,ss2; - ss1=string(trade_give[1])+string(trade_give[2])+string(trade_give[3])+string(trade_give[4]); - ss2=string(trade_take[1])+string(trade_take[2])+string(trade_take[3])+string(trade_take[4]); - if (ss1="Requisition") or (ss1="RequisitionRequisition") or (ss1="RequisitionRequisitionRequisition") or (string_count("Requisition",ss1)=4){ - if (ss2="Requisition") or (ss2="RequisitionRequisition") or (ss2="RequisitionRequisitionRequisition") or (string_count("Requisition",ss2)=4){ - my_worth=-10000; - } + demand_options = []; + offer_options = []; + + static clear_options = function(){ + trade_likely=""; + var _offer_length = array_length(offer_options); + var _demand_length = array_length(demand_options) + var trade_options = max(_demand_length,_offer_length) + for (var i=0;i 500 && diplomacy_faction==6){ + var got2=0; + with (obj_controller){ + repeat(10){ + if (got2<50){ + got2+=1; + if (quest[got2]="fund_elder") and (quest_faction[got2]=6){ + scr_dialogue("mission1_thanks"); + scr_quest(2,"fund_elder",6,0); + got2=50; + trading=0; + exit; + } + } + } + } + } + } else if (_opt.trade_type == "gene"){ + gene_seed-=_opt.number; + if (diplomacy_faction<=5) and (diplomacy_faction!=4) then obj_conotroller.gene_sold+=_opt.number; + if (diplomacy_faction>=6) then obj_controller.gene_xeno+=_opt.number; + } else if(_opt.trade_type == "stc"){ + for (var j = 0; j < 100; j += 1) { + var p = choose(1, 2, 3); + if (p == 1 && obj_controller.stc_wargear_un > 0) { + obj_controller.stc_wargear_un -= 1; + break; + } + if (p == 2 && obj_controller.stc_vehicles_un > 0) { + obj_controller.stc_vehicles_un -= 1; + break; + } + if (p == 3 && obj_controller.stc_ships_un > 0) { + obj_controller.stc_ships_un -= 1; + break; + } + } + } else if(_opt.trade_type == "info"){ + obj_controller.info_chips-=_opt.number; + } + } - deal=(100-penalty)-((their_worth-my_worth)*dif_penalty); - // if (trade_mnum[1]=0) and (trade_take[1]="Requisition") or (trade_take[2]="Requisition") or (trade_take[3]="Requisition") or (trade_take[4]="Requisition") then deal-=100; + var flit = setup_ai_trade_fleet(trade_from_star, diplomacy_faction); + flit.cargo_data.player_goods = trading_object; + flit.target = trade_to_obj; + with (flit){ + action_x=target.x; + action_y=target.y; + set_fleet_movement(); + } - if (argument0=false){ - if (deal<=20) then trade_likely="Very Unlikely"; - if (deal<=0) then trade_likely="Impossible"; - if (deal>20) and (deal<=40) then trade_likely="Unlikely"; - if (deal>40) and (deal<=60) then trade_likely="Moderate Chance"; - if (deal>60) and (deal<=80) then trade_likely="Likely"; - if (deal>80) then trade_likely="Very Likely"; - if (deal>100) then trade_likely="Unrefusable"; - - // show_message(string(deal)+" : "+string(trade_likely)); - - if (trade_mnum[1]+trade_mnum[2]+trade_mnum[3]+trade_mnum[4]<=0) and (trade_tnum[1]+trade_tnum[2]+trade_tnum[3]+trade_tnum[4]<=0) then trade_likely=""; } + static find_trade_locations = function(){ + if (obj_ini.fleet_type=ePlayerBase.home_world){ + var _stars_with_player_control = []; + with(obj_star){ + if (array_contains(p_owner, 1)){ + array_push(_stars_with_player_control, id) + } + } + + var player_fleet_targets = []; + + if (obj_ini.fleet_type != ePlayerBase.home_world || !array_length(_stars_with_player_control)){ + // with(obj_star){if (present_fleet[1]>0){x-=10000;y-=10000;}} + with(obj_p_fleet){// Get the nearest star system that is viable for creating the trading fleet + if ((capital_number>0 || frigate_number>0) && action=""){ + array_push(player_fleet_targets, id); + } + + } + } + + + // temp2: ideal trade target + // temp3: origin + // temp4: possible trade target + + + var viable_faction_trade_stars = []; + var _check_val = diplomacy_faction; + if (diplomacy_faction==4){ + _check_val = 2 + } + with(obj_star){// Get origin star system for enemy fleet + if (array_contains(p_owner, _check_val)){ + array_push(viable_faction_trade_stars, id); + } + if (_check_val=5){ + + var ahuh=0,q=0; + repeat(planets){ + q+=1; + if (p_owner[q]=5) then ahuh=1; + if (p_owner[q]<6) and (planet_feature_bool(p_feature[q],P_features.Sororitas_Cathedral) == 1) then ahuh=1; + } + if (ahuh=1){ + array_push(viable_faction_trade_stars, id); + } + + } + } + } + + if (!array_length(_stars_with_player_control) && !array_length(player_fleet_targets)){ + with (obj_controller){ + scr_dialogue("trade_error_1"); + trading = false; + } + return false + } + if (!array_length(viable_faction_trade_stars)){ + with (obj_controller){ + scr_dialogue("trade_error_2"); + trading = false; + } + return false + } + trade_from_star = array_random_element(viable_faction_trade_stars); + if (!array_length(_stars_with_player_control)){ + trade_to_obj = array_random_element(player_fleet_targets); + } else if (!array_length(player_fleet_targets)){ + trade_to_obj = array_random_element(_stars_with_player_control); + } else { + trade_to_obj = choose(array_random_element(_stars_with_player_control), array_random_element(player_fleet_targets)); + } + return true; + } + static attempt_trade = function(){ + calculate_deal_chance(); + var attempt_rand = roll_dice_chapter(1, 100, "high"); + var _success = attempt_rand <= deal_chance; + if (_success){ + _success = find_trade_locations(); + show_debug_message("trade_success"); + if (_success){ + successful_trade_attempt(); + scr_dialogue("agree"); + //force_goodbye=1; + obj_controller.trading=0; + if (diplomacy_faction=6) or (diplomacy_faction=7) or (diplomacy_faction=8){ + scr_loyalty("Xeno Trade","+"); + } + } else { + show_debug_message("no trade locations"); + } + } else { + var _dip = diplomacy_faction; + with (obj_controller){ + var _rela=relationship_hostility_matrix(diplomacy); + if (trading_artifact==0){ + diplo_text="[[Trade Refused]]##"; + } else { + diplo_text=""; + } + annoyed[_dip] += 1; + rando=choose(1,2,3); + if (_rela=="hostile"){ + force_goodbye=1; + if (rando==1) then diplo_text+="You would offer me scraps for the keys to a kingdom? You are foolish and, worse, you are unaware of your own incompetence."; + if (rando==2) then diplo_text+="Do not attempt exchanges with those so far above you, lapdog of the Corpse Emperor, it makes you look even more idiotic than you already do."; + if (rando==3) then diplo_text+="I would spit upon this ‘offer' you bring before me but I find myself too amused by it."; + } + else if (_rela!="hostile"){ + if (rando==1) then diplo_text+="You may consider my response to be a ‘no' and assume my attitude to be whatever you like, Chapter Master."; + if (rando==2) then diplo_text+="Have a care that you do not overstep the mark, Chapter Master, I see no reason to accept such a trade."; + if (rando==3) then diplo_text+="An unreasonable trade, whatever our working relationship might be. I refuse."; + } + if (annoyed[_dip]>=10){ + force_goodbye=1; + turns_ignored[_dip]=max(turns_ignored[_dip],1); + diplo_last="disagree"; + diplo_char=0; + diplo_alpha=0; + exit; + } + } + show_debug_message("trade_fail"); + clear_options(); + } + } + offer_button = new UnitButtonObject({ + x1 : 630, + y1 : 649, + label : "Offer", + }); + offer_button.bind_method = function(){ + if (obj_controller.diplo_last !=" offer"){ + attempt_trade(true); + } + } + offer_button.bind_scope = self; + + exit_button = new UnitButtonObject({ + x1 : 818, + y1 : 796, + label : "Exit", + }); + + exit_button.bind_method = function(){ + with (obj_controller){ + cooldown=8; + trading=0; + scr_dialogue("trade_close"); + click2=1; + if (trading_artifact!=0){ + scr_toggle_diplomacy(); + with(obj_popup){ + instance_destroy(); + } + obj_ground_mission.alarm[1]=1; + exit; + } + } + } + exit_button.bind_scope = self; + static new_demand_buttons = function(trade_disp, name, trade_type, max_take = 100000){ + var _option = new UnitButtonObject({ + label : name, + number : 0, + disp : trade_disp, + trade_type : trade_type, + max_take : max_take, + number_last : 0, + }); + with (_option){ + bind_method = function(){ + if (max_take == 1){ + variable_struct_set(self, "number", 1); + } else { + get_diag_integer($"{label} wanted?", max_take, self); + } + } + } + //_option.bind_scope = _option; + array_push(demand_options, _option); + } + trader_disp = obj_controller.disposition[diplomacy_faction]; + + trade_req=obj_controller.requisition; + trade_gene=obj_controller.gene_seed; + trade_chip=obj_controller.stc_wargear_un+obj_controller.stc_vehicles_un+obj_controller.stc_ships_un; + trade_info=obj_controller.info_chips; + + switch (diplomacy_faction){ + case 2: + new_demand_buttons(0, "Requisition","req"); + new_demand_buttons(0, "Recruiting Planet", "license",1); + new_demand_buttons(0, "License: Repair","license",1); + new_demand_buttons(0, "License: Crusade","license",1); + break; + case 3: + new_demand_buttons(35, "Terminator Armour", "equip",5); + new_demand_buttons(20, "Land Raider", "vehic",1); + new_demand_buttons(40, "Minor Artifact", "arti",1); + new_demand_buttons(25, "Skitarii", "merc",200); + new_demand_buttons(55, "Techpriest", "merc",3); + break; + case 4: + new_demand_buttons(30, "Hellrifle", "equip",3); + new_demand_buttons(20, "Incinerator", "equip",10); + new_demand_buttons(25, "Crusader", "merc", 5); + new_demand_buttons(40, "Exterminatus", "equip",1); + new_demand_buttons(60, "Cyclonic Torpedo", "equip",1); + break; + case 5: + new_demand_buttons(20, "Eviscerator", "equip",10); + new_demand_buttons(30, "Heavy", "equip",10); + //new_demand_buttons(30, "Inferno Bolts", "equip"); + new_demand_buttons(40, "Sister of Battle", "merc",5); + new_demand_buttons(45, "Sister Hospitaler", "merc",3); + break; + case 6: + new_demand_buttons(-10, "Master Crafted Power Sword", "equip",3); + new_demand_buttons(-10, "Archeotech Laspistol", "equip",1); + new_demand_buttons(10, "Ranger", "merc",3); + new_demand_buttons(-15, "Useful Information", "license",1); + break; + case 7: + new_demand_buttons(-100, "Power Klaw", "equip",10); + new_demand_buttons(-100, "Ork Sniper", "merc",50); + new_demand_buttons(-100, "Flash Git", "merc",50); + break; + } + static new_offer_option = function(trade_disp = -100, name, trade_type, max_count=1){ + var _option = new UnitButtonObject({ + label : name, + number : 0, + max_number : max_count, + disp : trade_disp, + trade_type : trade_type, + number_last : 0, + }); + with (_option){ + bind_method = function(){ + if (max_number == 1){ + number = 1; + } else { + get_diag_integer($"{label} offered?",max_number, self); + } + } + } + array_push(offer_options, _option); + } + if (obj_controller.requisition > 0){ + new_offer_option(, "Requisition", "req", obj_controller.requisition); + } - // show_message("A-1: "+string(liscensing)); - - - - if (argument0=true){ - - if (rando4<=deal) and (trading_artifact=0){ + if (obj_controller.gene_seed > 0){ + new_offer_option(, "Gene Seed", "gene", obj_controller.gene_seed); + } - var step,lisc;step=0;lisc=0; - lisc=string_count("License",string(trade_take[1]+trade_take[2]+trade_take[3]+trade_take[4])); - lisc+=string_count("Recruiting",string(trade_take[1]+trade_take[2]+trade_take[3]+trade_take[4])); - lisc+=string_count("Useful Info",string(trade_take[1]+trade_take[2]+trade_take[3]+trade_take[4])); - if (trade_take[1]!="") and (trade_take[2]="") then step=1; - if (trade_take[2]!="") and (trade_take[3]="") then step=2; - if (trade_take[3]!="") and (trade_take[4]="") then step=3; - if (trade_take[4]!="") then step=4; + if (trade_chip > 0){ + new_offer_option(, "STC Fragment","stc" ,trade_chip); + } + if (trade_info > 0){ + new_offer_option(, "Info Chip","info", trade_info); + } - if (lisc>0) then obj_controller.liscensing=1; - if (trade_take[1]="Recruiting Planet") or (trade_take[2]="Recruiting Planet") or (trade_take[3]="Recruiting Planet") or (trade_take[4]="Recruiting Planet"){ - obj_controller.liscensing=5; - - if (trade_take[1]="Recruiting Planet") then recruiting_worlds_bought+=1; - if (trade_take[2]="Recruiting Planet") then recruiting_worlds_bought+=1; - if (trade_take[3]="Recruiting Planet") then recruiting_worlds_bought+=1; - if (trade_take[4]="Recruiting Planet") then recruiting_worlds_bought+=1; - } - if (trade_take[1]="License: Crusade") or (trade_take[2]="License: Crusade") or (trade_take[3]="License: Crusade") or (trade_take[4]="License: Crusade"){ - obj_controller.liscensing=2; - } - if (trade_take[1]="Useful Information") or (trade_take[2]="Useful Information") or (trade_take[3]="Useful Information") or (trade_take[4]="Useful Information"){ - obj_controller.liscensing=5; - } - if (trade_take[1]="License: Repair") or (trade_take[2]="License: Repair") or (trade_take[3]="License: Repair") or (trade_take[4]="License: Repair"){ - repair_ships=1; - } - if (trade_take[1]="Exterminatus") or (trade_take[2]="Exterminatus") or (trade_take[3]="Exterminatus") or (trade_take[4]="Exterminatus"){ - obj_controller.liscensing=0; - lisc=0; - } + static draw_trade_screen = function(){ + recalc_values = false; + draw_set_color(38144); + draw_rectangle(342,326,486,673,1); + draw_rectangle(343,327,485,672,1);// Left Main Panel + draw_rectangle(504,371,741,641,1); + draw_rectangle(505,372,740,640,1);// Center panel + draw_rectangle(759,326,903,673,1); + draw_rectangle(760,327,902,672,1);// Right Main Panel - // show_message("A: "+string(liscensing)); + draw_rectangle(342,326,486,371,1);// Left Title Panel + draw_rectangle(759,326,903,371,1);// Right Title Panel - ;var goods;goods=""; - + draw_set_font(fnt_40k_14b); + draw_set_halign(fa_center); + draw_text(411,330,$"{obj_controller.faction[diplomacy_faction]}\nItems"); + draw_text(829,330,$"{global.chapter_name}\nItems"); + if (trade_likely!="") then draw_text(623,348,$"[{trade_likely}]"); + + clear_button.draw(); + offer_button.draw(); + exit_button.draw(); - // Temporary work around - if (lisc>0){ - for (var i = 1; i <= 4; i += 1) { - if (trade_give[i]="Requisition") then requisition-=trade_mnum[i]; - if (trade_give[i]="Gene-Seed") and (trade_mnum[i]>0){ - gene_seed-=trade_mnum[i]; - - if (diplomacy<=5) and (diplomacy!=4) then gene_sold+=trade_mnum[i]; - if (diplomacy>=6) then gene_xeno+=trade_mnum[i]; - } - if (trade_give[i]="Info Chip") and (trade_mnum[i]>0) then info_chips-=trade_mnum[i]; - if (trade_give[i]="STC Fragment") and (trade_mnum[i]>0){ - for (var j = 0; j < 100; j += 1) { - var p = choose(1, 2, 3); - if (p == 1 && stc_wargear_un > 0) { - stc_wargear_un -= 1; - break; - } - if (p == 2 && stc_vehicles_un > 0) { - stc_vehicles_un -= 1; - break; - } - if (p == 3 && stc_ships_un > 0) { - stc_ships_un -= 1; - break; - } - } - } - } - - - } - - - - if (lisc!=step) or (lisc=0){// Do not fly over licenses - - if (obj_ini.fleet_type=ePlayerBase.home_world) then with(obj_star){ - if ((p_owner[1]=1) or (p_owner[2]=1) or (p_owner[3]=1) or (p_owner[4]=1)){instance_create(x,y,obj_temp2);x-=10000;y-=10000;} - } - - - if (obj_ini.fleet_type != ePlayerBase.home_world){ - // with(obj_star){if (present_fleet[1]>0){x-=10000;y-=10000;}} - with(obj_p_fleet){// Get the nearest star system that is viable for creating the trading fleet - if (capital_number>0) and (action="") then instance_create(instance_nearest(x,y,obj_star).x,instance_nearest(x,y,obj_star).y,obj_temp2); - if (frigate_number>0) and (action="") then instance_create(instance_nearest(x,y,obj_star).x,instance_nearest(x,y,obj_star).y,obj_ground_mission); - } - } - - - // temp2: ideal trade target - // temp3: origin - // temp4: possible trade target - - - with(obj_star){// Get origin star system for enemy fleet - /*var q;q=0; - repeat(4){q+=1; - if (p_owner[q]=1) or (string_count("Monastery",p_feature[q])>0) then instance_create(x,y,obj_temp3); - }*/ - - - if /*(owner=obj_controller.diplomacy) and */((p_owner[1]=obj_controller.diplomacy) or (p_owner[2]=obj_controller.diplomacy) - or (p_owner[3]=obj_controller.diplomacy) or (p_owner[4]=obj_controller.diplomacy)){ - instance_create(x,y,obj_temp3); - } - - if (obj_controller.diplomacy=4){ - if (p_owner[1]=2) or (p_owner[2]=2) or (p_owner[3]=2) or (p_owner[4]=2) then instance_create(x,y,obj_temp3); - } - - // if (obj_controller.diplomacy=4) and (owner = eFACTION.Imperium) then instance_create(x,y,obj_temp3); - } - if (diplomacy=5){ - with(obj_star){var ahuh,q;ahuh=0;q=0; - repeat(4){q+=1;if (p_owner[q]=5) then ahuh=1; - if (p_owner[q]<6) and (planet_feature_bool(p_feature[q],P_features.Sororitas_Cathedral )==1) then ahuh=1; - } - if (ahuh=1) then instance_create(x,y,obj_temp3); - } + draw_set_halign(fa_left); + draw_set_font(fnt_40k_14); + draw_set_color(38144); + var _requested_count = 0; + //if (obj_controller.trading_artifact = 0){ + for (var i=0;i 0){ + var _y_offset = 399 + (_requested_count * 20); + draw_sprite(spr_cancel_small,0,507,_y_offset); + if (point_and_click_sprite(507,_y_offset, spr_cancel_small)){ + _opt.number = 0; + recalc_values = true;; + } + + if (_opt.max_take > 1){ + draw_text(530,_y_offset,$"{_opt.label} : {_opt.number}"); + } else { + draw_text(530,_y_offset,$"{_opt.label}"); + } + _requested_count++; + } } - - - // show_message("TG2:"+string(instance_number(obj_temp2))+", TG3:"+string(instance_number(obj_temp3))+", TG4:"+string(instance_number(obj_ground_mission))); - - - var targ, flit, chasing;chasing=0;targ=0;// Set target, chase - - // if (obj_ini.fleet_type != ePlayerBase.home_world){ - if (instance_exists(obj_temp2)) then targ=instance_nearest(obj_temp2.x,obj_temp2.y,obj_temp3); - if (!instance_exists(obj_temp2)) and (instance_exists(obj_ground_mission)) then targ=instance_nearest(obj_ground_mission.x,obj_ground_mission.y,obj_temp3); - - if ((!instance_exists(obj_temp2)) and (!instance_exists(obj_ground_mission))) or (instance_number(obj_p_fleet)=1) and ((obj_p_fleet.x<=0) or (obj_p_fleet.x>room_width) or (obj_p_fleet.y<=0) or (obj_p_fleet.y>room_height)){ - with(obj_star){ - if (x<-3500) and (y<-3500){x+=10000;y+=10000;} - if (x<-3500) and (y<-3500){x+=10000;y+=10000;} - } - trading=0;scr_dialogue("trade_error_1"); - - if (trade_take[1]="Recruiting Planet") then recruiting_worlds_bought-=1; - if (trade_take[2]="Recruiting Planet") then recruiting_worlds_bought-=1; - if (trade_take[3]="Recruiting Planet") then recruiting_worlds_bought-=1; - if (trade_take[4]="Recruiting Planet") then recruiting_worlds_bought-=1; - if (trade_take[1]="License: Crusade") or (trade_take[2]="License: Crusade") or (trade_take[3]="License: Crusade") or (trade_take[4]="License: Crusade"){ - obj_controller.liscensing=0; - } - if (trade_take[1]="Useful Information") or (trade_take[2]="Useful Information") or (trade_take[3]="Useful Information") or (trade_take[4]="Useful Information"){ - obj_controller.liscensing=0; - } - if (trade_take[1]="License: Repair") or (trade_take[2]="License: Repair") or (trade_take[3]="License: Repair") or (trade_take[4]="License: Repair"){ - repair_ships=0; - } - - instance_activate_all();exit; - } - - // If player fleet is flying about then get their target for new target - if (!instance_exists(obj_temp2)) and (!instance_exists(obj_ground_mission)) and (instance_exists(obj_p_fleet)) and (obj_ini.fleet_type != ePlayerBase.home_world){ - // show_message("no T2 or T4: chasing"); - chasing=1; - with(obj_p_fleet){var pop; - if (capital_number>0) and (action!=""){pop=instance_create(action_x,action_y,obj_temp2);pop.action_eta=action_eta;} - if (frigate_number>0) and (action!=""){pop=instance_create(action_x,action_y,obj_ground_mission);pop.action_eta=action_eta;} - } - } - if (instance_exists(obj_temp2)) then targ=instance_nearest(obj_temp2.x,obj_temp2.y,obj_temp3); - if (!instance_exists(obj_temp2)) and (instance_exists(obj_ground_mission)) then targ=instance_nearest(obj_ground_mission.x,obj_ground_mission.y,obj_temp3); - // } - - if (!instance_exists(obj_temp3)){ - with(obj_star){ - if (x<-3500) and (y<-3500){x+=10000;y+=10000;} - if (x<-3500) and (y<-3500){x+=10000;y+=10000;} - } - trading=0;scr_dialogue("trade_error_2"); - - for (var i=1;i<5;i++){ - if (trade_take[i]=="Recruiting Planet") then recruiting_worlds_bought-=1; - if (trade_take[i]=="License: Crusade") then obj_controller.liscensing=0; - if (trade_take[i]=="Useful Information") then obj_controller.liscensing=0; - if (trade_take[i]=="License: Repair") then repair_ships=0; - } - - instance_activate_all(); - exit; - } - - - flit=instance_create(targ.x,targ.y,obj_en_fleet); - - flit.owner=diplomacy; - flit.home_x=targ.x; - flit.home_y=targ.y; - - if (diplomacy=5) then flit.owner = eFACTION.Imperium; - - if (diplomacy=2) then flit.sprite_index=spr_fleet_imperial; - if (diplomacy=3) then flit.sprite_index=spr_fleet_mechanicus; - if (diplomacy=4){flit.sprite_index=spr_fleet_inquisition;flit.owner = eFACTION.Inquisition;} - // if (diplomacy=4){flit.sprite_index=spr_fleet_imperial;flit.owner = eFACTION.Imperium;} - if (diplomacy=6){ - flit.action_spd=6400; - flit.action_eta=1; - flit.sprite_index=spr_fleet_eldar; - } - if (diplomacy=7) then flit.sprite_index=spr_fleet_ork; - if (diplomacy=8) then flit.sprite_index=spr_fleet_tau; - - flit.image_index=0; - flit.capital_number=1; - - i=0; - repeat(4){i+=1; - if (trade_give[i]="Requisition") then requisition-=trade_mnum[i]; - if (trade_give[i]="Gene-Seed") and (trade_mnum[i]>0){ - gene_seed-=trade_mnum[i]; - - if (diplomacy<=5) and (diplomacy!=4) then gene_sold+=trade_mnum[i]; - if (diplomacy>=6) then gene_xeno+=trade_mnum[i]; - } - if (trade_give[i]="Info Chip") and (trade_mnum[i]>0) then info_chips-=trade_mnum[i]; - if (trade_give[i]="STC Fragment") and (trade_mnum[i]>0){ - var remov,p;remov=0;p=0; - repeat(100){ - if (remov=0){p=choose(1,2,3); - if (p=1) and (stc_wargear_un>0){stc_wargear_un-=1;remov=1;} - if (p=2) and (stc_vehicles_un>0){stc_vehicles_un-=1;remov=1;} - if (p=3) and (stc_ships_un>0){stc_ships_un-=1;remov=1;} - } - } - } - if (trade_take[i]!="") then goods+=string(trade_take[i])+"!"+string(trade_tnum[i])+"!|"; - } - - flit.trade_goods=goods; - if (flit.trade_goods="") then flit.trade_goods="none"; - - if (obj_ini.fleet_type != ePlayerBase.home_world){ - if (instance_exists(obj_temp2)){flit.action_x=obj_temp2.x;flit.action_y=obj_temp2.y;flit.target=instance_nearest(flit.action_x,flit.action_y,obj_p_fleet);} - if (!instance_exists(obj_temp2)) and (instance_exists(obj_ground_mission)){flit.action_x=obj_ground_mission.x;flit.action_y=obj_ground_mission.y;flit.target=instance_nearest(flit.action_x,flit.action_y,obj_p_fleet);} - } - if (obj_ini.fleet_type=ePlayerBase.home_world){ - targ=instance_nearest(flit.x,flit.y,obj_temp2); - flit.action_x=targ.x; - flit.action_y=targ.y; - } - - if (chasing=1){flit.minimum_eta=flit.target.action_eta;} - flit.alarm[4]=1; - - with(obj_temp2){instance_destroy();} - with(obj_temp3){instance_destroy();} - with(obj_ground_mission){instance_destroy();} - - - // show_message("D: "+string(liscensing)); - - if (flit.trade_goods="none"){// Elfdar mission 1 maybe - var got;got=0; - - - // show_message("E: "+string(liscensing)); - - if (trade_give[1]="Requisition") then got+=trade_mnum[1]; - if (trade_give[2]="Requisition") then got+=trade_mnum[2]; - if (trade_give[3]="Requisition") then got+=trade_mnum[3]; - if (trade_give[4]="Requisition") then got+=trade_mnum[4]; - - if (trade_tnum[1]+trade_tnum[2]+trade_tnum[3]+trade_tnum[4]>0) then got=0; - - if (got>=500) and (diplomacy=6){ - var got2;got2=0; - repeat(10){if (got2<50){got2+=1;if (quest[got2]="fund_elder") and (quest_faction[got2]=6){ - scr_dialogue("mission1_thanks");scr_quest(2,"fund_elder",6,0);got2=50;trading=0; - trade_take[0]="";trade_take[1]="";trade_take[2]="";trade_take[3]="";trade_take[4]="";trade_take[5]="";trade_tnum[0]=0;trade_tnum[1]=0;trade_tnum[2]=0;trade_tnum[3]=0;trade_tnum[4]=0;trade_tnum[5]=0; - trade_give[0]="";trade_give[1]="";trade_give[2]="";trade_give[3]="";trade_give[4]="";trade_give[5]="";trade_mnum[0]=0;trade_mnum[1]=0;trade_mnum[2]=0;trade_mnum[3]=0;trade_mnum[4]=0;trade_mnum[5]=0; - exit; - }}} - } - } - - } - - - trading=0; - - // show_message("F: "+string(liscensing)); - - // show_message("rando4: "+string(rando4)+"#deal: "+string(deal)); - - - // show_message("Lisc: "+string(lisc)+" | Step: "+string(step)); - - if (trade_take[1]="Useful Information") or (trade_take[2]="Useful Information") or (trade_take[3]="Useful Information") or (trade_take[4]="Useful Information"){ - scr_dialogue("useful_information"); - } - else{ - if (lisc!=step) or (lisc=0) then scr_dialogue("agree"); - if (lisc=step) and (obj_controller.liscensing>0) then scr_dialogue("agree_lisc"); - } - - trade_take[0]="";trade_take[1]="";trade_take[2]="";trade_take[3]="";trade_take[4]="";trade_take[5]="";trade_tnum[0]=0;trade_tnum[1]=0;trade_tnum[2]=0;trade_tnum[3]=0;trade_tnum[4]=0;trade_tnum[5]=0; - trade_give[0]="";trade_give[1]="";trade_give[2]="";trade_give[3]="";trade_give[4]="";trade_give[5]="";trade_mnum[0]=0;trade_mnum[1]=0;trade_mnum[2]=0;trade_mnum[3]=0;trade_mnum[4]=0;trade_mnum[5]=0; - if (diplomacy=6) or (diplomacy=7) or (diplomacy=8) then scr_loyalty("Xeno Trade","+"); + //} + + var _requested_count = 0; + draw_text(507,529,$"{global.chapter_name}:"); + for (var i=0;i 0){ + var _y_offset = 547 + (_requested_count * 20); + draw_sprite(spr_cancel_small,0,507,_y_offset); + if (point_and_click_sprite(507,_y_offset, spr_cancel_small)){ + _opt.number = 0; + recalc_values = true;; + } + if (_opt.max_number > 1){ + draw_text(530,_y_offset,$"{_opt.label} : {_opt.number}"); + } else { + draw_text(530,_y_offset,$"{_opt.label}"); + } + _requested_count++; + } + } + + if (recalc_values){ + calculate_deal_chance(); + } } - if (rando4>deal) and (trading_artifact=0){ - trading=0;scr_dialogue("disagree"); - trade_take[0]="";trade_take[1]="";trade_take[2]="";trade_take[3]="";trade_take[4]="";trade_take[5]="";trade_tnum[0]=0;trade_tnum[1]=0;trade_tnum[2]=0;trade_tnum[3]=0;trade_tnum[4]=0;trade_tnum[5]=0; - trade_give[0]="";trade_give[1]="";trade_give[2]="";trade_give[3]="";trade_give[4]="";trade_give[5]="";trade_mnum[0]=0;trade_mnum[1]=0;trade_mnum[2]=0;trade_mnum[3]=0;trade_mnum[4]=0;trade_mnum[5]=0; + var _info_val = 0; + with (obj_controller){ + if (random_event_next != EVENT.none) and ((string_count("WL10|",useful_info)>0) or (turn0) or (known[eFACTION.Ork]<1)) and (string_count("WG|",useful_info)>1) and (string_count("CM|",useful_info)>0){ + _info_val=1000; + } } - - - // show_message("G: "+string(liscensing)); - - if (trading_artifact!=0){// Eheheheh, good space goy - if (rando4<=deal){ - i=0; - repeat(4){i+=1; - if (trade_give[i]="Requisition") then requisition-=trade_mnum[i]; - if (trade_give[i]="Gene-Seed") and (trade_mnum[i]>0){ - gene_seed-=trade_mnum[i]; - - if (diplomacy<=5) and (diplomacy!=4) then gene_sold+=trade_mnum[i]; - if (diplomacy>=6) then gene_xeno+=trade_mnum[i]; - } - if (trade_give[i]="Info Chip") and (trade_mnum[i]>0) then info_chips-=trade_mnum[i]; - if (trade_give[i]="STC Fragment") and (trade_mnum[i]>0){ - var remov,p;remov=0;p=0; - repeat(100){ - if (remov=0){p=choose(1,2,3); - if (p=1) and (stc_wargear_un>0){stc_wargear_un-=1;remov=1;} - if (p=2) and (stc_vehicles_un>0){stc_vehicles_un-=1;remov=1;} - if (p=3) and (stc_ships_un>0){stc_ships_un-=1;remov=1;} - } - } - } - } - trading=0;scr_dialogue("agree");force_goodbye=1;trading_artifact=2; - trade_take[0]="";trade_take[1]="";trade_take[2]="";trade_take[3]="";trade_take[4]="";trade_take[5]="";trade_tnum[0]=0;trade_tnum[1]=0;trade_tnum[2]=0;trade_tnum[3]=0;trade_tnum[4]=0;trade_tnum[5]=0; - trade_give[0]="";trade_give[1]="";trade_give[2]="";trade_give[3]="";trade_give[4]="";trade_give[5]="";trade_mnum[0]=0;trade_mnum[1]=0;trade_mnum[2]=0;trade_mnum[3]=0;trade_mnum[4]=0;trade_mnum[5]=0; - if (diplomacy=6) or (diplomacy=7) or (diplomacy=8) then scr_loyalty("Xeno Trade","+"); - } - if (rando4>deal){scr_dialogue("disagree"); - trade_give[0]="";trade_give[1]="";trade_give[2]="";trade_give[3]="";trade_give[4]="";trade_give[5]="";trade_mnum[0]=0;trade_mnum[1]=0;trade_mnum[2]=0;trade_mnum[3]=0;trade_mnum[4]=0;trade_mnum[5]=0; - } + information_value = _info_val; + + static calculate_trader_trade_value = function(){ + + their_worth = 0; + + for (var i=0;i 0 && struct_exists(relative_trade_values, _opt.label)){ + their_worth+=_opt.number*relative_trade_values[$ _opt.label]; + if (_opt.label=="Artifact"){ + var _faction_barrier = 0; + switch (diplomacy_faction){ + case 2: + _faction_barrier = 300; + break; + case 3: + _faction_barrier = 800; + break; + case 4: + _faction_barrier = 600; + break; + case 5: + _faction_barrier = 500; + break; + } + if (diplomacy_faction < 5){ + _faction_barrier = 1200 + } + their_worth += _faction_barrier; + } + } + } } - // show_message("H: "+string(liscensing)); - + static calculate_player_trade_value = function(){ + my_worth = 0; + for (var i = 0; i < array_length(offer_options); i++) { + var _opt = offer_options[i] + if (_opt.number<=0){ + continue; + } + if (_opt.label="Requisition"){ + my_worth += _opt.number; + } + + else if (_opt.label="Gene-Seed") { + if (diplomacy_faction=3) or (diplomacy_faction=4) then my_worth+=_opt.number*30; + if (diplomacy_faction=2) or (diplomacy_faction=5) then my_worth+=_opt.number*20; + if (diplomacy_faction=8) or (diplomacy_faction=10) then my_worth+=_opt.number*50; + } + + else if (_opt.label="Info Chip"){ + if (diplomacy_faction == eFACTION.Mechanicus){ + my_worth+=_opt.number*100;// 20% bonus + } else { + my_worth+=_opt.number*80; + } + my_worth+=_opt.number*80; + } + + if (_opt.label="STC Fragment") { + if (diplomacy_faction=2) then my_worth+=_opt.number*900; + if (diplomacy_faction=3) then my_worth+=_opt.number*1000; + if (diplomacy_faction=4) then my_worth+=_opt.number*1000; + if (diplomacy_faction=5) then my_worth+=_opt.number*900; + if (diplomacy_faction=10) then my_worth+=_opt.number*900; + + if (diplomacy_faction=6) then my_worth+=_opt.number*500; + if (diplomacy_faction=7) then my_worth+=_opt.number*500; + if (diplomacy_faction=8) then my_worth+=_opt.number*1000; + } + } } - - with(obj_star){ - if (x<-3500) and (y<-3500){x+=10000;y+=10000;} - if (x<-3500) and (y<-3500){x+=10000;y+=10000;} + trade_likely = ""; + static chance_chart = ["Impossible", "Very Unlikely","Unlikely","Moderate Chance","Likely","Very Likely","Unrefusable"]; + static calculate_deal_chance = function(){ + + var def_penalty=0; + var penalty=0; + calculate_player_trade_value(); + calculate_trader_trade_value(); + + if (diplomacy_faction=2){ + dif_penalty=0.4; + penalty=5; + }else if (diplomacy_faction=3){ + dif_penalty=0.6; + penalty=5; + }else if (diplomacy_faction=4){ + dif_penalty=1; + penalty=15; + }else if (diplomacy_faction=5){ + dif_penalty=0.8; + penalty=0; + }else if (diplomacy_faction=6){ + dif_penalty=0.6; + penalty=10; + }else if (diplomacy_faction=7){ + dif_penalty=0.4; + penalty=20; + }else if (diplomacy_faction=8){ + dif_penalty=0.4; + penalty=0; + }else if (diplomacy_faction=10){ + dif_penalty=1; + penalty=0;} + + deal_chance=(100-penalty)-(((their_worth-(my_worth*dif_penalty))/10)); + + show_debug_message($"{their_worth},{my_worth},{deal_chance}"); + + var _chance = clamp(floor((deal_chance/20)), 0, 6); + + trade_likely = chance_chart[_chance]; } - instance_activate_all(); - - } + diff --git a/scripts/scr_trade_add/scr_trade_add.gml b/scripts/scr_trade_add/scr_trade_add.gml index fdd4c37b8d..8b13789179 100644 --- a/scripts/scr_trade_add/scr_trade_add.gml +++ b/scripts/scr_trade_add/scr_trade_add.gml @@ -1,67 +1 @@ -function scr_trade_add(argument0) { - // argument0: item - - var tomp1,thinz; - tomp1=0;thinz=0; - if (trade_take[4]="") then thinz=4;if (trade_take[3]="") then thinz=3;if (trade_take[2]="") then thinz=2;if (trade_take[1]="") then thinz=1; - - - - - if (thinz!=0){ - trade_take[thinz]=argument0; - - if (argument0="Requisition"){get_diag_integer("Requisition wanted?",100000,"t"+string(thinz),"Requisition");} - if (argument0="Terminator Armour"){get_diag_integer("Terminator Armour wanted?",5,"t"+string(thinz),"Terminator Armour");} - if (argument0="Tartaros"){trade_tnum[thinz]=1;tomp1=1;} - if (argument0="Land Raider"){trade_tnum[thinz]=1;tomp1=1;} - if (argument0="Castellax Battle Automata"){trade_tnum[thinz]=1;tomp1=1;} - - if (argument0="Minor Artifact"){trade_tnum[thinz]=1;tomp1=1;} - if (argument0="Skitarii"){get_diag_integer("Skitarii wanted?",1000,"t"+string(thinz),"Skitarii");} - if (argument0="Techpriest"){trade_tnum[thinz]=3;tomp1=3;} - - // if (argument0="Storm Trooper"){trade_tnum[thinz]=get_integr("Number of Storm Troopers?",10);tomp1=100;} - if (argument0="Recruiting Planet"){trade_tnum[thinz]=1;tomp1=1;} - if (argument0="License: Repair"){trade_tnum[thinz]=1;tomp1=1;} - if (argument0="License: Crusade"){trade_tnum[thinz]=1;tomp1=1;} - - if (argument0="Eldar Power Sword"){get_diag_integer("Eldar Power Swords wanted?",5,"t"+string(thinz),"Eldar Power Sword");} - if (argument0="Archeotech Laspistol"){trade_tnum[thinz]=1;tomp1=1;} - if (argument0="Ranger"){get_diag_integer("Eldar Rangers wanted?",5,"t"+string(thinz),"Ranger");} - if (argument0="Useful Information"){ - var woj;woj=trade_take[1]+trade_take[2]+trade_take[3]+trade_take[4]; - if (string_count("Useful Info",woj)=1){trade_tnum[thinz]=1;tomp1=1;} - if (string_count("Useful Info",woj)>1){trade_tnum[thinz]=0;tomp1=0;trade_take[thinz]="";} - } - - // TODO: Condemnor Boltgun trade dialog disabled due to weapon being temporarily removed. - // Re-enable when the weapon is properly implemented. - // if (argument0="Condemnor Boltgun"){get_diag_integer("Condemnor Boltguns wanted?",20,"t"+string(thinz),"Condemnor Boltgun");} - if (argument0="Hellrifle"){get_diag_integer("Hellrifles wanted?",3,"t"+string(thinz),"Hellrifle");} - if (argument0="Incinerator"){get_diag_integer("Incinerators wanted?",10,"t"+string(thinz),"Incinerator");} - if (argument0="Crusader"){get_diag_integer("Crusaders wanted?",5,"t"+string(thinz),"Crusader");} - if (argument0="Exterminatus"){trade_tnum[thinz]=1;tomp1=1;} - if (argument0="Cyclonic Torpedo"){trade_tnum[thinz]=1;tomp1=1;} - if (argument0="Eviscerator"){get_diag_integer("Eviscerators wanted?",10,"t"+string(thinz),"Eviscerator");} - if (argument0="Heavy Flamer"){get_diag_integer("Heavy Flamers wanted?",10,"t"+string(thinz),"Heavy Flamer");} - if (argument0="Inferno Bolts"){trade_tnum[thinz]=20;tomp1=20;} - if (argument0="Sister of Battle"){get_diag_integer("Sisters of Battle wanted?",3,"t"+string(thinz),"Sister of Battle");} - if (argument0="Sister Hospitaler"){trade_tnum[thinz]=1;tomp1=1;} - - if (argument0="Power Klaw"){get_diag_integer("Power Klaws wanted?",5,"t"+string(thinz),"Power Klaw");} - if (argument0="Ork Sniper"){get_diag_integer("Ork Snipers wanted?",20,"t"+string(thinz),"Ork Sniper");} - if (argument0="Flash Git"){get_diag_integer("Flash Gitz wanted?",6,"t"+string(thinz),"Flash Git");} - - if (argument0="Test"){trade_tnum[thinz]=1;tomp1=1;} - - // if (trade_tnum[thinz]=0){trade_tnum[thinz]=0;trade_take[thinz]="";} - // if (trade_tnum[thinz]>tomp1) then trade_tnum[thinz]=tomp1; - } - - cooldown=8; - scr_trade(false); - - -} diff --git a/scripts/scr_trade_dep/scr_trade_dep.gml b/scripts/scr_trade_dep/scr_trade_dep.gml index 9cdbfa54b8..cbf0561ec3 100644 --- a/scripts/scr_trade_dep/scr_trade_dep.gml +++ b/scripts/scr_trade_dep/scr_trade_dep.gml @@ -1,177 +1,64 @@ function scr_trade_dep() { - - if (trade_goods="none") then exit; - - - var g, n, r, temp1, temp2; - r=-1;repeat(100){r+=1;g[r]="";n[r]=0;} - - temp1=0;temp2=string_count("|",trade_goods); - - explode_script(trade_goods,"|"); - r=0;repeat(temp2){r+=1; - g[r]=string(explode[r-1]);// show_message(string(g[r])); - } - r=0;repeat(temp2){r+=1; - explode_script(g[r],"!");g[r]=string(explode[0]);n[r]=real(explode[1]); - // show_message(string(g[r])+" x"+string(n[r])); + var _goods = cargo_data.player_goods; + + show_debug_message($"trade goods : {_goods}"); + if (struct_exists(_goods, "mercenaries")){ + var _mercs = struct_get_names(_goods.mercenaries); + for (var m=0;m=2) { + _new_diag = "hello"; + } + } else { + if (known[eFACTION.Inquisition]==1) { + known[diplomacy]=2; + faction_justmet=1; + obj_controller.last_mission=turn+1; + } + else if (known[eFACTION.Inquisition]==3) { + known[faction_enum]=4; + faction_justmet=1; + obj_controller.last_mission=turn+1; + } + else if (known[faction_enum]>=4) { + _new_diag = "hello"; + } + } + scr_dialogue(_new_diag); + } +} + +function draw_diplomacy_diplo_text(){ + draw_set_font(fnt_40k_14); + draw_set_alpha(1); + draw_set_color(38144); + draw_set_halign(fa_left); + draw_text_ext(336+16,209,string_hash_to_newline(string(diplo_txt)),-1,536); + draw_set_halign(fa_center); + draw_line(xx+429,yy+710,xx+800,yy+710); +} +function set_up_diplomacy_buttons(){ + diplo_buttons = {}; + set_up_diplomacy_persons(); + //Trade button setup + diplo_buttons.trade = new UnitButtonObject({ + x1 : 400, + y1 : 720, + label : "Trade", + bind_scope : obj_controller, + style:"pixel" + }); + diplo_buttons.trade.bind_method = function(){ + if ((audience==0) and (force_goodbye==0)){ + trading=1; + scr_dialogue("open_trade"); + cooldown=8; + click2=1; + trade_attempt = new TradeAttempt(diplomacy); + } + } + + + //Demand button setup + diplo_buttons.demand = new UnitButtonObject({ + x1 : 600, + y1 : 720, + label : "Demand", + bind_scope : obj_controller, + style:"pixel" + }); + diplo_buttons.demand.bind_method = function(){ + if ((audience==0) and (force_goodbye==0)){ + cooldown=8; + click2=1; + trading_demand=diplomacy; + scr_dialogue("trading_demand"); + } + } + + //Discuss button setup + diplo_buttons.discuss = new UnitButtonObject({ + x1 : 800, + y1 : 720, + label : "Discuss", + tooltip : "Unfinished", + bind_scope : obj_controller, + style:"pixel" + }); + + + //denounce button setup + diplo_buttons.denounce = new UnitButtonObject({ + x1 : 400, + y1 : diplo_buttons.trade.y2, + label : "Denounce", + bind_scope : obj_controller, + style:"pixel" + }); + + diplo_buttons.denounce.bind_method = function(){ + if (diplo_last!="denounced"){ + scr_dialogue("denounced"); + cooldown=8; + click2=1; + } + } + + diplo_buttons.praise = new UnitButtonObject({ + x1 : 600, + y1 : diplo_buttons.trade.y2, + label : "Praise", + bind_scope : obj_controller, + style:"pixel" + }); + + diplo_buttons.praise.bind_method = function(){ + if (diplo_last!="praised"){ + scr_dialogue("praised"); + cooldown=8; + click2=1; + } + } + + diplo_buttons.alliance = new UnitButtonObject({ + x1 : 800, + y1 : diplo_buttons.trade.y2, + label : "Propose\nAlliance", + bind_scope : obj_controller, + style:"pixel" + }); + + + diplo_buttons.alliance.bind_method = function(){ + if (diplo_last!="propose_alliance"){ + cooldown=8; + click2=1; + scr_dialogue("propose_alliance"); + } + } + + diplo_buttons.exit_button = new UnitButtonObject({ + x1 : 818, + y1 : 795, + label : "Exit", + bind_scope : obj_controller, + color : CM_RED_COLOR, + }); + + diplo_buttons.exit_button.bind_method = function(){ + obj_controller.menu_lock = false; + if (audio_is_playing(snd_blood)==true) then scr_music("royal",2000); + + var _close_diplomacy = true; + if (complex_event==true) and (instance_exists(obj_temp_meeting)){ + complex_event=false; + with(obj_temp_meeting){ + instance_destroy(); + } + if (instance_exists(obj_turn_end)){ + obj_turn_end.alarm[1]=1; + } + } + if (trading_artifact!=0){ + clear_diplo_choices(); + cooldown=8; + if (trading_artifact==2) and (instance_exists(obj_ground_mission)){ + obj_ground_mission.alarm[2]=1; + }// 135 this might not be needed + trading_artifact=0; + with(obj_popup){ + obj_ground_mission.alarm[1]=1; + instance_destroy(); + } + } + if (force_goodbye==5){ + clear_diplo_choices(); + } + if (liscensing==2) and (repair_ships==0){ + cooldown=8; + var cru=instance_create(mouse_x,mouse_y,obj_crusade); + cru.owner=diplomacy; + cru.placing=true; + exit_all=0; + liscensing=0; + if (zoomed==0) then scr_zoom(); + } + if (exit_all!=0){ + exit_all=0; + } + if (diplo_last=="artifact_thanks") and (force_goodbye!=0){ + + scr_toggle_armamentarium(); + _close_diplomacy = false; + } + // Exits back to diplomacy thing + if (audience==0){ + cooldown=8; + diplomacy=0; + force_goodbye=0; + _close_diplomacy = false; + } + // No need to check for next audience + if (audience>0) and (instance_exists(obj_turn_end)){ + if (complex_event==false){ + + obj_turn_end.alarm[1]=1; + show_debug_message("next_audience"); + } + if (complex_event=true){ + // TODO + } + } + if (_close_diplomacy){ + scr_toggle_diplomacy(); + } + } + + + diplo_buttons.declare_war = new ShutterButton(); + var _war = diplo_buttons.declare_war; + _war.XX= 640; + _war.YY= diplo_buttons.alliance.y2; + _war.label = "DECLARE WAR"; + _war.tooltip = "Unfinished"; + _war.color = CM_RED_COLOR; + _war.cover_text= "Declare War"; + _war.bind_scope = obj_controller; +} + +function set_up_diplomacy_persons(){ + diplo_persons = { + } + diplo_persons.imperium = new ShutterButton(); + var _imp = diplo_persons.imperium; + _imp.image = known[eFACTION.Imperium] ? 3 : 4; + _imp._faction_enum = eFACTION.Imperium; + + diplo_persons.mechanicus = new ShutterButton(); + var _mechs = diplo_persons.mechanicus; + _mechs.image = known[eFACTION.Mechanicus] ? 5 : 6; + _mechs._faction_enum = eFACTION.Mechanicus; + + diplo_persons.inquisition = new ShutterButton(); + var _inquis = diplo_persons.inquisition; + _inquis.image = known[eFACTION.Inquisition] ? 7 : 8; + _inquis._faction_enum = eFACTION.Inquisition; + + diplo_persons.sisters = new ShutterButton(); + var _sisters = diplo_persons.sisters; + _sisters.image = known[eFACTION.Ecclesiarchy] ? 9 : 10; + _sisters._faction_enum = eFACTION.Ecclesiarchy; + + + + diplo_persons.eldar = new ShutterButton(); + var _eldar = diplo_persons.eldar; + if (faction_gender[eFACTION.Eldar]=1){ + _eldar.image = known[eFACTION.Eldar] ? 9 : 10; + } else { + _eldar.image = known[eFACTION.Eldar] ? 21 : 22; + } + _eldar._faction_enum = eFACTION.Eldar; + + + diplo_persons.ork = new ShutterButton(); + var _orks = diplo_persons.ork; + _orks.image = known[eFACTION.Ork] ? 13 : 14; + _orks._faction_enum = eFACTION.Ork; + + diplo_persons.tau = new ShutterButton(); + var _tau = diplo_persons.tau; + _tau.image = known[eFACTION.Tau] ? 15 : 16; + _tau._faction_enum = eFACTION.Tau; + + diplo_persons.chaos = new ShutterButton(); + var imm=19; + if (known[eFACTION.Chaos]>0 && faction_gender[eFACTION.Chaos]=2) then imm=27; + if (known[eFACTION.Chaos]<1 && faction_gender[eFACTION.Chaos]=1) then imm=20; + if (known[eFACTION.Chaos]<1 && faction_gender[eFACTION.Chaos]=2) then imm=28; + var _chaos = diplo_persons.chaos; + _chaos.image = imm; + _chaos._faction_enum = eFACTION.Chaos; + + var _shutters = [_imp, _mechs, _inquis, _sisters, _eldar, _orks, _tau, _chaos]; + + for (var i=0;i0){ + txt=$"{obj_controller.faction_title[_faction_enum]} {obj_controller.faction_leader[_faction_enum]}"; + } + draw_text_transformed(xx+169,yy+50,txt,0.7,0.7,0); + draw_text_transformed(xx+169,yy+65,$"Disposition: {obj_controller.disposition[_faction_enum]}",0.7,0.7,0); + scr_draw_rainbow(xx+250,yy+66,xx+400,yy+76,(obj_controller.disposition[_faction_enum]/200)+0.5); + + if (obj_controller.known[_faction_enum]>0.7) and (obj_controller.faction_defeated[_faction_enum]=0) { + var _audience = management_buttons.audience; + _audience.update({ + x1: xx+169, + y1: yy+85, + }); + _audience.bind_method = function(){ + if (obj_controller.known[_faction_enum]!=0) and (obj_controller.turns_ignored[_faction_enum]==0){ + obj_controller.diplomacy = _faction_enum; + intro_to_diplomacy(_faction_enum); + } + + } + _audience.draw(); + var _ignore_status = obj_controller.ignore[_faction_enum] < 1 ? management_buttons.ignore : management_buttons.unignore; + + _ignore_status.update({ + x1: _audience.x2+1, + y1: yy+85, + }); + _ignore_status.draw(); + + + /*var fis;fis="[Request Audience]"; + if (turns_ignored[2]>0) then fis=" "; + if (ignore[eFACTION.Imperium]<1) then draw_text_transformed(xx+189,yy+354,string(fis)+" [Ignore]",0.7,0.7,0); + if (ignore[eFACTION.Imperium]>=1) then draw_text_transformed(xx+189,yy+354,string(fis)+"[Unignore]",0.7,0.7,0);*/ + } + } + } + } +} + + function scr_ui_diplomacy() { + if (menu != MENU.Diplomacy){ + return; + } var xx,yy,show_stuff; xx=__view_get( e__VW.XView, 0 )+0; yy=__view_get( e__VW.YView, 0 )+0; - var show_stuff=false;var warning=0; + var show_stuff=false; + var warning=0; // This script draws all of the diplomacy stuff, up to and including trading. xx+=6; - if (menu=20) and (diplomacy=0){// Main diplomacy screen + if (diplomacy=0){// Main diplomacy screen draw_set_alpha(1); draw_set_color(0); draw_rectangle(xx,yy,xx+1600,yy+900,0); @@ -36,91 +433,31 @@ function scr_ui_diplomacy() { xx+=55;yy-=20; + diplo_persons.imperium.draw_shutter(xx+31, yy+281, false, 1.5, known[eFACTION.Imperium]>0.7); + + diplo_persons.mechanicus.draw_shutter(xx+31, yy+417, false, 1.5, known[eFACTION.Mechanicus]>0.7); + + diplo_persons.inquisition.draw_shutter(xx+31, yy+553, false, 1.5, known[eFACTION.Inquisition]>0.7); + + diplo_persons.sisters.draw_shutter(xx+31, yy+689, false, 1.5, known[eFACTION.Ecclesiarchy]>0.7); + + diplo_persons.eldar.draw_shutter(xx+1041, yy+281, false, 1.5, known[eFACTION.Eldar]>0.7); + + diplo_persons.ork.draw_shutter(xx+1041, yy+417, false, 1.5, known[eFACTION.Ork]>0.7); + + diplo_persons.tau.draw_shutter(xx+1041, yy+553, false, 1.5, known[eFACTION.Tau]>0.7); + + diplo_persons.chaos.draw_shutter(xx+1041, yy+689, false, 1.5, known[eFACTION.Chaos]>0.7); + - var imm = 1; - if (known[eFACTION.Imperium]>0) then imm=3; - if (known[eFACTION.Imperium]<1) then imm=4;// draw_sprite(spr_diplomacy_med,imm,xx+31,yy+281); - scr_image("diplomacy/icons",imm,xx+31,yy+281,153,135); - if (faction_defeated[eFACTION.Imperium]=1) then draw_sprite(spr_diplomacy_defeated,0,xx+31,yy+281); - - if (known[eFACTION.Mechanicus]>0) then imm=5; - if (known[eFACTION.Mechanicus]<1) then imm=6;// draw_sprite(spr_diplomacy_med,imm,xx+31,yy+417); - scr_image("diplomacy/icons",imm,xx+31,yy+417,153,135); - if (faction_defeated[eFACTION.Mechanicus]=1) then draw_sprite(spr_diplomacy_defeated,0,xx+31,yy+417); - - if (known[eFACTION.Inquisition]>0) then imm=7; - if (known[eFACTION.Inquisition]<1) then imm=8;// draw_sprite(spr_diplomacy_med,imm,xx+31,yy+553); - scr_image("diplomacy/icons",imm,xx+31,yy+553,153,135); - if (faction_defeated[eFACTION.Inquisition]=1) then draw_sprite(spr_diplomacy_defeated,0,xx+31,yy+553); - - if (known[eFACTION.Ecclesiarchy]>0) then imm=9; - if (known[eFACTION.Ecclesiarchy]<1) then imm=10;// draw_sprite(spr_diplomacy_med,imm,xx+31,yy+689); - scr_image("diplomacy/icons",imm,xx+31,yy+689,153,135); - if (faction_defeated[eFACTION.Ecclesiarchy]=1) then draw_sprite(spr_diplomacy_defeated,0,xx+31,yy+689); - - - if (faction_gender[eFACTION.Eldar]=1){ //male eldar - if (known[eFACTION.Eldar]>0) then imm=11; - if (known[eFACTION.Eldar]<1) then imm=12;// draw_sprite(spr_diplomacy_med,imm,xx+1041,yy+281); - scr_image("diplomacy/icons",imm,xx+1041,yy+281,153,135); - } - - if (faction_gender[eFACTION.Eldar]=2){ //female eldar - if (known[eFACTION.Eldar]>0) then imm=21; - if (known[eFACTION.Eldar]<1) then imm=22;// draw_sprite(spr_diplomacy_med,imm,xx+1041,yy+281); - scr_image("diplomacy/icons",imm,xx+1041,yy+281,153,135); - } - - if (faction_defeated[eFACTION.Eldar]=1) then draw_sprite(spr_diplomacy_defeated,0,xx+1041,yy+281); - - if (known[eFACTION.Ork]>0) then imm=13; - if (known[eFACTION.Ork]<1) then imm=14;// draw_sprite(spr_diplomacy_med,imm,xx+1041,yy+417); - scr_image("diplomacy/icons",imm,xx+1041,yy+417,153,135); - if (faction_defeated[eFACTION.Ork]=1) then draw_sprite(spr_diplomacy_defeated,0,xx+1041,yy+417); - - if (known[eFACTION.Tau]>0) then imm=15; - if (known[eFACTION.Tau]<1) then imm=16;// draw_sprite(spr_diplomacy_med,imm,xx+1041,yy+553); - scr_image("diplomacy/icons",imm,xx+1041,yy+553,153,135); - if (faction_defeated[eFACTION.Tau]=1) then draw_sprite(spr_diplomacy_defeated,0,xx+1041,yy+553); - - if (known[eFACTION.Chaos]>0 && faction_gender[eFACTION.Chaos]=1) then imm=19; - if (known[eFACTION.Chaos]>0 && faction_gender[eFACTION.Chaos]=2) then imm=27; - if (known[eFACTION.Chaos]<1 && faction_gender[eFACTION.Chaos]=1) then imm=20; - if (known[eFACTION.Chaos]<1 && faction_gender[eFACTION.Chaos]=2) then imm=28; - // draw_sprite(spr_diplomacy_med,imm,xx+1041,yy+689); - scr_image("diplomacy/icons",imm,xx+1041,yy+689,153,135); - if (faction_defeated[eFACTION.Chaos]=1) then draw_sprite(spr_diplomacy_defeated,0,xx+1041,yy+689); - - - /*draw_rectangle(xx+26,yy+34,xx+312,yy+125,1);draw_line(xx+128,yy+34,xx+128,yy+125); - draw_rectangle(xx+26,yy+34+91,xx+312,yy+125+91,1);draw_line(xx+128,yy+34+91,xx+128,yy+125+91); - draw_rectangle(xx+26,yy+34+182,xx+312,yy+125+182,1);draw_line(xx+128,yy+34+182,xx+128,yy+125+182); - draw_rectangle(xx+26,yy+34+273,xx+312,yy+125+273,1);draw_line(xx+128,yy+34+273,xx+128,yy+125+273); - // - draw_rectangle(xx+26+286,yy+34,xx+312+286,yy+125,1);draw_line(xx+128+286,yy+34,xx+128+286,yy+125); - draw_rectangle(xx+26+286,yy+34+91,xx+312+286,yy+125+91,1);draw_line(xx+128+286,yy+34+91,xx+128+286,yy+125+91); - draw_rectangle(xx+26+286,yy+34+182,xx+312+286,yy+125+182,1);draw_line(xx+128+286,yy+34+182,xx+128+286,yy+125+182); - draw_rectangle(xx+26+286,yy+34+273,xx+312+286,yy+125+273,1);draw_line(xx+128+286,yy+34+273,xx+128+286,yy+125+273);*/ - - // draw_sprite(spr_diplo_symbols,0,xx+128,yy+174); - // draw_sprite(spr_diplo_symbols,1,xx+558,yy+174); - // draw_sprite(spr_diplo_symbols,2,xx+1147,yy+174); - scr_image("symbol",0,xx+128,yy+174,217,107); + scr_image("symbol",0,xx+138,yy+174,217,107); scr_image("symbol",1,xx+525,yy+174,109,54); scr_image("symbol",2,xx+1147,yy+174,217,107); - draw_rectangle(xx+31,yy+281,xx+438,yy+416,1); - draw_line(xx+184,yy+281,xx+184,yy+416); - draw_rectangle(xx+31,yy+417,xx+438,yy+552,1); - draw_line(xx+184,yy+417,xx+184,yy+553); - draw_rectangle(xx+31,yy+553,xx+438,yy+688,1); - draw_line(xx+184,yy+553,xx+184,yy+689); - draw_rectangle(xx+31,yy+689,xx+438,yy+824,1); - draw_line(xx+184,yy+689,xx+184,yy+824); - // - //draes chapter diplomacy - draw_rectangle(xx+451,yy+281,xx+675,yy+416,1); + + //draws chapter diplomacy + /*draw_rectangle(xx+451,yy+281,xx+675,yy+416,1); draw_line(xx+604,yy+281,xx+604,yy+416); draw_rectangle(xx+451,yy+417,xx+675,yy+552,1); draw_line(xx+604,yy+417,xx+604,yy+553); @@ -128,18 +465,7 @@ function scr_ui_diplomacy() { draw_line(xx+604,yy+553,xx+604,yy+689); draw_rectangle(xx+451,yy+689,xx+675,yy+824,1); draw_line(xx+604,yy+689,xx+604,yy+824); - - //draws chaos diplomacy - draw_rectangle(xx+688,yy+281,xx+1028,yy+416,1); - draw_rectangle(xx+688,yy+417,xx+1028,yy+552,1); - draw_rectangle(xx+688,yy+553,xx+1028,yy+688,1); - draw_rectangle(xx+688,yy+689,xx+1028,yy+824,1); - - // draws xenos diplomacy - draw_rectangle(xx+1041,yy+281,xx+1448,yy+416,1);draw_line(xx+1194,yy+281,xx+1194,yy+416); - draw_rectangle(xx+1041,yy+417,xx+1448,yy+552,1);draw_line(xx+1194,yy+417,xx+1194,yy+553); - draw_rectangle(xx+1041,yy+553,xx+1448,yy+688,1);draw_line(xx+1194,yy+553,xx+1194,yy+689); - draw_rectangle(xx+1041,yy+689,xx+1448,yy+824,1);draw_line(xx+1194,yy+689,xx+1194,yy+824); + */ @@ -147,92 +473,20 @@ function scr_ui_diplomacy() { draw_set_halign(fa_left); //draw faction names, etc - draw_text(xx+189,yy+285,string_hash_to_newline("Imperium")); - draw_text(xx+189,yy+421,string_hash_to_newline("Mechanicus")); - draw_text(xx+189,yy+557,string_hash_to_newline("Inquisition")); - draw_text(xx+189,yy+693,string_hash_to_newline("Ecclesiarchy")); - draw_text(xx+609,yy+285,string_hash_to_newline("Chapter 1")); - draw_text(xx+609,yy+421,string_hash_to_newline("Chapter 2")); - draw_text(xx+609,yy+557,string_hash_to_newline("Chapter 3")); - draw_text(xx+609,yy+693,string_hash_to_newline("Chapter 4")); - draw_text(xx+1199,yy+285,string_hash_to_newline("Eldar")); - draw_text(xx+1199,yy+421,string_hash_to_newline("Orks")); - draw_text(xx+1199,yy+557,string_hash_to_newline("Tau")); - draw_text(xx+1199,yy+693,string_hash_to_newline("Heretics")); + draw_text(xx+609,yy+285,"Chapter 1"); + draw_text(xx+609,yy+421,"Chapter 2"); + draw_text(xx+609,yy+557,"Chapter 3"); + draw_text(xx+609,yy+693,"Chapter 4"); //render status, i.e. whether at war, that stuff draw_set_font(fnt_40k_14); draw_set_halign(fa_right); - draw_text_transformed(xx+431,yy+289,string_hash_to_newline(string(faction_status[2])),0.7,0.7,0); - draw_text_transformed(xx+431,yy+425,string_hash_to_newline(faction_status[3]),0.7,0.7,0); - draw_text_transformed(xx+431,yy+561,string_hash_to_newline(faction_status[4]),0.7,0.7,0); - draw_text_transformed(xx+431,yy+697,string_hash_to_newline(faction_status[5]),0.7,0.7,0); - /*draw_text_transformed(xx+851,yy+289,faction_status[6],0.7,0.7,0); - draw_text_transformed(xx+851,yy+425,faction_status[7],0.7,0.7,0); - draw_text_transformed(xx+851,yy+561,faction_status[8],0.7,0.7,0); - draw_text_transformed(xx+851,yy+697,faction_status[10],0.7,0.7,0);*/ - draw_text_transformed(xx+1441,yy+289,string_hash_to_newline(faction_status[6]),0.7,0.7,0); - draw_text_transformed(xx+1441,yy+425,string_hash_to_newline(faction_status[7]),0.7,0.7,0); - draw_text_transformed(xx+1441,yy+561,string_hash_to_newline(faction_status[8]),0.7,0.7,0); - draw_text_transformed(xx+1441,yy+697,string_hash_to_newline(faction_status[10]),0.7,0.7,0); + draw_set_halign(fa_left); var txt; - txt="????"; - if (known[2]>0) then txt=string(faction_title[2])+" "+string(faction_leader[2]); - draw_text_transformed(xx+189,yy+309,string_hash_to_newline(txt),0.7,0.7,0); - txt="????"; - if (known[3]>0) then txt=string(faction_title[3])+" "+string(faction_leader[3]); - draw_text_transformed(xx+189,yy+445,string_hash_to_newline(txt),0.7,0.7,0); - txt="????"; - if (known[4]>0) then txt=string(faction_title[4])+" "+string(faction_leader[4]); - draw_text_transformed(xx+189,yy+581,string_hash_to_newline(txt),0.7,0.7,0); - txt="????"; - if (known[5]>0) then txt=string(faction_title[5])+" "+string(faction_leader[5]); - draw_text_transformed(xx+189,yy+717,string_hash_to_newline(txt),0.7,0.7,0); - /*txt="????";if (known[6]>0) then txt=string(faction_title[6])+" "+string(faction_leader[6]);draw_text_transformed(xx+609,yy+309,txt,0.7,0.7,0); - txt="????";if (known[7]>0) then txt=string(faction_title[7])+" "+string(faction_leader[7]);draw_text_transformed(xx+609,yy+445,txt,0.7,0.7,0); - txt="????";if (known[8]>0) then txt=string(faction_title[8])+" "+string(faction_leader[8]);draw_text_transformed(xx+609,yy+581,txt,0.7,0.7,0); - txt="????";if (known[10]>0) then txt=string(faction_title[10])+" "+string(faction_leader[10]);draw_text_transformed(xx+609,yy+717,txt,0.7,0.7,0);*/ - txt="????"; - if (known[6]>0) then txt=string(faction_title[6])+" "+string(faction_leader[6]); - draw_text_transformed(xx+1199,yy+309,string_hash_to_newline(txt),0.7,0.7,0); - txt="????"; - if (known[7]>0) then txt=string(faction_title[7])+" "+string(faction_leader[7]); - draw_text_transformed(xx+1199,yy+445,string_hash_to_newline(txt),0.7,0.7,0); - txt="????"; - if (known[8]>0) then txt=string(faction_title[8])+" "+string(faction_leader[8]); - draw_text_transformed(xx+1199,yy+581,string_hash_to_newline(txt),0.7,0.7,0); - txt="????";if (known[10]>0) then txt=string(faction_title[10])+" "+string(faction_leader[10]); - draw_text_transformed(xx+1199,yy+717,string_hash_to_newline(txt),0.7,0.7,0); - - //disposition score rendering - draw_text_transformed(xx+189,yy+324,string_hash_to_newline("Disposition: "+string(disposition[2])),0.7,0.7,0); - draw_text_transformed(xx+189,yy+460,string_hash_to_newline("Disposition: "+string(disposition[3])),0.7,0.7,0); - draw_text_transformed(xx+189,yy+596,string_hash_to_newline("Disposition: "+string(disposition[4])),0.7,0.7,0); - draw_text_transformed(xx+189,yy+732,string_hash_to_newline("Disposition: "+string(disposition[5])),0.7,0.7,0); - /*draw_text_transformed(xx+609,yy+324,"Disposition: "+string(disposition[6]),0.7,0.7,0); - draw_text_transformed(xx+609,yy+460,"Disposition: "+string(disposition[7]),0.7,0.7,0); - draw_text_transformed(xx+609,yy+596,"Disposition: "+string(disposition[8]),0.7,0.7,0); - draw_text_transformed(xx+609,yy+732,"Disposition: "+string(disposition[10]),0.7,0.7,0);*/ - draw_text_transformed(xx+1199,yy+324,string_hash_to_newline("Disposition: "+string(disposition[6])),0.7,0.7,0); - draw_text_transformed(xx+1199,yy+460,string_hash_to_newline("Disposition: "+string(disposition[7])),0.7,0.7,0); - draw_text_transformed(xx+1199,yy+596,string_hash_to_newline("Disposition: "+string(disposition[8])),0.7,0.7,0); - draw_text_transformed(xx+1199,yy+732,string_hash_to_newline("Disposition: "+string(disposition[10])),0.7,0.7,0); - - - //disposition bar rendering - scr_draw_rainbow(xx+270,yy+325,xx+420,yy+335,(disposition[2]/200)+0.5); - scr_draw_rainbow(xx+270,yy+325+136,xx+420,yy+335+136,(disposition[3]/200)+0.5); - scr_draw_rainbow(xx+270,yy+325+272,xx+420,yy+335+272,(disposition[4]/200)+0.5); - scr_draw_rainbow(xx+270,yy+325+408,xx+420,yy+335+408,(disposition[5]/200)+0.5); - - scr_draw_rainbow(xx+270+1010,yy+325,xx+420+1010,yy+335,(disposition[6]/200)+0.5); - scr_draw_rainbow(xx+270+1010,yy+325+136,xx+420+1010,yy+335+136,(disposition[7]/200)+0.5); - scr_draw_rainbow(xx+270+1010,yy+325+272,xx+420+1010,yy+335+272,(disposition[8]/200)+0.5); - scr_draw_rainbow(xx+270+1010,yy+325+408,xx+420+1010,yy+335+408,(disposition[10]/200)+0.5); - + /*draw_sprite(spr_disposition_small,round((disposition[2]+100)/10),xx+131,yy+74); draw_sprite(spr_disposition_small,round((disposition[3]+100)/10),xx+131+286,yy+74); @@ -265,199 +519,10 @@ function scr_ui_diplomacy() { #region faction talks/ignore stuff - if (known[2]>0.7) and (faction_defeated[2]=0) { - x6=xx+250;y6=yy+334;x7=x6+92;y7=y6+15; - if (turns_ignored[2]<=0) { - draw_set_color(38144); - draw_rectangle(x6,y6,x7,y7,0); - draw_set_color(c_black); - draw_text_transformed(x6,y6+1,string_hash_to_newline(" Request Audience"),0.7,0.7,0); - if (mouse_x>=x6) and (mouse_y>=y6) and (mouse_x=1) then draw_text_transformed(x6,y6+1,string_hash_to_newline(" Unignore"),0.7,0.7,0); - if (mouse_x>=x6) and (mouse_y>=y6) and (mouse_x0) then fis=" "; - if (ignore[eFACTION.Imperium]<1) then draw_text_transformed(xx+189,yy+354,string(fis)+" [Ignore]",0.7,0.7,0); - if (ignore[eFACTION.Imperium]>=1) then draw_text_transformed(xx+189,yy+354,string(fis)+"[Unignore]",0.7,0.7,0);*/ - } - - if (known[eFACTION.Mechanicus]>0.7) and (faction_defeated[3]=0){ - x6=xx+250;y6=yy+334+136;x7=x6+92;y7=y6+15; - if (turns_ignored[3]<=0) { - draw_set_color(38144); - draw_rectangle(x6,y6,x7,y7,0); - draw_set_color(c_black); - draw_text_transformed(x6,y6+1,string_hash_to_newline(" Request Audience"),0.7,0.7,0); - if (mouse_x>=x6) and (mouse_y>=y6) and (mouse_x=1) then draw_text_transformed(x6,y6+1,string_hash_to_newline(" Unignore"),0.7,0.7,0); - if (mouse_x>=x6) and (mouse_y>=y6) and (mouse_x0.7) and (faction_defeated[4]=0){ - x6=xx+250;y6=yy+334+272;x7=x6+92;y7=y6+15; - if (turns_ignored[4]<=0){ - draw_set_color(38144);draw_rectangle(x6,y6,x7,y7,0); - draw_set_color(c_black);draw_text_transformed(x6,y6+1,string_hash_to_newline(" Request Audience"),0.7,0.7,0); - if (mouse_x>=x6) and (mouse_y>=y6) and (mouse_x=1) then draw_text_transformed(x6,y6+1,string_hash_to_newline(" Unignore"),0.7,0.7,0); - if (mouse_x>=x6) and (mouse_y>=y6) and (mouse_x0.7) and (faction_defeated[5]=0){ - x6=xx+250;y6=yy+334+408;x7=x6+92;y7=y6+15; - if (turns_ignored[5]<=0){ - draw_set_color(38144);draw_rectangle(x6,y6,x7,y7,0); - draw_set_color(c_black);draw_text_transformed(x6,y6+1,string_hash_to_newline(" Request Audience"),0.7,0.7,0); - if (mouse_x>=x6) and (mouse_y>=y6) and (mouse_x=1) then draw_text_transformed(x6,y6+1,string_hash_to_newline(" Unignore"),0.7,0.7,0); - if (mouse_x>=x6) and (mouse_y>=y6) and (mouse_x0.7) and (faction_defeated[2]=0){ - x6=xx+250+1010;y6=yy+334;x7=x6+92;y7=y6+15; - if (turns_ignored[6]<=0){ - draw_set_color(38144);draw_rectangle(x6,y6,x7,y7,0); - draw_set_color(c_black);draw_text_transformed(x6,y6+1,string_hash_to_newline(" Request Audience"),0.7,0.7,0); - if (mouse_x>=x6) and (mouse_y>=y6) and (mouse_x=1) then draw_text_transformed(x6,y6+1,string_hash_to_newline(" Unignore"),0.7,0.7,0); - if (mouse_x>=x6) and (mouse_y>=y6) and (mouse_x0.7) and (faction_defeated[3]=0){ - x6=xx+250+1010;y6=yy+334+136;x7=x6+92;y7=y6+15; - if (turns_ignored[7]<=0){ - draw_set_color(38144);draw_rectangle(x6,y6,x7,y7,0); - draw_set_color(c_black);draw_text_transformed(x6,y6+1,string_hash_to_newline(" Request Audience"),0.7,0.7,0); - if (mouse_x>=x6) and (mouse_y>=y6) and (mouse_x=1) then draw_text_transformed(x6,y6+1,string_hash_to_newline(" Unignore"),0.7,0.7,0); - if (mouse_x>=x6) and (mouse_y>=y6) and (mouse_x0.7) and (faction_defeated[4]=0){ - x6=xx+250+1010;y6=yy+334+272;x7=x6+92;y7=y6+15; - if (turns_ignored[8]<=0){ - draw_set_color(38144);draw_rectangle(x6,y6,x7,y7,0); - draw_set_color(c_black);draw_text_transformed(x6,y6+1,string_hash_to_newline(" Request Audience"),0.7,0.7,0); - if (mouse_x>=x6) and (mouse_y>=y6) and (mouse_x=1) then draw_text_transformed(x6,y6+1,string_hash_to_newline(" Unignore"),0.7,0.7,0); - if (mouse_x>=x6) and (mouse_y>=y6) and (mouse_x0.7) and (faction_defeated[5]=0){ - x6=xx+250+1010;y6=yy+334+408;x7=x6+92;y7=y6+15; - if (turns_ignored[10]<=0){ - draw_set_color(38144);draw_rectangle(x6,y6,x7,y7,0); - draw_set_color(c_black);draw_text_transformed(x6,y6+1,string_hash_to_newline(" Request Audience"),0.7,0.7,0); - if (mouse_x>=x6) and (mouse_y>=y6) and (mouse_x=1) then draw_text_transformed(x6,y6+1,string_hash_to_newline(" Unignore"),0.7,0.7,0); - if (mouse_x>=x6) and (mouse_y>=y6) and (mouse_x0.7) and (faction_defeated[6]=0){ - var fis;fis="[Request Audience]"; - if (turns_ignored[6]>0) then fis=" "; - if (ignore[eFACTION.Eldar]<1) then draw_text_transformed(xx+1199,yy+354,string(fis)+" [Ignore]",0.7,0.7,0); - if (ignore[eFACTION.Eldar]>=1) then draw_text_transformed(xx+1199,yy+354,string(fis)+"[Unignore]",0.7,0.7,0); - } - if (known[eFACTION.Ork]>0.7) and (faction_defeated[7]=0){ - var fis;fis="[Request Audience]"; - if (turns_ignored[7]>0) then fis=" "; - if (ignore[eFACTION.Ork]<1) then draw_text_transformed(xx+1199,yy+490,string(fis)+" [Ignore]",0.7,0.7,0); - if (ignore[eFACTION.Ork]>=1) then draw_text_transformed(xx+1199,yy+490,string(fis)+"[Unignore]",0.7,0.7,0); - } - if (known[eFACTION.Tau]>0.7) and (faction_defeated[8]=0){ - var fis;fis="[Request Audience]"; - if (turns_ignored[8]>0) then fis=" "; - if (ignore[eFACTION.Tau]<1) then draw_text_transformed(xx+1199,yy+631,string(fis)+" [Ignore]",0.7,0.7,0); - if (ignore[eFACTION.Tau]>=1) then draw_text_transformed(xx+1199,yy+631,string(fis)+"[Unignore]",0.7,0.7,0); - } - if (known[eFACTION.Chaos]>0.7) and (faction_defeated[10]=0){ - var fis;fis="[Request Audience]"; - if (turns_ignored[10]>0) then fis=" "; - if (ignore[eFACTION.Chaos]<1) then draw_text_transformed(xx+1199,yy+762,string(fis)+" [Ignore]",0.7,0.7,0); - if (ignore[eFACTION.Chaos]>=1) then draw_text_transformed(xx+1199,yy+762,string(fis)+"[Unignore]",0.7,0.7,0); - }*/ - - - - - - - + /* faction_leader[0]="";faction_title[0]="";faction_status[0]="";faction_leader[1]="";faction_title[1]="";faction_status[1]=""; faction_leader[eFACTION.Imperium]="";faction_title[2]="Sector Commander";faction_status[eFACTION.Imperium]="Allied"; @@ -476,10 +541,11 @@ function scr_ui_diplomacy() { } - xx=__view_get( e__VW.XView, 0 );yy=__view_get( e__VW.YView, 0 ); + xx=__view_get( e__VW.XView, 0 ); + yy=__view_get( e__VW.YView, 0 ); - if (menu=20) and (diplomacy<-5) and (diplomacy>-6){ + if (diplomacy<-5) and (diplomacy>-6){ draw_sprite(spr_rock_bg,0,xx,yy); // draw_sprite(spr_diplo_splash,diplomacy,xx+916,yy+33); draw_set_alpha(0.75); @@ -503,8 +569,10 @@ function scr_ui_diplomacy() { draw_set_color(38144); draw_set_font(fnt_40k_30b); - var fac, fac2, fac3,warning;fac=""; - fac2=string(global.chapter_name)+" (Imperium)";fac3="";warning=0; + var fac=""; + var fac2=string(global.chapter_name)+" (Imperium)"; + var fac3=""; + var warning=0; if (advi="flee") then fac="Master of the Fleet "+string(obj_ini.lord_admiral_name); if (advi="apoth") then fac="Master of the Apothecarion "+string(obj_ini.name[0,4]); @@ -513,15 +581,15 @@ function scr_ui_diplomacy() { if (advi="tech") then fac="Forge Master "+string(obj_ini.name[0,2]); if (advi="") then fac="First Sergeant "+string(recruiter_name); - draw_text_transformed(xx+622,yy+66,string_hash_to_newline(string(fac2)),1,1,0); - draw_text_transformed(xx+622,yy+104,string_hash_to_newline(string(fac)),0.6,0.6,0); + draw_text_transformed(xx+622,yy+66,fac2,1,1,0); + draw_text_transformed(xx+622,yy+104,fac,0.6,0.6,0); show_stuff=true; } - if (menu=20) and (diplomacy>0){// Diplomacy - Speaking + if (diplomacy>0){// Diplomacy - Speaking var daemon; daemon=false; if (diplomacy>10) and (diplomacy<11) then daemon=true; @@ -588,262 +656,23 @@ function scr_ui_diplomacy() { draw_text(xx+622,yy+144,string_hash_to_newline(string(fac3))); scr_draw_rainbow(xx+366,yy+165,xx+871,yy+175,(disposition[diplomacy]/200)+0.5); } - draw_set_color(c_gray);draw_rectangle(xx+366,yy+165,xx+871,yy+175,1); + draw_set_color(c_gray); + draw_rectangle(xx+366,yy+165,xx+871,yy+175,1); show_stuff=true; } - if (warning=1) and (diplomacy>=6){ - var warn; - if (diplomacy<10) and (warning=1) then warn="Consorting with xenos will cause your disposition with the Imperium to lower."; - if (diplomacy>=10) and (warning=1) then warn="Consorting with heretics will cause your disposition with the Imperium to plummet."; - - draw_rectangle(mouse_x-2,mouse_y+20,mouse_x+2+string_width_ext(string_hash_to_newline(string(warn)),-1,600),mouse_y+24+string_height_ext(string_hash_to_newline(string(warn)),-1,600),0); - draw_set_color(38144); - draw_rectangle(mouse_x-2,mouse_y+20,mouse_x+2+string_width_ext(string_hash_to_newline(string(warn)),-1,600),mouse_y+24+string_height_ext(string_hash_to_newline(string(warn)),-1,600),1); - draw_text_ext(mouse_x,mouse_y+22,string_hash_to_newline(string(warn)),-1,600); - } - - if (show_stuff=true){ - draw_set_font(fnt_40k_14);draw_set_alpha(1); - draw_set_color(38144);draw_set_halign(fa_left); - draw_text_ext(xx+336+16,yy+209,string_hash_to_newline(string(diplo_txt)),-1,536); - xx=__view_get( e__VW.XView, 0 );yy=__view_get( e__VW.YView, 0 );draw_set_halign(fa_center); - draw_line(xx+429,yy+710,xx+800,yy+710); - - if (trading=0) and (diplo_option[1]="") and (diplo_option[2]="") and (diplo_option[3]="") and (diplo_option[4]=""){ - draw_set_color(38144); - if ((audience=0) and (force_goodbye=0)) or (faction_justmet=1){ - if (audience=0) and (force_goodbye=0){ - draw_rectangle(xx+442,yy+719,xx+547,yy+738,0); - draw_rectangle(xx+562,yy+719,xx+667,yy+738,0); - draw_rectangle(xx+682,yy+719,xx+787,yy+738,0); - } - - draw_rectangle(xx+442,yy+753,xx+547,yy+772,0); - draw_rectangle(xx+562,yy+753,xx+667,yy+772,0); - if (audience=0) and (force_goodbye=0){draw_rectangle(xx+682,yy+753,xx+787,yy+772,0);} - - if (audience=0) and (force_goodbye=0){draw_rectangle(xx+552,yy+785,xx+677,yy+804,0);}// Declare War? - } - draw_rectangle(xx+818,yy+796,xx+897,yy+815,0); - - draw_set_color(0); - draw_text(xx+442+52,yy+720,string_hash_to_newline("Trade")); - draw_text(xx+562+52,yy+720,string_hash_to_newline("Demand")); - draw_text(xx+682+52,yy+720,string_hash_to_newline("Discuss")); - draw_text(xx+442+52,yy+754,string_hash_to_newline("Denounce")); - draw_text(xx+562+52,yy+754,string_hash_to_newline("Praise")); - draw_text(xx+682+52,yy+754,string_hash_to_newline("Propose Alliance")); - draw_text(xx+614.5,yy+786,string_hash_to_newline("DECLARE WAR")); - draw_text(xx+857.5,yy+797,string_hash_to_newline("Exit")); - - draw_set_alpha(0.2); - if ((audience=0) and (force_goodbye=0)) or (faction_justmet=1){ - var show;show=false;if (faction_justmet=1) then show=true; - - - if (mouse_y>=yy+719) and (mouse_y=xx+442) and (mouse_x=xx+562) and (mouse_x=xx+682) and (mouse_x=yy+753) and (mouse_y=xx+442) and (mouse_x=xx+562) and (mouse_x=xx+682) and (mouse_x=xx+552) and (mouse_y>=yy+785) and (mouse_x<=xx+677) and (mouse_y<=yy+804) then draw_rectangle(xx+552,yy+785,xx+677,yy+804,0); - } - } - if (mouse_x>=xx+818) and (mouse_y>=yy+796) and (mouse_x<=xx+897) and (mouse_y<=yy+815) then draw_rectangle(xx+818,yy+796,xx+897,yy+815,0); - - draw_set_alpha(1); - draw_set_halign(fa_left); - draw_set_color(0); - - - - // draw_line(xx+220,yy+317,xx+592,yy+317); - } - - - // xx=view_xview[0];yy=view_yview[0]; - - - - if (trading=1){ - draw_set_color(38144); - draw_rectangle(xx+342,yy+326,xx+486,yy+673,1);draw_rectangle(xx+343,yy+327,xx+485,yy+672,1);// Left Main Panel - draw_rectangle(xx+504,yy+371,xx+741,yy+641,1);draw_rectangle(xx+505,yy+372,xx+740,yy+640,1);// Center panel - draw_rectangle(xx+759,yy+326,xx+903,yy+673,1);draw_rectangle(xx+760,yy+327,xx+902,yy+672,1);// Right Main Panel - - draw_rectangle(xx+342,yy+326,xx+486,yy+371,1);// Left Title Panel - draw_rectangle(xx+759,yy+326,xx+903,yy+371,1);// Right Title Panel - - draw_set_font(fnt_40k_14b);draw_set_halign(fa_center); - draw_text(xx+411,yy+330,string_hash_to_newline(string(obj_controller.faction[diplomacy])+"#Items")); - draw_text(xx+829,yy+330,string_hash_to_newline(string(global.chapter_name)+"#Items")); - - if (trade_likely!="") then draw_text(xx+623,yy+348,string_hash_to_newline("["+string(trade_likely)+"]")); - - // Buttons - draw_rectangle(xx+510,yy+649,xx+615,yy+668,0);// Clear - draw_rectangle(xx+630,yy+649,xx+735,yy+668,0);// Offer - draw_rectangle(xx+818,yy+796,xx+897,yy+815,0);// Cancel - - draw_set_color(0); - draw_text(xx+562,yy+649,string_hash_to_newline("Clear")); - draw_text(xx+682,yy+649,string_hash_to_newline("Offer")); - draw_text(xx+857.5,yy+797,string_hash_to_newline("Exit")); - - draw_set_alpha(0.2); - if (scr_hit(xx+510,yy+649,xx+615,yy+668)=true) then draw_rectangle(xx+510,yy+649,xx+615,yy+668,0); - if (scr_hit(xx+630,yy+649,xx+735,yy+668)=true) then draw_rectangle(xx+630,yy+649,xx+735,yy+668,0); - if (scr_hit(xx+818,yy+796,xx+897,yy+815)=true) then draw_rectangle(xx+818,yy+796,xx+897,yy+815,0); - draw_set_alpha(1); - - draw_set_halign(fa_left);draw_set_font(fnt_40k_14);draw_set_color(38144); - if (trading_artifact=0){ - draw_set_alpha(1);if (disposition[diplomacy]0){ - draw_set_font(fnt_40k_14b); - draw_text(xx+507,yy+381,string_hash_to_newline(string(obj_controller.faction[diplomacy])+":")); - draw_set_font(fnt_40k_14); - if (trading_artifact=0){ - if (trade_tnum[1]>0) then draw_sprite(spr_cancel_small,0,xx+507,yy+399); - if (trade_tnum[2]>0) then draw_sprite(spr_cancel_small,0,xx+507,yy+419); - if (trade_tnum[3]>0) then draw_sprite(spr_cancel_small,0,xx+507,yy+439); - if (trade_tnum[4]>0) then draw_sprite(spr_cancel_small,0,xx+507,yy+459); - } - if (trade_tnum[1]=1) and (trade_take[1]!="Artifact") then draw_text(xx+530,yy+399,string_hash_to_newline(string(trade_take[1]))); - if (trade_tnum[1]=1) and (trade_take[1]="Artifact") then draw_text(xx+530,yy+399,string_hash_to_newline(string(trade_take[1]))); - // - if (trade_tnum[1]>1) then draw_text(xx+530,yy+399,string_hash_to_newline(string(trade_take[1])+" ("+string(trade_tnum[1])+")")); - if (trade_tnum[2]=1) then draw_text(xx+530,yy+419,string_hash_to_newline(string(trade_take[2]))); - if (trade_tnum[2]>1) then draw_text(xx+530,yy+419,string_hash_to_newline(string(trade_take[2])+" ("+string(trade_tnum[2])+")")); - if (trade_tnum[3]=1) then draw_text(xx+530,yy+439,string_hash_to_newline(string(trade_take[3]))); - if (trade_tnum[3]>1) then draw_text(xx+530,yy+439,string_hash_to_newline(string(trade_take[3])+" ("+string(trade_tnum[3])+")")); - if (trade_tnum[4]=1) then draw_text(xx+530,yy+459,string_hash_to_newline(string(trade_take[4]))); - if (trade_tnum[4]>1) then draw_text(xx+530,yy+459,string_hash_to_newline(string(trade_take[4])+" ("+string(trade_tnum[4])+")")); - } - if (trade_mnum[1]+trade_mnum[2]+trade_mnum[3]+trade_mnum[4]>0){ - draw_set_font(fnt_40k_14b); - draw_text(xx+507,yy+529,string_hash_to_newline(string(global.chapter_name)+":")); - draw_set_font(fnt_40k_14); - if (trade_mnum[1]>0) then draw_sprite(spr_cancel_small,0,xx+507,yy+547); - if (trade_mnum[2]>0) then draw_sprite(spr_cancel_small,0,xx+507,yy+567); - if (trade_mnum[3]>0) then draw_sprite(spr_cancel_small,0,xx+507,yy+587); - if (trade_mnum[4]>0) then draw_sprite(spr_cancel_small,0,xx+507,yy+607); - - if (trade_mnum[1]=1) then draw_text(xx+530,yy+547,string_hash_to_newline(string(trade_give[1]))); - if (trade_mnum[1]>1) then draw_text(xx+530,yy+547,string_hash_to_newline(string(trade_give[1])+" ("+string(trade_mnum[1])+")")); - if (trade_mnum[2]=1) then draw_text(xx+530,yy+567,string_hash_to_newline(string(trade_give[2]))); - if (trade_mnum[2]>1) then draw_text(xx+530,yy+567,string_hash_to_newline(string(trade_give[2])+" ("+string(trade_mnum[2])+")")); - if (trade_mnum[3]=1) then draw_text(xx+530,yy+587,string_hash_to_newline(string(trade_give[3]))); - if (trade_mnum[3]>1) then draw_text(xx+530,yy+587,string_hash_to_newline(string(trade_give[3])+" ("+string(trade_mnum[3])+")")); - if (trade_mnum[4]=1) then draw_text(xx+530,yy+607,string_hash_to_newline(string(trade_give[4]))); - if (trade_mnum[4]>1) then draw_text(xx+530,yy+607,string_hash_to_newline(string(trade_give[4])+" ("+string(trade_mnum[4])+")")); - } - - } - + if (warning=1) and (diplomacy>=6){ + var warn; + if (diplomacy<10) and (warning=1) then warn="Consorting with xenos will cause your disposition with the Imperium to lower."; + if (diplomacy>=10) and (warning=1) then warn="Consorting with heretics will cause your disposition with the Imperium to plummet."; + + draw_rectangle(mouse_x-2,mouse_y+20,mouse_x+2+string_width_ext(warn,-1,600),mouse_y+24+string_height_ext(warn,-1,600),0); + draw_set_color(38144); + draw_rectangle(mouse_x-2,mouse_y+20,mouse_x+2+string_width_ext(warn,-1,600),mouse_y+24+string_height_ext(warn,-1,600),1); + draw_text_ext(mouse_x,mouse_y+22,warn,-1,600); + } - } //scr_dialogue(diplomacy_pathway); basic_diplomacy_screen(); diff --git a/sprites/spr_checker_texture/58ee1e71-509f-4b0e-ab39-17c8da2a0687.png b/sprites/spr_checker_texture/58ee1e71-509f-4b0e-ab39-17c8da2a0687.png index 19bf6388b199fb5c12384b20e0257e9508b4e3f2..8ecf8e9f25d6755a1130ba78f2c19adbbad50f24 100644 GIT binary patch delta 143 zcmeyu_JwW3JEnR=(-1=oD~>+3=P)iC(VHxG~gOaGILXlOA>PnaO=rYdhr6NhryHG)z4*}Q$iB}a2O|i diff --git a/sprites/spr_data_slate_border/88d208ab-efc3-4c8a-a23a-ac1685249362.png b/sprites/spr_data_slate_border/88d208ab-efc3-4c8a-a23a-ac1685249362.png index ef74d6130c8cefc5cccd3ca0d894fce9d13f298d..7cc0e67e07d4731025279ae06d55080543dd798c 100644 GIT binary patch delta 120 zcmezA`_p$rp_+%8uAym&p@o%^ft8`Dwt<0_fq~i)jp+;w45}rr5hW>!C8<`q`6-!c ql?+A(My9$3STuysoS;2me!t delta 120 zcmezA`_p$rp_+%WuAxbYk+GG5ft9g|Hjp$hn7Bdu3w$(bc)I$ztaD0e0sw?1BXR%$ diff --git a/sprites/spr_data_slate_border/layers/88d208ab-efc3-4c8a-a23a-ac1685249362/0c20ae10-2b03-43f4-b05e-7cb2256d0b71.png b/sprites/spr_data_slate_border/layers/88d208ab-efc3-4c8a-a23a-ac1685249362/0c20ae10-2b03-43f4-b05e-7cb2256d0b71.png index ef74d6130c8cefc5cccd3ca0d894fce9d13f298d..7cc0e67e07d4731025279ae06d55080543dd798c 100644 GIT binary patch delta 120 zcmezA`_p$rp_+%8uAym&p@o%^ft8`Dwt<0_fq~i)jp+;w45}rr5hW>!C8<`q`6-!c ql?+A(My9$3STuysoS;2me!t delta 120 zcmezA`_p$rp_+%WuAxbYk+GG5ft9g|Hjp$hn7Bdu3w$(bc)I$ztaD0e0sw?1BXR%$ diff --git a/sprites/spr_loading2/spr_loading2.yy b/sprites/spr_loading2/spr_loading2.yy index 79048779ae..226b3c9480 100644 --- a/sprites/spr_loading2/spr_loading2.yy +++ b/sprites/spr_loading2/spr_loading2.yy @@ -12,8 +12,8 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"v1","%Name":"cfe64c72-788d-4d52-bbd4-58b53f3c2e49","name":"cfe64c72-788d-4d52-bbd4-58b53f3c2e49","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, {"$GMSpriteFrame":"v1","%Name":"8b470910-b621-490a-a783-411ee078b812","name":"8b470910-b621-490a-a783-411ee078b812","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"cfe64c72-788d-4d52-bbd4-58b53f3c2e49","name":"cfe64c72-788d-4d52-bbd4-58b53f3c2e49","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, {"$GMSpriteFrame":"v1","%Name":"05f5f018-2f5d-40a3-a69e-4ef342b4279a","name":"05f5f018-2f5d-40a3-a69e-4ef342b4279a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, {"$GMSpriteFrame":"v1","%Name":"cf510d03-7a34-4777-a6e6-009ebcd6fccc","name":"cf510d03-7a34-4777-a6e6-009ebcd6fccc","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, {"$GMSpriteFrame":"v1","%Name":"37a52a8f-f010-4987-8d6a-4b83e1ff1186","name":"37a52a8f-f010-4987-8d6a-4b83e1ff1186","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, @@ -77,12 +77,12 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"cfe64c72-788d-4d52-bbd4-58b53f3c2e49","path":"sprites/spr_loading2/spr_loading2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"975627ff-8df0-4e31-9c0d-3a165e9ffa3e","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, {"$Keyframe":"","Channels":{ "0":{"$SpriteFrameKeyframe":"","Id":{"name":"8b470910-b621-490a-a783-411ee078b812","path":"sprites/spr_loading2/spr_loading2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"dff72920-d2c1-4bcb-84ea-e539caa245f8","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + },"Disabled":false,"id":"dff72920-d2c1-4bcb-84ea-e539caa245f8","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"cfe64c72-788d-4d52-bbd4-58b53f3c2e49","path":"sprites/spr_loading2/spr_loading2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"975627ff-8df0-4e31-9c0d-3a165e9ffa3e","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, {"$Keyframe":"","Channels":{ "0":{"$SpriteFrameKeyframe":"","Id":{"name":"05f5f018-2f5d-40a3-a69e-4ef342b4279a","path":"sprites/spr_loading2/spr_loading2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, },"Disabled":false,"id":"ec783239-b271-4744-bb34-213183fb1a9d","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, diff --git a/sprites/spr_mk7_complex_knees/b6ba8600-fb6b-4fa9-abc7-bdc2311eb79e.png b/sprites/spr_mk7_complex_knees/b6ba8600-fb6b-4fa9-abc7-bdc2311eb79e.png index 97884b9bb2ad5a9f5859d86c00d82a50d27ffe64..4bd1d4dfdb5af13a91af7edba6a43ad0269d8170 100644 GIT binary patch delta 116 zcmey)@ttGCM`kxe(-1=oD~>+3=P)iC(S3Dv&buA$mA%!cmXtu!PC{xWt~$(699GNA9er$ diff --git a/sprites/spr_ship_aconite/0135cb67-e9d4-47f9-ae29-035c8a8dfafa.png b/sprites/spr_ship_aconite/0135cb67-e9d4-47f9-ae29-035c8a8dfafa.png index 50d36041af5af209133e177a5b9e4faea9f70ccb..51be9a1a470b86728d9318e01d798a69d65bd811 100644 GIT binary patch literal 3933 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 diff --git a/sprites/spr_ship_aconite/layers/0135cb67-e9d4-47f9-ae29-035c8a8dfafa/dbd2f6e9-16f8-4d28-b0ee-9c4c7c1666c3.png b/sprites/spr_ship_aconite/layers/0135cb67-e9d4-47f9-ae29-035c8a8dfafa/dbd2f6e9-16f8-4d28-b0ee-9c4c7c1666c3.png index 50d36041af5af209133e177a5b9e4faea9f70ccb..60e01c8e6c0d7067d8e597de457c0abc8c068e44 100644 GIT binary patch literal 3933 zcmZ{nXD}QN)4)$jh=}M!i7t9h=kAmoqC^Q1IY-opa^&=0f)f#r5Kb30{(>k`bI$2R z=a1;Ui+-H$@qBq_-Ve|0?C$LD{ANGx&TiCmea(ARY*YXM;GVXYy3vhyyisn-+c%bO z)FkV_fvuL29suAk2mriC0RU$=srTyufEN$|*t7xwKq&wKi)+R&L�xw#_q5b-?w1 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 Z+Qs#MGYYgH2X7dFwuZj?52#hxe*karfb0MO literal 4037 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 diff --git a/sprites/spr_ship_aven/3b549580-f553-4212-b6bb-c41c3ff18e19.png b/sprites/spr_ship_aven/3b549580-f553-4212-b6bb-c41c3ff18e19.png index 25638fed989f3412cbaa1a75f0279326ade18bab..8721d9eeafe0f696140c84593a00ac56f9f27445 100644 GIT binary patch literal 16554 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 literal 15960 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 Kq^c$U3;sXdywY<3 literal 15960 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 literal 0 HcmV?d00001 diff --git a/sprites/spr_shutter_button_cover/layers/76267b7c-4ed6-4e13-80f8-12d83c354c19/b201671b-7405-4bb4-ab4e-e9c0d0be9fe7.png b/sprites/spr_shutter_button_cover/layers/76267b7c-4ed6-4e13-80f8-12d83c354c19/b201671b-7405-4bb4-ab4e-e9c0d0be9fe7.png new file mode 100644 index 0000000000000000000000000000000000000000..cc1403790352693870b05e20f3a4528cc963484d GIT binary patch literal 29394 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 literal 0 HcmV?d00001 diff --git a/sprites/spr_shutter_button_cover/spr_shutter_button_cover.yy b/sprites/spr_shutter_button_cover/spr_shutter_button_cover.yy new file mode 100644 index 0000000000..0bd0c8f503 --- /dev/null +++ b/sprites/spr_shutter_button_cover/spr_shutter_button_cover.yy @@ -0,0 +1,92 @@ +{ + "$GMSprite":"v2", + "%Name":"spr_shutter_button_cover", + "bboxMode":0, + "bbox_bottom":94, + "bbox_left":6, + "bbox_right":310, + "bbox_top":5, + "collisionKind":1, + "collisionTolerance":0, + "DynamicTexturePage":false, + "edgeFiltering":false, + "For3D":false, + "frames":[ + {"$GMSpriteFrame":"v1","%Name":"76267b7c-4ed6-4e13-80f8-12d83c354c19","name":"76267b7c-4ed6-4e13-80f8-12d83c354c19","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + ], + "gridX":0, + "gridY":0, + "height":1080, + "HTile":false, + "layers":[ + {"$GMImageLayer":"","%Name":"b201671b-7405-4bb4-ab4e-e9c0d0be9fe7","blendMode":0,"displayName":"default","isLocked":false,"name":"b201671b-7405-4bb4-ab4e-e9c0d0be9fe7","opacity":100.0,"resourceType":"GMImageLayer","resourceVersion":"2.0","visible":true,}, + ], + "name":"spr_shutter_button_cover", + "nineSlice":null, + "origin":9, + "parent":{ + "name":"buttons", + "path":"folders/Sprites/UI/New UI/buttons.yy", + }, + "preMultiplyAlpha":false, + "resourceType":"GMSprite", + "resourceVersion":"2.0", + "sequence":{ + "$GMSequence":"v1", + "%Name":"spr_shutter_button_cover", + "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_shutter_button_cover", + "playback":1, + "playbackSpeed":30.0, + "playbackSpeedType":0, + "resourceType":"GMSequence", + "resourceVersion":"2.0", + "seqHeight":1080.0, + "seqWidth":1000.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":"76267b7c-4ed6-4e13-80f8-12d83c354c19","path":"sprites/spr_shutter_button_cover/spr_shutter_button_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"131c5b6e-7e6d-4009-9f41-8c682fdbe6fa","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":5, + }, + "swatchColours":null, + "swfPrecision":2.525, + "textureGroupId":{ + "name":"Default", + "path":"texturegroups/Default", + }, + "type":0, + "VTile":false, + "width":1000, +} \ No newline at end of file From 37437d047ced8431bbd631605ba1d8345a8213da Mon Sep 17 00:00:00 2001 From: EttyKitty <20323032+EttyKitty@users.noreply.github.com> Date: Tue, 1 Jul 2025 01:31:44 +0300 Subject: [PATCH 109/286] feat: Screamer Pink colour (#898) --- scripts/scr_colors_initialize/scr_colors_initialize.gml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/scripts/scr_colors_initialize/scr_colors_initialize.gml b/scripts/scr_colors_initialize/scr_colors_initialize.gml index f1ebae5ee1..4758d4e5c7 100644 --- a/scripts/scr_colors_initialize/scr_colors_initialize.gml +++ b/scripts/scr_colors_initialize/scr_colors_initialize.gml @@ -37,7 +37,8 @@ enum Colors { Purple, Pink, Imperial_Fists, - Raptors_Green + Raptors_Green, + Screamer_Pink } function scr_colors_initialize() { @@ -81,7 +82,7 @@ function scr_colors_initialize() { ["Pink", 255, 0, 198], ["Imperial Fists", 255, 200, 0], ["Raptors Green", 65, 74, 29], - + ["Screamer Pink", 122, 14, 68] ]; global.colors_count = array_length(colors_array); From 7b852d5d29119450755b9404a1cb90a55435bea0 Mon Sep 17 00:00:00 2001 From: Nelsonh <81228864+OH296@users.noreply.github.com> Date: Mon, 30 Jun 2025 23:50:17 +0100 Subject: [PATCH 110/286] fix: Cataphractii armour issues and modding weapons fix (#899) --- scripts/macros/macros.gml | 2 +- scripts/scr_ComplexSet/scr_ComplexSet.gml | 2 +- .../scr_culture_visuals.gml | 37 +++++++++--------- .../scr_draw_unit_image.gml | 2 +- scripts/scr_weapon/scr_weapon.gml | 2 +- .../cc1bb055-3092-4530-9edd-694aca0796a7.png | Bin 1110 -> 1093 bytes .../df8d27d6-66e9-4750-b0dc-950fe74d3e9f.png | Bin 1101 -> 1058 bytes .../1875f065-a467-43e5-b1cb-779c58891acc.png | Bin 1110 -> 1093 bytes .../1875f065-a467-43e5-b1cb-779c58891acc.png | Bin 1101 -> 1058 bytes 9 files changed, 23 insertions(+), 22 deletions(-) diff --git a/scripts/macros/macros.gml b/scripts/macros/macros.gml index 4aaf8fd953..b3808ca38d 100644 --- a/scripts/macros/macros.gml +++ b/scripts/macros/macros.gml @@ -17,7 +17,7 @@ // Basic, because we don't include Artificer Armour #macro LIST_BASIC_POWER_ARMOUR ["MK7 Aquila", "MK6 Corvus", "MK5 Heresy", "MK8 Errant", "MK4 Maximus", "MK3 Iron Armour","Power Armour"] -#macro LIST_TERMINATOR_ARMOUR ["Terminator Armour", "Tartaros","Cataphractii Pattern Terminator"] +#macro LIST_TERMINATOR_ARMOUR ["Terminator Armour", "Tartaros","Cataphractii"] enum MENU { Default = 0, diff --git a/scripts/scr_ComplexSet/scr_ComplexSet.gml b/scripts/scr_ComplexSet/scr_ComplexSet.gml index 69da81292f..1c108d09fd 100644 --- a/scripts/scr_ComplexSet/scr_ComplexSet.gml +++ b/scripts/scr_ComplexSet/scr_ComplexSet.gml @@ -1180,7 +1180,7 @@ function ComplexSet(_unit) constructor { }); armour_type = ArmourType.Terminator; break; - case "Cataphractii Pattern Terminator": + case "Cataphractii": add_group({ head: spr_cata_head, belt : spr_cata_belt, diff --git a/scripts/scr_culture_visuals/scr_culture_visuals.gml b/scripts/scr_culture_visuals/scr_culture_visuals.gml index 1ee4cdfb7e..0bf1414665 100644 --- a/scripts/scr_culture_visuals/scr_culture_visuals.gml +++ b/scripts/scr_culture_visuals/scr_culture_visuals.gml @@ -134,18 +134,19 @@ function load_vis_set_to_global(directory, data){ sprite_delete(_merge_sprite); } var _s_data = _sprite_item.data; - show_debug_message(_sprite_item.name); _s_data.name = _sprite_item.name; _s_data.sprite = _new_sprite; if (_s_data.position == "weapon"){ var _weapon_vis = global.weapon_visual_data; - if (struct_exists(_s_data,"base_weapon")){ - array_push(_weapon_vis.variants, _s_data); + struct_remove(_s_data, "position"); + if (struct_exists(_weapon_vis,_s_data.base_weapon)){ + array_push(_weapon_vis[$_s_data.base_weapon].variants, _s_data); } else { _weapon_vis[$ _s_data.base_weapon] = { base : _s_data, variants : [{sprite : _s_data.sprite}], }; + struct_remove(_weapon_vis[$ _s_data.base_weapon].base, "base_weapon"); } } else { array_push(global.modular_drawing_items, _s_data); @@ -1093,7 +1094,7 @@ global.modular_drawing_items = [ position : "left_arm", sprite : spr_cata_left_arm, body_types:[2], - armours : ["Cataphractii Pattern Terminator"], + armours : ["Cataphractii"], subcomponents : [ [spr_blank,spr_cata_left_armtrim] ] @@ -1102,7 +1103,7 @@ global.modular_drawing_items = [ position : "right_arm", sprite : spr_cata_right_arm, body_types:[2], - armours : ["Cataphractii Pattern Terminator"], + armours : ["Cataphractii"], subcomponents : [ [spr_blank,spr_cata_right_armtrim] ] @@ -1111,7 +1112,7 @@ global.modular_drawing_items = [ position : "armour", sprite : spr_cata_complex, body_types:[2], - armours : ["Cataphractii Pattern Terminator"], + armours : ["Cataphractii"], subcomponents : [ [spr_cata_cowl_trim], ] @@ -1120,7 +1121,7 @@ global.modular_drawing_items = [ position : "tabbard", sprite : spr_cata_tabbard_leather, body_types:[2], - armours : ["Cataphractii Pattern Terminator"], + armours : ["Cataphractii"], subcomponents : [ [spr_blank,spr_cata_tabbard_leather_hangings], ] @@ -1129,27 +1130,27 @@ global.modular_drawing_items = [ position : "tabbard", sprite : spr_cata_tabbard_mail, body_types:[2], - armours : ["Cataphractii Pattern Terminator"], + armours : ["Cataphractii"], }, { position : "right_knee", sprite : spr_cata_right_knee, body_types:[2], - armours : ["Cataphractii Pattern Terminator"], + armours : ["Cataphractii"], max_saturation : 50, }, { position : "left_knee", sprite : spr_cata_left_knee, body_types:[2], - armours : ["Cataphractii Pattern Terminator"], + armours : ["Cataphractii"], max_saturation : 50, }, { position : "right_leg", sprite : spr_cata_right_leg, body_types:[2], - armours : ["Cataphractii Pattern Terminator"], + armours : ["Cataphractii"], subcomponents : [ [spr_blank,spr_cata_heavy_toe_right], ] @@ -1158,7 +1159,7 @@ global.modular_drawing_items = [ position : "left_leg", sprite : spr_cata_left_leg, body_types:[2], - armours : ["Cataphractii Pattern Terminator"], + armours : ["Cataphractii"], subcomponents : [ [spr_blank,spr_cata_heavy_toe_left], ], @@ -1167,7 +1168,7 @@ global.modular_drawing_items = [ position : "right_pauldron_embeleshments", sprite : spr_cata_shoulder_hanging_leather_right, body_types:[2], - armours : ["Cataphractii Pattern Terminator"], + armours : ["Cataphractii"], subcomponents : [ [spr_blank, spr_cata_shoulder_hanging_leather_right_tips], ], @@ -1176,7 +1177,7 @@ global.modular_drawing_items = [ position : "left_pauldron_embeleshments", sprite : spr_cata_shoulder_hanging_leather_left, body_types:[2], - armours : ["Cataphractii Pattern Terminator"], + armours : ["Cataphractii"], subcomponents : [ [spr_blank, spr_cata_shoulder_hanging_leather_left_tips], ], @@ -1185,19 +1186,19 @@ global.modular_drawing_items = [ position : "right_pauldron_embeleshments", sprite : spr_cata_shoulder_hanging_mail_right, body_types:[2], - armours : ["Cataphractii Pattern Terminator"], + armours : ["Cataphractii"], }, { position : "left_pauldron_embeleshments", sprite : spr_cata_shoulder_hanging_mail_left, body_types:[2], - armours : ["Cataphractii Pattern Terminator"], + armours : ["Cataphractii"], }, { sprite : spr_blank, body_types :[2], position : "left_trim", - armours : ["Cataphractii Pattern Terminator"], + armours : ["Cataphractii"], subcomponents : [ [spr_blank, spr_cata_left_trim], [spr_blank, spr_cata_left_trim_2], @@ -1208,7 +1209,7 @@ global.modular_drawing_items = [ sprite : spr_blank, body_types :[2], position : "right_trim", - armours : ["Cataphractii Pattern Terminator"], + armours : ["Cataphractii"], subcomponents : [ [spr_blank, spr_cata_right_trim], [spr_blank, spr_cata_right_trim_2], 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 ed69155468..541e0cefce 100644 --- a/scripts/scr_draw_unit_image/scr_draw_unit_image.gml +++ b/scripts/scr_draw_unit_image/scr_draw_unit_image.gml @@ -453,7 +453,7 @@ function scr_draw_unit_image(_background = false) { // if (skin_color!=6) then draw_sprite(spr_clothing_colors,clothing_style,x_surface_offset,y_surface_offset); } else { - var _complex_armours = ["MK3 Iron Armour", "Terminator Armour", "Tartaros", "MK7 Aquila", "Power Armour", "MK8 Errant", "Artificer Armour", "MK4 Maximus", "MK5 Heresy", "MK6 Corvus", "Dreadnought", "Scout Armour"]; + var _complex_armours = ["MK3 Iron Armour", "Terminator Armour", "Tartaros", "MK7 Aquila", "Power Armour", "MK8 Errant", "Artificer Armour", "MK4 Maximus", "MK5 Heresy", "MK6 Corvus", "Dreadnought", "Scout Armour","Cataphractii"]; if (array_contains(_complex_armours, unit_armour)) { complex_set = new ComplexSet(self); complex_livery = true; diff --git a/scripts/scr_weapon/scr_weapon.gml b/scripts/scr_weapon/scr_weapon.gml index 807ec6a557..ac77cb9101 100644 --- a/scripts/scr_weapon/scr_weapon.gml +++ b/scripts/scr_weapon/scr_weapon.gml @@ -2289,7 +2289,7 @@ global.gear = { "req_exp": 100, "maintenance" : 0.5, }, - "Cataphractii Pattern Terminator": { + "Cataphractii": { "abbreviation": "Catphr", "armour_value": { "standard": 42, diff --git a/sprites/spr_cata_head/cc1bb055-3092-4530-9edd-694aca0796a7.png b/sprites/spr_cata_head/cc1bb055-3092-4530-9edd-694aca0796a7.png index 3fea25957307e4532187d829eae652a6ee6d1b3d..e8273da74a2c5bb2fb352cadddb7e850d71bcaa7 100644 GIT binary patch delta 884 zcmcb{ag<|1QoV(zi(^Q|t+%&M=RS60V0$p%k?Z6|-Y05|OpBC?f*DsjhE{qVEaRrYyIE8 zU-C3-U+wyBc{44a*JsA&e_I>=PxE9|&fbPR*TNE%s&3`tP&i{QWCgAKD~; zH`*)rT2)_m*7+-|uj%W*eaZ2>^737S*!AaIO5Pu`OrMk$%ToO7qWZ7JhRtEV#)t%o~&maGvxxfAQ z^346;_iWPruBvxv!sPeTyC>*|e_q%ACg=30!~OPgha#r+*K7^h_40S|Wp(=m`7@Ds zYkZ5QtIYoOCH2)=$?drg{ioc%N2q?y+5dX|*JZo3v+lgHHG2MLrjJ@>U7cOrMV0#J z>s3xZuemvO>&DFH?Y?D>y3dy1u9If2XS+YMPwqIc;JMSb&ps^fJ$hmK%+vsW8TQN8 z=Z#xFbIt#}^pDX?!;{-X^!MIdb5FHkTjk1-{98}LJZIG^{LiSLqcBH&##LXl(5)8X z=^nP(ryABBe^uaP;hyuVxqXt#*NdMb6n>xjQ0n;i`T572uHAL*y~ps-Cedi7is$cy zAo(@+yG>@)#`^zyU*FFEu>H4^;JLumh&bsZhR%m8_O3LV>0`50Jnx(Atq%FZPvx7x zzew}{Gbh;jSLJK%*Xo|B8SIk{nad|TFtgM@SXRRxdimAn`P-LX1SUh(64!{5l*E!$ ztK_0oAjM#0U}UOmV5Vzq5MpRyWngM$Y@}^qU}a#iF-^|^MMG|WN@iLmZVd;lr}Y3e iXuxeK$;?fitj@xxh++10z3suEJmKl;=d#Wzp$PyLo}n`U delta 901 zcmX@gagAd_QoX0Ai(^Q|t+%&q^B%iNusxXW$oDwuc8QRJf|ZMvyn=dw^2NNGCYglY zGKUyhPQ>2Q-F8RG*YBW+(o;d#SI5f|-oL73U_8=c{OEjlzjGHS0~8#HUUjdUxz53N z-ASSRW%jNTQAA+^zF>r(_gC`*UsX2 zq43bg-+spPwjz(~+c{P?@cn$b*ZhI?mstt_CdT`FZ?|pS9&*nUy z)&BeVyY(kB&HH0?o-;G9{eH;O=J^`FU!qrwZvB0_GveG?>uA11JC>ENd|MyBE%wJR z{R*2q_I|&wem=Bu&U6b7=RUjqH%{9k&h6&9d2`C!-}?17?HhCCE3;RYTz&q0Re9Y3 zy&0Q#{hakg&GXvVkB6_!HqN`%Ah)IWU((booA3J9uf2ZNcjK|E^OTFv%{!SgY5DTy zhxKPY+5Tsi%1`6^+}pQqY&m#a<@N%x&zF7c>w6fR&-=J3U1d)CjH|xau0FW(USUS<*EO2VyS(@gN1QR&e_`*Bj>-F1+q#GEe!N^}_mcVBb`|_pSs8PSak3(F*<=G|*7_Y< z{~2%H`Vi42bnpf+QL2`>MwFx^mZVxG7o`Fz1|tI_Q(XfyT_cMS14AnVb1MTgZ36=< z0|UjHqZlfhP`?NmkGc z$UZW#3>aCn{MLq;dz*j8w9m#BA}y$^D@I= zUK+|VUEd<40y^f8&)$Jw(0hXUJ=XKv63+9=s`=4@YS-61WpLMza9-<6`VJD>eX@6U+aB!SG2gnFj>x|;XF(~n1_aPNISO(selgo;nX|u4SGs2|BLN>w}f-QvT8nepf=lEe@O4H zAK^UK`^{^o*?)Yxe6DSsGd<^SZ8iI+xBh*S>#<3_yY&prEtT8WdlppAulF@oPo+G9 zaPD#cFufV8l80WJ_l&EqA0FD%63+c5_m}DBdQV8V4(vITRM$l?C#U|RFO8ma-1_$B zuKg);()N+F`E($lO(&egJ!kc3UQsP4?N6Sw`BdMz;eQ~ETlX%t{mQltU;hstw>Ni_ ze)T+ZTh2=ygdsbhH?|?0&8KaJY%R<6-9LXkgt1&d@~@@RS)ZS?{_+F1!MtqNpORc8 z$)c%tKIG~3jLS_xAFUhx#42enw;%nfSyUIrh_gLMdd{A@uCrRL2H*Q-{d1D!_xyRk zViTK9@PC%ceNc=3wA*(M)Z}-0n?Lf`QTuT&g!4dkUU!yP`S>_&RX3Z(h_r?|d zCI#Ufv1mFsB}tlx#i|*dciF6Sxk#Etwewcy*F`rEfov9?ffpf(aPCysb&_muOq$Mn zm(A{Kx2qa9iz>hU-A!)yvq*$+K89f{5eOH0RwZB z5CaMf|EGTe({jD=;uRFfgGfedUv}0~}Q{I8-n( zIxsmpF*7SLFgh?W(0avL0000ebVXQnWMOn=I&^7mWpi|4ZEyfGFfuhQFg7hRI8-n( fIxsmpF*7SLFgh?Whi~MD00000NkvXXu0mjf70#VS diff --git a/sprites/spr_cata_head/layers/cc1bb055-3092-4530-9edd-694aca0796a7/1875f065-a467-43e5-b1cb-779c58891acc.png b/sprites/spr_cata_head/layers/cc1bb055-3092-4530-9edd-694aca0796a7/1875f065-a467-43e5-b1cb-779c58891acc.png index 3fea25957307e4532187d829eae652a6ee6d1b3d..e8273da74a2c5bb2fb352cadddb7e850d71bcaa7 100644 GIT binary patch delta 884 zcmcb{ag<|1QoV(zi(^Q|t+%&M=RS60V0$p%k?Z6|-Y05|OpBC?f*DsjhE{qVEaRrYyIE8 zU-C3-U+wyBc{44a*JsA&e_I>=PxE9|&fbPR*TNE%s&3`tP&i{QWCgAKD~; zH`*)rT2)_m*7+-|uj%W*eaZ2>^737S*!AaIO5Pu`OrMk$%ToO7qWZ7JhRtEV#)t%o~&maGvxxfAQ z^346;_iWPruBvxv!sPeTyC>*|e_q%ACg=30!~OPgha#r+*K7^h_40S|Wp(=m`7@Ds zYkZ5QtIYoOCH2)=$?drg{ioc%N2q?y+5dX|*JZo3v+lgHHG2MLrjJ@>U7cOrMV0#J z>s3xZuemvO>&DFH?Y?D>y3dy1u9If2XS+YMPwqIc;JMSb&ps^fJ$hmK%+vsW8TQN8 z=Z#xFbIt#}^pDX?!;{-X^!MIdb5FHkTjk1-{98}LJZIG^{LiSLqcBH&##LXl(5)8X z=^nP(ryABBe^uaP;hyuVxqXt#*NdMb6n>xjQ0n;i`T572uHAL*y~ps-Cedi7is$cy zAo(@+yG>@)#`^zyU*FFEu>H4^;JLumh&bsZhR%m8_O3LV>0`50Jnx(Atq%FZPvx7x zzew}{Gbh;jSLJK%*Xo|B8SIk{nad|TFtgM@SXRRxdimAn`P-LX1SUh(64!{5l*E!$ ztK_0oAjM#0U}UOmV5Vzq5MpRyWngM$Y@}^qU}a#iF-^|^MMG|WN@iLmZVd;lr}Y3e iXuxeK$;?fitj@xxh++10z3suEJmKl;=d#Wzp$PyLo}n`U delta 901 zcmX@gagAd_QoX0Ai(^Q|t+%&q^B%iNusxXW$oDwuc8QRJf|ZMvyn=dw^2NNGCYglY zGKUyhPQ>2Q-F8RG*YBW+(o;d#SI5f|-oL73U_8=c{OEjlzjGHS0~8#HUUjdUxz53N z-ASSRW%jNTQAA+^zF>r(_gC`*UsX2 zq43bg-+spPwjz(~+c{P?@cn$b*ZhI?mstt_CdT`FZ?|pS9&*nUy z)&BeVyY(kB&HH0?o-;G9{eH;O=J^`FU!qrwZvB0_GveG?>uA11JC>ENd|MyBE%wJR z{R*2q_I|&wem=Bu&U6b7=RUjqH%{9k&h6&9d2`C!-}?17?HhCCE3;RYTz&q0Re9Y3 zy&0Q#{hakg&GXvVkB6_!HqN`%Ah)IWU((booA3J9uf2ZNcjK|E^OTFv%{!SgY5DTy zhxKPY+5Tsi%1`6^+}pQqY&m#a<@N%x&zF7c>w6fR&-=J3U1d)CjH|xau0FW(USUS<*EO2VyS(@gN1QR&e_`*Bj>-F1+q#GEe!N^}_mcVBb`|_pSs8PSak3(F*<=G|*7_Y< z{~2%H`Vi42bnpf+QL2`>MwFx^mZVxG7o`Fz1|tI_Q(XfyT_cMS14AnVb1MTgZ36=< z0|UjHqZlfhP`?NmkGc z$UZW#3>aCn{MLq;dz*j8w9m#BA}y$^D@I= zUK+|VUEd<40y^f8&)$Jw(0hXUJ=XKv63+9=s`=4@YS-61WpLMza9-<6`VJD>eX@6U+aB!SG2gnFj>x|;XF(~n1_aPNISO(selgo;nX|u4SGs2|BLN>w}f-QvT8nepf=lEe@O4H zAK^UK`^{^o*?)Yxe6DSsGd<^SZ8iI+xBh*S>#<3_yY&prEtT8WdlppAulF@oPo+G9 zaPD#cFufV8l80WJ_l&EqA0FD%63+c5_m}DBdQV8V4(vITRM$l?C#U|RFO8ma-1_$B zuKg);()N+F`E($lO(&egJ!kc3UQsP4?N6Sw`BdMz;eQ~ETlX%t{mQltU;hstw>Ni_ ze)T+ZTh2=ygdsbhH?|?0&8KaJY%R<6-9LXkgt1&d@~@@RS)ZS?{_+F1!MtqNpORc8 z$)c%tKIG~3jLS_xAFUhx#42enw;%nfSyUIrh_gLMdd{A@uCrRL2H*Q-{d1D!_xyRk zViTK9@PC%ceNc=3wA*(M)Z}-0n?Lf`QTuT&g!4dkUU!yP`S>_&RX3Z(h_r?|d zCI#Ufv1mFsB}tlx#i|*dciF6Sxk#Etwewcy*F`rEfov9?ffpf(aPCysb&_muOq$Mn zm(A{Kx2qa9iz>hU-A!)yvq*$+K89f{5eOH0RwZB z5CaMf|EGTe({jD=;uRFfgGfedUv}0~}Q{I8-n( zIxsmpF*7SLFgh?W(0avL0000ebVXQnWMOn=I&^7mWpi|4ZEyfGFfuhQFg7hRI8-n( fIxsmpF*7SLFgh?Whi~MD00000NkvXXu0mjf70#VS From d6692fafd86cb0d5947a940702ec38bb618ef766 Mon Sep 17 00:00:00 2001 From: Nelsonh <81228864+OH296@users.noreply.github.com> Date: Tue, 1 Jul 2025 00:20:45 +0100 Subject: [PATCH 111/286] fix: GC timer reversion (#900) --- objects/obj_garbage_collector/Step_0.gml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/objects/obj_garbage_collector/Step_0.gml b/objects/obj_garbage_collector/Step_0.gml index 973cb5e1fc..88117f46f7 100644 --- a/objects/obj_garbage_collector/Step_0.gml +++ b/objects/obj_garbage_collector/Step_0.gml @@ -4,7 +4,7 @@ if (gc_timer > 0) { } else { - gc_timer = 50000; // Default is every frame, so de-facto 1; + gc_timer = 50; // Default is every frame, so de-facto 1; gc_collect(); wait_and_execute(0, function(){ From 2184f634ccb908a0fa1013f888bd33488ec991ca Mon Sep 17 00:00:00 2001 From: EttyKitty <20323032+EttyKitty@users.noreply.github.com> Date: Tue, 1 Jul 2025 13:13:39 +0300 Subject: [PATCH 112/286] fix: The return of the Storm Shield (#901) --- scripts/scr_weapon/scr_weapon.gml | 203 +++++++++++++----------------- 1 file changed, 85 insertions(+), 118 deletions(-) diff --git a/scripts/scr_weapon/scr_weapon.gml b/scripts/scr_weapon/scr_weapon.gml index ac77cb9101..eca3d8e294 100644 --- a/scripts/scr_weapon/scr_weapon.gml +++ b/scripts/scr_weapon/scr_weapon.gml @@ -1,7 +1,7 @@ global.weapons = { //30k Weapons //Volkite Pack -"Volkite Culverin": { + "Volkite Culverin": { "abbreviation": "VolkCul", "attack": { "standard": 700, @@ -16,9 +16,8 @@ global.weapons = { "spli": 12, "arp": 0, "tags": ["Volkite", "energy"] -}, - -"Volkite Caliver": { + }, + "Volkite Caliver": { "abbreviation": "VolkCal", "attack": { "standard": 550, @@ -33,9 +32,8 @@ global.weapons = { "spli": 10, "arp": 0, "tags": ["Volkite", "energy"] -}, - -"Volkite Charger": { + }, + "Volkite Charger": { "abbreviation": "VolkCharg", "attack": { "standard": 400, @@ -50,9 +48,8 @@ global.weapons = { "spli": 6, "arp": 0, "tags": ["Volkite", "energy"] -}, - -"Volkite Serpenta": { + }, + "Volkite Serpenta": { "abbreviation": "VolkSerp", "attack": { "standard": 250, @@ -67,27 +64,25 @@ global.weapons = { "spli": 4, "arp": 0, "tags": ["Volkite", "energy", "pistol"] -}, - -//Bolt Pack -"Phobos Bolt Pistol": { + }, + //Bolt Pack + "Phobos Bolt Pistol": { "abbreviation": "PhBltPis", "attack": { "standard": 38, "master_crafted": 43, "artifact": 48 }, - "description":"Once primary personal weapon of ancient astartes legions, now an uncommon sight on the battlefield.This weapon was hand-crafted by the Fabricators of Mars at the very birth of the Imperium during the Great Crusade.", + "description": "Once primary personal weapon of ancient astartes legions, now an uncommon sight on the battlefield. This weapon was hand-crafted by the Fabricators of Mars at the very birth of the Imperium during the Great Crusade.", "melee_hands": 0, "ranged_hands": 1, "ammo": 20, "range": 3.5, "spli": 2, "arp": 0, - "tags": ["bolt", "pistol"], + "tags": ["bolt", "pistol"] }, - -"Phobos Bolter": { + "Phobos Bolter": { "abbreviation": "PhBltr", "attack": { "standard": 75, @@ -102,9 +97,8 @@ global.weapons = { "spli": 3, "arp": 0, "tags": ["bolt"] -}, - -"Mars Heavy Bolter": { + }, + "Mars Heavy Bolter": { "abbreviation": "MarsHvyBltr", "attack": { "standard": 400, @@ -119,8 +113,8 @@ global.weapons = { "spli": 9, "arp": 1, "tags": ["heavy_ranged", "bolt"] -}, -"Tigris Combi Bolter": { + }, + "Tigris Combi Bolter": { "abbreviation": "TigComBltr", "attack": { "standard": 100, @@ -134,12 +128,11 @@ global.weapons = { "range": 19, "spli": 11, "arp": 0, - "tags": [ "bolt"] -}, - -//Plasma Pack -"Ryza Plasma Gun": { -"abbreviation": "RyzPlsmGn", + "tags": ["bolt"] + }, + //Plasma Pack + "Ryza Plasma Gun": { + "abbreviation": "RyzPlsmGn", "attack": { "standard": 325, "master_crafted": 350, @@ -152,10 +145,10 @@ global.weapons = { "range": 14, "spli": 5, "arp": 1, - "tags": [ "plasma","energy"] -}, -"Ryza Plasma Pistol": { -"abbreviation": "RyzPlsmPis", + "tags": ["plasma", "energy"] + }, + "Ryza Plasma Pistol": { + "abbreviation": "RyzPlsmPis", "attack": { "standard": 145, "master_crafted": 160, @@ -168,10 +161,10 @@ global.weapons = { "range": 14, "spli": 5, "arp": 1, - "tags": [ "plasma","energy","pistol"] -}, -"Mars Plasma Cannon": { -"abbreviation": "MarsPlsmCnn", + "tags": ["plasma", "energy", "pistol"] + }, + "Mars Plasma Cannon": { + "abbreviation": "MarsPlsmCnn", "attack": { "standard": 650, "master_crafted": 700, @@ -184,13 +177,12 @@ global.weapons = { "range": 16, "spli": 8, "arp": 1, - "tags": [ "plasma","energy"] -}, - - //Melta Pack -"Primus Melta Gun":{ -"abbreviation": "PrimMltGn", -"attack": { + "tags": ["plasma", "energy"] + }, + //Melta Pack + "Primus Melta Gun": { + "abbreviation": "PrimMltGn", + "attack": { "standard": 560, "master_crafted": 585, "artifact": 610 @@ -202,11 +194,11 @@ global.weapons = { "range": 2.5, "spli": 2, "arp": 1, - "tags": ["melta","energy","boarding"] + "tags": ["melta", "energy", "boarding"] }, -"Proteus Multi-Melta":{ -"abbreviation": "ProtMltMelt", -"attack": { + "Proteus Multi-Melta": { + "abbreviation": "ProtMltMelt", + "attack": { "standard": 1000, "master_crafted": 1100, "artifact": 1200 @@ -218,13 +210,12 @@ global.weapons = { "range": 4.5, "spli": 2, "arp": 1, - "tags": ["melta","energy","boarding"] + "tags": ["melta", "energy", "boarding"] }, - -//Flamer Pack -"Phaestos Flamer":{ -"abbreviation": "PhFlmr", -"attack": { + //Flamer Pack + "Phaestos Flamer": { + "abbreviation": "PhFlmr", + "attack": { "standard": 430, "master_crafted": 585, "artifact": 610 @@ -236,12 +227,12 @@ global.weapons = { "range": 2.5, "spli": 6, "arp": -1, - "tags": ["flame",]//Shouldn't it also feature "boarding"? + "tags": ["flame"] //Shouldn't it also feature "boarding"? }, -//Melle Pack -"Power Scythe" :{ -"abbreviation": "PwrSct", -"attack": { + //Melle Pack + "Power Scythe": { + "abbreviation": "PwrSct", + "attack": { "standard": 250, "master_crafted": 300, "artifact": 350 @@ -258,12 +249,12 @@ global.weapons = { "range": 1.5, "spli": 6, "arp": 1, - "tags": ["power",] + "tags": ["power"] }, //Laser Pack -"Ryza Lascannon":{ -"abbreviation": "RyzLascnn", -"attack": { + "Ryza Lascannon": { + "abbreviation": "RyzLascnn", + "attack": { "standard": 750, "master_crafted": 800, "artifact": 850 @@ -275,12 +266,12 @@ global.weapons = { "range": 24, "spli": 1, "arp": 1, - "tags": ["heavy_ranged","las","energy",] -}, - //misc pack -"Cthon Autocannon":{ -"abbreviation": "CthAutocnn", -"attack": { + "tags": ["heavy_ranged", "las", "energy"] + }, + //misc pack + "Cthon Autocannon": { + "abbreviation": "CthAutocnn", + "attack": { "standard": 480, "master_crafted": 520, "artifact": 560 @@ -292,11 +283,31 @@ global.weapons = { "range": 20, "spli": 15, "arp": 1, - "tags": ["heavy_ranged","dreadnought",] -}, - + "tags": ["heavy_ranged", "dreadnought"] + }, //40k weapons - + "Storm Shield": { + "description": "Protects twice as well when boarding. A powered shield that must be held with a hand. While powered by the marines armour it shimmers with blue energy.", + "abbreviation": "StrmShld", + "attack": { + "standard": 5, + "master_crafted": 5, + "artifact": 10 + }, + "armour_value": { + "standard": 8, + "master_crafted": 10, + "artifact": 12 + }, + "melee_hands": 0.75, + "ranged_hands": 1, + "tags": ["shield"], + "hp_mod": { + "standard": 30, + "master_crafted": 35, + "artifact": 40 + }, + }, "Boarding Shield": { "description": "Protects twice as well when boarding. Used in siege or boarding operations, this shield offers additional protection. It may be used with a 2-handed ranged weapon.", "abbreviation": "BrdShld", @@ -2543,7 +2554,7 @@ global.gear = { }, "tags": ["vehicle", "Upgrade"], }, -// Hireling Armour + // Hireling Armour // Admech "Skitarii Armour": { "abbreviation": "SkitArm", @@ -2854,47 +2865,3 @@ global.gear = { // Add more mobility items as needed... } } - - -/* - - repeat(2){ - // Artifact weapons - if (arti_armour=false){ - - if (string_count("DUB",thawep)>0){attack=floor(attack*1.5);melee_hands+=1;ranged_hands+=1;spli=1;} - if (string_count("Dae",thawep)>0){attack=floor(attack*1.5);amm=-1;} - if (string_count("VOI",thawep)>0){attack=floor(attack*1.2);} - if (string_count("ADAMANTINE",thawep)>0){attack=floor(attack*1.1);} - - if (string_count("MINOR",thawep)>0){attack=floor(attack*0.85);} - if (string_count("MNR",thawep)>0){attack=floor(attack*0.85);} - } - - } - // Vehicle Upgrades - - if (equipment_1="Lucifer Pattern Engine"){statt=5;special_description="";emor=1; - descr="A significant upgrade over the more common patterns of Rhino-chassis engines, these engines provide greater output.";} - - // Vehicle Utility Weapons - if (thawep="HK Missile"){attack=350;arp=1;range=50;ranged_hands+=1;amm=1;spli=1; - descr="A single-use long-range anti-tank missile, this weapon can surgically destroy armoured targets in the opening stages of a battle.";} - - // Land Raider Sponsons - // Predator Turrets - - if (thawep="Twin Linked Assault Cannon Turret"){attack=360;arp=0;range=12;amm=10;spli=1; - descr="A Predator-compatible turret mounting a pair of short range anti-infantry assault cannons. ";} - if (thawep="Flamestorm Cannon Turret"){attack=400;arp=1;range=2.1;amm=12;spli=1; - descr="A Predator-compatible turret housing a huge flamethrower, the heat produced by this terrifying weapon can crack even armoured ceramite. ";} - if (thawep="Magna-Melta Turret"){attack=400;arp=1;range=6;amm=12; - descr="A Predator-compatible turret housing a magna-melta, a devastating short-range anti-tank weapon. ";} - if (thawep="Plasma Destroyer Turret"){attack=350;arp=1;range=15;spli=1; - descr="A Predator-compatible turret housing a plasma destroyer, sometimes called the plasma executioner after the vehicle variants that mount this terrifying anti-armour weapon. ";} - if (thawep="Heavy Conversion Beamer Turret"){attack=750;arp=1;range=25;amm=3;spli=1; - descr="A Predator-compatible turret housing a Heavy Conversion Beam Projector, a heavy energy weapon that turns a target's own matter against it by converting it into destructive energy.";} - if (thawep="Neutron Blaster Turret"){attack=400;arp=1;range=15;amm=10 - descr="A Predator-compatible turret housing a neutron blaster; a weapon from the Dark Age of Technology, this weapon is capable of destroying enemy armour with impunity. ";} - if (thawep="Volkite Saker Turret"){attack=400;arp=0;range=18;amm=50;spli=1; - descr="A Predator-compatible turret housing a Volkite Saker, capable of igniting entire formations of enemy forces with a single sweep. ";} From c920715c084da30d69ce934c4c6a5bf4cb922956 Mon Sep 17 00:00:00 2001 From: Werwolf-12 Date: Tue, 1 Jul 2025 22:31:34 +0200 Subject: [PATCH 113/286] fix: Cataphractii and 30k weapons debuggable (#902) Co-authored-by: Nelsonh <81228864+OH296@users.noreply.github.com> --- objects/obj_shop/Create_0.gml | 206 ++++++++++-------- .../scr_initialize_custom.gml | 4 +- scripts/scr_ruins_reward/scr_ruins_reward.gml | 2 +- 3 files changed, 118 insertions(+), 94 deletions(-) diff --git a/objects/obj_shop/Create_0.gml b/objects/obj_shop/Create_0.gml index 0cd7724481..31e8be499c 100644 --- a/objects/obj_shop/Create_0.gml +++ b/objects/obj_shop/Create_0.gml @@ -111,98 +111,8 @@ if (shop = "equipment") { item_cost[i] = 10; forge_cost[i] = 40; i += 1; - //Debug space for 30k weapons - if (global.cheat_debug) { - //Volkite Pack - item[i] = "Volkite Serpenta"; - item_stocked[i] = scr_item_count(item[i]); - item_cost[i] = 0; - forge_cost[i] = 0; - i += 1; - item[i] = "Volkite Charger"; - item_stocked[i] = scr_item_count(item[i]); - item_cost[i] = 0; - forge_cost[i] = 0; - i += 1; - item[i] = "Volkite Caliver"; - item_stocked[i] = scr_item_count(item[i]); - item_cost[i] = 0; - forge_cost[i] = 0; - i += 1; - item[i] ="Volkite Culverin"; - item_stocked[i] = scr_item_count(item[i]); - item_cost[i] = 0; - forge_cost[i] = 0; - i += 1; - //Bolt Pack - item[i] = "Phobos Bolt Pistol"; - item_stocked[i] = scr_item_count(item[i]); - item_cost[i] = 0; - forge_cost[i] = 0; - i += 1; - item[i] = "Phobos Bolter"; - item_stocked[i] = scr_item_count(item[i]); - item_cost[i] = 0; - forge_cost[i] = 0; - i += 1; - item[i] = "Mars Heavy Bolter"; - item_stocked[i] = scr_item_count(item[i]); - item_cost[i] = 0; - forge_cost[i] = 0; - i += 1; - item[i] = "Tigris Combi Bolter"; - item_stocked[i] = scr_item_count(item[i]); - item_cost[i] = 0; - forge_cost[i] = 0; - i += 1; - //Plasma Pack - item[i] = "Ryza Plasma Gun"; - item_stocked[i] = scr_item_count(item[i]); - item_cost[i] = 0; - forge_cost[i] = 0; - i += 1; - item[i] = "Ryza Plasma Pistol"; - item_stocked[i] = scr_item_count(item[i]); - item_cost[i] = 0; - forge_cost[i] = 0; - i += 1; - item[i] = "Mars Plasma Cannon"; - item_stocked[i] = scr_item_count(item[i]); - item_cost[i] = 0; - forge_cost[i] = 0; - i += 1; - item[i] = "Primus Melta Gun"; - item_stocked[i] = scr_item_count(item[i]); - item_cost[i] = 0; - forge_cost[i] = 0; - i += 1; - item[i] = "Proteus Multi-Melta"; - item_stocked[i] = scr_item_count(item[i]); - item_cost[i] = 0; - forge_cost[i] = 0; - i += 1; - item[i] = "Phaestos Flamer"; - item_stocked[i] = scr_item_count(item[i]); - item_cost[i] = 0; - forge_cost[i] = 0; - i += 1; - item[i] = "Power Scythe"; - item_stocked[i] = scr_item_count(item[i]); - item_cost[i] = 0; - forge_cost[i] = 0; - i += 1; - item[i] = "Ryza Lascannon"; - item_stocked[i] = scr_item_count(item[i]); - item_cost[i] = 0; - forge_cost[i] = 0; - i += 1; - item[i] = "Cthon Autocannon"; - item_stocked[i] = scr_item_count(item[i]); - item_cost[i] = 0; - forge_cost[i] = 0; - i += 1; - //End of debug space for 30k weapons - } + + item[i] = "Power Axe"; item_stocked[i] = scr_item_count(item[i]); item_cost[i] = 40; @@ -637,6 +547,114 @@ if (shop = "equipment") { nobuy[i] = 1; item_cost[i] = 0; } + //Debug space for 30k weapons + //Volkite Pack + item[i] = "Volkite Serpenta"; + 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] = "Volkite Charger"; + item_stocked[i] = scr_item_count(item[i]); + item_cost[i] = 0; + forge_cost[i] = 0; + i += 1; + nobuy[i] = 1; + item[i] = "Volkite Caliver"; + item_stocked[i] = scr_item_count(item[i]); + item_cost[i] = 0; + forge_cost[i] = 0; + i += 1; + nobuy[i] = 1; + item[i] ="Volkite Culverin"; + item_stocked[i] = scr_item_count(item[i]); + item_cost[i] = 0; + forge_cost[i] = 0; + i += 1; + nobuy[i] = 1; + //Bolt Pack + item[i] = "Phobos Bolt Pistol"; + item_stocked[i] = scr_item_count(item[i]); + item_cost[i] = 0; + forge_cost[i] = 0; + i += 1; + nobuy[i] = 1; + item[i] = "Phobos Bolter"; + item_stocked[i] = scr_item_count(item[i]); + item_cost[i] = 0; + forge_cost[i] = 0; + i += 1; + nobuy[i] = 1; + item[i] = "Mars Heavy Bolter"; + item_stocked[i] = scr_item_count(item[i]); + item_cost[i] = 0; + forge_cost[i] = 0; + i += 1; + nobuy[i] = 1; + item[i] = "Tigris Combi Bolter"; + item_stocked[i] = scr_item_count(item[i]); + item_cost[i] = 0; + forge_cost[i] = 0; + i += 1; + nobuy[i] = 1; + //Plasma Pack + item[i] = "Ryza Plasma Gun"; + item_stocked[i] = scr_item_count(item[i]); + item_cost[i] = 0; + forge_cost[i] = 0; + i += 1; + nobuy[i] = 1; + item[i] = "Ryza Plasma Pistol"; + item_stocked[i] = scr_item_count(item[i]); + item_cost[i] = 0; + forge_cost[i] = 0; + i += 1; + nobuy[i] = 1; + item[i] = "Mars Plasma Cannon"; + item_stocked[i] = scr_item_count(item[i]); + item_cost[i] = 0; + forge_cost[i] = 0; + i += 1; + nobuy[i] = 1; + item[i] = "Primus Melta Gun"; + item_stocked[i] = scr_item_count(item[i]); + item_cost[i] = 0; + forge_cost[i] = 0; + i += 1; + nobuy[i] = 1; + item[i] = "Proteus Multi-Melta"; + item_stocked[i] = scr_item_count(item[i]); + item_cost[i] = 0; + forge_cost[i] = 0; + i += 1; + nobuy[i] = 1; + item[i] = "Phaestos Flamer"; + item_stocked[i] = scr_item_count(item[i]); + item_cost[i] = 0; + forge_cost[i] = 0; + i += 1; + nobuy[i] = 1; + item[i] = "Power Scythe"; + item_stocked[i] = scr_item_count(item[i]); + item_cost[i] = 0; + forge_cost[i] = 0; + i += 1; + nobuy[i] = 1; + item[i] = "Ryza Lascannon"; + item_stocked[i] = scr_item_count(item[i]); + item_cost[i] = 0; + forge_cost[i] = 0; + i += 1; + nobuy[i] = 1; + item[i] = "Cthon Autocannon"; + item_stocked[i] = scr_item_count(item[i]); + item_cost[i] = 0; + forge_cost[i] = 0; + i += 1; + var mc = 0; repeat(i) { mc++; @@ -819,6 +837,10 @@ if (research.armour[1].stealth[0] > 0 && research.armour[1].armour[0] > 1 && obj mk_4_tool_tip = tooltip_overide[i]; tooltip_overide[i] += $"STC wargear component 6"; } +i += 1; +item[i] = "Cataphractii"; +item_stocked[i] = scr_item_count("Cataphractii"); +nobuy[i] = 1; i += 1; diff --git a/scripts/scr_initialize_custom/scr_initialize_custom.gml b/scripts/scr_initialize_custom/scr_initialize_custom.gml index ad95bd0ea7..99e55bf954 100644 --- a/scripts/scr_initialize_custom/scr_initialize_custom.gml +++ b/scripts/scr_initialize_custom/scr_initialize_custom.gml @@ -3209,7 +3209,8 @@ function scr_initialize_custom() { //Fixed Loot tagble if(scr_has_adv("Ancient Armoury")){ //armour - scr_add_item("Tartaros",1)//When Cata is added I will replace tartaros with that. +var armm5=""; + armm5=choose("Tartaros","Cataphractii"); scr_add_item("MK3 Iron Armour",irandom_range(2,5)); scr_add_item("MK4 Maximus",irandom_range(5,10)); scr_add_item("MK5 Heresy",irandom_range(5,10)); @@ -3237,6 +3238,7 @@ if(scr_has_adv("Ancient Armoury")){ scr_add_item(armm2,armk2); scr_add_item(armm3,armk3); scr_add_item(armm4,armk4); + scr_add_item(armm5,1); } diff --git a/scripts/scr_ruins_reward/scr_ruins_reward.gml b/scripts/scr_ruins_reward/scr_ruins_reward.gml index e544619721..cacf6e3c84 100644 --- a/scripts/scr_ruins_reward/scr_ruins_reward.gml +++ b/scripts/scr_ruins_reward/scr_ruins_reward.gml @@ -84,7 +84,7 @@ function scr_ruins_reward(star_system, planet, _ruins) { //Fallen Terminator Squad if (ruins_type<=2) or (ruins_type>=10){ - wep1=choose("Tartaros","Terminator Armour"); + wep1=choose("Tartaros","Terminator Armour","Cataphractii"); wen1=choose(1,2,3); wep2=choose("Tigris Combi Bolter","Volkite Charger"); wen2=choose(1,2,); From 687f98238306fdee760092759993e1438dbb6d5b Mon Sep 17 00:00:00 2001 From: Nelsonh <81228864+OH296@users.noreply.github.com> Date: Tue, 1 Jul 2025 21:57:53 +0100 Subject: [PATCH 114/286] feat: Allow adding offsets to sprites when modding (#903) --- scripts/scr_culture_visuals/scr_culture_visuals.gml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/scripts/scr_culture_visuals/scr_culture_visuals.gml b/scripts/scr_culture_visuals/scr_culture_visuals.gml index 0bf1414665..31e770eaf2 100644 --- a/scripts/scr_culture_visuals/scr_culture_visuals.gml +++ b/scripts/scr_culture_visuals/scr_culture_visuals.gml @@ -134,6 +134,9 @@ function load_vis_set_to_global(directory, data){ sprite_delete(_merge_sprite); } var _s_data = _sprite_item.data; + if (struct_exists(_s_data, "offset")){ + sprite_set_offset(_new_sprite, _s_data.offset.x, _s_data.offset.y); + } _s_data.name = _sprite_item.name; _s_data.sprite = _new_sprite; if (_s_data.position == "weapon"){ From 22c826bc9ff3db27ce6c7ee6b749f3084437a2d9 Mon Sep 17 00:00:00 2001 From: Nelsonh <81228864+OH296@users.noreply.github.com> Date: Thu, 3 Jul 2025 19:46:10 +0100 Subject: [PATCH 115/286] fix: Trading mercenaries (#904) --- objects/obj_controller/Create_0.gml | 16 +- objects/obj_garbage_collector/Step_0.gml | 2 +- objects/obj_turn_end/Alarm_1.gml | 1 - scripts/macros/macros.gml | 20 +++ scripts/scr_buttons/scr_buttons.gml | 8 +- scripts/scr_enemy_ai_a/scr_enemy_ai_a.gml | 42 +++-- scripts/scr_garrison/scr_garrison.gml | 59 ++++--- .../scr_marine_struct/scr_marine_struct.gml | 41 ++++- scripts/scr_squads/scr_squads.gml | 4 +- scripts/scr_trade/scr_trade.gml | 4 + scripts/scr_trade_dep/scr_trade_dep.gml | 2 +- scripts/scr_ui_diplomacy/scr_ui_diplomacy.gml | 162 +++++++++++------- sprites/spr_da_standard/spr_da_standard.yy | 18 +- sprites/spr_marine_robes/spr_marine_robes.yy | 10 +- .../spr_weapon_standard.yy | 18 +- .../spr_weapon_standard2.yy | 10 +- 16 files changed, 286 insertions(+), 131 deletions(-) diff --git a/objects/obj_controller/Create_0.gml b/objects/obj_controller/Create_0.gml index 33a827fcc3..37e1440258 100644 --- a/objects/obj_controller/Create_0.gml +++ b/objects/obj_controller/Create_0.gml @@ -925,21 +925,7 @@ bat_whirlwind_column=1; bat_landspeeder_column=4; bat_scout_column=1; // ** Sets up disposition per faction ** -enum eFACTION { - Player = 1, - Imperium, - Mechanicus, - Inquisition, - Ecclesiarchy, - Eldar, - Ork, - Tau, - Tyranids, - Chaos, - Heretics, - Genestealer, - Necrons = 13 -} + imperial_factions = [ eFACTION.Imperium, diff --git a/objects/obj_garbage_collector/Step_0.gml b/objects/obj_garbage_collector/Step_0.gml index 88117f46f7..973cb5e1fc 100644 --- a/objects/obj_garbage_collector/Step_0.gml +++ b/objects/obj_garbage_collector/Step_0.gml @@ -4,7 +4,7 @@ if (gc_timer > 0) { } else { - gc_timer = 50; // Default is every frame, so de-facto 1; + gc_timer = 50000; // Default is every frame, so de-facto 1; gc_collect(); wait_and_execute(0, function(){ diff --git a/objects/obj_turn_end/Alarm_1.gml b/objects/obj_turn_end/Alarm_1.gml index 9952ce410c..61e42660ac 100644 --- a/objects/obj_turn_end/Alarm_1.gml +++ b/objects/obj_turn_end/Alarm_1.gml @@ -121,7 +121,6 @@ if (!_is_audience){ // if (current_popup>popups) or (popup[1]=0) then popups_end=1; if (popups_end=1){ - show_debug_message("end turn final sequence"); /*if (popups=0){ diff --git a/scripts/macros/macros.gml b/scripts/macros/macros.gml index b3808ca38d..9bec38f306 100644 --- a/scripts/macros/macros.gml +++ b/scripts/macros/macros.gml @@ -18,6 +18,26 @@ // Basic, because we don't include Artificer Armour #macro LIST_BASIC_POWER_ARMOUR ["MK7 Aquila", "MK6 Corvus", "MK5 Heresy", "MK8 Errant", "MK4 Maximus", "MK3 Iron Armour","Power Armour"] #macro LIST_TERMINATOR_ARMOUR ["Terminator Armour", "Tartaros","Cataphractii"] +#macro FACTION_NAMES ["","Your Chapter", "Imperium of Man","Adeptus Mechanicus","Inquisition","Ecclesiarchy","Eldar","Orks", "Tyranid Hive","Tau Empire","Chaos","Heretics","Genestealer Cults", "Necron Dynasties"] +#macro XENOS_FACTIONS [6,7,8,9] + +#macro ALLIANCE_GRADES ["Hated", "Hostile","Suspicious","Uneasy","Neutral","Allies","Close Allies","Battle Brothers"] + +enum eFACTION { + Player = 1, + Imperium, + Mechanicus, + Inquisition, + Ecclesiarchy, + Eldar, + Ork, + Tau, + Tyranids, + Chaos, + Heretics, + Genestealer, + Necrons = 13 +} enum MENU { Default = 0, diff --git a/scripts/scr_buttons/scr_buttons.gml b/scripts/scr_buttons/scr_buttons.gml index b9762c2e5b..e707dfb10a 100644 --- a/scripts/scr_buttons/scr_buttons.gml +++ b/scripts/scr_buttons/scr_buttons.gml @@ -112,6 +112,7 @@ function UnitButtonObject(data = false) constructor{ break; } } + static disabled = false; static draw = function(allow_click = true){ var cur_alpha = draw_get_alpha(); var cur_font = draw_get_font(); @@ -119,7 +120,12 @@ function UnitButtonObject(data = false) constructor{ var cur_halign = draw_get_halign(); var cur_valign = draw_get_valign(); if (style = "standard"){ - var _button_click_area = draw_unit_buttons(w > 0 ? [x1, y1, x2, y2] : [x1, y1] , label, [1,1],color,,font,alpha); + var _temp_alpha = alpha; + if (disabled){ + _temp_alpha = 0.5; + allow_click = false; + } + var _button_click_area = draw_unit_buttons(w > 0 ? [x1, y1, x2, y2] : [x1, y1] , label, [1,1],color,,font,_temp_alpha); } else if (style = "pixel"){ var _widths = [sprite_get_width(spr_pixel_button_left), sprite_get_width(spr_pixel_button_middle), sprite_get_width(spr_pixel_button_right)] diff --git a/scripts/scr_enemy_ai_a/scr_enemy_ai_a.gml b/scripts/scr_enemy_ai_a/scr_enemy_ai_a.gml index f50f664b6e..693e99049b 100644 --- a/scripts/scr_enemy_ai_a/scr_enemy_ai_a.gml +++ b/scripts/scr_enemy_ai_a/scr_enemy_ai_a.gml @@ -345,7 +345,8 @@ function scr_enemy_ai_a() { var after_combat_tyranids=tyranids_score; var after_combat_sisters=sisters_score; var tempor=0,rand1=0,rand2=0; - + + var _active_garrison = pdf_with_player && garrison.viable_garrison>0; // Guard attack if (guard_score>0) and (guard_attack!="") and (guard_score>0.5){ @@ -522,19 +523,27 @@ function scr_enemy_ai_a() { }else if (ork_attack="guard"){var onc=0; rand2=(choose(1,2,3,4,5,6)*guard_score)*choose(1,1.25); if (rand1>rand2){ - if (planet_forces[eFACTION.Ork]<=3) and (onc=0){p_guardsmen[_run]=floor(p_guardsmen[_run]*(min(0.95, 0.7+pdf_loss_reduction)));onc=1;} - if (planet_forces[eFACTION.Ork]>=4) and (onc=0){p_guardsmen[_run]=floor(p_guardsmen[_run]*(min(0.95, 0.55+pdf_loss_reduction)));onc=1;} - if (planet_forces[eFACTION.Ork]>=4) and (p_guardsmen[_run]<15000) and (onc=0){p_guardsmen[_run]=0;onc=1;} - if (planet_forces[eFACTION.Ork]>=3) and (p_guardsmen[_run]<5000) and (onc=0){p_guardsmen[_run]=0;onc=1;} + if (planet_forces[eFACTION.Ork]<=3) and (onc=0){ + p_guardsmen[_run]=floor(p_guardsmen[_run]*(min(0.95, 0.7+pdf_loss_reduction)));onc=1; + } + if (planet_forces[eFACTION.Ork]>=4) and (onc=0){ + p_guardsmen[_run]=floor(p_guardsmen[_run]*(min(0.95, 0.55+pdf_loss_reduction))); + onc=1; + } + if (planet_forces[eFACTION.Ork]>=4) and (p_guardsmen[_run]<15000) and (onc=0){ + p_guardsmen[_run]=0;onc=1; + } + if (planet_forces[eFACTION.Ork]>=3) and (p_guardsmen[_run]<5000) and (onc=0){ + p_guardsmen[_run]=0;onc=1; + } } }else if (ork_attack="pdf"){ var pdf_random = choose(1,2,3,4,5,6); rand2=(pdf_random*pdf_score); - var active_garrison = pdf_with_player && garrison.viable_garrison>0; if (rand1>rand2){ _planet_data.pdf_defence_loss_to_orks(); - if (active_garrison){ + if (_active_garrison){ var tixt = $"Chapter Forces led by {garrison.garrison_leader.name_role()} on {name} {scr_roman_numerals()[_run-1]} were unable to secure PDF victory chapter support requested"; if (garrison.garrison_sustain_damages("loose")>0){ tixt += $". {garrison.garrison_sustain_damages()} Marines Lost"; @@ -543,7 +552,7 @@ function scr_enemy_ai_a() { //garrison.determine_battle(false,rand2-rand1, eFACTION.Ork); } } else { - if (active_garrison){ + if (_active_garrison){ garrison.garrison_sustain_damages(); var tixt = $"Chapter Forces led by {garrison.garrison_leader.name_role()} on {name} {scr_roman_numerals()[_run-1]} secure PDF victory"; if (garrison.garrison_sustain_damages("win")>0){ @@ -750,10 +759,19 @@ function scr_enemy_ai_a() { }else if (necrons_attack="guard"){ rand2=(choose(1,2,3,4,5)*guard_score)*choose(1,1.25); if (rand1>rand2){ - if (necrons_score<=3) then p_guardsmen[_run]=floor(p_guardsmen[_run]*0.6); - if (necrons_score>=4) then p_guardsmen[_run]=floor(p_guardsmen[_run]*0.5); - if (necrons_score>=6) then p_guardsmen[_run]=floor(p_guardsmen[_run]*0.2); - if (necrons_score>=4) and (p_guardsmen[_run]<15000) then p_guardsmen[_run]=0; + if (necrons_score<=3){ + p_guardsmen[_run]=floor(p_guardsmen[_run]*0.6); + } + else if (necrons_score>=6){ + p_guardsmen[_run]=floor(p_guardsmen[_run]*0.2); + } + else if (necrons_score>=4){ + if (p_guardsmen[_run]<15000){ + p_guardsmen[_run]=0; + } else { + p_guardsmen[_run]=floor(p_guardsmen[_run]*0.5); + } + } } }else if (necrons_attack="pdf"){ rand2=(choose(1,2,3,4,5)*pdf_score)*choose(1,1.25); diff --git a/scripts/scr_garrison/scr_garrison.gml b/scripts/scr_garrison/scr_garrison.gml index 5cad14e61d..5228d2cd55 100644 --- a/scripts/scr_garrison/scr_garrison.gml +++ b/scripts/scr_garrison/scr_garrison.gml @@ -106,9 +106,9 @@ function GarrisonForce(planet_operatives, turn_end=false, type="garrison") const var hierarchy = role_hierarchy(); var leader_hier_pos=array_length(hierarchy); var unit; - for (var squad=0;squad 1){ report_string+= $"The garrison is comprised of {array_length(garrison_squads)} squads," - } else {report_string+="The garrison is comprised of a single squad,"} + } else {report_string+="The garrison is comprised of a single _squad,"} report_string+= $" with a total man count of {total_garrison}.#" if (system.p_owner[planet] != eFACTION.Player) { @@ -193,9 +193,9 @@ function GarrisonForce(planet_operatives, turn_end=false, type="garrison") const if (is_struct(garrison_leader)) { _diplomatic_leader = garrison_leader.has_trait("honorable"); } else { - scr_alert("yellow", "DEBUG", $"DEBUG: Garrison Leader on {star.name} {planet} couldn't be found!", 0, 0); - scr_event_log("yellow", $"DEBUG: Garrison Leader on {star.name} {planet} couldn't be found!"); - log_error($"DEBUG: Garrison Leader on {star.name} {planet} couldn't be found!"); + scr_alert("yellow", "DEBUG", $"DEBUG: Garrison _Leader on {star.name} {planet} couldn't be found!", 0, 0); + scr_event_log("yellow", $"DEBUG: Garrison _Leader on {star.name} {planet} couldn't be found!"); + log_error($"DEBUG: Garrison _Leader on {star.name} {planet} couldn't be found!"); } if (_diplomatic_leader) { @@ -226,32 +226,33 @@ function GarrisonForce(planet_operatives, turn_end=false, type="garrison") const /* this is probably going to become infinatly complex with many different functions and far more complex inputs but for now i'm just trying to set up a concept with some simple examples*/ static determine_battle = function(attack_defend, win, margin, enemy, location, planet=0, ship=0){ + var _sim = global.character_tester; if (win){ }else{ //var squad_positions; - var leader; - var mem; + var _leader; + var m; var unit; var effort="failed"; switch(enemy){ case eFACTION.Ork://trying to come up with how we might auto evaluate a squads fate in a battle for (var s=0;smargin){//if unit "wins" in combat test against weapon skill as this is a cc enagement - if (irandom(4999)0){// Diplomacy - Speaking @@ -610,50 +652,49 @@ function scr_ui_diplomacy() { } if (daemon=false){ - if (diplomacy!=eFACTION.Eldar) then scr_image("diplomacy/splash",diplomacy,xx+16,yy+43,310,828); - if (diplomacy!=eFACTION.Eldar) or ((diplomacy==eFACTION.Eldar) and (faction_gender[eFACTION.Eldar]=1)) then scr_image("diplomacy/splash",diplomacy,xx+16,yy+16,310,828); - if (diplomacy==eFACTION.Eldar) and (faction_gender[eFACTION.Eldar]=2) then scr_image("diplomacy/splash",11,xx+16,yy+16,310,828); - if (diplomacy==eFACTION.Chaos) and (faction_gender[eFACTION.Chaos]=2) then scr_image("diplomacy/splash",12,xx+16,yy+43,310,828); + if (diplomacy!=eFACTION.Eldar){ + scr_image("diplomacy/splash",diplomacy,xx+16,yy+43,310,828); + } + if (diplomacy!=eFACTION.Eldar) or ((diplomacy==eFACTION.Eldar) and (faction_gender[eFACTION.Eldar]=1)){ + scr_image("diplomacy/splash",diplomacy,xx+16,yy+16,310,828); + } + if (diplomacy==eFACTION.Eldar) and (faction_gender[eFACTION.Eldar]=2){ + scr_image("diplomacy/splash",11,xx+16,yy+16,310,828); + } + if (diplomacy==eFACTION.Chaos) and (faction_gender[eFACTION.Chaos]=2){ + scr_image("diplomacy/splash",12,xx+16,yy+43,310,828); + } } draw_set_halign(fa_center); draw_set_color(38144); draw_set_font(fnt_40k_30b); - var fac, fac2, fac3,warning;fac="";fac2=" (Imperium)";fac3="";warning=0; - if (diplomacy>=6) then fac2=""; - + var _diplomacy_faction_name=""; + var _diplomacy_faction_alligience=" (Imperium)"; + var _disposition_rating=""; + var warning=0; + if (diplomacy>=6){ + _diplomacy_faction_alligience=""; + } - if (diplomacy==eFACTION.Imperium) then fac="Imperium of Man"; - if (diplomacy==eFACTION.Mechanicus) then fac="Adeptus Mechanicus"; - if (diplomacy==eFACTION.Inquisition) then fac="Inquisition"; - if (diplomacy==eFACTION.Ecclesiarchy) then fac="Ecclesiarchy"; - if (diplomacy==eFACTION.Eldar) then fac="Eldar"; - if (diplomacy==eFACTION.Ork) then fac="Orks"; - if (diplomacy==eFACTION.Tau) then fac="Tau Empire"; - if (diplomacy==eFACTION.Chaos) then fac="Heretics"; - if (diplomacy>10) and (diplomacy<11) then fac="Chaos"; + + _diplomacy_faction_name = FACTION_NAMES[diplomacy]; - draw_text_transformed(xx+622,yy+66,string_hash_to_newline(string(fac)),1,1,0); + draw_text_transformed(xx+622,yy+66,_diplomacy_faction_name,1,1,0); - if (daemon=true){ draw_text_transformed(xx+622,yy+104,string_hash_to_newline("The Emmmisary"),0.6,0.6,0);show_stuff=true;}; - if (daemon=false) then draw_text_transformed(xx+622,yy+104,string_hash_to_newline(string(faction_title[diplomacy])+" "+string(faction_leader[diplomacy])+string(fac2)),0.6,0.6,0); + if (daemon=true){ + draw_text_transformed(xx+622,yy+104,"The Emmmisary",0.6,0.6,0); + show_stuff=true; + } else if (daemon=false){ + draw_text_transformed(xx+622,yy+104,$"{faction_title[diplomacy]} {faction_leader[diplomacy]} {_diplomacy_faction_alligience}",0.6,0.6,0); + } draw_set_font(fnt_40k_14); - if (daemon=false){ - fac3="Disposition: "; - if (disposition[diplomacy]<=-20) then fac3+="Hated"; - if (disposition[diplomacy]>-20) and (disposition[diplomacy]<0) then fac3+="Hostile"; - if (disposition[diplomacy]>=0) and (disposition[diplomacy]<10) then fac3+="Suspicious"; - if (disposition[diplomacy]>=10) and (disposition[diplomacy]<20) then fac3+="Uneasy"; - if (disposition[diplomacy]>=20) and (disposition[diplomacy]<40) then fac3+="Neutral"; - if (disposition[diplomacy]>=40) and (disposition[diplomacy]<60) then fac3+="Allies"; - if (disposition[diplomacy]>=60) and (disposition[diplomacy]<80) then fac3+="Close Allies"; - if (disposition[diplomacy]>=80) then fac3+="Battle Brothers"; - fac3+=" ("+string(disposition[diplomacy])+")"; + _disposition_rating=$"Disposition: {faction_disposition_rating_string(diplomacy)} ({disposition[diplomacy]})"; // draw_set_halign(fa_center); - draw_text(xx+622,yy+144,string_hash_to_newline(string(fac3))); + draw_text(xx+622,yy+144,_disposition_rating); scr_draw_rainbow(xx+366,yy+165,xx+871,yy+175,(disposition[diplomacy]/200)+0.5); } draw_set_color(c_gray); @@ -662,10 +703,13 @@ function scr_ui_diplomacy() { show_stuff=true; } - if (warning=1) and (diplomacy>=6){ + if (warning=1 || diplomacy>=6){ var warn; - if (diplomacy<10) and (warning=1) then warn="Consorting with xenos will cause your disposition with the Imperium to lower."; - if (diplomacy>=10) and (warning=1) then warn="Consorting with heretics will cause your disposition with the Imperium to plummet."; + if (array_contains(XENOS_FACTIONS, diplomacy)){ + warn="Consorting with xenos will cause your disposition with the Imperium to lower."; + } else { + warn="Consorting with heretics will cause your disposition with the Imperium to plummet."; + } draw_rectangle(mouse_x-2,mouse_y+20,mouse_x+2+string_width_ext(warn,-1,600),mouse_y+24+string_height_ext(warn,-1,600),0); draw_set_color(38144); diff --git a/sprites/spr_da_standard/spr_da_standard.yy b/sprites/spr_da_standard/spr_da_standard.yy index ca42e17d23..2634ca954c 100644 --- a/sprites/spr_da_standard/spr_da_standard.yy +++ b/sprites/spr_da_standard/spr_da_standard.yy @@ -66,15 +66,25 @@ "playbackSpeedType":0, "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":"5141ac0b-5807-4383-83b9-fc6d775c3aa0","path":"sprites/spr_da_standard/spr_da_standard.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"fd91b4b6-5224-4a2b-8cb6-037c6f3868b0","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"47247ed9-3260-4acb-b4c1-288195f3c451","path":"sprites/spr_da_standard/spr_da_standard.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"87309639-7313-4526-a3f9-b2946a96e39f","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"15710c01-0df5-4aec-b31b-d7d0ac595350","path":"sprites/spr_da_standard/spr_da_standard.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"513f09b2-ebc0-4278-98c1-3e954efc6dcb","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"b9d4fc97-14aa-4e28-b0fb-161752a43977","path":"sprites/spr_da_standard/spr_da_standard.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"6b5b123e-21a9-4aee-aae7-ea64260270e7","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"5141ac0b-5807-4383-83b9-fc6d775c3aa0","path":"sprites/spr_da_standard/spr_da_standard.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"fd91b4b6-5224-4a2b-8cb6-037c6f3868b0","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"47247ed9-3260-4acb-b4c1-288195f3c451","path":"sprites/spr_da_standard/spr_da_standard.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"87309639-7313-4526-a3f9-b2946a96e39f","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"15710c01-0df5-4aec-b31b-d7d0ac595350","path":"sprites/spr_da_standard/spr_da_standard.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"513f09b2-ebc0-4278-98c1-3e954efc6dcb","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"b9d4fc97-14aa-4e28-b0fb-161752a43977","path":"sprites/spr_da_standard/spr_da_standard.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"6b5b123e-21a9-4aee-aae7-ea64260270e7","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_marine_robes/spr_marine_robes.yy b/sprites/spr_marine_robes/spr_marine_robes.yy index 836ea1ed21..32083affb9 100644 --- a/sprites/spr_marine_robes/spr_marine_robes.yy +++ b/sprites/spr_marine_robes/spr_marine_robes.yy @@ -64,13 +64,19 @@ "playbackSpeedType":0, "resourceType":"GMSequence", "resourceVersion":"2.0", + "seqHeight":232.0, + "seqWidth":167.0, "showBackdrop":true, "showBackdropImage":false, "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"c69262d4-e553-4269-a37b-ce6d95d4fbe9","path":"sprites/spr_marine_robes/spr_marine_robes.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"465410e8-8c66-4937-9939-84339eb58dc9","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"2517a4fc-f093-4d83-8a38-f4f33e3f9ed3","path":"sprites/spr_marine_robes/spr_marine_robes.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"8880f29c-fb69-4fe1-bcdf-d56db7fd4d89","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"c69262d4-e553-4269-a37b-ce6d95d4fbe9","path":"sprites/spr_marine_robes/spr_marine_robes.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"465410e8-8c66-4937-9939-84339eb58dc9","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"2517a4fc-f093-4d83-8a38-f4f33e3f9ed3","path":"sprites/spr_marine_robes/spr_marine_robes.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"8880f29c-fb69-4fe1-bcdf-d56db7fd4d89","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_weapon_standard/spr_weapon_standard.yy b/sprites/spr_weapon_standard/spr_weapon_standard.yy index f41ed0fe92..9e9c106d96 100644 --- a/sprites/spr_weapon_standard/spr_weapon_standard.yy +++ b/sprites/spr_weapon_standard/spr_weapon_standard.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":"7a4a520a-7a19-4f59-bc07-dde98452c760","path":"sprites/spr_weapon_standard/spr_weapon_standard.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"6098e9c5-5468-41a9-a2b2-b8a20ab9a5b1","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"f2936088-e4f0-4a05-881d-20ac9d75bb29","path":"sprites/spr_weapon_standard/spr_weapon_standard.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"c93b7cba-b1b1-4daa-a530-bfb41ed7d67d","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"cbce5203-3778-468e-b7c8-7515f6e18fde","path":"sprites/spr_weapon_standard/spr_weapon_standard.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"718e1208-998c-4f79-b774-96d8555dfc20","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"ee70063b-766f-4ba8-8b3f-51fdb1ec6ec5","path":"sprites/spr_weapon_standard/spr_weapon_standard.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"40db7c33-c106-423a-ab76-892e47323159","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"7a4a520a-7a19-4f59-bc07-dde98452c760","path":"sprites/spr_weapon_standard/spr_weapon_standard.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"6098e9c5-5468-41a9-a2b2-b8a20ab9a5b1","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"f2936088-e4f0-4a05-881d-20ac9d75bb29","path":"sprites/spr_weapon_standard/spr_weapon_standard.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"c93b7cba-b1b1-4daa-a530-bfb41ed7d67d","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"cbce5203-3778-468e-b7c8-7515f6e18fde","path":"sprites/spr_weapon_standard/spr_weapon_standard.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"718e1208-998c-4f79-b774-96d8555dfc20","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"ee70063b-766f-4ba8-8b3f-51fdb1ec6ec5","path":"sprites/spr_weapon_standard/spr_weapon_standard.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"40db7c33-c106-423a-ab76-892e47323159","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_weapon_standard2/spr_weapon_standard2.yy b/sprites/spr_weapon_standard2/spr_weapon_standard2.yy index 16943323f5..cef5915ae3 100644 --- a/sprites/spr_weapon_standard2/spr_weapon_standard2.yy +++ b/sprites/spr_weapon_standard2/spr_weapon_standard2.yy @@ -65,13 +65,19 @@ "playbackSpeedType":1, "resourceType":"GMSequence", "resourceVersion":"2.0", + "seqHeight":282.0, + "seqWidth":207.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":"fc5175d3-d91f-4714-a7cf-f97f841078f9","path":"sprites/spr_weapon_standard2/spr_weapon_standard2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"46000387-92ab-4c63-aeca-861fad536597","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"3e954feb-84ef-4aa3-9cde-3ff472c5b06b","path":"sprites/spr_weapon_standard2/spr_weapon_standard2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"df99334c-a885-446f-9589-d197bb8535d4","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"fc5175d3-d91f-4714-a7cf-f97f841078f9","path":"sprites/spr_weapon_standard2/spr_weapon_standard2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"46000387-92ab-4c63-aeca-861fad536597","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"3e954feb-84ef-4aa3-9cde-3ff472c5b06b","path":"sprites/spr_weapon_standard2/spr_weapon_standard2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"df99334c-a885-446f-9589-d197bb8535d4","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, From f2762a58959e5e9430b0dd2d5f21a984fb308e9d Mon Sep 17 00:00:00 2001 From: Nelsonh <81228864+OH296@users.noreply.github.com> Date: Wed, 9 Jul 2025 22:25:44 +0100 Subject: [PATCH 116/286] fix: Solve a few introduced diplomacy bugs (#905) --- ChapterMaster.yyp | 2 + objects/obj_controller/Create_0.gml | 2 +- objects/obj_controller/Draw_64.gml | 47 ++--- objects/obj_turn_end/Alarm_1.gml | 2 +- .../scr_chapter_master/scr_chapter_master.gml | 10 + .../scr_chapter_master/scr_chapter_master.yy | 13 ++ scripts/scr_cheatcode/scr_cheatcode.gml | 15 +- .../scr_controller_helpers.gml | 1 + scripts/scr_demand/scr_demand.gml | 91 ++++++--- scripts/scr_dialogue/scr_dialogue.gml | 40 ++-- .../scr_diplomacy_helpers.gml | 96 +++++++++- .../scr_draw_armentarium.gml | 2 +- .../scr_draw_unit_image.gml | 8 +- .../scr_draw_unit_stat_data.gml | 29 +-- .../scr_mission_functions.gml | 4 +- .../scr_specialist_point_handler.gml | 7 +- scripts/scr_trade/scr_trade.gml | 23 ++- scripts/scr_trade_dep/scr_trade_dep.gml | 42 ++--- scripts/scr_ui_diplomacy/scr_ui_diplomacy.gml | 178 ++++++------------ scripts/scr_ui_manage/scr_ui_manage.gml | 3 +- .../89bfcfeb-e00c-4896-854a-bb20c2000103.png | Bin 0 -> 2873 bytes .../2be4912c-981a-4c4c-a48e-98881663e423.png | Bin 0 -> 2873 bytes sprites/spr_holo_pad/spr_holo_pad.yy | 92 +++++++++ 23 files changed, 463 insertions(+), 244 deletions(-) create mode 100644 scripts/scr_chapter_master/scr_chapter_master.gml create mode 100644 scripts/scr_chapter_master/scr_chapter_master.yy create mode 100644 sprites/spr_holo_pad/89bfcfeb-e00c-4896-854a-bb20c2000103.png create mode 100644 sprites/spr_holo_pad/layers/89bfcfeb-e00c-4896-854a-bb20c2000103/2be4912c-981a-4c4c-a48e-98881663e423.png create mode 100644 sprites/spr_holo_pad/spr_holo_pad.yy diff --git a/ChapterMaster.yyp b/ChapterMaster.yyp index dd7555182f..8d3f5d471f 100644 --- a/ChapterMaster.yyp +++ b/ChapterMaster.yyp @@ -758,6 +758,7 @@ {"id":{"name":"scr_bomb_world","path":"scripts/scr_bomb_world/scr_bomb_world.yy",},}, {"id":{"name":"scr_buttons","path":"scripts/scr_buttons/scr_buttons.yy",},}, {"id":{"name":"scr_chaos_alliance_test","path":"scripts/scr_chaos_alliance_test/scr_chaos_alliance_test.yy",},}, + {"id":{"name":"scr_chapter_master","path":"scripts/scr_chapter_master/scr_chapter_master.yy",},}, {"id":{"name":"scr_chapter_new","path":"scripts/scr_chapter_new/scr_chapter_new.yy",},}, {"id":{"name":"scr_chapter_random","path":"scripts/scr_chapter_random/scr_chapter_random.yy",},}, {"id":{"name":"scr_cheatcode","path":"scripts/scr_cheatcode/scr_cheatcode.yy",},}, @@ -1233,6 +1234,7 @@ {"id":{"name":"spr_heresy_colors","path":"sprites/spr_heresy_colors/spr_heresy_colors.yy",},}, {"id":{"name":"spr_hero_skull","path":"sprites/spr_hero_skull/spr_hero_skull.yy",},}, {"id":{"name":"spr_hero","path":"sprites/spr_hero/spr_hero.yy",},}, + {"id":{"name":"spr_holo_pad","path":"sprites/spr_holo_pad/spr_holo_pad.yy",},}, {"id":{"name":"spr_honor_helm","path":"sprites/spr_honor_helm/spr_honor_helm.yy",},}, {"id":{"name":"spr_icon_apothecarion","path":"sprites/spr_icon_apothecarion/spr_icon_apothecarion.yy",},}, {"id":{"name":"spr_icon_ballistic_skill","path":"sprites/spr_icon_ballistic_skill/spr_icon_ballistic_skill.yy",},}, diff --git a/objects/obj_controller/Create_0.gml b/objects/obj_controller/Create_0.gml index 37e1440258..d4c8877e2c 100644 --- a/objects/obj_controller/Create_0.gml +++ b/objects/obj_controller/Create_0.gml @@ -566,7 +566,7 @@ identifiable=0; repair_ships=0; forge_points = 0; master_craft_chance = 0; -tech_status = "Cult Mechanicus"; +tech_status = "cult_mechanicus"; forge_string=""; player_forge_data = { player_forges : 0, diff --git a/objects/obj_controller/Draw_64.gml b/objects/obj_controller/Draw_64.gml index 8c50b1bfb8..747a3deb4d 100644 --- a/objects/obj_controller/Draw_64.gml +++ b/objects/obj_controller/Draw_64.gml @@ -20,6 +20,29 @@ if (is_test_map==true){ var xx = 0; var yy = 0; +if (menu == MENU.Diplomacy){ + if (diplomacy > 0){ + draw_diplomacy_diplo_text(); + if (trading==true){ + if ((diplomacy>1) && is_struct(trade_attempt)){ + try { + trade_attempt.draw_trade_screen(); + } catch(_exception){ + handle_exception(_exception); + delete trade_attempt; + trading = false; + + } + } + } else if (diplomacy!=10.1){ + draw_character_diplomacy_base_page() + } + } else if (diplomacy == -1){ + if (is_struct(character_diplomacy)){ + draw_character_diplomacy(); + } + } +} // Main UI if (!zoomed && !zui){ draw_sprite(spr_new_ui,menu==0,0,0); @@ -146,7 +169,7 @@ if (!zoomed && !zui){ draw_text(495-10,16,string(marines)+"/"+string(command)); draw_text(495.5-10,16.5,string(marines)+"/"+string(command)); - if (menu==0){ + if (menu==MENU.Default){ location_viewer.draw(); } } @@ -156,27 +179,7 @@ draw_set_halign(fa_left); draw_set_alpha(1); // Sets up debut mode if (global.cheat_debug == true){ - draw_text(1124, 7, string_hash_to_newline("DEBUG MODE")); -} - -if (menu == MENU.Diplomacy){ - if (diplomacy != 0){ - draw_diplomacy_diplo_text(); - if (trading==true){ - if ((diplomacy>1) && is_struct(trade_attempt)){ - try { - trade_attempt.draw_trade_screen(); - } catch(_exception){ - handle_exception(_exception); - delete trade_attempt; - trading = false; - - } - } - } else if (diplomacy!=10.1){ - draw_character_diplomacy_base_page() - } - } + draw_text(1124, 7, "DEBUG MODE"); } function draw_line(x1, y1, y_slide, variable) { diff --git a/objects/obj_turn_end/Alarm_1.gml b/objects/obj_turn_end/Alarm_1.gml index 61e42660ac..9c88895778 100644 --- a/objects/obj_turn_end/Alarm_1.gml +++ b/objects/obj_turn_end/Alarm_1.gml @@ -34,7 +34,7 @@ if (_is_audience){ } if (obj_controller.diplomacy!=6){ - show_debug_message("new_intro"); + //show_debug_message("new_intro"); scr_dialogue("intro"); } diff --git a/scripts/scr_chapter_master/scr_chapter_master.gml b/scripts/scr_chapter_master/scr_chapter_master.gml new file mode 100644 index 0000000000..4a73da70a7 --- /dev/null +++ b/scripts/scr_chapter_master/scr_chapter_master.gml @@ -0,0 +1,10 @@ +function scr_chapter_master(){ + favours = { + faction_leaders : array_create(15, []), + minor_characters : {}, + } + + static get_struct = function(){ + return fetch_unit([0,0]); + } +} \ No newline at end of file diff --git a/scripts/scr_chapter_master/scr_chapter_master.yy b/scripts/scr_chapter_master/scr_chapter_master.yy new file mode 100644 index 0000000000..cc0deabaee --- /dev/null +++ b/scripts/scr_chapter_master/scr_chapter_master.yy @@ -0,0 +1,13 @@ +{ + "$GMScript":"v1", + "%Name":"scr_chapter_master", + "isCompatibility":false, + "isDnD":false, + "name":"scr_chapter_master", + "parent":{ + "name":"Scripts", + "path":"folders/Scripts.yy", + }, + "resourceType":"GMScript", + "resourceVersion":"2.0", +} \ No newline at end of file diff --git a/scripts/scr_cheatcode/scr_cheatcode.gml b/scripts/scr_cheatcode/scr_cheatcode.gml index 1e0dd52e6a..a063a9ff70 100644 --- a/scripts/scr_cheatcode/scr_cheatcode.gml +++ b/scripts/scr_cheatcode/scr_cheatcode.gml @@ -356,7 +356,20 @@ function scr_cheatcode(argument0) { case "orkinvasion": out_of_system_warboss(); break; - + case "forgemastermeet": + var _forge_master = scr_role_count("Forge Master", "", "units"); + if (array_length(_forge_master)>0){ + show_debug_message("meet forge master"); + obj_controller.menu_lock = false; + instance_destroy(obj_popup_dialogue); + scr_toggle_diplomacy(); + obj_controller.diplomacy = -1; + obj_controller.character_diplomacy = _forge_master[0]; + diplo_txt="Greetings chapter master"; + } else { + show_debug_message("no forge master"); + } + break; } } } catch(_exception) { diff --git a/scripts/scr_controller_helpers/scr_controller_helpers.gml b/scripts/scr_controller_helpers/scr_controller_helpers.gml index 01c69269a8..5bfc518795 100644 --- a/scripts/scr_controller_helpers/scr_controller_helpers.gml +++ b/scripts/scr_controller_helpers/scr_controller_helpers.gml @@ -400,6 +400,7 @@ function scr_toggle_diplomacy() { audience = 0; diplomacy = 0; hide_banner = 1; + character_diplomacy = false; show_debug_message("set_diplo") } } diff --git a/scripts/scr_demand/scr_demand.gml b/scripts/scr_demand/scr_demand.gml index 5dad788e6e..41315af661 100644 --- a/scripts/scr_demand/scr_demand.gml +++ b/scripts/scr_demand/scr_demand.gml @@ -1,6 +1,6 @@ -function scr_demand(argument0) { +function scr_demand(demand_type) { - // argument0: button + // demand_type: button @@ -14,7 +14,11 @@ function scr_demand(argument0) { annoyed[trading_demand]+=2; if (trading_demand=2){// Imperium - with(obj_star){if (owner = eFACTION.Imperium) then instance_create(x,y,obj_temp2);} + with(obj_star){ + if (owner = eFACTION.Imperium){ + instance_create(x,y,obj_temp2); + } + } resistance=min(instance_number(obj_temp2),8); with(obj_temp2){instance_destroy();} if (obj_controller.disposition[2]<30) then resistance+=1; @@ -23,15 +27,25 @@ function scr_demand(argument0) { if (rela="hostile") or (faction_status[eFACTION.Imperium]="Antagonism") then resistance+=2; if (faction_status[eFACTION.Imperium]="War") then resistance+=3; - if (argument0=1){// Requisition + if (demand_type=1){// Requisition rull=floor(random(10))+1; - if (rull>resistance){requisition+=300;worked=true;} - if (rull<=resistance){worked=false;} + if (rull>resistance){ + requisition+=300; + worked=true; + } + else if (rull<=resistance){ + worked=false; + } } - if (argument0=2){// Crusade + if (demand_type=2){// Crusade rull=floor(random(10))+1; - if (rull>resistance){obj_controller.liscensing=2;worked=true;} - if (rull<=resistance){worked=false;} + if (rull>resistance){ + obj_controller.liscensing=2; + worked=true; + } + if (rull<=resistance){ + worked=false; + } } } @@ -46,7 +60,7 @@ function scr_demand(argument0) { if (faction_status[diplomacy]="War") then resistance+=3; if (rela="friendly") then resistance-=2; - if (argument0=1){// Requisition + if (demand_type=1){// Requisition rull=floor(random(10))+1; if (rull>resistance){requisition+=300;worked=true;} if (rull<=resistance){worked=false;} @@ -58,12 +72,12 @@ function scr_demand(argument0) { if (trading_demand=4){ resistance=10; - if (argument0=1){// Requisition + if (demand_type=1){// Requisition rull=floor(random(10))+1; if (rull>resistance){requisition+=300;worked=true;} if (rull<=resistance){worked=false;} } - if (argument0=2) and (inspection_passes=0){ + if (demand_type=2) and (inspection_passes=0){ rull=floor(random(10))+1; if (rull>resistance){ worked=true; @@ -74,7 +88,7 @@ function scr_demand(argument0) { } if (rull<=resistance){worked=false;} } - if (argument0=2) and (inspection_passes>0){ + if (demand_type=2) and (inspection_passes>0){ inspection_passes-=1; worked=true;no_penalty=true; last_world_inspection=turn+12; @@ -97,7 +111,7 @@ function scr_demand(argument0) { if (rela="neutral") then resistance-=1; if (rela="friendly") then resistance-=3; - if (argument0=2) then resistance-=2; + if (demand_type=2) then resistance-=2; if (obj_controller.faction_status[eFACTION.Eldar]="War") or (obj_controller.faction_status[eFACTION.Eldar]="Antagonism"){ with(obj_star){if (owner = eFACTION.Eldar) and (craftworld=1) then instance_create(x,y,obj_temp5);} @@ -110,7 +124,7 @@ function scr_demand(argument0) { with(obj_temp3){instance_destroy();} } - if (argument0=1){// Requisition + if (demand_type=1){// Requisition rull=floor(random(10))+1; if (rull>resistance){ requisition+=150; @@ -118,7 +132,7 @@ function scr_demand(argument0) { } if (rull<=resistance){worked=false;} } - if (argument0=2){// useful info + if (demand_type=2){// useful info rull=floor(random(10))+1; if (rull>resistance){worked=true;} if (rull<=resistance){worked=false;} @@ -139,14 +153,14 @@ function scr_demand(argument0) { if (rela="neutral") then resistance-=2; if (rela="friendly") then resistance-=2; - if (argument0=2) then resistance-=2; + if (demand_type=2) then resistance-=2; - if (argument0=1){// Requisition + if (demand_type=1){// Requisition rull=floor(random(10))+1; if (rull>resistance){requisition+=200;worked=true;} if (rull<=resistance){worked=false;} } - if (argument0=2){// Crusade + if (demand_type=2){// Crusade rull=floor(random(10))+1; if (rull>resistance){obj_controller.liscensing=2;worked=true;if (disposition[7]>=40) then no_penalty=true;} if (rull<=resistance){worked=false;} @@ -166,12 +180,12 @@ function scr_demand(argument0) { // If only one planet, and player is at it, should probably get a bonus - if (argument0=1){// Requisition + if (demand_type=1){// Requisition rull=floor(random(10))+1; if (rull>resistance){requisition+=300;worked=true;} if (rull<=resistance){worked=false;} } - if (argument0=2){ + if (demand_type=2){ rull=floor(random(10))+1; @@ -222,13 +236,36 @@ function scr_demand(argument0) { if (worked=true){ clear_diplo_choices(); - if (rela="friendly") and (no_penalty=false){disposition[trading_demand]-=8;turns_ignored[trading_demand]+=3;if (trading_demand=8) then disposition[trading_demand]+=6;} - if (rela="neutral") and (no_penalty=false){disposition[trading_demand]-=10;turns_ignored[trading_demand]+=6;if (trading_demand=8) then disposition[trading_demand]+=6;} - if (rela="hostile") and (no_penalty=false){disposition[trading_demand]-=15;turns_ignored[trading_demand]+=9;if (trading_demand=8) then disposition[trading_demand]+=9;} + if (!no_penalty){ + if (rela="friendly") { + disposition[trading_demand]-=8; + turns_ignored[trading_demand]+=3; + if (trading_demand=8){ + disposition[trading_demand]+=6; + } + } + if (rela="neutral") { + disposition[trading_demand]-=10; + turns_ignored[trading_demand]+=6; + if (trading_demand=8){ + disposition[trading_demand]+=6; + } + } + if (rela="hostile") { + disposition[trading_demand]-=15; + turns_ignored[trading_demand]+=9; + if (trading_demand=8){ + disposition[trading_demand]+=9; + } + } + if (disposition[trading_demand]<-100){ + disposition[trading_demand]=-100; + } + } - if (disposition[trading_demand]<-100) and (no_penalty=false) then disposition[trading_demand]=-100; + - if (trading_demand=6) and (argument0=2){ + if (trading_demand=6) and (demand_type=2){ if (no_penalty=false) then disposition[trading_demand]+=7; force_goodbye=1;trading_demand=0;scr_dialogue("useful_information"); exit; @@ -259,7 +296,7 @@ function scr_demand(argument0) { var war,woo;war=false;woo=floor(random(100))+1; if (no_penalty=false){ if (disposition[diplomacy]<=10) and (faction_status[diplomacy]="Antagonism") and (woo<=35) then war=true; - if (diplomacy=8) and (argument0=2) and (war=true) then war=false; + if (diplomacy=8) and (demand_type=2) and (war=true) then war=false; } if (war=false) then scr_dialogue("demand_refused"); diff --git a/scripts/scr_dialogue/scr_dialogue.gml b/scripts/scr_dialogue/scr_dialogue.gml index 2fcc5186d6..81b136abe1 100644 --- a/scripts/scr_dialogue/scr_dialogue.gml +++ b/scripts/scr_dialogue/scr_dialogue.gml @@ -6,6 +6,16 @@ function scr_dialogue(diplo_keyphrase) { // diplo_keyphrase = keyphrase clear_diplo_choices(); + if (diplomacy == -1){ + if (is_struct(character_diplomacy)){ + if (_unit.role == "Forge Master"){ + if (diplo_keyphrase == "intro"){ + diplo_text = "Chapter Master. What may " + iplomacy_option({option_text:"The Imperium and Inquisition's ignorance and hypocrisy will be the death of my Chapter.", goto: _goto}); + } + } + } + } var event_log=""; var rando=0,tempd="",sorc=false; var rela,trade_msg; @@ -1423,7 +1433,7 @@ function scr_dialogue(diplo_keyphrase) { } if (diplo_keyphrase=="trading_demand"){ if (rela=="friendly") then diplo_text="Remember whom you speak to, Chapter Master."; - if (rela=="neutral") then diplo_text="I, Inquisitor Lord "+string(faction_leader[eFACTION.Inquisition])+", on behalf of the Inquisition, am awaiting your words."; + if (rela=="neutral") then diplo_text=$"I, Inquisitor Lord {faction_leader[eFACTION.Inquisition]}, on behalf of the Inquisition, am awaiting your words."; if (rela=="hostile") then diplo_text="Speak your next words very carefully, Astartes, for they may be your last."; add_diplomacy_option({option_text:"Demand Requisition"}); add_diplomacy_option({option_text:"Skip Inspection"}); @@ -2208,9 +2218,7 @@ function scr_dialogue(diplo_keyphrase) { } if (onceh!=0){ array_push(p_feature[onceh], new NewPlanetFeature(P_features.Webway)); - obj_controller.temp[90]=name; - good=1; - obj_controller.temp[90]+=scr_roman(onceh) + obj_controller.temp[90] = planet_numeral_name(onceh); } } } @@ -2237,19 +2245,17 @@ function scr_dialogue(diplo_keyphrase) { var that,good=0; that=instance_nearest(random(room_width),random(room_height),obj_star); for(var j=0; j<5; j++){ - if (good==0) then with(that){ - var i=0,onceh=0; - for(var k=0; k<10; k++){ - i=floor(random(planets))+1; - if (array_length(p_feature[i])==0) and (onceh==0) then onceh=i;} - if (onceh!=0){ - array_push(p_feature[onceh], new NewPlanetFeature(P_features.Webway)); - obj_controller.temp[90]=name; - good=1; - if (onceh==1) then obj_controller.temp[90]+=" I"; - if (onceh==2) then obj_controller.temp[90]+=" II"; - if (onceh==3) then obj_controller.temp[90]+=" III"; - if (onceh==4) then obj_controller.temp[90]+=" IV"; + if (good==0){ + with(that){ + var onceh=0; + for(var k=0; k<10; k++){ + var i=floor(random(planets))+1; + if (array_length(p_feature[i])==0) and (onceh==0) then onceh=i; + } + if (onceh!=0){ + array_push(p_feature[onceh], new NewPlanetFeature(P_features.Webway)); + obj_controller.temp[90] = planet_numeral_name(onceh); + } } } } diff --git a/scripts/scr_diplomacy_helpers/scr_diplomacy_helpers.gml b/scripts/scr_diplomacy_helpers/scr_diplomacy_helpers.gml index 0bb0294efb..fc07518787 100644 --- a/scripts/scr_diplomacy_helpers/scr_diplomacy_helpers.gml +++ b/scripts/scr_diplomacy_helpers/scr_diplomacy_helpers.gml @@ -127,7 +127,101 @@ function basic_diplomacy_screen(){ } } -function evaluate_chosen_diplomacy_option(){ +function draw_character_diplomacy(){ + var _diplo_unit = character_diplomacy; + if (_diplo_unit.allegiance == global.chapter_name){ + + + /*if (advi="flee") { + _diplomacy_faction_name="Master of the Fleet "+string(obj_ini.lord_admiral_name); + }*/ + var _splash = ""; + var _specific_splash = 0; + _diplomacy_faction_name = _diplo_unit.name_role(); + _diplo_unit.IsSpecialist(SPECIALISTS_HEADS){ + + var _customs = obj_ini.custom_advisors; + if (_diplo_unit.IsSpecialist(SPECIALISTS_APOTHECARIES)) { + _specific_splash = struct_exists(_customs,"apothecary") ? _customs.apothecary : 2; + } + else if (_diplo_unit.IsSpecialist(SPECIALISTS_CHAPLAINS)) { + _specific_splash = struct_exists(_customs,"chaplain") ? _customs.chaplain : 3; + } + else if (_diplo_unit.IsSpecialist(SPECIALISTS_LIBRARIANS)) { + _specific_splash = struct_exists(_customs,"librarian") ? _customs.librarian : 4; + } + else if (_diplo_unit.IsSpecialist(SPECIALISTS_TECHS)) { + _specific_splash = struct_exists(_customs,"forge_master") ? _customs.forge : 5; + } + scr_image("advisor/splash", _specific_splash, 16, 43, 310, 828); + } + /* else if (advi="") { + _diplomacy_faction_name="First Sergeant "+string(recruiter_name); + }*/ + + } + + var _main_slate = diplo_buttons.main_slate; + var _meet = diplo_buttons.meet_slate; + var _cm_slate = diplo_buttons.cm_slate; + with (_meet){ + XX = 0; + YY = 520; + width = 520; + } + + _meet.inside_method = function(){ + var _diplo_unit = obj_controller.character_diplomacy; + if (!struct_exists(obj_controller, "diplo_image")){ + obj_controller.diplo_image = _diplo_unit.draw_unit_image(); + } + obj_controller.diplo_image.draw(210, 520-271,true, 1,1,0,CM_GREEN_COLOR, 1); + _diplo_unit.stat_display(false,{ + x1: 10, + y1: 520, + w: 569, + h: 303, + }, true); + draw_sprite(spr_holo_pad, 0, 210, 520); + } + + _meet.draw_with_dimensions(); + + _main_slate.XX = _meet.XX+_meet.width; + _main_slate.YY = 175; + _main_slate.draw_with_dimensions(); + draw_diplomacy_diplo_text(); + draw_set_halign(fa_center); + draw_text_transformed(622,104,$"{_diplo_unit.name_role()}",0.6,0.6,0); + draw_set_halign(fa_left); + + with (_cm_slate){ + XX = _main_slate.XX+_main_slate.width; + YY = 520; + } + _cm_slate.inside_method = function(){ + var _master = fetch_unit([0,0]); + + if (!struct_exists(obj_controller, "master_image")){ + obj_controller.master_image = _master.draw_unit_image(); + } + obj_controller.master_image.draw(1108+200, 520-271,true, 1,1,0,CM_GREEN_COLOR, 1); + _master.stat_display(false,{ + x1: 1108, + y1: 520, + w: 569, + h: 303, + } , true); + draw_sprite(spr_holo_pad, 0, 1108+200, 520); + } + _cm_slate.draw_with_dimensions(); + + + + basic_diplomacy_screen(); +} + +function evaluate_chosen_diplomacy_option(diplo_pressed){ var _opt = diplo_option[diplo_pressed]; if (_opt.goto != ""){ scr_dialogue(_opt.goto); diff --git a/scripts/scr_draw_armentarium/scr_draw_armentarium.gml b/scripts/scr_draw_armentarium/scr_draw_armentarium.gml index e5b60ac8e0..33446129a5 100644 --- a/scripts/scr_draw_armentarium/scr_draw_armentarium.gml +++ b/scripts/scr_draw_armentarium/scr_draw_armentarium.gml @@ -224,7 +224,7 @@ function scr_draw_armentarium(){ yyy1 = max_techs - temp[37]; if (yyy1 < 0) then yyy1 = yyy1 * -1; yyy = (yyy1 * 2); - if (disposition[3] mod 2 == 0) then yyy += 2; + if (disposition[3] % 2 == 0) then yyy += 2; else { yyy += 1; } 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 541e0cefce..64cdcd96d5 100644 --- a/scripts/scr_draw_unit_image/scr_draw_unit_image.gml +++ b/scripts/scr_draw_unit_image/scr_draw_unit_image.gml @@ -55,7 +55,7 @@ function surface_clear_and_free(_surface) { function UnitImage(_unit_sprite) constructor { unit_sprite = _unit_sprite; - static draw = function(xx, yy, _background = false) { + static draw = function(xx, yy, _background = false,xscale = 1, yscale=1, rot=0, col=c_white, alpha=1) { if (_background) { draw_rectangle_color_simple(xx - 1, yy - 1, xx + 1 + 166, yy + 271 + 1, 0, c_black); draw_rectangle_color_simple(xx - 1, yy - 1, xx + 166 + 1, yy + 271 + 1, 1, c_gray); @@ -63,11 +63,10 @@ function UnitImage(_unit_sprite) constructor { draw_rectangle_color_simple(xx - 3, yy - 3, xx + 166 + 3, yy + 3 + 271, 1, c_gray); } if (sprite_exists(unit_sprite)) { - draw_sprite(unit_sprite, 0, xx - 200, yy - 90); + draw_sprite_ext(unit_sprite, 0, xx - 200, yy - 90, xscale, yscale, rot, col, alpha) } }; - - static draw_part = function(xx, yy, left, top, width, height, _background = false) { + static draw_part = function(xx, yy, left, top, width, height, _background = false,xscale = 1, yscale=1, rot=0, col=c_white, alpha=1) { if (_background) { draw_rectangle_color_simple(xx - 1 + left, yy - 1 + top, xx + 1 + width, yy + height + 1, 0, c_black); draw_rectangle_color_simple(xx - 1 + left, yy - 1 + top, xx + width + 1, yy + height + 1, 1, c_gray); @@ -79,6 +78,7 @@ function UnitImage(_unit_sprite) constructor { } }; + static destroy_image = function() { if (sprite_exists(unit_sprite)) { sprite_delete(unit_sprite); diff --git a/scripts/scr_draw_unit_stat_data/scr_draw_unit_stat_data.gml b/scripts/scr_draw_unit_stat_data/scr_draw_unit_stat_data.gml index a500c083bb..8c40711179 100644 --- a/scripts/scr_draw_unit_stat_data/scr_draw_unit_stat_data.gml +++ b/scripts/scr_draw_unit_stat_data/scr_draw_unit_stat_data.gml @@ -1,8 +1,18 @@ // Script assets have changed for v2.3.0 see // https://help.yoyogames.com/hc/en-us/articles/360005277377 for more information -function scr_draw_unit_stat_data(manage=false){ - var xx=__view_get( e__VW.XView, 0 )+0; - var yy=__view_get( e__VW.YView, 0 )+0; +function scr_draw_unit_stat_data(manage=false, data_block = { + x1: 1008, + y1: 520, + w: 569, + h: 303, +}, squeezed = false){ + if (event_number==ev_gui){ + xx=0; + yy=0; + } else { + var xx=__view_get( e__VW.XView, 0 )+0; + var yy=__view_get( e__VW.YView, 0 )+0; + } var stat_tool_tips = []; var trait_tool_tips = []; var unit_name = name(); @@ -13,20 +23,15 @@ function scr_draw_unit_stat_data(manage=false){ var _psy_levels = ARR_psy_levels var _psionic_assignment = _psy_levels[psionic] } - - var data_block = { - x1: xx + 1008, - y1: yy + 520, - w: 569, - h: 303, - }; + data_block.x1 += xx; + data_block.y1 += yy; data_block.x2 = data_block.x1 + data_block.w; data_block.y2 = data_block.y1 + data_block.h; data_block.x_mid = (data_block.x1 + data_block.x2) / 2; data_block.y_mid = (data_block.y1 + data_block.y2) / 2; var attribute_box = { - x1: data_block.x1 + 84, + x1: data_block.x1 + (squeezed ? 42 : 84), y1: data_block.y1 + 8, w: 32, h: 48, @@ -257,7 +262,7 @@ function scr_draw_unit_stat_data(manage=false){ array_push(stat_tool_tips, [data_block.x1+16, attribute_box.y2+16+(i*24), data_block.x1+16+string_width(data_lines[i].text), attribute_box.y2+16+(i*24)+string_height(data_lines[i].text), data_lines[i].tooltip, ""]); } - var x1 = data_block.x2-16; + var x1 = squeezed ? data_block.x1 + ((data_block.x2- data_block.x1)/2) +32: data_block.x2-16; if (array_length(traits) != 0) { for (var i=0; i 40 && _noticed_heresy=false){ scr_alert("purple","Tech Heresy",$"{_current_tech.name_role()} contacts you concerned of Tech Heresy in the Armentarium"); scr_event_log("purple",$"{_current_tech.name_role()} contacts you concerned of Tech Heresy in the Armentarium"); @@ -259,7 +260,7 @@ function SpecialistPointHandler() constructor{ if (_new_pursuasion==forge_master){ // if tech is the forge master then forge master takes a wisdom in this case doubling as a perception test // if forge master passes tech heresy is noted and chapter master notified - if (_tester.standard_test(_current_tech, "wisdom", - 40)[0] && !_noticed_heresy){ + if (_tester.standard_test(_current_tech, "wisdom", - 40)[0] && !_noticed_heresy && !_heritecs){ _noticed_heresy=true; scr_event_log("purple",$"{techs[forge_master].name_role()} Has noticed signs of tech heresy amoung the Armentarium ranks"); scr_alert("purple","Tech Heresy",$"{techs[forge_master].name_role()} Has noticed signs of tech heresy amoung the Armentarium ranks"); @@ -278,7 +279,7 @@ function SpecialistPointHandler() constructor{ if }*/ } - if (array_length(techs)>array_length(heretics)){ + if (array_length(techs)>array_length(heretics) && !_heritecs){ if (array_length(heretics)/array_length(techs)>=0.35){ if (!irandom(9)){ /*var text_string = "You Recive an Urgent Transmision from"; diff --git a/scripts/scr_trade/scr_trade.gml b/scripts/scr_trade/scr_trade.gml index 507a2c1a72..087b5ec6b5 100644 --- a/scripts/scr_trade/scr_trade.gml +++ b/scripts/scr_trade/scr_trade.gml @@ -131,8 +131,12 @@ function TradeAttempt(diplomacy) constructor{ } } else if (_opt.trade_type == "gene"){ gene_seed-=_opt.number; - if (diplomacy_faction<=5) and (diplomacy_faction!=4) then obj_conotroller.gene_sold+=_opt.number; - if (diplomacy_faction>=6) then obj_controller.gene_xeno+=_opt.number; + if (diplomacy_faction<=5) and (diplomacy_faction!=4){ + obj_controller.gene_sold += _opt.number; + } + if (diplomacy_faction>=6){ + obj_controller.gene_xeno += _opt.number; + } } else if(_opt.trade_type == "stc"){ for (var j = 0; j < 100; j += 1) { var p = choose(1, 2, 3); @@ -543,7 +547,7 @@ function TradeAttempt(diplomacy) constructor{ static calculate_trader_trade_value = function(){ - their_worth = 0; + their_worth = 100; for (var i=0;i-6){ - draw_sprite(spr_rock_bg,0,xx,yy); - // draw_sprite(spr_diplo_splash,diplomacy,xx+916,yy+33); - draw_set_alpha(0.75); - draw_set_color(0); - draw_rectangle(xx+326+16,yy+66,xx+887+16,yy+820,0); - draw_set_alpha(1); - draw_set_color(38144); - draw_rectangle(xx+326+16,yy+66,xx+887+16,yy+820,1); - - var advi,fra;advi="";fra=0; - if (diplomacy=-5.1){ - advi="apoth"; - fra=1; - } - if (diplomacy=-5.2){ - advi="chap"; - fra=2; - if (global.chapter_name="Space Wolves"){ - fra=11; - } - } - if (diplomacy=-5.3){ - advi="libr"; - fra=3; - if (global.chapter_name="Space Wolves"){ - fra=10; - } - } - if (diplomacy=-5.4){ - advi="tech"; - fra=4; - } - if (diplomacy=-5.5){ - advi="recr"; - fra=5; - } - if (diplomacy=-5.6){ - advi="flee"; - fra=6; - } - - // draw_sprite(spr_advisors,fra,xx+16,yy+43); - scr_image("advisor/splash",fra+1,xx+16,yy+43,310,828); - draw_set_halign(fa_center); - draw_set_color(38144); - draw_set_font(fnt_40k_30b); - - var _diplomacy_faction_name=""; - var _diplomacy_faction_alligience=$"{global.chapter_name} (Imperium)"; - var _disposition_rating=""; - var warning=0; - - if (advi="flee") then _diplomacy_faction_name="Master of the Fleet "+string(obj_ini.lord_admiral_name); - if (advi="apoth") then _diplomacy_faction_name="Master of the Apothecarion "+string(obj_ini.name[0,4]); - if (advi="chap") then _diplomacy_faction_name="Master of Sanctity "+string(obj_ini.name[0,3]); - if (advi="libr") then _diplomacy_faction_name="Chief "+string(obj_ini.role[100,17])+" "+string(obj_ini.name[0,5]); - if (advi="tech") then _diplomacy_faction_name="Forge Master "+string(obj_ini.name[0,2]); - if (advi="") then _diplomacy_faction_name="First Sergeant "+string(recruiter_name); - - draw_text_transformed(xx+622,yy+66,_diplomacy_faction_alligience,1,1,0); - draw_text_transformed(xx+622,yy+104,_diplomacy_faction_name,0.6,0.6,0); - - show_stuff=true; - } + if (diplomacy == -1){ + if (!is_struct(character_diplomacy)){ + show_debug_message("no valid diplomacy target"); + diplomacy = 0; + } else { + // draw_sprite(spr_diplo_splash,diplomacy,xx+916,yy+33); - if (diplomacy = -1){ + } } - - if (diplomacy>0){// Diplomacy - Speaking var daemon; daemon=false; if (diplomacy>10) and (diplomacy<11) then daemon=true; - draw_sprite(spr_rock_bg,0,xx,yy); // draw_sprite(spr_diplo_splash,diplomacy,xx+916,yy+33); - draw_set_alpha(0.75); - draw_set_color(0); - draw_rectangle(xx+326+16,yy+66,xx+887+16,yy+820,0); - draw_set_alpha(1); - draw_set_color(38144); - draw_rectangle(xx+326+16,yy+66,xx+887+16,yy+820,1); if (diplomacy==10.1){ // if (diplomacy=10.1) then draw_sprite(spr_diplomacy_dae,0,xx+16,yy+43); daemon=true; scr_image("diplomacy_daemon",0,xx+16,yy+43,310,828); show_stuff=false; - if (mouse_x>=xx+360) and (mouse_y>=yy+143) and (mouse_x<=xx+884) and (mouse_y<=yy+180) then warning=1; + if (scr_hit(360,143,884,180)){ + warning=1; + } } if (daemon=false){ @@ -665,7 +601,7 @@ function scr_ui_diplomacy() { scr_image("diplomacy/splash",12,xx+16,yy+43,310,828); } } - + draw_set_halign(fa_center); draw_set_color(38144); draw_set_font(fnt_40k_30b); @@ -673,7 +609,8 @@ function scr_ui_diplomacy() { var _diplomacy_faction_name=""; var _diplomacy_faction_alligience=" (Imperium)"; var _disposition_rating=""; - var warning=0; + + if (diplomacy>=6){ _diplomacy_faction_alligience=""; } @@ -701,6 +638,7 @@ function scr_ui_diplomacy() { draw_rectangle(xx+366,yy+165,xx+871,yy+175,1); show_stuff=true; + _main_slate.draw_with_dimensions(); } if (warning=1 || diplomacy>=6){ @@ -711,6 +649,8 @@ function scr_ui_diplomacy() { warn="Consorting with heretics will cause your disposition with the Imperium to plummet."; } + draw_set_halign(fa_left); + draw_rectangle(mouse_x-2,mouse_y+20,mouse_x+2+string_width_ext(warn,-1,600),mouse_y+24+string_height_ext(warn,-1,600),0); draw_set_color(38144); draw_rectangle(mouse_x-2,mouse_y+20,mouse_x+2+string_width_ext(warn,-1,600),mouse_y+24+string_height_ext(warn,-1,600),1); diff --git a/scripts/scr_ui_manage/scr_ui_manage.gml b/scripts/scr_ui_manage/scr_ui_manage.gml index ba341f71a0..11e8f62615 100644 --- a/scripts/scr_ui_manage/scr_ui_manage.gml +++ b/scripts/scr_ui_manage/scr_ui_manage.gml @@ -659,7 +659,6 @@ function scr_ui_manage() { draw_set_color(c_white); - draw_sprite_and_unit_equip_data(); // Back draw_set_halign(fa_left); @@ -810,7 +809,7 @@ function scr_ui_manage() { } for (var i = 0; i < max(0, repetitions); i++) { - + draw_set_font(fnt_40k_14); if (sel >= array_length(display_unit)) { break; } diff --git a/sprites/spr_holo_pad/89bfcfeb-e00c-4896-854a-bb20c2000103.png b/sprites/spr_holo_pad/89bfcfeb-e00c-4896-854a-bb20c2000103.png new file mode 100644 index 0000000000000000000000000000000000000000..4b42c368df8ed80fccac10161cf9cfcd4e96852c GIT binary patch literal 2873 zcma);XHXN$7RQ5hP(l}}(wmwDHGm*Z0s$dF=pZeKBou=RNQ-b$kRmlGp%*CvBBDT) z8Wf~U2^a_^Tp@Ji0wPs-@ynZeAMVVXopb&(|1-ZiJ9~C!H{KFqe1=Pu3jhF|F@YN* z8CuQ=BnKNKLrgl17;@edjx+}V!W002s3!ox0mF(~0sw-*0Kken0C0@}0GtiTZM4#6 z6xdKVjST@Oe^y~jIUWGux?p0cZxcdY&o%d({3bz)JUBjnhacbf;SZcn4Q8d1NKr1q zoT<`G4IWPm%kwBd$3yc{w1Rva=FXpVY)qp`#U{~_t( z>gRN&_z|8_PqN`2TZ;iiVCZvT_dU6Q(Qi;$*>&lRzZRDYeB3E-CAe^ z2R`7AdEL|X*u+cQDRZ%jp2;2Jw}_xkd@k5^$jX5(wAhTbUbuVC?yT=9PcvawSJR`e z5b<)+Rd(U6!t{qhll`-tZwa#&f9wrU(9+%P<7t@=G2yGmJNL{{2cgv7hZ2~+?gQYs z?vnh}nWz^5I^cH;^;#4s_AbB8GUfE537Dmbq(1C+-fbzeGSZB@6)$j$b4C8H z?7hMc7AfeekvMeIARPz+>U}xmvlcK?BDRa`UV8PBrCC5unYHyD0B8M@7 zSJf_^j1)>vFsj?A#g&OZN^`55EB~u*P2Tq!dmML}?7_x2WxdDGnRh{6hd%w=YFj*; zP<-jjLB1l1#R&135X_+u%Qvx*&tv{^dP3dC>_!W-D*F7Nv1@mrA(`w2s-)ehpjoAb zI1JIhQ}pUdLJL7E9EUB-((7JMS0xRyO~P{3mkkVk51gT)NvLCtP5Wbz{VYd%ZWYhg z1>hqpr%G|5m@wGb{3YS!(}e}h=PvUWTzrk&5wG0$iPmvMLH=claC*R#8PKDM_P2c> zaGZPUZ#yq*(olQu#&FfGxB?@HTc5*3XUUg!#_6vJ&C2@C)20DO(10%o=j~h))c{ zbWJ7V_ntB!4NjO-ObNj?Y0C!OZ@ss06?eFxNMy3s{n<+29&A58SEn$evIKsO8%Y^v z(@_LJJQp0W>vBDs{EBGVrozX{l^{$!4n<bEKam!f=Pb^7MK%!}Y|Dl-8kn2+BZ(6oAM+iAt?ggG-4V z2`vgpR5%(EAzSL}iLL)PK0Zq(5^Zq4e)i9Xeca`HWw zWO8e%n8#|pf3Mi{+WmzTaXBbqG0;?oPcf%wX?aJH_RrohS09_wNS0 zvLu8`%XrIV$>o_c4WXe-8enIc%)t>fw8FL@XgJUG%6|2g4%+C!{^`Hrh8Bs3OuSrA zm7Z^PpdjB0w8v^_A%huqzUYrW_N8R235oB`-aDpc-vvI-pkwaXp%^PHce!CN1{encg8Dil!dqY2c!xq zt5!3WOQB&clDiv`nsrkR{M5&}X%gWIbepB2sVN)duMtIswAtXM8`Z89a`lT(!7n{} z-Kq(P51(&6g5Ep4QIr8G-Dcfh4K%{2L;Do;3$z`Ltpsa8?R?h1b-WdFu1+sGwID9# zjFIgi@}ghtWOGbbmjg7+YHdcH3o(j5zrUFa#56Y?PjBo_T)^_Bbj5dhhB=`Izud{n zLZ%tYvmM2HoJS;a*8)R)!h-^?A}*xk|b))tmc zi?f~?VM`iDcZ`-7K#R!^nzpu>E7^kFq1Rh%E5cl=&t@kLsC63r6{rFuPD+$)8_JMX z(RIVe4R4XFruBKn!=BdUmmy6Iic)pjU8|Clvp?$7Ft>EtkX3d)^zAw!uX*t@f`N+gR!O=^ zI_IJOuwAKX4aKv}=I2^tv1{{Z4ql!Zqc`$I!5BpOdr#yvPx<~4yp2|FSIuuBXY{Mb z*0yxa5BXy^D^FR|sgH)$HERo}+Q5SQ^t?L={9_haG zn^jI}pb<3lBy$gc!fe{uu-=xJl+E}_$_K(60&jZ+dR_Cp@5K;+8d&Y>MX>rsu!app z^V((bH84aK%*bG8b!LhG0sOJIF?T}$9Z>OUDq;Xi|LqWn@%MTV=;0sm?+h+7`w@cy Nn7|N*Zw%a{{{uWBYs>%u literal 0 HcmV?d00001 diff --git a/sprites/spr_holo_pad/layers/89bfcfeb-e00c-4896-854a-bb20c2000103/2be4912c-981a-4c4c-a48e-98881663e423.png b/sprites/spr_holo_pad/layers/89bfcfeb-e00c-4896-854a-bb20c2000103/2be4912c-981a-4c4c-a48e-98881663e423.png new file mode 100644 index 0000000000000000000000000000000000000000..4b42c368df8ed80fccac10161cf9cfcd4e96852c GIT binary patch literal 2873 zcma);XHXN$7RQ5hP(l}}(wmwDHGm*Z0s$dF=pZeKBou=RNQ-b$kRmlGp%*CvBBDT) z8Wf~U2^a_^Tp@Ji0wPs-@ynZeAMVVXopb&(|1-ZiJ9~C!H{KFqe1=Pu3jhF|F@YN* z8CuQ=BnKNKLrgl17;@edjx+}V!W002s3!ox0mF(~0sw-*0Kken0C0@}0GtiTZM4#6 z6xdKVjST@Oe^y~jIUWGux?p0cZxcdY&o%d({3bz)JUBjnhacbf;SZcn4Q8d1NKr1q zoT<`G4IWPm%kwBd$3yc{w1Rva=FXpVY)qp`#U{~_t( z>gRN&_z|8_PqN`2TZ;iiVCZvT_dU6Q(Qi;$*>&lRzZRDYeB3E-CAe^ z2R`7AdEL|X*u+cQDRZ%jp2;2Jw}_xkd@k5^$jX5(wAhTbUbuVC?yT=9PcvawSJR`e z5b<)+Rd(U6!t{qhll`-tZwa#&f9wrU(9+%P<7t@=G2yGmJNL{{2cgv7hZ2~+?gQYs z?vnh}nWz^5I^cH;^;#4s_AbB8GUfE537Dmbq(1C+-fbzeGSZB@6)$j$b4C8H z?7hMc7AfeekvMeIARPz+>U}xmvlcK?BDRa`UV8PBrCC5unYHyD0B8M@7 zSJf_^j1)>vFsj?A#g&OZN^`55EB~u*P2Tq!dmML}?7_x2WxdDGnRh{6hd%w=YFj*; zP<-jjLB1l1#R&135X_+u%Qvx*&tv{^dP3dC>_!W-D*F7Nv1@mrA(`w2s-)ehpjoAb zI1JIhQ}pUdLJL7E9EUB-((7JMS0xRyO~P{3mkkVk51gT)NvLCtP5Wbz{VYd%ZWYhg z1>hqpr%G|5m@wGb{3YS!(}e}h=PvUWTzrk&5wG0$iPmvMLH=claC*R#8PKDM_P2c> zaGZPUZ#yq*(olQu#&FfGxB?@HTc5*3XUUg!#_6vJ&C2@C)20DO(10%o=j~h))c{ zbWJ7V_ntB!4NjO-ObNj?Y0C!OZ@ss06?eFxNMy3s{n<+29&A58SEn$evIKsO8%Y^v z(@_LJJQp0W>vBDs{EBGVrozX{l^{$!4n<bEKam!f=Pb^7MK%!}Y|Dl-8kn2+BZ(6oAM+iAt?ggG-4V z2`vgpR5%(EAzSL}iLL)PK0Zq(5^Zq4e)i9Xeca`HWw zWO8e%n8#|pf3Mi{+WmzTaXBbqG0;?oPcf%wX?aJH_RrohS09_wNS0 zvLu8`%XrIV$>o_c4WXe-8enIc%)t>fw8FL@XgJUG%6|2g4%+C!{^`Hrh8Bs3OuSrA zm7Z^PpdjB0w8v^_A%huqzUYrW_N8R235oB`-aDpc-vvI-pkwaXp%^PHce!CN1{encg8Dil!dqY2c!xq zt5!3WOQB&clDiv`nsrkR{M5&}X%gWIbepB2sVN)duMtIswAtXM8`Z89a`lT(!7n{} z-Kq(P51(&6g5Ep4QIr8G-Dcfh4K%{2L;Do;3$z`Ltpsa8?R?h1b-WdFu1+sGwID9# zjFIgi@}ghtWOGbbmjg7+YHdcH3o(j5zrUFa#56Y?PjBo_T)^_Bbj5dhhB=`Izud{n zLZ%tYvmM2HoJS;a*8)R)!h-^?A}*xk|b))tmc zi?f~?VM`iDcZ`-7K#R!^nzpu>E7^kFq1Rh%E5cl=&t@kLsC63r6{rFuPD+$)8_JMX z(RIVe4R4XFruBKn!=BdUmmy6Iic)pjU8|Clvp?$7Ft>EtkX3d)^zAw!uX*t@f`N+gR!O=^ zI_IJOuwAKX4aKv}=I2^tv1{{Z4ql!Zqc`$I!5BpOdr#yvPx<~4yp2|FSIuuBXY{Mb z*0yxa5BXy^D^FR|sgH)$HERo}+Q5SQ^t?L={9_haG zn^jI}pb<3lBy$gc!fe{uu-=xJl+E}_$_K(60&jZ+dR_Cp@5K;+8d&Y>MX>rsu!app z^V((bH84aK%*bG8b!LhG0sOJIF?T}$9Z>OUDq;Xi|LqWn@%MTV=;0sm?+h+7`w@cy Nn7|N*Zw%a{{{uWBYs>%u literal 0 HcmV?d00001 diff --git a/sprites/spr_holo_pad/spr_holo_pad.yy b/sprites/spr_holo_pad/spr_holo_pad.yy new file mode 100644 index 0000000000..f1d68dcba5 --- /dev/null +++ b/sprites/spr_holo_pad/spr_holo_pad.yy @@ -0,0 +1,92 @@ +{ + "$GMSprite":"v2", + "%Name":"spr_holo_pad", + "bboxMode":0, + "bbox_bottom":81, + "bbox_left":0, + "bbox_right":166, + "bbox_top":22, + "collisionKind":1, + "collisionTolerance":0, + "DynamicTexturePage":false, + "edgeFiltering":false, + "For3D":false, + "frames":[ + {"$GMSpriteFrame":"v1","%Name":"89bfcfeb-e00c-4896-854a-bb20c2000103","name":"89bfcfeb-e00c-4896-854a-bb20c2000103","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + ], + "gridX":0, + "gridY":0, + "height":82, + "HTile":false, + "layers":[ + {"$GMImageLayer":"","%Name":"2be4912c-981a-4c4c-a48e-98881663e423","blendMode":0,"displayName":"default","isLocked":false,"name":"2be4912c-981a-4c4c-a48e-98881663e423","opacity":100.0,"resourceType":"GMImageLayer","resourceVersion":"2.0","visible":true,}, + ], + "name":"spr_holo_pad", + "nineSlice":null, + "origin":6, + "parent":{ + "name":"UI", + "path":"folders/Sprites/UI.yy", + }, + "preMultiplyAlpha":false, + "resourceType":"GMSprite", + "resourceVersion":"2.0", + "sequence":{ + "$GMSequence":"v1", + "%Name":"spr_holo_pad", + "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_holo_pad", + "playback":1, + "playbackSpeed":30.0, + "playbackSpeedType":0, + "resourceType":"GMSequence", + "resourceVersion":"2.0", + "seqHeight":82.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":"89bfcfeb-e00c-4896-854a-bb20c2000103","path":"sprites/spr_holo_pad/spr_holo_pad.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"67fe5d47-b758-48da-bda3-2a6368086433","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":82, + }, + "swatchColours":null, + "swfPrecision":0.5, + "textureGroupId":{ + "name":"Default", + "path":"texturegroups/Default", + }, + "type":0, + "VTile":false, + "width":167, +} \ No newline at end of file From 7e56782cc64b47fcc07545ab2a76530e1c0f51af Mon Sep 17 00:00:00 2001 From: Nelsonh <81228864+OH296@users.noreply.github.com> Date: Wed, 9 Jul 2025 22:49:58 +0100 Subject: [PATCH 117/286] fix: Hiding banner in manage (#906) --- scripts/scr_controller_helpers/scr_controller_helpers.gml | 1 + 1 file changed, 1 insertion(+) diff --git a/scripts/scr_controller_helpers/scr_controller_helpers.gml b/scripts/scr_controller_helpers/scr_controller_helpers.gml index 5bfc518795..8601efd191 100644 --- a/scripts/scr_controller_helpers/scr_controller_helpers.gml +++ b/scripts/scr_controller_helpers/scr_controller_helpers.gml @@ -173,6 +173,7 @@ function scr_toggle_manage() { scr_change_menu(MENU.Manage,function() { with(obj_controller) { if (menu != MENU.Manage) { + hide_banner = 1; basic_manage_settings(); scr_management(1); } From 20e4652fa4a97f568673b20888ef6401e8d684d5 Mon Sep 17 00:00:00 2001 From: EttyKitty <20323032+EttyKitty@users.noreply.github.com> Date: Fri, 11 Jul 2025 10:58:28 +0300 Subject: [PATCH 118/286] fix: Revert garbage collector delay (#907) --- objects/obj_garbage_collector/Step_0.gml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/objects/obj_garbage_collector/Step_0.gml b/objects/obj_garbage_collector/Step_0.gml index 973cb5e1fc..6a18688bb5 100644 --- a/objects/obj_garbage_collector/Step_0.gml +++ b/objects/obj_garbage_collector/Step_0.gml @@ -4,7 +4,7 @@ if (gc_timer > 0) { } else { - gc_timer = 50000; // Default is every frame, so de-facto 1; + gc_timer = 50; // Default is every frame, so de-facto 1; gc_collect(); wait_and_execute(0, function(){ @@ -22,4 +22,4 @@ if (gc_timer > 0) { } log_message(_gc_message); }); -} \ No newline at end of file +} From 4e55878b5109b159dc0aaeb12de706e8e4f692a7 Mon Sep 17 00:00:00 2001 From: Nelsonh <81228864+OH296@users.noreply.github.com> Date: Fri, 11 Jul 2025 14:06:08 +0100 Subject: [PATCH 119/286] chore: gitnore gc (#908) --- .gitignore | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.gitignore b/.gitignore index 385ac1a4b2..0dfabf0be6 100644 --- a/.gitignore +++ b/.gitignore @@ -12,3 +12,5 @@ ChapterMaster.resource_order tmp/ stitch.config.json + +objects/obj_garbage_collector/ From a98a498355f41e7cc3d554d475155e3b532c9980 Mon Sep 17 00:00:00 2001 From: Cassie / Victoria <71527619+CassieCaster@users.noreply.github.com> Date: Fri, 11 Jul 2025 18:13:12 -0400 Subject: [PATCH 120/286] feat: Force Sword sprite by [DARK] Jeffro (#909) --- ChapterMaster.yyp | 3 +- .../scr_culture_visuals.gml | 2 +- .../b38dc224-c08d-42f1-9f78-d517a6dc7b0d.png | Bin 0 -> 4965 bytes .../956e8d0a-af47-4b63-b116-fea81d656413.png | Bin 0 -> 4965 bytes .../spr_weapon_frcsword.yy | 92 ++++++++++++++++++ 5 files changed, 95 insertions(+), 2 deletions(-) create mode 100644 sprites/spr_weapon_frcsword/b38dc224-c08d-42f1-9f78-d517a6dc7b0d.png create mode 100644 sprites/spr_weapon_frcsword/layers/b38dc224-c08d-42f1-9f78-d517a6dc7b0d/956e8d0a-af47-4b63-b116-fea81d656413.png create mode 100644 sprites/spr_weapon_frcsword/spr_weapon_frcsword.yy diff --git a/ChapterMaster.yyp b/ChapterMaster.yyp index 8d3f5d471f..96910bcc17 100644 --- a/ChapterMaster.yyp +++ b/ChapterMaster.yyp @@ -575,7 +575,7 @@ "isEcma":false, "LibraryEmitters":[], "MetaData":{ - "IDEVersion":"2024.1400.0.815", + "IDEVersion":"2024.1400.0.841", }, "name":"ChapterMaster", "resources":[ @@ -1686,6 +1686,7 @@ {"id":{"name":"spr_weapon_flamer","path":"sprites/spr_weapon_flamer/spr_weapon_flamer.yy",},}, {"id":{"name":"spr_weapon_frcaxe","path":"sprites/spr_weapon_frcaxe/spr_weapon_frcaxe.yy",},}, {"id":{"name":"spr_weapon_frcstaff","path":"sprites/spr_weapon_frcstaff/spr_weapon_frcstaff.yy",},}, + {"id":{"name":"spr_weapon_frcsword","path":"sprites/spr_weapon_frcsword/spr_weapon_frcsword.yy",},}, {"id":{"name":"spr_weapon_grav_cannon","path":"sprites/spr_weapon_grav_cannon/spr_weapon_grav_cannon.yy",},}, {"id":{"name":"spr_weapon_grav_gun","path":"sprites/spr_weapon_grav_gun/spr_weapon_grav_gun.yy",},}, {"id":{"name":"spr_weapon_grav_pistol","path":"sprites/spr_weapon_grav_pistol/spr_weapon_grav_pistol.yy",},}, diff --git a/scripts/scr_culture_visuals/scr_culture_visuals.gml b/scripts/scr_culture_visuals/scr_culture_visuals.gml index 31e770eaf2..aa92949e77 100644 --- a/scripts/scr_culture_visuals/scr_culture_visuals.gml +++ b/scripts/scr_culture_visuals/scr_culture_visuals.gml @@ -2447,7 +2447,7 @@ base: { }, variants: [ { - sprite: spr_weapon_powswo + sprite: spr_weapon_frcsword } ] }, diff --git a/sprites/spr_weapon_frcsword/b38dc224-c08d-42f1-9f78-d517a6dc7b0d.png b/sprites/spr_weapon_frcsword/b38dc224-c08d-42f1-9f78-d517a6dc7b0d.png new file mode 100644 index 0000000000000000000000000000000000000000..8ed5bfb3701aad7cb1c8a3f43f339ae31905ed8c GIT binary patch literal 4965 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 literal 0 HcmV?d00001 diff --git a/sprites/spr_weapon_frcsword/layers/b38dc224-c08d-42f1-9f78-d517a6dc7b0d/956e8d0a-af47-4b63-b116-fea81d656413.png b/sprites/spr_weapon_frcsword/layers/b38dc224-c08d-42f1-9f78-d517a6dc7b0d/956e8d0a-af47-4b63-b116-fea81d656413.png new file mode 100644 index 0000000000000000000000000000000000000000..8ed5bfb3701aad7cb1c8a3f43f339ae31905ed8c GIT binary patch literal 4965 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 literal 0 HcmV?d00001 diff --git a/sprites/spr_weapon_frcsword/spr_weapon_frcsword.yy b/sprites/spr_weapon_frcsword/spr_weapon_frcsword.yy new file mode 100644 index 0000000000..4b6b9eb3a5 --- /dev/null +++ b/sprites/spr_weapon_frcsword/spr_weapon_frcsword.yy @@ -0,0 +1,92 @@ +{ + "$GMSprite":"v2", + "%Name":"spr_weapon_frcsword", + "bboxMode":0, + "bbox_bottom":222, + "bbox_left":20, + "bbox_right":59, + "bbox_top":59, + "collisionKind":1, + "collisionTolerance":0, + "DynamicTexturePage":false, + "edgeFiltering":false, + "For3D":false, + "frames":[ + {"$GMSpriteFrame":"v1","%Name":"b38dc224-c08d-42f1-9f78-d517a6dc7b0d","name":"b38dc224-c08d-42f1-9f78-d517a6dc7b0d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + ], + "gridX":0, + "gridY":0, + "height":231, + "HTile":false, + "layers":[ + {"$GMImageLayer":"","%Name":"956e8d0a-af47-4b63-b116-fea81d656413","blendMode":0,"displayName":"default","isLocked":false,"name":"956e8d0a-af47-4b63-b116-fea81d656413","opacity":100.0,"resourceType":"GMImageLayer","resourceVersion":"2.0","visible":true,}, + ], + "name":"spr_weapon_frcsword", + "nineSlice":null, + "origin":0, + "parent":{ + "name":"melee", + "path":"folders/Sprites/Marine Viewer/weapons/melee.yy", + }, + "preMultiplyAlpha":false, + "resourceType":"GMSprite", + "resourceVersion":"2.0", + "sequence":{ + "$GMSequence":"v1", + "%Name":"spr_weapon_frcsword", + "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_weapon_frcsword", + "playback":1, + "playbackSpeed":1.0, + "playbackSpeedType":1, + "resourceType":"GMSequence", + "resourceVersion":"2.0", + "seqHeight":231.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":"b38dc224-c08d-42f1-9f78-d517a6dc7b0d","path":"sprites/spr_weapon_frcsword/spr_weapon_frcsword.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"e37fa24f-c0ad-482b-ae93-ea01da41025e","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 From a68340179167f3e4cbb5ef9bd0d99450984d8faa Mon Sep 17 00:00:00 2001 From: Nelsonh <81228864+OH296@users.noreply.github.com> Date: Fri, 11 Jul 2025 23:45:48 +0100 Subject: [PATCH 121/286] fix: make "Demand" diplomacy actions work inquisition (#910) --- scripts/scr_demand/scr_demand.gml | 74 ++++++++++++++----- scripts/scr_dialogue/scr_dialogue.gml | 57 +++++++++++--- .../scr_diplomacy_helpers.gml | 19 +++-- .../scr_inquisition_fleet_functions.gml | 1 + scripts/scr_quest/scr_quest.gml | 13 +++- scripts/scr_ui_diplomacy/scr_ui_diplomacy.gml | 38 +++++----- 6 files changed, 141 insertions(+), 61 deletions(-) diff --git a/scripts/scr_demand/scr_demand.gml b/scripts/scr_demand/scr_demand.gml index 41315af661..1824c232e8 100644 --- a/scripts/scr_demand/scr_demand.gml +++ b/scripts/scr_demand/scr_demand.gml @@ -1,3 +1,53 @@ +function threat_plausibility(){ + var _threat = 20; + var _good_imperium_position = diplomacy[eFACTION.Imperium] > 50 ? 1 : -1; + var _relative_strength = floor(obj_controller/20); + var _nature = ""; +} + +function clear_inspections(){ + with(obj_en_fleet){ + if (owner = eFACTION.Inquisition) and (string_count("Inqis",trade_goods)>0){ + trade_goods="cancel_inspection"; + target=0; + } + } +} + +function inquis_use_inspection_pass(){ + if (inspection_passes>0){ + inspection_passes-=1; + last_world_inspection=turn+25; + last_fleet_inspection=turn+25; + //obj_controller.liscensing=5; + clear_inspections(); + diplo_text = "Very well i shall honour our previous agreements. (24 months leave of inspections)"; + } +} + +function inquis_demand_inspection_pass(){ + var resistance=10; + var _worked = false; + clear_diplo_choices(); + if (inspection_passes==0){ + rull=floor(random(10))+1; + if (rull>resistance){ + _worked=true; + last_world_inspection=turn+24; + last_fleet_inspection=turn+24; + //obj_controller.liscensing=5; + clear_inspections(); + diplo_text = "Very well Chapter Master I Your service to the imperium is well known i have no doubt that you would not ask such of me without good reasoon. I shall forgoe my normal duties just this onece. \n do not becomne complacent Chapter Master i may not always be so generous"; + } else { + var _diff = resistance - rull; + diplomacy[eFACTION.Inquisition] -= 1; + diplo_text = "Consider your request denied. If there is heresy or any wrong doing i shal see that is rooted out and made plain for all to see";; + + } + } + +} + function scr_demand(demand_type) { // demand_type: button @@ -73,28 +123,14 @@ function scr_demand(demand_type) { resistance=10; if (demand_type=1){// Requisition - rull=floor(random(10))+1; - if (rull>resistance){requisition+=300;worked=true;} - if (rull<=resistance){worked=false;} - } - if (demand_type=2) and (inspection_passes=0){ rull=floor(random(10))+1; if (rull>resistance){ - worked=true; - last_world_inspection=turn+12; - last_fleet_inspection=turn+12; - obj_controller.liscensing=5; - with(obj_en_fleet){if (owner = eFACTION.Inquisition) and (string_count("Inqis",trade_goods)>0){trade_goods="cancel_inspection";target=0;}} + requisition+=300; + worked=true; + } + if (rull<=resistance){ + worked=false; } - if (rull<=resistance){worked=false;} - } - if (demand_type=2) and (inspection_passes>0){ - inspection_passes-=1; - worked=true;no_penalty=true; - last_world_inspection=turn+12; - last_fleet_inspection=turn+12; - obj_controller.liscensing=5; - with(obj_en_fleet){if (owner = eFACTION.Inquisition) and (string_count("Inqis",trade_goods)>0){trade_goods="cancel_inspection";target=0;}} } } diff --git a/scripts/scr_dialogue/scr_dialogue.gml b/scripts/scr_dialogue/scr_dialogue.gml index 81b136abe1..6e226eb741 100644 --- a/scripts/scr_dialogue/scr_dialogue.gml +++ b/scripts/scr_dialogue/scr_dialogue.gml @@ -478,6 +478,11 @@ function scr_dialogue(diplo_keyphrase) { }; } + if (diplo_keyphrase=="Demand Method"){ + add_diplomacy_option({option_text:"Threaten", tooltip : "The plausibility will of your threat"}); + add_diplomacy_option({option_text:"Bribe"}); + add_diplomacy_option({option_text:"Plausible Excuse"}); + } // ** Chaos ** if (diplomacy=10){ if (diplo_keyphrase=="civilwar_begin"){ @@ -746,7 +751,10 @@ function scr_dialogue(diplo_keyphrase) { } add_diplomacy_option({option_text:"Demand Requisition"}); add_diplomacy_option({option_text:"Demand Military Assistance"}); - add_diplomacy_option({option_text:"Cancel"}); + add_diplomacy_option({ + option_text:"Cancel", + goto:"disagree" + }); } if (diplo_keyphrase=="propose_alliance") and (obj_controller.faction_gender[10]==1){ var _found = false; @@ -985,7 +993,10 @@ function scr_dialogue(diplo_keyphrase) { if (rela=="hostile") then diplo_text="Consider your next words carefully."; add_diplomacy_option({option_text:"Demand Requisition"}); add_diplomacy_option({option_text:"Demand Military Assistance"}); - add_diplomacy_option({option_text:"Cancel"}); + add_diplomacy_option({ + option_text:"Cancel", + goto:"disagree" + }); } if (string_count("assassination_angryish",diplo_keyphrase)>0){ var ta="",tb="",tc=""; @@ -1188,7 +1199,10 @@ function scr_dialogue(diplo_keyphrase) { if (randoo!=1) then diplo_text="Certain queries may have to be answered by action."; } add_diplomacy_option({option_text:"Demand Requisition"}); - add_diplomacy_option({option_text:"Cancel"}); + add_diplomacy_option({ + option_text:"Cancel", + goto:"disagree" + }); } } // ** Inquisition ** @@ -1435,12 +1449,26 @@ function scr_dialogue(diplo_keyphrase) { if (rela=="friendly") then diplo_text="Remember whom you speak to, Chapter Master."; if (rela=="neutral") then diplo_text=$"I, Inquisitor Lord {faction_leader[eFACTION.Inquisition]}, on behalf of the Inquisition, am awaiting your words."; if (rela=="hostile") then diplo_text="Speak your next words very carefully, Astartes, for they may be your last."; - add_diplomacy_option({option_text:"Demand Requisition"}); - add_diplomacy_option({option_text:"Skip Inspection"}); - add_diplomacy_option({option_text:"Cancel"}); + add_diplomacy_option({ + option_text:"Demand Requisition" + }); + + + add_diplomacy_option({ + option_text:"Skip Inspection", + method : inquis_demand_inspection_pass, + }); + if (inspection_passes>0){ - add_diplomacy_option({option_text:"Skip Inspection ({inspection_passes} pass)"}); + add_diplomacy_option({ + option_text:"Skip Inspection (Use pass)", + method : inquis_use_inspection_pass + }); } + add_diplomacy_option({ + option_text:"Cancel", + goto:"disagree" + }); } if (diplo_keyphrase=="penitent_end"){ rando=choose(1,2); @@ -1761,7 +1789,10 @@ function scr_dialogue(diplo_keyphrase) { if (rela=="neutral") then diplo_text="What is the meaning of this?"; if (rela=="hostile") then diplo_text="“The Heretic and Blasphemer can offer no excuse for their crimes. Those who are pardoned merely live to further shroud Humanity from the Light of the Emperor with the Darkness of their souls.”"; add_diplomacy_option({option_text:"Demand Requisition"}); - add_diplomacy_option({option_text:"Cancel"}); + add_diplomacy_option({ + option_text:"Cancel", + goto:"disagree" + }); } if (diplo_keyphrase=="penitent_end"){ rando=choose(1,2); @@ -2014,7 +2045,10 @@ function scr_dialogue(diplo_keyphrase) { } add_diplomacy_option({option_text:"Demand Requisition"}); add_diplomacy_option({option_text:"Demand Useful Information"}); - add_diplomacy_option({option_text:"Cancel"}); + add_diplomacy_option({ + option_text:"Cancel", + goto:"disagree" + }); } if (diplo_keyphrase=="mission1"){ diplo_text="The good that might come from simple acts of benevolence are oft underestimated. A token goodwill gesture can go far, "; @@ -2497,7 +2531,10 @@ function scr_dialogue(diplo_keyphrase) { diplo_text="Yeah? Wut?"; add_diplomacy_option({option_text:"Demand Requisition"}); add_diplomacy_option({option_text:"Demand Military Assistance"}); - add_diplomacy_option({option_text:"Cancel"}); + add_diplomacy_option({ + option_text:"Cancel", + goto:"disagree" + }); } } // ** Tau ** diff --git a/scripts/scr_diplomacy_helpers/scr_diplomacy_helpers.gml b/scripts/scr_diplomacy_helpers/scr_diplomacy_helpers.gml index fc07518787..50f5273dc1 100644 --- a/scripts/scr_diplomacy_helpers/scr_diplomacy_helpers.gml +++ b/scripts/scr_diplomacy_helpers/scr_diplomacy_helpers.gml @@ -83,15 +83,15 @@ function basic_diplomacy_screen(){ var sw=1; for (var i=1;i<5;i++){ - if (string_width(string_hash_to_newline(_opt))*sw>530) then sw-=0.05; + if (string_width(string_hash_to_newline(_opt.option_text))*sw>530) then sw-=0.05; } - if (string_width(string_hash_to_newline(_opt))*sw<=530) and (sw=1){ - draw_text_transformed(xx+620,yy+696,string_hash_to_newline(_opt),sw,sw,0); - draw_text_transformed(xx+620,yy+696+2,string_hash_to_newline(_opt),sw,sw,0); + if (string_width(string_hash_to_newline(_opt.option_text))*sw<=530) and (sw=1){ + draw_text_transformed(xx+620,yy+696,string_hash_to_newline(_opt.option_text),sw,sw,0); + draw_text_transformed(xx+620,yy+696+2,string_hash_to_newline(_opt.option_text),sw,sw,0); } - if (string_width(string_hash_to_newline(_opt))*sw>530){ - draw_text_ext_transformed(xx+620,yy+696-4,string_hash_to_newline(_opt),16,530/sw,sw,sw,0); + if (string_width(string_hash_to_newline(_opt.option_text))*sw>530){ + draw_text_ext_transformed(xx+620,yy+696-4,string_hash_to_newline(_opt.option_text),16,530/sw,sw,sw,0); } if scr_hit(left,top,right,base){ draw_set_alpha(0.2); @@ -223,10 +223,6 @@ function draw_character_diplomacy(){ function evaluate_chosen_diplomacy_option(diplo_pressed){ var _opt = diplo_option[diplo_pressed]; - if (_opt.goto != ""){ - scr_dialogue(_opt.goto); - exit; - } var _pressed_option = _opt.key; if (struct_exists(_opt, "method")){ @@ -234,6 +230,9 @@ function evaluate_chosen_diplomacy_option(diplo_pressed){ script_execute(_opt.method); } } + if (_opt.goto != ""){ + scr_dialogue(_opt.goto); + } } function scr_diplomacy_hit(selection, new_path, complex_path="none"){ diff --git a/scripts/scr_inquisition_fleet_functions/scr_inquisition_fleet_functions.gml b/scripts/scr_inquisition_fleet_functions/scr_inquisition_fleet_functions.gml index f8b49b665c..6f67c3e6b1 100644 --- a/scripts/scr_inquisition_fleet_functions/scr_inquisition_fleet_functions.gml +++ b/scripts/scr_inquisition_fleet_functions/scr_inquisition_fleet_functions.gml @@ -13,6 +13,7 @@ function base_inquis_fleet (){ } } + function hunt_player_serfs(){ explode_script(obj_controller.temp[1008],"|"); var tb=string(explode[0]); diff --git a/scripts/scr_quest/scr_quest.gml b/scripts/scr_quest/scr_quest.gml index 7a7fd51995..e9c8f99873 100644 --- a/scripts/scr_quest/scr_quest.gml +++ b/scripts/scr_quest/scr_quest.gml @@ -68,11 +68,18 @@ function scr_quest(quest_satus=0, quest_name, quest_fac, quest_end) { disposition[4]-=10; obj_controller.qsfx=1; }else { + var _result_text = ""; delete_artifact(wanted_arti); i=wanted_arti; - if (obj_controller.demanding=0) then obj_controller.disposition[4]+=1; - if (obj_controller.demanding=1) then obj_controller.disposition[4]+=choose(0,0,1); - scr_popup("Inquisition Mission Completed","The Inquisition has asked for the return of the Artifact, and your Chapter was able to hand it over without complications. The mission has been accomplished.","inquisition",""); + if (obj_controller.demanding=0){ + obj_controller.disposition[4]+=1; + obj_controller.inspection_passes++; + _result_text = "(Disposition : 1\nInspection Passes : +1(yieldable in diplommacy))"; + } + if (obj_controller.demanding=1){ + obj_controller.disposition[4]+=choose(0,0,1); + } + scr_popup("Inquisition Mission Completed","The Inquisition has asked for the return of the Artifact, and your Chapter was able to hand it over without complications. The mission has been accomplished." + _result_text,"inquisition",""); scr_event_log("","Inquisition Mission Completed: The entrusted Artifact has been returned to the Inquisition."); } } diff --git a/scripts/scr_ui_diplomacy/scr_ui_diplomacy.gml b/scripts/scr_ui_diplomacy/scr_ui_diplomacy.gml index 5322472428..d7933344b4 100644 --- a/scripts/scr_ui_diplomacy/scr_ui_diplomacy.gml +++ b/scripts/scr_ui_diplomacy/scr_ui_diplomacy.gml @@ -1,6 +1,6 @@ function draw_character_diplomacy_base_page(){ obj_controller.menu_lock = true; - if (!audience){ + if (!audience && !valid_diplomacy_options()){ with (diplo_buttons){ trade.draw(); demand.draw(); @@ -284,22 +284,22 @@ function set_up_diplomacy_persons(){ } diplo_persons.imperium = new ShutterButton(); var _imp = diplo_persons.imperium; - _imp.image = known[eFACTION.Imperium] ? 3 : 4; + _imp.image = known[eFACTION.Imperium] || global.cheat_debug? 3 : 4; _imp._faction_enum = eFACTION.Imperium; diplo_persons.mechanicus = new ShutterButton(); var _mechs = diplo_persons.mechanicus; - _mechs.image = known[eFACTION.Mechanicus] ? 5 : 6; + _mechs.image = known[eFACTION.Mechanicus] || global.cheat_debug? 5 : 6; _mechs._faction_enum = eFACTION.Mechanicus; diplo_persons.inquisition = new ShutterButton(); var _inquis = diplo_persons.inquisition; - _inquis.image = known[eFACTION.Inquisition] ? 7 : 8; + _inquis.image = known[eFACTION.Inquisition]|| global.cheat_debug ? 7 : 8; _inquis._faction_enum = eFACTION.Inquisition; diplo_persons.sisters = new ShutterButton(); var _sisters = diplo_persons.sisters; - _sisters.image = known[eFACTION.Ecclesiarchy] ? 9 : 10; + _sisters.image = known[eFACTION.Ecclesiarchy] || global.cheat_debug? 9 : 10; _sisters._faction_enum = eFACTION.Ecclesiarchy; @@ -307,21 +307,21 @@ function set_up_diplomacy_persons(){ diplo_persons.eldar = new ShutterButton(); var _eldar = diplo_persons.eldar; if (faction_gender[eFACTION.Eldar]=1){ - _eldar.image = known[eFACTION.Eldar] ? 9 : 10; + _eldar.image = known[eFACTION.Eldar] || global.cheat_debug? 9 : 10; } else { - _eldar.image = known[eFACTION.Eldar] ? 21 : 22; + _eldar.image = known[eFACTION.Eldar] || global.cheat_debug? 21 : 22; } _eldar._faction_enum = eFACTION.Eldar; diplo_persons.ork = new ShutterButton(); var _orks = diplo_persons.ork; - _orks.image = known[eFACTION.Ork] ? 13 : 14; + _orks.image = known[eFACTION.Ork] || global.cheat_debug? 13 : 14; _orks._faction_enum = eFACTION.Ork; diplo_persons.tau = new ShutterButton(); var _tau = diplo_persons.tau; - _tau.image = known[eFACTION.Tau] ? 15 : 16; + _tau.image = known[eFACTION.Tau] || global.cheat_debug? 15 : 16; _tau._faction_enum = eFACTION.Tau; diplo_persons.chaos = new ShutterButton(); @@ -387,14 +387,14 @@ function set_up_diplomacy_persons(){ draw_text_transformed(xx+169,yy+65,$"Disposition: {obj_controller.disposition[_faction_enum]}",0.7,0.7,0); scr_draw_rainbow(xx+250,yy+66,xx+400,yy+76,(obj_controller.disposition[_faction_enum]/200)+0.5); - if (obj_controller.known[_faction_enum]>0.7) and (obj_controller.faction_defeated[_faction_enum]=0) { + if (((obj_controller.known[_faction_enum]>0.7) and (obj_controller.faction_defeated[_faction_enum]=0) )|| global.cheat_debug) { var _audience = management_buttons.audience; _audience.update({ x1: xx+169, y1: yy+85, }); _audience.bind_method = function(){ - if (obj_controller.known[_faction_enum]!=0) and (obj_controller.turns_ignored[_faction_enum]==0){ + if (obj_controller.known[_faction_enum]!=0 || global.cheat_debug) and (obj_controller.turns_ignored[_faction_enum]==0){ obj_controller.diplomacy = _faction_enum; intro_to_diplomacy(_faction_enum); } @@ -474,21 +474,21 @@ function scr_ui_diplomacy() { xx+=55;yy-=20; - diplo_persons.imperium.draw_shutter(xx+31, yy+281, false, 1.5, known[eFACTION.Imperium]>0.7); + diplo_persons.imperium.draw_shutter(xx+31, yy+281, false, 1.5, known[eFACTION.Imperium]>0.7 || global.cheat_debug); - diplo_persons.mechanicus.draw_shutter(xx+31, yy+417, false, 1.5, known[eFACTION.Mechanicus]>0.7); + diplo_persons.mechanicus.draw_shutter(xx+31, yy+417, false, 1.5, known[eFACTION.Mechanicus]>0.7 || global.cheat_debug); - diplo_persons.inquisition.draw_shutter(xx+31, yy+553, false, 1.5, known[eFACTION.Inquisition]>0.7); + diplo_persons.inquisition.draw_shutter(xx+31, yy+553, false, 1.5, known[eFACTION.Inquisition]>0.7 || global.cheat_debug); - diplo_persons.sisters.draw_shutter(xx+31, yy+689, false, 1.5, known[eFACTION.Ecclesiarchy]>0.7); + diplo_persons.sisters.draw_shutter(xx+31, yy+689, false, 1.5, known[eFACTION.Ecclesiarchy]>0.7 || global.cheat_debug); - diplo_persons.eldar.draw_shutter(xx+1041, yy+281, false, 1.5, known[eFACTION.Eldar]>0.7); + diplo_persons.eldar.draw_shutter(xx+1041, yy+281, false, 1.5, known[eFACTION.Eldar]>0.7 || global.cheat_debug); - diplo_persons.ork.draw_shutter(xx+1041, yy+417, false, 1.5, known[eFACTION.Ork]>0.7); + diplo_persons.ork.draw_shutter(xx+1041, yy+417, false, 1.5, known[eFACTION.Ork]>0.7 || global.cheat_debug); - diplo_persons.tau.draw_shutter(xx+1041, yy+553, false, 1.5, known[eFACTION.Tau]>0.7); + diplo_persons.tau.draw_shutter(xx+1041, yy+553, false, 1.5, known[eFACTION.Tau]>0.7 || global.cheat_debug); - diplo_persons.chaos.draw_shutter(xx+1041, yy+689, false, 1.5, known[eFACTION.Chaos]>0.7); + diplo_persons.chaos.draw_shutter(xx+1041, yy+689, false, 1.5, known[eFACTION.Chaos]>0.7 || global.cheat_debug); scr_image("symbol",0,xx+138,yy+174,217,107); From c99ee0ee00b9769639522c30786cee0678e68d3d Mon Sep 17 00:00:00 2001 From: Nelsonh <81228864+OH296@users.noreply.github.com> Date: Sat, 12 Jul 2025 16:05:14 +0100 Subject: [PATCH 122/286] fix: use correct font size on promote tabs (#912) --- scripts/scr_ui_manage/scr_ui_manage.gml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/scr_ui_manage/scr_ui_manage.gml b/scripts/scr_ui_manage/scr_ui_manage.gml index 11e8f62615..42bd89e58a 100644 --- a/scripts/scr_ui_manage/scr_ui_manage.gml +++ b/scripts/scr_ui_manage/scr_ui_manage.gml @@ -790,7 +790,7 @@ function scr_ui_manage() { man_count = 0; var _command_slots_data = get_command_slots_data(); - + draw_set_font(fnt_40k_14); if (managing > 0 && managing <= 10) { for (var r = 0; r < array_length(_command_slots_data); r++) { var role = _command_slots_data[r]; From 538f40062ffe1332ef9717b2b8e84c9647729c3b Mon Sep 17 00:00:00 2001 From: Nelsonh <81228864+OH296@users.noreply.github.com> Date: Sat, 12 Jul 2025 16:07:32 +0100 Subject: [PATCH 123/286] fix: Home world treated as player owned for garrison and recruit (#911) --- ChapterMaster.yyp | 2 +- scripts/scr_garrison/scr_garrison.gml | 14 ++++++++++---- scripts/scr_recruit_data/scr_recruit_data.gml | 2 ++ .../scr_system_search_helpers.gml | 7 ++++++- sprites/spr_weapon_frcstaff/spr_weapon_frcstaff.yy | 6 +++++- 5 files changed, 24 insertions(+), 7 deletions(-) diff --git a/ChapterMaster.yyp b/ChapterMaster.yyp index 96910bcc17..d451882129 100644 --- a/ChapterMaster.yyp +++ b/ChapterMaster.yyp @@ -575,7 +575,7 @@ "isEcma":false, "LibraryEmitters":[], "MetaData":{ - "IDEVersion":"2024.1400.0.841", + "IDEVersion":"2024.1400.0.815", }, "name":"ChapterMaster", "resources":[ diff --git a/scripts/scr_garrison/scr_garrison.gml b/scripts/scr_garrison/scr_garrison.gml index 5228d2cd55..cd5d421671 100644 --- a/scripts/scr_garrison/scr_garrison.gml +++ b/scripts/scr_garrison/scr_garrison.gml @@ -1,7 +1,9 @@ function disposition_description_chart(dispo) { if (global.cheat_debug) { return $"{dispo}" - } else if (dispo < -100) { + } else if (dispo < -4000) { + return "Ruled"; + }else if (dispo < -100) { return "DEBUG: Numbers lower than -100 detected, this shouldn't happen!"; } else if (dispo <= 0) { return "Extremely Hostile"; @@ -154,11 +156,15 @@ function GarrisonForce(planet_operatives, turn_end=false, type="garrison") const } else {report_string+="The garrison is comprised of a single _squad,"} report_string+= $" with a total man count of {total_garrison}.#" - if (system.p_owner[planet] != eFACTION.Player) { + if (system.p_owner[planet] != eFACTION.Player && system.dispo[planet] >=-100) { var disposition = disposition_description_chart(system.dispo[planet]); report_string += $"Our Relationship with the Rulers of the planet is {disposition}#"; - } else if (system.dispo[planet] < -1000 && system.p_owner[planet] == eFACTION.Player) { - report_string += $"Rule of the planet is going well"; + } else if (system.dispo[planet] < -1000) { + if (system.p_owner[planet] == eFACTION.Player){ + report_string += $"Rule of the planet is going well"; + } else { + report_string += $"Your rule of the the planet is being undermined by hostile forces"; + } } else { report_string += $"DEBUG: planet owner check failed"; //report_string+=$"There is no clear chain of command on the planet we suspect the existence of Xenos or Heretic Forces"; // TODO LOW GARRISON_XENO // Readd when this actually gets implented diff --git a/scripts/scr_recruit_data/scr_recruit_data.gml b/scripts/scr_recruit_data/scr_recruit_data.gml index 17ad9e28b3..e926978a58 100644 --- a/scripts/scr_recruit_data/scr_recruit_data.gml +++ b/scripts/scr_recruit_data/scr_recruit_data.gml @@ -51,6 +51,8 @@ function find_recruit_success_chance(local_apothecary_points, system, planet, ui recruit_chance = 3000 } else if (p_data.at_war(0, 0, 0) && p_data.player_disposition < 0) { recruit_chance = 2000 + } else if (p_data.player_disposition<-1000 && p_data.current_owner == eFACTION.Player) { + var recruit_chance = 1500 - _recruit_cost*100; } else { var _frictious = (p_data.at_war(0, 1, 1) && p_data.player_disposition <= 50); var _disp_mod = -((_frictious ? 30 : 10) * p_data.player_disposition); diff --git a/scripts/scr_system_search_helpers/scr_system_search_helpers.gml b/scripts/scr_system_search_helpers/scr_system_search_helpers.gml index dddbf01764..de17cd7fd1 100644 --- a/scripts/scr_system_search_helpers/scr_system_search_helpers.gml +++ b/scripts/scr_system_search_helpers/scr_system_search_helpers.gml @@ -61,7 +61,12 @@ function scr_is_planet_owned_by_allies(star, planet_id) { if( planet_id < 1 ){//1 because weird indexing starting at 1 in this game return false; } - return array_contains(global.SystemHelps.default_allies, star.p_owner[planet_id]); + if (array_contains(global.SystemHelps.default_allies, star.p_owner[planet_id])){ + return true; + }else if(star.dispo[planet_id] < -4000) { + return true; + } + return false; } function scr_is_star_owned_by_allies(star) { diff --git a/sprites/spr_weapon_frcstaff/spr_weapon_frcstaff.yy b/sprites/spr_weapon_frcstaff/spr_weapon_frcstaff.yy index 66d06787bd..2b559c4f6c 100644 --- a/sprites/spr_weapon_frcstaff/spr_weapon_frcstaff.yy +++ b/sprites/spr_weapon_frcstaff/spr_weapon_frcstaff.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":"a09fc4ff-b696-45c3-b5ae-6b73250622a7","path":"sprites/spr_weapon_frcstaff/spr_weapon_frcstaff.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"8bf4c274-3780-4000-a5da-baf166ccb705","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"a09fc4ff-b696-45c3-b5ae-6b73250622a7","path":"sprites/spr_weapon_frcstaff/spr_weapon_frcstaff.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"8bf4c274-3780-4000-a5da-baf166ccb705","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, From 42fb3de69be65ba419d09fb03d4b53b9588bcd04 Mon Sep 17 00:00:00 2001 From: Nelsonh <81228864+OH296@users.noreply.github.com> Date: Sat, 12 Jul 2025 16:13:13 +0100 Subject: [PATCH 124/286] fix: Call warboss from out of system if no available spawn planet (#913) Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com> --- .../scr_ork_fleet_functions.gml | 34 ++++++++++++------- 1 file changed, 21 insertions(+), 13 deletions(-) diff --git a/scripts/scr_ork_fleet_functions/scr_ork_fleet_functions.gml b/scripts/scr_ork_fleet_functions/scr_ork_fleet_functions.gml index b12529f015..8b886390d3 100644 --- a/scripts/scr_ork_fleet_functions/scr_ork_fleet_functions.gml +++ b/scripts/scr_ork_fleet_functions/scr_ork_fleet_functions.gml @@ -203,28 +203,36 @@ function init_ork_waagh(overide = false){ } } + var _waaagh_star_found = false; if (array_length(ork_waagh_activity)){ var _waaagh_star = array_random_element(ork_waagh_activity); + _waaagh_star_found = true; } else if (array_length(_any_ork_star) > 0) { var _waaagh_star = array_random_element(_any_ork_star); - } - var _pdata = new PlanetData(_waaagh_star[1], _waaagh_star[0]); - var _boss = _pdata.add_feature(P_features.OrkWarboss); - if (overide){ - _boss.player_hidden = false; - scr_event_log("red","boss on {_pdata.name()}", _pdata.system.name); + _waaagh_star_found = true; } - if (_pdata.planet_forces[eFACTION.Ork] < 4) { - _pdata.add_forces(eFACTION.Ork, 2); - } + if (_waaagh_star_found){ + var _pdata = new PlanetData(_waaagh_star[1], _waaagh_star[0]); + + var _boss = _pdata.add_feature(P_features.OrkWarboss); + if (overide){ + _boss.player_hidden = false; + scr_event_log("red",$"boss on {_pdata.name()}", _pdata.system.name); + } + if (_pdata.planet_forces[eFACTION.Ork] < 4) { + _pdata.add_forces(eFACTION.Ork, 2); + } + } else { + out_of_system_warboss(true); + } } } -function out_of_system_warboss(){ +function out_of_system_warboss(overide = false){ with (obj_controller){ // More Testing @@ -232,7 +240,7 @@ function out_of_system_warboss(){ var did_so=false; - if (did_so=false)&& (faction_defeated[7]=1 || known[eFACTION.Ork]== 0 ) { + if (did_so=false) && (faction_defeated[7]=1 || known[eFACTION.Ork] == 0 || overide) { known[eFACTION.Ork] = 0; var _warboss = new NewPlanetFeature(P_features.OrkWarboss); if (faction_defeated[7]=1){ @@ -318,10 +326,10 @@ function out_of_system_warboss(){ instance_activate_object(obj_en_fleet); var _ork_leader = obj_controller.faction_leader[eFACTION.Ork]; - var tix=$"Warboss {_ork_leader} leads a WAAAGH! into Sector "+string(obj_ini.sector_name)+"."; + var tix=$"Warboss {_ork_leader} leads a WAAAGH! into Sector {obj_ini.sector_name}."; scr_alert("red","lol",string(tix),starf.x,starf.y); scr_event_log("red",tix); - scr_popup("WAAAAGH!",$"A WAAAGH! led by the Warboss {_ork_leader} has arrived in "+string(obj_ini.sector_name)+". With him is a massive Ork fleet. Numbering in the dozens of battleships, they carry with them countless greenskins. The forefront of the WAAAGH! is destined for the "+string(starf.name)+" system.","waaagh",""); + scr_popup("WAAAAGH!",$"A WAAAGH! led by the Warboss {_ork_leader} has arrived in {obj_ini.sector_name}. With him is a massive Ork fleet. Numbering in the dozens of battleships, they carry with them countless greenskins. The forefront of the WAAAGH! is destined for the {starf.name} system.","waaagh",""); } } } From 31bf157455cd9cf7731a2c0990af6a5d6e4760ee Mon Sep 17 00:00:00 2001 From: Werwolf-12 Date: Sat, 12 Jul 2025 18:30:05 +0200 Subject: [PATCH 125/286] fix: Cata fixes and Serpha V jump pack. (#915) --- objects/obj_shop/Create_0.gml | 6 ++ .../scr_culture_visuals.gml | 51 ++++++++-- .../scr_initialize_custom.gml | 2 + scripts/scr_ruins_reward/scr_ruins_reward.gml | 2 +- scripts/scr_weapon/scr_weapon.gml | 11 +++ sprites/spr_cata_belt/spr_cata_belt.yy | 6 +- .../2583c501-d4e3-4285-b210-347ae21d5657.png | Bin 4176 -> 4163 bytes .../1c6df36d-e885-4b8f-a400-731ba5f7a89f.png | Bin 4176 -> 4163 bytes sprites/spr_cata_complex/spr_cata_complex.yy | 6 +- .../spr_cata_cowl_trim/spr_cata_cowl_trim.yy | 6 +- .../eacd6626-c655-4103-80b3-501d635dbecc.png | Bin 0 -> 1082 bytes .../19bbd962-0cda-4b64-9afc-f12938f1660e.png | Bin 0 -> 1082 bytes .../spr_cata_cowl_trim_1.yy | 92 ++++++++++++++++++ .../d14dc785-21d1-4e15-ad83-2b38fa9a79f7.png | Bin 1125 -> 1260 bytes .../fe0dd4fc-c973-4418-9c16-c69e04260f36.png | Bin 1125 -> 1260 bytes sprites/spr_cata_gorget/spr_cata_gorget.yy | 6 +- .../cc1bb055-3092-4530-9edd-694aca0796a7.png | Bin 1093 -> 1065 bytes .../df8d27d6-66e9-4750-b0dc-950fe74d3e9f.png | Bin 1058 -> 1042 bytes .../1875f065-a467-43e5-b1cb-779c58891acc.png | Bin 1093 -> 1065 bytes .../1875f065-a467-43e5-b1cb-779c58891acc.png | Bin 1058 -> 1042 bytes sprites/spr_cata_head/spr_cata_head.yy | 6 +- .../spr_cata_heavy_toe_left.yy | 6 +- .../spr_cata_heavy_toe_right.yy | 6 +- .../spr_cata_left_arm/spr_cata_left_arm.yy | 6 +- .../spr_cata_left_armtrim.yy | 6 +- .../spr_cata_left_knee/spr_cata_left_knee.yy | 6 +- .../30845d03-5630-4ea2-b874-e43d1c591f74.png | Bin 1623 -> 1595 bytes .../c2171e14-c3fe-4232-ba2e-e302118f9cc4.png | Bin 1623 -> 1595 bytes .../spr_cata_left_leg/spr_cata_left_leg.yy | 6 +- .../spr_cata_left_trim/spr_cata_left_trim.yy | 6 +- .../spr_cata_left_trim_1.yy | 6 +- .../spr_cata_left_trim_2.yy | 6 +- .../spr_cata_right_arm/spr_cata_right_arm.yy | 6 +- .../spr_cata_right_armtrim.yy | 6 +- .../spr_cata_right_knee.yy | 6 +- .../spr_cata_right_leg/spr_cata_right_leg.yy | 6 +- .../spr_cata_right_trim.yy | 6 +- .../spr_cata_right_trim_1.yy | 6 +- .../spr_cata_right_trim_2.yy | 6 +- .../spr_cata_shoulder_hanging_leather_left.yy | 6 +- .../3d17787f-c1c2-47db-992e-a221a37550a1.png | Bin 906 -> 795 bytes .../89d15f31-c097-44dc-98f3-b3d5ed35463c.png | Bin 906 -> 795 bytes ...cata_shoulder_hanging_leather_left_tips.yy | 6 +- .../0eb5da06-be9b-42af-a45c-5652a70e0363.png | Bin 948 -> 836 bytes .../240582c2-092d-40fa-9caa-ea64c5a2fc69.png | Bin 948 -> 836 bytes ...spr_cata_shoulder_hanging_leather_right.yy | 6 +- ...ata_shoulder_hanging_leather_right_tips.yy | 6 +- .../spr_cata_shoulder_hanging_mail_left.yy | 6 +- .../spr_cata_shoulder_hanging_mail_right.yy | 6 +- .../spr_cata_tabbard_leather.yy | 6 +- .../16ff2f35-0659-40fa-be7a-7a2942a2c47e.png | Bin 647 -> 595 bytes .../a8907230-deee-4373-af6a-ec8ca94f1d81.png | Bin 647 -> 595 bytes .../spr_cata_tabbard_leather_hangings.yy | 6 +- .../spr_cata_tabbard_mail.yy | 6 +- .../bf0c5f8b-3023-4fe2-8b02-193bc2c05b25.png | Bin 0 -> 4703 bytes .../44bab4d0-aab6-43b3-8549-2f4f4dc0ef03.png | Bin 0 -> 4703 bytes .../spr_jump_pack_serpha_complex.yy | 92 ++++++++++++++++++ .../175b3fc0-27ea-4b35-bab7-7867c6fa811b.png | Bin 0 -> 1938 bytes .../929a717e-45ba-45eb-915b-7e0136b8f8d3.png | Bin 0 -> 1938 bytes .../spr_weapon_volkite_culverin_term.yy | 92 ++++++++++++++++++ 60 files changed, 431 insertions(+), 97 deletions(-) create mode 100644 sprites/spr_cata_cowl_trim_1/eacd6626-c655-4103-80b3-501d635dbecc.png create mode 100644 sprites/spr_cata_cowl_trim_1/layers/eacd6626-c655-4103-80b3-501d635dbecc/19bbd962-0cda-4b64-9afc-f12938f1660e.png create mode 100644 sprites/spr_cata_cowl_trim_1/spr_cata_cowl_trim_1.yy create mode 100644 sprites/spr_jump_pack_serpha_complex/bf0c5f8b-3023-4fe2-8b02-193bc2c05b25.png create mode 100644 sprites/spr_jump_pack_serpha_complex/layers/bf0c5f8b-3023-4fe2-8b02-193bc2c05b25/44bab4d0-aab6-43b3-8549-2f4f4dc0ef03.png create mode 100644 sprites/spr_jump_pack_serpha_complex/spr_jump_pack_serpha_complex.yy create mode 100644 sprites/spr_weapon_volkite_culverin_term/175b3fc0-27ea-4b35-bab7-7867c6fa811b.png create mode 100644 sprites/spr_weapon_volkite_culverin_term/layers/175b3fc0-27ea-4b35-bab7-7867c6fa811b/929a717e-45ba-45eb-915b-7e0136b8f8d3.png create mode 100644 sprites/spr_weapon_volkite_culverin_term/spr_weapon_volkite_culverin_term.yy diff --git a/objects/obj_shop/Create_0.gml b/objects/obj_shop/Create_0.gml index 31e8be499c..29cf62e715 100644 --- a/objects/obj_shop/Create_0.gml +++ b/objects/obj_shop/Create_0.gml @@ -653,6 +653,12 @@ if (shop = "equipment") { item_stocked[i] = scr_item_count(item[i]); item_cost[i] = 0; forge_cost[i] = 0; + i += 1; + nobuy[i] = 1; + item[i] = "Ancient Jump Pack"; + item_stocked[i] = scr_item_count(item[i]); + item_cost[i] = 0; + forge_cost[i] = 0; i += 1; var mc = 0; diff --git a/scripts/scr_culture_visuals/scr_culture_visuals.gml b/scripts/scr_culture_visuals/scr_culture_visuals.gml index aa92949e77..60504a8cbb 100644 --- a/scripts/scr_culture_visuals/scr_culture_visuals.gml +++ b/scripts/scr_culture_visuals/scr_culture_visuals.gml @@ -731,6 +731,18 @@ global.modular_drawing_items = [ "chest_fastening" : spr_backpack_fastening, }, + }, + { + sprite : spr_jump_pack_serpha_complex, + body_types :[0], + position : "backpack_augment", + equipped : { + "mobi" : "Ancient Jump Pack" + }, + overides : { + "chest_fastening" : spr_backpack_fastening, + }, + }, { sprite : spr_gear_hood2, @@ -1130,6 +1142,7 @@ global.modular_drawing_items = [ ] }, { + position : "tabbard", sprite : spr_cata_tabbard_mail, body_types:[2], @@ -1172,6 +1185,15 @@ global.modular_drawing_items = [ sprite : spr_cata_shoulder_hanging_leather_right, body_types:[2], armours : ["Cataphractii"], + subcomponents : [ + [spr_blank, spr_cata_shoulder_hanging_leather_right_tips], + ], + overides: { + "left_pauldron_embeleshments" : + spr_cata_shoulder_hanging_leather_left, + "tabbard": + spr_cata_tabbard_leather + }, subcomponents : [ [spr_blank, spr_cata_shoulder_hanging_leather_right_tips], ], @@ -1186,12 +1208,21 @@ global.modular_drawing_items = [ ], }, { + position : "right_pauldron_embeleshments", sprite : spr_cata_shoulder_hanging_mail_right, body_types:[2], armours : ["Cataphractii"], + overides: { + "left_pauldron_embeleshments" : + spr_cata_shoulder_hanging_mail_left, + "tabbard": + spr_cata_tabbard_mail }, + }, + { + position : "left_pauldron_embeleshments", sprite : spr_cata_shoulder_hanging_mail_left, body_types:[2], @@ -1524,14 +1555,22 @@ global.weapon_visual_data = { "Volkite Culverin": { base: { weapon_data: { - display_type: "ranged_twohand", - new_weapon_draw: true + display_type: "terminator_ranged", }, - body_types: [0,1] + body_types: [2] }, - variants: [{ - sprite: spr_weapon_volkite_culverin, - }] + variants: [ + { + sprite: spr_weapon_volkite_culverin_term + }, + { + weapon_data: { + display_type: "ranged_twohand", + }, + sprite: spr_weapon_volkite_culverin, + body_types: [0, 1] + } + ] }, //Bolter Pack "Phobos Bolter": { diff --git a/scripts/scr_initialize_custom/scr_initialize_custom.gml b/scripts/scr_initialize_custom/scr_initialize_custom.gml index 99e55bf954..e23e49f2ee 100644 --- a/scripts/scr_initialize_custom/scr_initialize_custom.gml +++ b/scripts/scr_initialize_custom/scr_initialize_custom.gml @@ -3226,6 +3226,8 @@ var armm5=""; scr_add_item("Phobos Bolter",10); scr_add_item("Phobos Bolt Pistol",3); scr_add_item("Mars Heavy Bolter",5); + scr_add_item("Ancient Jump Pack",5); + scr_add_item("Jump Pack",-5); armm1=choose("Volkite Culverin","Volkite Caliver","Mars Plasma Cannon","Ryza Lascannon","Grav-Cannon","Proteus Multi-Melta","Cthon Autocannon"); armk1=irandom_range(2,5); armm2=choose("Primus Melta Gun","Ryza Plasma Gun","Volkite Charger","Grav-Gun"); diff --git a/scripts/scr_ruins_reward/scr_ruins_reward.gml b/scripts/scr_ruins_reward/scr_ruins_reward.gml index cacf6e3c84..92f41d2a40 100644 --- a/scripts/scr_ruins_reward/scr_ruins_reward.gml +++ b/scripts/scr_ruins_reward/scr_ruins_reward.gml @@ -151,7 +151,7 @@ else if (ruins_type=5){ wen6=choose(0,1); wep7=choose("Company Standard","Narthecium","Psychic Hood","Rosarius"); wen7=choose(0,1); - wep8=choose("Jump Pack"); + wep8=choose("Ancient Jump Pack"); wen8=choose(1,2,3); } //Fallen Breacher Squad diff --git a/scripts/scr_weapon/scr_weapon.gml b/scripts/scr_weapon/scr_weapon.gml index eca3d8e294..689451ea50 100644 --- a/scripts/scr_weapon/scr_weapon.gml +++ b/scripts/scr_weapon/scr_weapon.gml @@ -2817,6 +2817,17 @@ global.gear = { }, "tags": ["jump"], }, + "Ancient Jump Pack": { + "abbreviation": "AncientJmpPck", + "special_properties": ["Hammer of Wrath"], + "description": "A back-mounted device containing jets powerful enough to lift an Astartes in Power Armor over great distances. Utilizing these, Assault Marines bring devastation to the foe. This is ancient and now very rare serpha V pattern, used mostly during Emperors's Great Crusade.", + "damage_resistance_mod": { + "standard": 30, + "master_crafted": 35, + "artifact": 40 + }, + "tags": ["jump"], + }, "Heavy Weapons Pack": { "abbreviation": "HvyWpPck", "description": "A heavy ammunition backpack commonly used by devastators in conjunction with a heavy support weapon.", diff --git a/sprites/spr_cata_belt/spr_cata_belt.yy b/sprites/spr_cata_belt/spr_cata_belt.yy index 7185f14855..e895943f0e 100644 --- a/sprites/spr_cata_belt/spr_cata_belt.yy +++ b/sprites/spr_cata_belt/spr_cata_belt.yy @@ -23,7 +23,7 @@ ], "name":"spr_cata_belt", "nineSlice":null, - "origin":0, + "origin":9, "parent":{ "name":"cata_complex", "path":"folders/Sprites/Marine Viewer/body_types/cata_complex.yy", @@ -77,8 +77,8 @@ ], "visibleRange":null, "volume":1.0, - "xorigin":0, - "yorigin":0, + "xorigin":6, + "yorigin":8, }, "swatchColours":null, "swfPrecision":0.5, diff --git a/sprites/spr_cata_complex/2583c501-d4e3-4285-b210-347ae21d5657.png b/sprites/spr_cata_complex/2583c501-d4e3-4285-b210-347ae21d5657.png index 0f188724293959f309ea03d417e5e109d8704499..f8b6ff41845708ccf4202eefa82523b789a37c5d 100644 GIT binary patch delta 3945 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 delta 4042 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 diff --git a/sprites/spr_cata_complex/layers/2583c501-d4e3-4285-b210-347ae21d5657/1c6df36d-e885-4b8f-a400-731ba5f7a89f.png b/sprites/spr_cata_complex/layers/2583c501-d4e3-4285-b210-347ae21d5657/1c6df36d-e885-4b8f-a400-731ba5f7a89f.png index 0f188724293959f309ea03d417e5e109d8704499..f8b6ff41845708ccf4202eefa82523b789a37c5d 100644 GIT binary patch delta 3945 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 delta 4042 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 diff --git a/sprites/spr_cata_complex/spr_cata_complex.yy b/sprites/spr_cata_complex/spr_cata_complex.yy index 72206a160d..ac3c37434e 100644 --- a/sprites/spr_cata_complex/spr_cata_complex.yy +++ b/sprites/spr_cata_complex/spr_cata_complex.yy @@ -23,7 +23,7 @@ ], "name":"spr_cata_complex", "nineSlice":null, - "origin":0, + "origin":9, "parent":{ "name":"cata_complex", "path":"folders/Sprites/Marine Viewer/body_types/cata_complex.yy", @@ -77,8 +77,8 @@ ], "visibleRange":null, "volume":1.0, - "xorigin":0, - "yorigin":0, + "xorigin":6, + "yorigin":8, }, "swatchColours":null, "swfPrecision":0.5, diff --git a/sprites/spr_cata_cowl_trim/spr_cata_cowl_trim.yy b/sprites/spr_cata_cowl_trim/spr_cata_cowl_trim.yy index f6e6d92409..4ec40c3f04 100644 --- a/sprites/spr_cata_cowl_trim/spr_cata_cowl_trim.yy +++ b/sprites/spr_cata_cowl_trim/spr_cata_cowl_trim.yy @@ -23,7 +23,7 @@ ], "name":"spr_cata_cowl_trim", "nineSlice":null, - "origin":0, + "origin":9, "parent":{ "name":"cata_complex", "path":"folders/Sprites/Marine Viewer/body_types/cata_complex.yy", @@ -77,8 +77,8 @@ ], "visibleRange":null, "volume":1.0, - "xorigin":0, - "yorigin":0, + "xorigin":6, + "yorigin":8, }, "swatchColours":null, "swfPrecision":0.5, diff --git a/sprites/spr_cata_cowl_trim_1/eacd6626-c655-4103-80b3-501d635dbecc.png b/sprites/spr_cata_cowl_trim_1/eacd6626-c655-4103-80b3-501d635dbecc.png new file mode 100644 index 0000000000000000000000000000000000000000..8d0e60d400e5128e3f6f0c9cbca2d6379453dd73 GIT binary patch literal 1082 zcmeAS@N?(olHy`uVBq!ia0vp^%Ypa>2OE&=lK2t|q!f}pf_xbms?-=58d?|_egTCV zUNA6}8Za=tN?>5Hn!&&zUNC1@pbb!hEy>&6h2cL4F4((#G6Ms%uBVG*NX4zUw@w${ z3J_s?;H<_Q&>o#|ut`j#h1WR8=S^?=jQ|ea3N@WOO|J_$Pbmc{ad&d~TzFh}|5(ox z!RK*x_r?2wCNngIsl|#L7)72nt*ud&EtigTIdb~*>yy1_A1|s{xn6(C;eE@bPA%`~ zIQuv$ns?QNI6wE;)UoGle@EfcmaQl6FSy5LjhE{?R@0rPD1 z7uhYDef;R2KXJPA-4|_|{`~rzr$0@*J95lsr(VqttY3EX)lJ>`^KI%EF5k3l@j_|; zz4dOFYEtZ;U4Q_~0IQ`&6c1 zk&}AY1+qN8oVTYrA%s~<(9qv>!Aa8{Zl*JCclf!lS@Y>^kjo-Q-&Gq;e~F#RiWTH! z{}O$jwM1j}n*+av&UAEmu3T3c7%mra+=tV`GP&np?FaSrg|=%ZN^A4&sduSw{<-qn zpXcZ2U9Sq(^nWe*@wGZ5?j5F z@t0q>U;Wnmnzrn6=39=>A3qw-u#<3>)-yci7V5kFa?W0>EB9`{o!8w70h(tUKVm{=d-u-Fgr1U0dz^=G$ov|B1fYJMC7ju3zJ} z-EU=a-d;1dx+jka4ePLObf5p0OuBpv_@@LUS-9@u`GTrM|8s@cu(%OK4hIfCNjy4wT zFfbP>0Xjgn#5JNMC9x#cD!C{XNHG{07@6uCnCluEg%}!J85&v{m}wgrSQ!{3l>AUd x(U6;;l9^VCTZ5pc!%UzC4Y&;@nYpROC5gEOxb?W%B)Wlu#naW#Wt~$(6985RuLA%8 literal 0 HcmV?d00001 diff --git a/sprites/spr_cata_cowl_trim_1/layers/eacd6626-c655-4103-80b3-501d635dbecc/19bbd962-0cda-4b64-9afc-f12938f1660e.png b/sprites/spr_cata_cowl_trim_1/layers/eacd6626-c655-4103-80b3-501d635dbecc/19bbd962-0cda-4b64-9afc-f12938f1660e.png new file mode 100644 index 0000000000000000000000000000000000000000..8d0e60d400e5128e3f6f0c9cbca2d6379453dd73 GIT binary patch literal 1082 zcmeAS@N?(olHy`uVBq!ia0vp^%Ypa>2OE&=lK2t|q!f}pf_xbms?-=58d?|_egTCV zUNA6}8Za=tN?>5Hn!&&zUNC1@pbb!hEy>&6h2cL4F4((#G6Ms%uBVG*NX4zUw@w${ z3J_s?;H<_Q&>o#|ut`j#h1WR8=S^?=jQ|ea3N@WOO|J_$Pbmc{ad&d~TzFh}|5(ox z!RK*x_r?2wCNngIsl|#L7)72nt*ud&EtigTIdb~*>yy1_A1|s{xn6(C;eE@bPA%`~ zIQuv$ns?QNI6wE;)UoGle@EfcmaQl6FSy5LjhE{?R@0rPD1 z7uhYDef;R2KXJPA-4|_|{`~rzr$0@*J95lsr(VqttY3EX)lJ>`^KI%EF5k3l@j_|; zz4dOFYEtZ;U4Q_~0IQ`&6c1 zk&}AY1+qN8oVTYrA%s~<(9qv>!Aa8{Zl*JCclf!lS@Y>^kjo-Q-&Gq;e~F#RiWTH! z{}O$jwM1j}n*+av&UAEmu3T3c7%mra+=tV`GP&np?FaSrg|=%ZN^A4&sduSw{<-qn zpXcZ2U9Sq(^nWe*@wGZ5?j5F z@t0q>U;Wnmnzrn6=39=>A3qw-u#<3>)-yci7V5kFa?W0>EB9`{o!8w70h(tUKVm{=d-u-Fgr1U0dz^=G$ov|B1fYJMC7ju3zJ} z-EU=a-d;1dx+jka4ePLObf5p0OuBpv_@@LUS-9@u`GTrM|8s@cu(%OK4hIfCNjy4wT zFfbP>0Xjgn#5JNMC9x#cD!C{XNHG{07@6uCnCluEg%}!J85&v{m}wgrSQ!{3l>AUd x(U6;;l9^VCTZ5pc!%UzC4Y&;@nYpROC5gEOxb?W%B)Wlu#naW#Wt~$(6985RuLA%8 literal 0 HcmV?d00001 diff --git a/sprites/spr_cata_cowl_trim_1/spr_cata_cowl_trim_1.yy b/sprites/spr_cata_cowl_trim_1/spr_cata_cowl_trim_1.yy new file mode 100644 index 0000000000..f977f634c4 --- /dev/null +++ b/sprites/spr_cata_cowl_trim_1/spr_cata_cowl_trim_1.yy @@ -0,0 +1,92 @@ +{ + "$GMSprite":"v2", + "%Name":"spr_cata_cowl_trim_1", + "bboxMode":0, + "bbox_bottom":43, + "bbox_left":57, + "bbox_right":113, + "bbox_top":7, + "collisionKind":1, + "collisionTolerance":0, + "DynamicTexturePage":false, + "edgeFiltering":false, + "For3D":false, + "frames":[ + {"$GMSpriteFrame":"v1","%Name":"eacd6626-c655-4103-80b3-501d635dbecc","name":"eacd6626-c655-4103-80b3-501d635dbecc","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + ], + "gridX":0, + "gridY":0, + "height":232, + "HTile":false, + "layers":[ + {"$GMImageLayer":"","%Name":"19bbd962-0cda-4b64-9afc-f12938f1660e","blendMode":0,"displayName":"default","isLocked":false,"name":"19bbd962-0cda-4b64-9afc-f12938f1660e","opacity":100.0,"resourceType":"GMImageLayer","resourceVersion":"2.0","visible":true,}, + ], + "name":"spr_cata_cowl_trim_1", + "nineSlice":null, + "origin":9, + "parent":{ + "name":"cata_complex", + "path":"folders/Sprites/Marine Viewer/body_types/cata_complex.yy", + }, + "preMultiplyAlpha":false, + "resourceType":"GMSprite", + "resourceVersion":"2.0", + "sequence":{ + "$GMSequence":"v1", + "%Name":"spr_cata_cowl_trim", + "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_cata_cowl_trim", + "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":"eacd6626-c655-4103-80b3-501d635dbecc","path":"sprites/spr_cata_cowl_trim_1/spr_cata_cowl_trim_1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"dd9d5e2a-e1f0-4998-93af-4d70aa530ab5","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":6, + "yorigin":8, + }, + "swatchColours":null, + "swfPrecision":0.5, + "textureGroupId":{ + "name":"Default", + "path":"texturegroups/Default", + }, + "type":0, + "VTile":false, + "width":167, +} \ No newline at end of file diff --git a/sprites/spr_cata_gorget/d14dc785-21d1-4e15-ad83-2b38fa9a79f7.png b/sprites/spr_cata_gorget/d14dc785-21d1-4e15-ad83-2b38fa9a79f7.png index ff80aaffa48d20e8f87f3515a0600bfd1e01db52..513e7f4ddd91f47c613ba6bf40b7daabd8824d97 100644 GIT binary patch delta 1059 zcmaFL@rH9kQqp}-7srr_TW@b0W=p5buzfh5+pD=HK$M@6-AL4`?8GhK_=5?%s&d)& z8TIA%NbIS|2w(3yVf})&tJ`~Icd^Vm${V^sSJo$h{qD}^o1Yw8`E>KUzkeNMnC5@E z{&VO5z3;1om?j4@OVl5zk9fVSAyt}(&C|$t(#e!dtIyy5ljC_!ZL;Te)w?VEcj-Nl z^O^tF)_>BRKOfG1`SWLwIb&>m{QP&dzmq3D`H@mRYo6(B{#|+uVwzfW#Kpy9r$6|7 z$0_h(%GN1D=K?2P+`RX>BoEu=|9`Xi4Woh^J6ZZpHy?J)b?~xkj3v8g_G=e=_N&0$)7u!vZ<_Q z(_E8db64N7m5$x~?ZuCj-R0%`CovteJig*J)4LOqlj3*lCC&8WNuPA}&Aheie(rc( zHEnH2!8X0O>o@(nTRbQ7dd;ot-c>;!^%l|FzVWwNpUf&fpLYF@y#(LnJui1HOMU%R za=XW4`Iz!^b3Vye>wb9W+|OO1FXk1ey>Qjgno~S&>amlD`7*R;q+i|k zJ=R!LXHM}RztYb74#r&8 CAjdo9uYk73&=Bs(LuPUEB%=Kc9_fNM;_LFTi7iO!m zwryTo|Ih5a1^Hy=Kg1* zJx$RtoY7ejw{gMZUgKzf-&GfYZa%f|?FO^0hi}~apSty~hv~MQeQ_%f`m_|Ub4@<@ z2bzUr4oMjWiUS_=c+^(BHX0Ofq9lo`8@{`Rf z`&FhtKDmDKpOE(oQ?6SIyiaiSxIHWO!}c@Rd|nsm#n_0SIw~_Ex}v@FtVOuGUwS6% zXEWiImn;q5XYTr0Ygb=gAbD-}t}NpT`|B%qZ2R_W_qx;ZoQEpi^LELvXR-!mgY^3D zKg>d#GGA%3H!f#jU{Eb_jVMV;EJ?LWE=mPb3`Pb9nO2EgL-~miexL>oxD6$lxv9l^C5gEOxHT!8D4`o;Yzg@;OZiSwrC+F96P3k^v@aDRTTUWm-qe?kdxs98GrDK#n=nDwyLU< zX4Zgo1eyB z01PQAoX^kCV=sX>D50&VuD^`E1bcgjA}VK9-7Tx?Zn;_SQ&rXB|KH>Is;WAC+t0VX zjlG_0C?cFm9>!jP{eQh(DdEg^x0>Y(IM;n81%-37-Y=8PqO~_IJ;|rddjDzc^;}Ca z;beMdAI`e27u($`X`RcaTs>P=v+;SmTg~p%ucUx*_L$3LJKJ{NC^4K#rdd6Es^+W} z5zcmNf0=HlUOkuF-Rg5@+|rXm!rAsRwKsoHrh0a(W_urVRewx4dj_MazPQc0ALd*& zlY+uIWD3=@w6kVow(q(jtrz-Ofs*7_t57GH#Z=9t@XFa9j&8Anc7r+Rk1G4j`kgmq zsCp*1Q$c%Lc~Mm}DZFy#bU3=13fj}k&)!5OC^DR_$vydg<~(chKRTq%V-B?Pn?4&~ zLlK)CGB9i;oqsl;T=$oo&6{ALjUU%jQZSRk!S?xsRdy z@19+IE~p>xzoqD4CMxHNc13Ho*xs{WbGt@sz)D@$i+^??`)=2F)@_EL_T!ft%tSbQ z^|alS01dVLm)kvTcdPcf@npE_Y2A&J;FlcAhPK|L2}aYpH|zbS>xzmL8ANf6Eta_OT^)e)27174Hx0|^Tl@-O@If8}&Aq`;F(1R57MEiyP% zFfuwcHaayhD=;uRFfizyEkl!g1R57MEiyP%FfuwcHaayhD=;uRFff_GmH(5h1RWzb lEiyP%FfuwcHaayhD=;uRFfh*5v>*Tg002ovPDHLkV1o6xtStZl diff --git a/sprites/spr_cata_gorget/layers/d14dc785-21d1-4e15-ad83-2b38fa9a79f7/fe0dd4fc-c973-4418-9c16-c69e04260f36.png b/sprites/spr_cata_gorget/layers/d14dc785-21d1-4e15-ad83-2b38fa9a79f7/fe0dd4fc-c973-4418-9c16-c69e04260f36.png index ff80aaffa48d20e8f87f3515a0600bfd1e01db52..513e7f4ddd91f47c613ba6bf40b7daabd8824d97 100644 GIT binary patch delta 1059 zcmaFL@rH9kQqp}-7srr_TW@b0W=p5buzfh5+pD=HK$M@6-AL4`?8GhK_=5?%s&d)& z8TIA%NbIS|2w(3yVf})&tJ`~Icd^Vm${V^sSJo$h{qD}^o1Yw8`E>KUzkeNMnC5@E z{&VO5z3;1om?j4@OVl5zk9fVSAyt}(&C|$t(#e!dtIyy5ljC_!ZL;Te)w?VEcj-Nl z^O^tF)_>BRKOfG1`SWLwIb&>m{QP&dzmq3D`H@mRYo6(B{#|+uVwzfW#Kpy9r$6|7 z$0_h(%GN1D=K?2P+`RX>BoEu=|9`Xi4Woh^J6ZZpHy?J)b?~xkj3v8g_G=e=_N&0$)7u!vZ<_Q z(_E8db64N7m5$x~?ZuCj-R0%`CovteJig*J)4LOqlj3*lCC&8WNuPA}&Aheie(rc( zHEnH2!8X0O>o@(nTRbQ7dd;ot-c>;!^%l|FzVWwNpUf&fpLYF@y#(LnJui1HOMU%R za=XW4`Iz!^b3Vye>wb9W+|OO1FXk1ey>Qjgno~S&>amlD`7*R;q+i|k zJ=R!LXHM}RztYb74#r&8 CAjdo9uYk73&=Bs(LuPUEB%=Kc9_fNM;_LFTi7iO!m zwryTo|Ih5a1^Hy=Kg1* zJx$RtoY7ejw{gMZUgKzf-&GfYZa%f|?FO^0hi}~apSty~hv~MQeQ_%f`m_|Ub4@<@ z2bzUr4oMjWiUS_=c+^(BHX0Ofq9lo`8@{`Rf z`&FhtKDmDKpOE(oQ?6SIyiaiSxIHWO!}c@Rd|nsm#n_0SIw~_Ex}v@FtVOuGUwS6% zXEWiImn;q5XYTr0Ygb=gAbD-}t}NpT`|B%qZ2R_W_qx;ZoQEpi^LELvXR-!mgY^3D zKg>d#GGA%3H!f#jU{Eb_jVMV;EJ?LWE=mPb3`Pb9nO2EgL-~miexL>oxD6$lxv9l^C5gEOxHT!8D4`o;Yzg@;OZiSwrC+F96P3k^v@aDRTTUWm-qe?kdxs98GrDK#n=nDwyLU< zX4Zgo1eyB z01PQAoX^kCV=sX>D50&VuD^`E1bcgjA}VK9-7Tx?Zn;_SQ&rXB|KH>Is;WAC+t0VX zjlG_0C?cFm9>!jP{eQh(DdEg^x0>Y(IM;n81%-37-Y=8PqO~_IJ;|rddjDzc^;}Ca z;beMdAI`e27u($`X`RcaTs>P=v+;SmTg~p%ucUx*_L$3LJKJ{NC^4K#rdd6Es^+W} z5zcmNf0=HlUOkuF-Rg5@+|rXm!rAsRwKsoHrh0a(W_urVRewx4dj_MazPQc0ALd*& zlY+uIWD3=@w6kVow(q(jtrz-Ofs*7_t57GH#Z=9t@XFa9j&8Anc7r+Rk1G4j`kgmq zsCp*1Q$c%Lc~Mm}DZFy#bU3=13fj}k&)!5OC^DR_$vydg<~(chKRTq%V-B?Pn?4&~ zLlK)CGB9i;oqsl;T=$oo&6{ALjUU%jQZSRk!S?xsRdy z@19+IE~p>xzoqD4CMxHNc13Ho*xs{WbGt@sz)D@$i+^??`)=2F)@_EL_T!ft%tSbQ z^|alS01dVLm)kvTcdPcf@npE_Y2A&J;FlcAhPK|L2}aYpH|zbS>xzmL8ANf6Eta_OT^)e)27174Hx0|^Tl@-O@If8}&Aq`;F(1R57MEiyP% zFfuwcHaayhD=;uRFfizyEkl!g1R57MEiyP%FfuwcHaayhD=;uRFff_GmH(5h1RWzb lEiyP%FfuwcHaayhD=;uRFfh*5v>*Tg002ovPDHLkV1o6xtStZl diff --git a/sprites/spr_cata_gorget/spr_cata_gorget.yy b/sprites/spr_cata_gorget/spr_cata_gorget.yy index 8df3fe81b7..89cffaeb00 100644 --- a/sprites/spr_cata_gorget/spr_cata_gorget.yy +++ b/sprites/spr_cata_gorget/spr_cata_gorget.yy @@ -23,7 +23,7 @@ ], "name":"spr_cata_gorget", "nineSlice":null, - "origin":0, + "origin":9, "parent":{ "name":"cata_complex", "path":"folders/Sprites/Marine Viewer/body_types/cata_complex.yy", @@ -77,8 +77,8 @@ ], "visibleRange":null, "volume":1.0, - "xorigin":0, - "yorigin":0, + "xorigin":6, + "yorigin":8, }, "swatchColours":null, "swfPrecision":0.5, diff --git a/sprites/spr_cata_head/cc1bb055-3092-4530-9edd-694aca0796a7.png b/sprites/spr_cata_head/cc1bb055-3092-4530-9edd-694aca0796a7.png index e8273da74a2c5bb2fb352cadddb7e850d71bcaa7..739891140e87a8e85744c4b32eccf72dfa46e352 100644 GIT binary patch delta 866 zcmX@gv65p#QoW3)i(^Q|t+%%v^KLmvG+eA-C8ySIAQWWbQf|pE{U~K}amsXO6`@I% zF4OmR?mp1AF}ay@<)v%yJtua2v`Db)Wp`p>fPw?*Uh#h!{yCSH-Tt|^X>$2qn`0GK zHN71XE-qW|t!evKeop<@zpMNY$M(V=zw-kbZJp-a*`ig#5hoZ8)){P}Oy!ev%0RvvRMe>pry>gj~C z9I=%S?KQt&v47y-rFO=?aL)f}7Uxf=pFPjF$};Y+%--_99iM~v&z|>ueRkEaHOXgZ znm*4gb+Ht=;Ougzzn=Hi-e`HL*}t#;S;?M#UeEY>0OQm=i^uRmTt4(Trd0Rb^XD| zFF%%EoNuddGwr(SoEAlO`}`c`==`v^JU3T;dV5#DUMBg>_Wqh|P4m~+)35p09Z)=z z8u`DcV|MP$NA9)NHy*0)EoI|ji7;&}+vd8be`EcfqDXg_KRVlAs@=}rwtk{%x__X^ z#@lb*-k)#o>WEnGTo8K1?pjW5)Lg0h>a&k$Fc-$Xbg#WV(|7jGjZ(MzPj?hIP5)vh z6)yK|)1CEP({4Zh`_wG9gs1OFrJM8}Z?DPUUTaS;Rll&Yw!(jo^0w6HzMks)a%bMl zwN~w4&s&-i{W$HCW4gl}brDxVLBZX3-wC8-XU(X6>vM~H)939sgr9fVOzUs6NPA%v zm!}*o;`%VQDs9{Rg}pzd#p^fM_NM(la{gsp+G%e0`X{&ZPcD_6tjJt8*?^g~z9I4_ zul(#^PousbJ_Jm2swJ)wB`Jv|saDBFsX&Us$iT={*T7uY&?v;v*viP%%G6xjz`)AD zK<<@wABu+D{FKbJO57Uqw>KLBHE6(XD9OxC)h{kd%q_sJ$zsu>x1g-x>FVdQ&MBb@ E0Js*C6aWAK delta 882 zcmZ3E{qVEaRrYyIE8 zU-C3-U+wyBc{44a*JsA&e_I>=PxE9|&fbPR*TNE%s&3`tP&i{QWCgAKD~; zH`*)rT2)_m*7+-|uj%W*eaZ2>^737S*!AaIO5Pu`OrMk$%ToO7qWZ7JhRtEV#)t%o~&maGvxxfAQ z^346;_iWPruBvxv!sPeTyC>*|e_q%ACg=30!~OPgha#r+*K7^h_40S|Wp(=m`7@Ds zYkZ5QtIYoOCH2)=$?drg{ioc%N2q?y+5dX|*JZo3v+lgHHG2MLrjJ@>U7cOrMV0#J z>s3xZuemvO>&DFH?Y?D>y3dy1u9If2XS+YMPwqIc;JMSb&ps^fJ$hmK%+vsW8TQN8 z=Z#xFbIt#}^pDX?!;{-X^!MIdb5FHkTjk1-{98}LJZIG^{LiSLqcBH&##LXl(5)8X z=^nP(ryABBe^uaP;hyuVxqXt#*NdMb6n>xjQ0n;i`T572uHAL*y~ps-Cedi7is$cy zAo(@+yG>@)#`^zyU*FFEu>H4^;JLumh&bsZhR%m8_O3LV>0`50Jnx(Atq%FZPvx7x zzew}{Gbh;jSLJK%*Xo|B8SIl8nXBp<9xSV2554?q^Ze~gF9Oq`YKdz^NlIc#s#S7P zDv)9@GB7gLH89gPHV84aure^UGB(mSFt9Q(*qEkgfTAHcKP5A*61Ro}*3)``8Z_WG elw{^k{>jX%jK%QjdfS6RIl|M`&t;ucLK6ToY@p8o diff --git a/sprites/spr_cata_head/df8d27d6-66e9-4750-b0dc-950fe74d3e9f.png b/sprites/spr_cata_head/df8d27d6-66e9-4750-b0dc-950fe74d3e9f.png index b5581d57f8cb72492a0a8bd70cdfad1458e941bc..c169997e7362a464c000a9e9bfb509452846291f 100644 GIT binary patch delta 799 zcmZ3)F^OYBQa!7ui(^Q|t+%)C=FSd~Xn5Ga>Tn82%+o{FDSX~*eHVGnRIYw z`rVc|hHs5BId_(v?Vs*V?><&idX-XT{$C+v;yi_OKWF(&F*ly>`&_y;%0%&kPT@IYzT&(omVY;S zE@3+R^V2o?2h3HTGyW&p&Yx!C@BMw&dfAZe`<^MfrT^{t9JBrI;}ut{BKKe0r8m>? zd7-b%RPGmMN@l^_z4hm=6`x*KSDs&*{l+rod}WZS=tGT7T71{dqTk*>Ix#iqsG5Yp zbI#lZcjmdp8Fq&88ztL&EuKegX@8kzT&{0bd`9x^y(0N%kJkRb`2E<7;;7>K?>GL7 z?0j*2;_9zP!Y>M9X2}=Z+2^QNpLYE}`FYk}lXq`!a9o~sabek>^xMa$*WY_!So-+* z%-5gxw)9RY{!*1Je=}?Eo9`3$TFtfF^YgJlvQ_P)bxW_f*4vB!J)i#O@Sb(EmUry9 z6?XKZwTUs~wb%vCnSwJV++VLII=%W>R`ikc@kgIjUle-YVlu6;BYCGmb?$+x*NBpo#FA92lFZ!H;*!MN0tO=k ZBU4=iEP5;!EqV(|$)2u$F6*2UngH@3f0h6M delta 814 zcmbQlv4~?rQoX3Bi(^Q|t+%&)^A<-)uwL+9Ek2p|%b965AMExt#5Jn(P4x`Bzo!;=99?1H}DwEiHS)s=btyR6Kf z@7jlF9B+TF5~*gHQ~rA6x4xgP|Ngv@{oyLwxMqIW%X;5QKw)R;ODet__uLYxZT-UY zaF3t#8lwsBv-2K(d{{a2Nx+%>+uxhCmZWn$e>!VoK%U;4=xx$0TeFlFEN=O1bT}bS z>Xc#ZeWfK#R?qs+-)oG&P~G&?_S)y$Lgzl8TJ`f{W7hTSHmL>I`wQY;d;gxj_3m1J z`K{}s)6Q6~U!C^9p7&Y3XOaEY%!2LnChl8Wbobai)~TOw*Lq(K)?BYJCw-5d&-&%7 zo-CdI%=qo9-`m^2m9%``^YnGHxW4R$h=hLT8M*B8+{`U=( zo^4jq{={^}(H~z7Uf4g=RL-B5_WiLNNB#4s^VlxWp1dLS?*g@%(keEsk%uZ*YRz6$ zq;~S^nKdeS3k4N!+BrVPObmzRg#&TT3nKtTfkssU}UOmfJM*#Yr9!MDcaN3&t;ucLK6V7UX@`0 diff --git a/sprites/spr_cata_head/layers/cc1bb055-3092-4530-9edd-694aca0796a7/1875f065-a467-43e5-b1cb-779c58891acc.png b/sprites/spr_cata_head/layers/cc1bb055-3092-4530-9edd-694aca0796a7/1875f065-a467-43e5-b1cb-779c58891acc.png index e8273da74a2c5bb2fb352cadddb7e850d71bcaa7..739891140e87a8e85744c4b32eccf72dfa46e352 100644 GIT binary patch delta 866 zcmX@gv65p#QoW3)i(^Q|t+%%v^KLmvG+eA-C8ySIAQWWbQf|pE{U~K}amsXO6`@I% zF4OmR?mp1AF}ay@<)v%yJtua2v`Db)Wp`p>fPw?*Uh#h!{yCSH-Tt|^X>$2qn`0GK zHN71XE-qW|t!evKeop<@zpMNY$M(V=zw-kbZJp-a*`ig#5hoZ8)){P}Oy!ev%0RvvRMe>pry>gj~C z9I=%S?KQt&v47y-rFO=?aL)f}7Uxf=pFPjF$};Y+%--_99iM~v&z|>ueRkEaHOXgZ znm*4gb+Ht=;Ougzzn=Hi-e`HL*}t#;S;?M#UeEY>0OQm=i^uRmTt4(Trd0Rb^XD| zFF%%EoNuddGwr(SoEAlO`}`c`==`v^JU3T;dV5#DUMBg>_Wqh|P4m~+)35p09Z)=z z8u`DcV|MP$NA9)NHy*0)EoI|ji7;&}+vd8be`EcfqDXg_KRVlAs@=}rwtk{%x__X^ z#@lb*-k)#o>WEnGTo8K1?pjW5)Lg0h>a&k$Fc-$Xbg#WV(|7jGjZ(MzPj?hIP5)vh z6)yK|)1CEP({4Zh`_wG9gs1OFrJM8}Z?DPUUTaS;Rll&Yw!(jo^0w6HzMks)a%bMl zwN~w4&s&-i{W$HCW4gl}brDxVLBZX3-wC8-XU(X6>vM~H)939sgr9fVOzUs6NPA%v zm!}*o;`%VQDs9{Rg}pzd#p^fM_NM(la{gsp+G%e0`X{&ZPcD_6tjJt8*?^g~z9I4_ zul(#^PousbJ_Jm2swJ)wB`Jv|saDBFsX&Us$iT={*T7uY&?v;v*viP%%G6xjz`)AD zK<<@wABu+D{FKbJO57Uqw>KLBHE6(XD9OxC)h{kd%q_sJ$zsu>x1g-x>FVdQ&MBb@ E0Js*C6aWAK delta 882 zcmZ3E{qVEaRrYyIE8 zU-C3-U+wyBc{44a*JsA&e_I>=PxE9|&fbPR*TNE%s&3`tP&i{QWCgAKD~; zH`*)rT2)_m*7+-|uj%W*eaZ2>^737S*!AaIO5Pu`OrMk$%ToO7qWZ7JhRtEV#)t%o~&maGvxxfAQ z^346;_iWPruBvxv!sPeTyC>*|e_q%ACg=30!~OPgha#r+*K7^h_40S|Wp(=m`7@Ds zYkZ5QtIYoOCH2)=$?drg{ioc%N2q?y+5dX|*JZo3v+lgHHG2MLrjJ@>U7cOrMV0#J z>s3xZuemvO>&DFH?Y?D>y3dy1u9If2XS+YMPwqIc;JMSb&ps^fJ$hmK%+vsW8TQN8 z=Z#xFbIt#}^pDX?!;{-X^!MIdb5FHkTjk1-{98}LJZIG^{LiSLqcBH&##LXl(5)8X z=^nP(ryABBe^uaP;hyuVxqXt#*NdMb6n>xjQ0n;i`T572uHAL*y~ps-Cedi7is$cy zAo(@+yG>@)#`^zyU*FFEu>H4^;JLumh&bsZhR%m8_O3LV>0`50Jnx(Atq%FZPvx7x zzew}{Gbh;jSLJK%*Xo|B8SIl8nXBp<9xSV2554?q^Ze~gF9Oq`YKdz^NlIc#s#S7P zDv)9@GB7gLH89gPHV84aure^UGB(mSFt9Q(*qEkgfTAHcKP5A*61Ro}*3)``8Z_WG elw{^k{>jX%jK%QjdfS6RIl|M`&t;ucLK6ToY@p8o diff --git a/sprites/spr_cata_head/layers/df8d27d6-66e9-4750-b0dc-950fe74d3e9f/1875f065-a467-43e5-b1cb-779c58891acc.png b/sprites/spr_cata_head/layers/df8d27d6-66e9-4750-b0dc-950fe74d3e9f/1875f065-a467-43e5-b1cb-779c58891acc.png index b5581d57f8cb72492a0a8bd70cdfad1458e941bc..c169997e7362a464c000a9e9bfb509452846291f 100644 GIT binary patch delta 799 zcmZ3)F^OYBQa!7ui(^Q|t+%)C=FSd~Xn5Ga>Tn82%+o{FDSX~*eHVGnRIYw z`rVc|hHs5BId_(v?Vs*V?><&idX-XT{$C+v;yi_OKWF(&F*ly>`&_y;%0%&kPT@IYzT&(omVY;S zE@3+R^V2o?2h3HTGyW&p&Yx!C@BMw&dfAZe`<^MfrT^{t9JBrI;}ut{BKKe0r8m>? zd7-b%RPGmMN@l^_z4hm=6`x*KSDs&*{l+rod}WZS=tGT7T71{dqTk*>Ix#iqsG5Yp zbI#lZcjmdp8Fq&88ztL&EuKegX@8kzT&{0bd`9x^y(0N%kJkRb`2E<7;;7>K?>GL7 z?0j*2;_9zP!Y>M9X2}=Z+2^QNpLYE}`FYk}lXq`!a9o~sabek>^xMa$*WY_!So-+* z%-5gxw)9RY{!*1Je=}?Eo9`3$TFtfF^YgJlvQ_P)bxW_f*4vB!J)i#O@Sb(EmUry9 z6?XKZwTUs~wb%vCnSwJV++VLII=%W>R`ikc@kgIjUle-YVlu6;BYCGmb?$+x*NBpo#FA92lFZ!H;*!MN0tO=k ZBU4=iEP5;!EqV(|$)2u$F6*2UngH@3f0h6M delta 814 zcmbQlv4~?rQoX3Bi(^Q|t+%&)^A<-)uwL+9Ek2p|%b965AMExt#5Jn(P4x`Bzo!;=99?1H}DwEiHS)s=btyR6Kf z@7jlF9B+TF5~*gHQ~rA6x4xgP|Ngv@{oyLwxMqIW%X;5QKw)R;ODet__uLYxZT-UY zaF3t#8lwsBv-2K(d{{a2Nx+%>+uxhCmZWn$e>!VoK%U;4=xx$0TeFlFEN=O1bT}bS z>Xc#ZeWfK#R?qs+-)oG&P~G&?_S)y$Lgzl8TJ`f{W7hTSHmL>I`wQY;d;gxj_3m1J z`K{}s)6Q6~U!C^9p7&Y3XOaEY%!2LnChl8Wbobai)~TOw*Lq(K)?BYJCw-5d&-&%7 zo-CdI%=qo9-`m^2m9%``^YnGHxW4R$h=hLT8M*B8+{`U=( zo^4jq{={^}(H~z7Uf4g=RL-B5_WiLNNB#4s^VlxWp1dLS?*g@%(keEsk%uZ*YRz6$ zq;~S^nKdeS3k4N!+BrVPObmzRg#&TT3nKtTfkssU}UOmfJM*#Yr9!MDcaN3&t;ucLK6V7UX@`0 diff --git a/sprites/spr_cata_head/spr_cata_head.yy b/sprites/spr_cata_head/spr_cata_head.yy index 5e8f0e23e2..c22b81ce75 100644 --- a/sprites/spr_cata_head/spr_cata_head.yy +++ b/sprites/spr_cata_head/spr_cata_head.yy @@ -24,7 +24,7 @@ ], "name":"spr_cata_head", "nineSlice":null, - "origin":0, + "origin":9, "parent":{ "name":"cata_complex", "path":"folders/Sprites/Marine Viewer/body_types/cata_complex.yy", @@ -81,8 +81,8 @@ ], "visibleRange":null, "volume":1.0, - "xorigin":0, - "yorigin":0, + "xorigin":6, + "yorigin":8, }, "swatchColours":null, "swfPrecision":0.5, diff --git a/sprites/spr_cata_heavy_toe_left/spr_cata_heavy_toe_left.yy b/sprites/spr_cata_heavy_toe_left/spr_cata_heavy_toe_left.yy index 4ada33c507..cb95a270e4 100644 --- a/sprites/spr_cata_heavy_toe_left/spr_cata_heavy_toe_left.yy +++ b/sprites/spr_cata_heavy_toe_left/spr_cata_heavy_toe_left.yy @@ -23,7 +23,7 @@ ], "name":"spr_cata_heavy_toe_left", "nineSlice":null, - "origin":0, + "origin":9, "parent":{ "name":"cata_complex", "path":"folders/Sprites/Marine Viewer/body_types/cata_complex.yy", @@ -77,8 +77,8 @@ ], "visibleRange":null, "volume":1.0, - "xorigin":0, - "yorigin":0, + "xorigin":2, + "yorigin":8, }, "swatchColours":null, "swfPrecision":0.5, diff --git a/sprites/spr_cata_heavy_toe_right/spr_cata_heavy_toe_right.yy b/sprites/spr_cata_heavy_toe_right/spr_cata_heavy_toe_right.yy index 9a1dfa67d1..8e37792939 100644 --- a/sprites/spr_cata_heavy_toe_right/spr_cata_heavy_toe_right.yy +++ b/sprites/spr_cata_heavy_toe_right/spr_cata_heavy_toe_right.yy @@ -23,7 +23,7 @@ ], "name":"spr_cata_heavy_toe_right", "nineSlice":null, - "origin":0, + "origin":9, "parent":{ "name":"cata_complex", "path":"folders/Sprites/Marine Viewer/body_types/cata_complex.yy", @@ -77,8 +77,8 @@ ], "visibleRange":null, "volume":1.0, - "xorigin":0, - "yorigin":0, + "xorigin":6, + "yorigin":8, }, "swatchColours":null, "swfPrecision":0.5, diff --git a/sprites/spr_cata_left_arm/spr_cata_left_arm.yy b/sprites/spr_cata_left_arm/spr_cata_left_arm.yy index 7928892304..880c536e97 100644 --- a/sprites/spr_cata_left_arm/spr_cata_left_arm.yy +++ b/sprites/spr_cata_left_arm/spr_cata_left_arm.yy @@ -23,7 +23,7 @@ ], "name":"spr_cata_left_arm", "nineSlice":null, - "origin":0, + "origin":9, "parent":{ "name":"cata_complex", "path":"folders/Sprites/Marine Viewer/body_types/cata_complex.yy", @@ -77,8 +77,8 @@ ], "visibleRange":null, "volume":1.0, - "xorigin":0, - "yorigin":0, + "xorigin":6, + "yorigin":8, }, "swatchColours":null, "swfPrecision":0.5, diff --git a/sprites/spr_cata_left_armtrim/spr_cata_left_armtrim.yy b/sprites/spr_cata_left_armtrim/spr_cata_left_armtrim.yy index 03318887bb..a1ad2841b8 100644 --- a/sprites/spr_cata_left_armtrim/spr_cata_left_armtrim.yy +++ b/sprites/spr_cata_left_armtrim/spr_cata_left_armtrim.yy @@ -23,7 +23,7 @@ ], "name":"spr_cata_left_armtrim", "nineSlice":null, - "origin":0, + "origin":9, "parent":{ "name":"cata_complex", "path":"folders/Sprites/Marine Viewer/body_types/cata_complex.yy", @@ -77,8 +77,8 @@ ], "visibleRange":null, "volume":1.0, - "xorigin":0, - "yorigin":0, + "xorigin":6, + "yorigin":8, }, "swatchColours":null, "swfPrecision":0.5, diff --git a/sprites/spr_cata_left_knee/spr_cata_left_knee.yy b/sprites/spr_cata_left_knee/spr_cata_left_knee.yy index cf81795071..08e12eb38e 100644 --- a/sprites/spr_cata_left_knee/spr_cata_left_knee.yy +++ b/sprites/spr_cata_left_knee/spr_cata_left_knee.yy @@ -23,7 +23,7 @@ ], "name":"spr_cata_left_knee", "nineSlice":null, - "origin":0, + "origin":9, "parent":{ "name":"cata_complex", "path":"folders/Sprites/Marine Viewer/body_types/cata_complex.yy", @@ -77,8 +77,8 @@ ], "visibleRange":null, "volume":1.0, - "xorigin":0, - "yorigin":0, + "xorigin":6, + "yorigin":8, }, "swatchColours":null, "swfPrecision":0.5, diff --git a/sprites/spr_cata_left_leg/30845d03-5630-4ea2-b874-e43d1c591f74.png b/sprites/spr_cata_left_leg/30845d03-5630-4ea2-b874-e43d1c591f74.png index 75a3f6e4e11fce8de4e986edf41f2f6ea5faf0f8..65f2d47970c20a09e70f90dbcaa8dbe46ece7a88 100644 GIT binary patch delta 1418 zcmZvcX;2af9L2FM%d$MyEHh&)HIFdFMe)K+vGJmnJn+aX0TojW5)YIu&o;9)D?$+4 z)JzjCHH$DT#!W+m%0xpnnN)NgGa(_5Y-zvj>`XKNnK$pl`~APXdBeI~-9HjM?EQSa zLb4?DV^LQmVfxw=EQ`=a_e9_!3x*)z_WZ7N!M1qE3rawliTSyYDbLiQLFedRVeh_? zYKSEB4HbU|QUL(K?Ul20W*P;=wdQ+LwE#~I*GFJ1Ta2+MFLqp*Fg& zbuR4yUj!N$m@HxhzKV`&h}KSF9==$S*T-mILY=ou2xmsf7N-m&Z>OEH;afeMC z(MgLwnq77REk>nCm;1$TN4V~rr`Ebs=T2TB7}GMUCN=!8QyWr_hKSx0K|oN?aaJH3 zqs-XE&Yu)@=JzQpDQi65vC@y5ItCt{fX%HKy<#nx29-wtvmS7#%tBMkF+#+@q)x z$yxkPU8J6w2Hs+QYhlHTMre`9$B)wHEv*oI4c?FD-P8F2DU)`);3W0fd49y`jY>~e zF+sfa=2@9OGHt9wC8Z`wZJ5&biVZOuI}<>oye9ENl|64lZRFWOr5S&agAh?6)%w+4Uj93 zHj;+K_Dm=!&tcSl3(gEbW}4i5e8@38X`aua8dGKFVKFB9NZ1jp|ZMm8Nj$o7ZP6JEz!)J&-ME2LHJy}O}Nk}Q@aS6*T|+4w-T z!a?v~G=Q-^wA8|Ti(l2z$=!v@O_v9C?K3A`I!gRER$_pE+HCp=e!l$1MUP~TK+ z+nXyw%a!ko+F1|RCkPaZs}c90|8#r;4T{}oVhUdn=M^$L;kpUDS+!3o`MESu6%QlESub!T;s+mw z)Orr)r)=fKWH!q{S*&P#vX-671JzYFGS3EawySUY(|?kXSl4U!ZQofg@AbQ;X+_mu zVb@k{W{28F;dPA%vBmKthGz)VqF$jABEL#*nxPZm^kCV*?hxv0`&PX@C8{wbQuhu) zJml^;8-K(xC-i9xOc(;NpA7RW> zLQ0Hc!^QdL^rzQ)`g)4r6K zl?6T35(^#eFspbBHqSw&UutzyTY2ql5$>gMsP_aM&$|@n=kqx@p}{RP0h=6G|5Yru z34r}~{hAVV4WJCKE_sR*e1E%-=Lt0HWJyAxNr~|!jO(d07>xiRUMmAkaf4*Y;Nf*m4jXaGM1(x>HU H-1&b1vwgg( delta 1424 zcmV;B1#kMh4A%^hVmwMoL_t(|+U?y-lABf(2H@LCs!|zbA6iH@l}Y-vC*G77qRk}E zK`hlUzJKSYA|L0eeQ!RR0@%yO@9CYjP>i7A2s zCKu&2$oc;5$J+(efGD4_Yb{?*#E%|KEoJq71&w~jwOKzz^&(#H*Yyg~vw)`QcM4}- zcLD9VPv6UzO(9JaPJK?&63%Tnj(0KzYt@W;Ef`j z`TRR@zp1L=l9T>V2`6a@=RSdcRXR>Ebd#iv^o@;pCZB7a$Ag_O0Ih&P6zRWwnJM!bunBfG*m!3ujJqf0%6( zgfow&?u|6mUGv;HFa2Ddj6Rnr_D`l!*+jK`^YZ~bzEI5q8)es7U*au>!Z z7zV1*aUaTUVZ!WGA^2aVeSG~SG zNAu54GUq9r`E{M^{C_OXpD}NobdQdqy!rX#&1;K|-`H$R=b~Dl8P!#tfycP)8~1Nb zdQT;lb6*;(XDR(F+`X;eSfZg?6G0n?cX&hXPWh$ ziPFDc89lEW#p9Ky+Yh^)w;kge&_UBmDra8xl}RtFUX)H%?7ZzZkbSQ(wXSrE_G&Gh zJJY#okJ7Cfk87}|y5xD+zb&P8PE!c-|q$QlBC7h%soTOzcX?xyg zDhbm1A8@BeJQDjL?EnA(C3HntbYx+4WjbSWWnpw>05UK#H7zhUEiyP%FfckbI65&l zD=;uRFa`XKNnK$pl`~APXdBeI~-9HjM?EQSa zLb4?DV^LQmVfxw=EQ`=a_e9_!3x*)z_WZ7N!M1qE3rawliTSyYDbLiQLFedRVeh_? zYKSEB4HbU|QUL(K?Ul20W*P;=wdQ+LwE#~I*GFJ1Ta2+MFLqp*Fg& zbuR4yUj!N$m@HxhzKV`&h}KSF9==$S*T-mILY=ou2xmsf7N-m&Z>OEH;afeMC z(MgLwnq77REk>nCm;1$TN4V~rr`Ebs=T2TB7}GMUCN=!8QyWr_hKSx0K|oN?aaJH3 zqs-XE&Yu)@=JzQpDQi65vC@y5ItCt{fX%HKy<#nx29-wtvmS7#%tBMkF+#+@q)x z$yxkPU8J6w2Hs+QYhlHTMre`9$B)wHEv*oI4c?FD-P8F2DU)`);3W0fd49y`jY>~e zF+sfa=2@9OGHt9wC8Z`wZJ5&biVZOuI}<>oye9ENl|64lZRFWOr5S&agAh?6)%w+4Uj93 zHj;+K_Dm=!&tcSl3(gEbW}4i5e8@38X`aua8dGKFVKFB9NZ1jp|ZMm8Nj$o7ZP6JEz!)J&-ME2LHJy}O}Nk}Q@aS6*T|+4w-T z!a?v~G=Q-^wA8|Ti(l2z$=!v@O_v9C?K3A`I!gRER$_pE+HCp=e!l$1MUP~TK+ z+nXyw%a!ko+F1|RCkPaZs}c90|8#r;4T{}oVhUdn=M^$L;kpUDS+!3o`MESu6%QlESub!T;s+mw z)Orr)r)=fKWH!q{S*&P#vX-671JzYFGS3EawySUY(|?kXSl4U!ZQofg@AbQ;X+_mu zVb@k{W{28F;dPA%vBmKthGz)VqF$jABEL#*nxPZm^kCV*?hxv0`&PX@C8{wbQuhu) zJml^;8-K(xC-i9xOc(;NpA7RW> zLQ0Hc!^QdL^rzQ)`g)4r6K zl?6T35(^#eFspbBHqSw&UutzyTY2ql5$>gMsP_aM&$|@n=kqx@p}{RP0h=6G|5Yru z34r}~{hAVV4WJCKE_sR*e1E%-=Lt0HWJyAxNr~|!jO(d07>xiRUMmAkaf4*Y;Nf*m4jXaGM1(x>HU H-1&b1vwgg( delta 1424 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 delta 740 zcmX@YwuOB{Qp9pk7srr_TW@b~>=F(XVYnc@v2sFEH23V>92WZnWk;{gzY(UAu#qF0 zMdfId&bEIpQHF2p8WNHpHbq3tN=n=&J$r89q`4>k63h%I7e5f4$@8!^=H1@+XT2wG z)T%$gcPgJP=S=f9^Lg`QbE?<9nQ3-#rvI_cCpP8WE>1na<=mVNnQNPkmx>4qwzD7p z^C4ly|0nmha-EwJw5Rg7jgpeRobPtq^lvV!AL#r#d$MBN+n<}<<+km7`Q(d+(!Z%? zH(JbQ78e+w;)x2s6>n3$hJR^rv+29DuTTB*4U-k=UQ&Ph=T)ouoO4gUKKApbtDWTe zHIH6~te&@dk)Ae}$2(W`*&nXPU9r=MeffqnaN{JPWv3PHew&`Wy>w&6$=ToRgS|d} z{CoP-)}unNBep+}(Oeob?T6CjxO3}Io&D`EANSOMzKz!V^Xt|>K7Bo&XzY6PD#D#v|!nkM-}xZz4`a+r$0V^-d<3!GI)Mf`2SV=-)`629F{!6=h$YW$zjYp zD$?RluHjy~U#jA??!i^xU$pD>pW&5qbGed!>8bIet5@p;Yf8D-9BxjGi&?(ktZ?3D zo!_CS8+Y!xRsZ*0aSYHc-&Z$kYkYTJ&b>&KO?|n0`M0*KIlE&1ZPwX6)mt;zi<{AB ze~y-g@~q#tZIrJ4lJ2-1`1@h~kJ-o8Zi@f1=k+#h?R zDYJ$tROb5aZ!A0IcYiu;mU=aIru}3`rm%?@SnI!>j}Lisy+x8gYXJiTgKCLuL`h0w zNvc(HQ7VvPFfuSQ)ip5FHL?sbG_x`_vobW$HZZULu6J{zcs!PC{xWt~$(69CgkUP%A| diff --git a/sprites/spr_cata_shoulder_hanging_leather_right/layers/0eb5da06-be9b-42af-a45c-5652a70e0363/240582c2-092d-40fa-9caa-ea64c5a2fc69.png b/sprites/spr_cata_shoulder_hanging_leather_right/layers/0eb5da06-be9b-42af-a45c-5652a70e0363/240582c2-092d-40fa-9caa-ea64c5a2fc69.png index e0400ec79ac591eceefdaa5f33c64028519ecd83..3335148897a0732c3b3dd63a07e6d97e6f55028c 100644 GIT binary patch delta 629 zcmdnOeuQm8Qh>Rqi(^Q|t+%&r`z||3ustwb#$N6%``?!RU&0$nDjm+wno z=dyfe@Y|C!79EN_H_Kqvi~_Z%D@=9Y=HK5F)_!UAlEYhjqrIN4nHA!D>0!mIPctv9 z%AO#Veq3t{|M&7kp80WQd-iEoOeU3#xC zp6c6Iv19-0{*~@8lQtBD@g2Whc{t?Gy*;bW|E;Rwk+-WAkC6JhagF-M*tf?G)?gB zp4;mWUB8l?kb7EXCRVz?WBLu#&v{oxev6!DnR9T|&>U^s_Oyuezob3T8D_N2V%EnSxw7#LJbTq8>`WCI(MeKbLh*2~7Zl&mUs| delta 740 zcmX@YwuOB{Qp9pk7srr_TW@b~>=F(XVYnc@v2sFEH23V>92WZnWk;{gzY(UAu#qF0 zMdfId&bEIpQHF2p8WNHpHbq3tN=n=&J$r89q`4>k63h%I7e5f4$@8!^=H1@+XT2wG z)T%$gcPgJP=S=f9^Lg`QbE?<9nQ3-#rvI_cCpP8WE>1na<=mVNnQNPkmx>4qwzD7p z^C4ly|0nmha-EwJw5Rg7jgpeRobPtq^lvV!AL#r#d$MBN+n<}<<+km7`Q(d+(!Z%? zH(JbQ78e+w;)x2s6>n3$hJR^rv+29DuTTB*4U-k=UQ&Ph=T)ouoO4gUKKApbtDWTe zHIH6~te&@dk)Ae}$2(W`*&nXPU9r=MeffqnaN{JPWv3PHew&`Wy>w&6$=ToRgS|d} z{CoP-)}unNBep+}(Oeob?T6CjxO3}Io&D`EANSOMzKz!V^Xt|>K7Bo&XzY6PD#D#v|!nkM-}xZz4`a+r$0V^-d<3!GI)Mf`2SV=-)`629F{!6=h$YW$zjYp zD$?RluHjy~U#jA??!i^xU$pD>pW&5qbGed!>8bIet5@p;Yf8D-9BxjGi&?(ktZ?3D zo!_CS8+Y!xRsZ*0aSYHc-&Z$kYkYTJ&b>&KO?|n0`M0*KIlE&1ZPwX6)mt;zi<{AB ze~y-g@~q#tZIrJ4lJ2-1`1@h~kJ-o8Zi@f1=k+#h?R zDYJ$tROb5aZ!A0IcYiu;mU=aIru}3`rm%?@SnI!>j}Lisy+x8gYXJiTgKCLuL`h0w zNvc(HQ7VvPFfuSQ)ip5FHL?sbG_x`_vobW$HZZULu6J{zcs!PC{xWt~$(69CgkUP%A| diff --git a/sprites/spr_cata_shoulder_hanging_leather_right/spr_cata_shoulder_hanging_leather_right.yy b/sprites/spr_cata_shoulder_hanging_leather_right/spr_cata_shoulder_hanging_leather_right.yy index 8427ffcab1..81e195b0ee 100644 --- a/sprites/spr_cata_shoulder_hanging_leather_right/spr_cata_shoulder_hanging_leather_right.yy +++ b/sprites/spr_cata_shoulder_hanging_leather_right/spr_cata_shoulder_hanging_leather_right.yy @@ -23,7 +23,7 @@ ], "name":"spr_cata_shoulder_hanging_leather_right", "nineSlice":null, - "origin":0, + "origin":9, "parent":{ "name":"cata_complex", "path":"folders/Sprites/Marine Viewer/body_types/cata_complex.yy", @@ -77,8 +77,8 @@ ], "visibleRange":null, "volume":1.0, - "xorigin":0, - "yorigin":0, + "xorigin":6, + "yorigin":8, }, "swatchColours":null, "swfPrecision":0.5, diff --git a/sprites/spr_cata_shoulder_hanging_leather_right_tips/spr_cata_shoulder_hanging_leather_right_tips.yy b/sprites/spr_cata_shoulder_hanging_leather_right_tips/spr_cata_shoulder_hanging_leather_right_tips.yy index 2481ee1ebf..b105ebe708 100644 --- a/sprites/spr_cata_shoulder_hanging_leather_right_tips/spr_cata_shoulder_hanging_leather_right_tips.yy +++ b/sprites/spr_cata_shoulder_hanging_leather_right_tips/spr_cata_shoulder_hanging_leather_right_tips.yy @@ -23,7 +23,7 @@ ], "name":"spr_cata_shoulder_hanging_leather_right_tips", "nineSlice":null, - "origin":0, + "origin":9, "parent":{ "name":"cata_complex", "path":"folders/Sprites/Marine Viewer/body_types/cata_complex.yy", @@ -77,8 +77,8 @@ ], "visibleRange":null, "volume":1.0, - "xorigin":0, - "yorigin":0, + "xorigin":6, + "yorigin":8, }, "swatchColours":null, "swfPrecision":0.5, diff --git a/sprites/spr_cata_shoulder_hanging_mail_left/spr_cata_shoulder_hanging_mail_left.yy b/sprites/spr_cata_shoulder_hanging_mail_left/spr_cata_shoulder_hanging_mail_left.yy index 1e65f79f2d..fbb67c20a9 100644 --- a/sprites/spr_cata_shoulder_hanging_mail_left/spr_cata_shoulder_hanging_mail_left.yy +++ b/sprites/spr_cata_shoulder_hanging_mail_left/spr_cata_shoulder_hanging_mail_left.yy @@ -23,7 +23,7 @@ ], "name":"spr_cata_shoulder_hanging_mail_left", "nineSlice":null, - "origin":0, + "origin":9, "parent":{ "name":"cata_complex", "path":"folders/Sprites/Marine Viewer/body_types/cata_complex.yy", @@ -77,8 +77,8 @@ ], "visibleRange":null, "volume":1.0, - "xorigin":0, - "yorigin":0, + "xorigin":6, + "yorigin":8, }, "swatchColours":null, "swfPrecision":0.5, diff --git a/sprites/spr_cata_shoulder_hanging_mail_right/spr_cata_shoulder_hanging_mail_right.yy b/sprites/spr_cata_shoulder_hanging_mail_right/spr_cata_shoulder_hanging_mail_right.yy index ca9fff2bd8..db8de8d373 100644 --- a/sprites/spr_cata_shoulder_hanging_mail_right/spr_cata_shoulder_hanging_mail_right.yy +++ b/sprites/spr_cata_shoulder_hanging_mail_right/spr_cata_shoulder_hanging_mail_right.yy @@ -23,7 +23,7 @@ ], "name":"spr_cata_shoulder_hanging_mail_right", "nineSlice":null, - "origin":0, + "origin":9, "parent":{ "name":"cata_complex", "path":"folders/Sprites/Marine Viewer/body_types/cata_complex.yy", @@ -77,8 +77,8 @@ ], "visibleRange":null, "volume":1.0, - "xorigin":0, - "yorigin":0, + "xorigin":6, + "yorigin":8, }, "swatchColours":null, "swfPrecision":0.5, diff --git a/sprites/spr_cata_tabbard_leather/spr_cata_tabbard_leather.yy b/sprites/spr_cata_tabbard_leather/spr_cata_tabbard_leather.yy index 322fbaf862..d34b7305cb 100644 --- a/sprites/spr_cata_tabbard_leather/spr_cata_tabbard_leather.yy +++ b/sprites/spr_cata_tabbard_leather/spr_cata_tabbard_leather.yy @@ -23,7 +23,7 @@ ], "name":"spr_cata_tabbard_leather", "nineSlice":null, - "origin":0, + "origin":9, "parent":{ "name":"cata_complex", "path":"folders/Sprites/Marine Viewer/body_types/cata_complex.yy", @@ -77,8 +77,8 @@ ], "visibleRange":null, "volume":1.0, - "xorigin":0, - "yorigin":0, + "xorigin":6, + "yorigin":8, }, "swatchColours":null, "swfPrecision":0.5, diff --git a/sprites/spr_cata_tabbard_leather_hangings/16ff2f35-0659-40fa-be7a-7a2942a2c47e.png b/sprites/spr_cata_tabbard_leather_hangings/16ff2f35-0659-40fa-be7a-7a2942a2c47e.png index a9b3ff5720b1574f225353737866c7a59104d5bd..332485bdee236b98d5db9c59d4516943edc35ce9 100644 GIT binary patch delta 368 zcmZo?z05Kp$->Rk#WAGf*4wMQc@G(gum-RP2Bom2B{ED)V6>9rlCly@=;S$&x9nlI z((y-&1uT|#-4E6|zO&PL;>PHS2l(sjPHvfZB-6Gt_i@bn>~q_)*SXc|Cvb?JR@0ew zR<+`JVYt5doiB27y}#oQOnBmS<(l>NZ@Vk^$gaP(`P@%|b3z|a-g8alNak4h>UZM) z&g8$vaeQC*e_lGR^Y+k6!9t@hDh@^#Dn4|+moOJaU)U(HpuGvM+;wc0qnD-0ko zahp>8f!#8U>ABvY6&04<1PZB^xJHzuB$lLFB^RXvDF!10BU4=ib6rEj5CaP|$+61Q#WAGf*4rx^eGfZ`usyKvP}6XoW3=d$#F@qy%`W{DBAB>lDCjsG z6zLI}zRW@GpoH~A2elW!wf0wkd-?9qZO(}clP7LqtN$=xXW8T|!?_{3rQz%I&uz;# z>uZZUplA`lu4rFOEzA0KzpG*o=Gq+&KklsmKtSZEj%QKn=S|`3`R;zcoVqpkzHQ7B zjkLArHz>~eyXxZ)70;k)uT?x_zke~BKYy9d^|gw3_N||%eKO<4*?+2scD7G*DE+#s zYLD&}=l4$qegu^VYuMh~UnjL=pRM=3^Y3@Z&3b&cuDSf;1BbHfe{T1dy(n#+CCB&j zduglG#D(hIKQ!|dJ;PJa{!%(Tc_X7#y_v3&Wr(4nm9e3fp|Q4sft7)QM5*?71_lPz z64!{5l*E!$tK9sQ%(O}dBLgE-T>~r{GBqZ912t&CHI!uLrWThZ<`&@AV`sZ*3Q!Lx NgQu&X%Q~loCIITjtDpb? diff --git a/sprites/spr_cata_tabbard_leather_hangings/layers/16ff2f35-0659-40fa-be7a-7a2942a2c47e/a8907230-deee-4373-af6a-ec8ca94f1d81.png b/sprites/spr_cata_tabbard_leather_hangings/layers/16ff2f35-0659-40fa-be7a-7a2942a2c47e/a8907230-deee-4373-af6a-ec8ca94f1d81.png index a9b3ff5720b1574f225353737866c7a59104d5bd..332485bdee236b98d5db9c59d4516943edc35ce9 100644 GIT binary patch delta 368 zcmZo?z05Kp$->Rk#WAGf*4wMQc@G(gum-RP2Bom2B{ED)V6>9rlCly@=;S$&x9nlI z((y-&1uT|#-4E6|zO&PL;>PHS2l(sjPHvfZB-6Gt_i@bn>~q_)*SXc|Cvb?JR@0ew zR<+`JVYt5doiB27y}#oQOnBmS<(l>NZ@Vk^$gaP(`P@%|b3z|a-g8alNak4h>UZM) z&g8$vaeQC*e_lGR^Y+k6!9t@hDh@^#Dn4|+moOJaU)U(HpuGvM+;wc0qnD-0ko zahp>8f!#8U>ABvY6&04<1PZB^xJHzuB$lLFB^RXvDF!10BU4=ib6rEj5CaP|$+61Q#WAGf*4rx^eGfZ`usyKvP}6XoW3=d$#F@qy%`W{DBAB>lDCjsG z6zLI}zRW@GpoH~A2elW!wf0wkd-?9qZO(}clP7LqtN$=xXW8T|!?_{3rQz%I&uz;# z>uZZUplA`lu4rFOEzA0KzpG*o=Gq+&KklsmKtSZEj%QKn=S|`3`R;zcoVqpkzHQ7B zjkLArHz>~eyXxZ)70;k)uT?x_zke~BKYy9d^|gw3_N||%eKO<4*?+2scD7G*DE+#s zYLD&}=l4$qegu^VYuMh~UnjL=pRM=3^Y3@Z&3b&cuDSf;1BbHfe{T1dy(n#+CCB&j zduglG#D(hIKQ!|dJ;PJa{!%(Tc_X7#y_v3&Wr(4nm9e3fp|Q4sft7)QM5*?71_lPz z64!{5l*E!$tK9sQ%(O}dBLgE-T>~r{GBqZ912t&CHI!uLrWThZ<`&@AV`sZ*3Q!Lx NgQu&X%Q~loCIITjtDpb? diff --git a/sprites/spr_cata_tabbard_leather_hangings/spr_cata_tabbard_leather_hangings.yy b/sprites/spr_cata_tabbard_leather_hangings/spr_cata_tabbard_leather_hangings.yy index 8acf0ccdcc..57d1959a31 100644 --- a/sprites/spr_cata_tabbard_leather_hangings/spr_cata_tabbard_leather_hangings.yy +++ b/sprites/spr_cata_tabbard_leather_hangings/spr_cata_tabbard_leather_hangings.yy @@ -23,7 +23,7 @@ ], "name":"spr_cata_tabbard_leather_hangings", "nineSlice":null, - "origin":0, + "origin":9, "parent":{ "name":"cata_complex", "path":"folders/Sprites/Marine Viewer/body_types/cata_complex.yy", @@ -77,8 +77,8 @@ ], "visibleRange":null, "volume":1.0, - "xorigin":0, - "yorigin":0, + "xorigin":6, + "yorigin":8, }, "swatchColours":null, "swfPrecision":0.5, diff --git a/sprites/spr_cata_tabbard_mail/spr_cata_tabbard_mail.yy b/sprites/spr_cata_tabbard_mail/spr_cata_tabbard_mail.yy index 4ee84e1ad4..3628be0c38 100644 --- a/sprites/spr_cata_tabbard_mail/spr_cata_tabbard_mail.yy +++ b/sprites/spr_cata_tabbard_mail/spr_cata_tabbard_mail.yy @@ -23,7 +23,7 @@ ], "name":"spr_cata_tabbard_mail", "nineSlice":null, - "origin":0, + "origin":9, "parent":{ "name":"cata_complex", "path":"folders/Sprites/Marine Viewer/body_types/cata_complex.yy", @@ -77,8 +77,8 @@ ], "visibleRange":null, "volume":1.0, - "xorigin":0, - "yorigin":0, + "xorigin":6, + "yorigin":8, }, "swatchColours":null, "swfPrecision":0.5, diff --git a/sprites/spr_jump_pack_serpha_complex/bf0c5f8b-3023-4fe2-8b02-193bc2c05b25.png b/sprites/spr_jump_pack_serpha_complex/bf0c5f8b-3023-4fe2-8b02-193bc2c05b25.png new file mode 100644 index 0000000000000000000000000000000000000000..6c9a645dbd19324a9cae3b398b8ba41e0d450145 GIT binary patch literal 4703 zcmeHLS5#ANl#N(WYE%#q0Sf{mV(26UL7GSj2r4B%z4u5Ugch2JNE1U52%sSC4@J6k zA(GI0FJh#3V<^(+IuEnftTpp6?{o9;-IZ^hFX!yL&)(-IQXlb%mFX%I2n1q%tf^)I zta%{NDV6i*fV+gHZYN;5Zlh_S3j+BGfk448L7;u$tKcON$QuFztyqFUu=gMk7m85( z1P*MRv(|p320Hos`OuJu2Z1gcJXU-76g#m#jdXo#mrbUfq{0g{oC5yU@cA#s$6&MyG zt7GRolkr+Pe-_d_uxq81He1PS3YciKI*e7SJ;KU3NnJM0Zu5J?nUhWTl)8y za_9+XZ9cZYC4bXSViBMT^a!j?*Co5kM%l%1=J6p0rN=8>xGVy zrmm$Wk>*}csU<%{kx#SGk1uIOnTiSfb9lYaVo_c&UD-76mF8*7wW%7s4JDS=!hGK{ zRj8q%K`r}9R=)_ZoV(zqNYwVqGk*UyiHyJ<6S2;p0w-U12ecSWpUY1-Pc`^g4@yqV zCUM?<{%f_QX<%ZaV>V6+VPPSVot^DE_BjMda-uiHDfLf4;|pqq0O;1OTVf_xNwd(mpkkFjl19d4}o%ksy^e6{3KIY7UJ zQsF8wS=X_zMab&>qM~^KlDxdUi00;pBSpx?t$>23Zvqc?UL5Uv$DX*vUDof&PxcfY zC=1)8MhIA&T=}T~nwd-dZMVHigP#oXc~OhBZcm1yc3_}ldV2cd@xkWS_V$bYEvL}t z>$y%pcMqK0-R=9c)UgfbVx2eRHBs~h-B+((0jvnvn@Pp07?QY1p|M6B7gAd6kzpvelaVRdcRx8kXKI=X<=jD4~ld zlQmM)(h7(~5`<-7S-RR|W?`W_?c3}Npl~xYGuQF5@Wi`DWdIVu#m&P*?SCY28{dwa z@8A@-XpE-JT20q_S5#NqaG&$2r=2^Hx7sv(ylvpz=~P3(CD~n!qqN(X7g{uBVBtN( zL?fPS*KCLXeFg;3>Agzmz2A1S9^ZAewVCtuGRb9PaDMg&nQ^J9SM!*GFzCJf=}Lfc zyFk`S_mID^@RuYj+`+os%Id1`!Fn|SkI7*^h-P*Sd&J8_z2oa?}KTf-UuYc_0 zBM0#4Z%Zj(SC&ni-&!6F08T<2)gX0tU*_lLp3Cfwpv=B7?bS__rS2Z2pUl+zO2uow zylYhaR#VWp+@2NJlnGE2&QICgRZzeRf4DuYJ$^Y$TrAY%DtvDaU-(bWJG;)Lzp!^C z-d$c_p9gvv^tV(mSoa=%(F8aG<9CiFz|im7tZ=w3n`HgdYor`)=gX@7qoqKkLP@O=fK2pnC5 zrQHM`x|l^HAtQr7FJRivJt*Bm4wIbTZYv*j3`TK5V-c*Vo_Q{OcE_-!UO1 zrpH?z@hofP+48q-}|W6^WiE0wXWPVRg+BlR9YI}(}OtvGs~{>5xne`T2&>R z7tmntfk>Iu8T^}n$XR*+9Wnm62uEqH>);=e!Wk&jCHi7-IhJNUF)?9W>C9;XsJeRd z%YharzQA2%XhaNw1Ouu%ad2H^=YxG~jp9nDbz1}-sl)jlmIrc%hKDakwURU1%E;XV z%%wp-%LBKaot@90VE{U$@nAz?q}WXR(IZBek;3NHZBJmg-u(V%Jw3KOhz|eI!;KaY z#xABS)^Cp>#gJ9ei~<2~0g40#DJ9>xSoql*B`qiS_j$EYA?>!3c>%(r{&lfy)Wn(1 zyn=#AwVMwCVFJ{|a_{#%e5+3tXxdWDx@j!G;>sF+^2H8nYuW?qg+=ynKk@8@K2bgu z`iN3h5?-%V@k)s_RT+I$l_>%!a~dibOg&I{pBhiiMqB3Ih4zMGH68R(PKy zN<`l0&_{)D4UI8RmD(@@z7F81p`k&RU0TtYI%~xh8)!`8>(dbm1H73(4h^WrU%rSY z-c0NME7qkp6wj(AFb@`+uD7=|rwzIW$G!#B)S!R^5b%HMFfmv-LRB?P>K_JjVolxD z^!D6#torRMQSn+i#`RbUpa}wwwnssiG1U2UmqoeJi2qDyl~&|qWW-g6S@&dWW#f+y zhotDhn#-9*)4C;LFfD+4O--4T)gDrCc$eHv0KU8-ASXksVf31V9zq0;C2Yp=@ut;y zOnr$r7Sn+9Gon<^`Glotx8nV8!!hkZ>oV1_7K7?24g;ufAU-YOQCxM zb0?1iVy7okBYS9M=d-i%79UKO=L$cC{R+3Az;`DQ zO|E0KS!^6qa{YQ#BdV#j(YEINFRP6NISsGmB$!DE5hvSKOgge=-w3Pq6ljf#O?{`P z@VnF^JHkCP0tJLU&3APYeUC9y2l_=MW6o+q_*`a2;qwsPE%)>_j+FopC|%b}xqf2W z@Az%Om~zs9Cqi4EuIpo*2cww({0n(2!7y_jg7|FljMZVhS`0qQlOdGpBIjg z4?HeKo@xH|?VfYatgdbsIRQONHPFSJN^dvw(zgoTAYn_hm`vdk7; zSIO+TSnO^UhLUHAp6;Xpnu&IY4o*$6eCuRy~RGzC@Uukmxq`zSM?tsDzRc!O~*&6YR_ z^U;HAY?mX|2$Rb>26uo-fnrumWy(E*MoZEOWxbm%F2GAbNr`Zx7PPvEAo9LSrCH2! zpq*?>tq@fNyD)N~$XTPsX16$)E}lR0d-S|$0y@l)9Z2C8_&k^?{0nCNDyo`anAyH` zW6q@|xTo!3!2{VoZ*T7&<_Zg2Tu2+?$52FF@yf~yVA+k0jXdL#ZyZ)H^P#&oHwKrb zSy@>HFI_mt$T*F^c^2(12_n|jO+syl`uctZU_+3VSELt-@`MoO;MiC;5bh5(BGe%o z7|?jQxjz6F0yN<68lssn$?}ycg5)|;aUmFRbzuKO1Zfsw$nU_er?|}l0wy0kf8rgo z?R4#vF7FvWKEAD;oq@?og$Yg1=YM6J296YKgH*w(jrS z{R+R#S16$h+W3r!z8+HVe}46i^nL%dpXz0yI+w8oSluZfC8oY^^X#nWXk1F+1Dn#Z zFTKg39Y(Es-&R^Wd?7mt0Q>ntRA}k5D&aB7YCq-TNU=|nbmAMUtGmE4{N$qsi-lNE_?}Lb%_3K zex+08UjFLzC-Fd>CtJs4hZ*fb{J(@79Tqq4GaFX2U)G)Ex#_*kO!69`du290m4Y?t zx*P#o6lEfQn@;f>_8Io5D2x+DjyB|Z$T0f3?euG|N0*gc(#4w|NI@|rLzna z_`l`0m%6c+t(BJ@%*N9WSU{2xNtt^PxqA{4Pa$$JX(^bb)LjS!27$b&#J~G*0d5|) uPWHb4djM$Zt~d}N@?XE;<>Y3E_OfzA{qHeGM@%#z2J~1Rp;oM78Tuaq3E{o~ literal 0 HcmV?d00001 diff --git a/sprites/spr_jump_pack_serpha_complex/layers/bf0c5f8b-3023-4fe2-8b02-193bc2c05b25/44bab4d0-aab6-43b3-8549-2f4f4dc0ef03.png b/sprites/spr_jump_pack_serpha_complex/layers/bf0c5f8b-3023-4fe2-8b02-193bc2c05b25/44bab4d0-aab6-43b3-8549-2f4f4dc0ef03.png new file mode 100644 index 0000000000000000000000000000000000000000..6c9a645dbd19324a9cae3b398b8ba41e0d450145 GIT binary patch literal 4703 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 literal 0 HcmV?d00001 diff --git a/sprites/spr_jump_pack_serpha_complex/spr_jump_pack_serpha_complex.yy b/sprites/spr_jump_pack_serpha_complex/spr_jump_pack_serpha_complex.yy new file mode 100644 index 0000000000..29e6e377e0 --- /dev/null +++ b/sprites/spr_jump_pack_serpha_complex/spr_jump_pack_serpha_complex.yy @@ -0,0 +1,92 @@ +{ + "$GMSprite":"v2", + "%Name":"spr_jump_pack_serpha_complex", + "bboxMode":0, + "bbox_bottom":106, + "bbox_left":6, + "bbox_right":160, + "bbox_top":36, + "collisionKind":1, + "collisionTolerance":0, + "DynamicTexturePage":false, + "edgeFiltering":false, + "For3D":false, + "frames":[ + {"$GMSpriteFrame":"v1","%Name":"bf0c5f8b-3023-4fe2-8b02-193bc2c05b25","name":"bf0c5f8b-3023-4fe2-8b02-193bc2c05b25","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + ], + "gridX":0, + "gridY":0, + "height":322, + "HTile":false, + "layers":[ + {"$GMImageLayer":"","%Name":"44bab4d0-aab6-43b3-8549-2f4f4dc0ef03","blendMode":0,"displayName":"default","isLocked":false,"name":"44bab4d0-aab6-43b3-8549-2f4f4dc0ef03","opacity":100.0,"resourceType":"GMImageLayer","resourceVersion":"2.0","visible":true,}, + ], + "name":"spr_jump_pack_serpha_complex", + "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_jump_pack_serpha_complex", + "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_jump_pack_serpha_complex", + "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":"bf0c5f8b-3023-4fe2-8b02-193bc2c05b25","path":"sprites/spr_jump_pack_serpha_complex/spr_jump_pack_serpha_complex.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"81954740-eb52-4281-a7c1-da1ca938492a","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_weapon_volkite_culverin_term/175b3fc0-27ea-4b35-bab7-7867c6fa811b.png b/sprites/spr_weapon_volkite_culverin_term/175b3fc0-27ea-4b35-bab7-7867c6fa811b.png new file mode 100644 index 0000000000000000000000000000000000000000..8f107824d804b921009bb05625585a0ebd5aa3b2 GIT binary patch literal 1938 zcmcIkSx}S78vR8;kO9$%Ojra#)RDyyL>7TafI(IT9YDn-7!oCr1R+9L!wzy~a}XgQ z0YznT*v24)HGm2OVNsSbkxdD!tU@v*7n$FeTXi4i;Xd5%s_%54?o+3~ufFQL7hUb; z_p0m#06^a1ysbNkV*s#AT1FaNO*v*FLD0mWcXt7R@M8cFlK=oBkcycDfIBb%Sik^) zc`g7b2Ntm0EWiWl8&3ANz|Qws)cpKckVtf}wZ2T{E{$1|rn{ihlNm|c9Wm;rS6r%^QW6JRON)vxoE(OZZ;x4>)$Yz zSGLsUM@kGj$Hmjq^*$Et_4VV0Y`9ho6G*e&?VP6P@rvsZqu(SfQG}-u&y%O57N!O6TJ&cTux*R- zF0a+}WJx++mF{NzCxOXb3SG}N>t`hPc+81*k48-l%1^l=Rss=h?O122<)BH|LhIRs zNs%6_rF#AhaDT=pVxf~CqT1H7Euzz5#m+lZJ+EglH+h#JYd!sM^IIbSRj+?LWCFq& zcBbvgb-wG4LM5-9MbHS3Ezqw;MtiDeD>eneVvXixSw0a}_^xcKvh`<+k7H_4)1tLt z3$&d@6z{Z&v5o`YD*p3s3FVq^TbrYsvxRh17FU*uJDD{rrjTX(`JeHkv(phwk06t~8Hu~*{U8_b03I!GXQcY}ZgdhI!P$2d=Tq8Q#L_Z+-OUZ11J5HAp zFJV$rw;1iQ+I93&tg2c)n#PK(zAzz`QLru#Roj?FLF!Xd(6sQf{TIeJ2q$74gAyzK z!rxB3kt9{9Hreb8HHouVYC!JMh#6pa&KR1utj$L(kpc2UUCPtW?Y!s_^5|zVW`}BJ z3E_WR3ocMeNfzc*g_#Xg^xwCa9!1Y-X*oiT$NcX#8=7k>kPY-}P_En4@)b5{dvRmz zgVdlAifZy#Jz68_=hi;;eS|J3%VhkIU{_w9LE*(;`Uco>d=+?o(aJiaxBCTB*hdGM(#5*(-8TrgYw zaMRFbUyx*JG%V{3Jr0wF^gzK2KJXb-Ej5q83i8_BEM`4ioH$N(K6z;ll^f9=$Cn$s z9II$?vfJ3VI_%$T+n;BD&8JQCcaj_Pf6w5@3GeGtlDucp5l~IUj}?p3 zH@gnjw6ra`?7oI>?iH9|rr?L_t=X!`$*vRr#XNtpy41}gIWf*M^pF9T&11wjK-;2w zURF1^J$Rh+q&z^XY6CS%?fH_`f!(XFgrjG<8(epbBxpr%nSBy1hO2lo#Bcl8B9+$o z*E)$iN1S91EBQj<^*`39+=&7EpW2c-zSi`lZBs4uy|*!`Z5lpAS&W+?S_!18v+Id; zDpztvWV@OqsX!=KXVo@WU{)Nl?|)DjKN73m$SvkUnaBP(MqRrz*3aW^PPj@fduRF} z{g5W%dL&2@?+E7|M^o&$dS26I4%I9g%~X7#6EYHn(g%#ug87p1ed;V@6F|^9sJa%z> zx_n-yL+w;@%XLxH%J3C~?WtuvZEIt{c*N?qRpDt)kEd`RgMXK>%(UiJ7O$gvsyi}r zj!-(@%=amp&Xk1Ag+L08f7&`hNG91c(lfMN<|Na;$017OL8i^C{ME>pH%4VDQSjqX ze94RFnc3^>Dn87suRF%lxLF^%6j>=L_=Wjv`I&U1H`BEVq$MS`KTmKg?Ll$tZ-V)C zL)=ePTw^-F)ZXh6b%b3MrGLiBj(Ms??SrLUWH0=ON5ahO&vpb)8wp<| zGsgzuKmgz{xUoLWMBmWxGR)K*cG?_nrVE3a!(c_#w-5Z6fJpZB!-xH|U~s9s5)_>H gj|0Vzhzq9p5Ci{Nll0fz?e8f$*tyzPA~A7)1G1-f_5c6? literal 0 HcmV?d00001 diff --git a/sprites/spr_weapon_volkite_culverin_term/layers/175b3fc0-27ea-4b35-bab7-7867c6fa811b/929a717e-45ba-45eb-915b-7e0136b8f8d3.png b/sprites/spr_weapon_volkite_culverin_term/layers/175b3fc0-27ea-4b35-bab7-7867c6fa811b/929a717e-45ba-45eb-915b-7e0136b8f8d3.png new file mode 100644 index 0000000000000000000000000000000000000000..8f107824d804b921009bb05625585a0ebd5aa3b2 GIT binary patch literal 1938 zcmcIkSx}S78vR8;kO9$%Ojra#)RDyyL>7TafI(IT9YDn-7!oCr1R+9L!wzy~a}XgQ z0YznT*v24)HGm2OVNsSbkxdD!tU@v*7n$FeTXi4i;Xd5%s_%54?o+3~ufFQL7hUb; z_p0m#06^a1ysbNkV*s#AT1FaNO*v*FLD0mWcXt7R@M8cFlK=oBkcycDfIBb%Sik^) zc`g7b2Ntm0EWiWl8&3ANz|Qws)cpKckVtf}wZ2T{E{$1|rn{ihlNm|c9Wm;rS6r%^QW6JRON)vxoE(OZZ;x4>)$Yz zSGLsUM@kGj$Hmjq^*$Et_4VV0Y`9ho6G*e&?VP6P@rvsZqu(SfQG}-u&y%O57N!O6TJ&cTux*R- zF0a+}WJx++mF{NzCxOXb3SG}N>t`hPc+81*k48-l%1^l=Rss=h?O122<)BH|LhIRs zNs%6_rF#AhaDT=pVxf~CqT1H7Euzz5#m+lZJ+EglH+h#JYd!sM^IIbSRj+?LWCFq& zcBbvgb-wG4LM5-9MbHS3Ezqw;MtiDeD>eneVvXixSw0a}_^xcKvh`<+k7H_4)1tLt z3$&d@6z{Z&v5o`YD*p3s3FVq^TbrYsvxRh17FU*uJDD{rrjTX(`JeHkv(phwk06t~8Hu~*{U8_b03I!GXQcY}ZgdhI!P$2d=Tq8Q#L_Z+-OUZ11J5HAp zFJV$rw;1iQ+I93&tg2c)n#PK(zAzz`QLru#Roj?FLF!Xd(6sQf{TIeJ2q$74gAyzK z!rxB3kt9{9Hreb8HHouVYC!JMh#6pa&KR1utj$L(kpc2UUCPtW?Y!s_^5|zVW`}BJ z3E_WR3ocMeNfzc*g_#Xg^xwCa9!1Y-X*oiT$NcX#8=7k>kPY-}P_En4@)b5{dvRmz zgVdlAifZy#Jz68_=hi;;eS|J3%VhkIU{_w9LE*(;`Uco>d=+?o(aJiaxBCTB*hdGM(#5*(-8TrgYw zaMRFbUyx*JG%V{3Jr0wF^gzK2KJXb-Ej5q83i8_BEM`4ioH$N(K6z;ll^f9=$Cn$s z9II$?vfJ3VI_%$T+n;BD&8JQCcaj_Pf6w5@3GeGtlDucp5l~IUj}?p3 zH@gnjw6ra`?7oI>?iH9|rr?L_t=X!`$*vRr#XNtpy41}gIWf*M^pF9T&11wjK-;2w zURF1^J$Rh+q&z^XY6CS%?fH_`f!(XFgrjG<8(epbBxpr%nSBy1hO2lo#Bcl8B9+$o z*E)$iN1S91EBQj<^*`39+=&7EpW2c-zSi`lZBs4uy|*!`Z5lpAS&W+?S_!18v+Id; zDpztvWV@OqsX!=KXVo@WU{)Nl?|)DjKN73m$SvkUnaBP(MqRrz*3aW^PPj@fduRF} z{g5W%dL&2@?+E7|M^o&$dS26I4%I9g%~X7#6EYHn(g%#ug87p1ed;V@6F|^9sJa%z> zx_n-yL+w;@%XLxH%J3C~?WtuvZEIt{c*N?qRpDt)kEd`RgMXK>%(UiJ7O$gvsyi}r zj!-(@%=amp&Xk1Ag+L08f7&`hNG91c(lfMN<|Na;$017OL8i^C{ME>pH%4VDQSjqX ze94RFnc3^>Dn87suRF%lxLF^%6j>=L_=Wjv`I&U1H`BEVq$MS`KTmKg?Ll$tZ-V)C zL)=ePTw^-F)ZXh6b%b3MrGLiBj(Ms??SrLUWH0=ON5ahO&vpb)8wp<| zGsgzuKmgz{xUoLWMBmWxGR)K*cG?_nrVE3a!(c_#w-5Z6fJpZB!-xH|U~s9s5)_>H gj|0Vzhzq9p5Ci{Nll0fz?e8f$*tyzPA~A7)1G1-f_5c6? literal 0 HcmV?d00001 diff --git a/sprites/spr_weapon_volkite_culverin_term/spr_weapon_volkite_culverin_term.yy b/sprites/spr_weapon_volkite_culverin_term/spr_weapon_volkite_culverin_term.yy new file mode 100644 index 0000000000..02d2dfc73c --- /dev/null +++ b/sprites/spr_weapon_volkite_culverin_term/spr_weapon_volkite_culverin_term.yy @@ -0,0 +1,92 @@ +{ + "$GMSprite":"v2", + "%Name":"spr_weapon_volkite_culverin_term", + "bboxMode":0, + "bbox_bottom":203, + "bbox_left":31, + "bbox_right":64, + "bbox_top":104, + "collisionKind":1, + "collisionTolerance":0, + "DynamicTexturePage":false, + "edgeFiltering":false, + "For3D":false, + "frames":[ + {"$GMSpriteFrame":"v1","%Name":"175b3fc0-27ea-4b35-bab7-7867c6fa811b","name":"175b3fc0-27ea-4b35-bab7-7867c6fa811b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + ], + "gridX":0, + "gridY":0, + "height":262, + "HTile":false, + "layers":[ + {"$GMImageLayer":"","%Name":"929a717e-45ba-45eb-915b-7e0136b8f8d3","blendMode":0,"displayName":"default","isLocked":false,"name":"929a717e-45ba-45eb-915b-7e0136b8f8d3","opacity":100.0,"resourceType":"GMImageLayer","resourceVersion":"2.0","visible":true,}, + ], + "name":"spr_weapon_volkite_culverin_term", + "nineSlice":null, + "origin":9, + "parent":{ + "name":"weapons_terminator", + "path":"folders/Sprites/Marine Viewer/weapons_terminator.yy", + }, + "preMultiplyAlpha":false, + "resourceType":"GMSprite", + "resourceVersion":"2.0", + "sequence":{ + "$GMSequence":"v1", + "%Name":"spr_weapon_volkite_culverin_term", + "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_weapon_volkite_culverin_term", + "playback":1, + "playbackSpeed":1.0, + "playbackSpeedType":1, + "resourceType":"GMSequence", + "resourceVersion":"2.0", + "seqHeight":262.0, + "seqWidth":221.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":"175b3fc0-27ea-4b35-bab7-7867c6fa811b","path":"sprites/spr_weapon_volkite_culverin_term/spr_weapon_volkite_culverin_term.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"56beb6db-0944-4439-80f6-ba38c9511580","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":27, + "yorigin":38, + }, + "swatchColours":null, + "swfPrecision":2.525, + "textureGroupId":{ + "name":"MarineViewer", + "path":"texturegroups/MarineViewer", + }, + "type":0, + "VTile":false, + "width":221, +} \ No newline at end of file From 2ca39ebeeb442fac383222230a8a9590b96248e5 Mon Sep 17 00:00:00 2001 From: Werwolf-12 Date: Sat, 12 Jul 2025 22:30:50 +0200 Subject: [PATCH 126/286] fix: Serpha unstaged files (#916) Co-authored-by: Nelsonh <81228864+OH296@users.noreply.github.com> --- ChapterMaster.yyp | 3 +++ objects/obj_shop/Create_0.gml | 2 +- scripts/scr_ruins_reward/scr_ruins_reward.gml | 1 + 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/ChapterMaster.yyp b/ChapterMaster.yyp index d451882129..5dcdc1b82d 100644 --- a/ChapterMaster.yyp +++ b/ChapterMaster.yyp @@ -1047,6 +1047,7 @@ {"id":{"name":"spr_carrion_breath","path":"sprites/spr_carrion_breath/spr_carrion_breath.yy",},}, {"id":{"name":"spr_cata_belt","path":"sprites/spr_cata_belt/spr_cata_belt.yy",},}, {"id":{"name":"spr_cata_complex","path":"sprites/spr_cata_complex/spr_cata_complex.yy",},}, + {"id":{"name":"spr_cata_cowl_trim_1","path":"sprites/spr_cata_cowl_trim_1/spr_cata_cowl_trim_1.yy",},}, {"id":{"name":"spr_cata_cowl_trim","path":"sprites/spr_cata_cowl_trim/spr_cata_cowl_trim.yy",},}, {"id":{"name":"spr_cata_gorget","path":"sprites/spr_cata_gorget/spr_cata_gorget.yy",},}, {"id":{"name":"spr_cata_head","path":"sprites/spr_cata_head/spr_cata_head.yy",},}, @@ -1286,6 +1287,7 @@ {"id":{"name":"spr_iron_colors","path":"sprites/spr_iron_colors/spr_iron_colors.yy",},}, {"id":{"name":"spr_iron2_colors","path":"sprites/spr_iron2_colors/spr_iron2_colors.yy",},}, {"id":{"name":"spr_jump_pack_complex","path":"sprites/spr_jump_pack_complex/spr_jump_pack_complex.yy",},}, + {"id":{"name":"spr_jump_pack_serpha_complex","path":"sprites/spr_jump_pack_serpha_complex/spr_jump_pack_serpha_complex.yy",},}, {"id":{"name":"spr_knightly_belt","path":"sprites/spr_knightly_belt/spr_knightly_belt.yy",},}, {"id":{"name":"spr_knightly_personal_livery","path":"sprites/spr_knightly_personal_livery/spr_knightly_personal_livery.yy",},}, {"id":{"name":"spr_knightly_robes","path":"sprites/spr_knightly_robes/spr_knightly_robes.yy",},}, @@ -1749,6 +1751,7 @@ {"id":{"name":"spr_weapon_tigris_combi","path":"sprites/spr_weapon_tigris_combi/spr_weapon_tigris_combi.yy",},}, {"id":{"name":"spr_weapon_volkite_caliver","path":"sprites/spr_weapon_volkite_caliver/spr_weapon_volkite_caliver.yy",},}, {"id":{"name":"spr_weapon_volkite_charger","path":"sprites/spr_weapon_volkite_charger/spr_weapon_volkite_charger.yy",},}, + {"id":{"name":"spr_weapon_volkite_culverin_term","path":"sprites/spr_weapon_volkite_culverin_term/spr_weapon_volkite_culverin_term.yy",},}, {"id":{"name":"spr_weapon_volkite_culverin","path":"sprites/spr_weapon_volkite_culverin/spr_weapon_volkite_culverin.yy",},}, {"id":{"name":"spr_weapon_volkite_serpenta","path":"sprites/spr_weapon_volkite_serpenta/spr_weapon_volkite_serpenta.yy",},}, {"id":{"name":"spr_weapon_xenophase_blade_var1","path":"sprites/spr_weapon_xenophase_blade_var1/spr_weapon_xenophase_blade_var1.yy",},}, diff --git a/objects/obj_shop/Create_0.gml b/objects/obj_shop/Create_0.gml index 29cf62e715..e45818b41a 100644 --- a/objects/obj_shop/Create_0.gml +++ b/objects/obj_shop/Create_0.gml @@ -531,7 +531,6 @@ if (shop = "equipment") { forge_cost[i] = 200; item_stocked[i] = scr_item_count(item[i]); item_cost[i] = 10; - i += 1; item[i] = "Missile Launcher"; forge_cost[i] = 300; @@ -547,6 +546,7 @@ if (shop = "equipment") { nobuy[i] = 1; item_cost[i] = 0; } + i += 1; //Debug space for 30k weapons //Volkite Pack item[i] = "Volkite Serpenta"; diff --git a/scripts/scr_ruins_reward/scr_ruins_reward.gml b/scripts/scr_ruins_reward/scr_ruins_reward.gml index 92f41d2a40..23e03f360e 100644 --- a/scripts/scr_ruins_reward/scr_ruins_reward.gml +++ b/scripts/scr_ruins_reward/scr_ruins_reward.gml @@ -151,6 +151,7 @@ else if (ruins_type=5){ wen6=choose(0,1); wep7=choose("Company Standard","Narthecium","Psychic Hood","Rosarius"); wen7=choose(0,1); + wep8=choose("Ancient Jump Pack"); wen8=choose(1,2,3); } From 994c8d63241ee0c81dc62b3f04eb05ad26838049 Mon Sep 17 00:00:00 2001 From: EttyKitty <20323032+EttyKitty@users.noreply.github.com> Date: Sun, 13 Jul 2025 02:45:07 +0300 Subject: [PATCH 127/286] ci: Maybe setup discord release notifications (#917) --- .github/workflows/release_dev.yml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/.github/workflows/release_dev.yml b/.github/workflows/release_dev.yml index 50016b6f48..f051831cc7 100644 --- a/.github/workflows/release_dev.yml +++ b/.github/workflows/release_dev.yml @@ -222,3 +222,11 @@ jobs: ./build_output/${{ needs.gamemaker_build.outputs.built_file }}/* env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + + - name: GitHub Releases to Discord + uses: SethCohen/github-releases-to-discord@v1.19.0 + with: + webhook_url: ${{ secrets.DISCORD_WEBHOOK_URL }} + username: "GitHub Releases" + content: "@Development Builds" + reduce_headings: true From f0910153fa6258202f608998e25b9cd7cb6b0d7c Mon Sep 17 00:00:00 2001 From: Werwolf-12 Date: Sun, 13 Jul 2025 22:50:46 +0200 Subject: [PATCH 128/286] fix: Scout right pauldron will recolour properly (#918) --- .../2462092a-8f18-48d4-9694-48ea1de535d9.png | Bin 6945 -> 6955 bytes .../6875771f-a0b5-4a59-8928-4f649aaa9035.png | Bin 6945 -> 6955 bytes .../spr_scout_complex/spr_scout_complex.yy | 4 +++- 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/sprites/spr_scout_complex/2462092a-8f18-48d4-9694-48ea1de535d9.png b/sprites/spr_scout_complex/2462092a-8f18-48d4-9694-48ea1de535d9.png index 4b3f0b9f77cca7afa99e22dcba780f0942206e89..326f8d1befec84b938d2a94d7e2f3641f8e98665 100644 GIT binary patch delta 6782 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 H9A5qp+(k`e delta 6781 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� zm^*Rc(rKYxBPWxZ?~Wz*bA7A=aj+3;6!%CtxZXTDTGW1_4~;G$dh;))Lz`+hke)S_ zCx!4}Wvz5=yX$zC;78#D;p0^rxPBELuji*A2U>YE#YR5)L7&}@-?n75U^wG?P3UWzf#I|Ew^qRTs>?&WDr^=+#Q0g{X+eG9rZ@+l6+}p`j z$xZccIyJKI)87ylQjbCJo*w^80QJS=EcX%V3`CVfjlZU47F@Y6H$V23TJHF5w{P@{ z4Bmfe9Z7L>u}lFUQ2M=fg9Fl0)jlT*!sFsA@RGRj(h_Q>drWE!#)+xXV)&cZ>rqf% zN#%#ZZGZSoEG?N-g}~1Twl0jRZlj=I)K^6{hb*j8Ts*-a2{pd*={}QuL|GPJ!Afk& z@{3?f?0XUv9D1EO<6e2jHv&yMRD&`I!*>G-{K6+y2%W)j+OQ~yq96lZXy$vZJTSP) z1=m>ryGYdg8f0>!{d5Ins;i1w!FK+kP-jN7XLzbHnUDiB3kU#vCOouL8voUjD&^E} z#aX|Zq#0qUpa`bG`mg*TOXUztyUu~E#N6O4TX3TrF0h{FBHlm|jMHXOd)NL{omE1m zK}kkL8j|wI^EBoG6-9!9CP2o(9`EW}A0YEaCC7c5mqTH(L53O60gT7_r_d)rI@JTq zXV<)u+OURMD|3T#si*;cNyddIVu>Gu9g9|5Qv{gX5D_LSPfu4$?+1C4WLeuk;cpvgwVZQ*^xQR3tEd7L%%g&K~&uto|7CnO_fzJ@FU# z{b(iPLf|Vj9fyXch{oLA)&S42HGD#$r*v^lb9cOfVR%-YyIj|+>b+*r1X|safwvP15s(?&+i|)>NSvT z!E$ZFZm;n4D{MYG_R_z?v98_OH~B%;tll@xBLpa?m*@6wQ5OFq-9M1Sk^oKF92^e~ z*i;tsl#ON;?ojHoKA}5%xW1hkk(v@j6T=#rRAZ*e*b-hBjUs2vpRX~E9Dx$Ib8`G-^LrSWQb&cYyRdaN(G z(>KI!)&Fs9U`I-Ukgdelj+{;5yU*a1QbAt?!$(KOc3CRztuc`y13y7<#et%XiyH!XRR|5og6%ay}l2TDm3439x?yP{SJD8z7)wT*KN z!shr`c6Qa-z$UATtA}T@;W%UV5GENZ0L}b%EoU_niwgj@P%=(Ehp?{b$tRBtlx!jQ z@J)g#@V_CVH^$G%n4fNjcgI(uMRF98O zTv$L{NQ@J^;NzRI?oLi_rlqC&KfDsDK;GnSS_YQ?!@J`&KEO%>s3>U4SISw0{|{@n BJe~jm diff --git a/sprites/spr_scout_complex/layers/2462092a-8f18-48d4-9694-48ea1de535d9/6875771f-a0b5-4a59-8928-4f649aaa9035.png b/sprites/spr_scout_complex/layers/2462092a-8f18-48d4-9694-48ea1de535d9/6875771f-a0b5-4a59-8928-4f649aaa9035.png index 4b3f0b9f77cca7afa99e22dcba780f0942206e89..326f8d1befec84b938d2a94d7e2f3641f8e98665 100644 GIT binary patch delta 6782 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 H9A5qp+(k`e delta 6781 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� zm^*Rc(rKYxBPWxZ?~Wz*bA7A=aj+3;6!%CtxZXTDTGW1_4~;G$dh;))Lz`+hke)S_ zCx!4}Wvz5=yX$zC;78#D;p0^rxPBELuji*A2U>YE#YR5)L7&}@-?n75U^wG?P3UWzf#I|Ew^qRTs>?&WDr^=+#Q0g{X+eG9rZ@+l6+}p`j z$xZccIyJKI)87ylQjbCJo*w^80QJS=EcX%V3`CVfjlZU47F@Y6H$V23TJHF5w{P@{ z4Bmfe9Z7L>u}lFUQ2M=fg9Fl0)jlT*!sFsA@RGRj(h_Q>drWE!#)+xXV)&cZ>rqf% zN#%#ZZGZSoEG?N-g}~1Twl0jRZlj=I)K^6{hb*j8Ts*-a2{pd*={}QuL|GPJ!Afk& z@{3?f?0XUv9D1EO<6e2jHv&yMRD&`I!*>G-{K6+y2%W)j+OQ~yq96lZXy$vZJTSP) z1=m>ryGYdg8f0>!{d5Ins;i1w!FK+kP-jN7XLzbHnUDiB3kU#vCOouL8voUjD&^E} z#aX|Zq#0qUpa`bG`mg*TOXUztyUu~E#N6O4TX3TrF0h{FBHlm|jMHXOd)NL{omE1m zK}kkL8j|wI^EBoG6-9!9CP2o(9`EW}A0YEaCC7c5mqTH(L53O60gT7_r_d)rI@JTq zXV<)u+OURMD|3T#si*;cNyddIVu>Gu9g9|5Qv{gX5D_LSPfu4$?+1C4WLeuk;cpvgwVZQ*^xQR3tEd7L%%g&K~&uto|7CnO_fzJ@FU# z{b(iPLf|Vj9fyXch{oLA)&S42HGD#$r*v^lb9cOfVR%-YyIj|+>b+*r1X|safwvP15s(?&+i|)>NSvT z!E$ZFZm;n4D{MYG_R_z?v98_OH~B%;tll@xBLpa?m*@6wQ5OFq-9M1Sk^oKF92^e~ z*i;tsl#ON;?ojHoKA}5%xW1hkk(v@j6T=#rRAZ*e*b-hBjUs2vpRX~E9Dx$Ib8`G-^LrSWQb&cYyRdaN(G z(>KI!)&Fs9U`I-Ukgdelj+{;5yU*a1QbAt?!$(KOc3CRztuc`y13y7<#et%XiyH!XRR|5og6%ay}l2TDm3439x?yP{SJD8z7)wT*KN z!shr`c6Qa-z$UATtA}T@;W%UV5GENZ0L}b%EoU_niwgj@P%=(Ehp?{b$tRBtlx!jQ z@J)g#@V_CVH^$G%n4fNjcgI(uMRF98O zTv$L{NQ@J^;NzRI?oLi_rlqC&KfDsDK;GnSS_YQ?!@J`&KEO%>s3>U4SISw0{|{@n BJe~jm diff --git a/sprites/spr_scout_complex/spr_scout_complex.yy b/sprites/spr_scout_complex/spr_scout_complex.yy index 21cd9ea9e4..db5c746b8c 100644 --- a/sprites/spr_scout_complex/spr_scout_complex.yy +++ b/sprites/spr_scout_complex/spr_scout_complex.yy @@ -70,7 +70,9 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"2462092a-8f18-48d4-9694-48ea1de535d9","path":"sprites/spr_scout_complex/spr_scout_complex.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"c74f3d25-50a8-4016-8372-0d7a2c479225","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"2462092a-8f18-48d4-9694-48ea1de535d9","path":"sprites/spr_scout_complex/spr_scout_complex.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"c74f3d25-50a8-4016-8372-0d7a2c479225","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, From 5055f49bf39657686b6bb41ecfbfc05d2c9fe744 Mon Sep 17 00:00:00 2001 From: EttyKitty <20323032+EttyKitty@users.noreply.github.com> Date: Mon, 14 Jul 2025 02:15:30 +0300 Subject: [PATCH 129/286] ci: Attempting to repair the release notification (#919) --- .../discord-prerelease-notification.yml | 21 +++++++++++++++++++ .github/workflows/release_dev.yml | 8 ------- 2 files changed, 21 insertions(+), 8 deletions(-) create mode 100644 .github/workflows/discord-prerelease-notification.yml diff --git a/.github/workflows/discord-prerelease-notification.yml b/.github/workflows/discord-prerelease-notification.yml new file mode 100644 index 0000000000..4a42436cbc --- /dev/null +++ b/.github/workflows/discord-prerelease-notification.yml @@ -0,0 +1,21 @@ +on: + release: + types: [prereleased] + +permissions: + contents: read + +jobs: + github-releases-to-discord: + runs-on: ubuntu-latest + steps: + - name: Checkout + uses: actions/checkout@v4 + + - name: GitHub Releases to Discord + uses: SethCohen/github-releases-to-discord@v1.19.0 + with: + webhook_url: ${{ secrets.DISCORD_WEBHOOK_URL }} + username: "GitHub Releases" + content: "@Development Builds" + reduce_headings: true diff --git a/.github/workflows/release_dev.yml b/.github/workflows/release_dev.yml index f051831cc7..50016b6f48 100644 --- a/.github/workflows/release_dev.yml +++ b/.github/workflows/release_dev.yml @@ -222,11 +222,3 @@ jobs: ./build_output/${{ needs.gamemaker_build.outputs.built_file }}/* env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - - - name: GitHub Releases to Discord - uses: SethCohen/github-releases-to-discord@v1.19.0 - with: - webhook_url: ${{ secrets.DISCORD_WEBHOOK_URL }} - username: "GitHub Releases" - content: "@Development Builds" - reduce_headings: true From a274b26c882155ae5e199fe2f71e863669d81b87 Mon Sep 17 00:00:00 2001 From: EttyKitty <20323032+EttyKitty@users.noreply.github.com> Date: Mon, 14 Jul 2025 02:37:37 +0300 Subject: [PATCH 130/286] ci: Maybe published trigger will work (#920) --- .github/workflows/discord-prerelease-notification.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/.github/workflows/discord-prerelease-notification.yml b/.github/workflows/discord-prerelease-notification.yml index 4a42436cbc..22c2c11e86 100644 --- a/.github/workflows/discord-prerelease-notification.yml +++ b/.github/workflows/discord-prerelease-notification.yml @@ -1,10 +1,9 @@ +name: Discord Release Notification on: release: - types: [prereleased] - + types: [prereleased, published] permissions: contents: read - jobs: github-releases-to-discord: runs-on: ubuntu-latest From 0a0b86bb231b59bb68465a6f838197d7bd635572 Mon Sep 17 00:00:00 2001 From: EttyKitty <20323032+EttyKitty@users.noreply.github.com> Date: Mon, 14 Jul 2025 03:47:25 +0300 Subject: [PATCH 131/286] ci: Here we go again (#921) --- .github/workflows/discord-prerelease-notification.yml | 2 +- .github/workflows/release_dev.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/discord-prerelease-notification.yml b/.github/workflows/discord-prerelease-notification.yml index 22c2c11e86..622174b4ba 100644 --- a/.github/workflows/discord-prerelease-notification.yml +++ b/.github/workflows/discord-prerelease-notification.yml @@ -1,7 +1,7 @@ name: Discord Release Notification on: release: - types: [prereleased, published] + types: [prereleased] permissions: contents: read jobs: diff --git a/.github/workflows/release_dev.yml b/.github/workflows/release_dev.yml index 50016b6f48..73847a78e8 100644 --- a/.github/workflows/release_dev.yml +++ b/.github/workflows/release_dev.yml @@ -221,4 +221,4 @@ jobs: files: | ./build_output/${{ needs.gamemaker_build.outputs.built_file }}/* env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + GITHUB_TOKEN: ${{ secrets.RELEASE_TOKEN }} From b81ecdd3f21cbd5da3845de686cb6a438dfb8118 Mon Sep 17 00:00:00 2001 From: EttyKitty <20323032+EttyKitty@users.noreply.github.com> Date: Mon, 14 Jul 2025 05:39:13 +0300 Subject: [PATCH 132/286] ci: Attempt 99 at fixing release notifications (#922) --- .github/workflows/discord-prerelease-notification.yml | 2 +- .github/workflows/release_dev.yml | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/.github/workflows/discord-prerelease-notification.yml b/.github/workflows/discord-prerelease-notification.yml index 622174b4ba..e7b9b46241 100644 --- a/.github/workflows/discord-prerelease-notification.yml +++ b/.github/workflows/discord-prerelease-notification.yml @@ -16,5 +16,5 @@ jobs: with: webhook_url: ${{ secrets.DISCORD_WEBHOOK_URL }} username: "GitHub Releases" - content: "@Development Builds" + content: "<@&1318332223232938014>" reduce_headings: true diff --git a/.github/workflows/release_dev.yml b/.github/workflows/release_dev.yml index 73847a78e8..ee56d705d8 100644 --- a/.github/workflows/release_dev.yml +++ b/.github/workflows/release_dev.yml @@ -211,14 +211,13 @@ jobs: - id: create_release name: Create a release and upload the build - uses: softprops/action-gh-release@v2 + uses: softprops/action-gh-release@v2.3.2 with: name: ${{ steps.prep_release_name.outputs.release_name }} + token: ${{ secrets.RELEASE_TOKEN_SECRET }} tag_name: ${{ needs.prepare_release.outputs.tag_name }} prerelease: true generate_release_notes: true make_latest: false files: | ./build_output/${{ needs.gamemaker_build.outputs.built_file }}/* - env: - GITHUB_TOKEN: ${{ secrets.RELEASE_TOKEN }} From 6f4da27be571ea404cc2e869d567b3be96d382db Mon Sep 17 00:00:00 2001 From: Nelsonh <81228864+OH296@users.noreply.github.com> Date: Tue, 15 Jul 2025 17:22:42 +0100 Subject: [PATCH 133/286] fix: gc system checking and better font setting (#923) --- ChapterMaster.yyp | 1 + objects/obj_controller/Alarm_5.gml | 218 +---------- objects/obj_controller/Create_0.gml | 8 +- objects/obj_garbage_collector/Step_0.gml | 7 +- objects/obj_popup/Create_0.gml | 6 +- objects/obj_popup/Draw_0.gml | 12 +- objects/obj_popup/Step_0.gml | 150 ++------ objects/obj_shop/Draw_0.gml | 28 +- objects/obj_turn_end/Alarm_1.gml | 1 + objects/obj_turn_end/Create_0.gml | 46 +-- options/mac/options_mac.yy | 2 +- scripts/scr_PlanetData/scr_PlanetData.gml | 51 ++- scripts/scr_add_artifact/scr_add_artifact.gml | 2 +- scripts/scr_audience/scr_audience.gml | 8 +- .../scr_chapter_master/scr_chapter_master.gml | 25 +- scripts/scr_cheatcode/scr_cheatcode.gml | 11 +- scripts/scr_demand/scr_demand.gml | 15 +- scripts/scr_dialogue/scr_dialogue.gml | 84 +++-- .../scr_diplomacy_helpers.gml | 53 ++- .../scr_draw_unit_stat_data.gml | 186 ++++----- scripts/scr_event_code/scr_event_code.gml | 352 ++++++++++++++++++ scripts/scr_event_code/scr_event_code.yy | 13 + .../scr_inquisition_fleet_functions.gml | 25 +- scripts/scr_load/scr_load.gml | 10 +- .../scr_load_controller.gml | 5 - .../scr_mechanicus_missions.gml | 4 +- .../scr_mission_reward/scr_mission_reward.gml | 3 +- scripts/scr_purge_world/scr_purge_world.gml | 6 +- scripts/scr_random_event/scr_random_event.gml | 213 ++++------- .../scr_save_controller.gml | 4 - scripts/scr_special_view/scr_special_view.gml | 1 - .../scr_struct_functions.gml | 12 + scripts/scr_trade/scr_trade.gml | 11 +- scripts/scr_trade_dep/scr_trade_dep.gml | 7 +- scripts/scr_ui_diplomacy/scr_ui_diplomacy.gml | 5 + scripts/scr_ui_manage/scr_ui_manage.gml | 2 + 36 files changed, 831 insertions(+), 756 deletions(-) create mode 100644 scripts/scr_event_code/scr_event_code.gml create mode 100644 scripts/scr_event_code/scr_event_code.yy diff --git a/ChapterMaster.yyp b/ChapterMaster.yyp index 5dcdc1b82d..2ee619c08b 100644 --- a/ChapterMaster.yyp +++ b/ChapterMaster.yyp @@ -806,6 +806,7 @@ {"id":{"name":"scr_enemy_ai_d","path":"scripts/scr_enemy_ai_d/scr_enemy_ai_d.yy",},}, {"id":{"name":"scr_enemy_ai_e","path":"scripts/scr_enemy_ai_e/scr_enemy_ai_e.yy",},}, {"id":{"name":"scr_equipment_struct","path":"scripts/scr_equipment_struct/scr_equipment_struct.yy",},}, + {"id":{"name":"scr_event_code","path":"scripts/scr_event_code/scr_event_code.yy",},}, {"id":{"name":"scr_event_dudes","path":"scripts/scr_event_dudes/scr_event_dudes.yy",},}, {"id":{"name":"scr_event_gossip","path":"scripts/scr_event_gossip/scr_event_gossip.yy",},}, {"id":{"name":"scr_event_log","path":"scripts/scr_event_log/scr_event_log.yy",},}, diff --git a/objects/obj_controller/Alarm_5.gml b/objects/obj_controller/Alarm_5.gml index cd5d0cf30b..77f8d6797a 100644 --- a/objects/obj_controller/Alarm_5.gml +++ b/objects/obj_controller/Alarm_5.gml @@ -450,220 +450,12 @@ with(obj_temp6){instance_destroy();} for(var i=1; i<=10; i++){ if (turns_ignored[i]==0) and (annoyed[i]>0) then annoyed[i]-=1; } -// ** Various checks for imperium and faction relations ** -for(var i=1; i<=99; i++){ - if (event[i]!="") and (event_duration[i]>0){ - event_duration[i]-=1; - if (event_duration[i]==0){ - - if (event[i]=="game_over_man"){ - obj_controller.alarm[8]=1; - } - // Removes planetary governor installed by the chapter - if (string_count("remove_serf",event[i])>0){ - explode_script(event[i],"|"); - var ta=string(explode[0]); - var star_name=string(explode[1]); - var planet=real(explode[2]); - var event_star = star_by_name(star_name); - if (event_star!="none"){ - event_star.dispo[planet]=-10;// Resets - var twix=$"Inquisition executes Chapter Serf in control of {star_name} {planet} and installs a new Planetary Governor."; - if (event_star.p_owner[planet]=eFACTION.Player) then event_star.p_owner[planet]=event_star.p_first[planet]; - scr_alert("","",twix,0,0); - scr_event_log("",twix, star_name); - } - } - // Changes relation to good - if (event[i]=="enemy_imperium"){ - scr_alert("green","enemy","You have made amends with your enemy in the Imperium.",0,0); - disposition[eFACTION.Imperium]+=20; - scr_event_log("","Amends made with Imperium."); - } - if (event[i]=="enemy_mechanicus"){ - scr_alert("green","enemy","You have made amends with your Mechanicus enemy.",0,0); - disposition[eFACTION.Mechanicus]+=20; - scr_event_log("","Amends made with Mechanicus enemy."); - } - if (event[i]=="enemy_inquisition"){ - scr_alert("green","enemy","You have made amends with your enemy in the Inquisition.",0,0); - disposition[eFACTION.Inquisition]+=20; - scr_event_log("","Amends made with Inquisition enemy."); - } - if (event[i]=="enemy_ecclesiarchy"){ - scr_alert("green","enemy","You have made amends with your enemy in the Ecclesiarchy.",0,0); - disposition[eFACTION.Ecclesiarchy]+=20; - scr_event_log("","Amends made with Ecclesiarchy enemy."); - } - // Sector commander losses its mind - if (event[i]=="imperium_daemon"){ - var alert_string = $"Sector Commander {faction_leader[eFACTION.Imperium]} has gone insane." - scr_alert("red","lol",alert_string,0,0); - faction_defeated[eFACTION.Imperium]=1; - scr_event_log("red",alert_string); - } - // Starts chaos invasion - if (event[i]=="chaos_invasion"){ - var xx=0,yy=0,flee=0,dirr=0; - var star_id = scr_random_find(1,true,"",""); - if(star_id != undefined){ - scr_event_log("purple","Chaos Fleets exit the warp near the "+string(star_id.name)+" system.", star_id.name); - for(var j=0; j<4; j++){ - dirr+=irandom_range(50,100); - xx=star_id.x+lengthdir_x(72,dirr); - yy=star_id.y+lengthdir_y(72,dirr); - flee=instance_create(xx,yy,obj_en_fleet); - flee.owner=eFACTION.Chaos; - flee.sprite_index=spr_fleet_chaos; - flee.image_index=4; - flee.capital_number=choose(0,1); - flee.frigate_number=choose(2,3); - flee.escort_number=choose(4,5,6); - flee.cargo_data.csm = true; - obj_controller.chaos_fleets+=1; - flee.action_x=star_id.x; - flee.action_y=star_id.y; - with(flee){ - set_fleet_movement(); - } - } - } - } - // Ships construction - if (string_count("new_",event[i])>0){ - var new_ship_event=event[i]; - var active_forges = []; - var chosen_star = false; - with(obj_star){ - if (owner==eFACTION.Mechanicus){ - for (i=1;i<=planets;i++){ - if (p_type[i]=="Forge") and (p_owner[i]==eFACTION.Mechanicus){ - array_push(active_forges,new PlanetData(i, self)); - } - } - } - } - if (array_length(active_forges)>0){ - var ship_spawn = active_forges[irandom(array_length(active_forges)-1)]; - var _new_player_fleet=instance_create(ship_spawn.system.x,ship_spawn.system.y,obj_p_fleet); - - // Creates the ship - var last_ship = new_player_ship(new_ship_event, ship_spawn.system.name); - - add_ship_to_fleet(last_ship, _new_player_fleet) - - // show_message(string(obj_ini.ship_class[last_ship])+":"+string(obj_ini.ship[last_ship])); - - if (obj_ini.ship_size[last_ship]!=1) then scr_popup("Ship Constructed",$"Your new {obj_ini.ship_class[last_ship]} '{obj_ini.ship[last_ship]}' has finished being constructed. It is orbiting {ship_spawn.system.name} and awaits its maiden voyage.","shipyard",""); - if (obj_ini.ship_size[last_ship]==1) then scr_popup("Ship Constructed",$"Your new {obj_ini.ship_class[last_ship]} Escort '{obj_ini.ship[last_ship]}' has finished being constructed. It is orbiting {ship_spawn.system.name} and awaits its maiden voyage.","shipyard",""); - var bob=instance_create(ship_spawn.system.x+16,ship_spawn.system.y-24,obj_star_event); - bob.image_alpha=1; - bob.image_speed=1; - } - if (array_length(active_forges)==0){ - event_duration[i]=2; - scr_popup("Ship Construction halted",$"A lack of suitable forge worlds in the system has halted construction of your requested ship","shipyard",""); - } - event[i]=""; - event_duration[i]-=1; - } - // Spare the inquisitor - if (string_count("inquisitor_spared",event[i])>0){ - var diceh=roll_dice_chapter(1, 100, "high"); - - if (diceh<=25){ - alarm[8]=1; - scr_loyalty("Crossing the Inquisition","+"); - } - if (diceh>25) and (diceh<=50){scr_loyalty("Crossing the Inquisition","+");} - if (diceh>50) and (diceh<=85){} - if (diceh>85) and (event[i]="inquisitor_spared2"){ - scr_popup("Anonymous Message","You recieve an anonymous letter of thanks. It mentions that motions are underway to destroy any local forces of Chaos.","",""); - with(obj_star){ - for(var o=1; o<=planets; o++){ - p_heresy[o]=max(0,p_heresy[o]-10); - } - } - } - } - - if (string_count("strange_building",event[i])>0){ - var b_event="",marine_name="",comp=0,marine_num=0,item="",unit; - explode_script(event[i],"|"); - b_event=string(explode[0]); - marine_name=string(explode[1]); - comp=real(explode[2]); - marine_num=real(explode[3]); - unit=obj_ini.TTRPG[comp][marine_num]; - item=string(explode[4]); - - var killy=0,tixt=string(obj_ini.role[100][16])+" "+string(marine_name)+" has finished his work- "; - - if (item=="Icon"){ - tixt+="it is a "+string(global.chapter_name)+" Icon wrought in metal, finely decorated. Pride for his chapter seems to have overtaken him. There are no corrections to be made and the item is placed where many may view it."; - } - if (item=="Statue"){ - tixt+="it is a small, finely crafted statue wrought in metal. The "+string(obj_ini.role[100][16])+" is scolded for the waste of material, but none daresay the quality of the piece."; - } - if (item=="Bike"){ - scr_add_item("Bike",1); - tixt+="it is a finely crafted Bike, conforming mostly to STC standards. The other "+string(obj_ini.role[100][16])+" are surprised at the rapid pace of his work."; - } - if (item=="Rhino"){ - scr_add_vehicle("Rhino",0,"Storm Bolter","Storm Bolter","","Artificer Hull","Dozer Blades"); - tixt+="it is a finely crafted Rhino, conforming to STC standards. The other "+string(obj_ini.role[100][16])+" are surprised at the rapid pace of his work."; - } - if (item=="Artifact"){ - var last_artifact=0; - scr_event_log("",string(obj_ini.role[100][16])+" "+string(marine_name)+" constructs an Artifact."); - if (obj_ini.fleet_type==ePlayerBase.home_world){ - last_artifact = scr_add_artifact("random_nodemon","",0,obj_ini.home_name,2); - } else { - if (obj_ini.fleet_type != ePlayerBase.home_world){ - last_artifact = scr_add_artifact("random_nodemon","",0,obj_ini.ship_location[0],501); - } - } - tixt+=$"some form of divine inspiration has seemed to have taken hold of him. An artifact {obj_ini.artifact[last_artifact]} has been crafted."; - } - if (item=="baby"){ - unit.edit_corruption(choose(8,12,16,20)) - tixt+="some form of horrendous statue. A weird amalgram of limbs and tentacles, the sheer atrocity of it is made worse by the tiny, baby-like form, the once natural shape of a human child twisted nearly beyond recognition."; - } - else if (item=="robot"){ - unit.edit_corruption(choose(2,4,6,8,10)); - tixt+=$"some form of small, box-like robot. It seems to teeter around haphazardly, nearly falling over with each step. {unit.name()} maintains that it has no AI, though the other "+string(obj_ini.role[100][16])+" express skepticism."; - unit.add_trait("tech_heretic"); - } - else if (item=="demon"){ - unit.edit_corruption(choose(8,12,16,20)); - tixt+="some form of horrendous statue. What was meant to be some sort of angel, or primarch, instead has a mishappen face that is hardly human in nature. Between the fetid, ragged feathers and empty sockets it is truly blasphemous."; - unit.add_trait("tech_heretic"); - } - else if (item=="fusion"){ - //TODO if tech heretic chosen don't kill the dude - // unit.corruption+=choose(70); - tixt+=$"some kind of ill-mannered ascension. One of your battle-brothers enters the armamentarium to find {marine_name} fused to a vehicle, his flesh twisted and submerged into the frame. Mechendrites and weapons fire upon the marine without warning, a windy scream eminating from the abomination. It takes several battle-brothers to take out what was once a "+string(obj_ini.role[100][16])+"."; - - // This is causing the problem - - scr_kill_unit(comp,marine_num) - with(obj_ini){scr_company_order(0);} - } - scr_popup("He Built It",tixt,"tech_build","target_marine|"+string(marine_name)+"|"+string(comp)+"|"+string(marine_num)+"|"); - } - if (event_duration[i]<=0) then event[i]=""; - } - } -} -for(var i=1; i<=99; i++){ - if (event[i]!="") and (event_duration[i]<=0) then event[i]=""; - if (event[i]=="") and (event_duration[i]==0) and (event[i+1]!=""){ - event[i]=event[i+1]; - event_duration[i]=event_duration[i+1]; - event[i+1]=""; - event_duration[i+1]=0; - } +// ** Various checks for imperium and faction relations ** +try{ + event_end_turn_action(); +} catch(_exception){ + handle_exception(_exception); } // Right here need to sort the battles within the obj_turn_end with(obj_turn_end){scr_battle_sort();} diff --git a/objects/obj_controller/Create_0.gml b/objects/obj_controller/Create_0.gml index d4c8877e2c..607bd8b277 100644 --- a/objects/obj_controller/Create_0.gml +++ b/objects/obj_controller/Create_0.gml @@ -685,11 +685,8 @@ for(var i=0; i<501; i++){ penit_co[i]=0; penit_id[i]=0; } - if (i<=100){ - event[i]=""; - event_duration[i]=0; - } } +event = []; // ship management arrays // they are used to display a paginated subset of ships // at a particular location for the load to ship screen. @@ -855,6 +852,8 @@ if (instance_exists(obj_ini)){ } if (is_test_map==true) then requisition=50000; +chapter_master = new scr_chapter_master(); + trade_attempt = false; // ** Sets income ** income=0; @@ -1214,6 +1213,7 @@ serialize = function(){ loyalty, spec_train_data, forge_queue: specialist_point_handler.forge_queue, + chapter_master_data : chapter_master } var excluded_from_save = ["temp", "serialize", "deserialize", "build_chaos_gods", "company_data","menu_buttons", diff --git a/objects/obj_garbage_collector/Step_0.gml b/objects/obj_garbage_collector/Step_0.gml index 6a18688bb5..4fc5949220 100644 --- a/objects/obj_garbage_collector/Step_0.gml +++ b/objects/obj_garbage_collector/Step_0.gml @@ -2,9 +2,10 @@ if (gc_timer > 0) { gc_timer -= 1; // show_debug_message($"obj_garbage_collector: gc_timer = {gc_timer}"); } else { - - - gc_timer = 50; // Default is every frame, so de-facto 1; + gc_timer = 50; + switch (os_type){ + case os_macosx: gc_timer = 10000 break; + } gc_collect(); wait_and_execute(0, function(){ diff --git a/objects/obj_popup/Create_0.gml b/objects/obj_popup/Create_0.gml index dc38e87263..1d7415884d 100644 --- a/objects/obj_popup/Create_0.gml +++ b/objects/obj_popup/Create_0.gml @@ -59,7 +59,11 @@ all_good=0; prev_selected = 0; new_target=0; - +function reset_popup_option(){ + option1 = ""; + option2 = ""; + option3 = ""; +} if (instance_exists(obj_controller)){obj_controller.cooldown=8000;} number=0; company_promote_data = [ diff --git a/objects/obj_popup/Draw_0.gml b/objects/obj_popup/Draw_0.gml index 03b5058c34..9bf161649c 100644 --- a/objects/obj_popup/Draw_0.gml +++ b/objects/obj_popup/Draw_0.gml @@ -146,14 +146,10 @@ try { case eFACTION.Imperium: if (is_daemon) { var v = 0, ev = 0; - for (var v = 1; v < array_length(obj_controller.event); v++) { - if (obj_controller.event[v] == "") { - ev = v; - break; - } - } - obj_controller.event[ev] = "imperium_daemon"; - obj_controller.event_duration[ev] = 1; + add_event({ + e_id : "imperium_daemon", + duration : 1, + }); with (obj_star) { for (var i = 1; i <= planets; i++) { if (p_owner[i] == 2) { diff --git a/objects/obj_popup/Step_0.gml b/objects/obj_popup/Step_0.gml index b03c3e04b1..3ec72fe3e9 100644 --- a/objects/obj_popup/Step_0.gml +++ b/objects/obj_popup/Step_0.gml @@ -499,9 +499,7 @@ try { } scr_event_log("", "Planetary Governor of " + string(new_target.name) + " " + scr_roman(planet) + " assassinated. The next in line takes over.", new_target.name); text = "The next in line for rule of " + string(new_target.name) + " " + scr_roman(planet) + " has taken over their rightful position of Planetary Governor."; - option1 = ""; - option2 = ""; - option3 = ""; + reset_popup_options(); with (obj_ground_mission) { instance_destroy(); } @@ -509,22 +507,9 @@ try { exit; } if (press == 2) { - new_target.dispo[planet] = 70 + floor(random_range(5, 15)) + 1; - scr_event_log("", "Planetary Governor of " + string(new_target.name) + " " + scr_roman(planet) + " assassinated. A more suitable Governor is installed."); - if (randa2 <= (10 * estimate)) { - for (var i = 0; i < array_length(obj_controller.event); i++) { - if (obj_controller.event[i] == "") { - var ev = i; - break; - } - } - obj_controller.event[ev] = "governor_assassination_1|" + string(new_target.name) + "|" + string(planet) + "|"; - obj_controller.event_duration[ev] = ((choose(1, 2, 3, 4, 5, 6) + choose(1, 2, 3, 4, 5, 6)) * 6) + choose(-3, -2, -1, 0, 1, 2, 3); - } - text = "Many of the successors for " + string(new_target.name) + " " + scr_roman(planet) + " are removed or otherwise made indisposed. Your chapter ensures that the new Planetary Governor is sympathetic to your plight and more than willing to heed your advice. A powerful new ally may be in the making."; - option1 = ""; - option2 = ""; - option3 = ""; + text = p_data.assasinate_governor(1, estimate); + + reset_popup_options(); with (obj_ground_mission) { instance_destroy(); } @@ -532,25 +517,8 @@ try { exit; } if (press == 3) { - new_target.dispo[planet] = 101; - scr_event_log("", "Planetary Governor of " + string(new_target.name) + " " + scr_roman(planet) + " assassinated. One of your Chapter Serfs take their position."); - if (randa2 <= (25 * estimate)) { - for (var i = 0; i < array_length(obj_controller.event); i++) { - if (obj_controller.event[i] == "") { - var ev = i; - break; - } - } - obj_controller.event[ev] = "governor_assassination_2|" + string(new_target.name) + "|" + string(planet) + "|"; - obj_controller.event_duration[ev] = (choose(1, 2) * 6) + choose(-3, -2, -1, 0, 1, 2, 3); - } - text = $"All of the successors for {planet_numeral_name(planet, new_target)} are removed or otherwise made indisposed. Paperwork is slightly altered. Rather than any sort of offical one of your Chapter Serfs is installed as the Planetary Governor. The planet is effectively under your control."; - if (new_target.p_first[planet] != 3) { - new_target.p_owner[planet] = 1; - } - option1 = ""; - option2 = ""; - option3 = ""; + text = p_data.assasinate_governor(2, estimate); + reset_popup_options(); with (obj_ground_mission) { instance_destroy(); } @@ -558,33 +526,12 @@ try { exit; } } - /* - var he;he=instance_create(argument0.x,argument0.y,obj_temp6); - var pip;pip=instance_create(0,0,obj_popup); - pip.title="Planetary Governor Assassinated"; - pip.text=txt; - - pip.option1="Allow the official successor to become Planetary Governor."; - pip.option2="Ensure that a sympathetic successor will be the one to rule."; - pip.option3="Remove all successors and install a loyal Chapter Serf."; - - // Result- this is the multiplier for the chance of discovery with the inquisition, can also be used to determine - // the new Governor disposition if they are the official successor - if (aroll<=chance){// Discovered - pip.estimate=2; - } - if (aroll>chance){// Success - pip.estimate=1; - } - */ if (image == "ruins_fort") { if ((press == 1) && (obj_controller.requisition >= 1000)) { obj_controller.requisition -= 1000; text = "Resources have been spent on the planet to restore the fortress. The planet's defense rating has increased to 5 ("; - option1 = ""; - option2 = ""; - option3 = ""; + reset_popup_options(); text += string(star_system.p_fortified[planet]) + "+"; text += string(5 - star_system.p_fortified[planet]) + ")"; star_system.p_fortified[planet] = max(star_system.p_fortified[planet], 5); @@ -595,9 +542,7 @@ try { var req = floor(random_range(200, 500)) + 1; image = ""; text = "Much of the fortress is demolished in order to salvage adamantium and raw materials. The opration has yielded " + string(req) + " requisition."; - option1 = ""; - option2 = ""; - option3 = ""; + reset_popup_options(); obj_controller.requisition += req; cooldown = 15; exit; @@ -622,9 +567,7 @@ try { if (press == 1) { image = ""; text = string(estimate) + " gene-seed has been added to the chapter vaults."; - option1 = ""; - option2 = ""; - option3 = ""; + reset_popup_options(); obj_controller.gene_seed += estimate; with (obj_ground_mission) { instance_destroy(); @@ -637,9 +580,7 @@ try { req = floor(random_range(200, 500)) + 1; image = ""; text = "Technological components have been salvaged, granting " + string(req) + " requisition."; - option1 = ""; - option2 = ""; - option3 = ""; + reset_popup_options(); obj_controller.requisition += req; with (obj_ground_mission) { instance_destroy(); @@ -907,9 +848,7 @@ try { title = "Inquisition Mission Completed"; image = "exploding_ship"; text = "The Inquisitor's ship begans to bank and turn, to flee, but is immediately fired upon by your fleet. The ship explodes, taking the Inquisitor with it. The mission has been accomplished."; - option1 = ""; - option2 = ""; - option3 = ""; + reset_popup_options(); scr_event_log("", "Inquisition Mission Completed: The radical Inquisitor has been purged."); @@ -1366,22 +1305,15 @@ try { instance_destroy(); } } - if (obj_ini.fleet_type != ePlayerBase.home_world) { - var last_artifact = scr_add_artifact("random", "", 4, obj_ini.ship[0], 501); - } - if (obj_ini.fleet_type == ePlayerBase.home_world) { - var last_artifact = scr_add_artifact("random", "", 4, obj_ini.home_name, 2); - } - option1 = ""; - option2 = ""; - option3 = ""; + + var last_artifact = scr_add_artifact("random", "", 4); + + reset_popup_options(); title = "Inquisition Mission Completed"; text = "Your ship sends over a boarding party, who retrieve the offered artifact- "; text += $" some form of {obj_ini.artifact[last_artifact]}. Once it is safely stowed away your ship is then ordered to fire. The Inquisitor's own seems to hesitate an instant before banking away, but is quickly destroyed."; image = "exploding_ship"; - option1 = ""; - option2 = ""; - option3 = ""; + reset_popup_options(); scr_event_log("", "Artifact recovered from radical Inquisitor."); scr_event_log("", "Inquisition Mission Completed: The radical Inquisitor has been purged."); exit; @@ -1389,9 +1321,7 @@ try { if (title == "He Built It") { obj_ini.god[ma_co, ma_id] += 10; - option1 = ""; - option2 = ""; - option3 = ""; + reset_popup_options(); } if (title == "Mercy Plea") { @@ -1543,33 +1473,22 @@ try { action = ""; } } - if (obj_ini.fleet_type != ePlayerBase.home_world) { - var last_artifact = scr_add_artifact("random", "", 4, obj_ini.ship[0], 501); - } - if (obj_ini.fleet_type == ePlayerBase.home_world) { - var last_artifact = scr_add_artifact("random", "", 4, obj_ini.home_name, 2); - } - option1 = ""; - option2 = ""; - option3 = ""; + var last_artifact = scr_add_artifact("random", "", 4); + + reset_popup_options(); title = "Inquisition Mission Completed"; text = "Your ship sends over a boarding party, who retrieve the offered artifact- "; text += $" some form of {obj_ini.artifact[last_artifact]}. As promised {global.chapter_name} allow the Inquisitor to leave, hoping for the best. What's the worst that could happen?"; image = "artifact_recovered"; - option1 = ""; - option2 = ""; - option3 = ""; + reset_popup_options(); scr_event_log("", "Artifact Recovered from radical Inquisitor."); scr_event_log("", "Inquisition Mission Completed: The radical Inquisitor has been purged."); - for (var i = 0; i < array_length(obj_controller.event); i++) { - if (obj_controller.event[i] == "") { - var ev = i; - break; - } - } - obj_controller.event[ev] = "inquisitor_spared1"; - obj_controller.event_duration[ev] = floor(random_range(6, 18)) + 1; + add_event({ + e_id : "inquisitor_spared", + duration : irandom_range(6, 18) + 1, + variation : 1, + }) exit; } @@ -1587,20 +1506,15 @@ try { title = "Inquisition Mission Completed"; text = $"{global.chapter_name} allow the Inquisitor to leave, trusting in their words. If they truly do have key information it is a risk {global.chapter_name} are willing to take. What's the worst that could happen?"; image = "artifact_recovered"; - option1 = ""; - option2 = ""; - option3 = ""; + reset_popup_options(); scr_event_log("", "Inquisition Mission Completed?: The radical Inquisitor has been allowed to flee in order to weaken the forces of Chaos, as they promised."); - for (var i = 0; i < array_length(obj_controller.event); i++) { - if (obj_controller.event[i] == "") { - var ev = i; - break; - } - } - obj_controller.event[ev] = "inquisitor_spared2"; - obj_controller.event_duration[ev] = floor(random_range(6, 18)) + 1; + add_event({ + e_id : "inquisitor_spared", + duration : irandom_range(6, 18) + 1, + variation : 2, + }) exit; } else if (image == "artifact") { diff --git a/objects/obj_shop/Draw_0.gml b/objects/obj_shop/Draw_0.gml index c8c75697da..3840468af6 100644 --- a/objects/obj_shop/Draw_0.gml +++ b/objects/obj_shop/Draw_0.gml @@ -134,7 +134,7 @@ slate_panel.inside_method = function(){ array_push(obj_controller.specialist_point_handler.forge_queue, new_queue_item); } } - }else if (nobuy[i]=0) && clicked && (!obj_controller.in_forge){ + } else if (nobuy[i]=0 && clicked && !obj_controller.in_forge){ cost=item_cost[i]; if (keyboard_check(vk_shift)) and (shop!="warships") then cost=item_cost[i]*5; if (obj_controller.requisition>=cost) and (shop!="warships"){ @@ -155,18 +155,20 @@ slate_panel.inside_method = function(){ } if (obj_controller.requisition>=cost) and (shop="warships"){ - var v=0,ev=0; - repeat(99){v+=1;if (ev=0) and (obj_controller.event[v]="") then ev=v;} - obj_controller.event[ev]="new_"+string(item[i]); - if (item[i]="Battle Barge") then obj_controller.event_duration[ev]=12; - if (item[i]="Strike Cruiser") then obj_controller.event_duration[ev]=4; - if (item[i]="Gladius") then obj_controller.event_duration[ev]=1; - if (item[i]="Hunter") then obj_controller.event_duration[ev]=1; - obj_controller.event_duration[ev]+=choose(0,0,1); - eta=obj_controller.event_duration[ev]; + var _duration = 4; + if (item[i]="Battle Barge") then _duration=30; + if (item[i]="Strike Cruiser") then _duration=10; - construction_started=120;obj_controller.requisition-=cost; + eta = _duration; + + construction_started=120; + obj_controller.requisition-=cost; + add_event({ + e_id : "ship_construction", + ship_class : item[i], + duration : _duration, + }) } obj_controller.cooldown=8000; @@ -175,9 +177,9 @@ slate_panel.inside_method = function(){ if (!obj_controller.in_forge && nobuy[i]=1) || (obj_controller.in_forge && forge_cost[i]=0){ draw_set_alpha(1); draw_set_color(881503); - draw_text(xx+x2+x_mod[i],yy+y2,string_hash_to_newline(item[i]));// Name + draw_text(xx+x2+x_mod[i],yy+y2,item[i]);// Name if (item_stocked[i]=0) then draw_set_alpha(0.5); - draw_text(xx+1300,yy+y2,string_hash_to_newline(item_stocked[i]));// Stocked + draw_text(xx+1300,yy+y2,item_stocked[i]);// Stocked draw_set_alpha(1); } if (mouse_x>=xx+962) and (mouse_y>=yy+y2) and (mouse_x0) and (dispo[o]<90){ - dispo[o]=max(dispo[o]-2,0); - } - } - } - obj_controller.disposition[2]-=7; - obj_controller.disposition[4]-=10; - obj_controller.disposition[5]-=4; - if (obj_controller.disposition[4]<=0) or (obj_controller.disposition[2]<=0){ - obj_controller.alarm[8]=1; - } - if (obj_controller.disposition[4]>0) and (obj_controller.disposition[2]>0){ - var top=string_replace(obj_controller.event[i],"governor_assassination_1","assassination_angryish"); - scr_audience(4,top,0,"",0,0); - } - } - if (string_count("governor_assassination_2",obj_controller.event[i])>0) and (obj_controller.faction_status[eFACTION.Inquisition]!="War"){ - with(obj_star){ - var o=0; - repeat(4){ - o+=1; - if (dispo[o]>0) and (dispo[o]<90){ - dispo[o]=max(dispo[o]-4,0); - } - } - } - obj_controller.disposition[2]-=15;obj_controller.disposition[4]-=30;obj_controller.disposition[5]-=10; - if (obj_controller.disposition[4]<=0) or (obj_controller.disposition[2]<=0) then obj_controller.alarm[8]=1; - if (obj_controller.disposition[4]>0) and (obj_controller.disposition[2]>0){ - var top=string_replace(obj_controller.event[i],"governor_assassination_2","assassination_angry"); - scr_audience(4,top,0,"",0,0); - } - } - } -}i=0; - - - +handle_discovered_governor_assasinations() if (audiences>0){// This is a one-off change all messages to declare war diff --git a/options/mac/options_mac.yy b/options/mac/options_mac.yy index b94080f074..25bf1f933a 100644 --- a/options/mac/options_mac.yy +++ b/options/mac/options_mac.yy @@ -25,7 +25,7 @@ "option_mac_output_dir":"~/gamemakerstudio2", "option_mac_resize_window":true, "option_mac_scale":0, - "option_mac_signing_identity":"", + "option_mac_signing_identity":"DD 43 55 BA D2 D6 29 A4 A2 2E 7A 9B 34 E7 E4 02 1A 8F 19 95 5B FF 94 CC 26 E8 EB 58 FF 20 60 61", "option_mac_splash_png":"${options_dir}/mac/splash/splash.png", "option_mac_start_fullscreen":false, "option_mac_team_id":"", diff --git a/scripts/scr_PlanetData/scr_PlanetData.gml b/scripts/scr_PlanetData/scr_PlanetData.gml index 54ae324feb..11dd810062 100644 --- a/scripts/scr_PlanetData/scr_PlanetData.gml +++ b/scripts/scr_PlanetData/scr_PlanetData.gml @@ -58,13 +58,16 @@ function PlanetData(planet, system) constructor{ new_colony_fleet(system, planet, target, targ_planet, type); } + static set_new_owner = function(new_owner){ + system.p_owner[planet] = new_owner; + current_owner = new_owner; + } static return_to_first_owner = function(allow_player = false){ if (!allow_player && origional_owner == eFACTION.Player){ - system.p_owner[planet]= eFACTION.Imperium; + set_new_owner(eFACTION.Imperium); } else { - system.p_owner[planet] = origional_owner; + set_new_owner(origional_owner); } - current_owner = origional_owner; } static add_disposition = function(alteration){ @@ -160,6 +163,44 @@ function PlanetData(planet, system) constructor{ } } + + + static assasinate_governor = function(assaination_type, discovery_modifier){ + var randa = roll_dice_chapter(1, 100, "high"); + var randa2 = roll_dice(1, 100); + + //type 1 is install a sympathectic else it's a straight serf installation + if (assaination_type == 1){ + var _discovery_rate = 10; + set_player_disposition(70 + floor(random_range(5, 15)) + 1); + var _text = $"Many of the successors for {name()} are removed or otherwise made indisposed. Your chapter ensures that the new Planetary Governor is sympathetic to your plight and more than willing to heed your advice. A powerful new ally may be in the making."; + scr_event_log("", $"Planetary Governor of {name()} assassinated. A more suitable Governor is installed."); + } else { + var _discovery_rate = 25; + if (origional_owner != 3) { + set_new_owner(eFACTION.Player); + } + set_player_disposition(101); + scr_event_log("", $"Planetary Governor of {name()} assassinated. One of your Chapter Serfs take their position."); + var _text = $"All of the successors for {name()} are removed or otherwise made indisposed. Paperwork is slightly altered. Rather than any sort of offical one of your Chapter Serfs is installed as the Planetary Governor. The planet is effectively under your control."; + } + + if (randa2 <= (_discovery_rate * discovery_modifier)) { + if (assaination_type == 1){ + var _duration = ((choose(1, 2, 3, 4, 5, 6) + choose(1, 2, 3, 4, 5, 6)) * 6) + choose(-3, -2, -1, 0, 1, 2, 3); + } else { + var _duration = (choose(1, 2) * 6) + choose(-3, -2, -1, 0, 1, 2, 3); + } + add_event({ + duration : _duration, + e_id : "governor_assassination", + variant : assaination_type, + system : system.name, + planet : planet, + }); + } + return _text; + } static grow_ork_forces = function(){ var contin=0; var rando=roll_dice(1,100);// This part handles the spreading @@ -762,7 +803,9 @@ function PlanetData(planet, system) constructor{ } if (player_disposition<=-3000) then draw_text(xx+534,yy+176,"Disposition: N/A"); - } else if (_succession=1) then draw_text(xx+534,yy+176,"War of _Succession"); + } else if (_succession){ + draw_text(xx+534,yy+176,"War of _Succession"); + } draw_set_color(c_gray); // End draw disposition draw_set_color(c_gray); diff --git a/scripts/scr_add_artifact/scr_add_artifact.gml b/scripts/scr_add_artifact/scr_add_artifact.gml index 4ccb449881..3f1e069862 100644 --- a/scripts/scr_add_artifact/scr_add_artifact.gml +++ b/scripts/scr_add_artifact/scr_add_artifact.gml @@ -12,7 +12,7 @@ function find_open_artifact_slot() { return last_artifact; } -function scr_add_artifact(artifact_type, artifact_tags, is_identified, artifact_location, ship_id) { +function scr_add_artifact(artifact_type="random", artifact_tags="", is_identified=4, artifact_location = "", ship_id) { last_artifact = find_open_artifact_slot(); if (last_artifact == -1) { exit; diff --git a/scripts/scr_audience/scr_audience.gml b/scripts/scr_audience/scr_audience.gml index 149dcc5ed8..ba561217bc 100644 --- a/scripts/scr_audience/scr_audience.gml +++ b/scripts/scr_audience/scr_audience.gml @@ -1,10 +1,14 @@ -function scr_audience(faction_enum, topic, new_disposition = 0, new_status = "", turns_ignored = 0, new_known_value = 0) { +function scr_audience(faction_enum, topic, new_disposition = 0, new_status = "", turns_ignored = 0, new_known_value = 0, audience_data = {}) { var _audience_instance = instance_exists(obj_turn_end) ? obj_turn_end : obj_controller; with (_audience_instance){ audiences+=1; - array_push(audience_stack,{faction : faction_enum,topic : topic}); + array_push(audience_stack,{ + faction : faction_enum, + topic : topic, + audience_data : audience_data + }); } obj_controller.disposition[faction_enum]+=new_disposition; diff --git a/scripts/scr_chapter_master/scr_chapter_master.gml b/scripts/scr_chapter_master/scr_chapter_master.gml index 4a73da70a7..ec28e3ba4a 100644 --- a/scripts/scr_chapter_master/scr_chapter_master.gml +++ b/scripts/scr_chapter_master/scr_chapter_master.gml @@ -1,10 +1,31 @@ -function scr_chapter_master(){ +function scr_chapter_master() constructor{ favours = { - faction_leaders : array_create(15, []), + faction_leaders : array_create(15, 0), minor_characters : {}, } static get_struct = function(){ return fetch_unit([0,0]); } +} + +function cm_obj(){ + return obj_controller.chapter_master; +} + +function has_faction_favour(diplomacy_faction){ + return (cm_obj().favours.faction_leaders[diplomacy_faction] > 0); +} + +function get_faction_favour(diplomacy_faction){ + + return cm_obj().favours.faction_leaders[diplomacy_faction]; +} + +function edit_faction_favour(diplomacy_faction,edit_val){ + with (cm_obj().favours){ + var _val = faction_leaders[diplomacy_faction]; + faction_leaders[diplomacy_faction] = clamp(_val+edit_val, 0, 100000); + return faction_leaders[diplomacy_faction]; + } } \ No newline at end of file diff --git a/scripts/scr_cheatcode/scr_cheatcode.gml b/scripts/scr_cheatcode/scr_cheatcode.gml index a063a9ff70..bff887ff76 100644 --- a/scripts/scr_cheatcode/scr_cheatcode.gml +++ b/scripts/scr_cheatcode/scr_cheatcode.gml @@ -222,11 +222,20 @@ function scr_cheatcode(argument0) { create_starship_event(); } else if (cheat_arguments[0] == "fallen"){ event_fallen(); + }else if (cheat_arguments[0] == "surfremove"){ + var _star_id = scr_random_find(0,true,"",""); + add_event({ + duration : 2, + e_id : "governor_assassination", + variant : 2, + system : _star_id.name, + planet : irandom_range(1, _star_id.planets), + }); } else { with (obj_controller) { scr_random_event(false); } - } + } break; case "infreq": if (global.cheat_req == 0) { diff --git a/scripts/scr_demand/scr_demand.gml b/scripts/scr_demand/scr_demand.gml index 1824c232e8..d29b5d1448 100644 --- a/scripts/scr_demand/scr_demand.gml +++ b/scripts/scr_demand/scr_demand.gml @@ -1,6 +1,6 @@ function threat_plausibility(){ var _threat = 20; - var _good_imperium_position = diplomacy[eFACTION.Imperium] > 50 ? 1 : -1; + var _good_imperium_position = disposition[eFACTION.Imperium] > 50 ? 1 : -1; var _relative_strength = floor(obj_controller/20); var _nature = ""; } @@ -40,7 +40,7 @@ function inquis_demand_inspection_pass(){ diplo_text = "Very well Chapter Master I Your service to the imperium is well known i have no doubt that you would not ask such of me without good reasoon. I shall forgoe my normal duties just this onece. \n do not becomne complacent Chapter Master i may not always be so generous"; } else { var _diff = resistance - rull; - diplomacy[eFACTION.Inquisition] -= 1; + alter_disposition(eFACTION.Inquisition, -1); diplo_text = "Consider your request denied. If there is heresy or any wrong doing i shal see that is rooted out and made plain for all to see";; } @@ -198,8 +198,15 @@ function scr_demand(demand_type) { } if (demand_type=2){// Crusade rull=floor(random(10))+1; - if (rull>resistance){obj_controller.liscensing=2;worked=true;if (disposition[7]>=40) then no_penalty=true;} - if (rull<=resistance){worked=false;} + if (rull>resistance){ + obj_controller.liscensing=2;worked=true; + if (disposition[7]>=40){ + no_penalty=true; + } + } + if (rull<=resistance){ + worked=false; + } } } diff --git a/scripts/scr_dialogue/scr_dialogue.gml b/scripts/scr_dialogue/scr_dialogue.gml index 6e226eb741..84c18c3928 100644 --- a/scripts/scr_dialogue/scr_dialogue.gml +++ b/scripts/scr_dialogue/scr_dialogue.gml @@ -998,17 +998,16 @@ function scr_dialogue(diplo_keyphrase) { goto:"disagree" }); } - if (string_count("assassination_angryish",diplo_keyphrase)>0){ - var ta="",tb="",tc=""; - explode_script(diplo_keyphrase,"|"); - ta=string(explode[0]); - tb=string(explode[1]); - tc=real(explode[2]); - + if (diplo_keyphrase == "assassination_angryish"){ + + var _event = audience_data; rando=choose(1,2,3); - if (rando==1) then diplo_text="Several sources indicate that you have killed the Planetary Governor of "+string(tb)+" "+scr_roman(tc)+" and went on to meddle with the succession. Such subterfuge will not be tolerated, Chapter Master."; - if (rando==2) then diplo_text="I have received word that you have killed the Planetary Governor of "+string(tb)+" "+scr_roman(tc)+" and placed a fool in power. Your attempts to control this sector, and seemingly emulate the Ultramarines, have not gone unnoticed. Do not think this will go unpunished."; - if (rando==3) then diplo_text="What do you think you are doing, Chapter Master? Killing a Planetary Governor? Replacing them with one of your tools? Inquisitor Lord "+string(faction_leader[eFACTION.Inquisition])+" will hear of this madness."; + var _assasin_place = planet_numeral_name(_event.planet, _event.system); + if (rando==1) then diplo_text=$"Several sources indicate that you have killed the Planetary Governor of {_assasin_place} and went on to meddle with the succession. Such subterfuge will not be tolerated, Chapter Master."; + if (rando==2) then diplo_text=$"I have received word that you have killed the Planetary Governor of {_assasin_place} and placed a fool in power. Your attempts to control this sector, and seemingly emulate the Ultramarines, have not gone unnoticed. Do not think this will go unpunished."; + if (rando==3) then diplo_text=$"What do you think you are doing, Chapter Master? Killing a Planetary Governor? Replacing them with one of your tools? Inquisitor Lord {faction_leader[eFACTION.Inquisition]} will hear of this madness."; + array_delete(obj_controller.event, _event_index, 1); + } } // ** Mechanicus ** @@ -1475,16 +1474,15 @@ function scr_dialogue(diplo_keyphrase) { if (rando==1) then diplo_text="It seems that congratulations are in order. While some might think the Inquisition blind to the possibility that it, that is to say we, could ever do wrong, it is not so. I know that we are as fallible as any man, save the Emperor, and can make mistakes when judging character. I took you for a traitor to humanity's cause. I see that I was wrong now and let it not be said I will not give credit where it is due; well done, Chapter Master. May the enemies of mankind speak your name in fear and humanity in adoration."; if (rando==2) then diplo_text="Few return from a penitent crusade, Chapter Master, and I find that those who do are invariably changed by the experience. Tell me, do you feel your vision expanded? Your faults exposed and then erased by his glorious light? I do not doubt that you do. To battle the Emperor's enemies without any thought of pause or relief is the highest form of honour, the highest form of service. You are to be congratulated on your diligence and dedication, not to mention your skill at arms."; } - if (string_count("assassination_angry",diplo_keyphrase)>0){ + if (diplo_keyphrase == "assassination_angry"){ // aa|planet_name|planet number| - var ta="",tb="",tc=""; - explode_script(diplo_keyphrase,"|"); - ta=string(explode[0]); - tb=string(explode[1]); - tc=real(explode[2]); - obj_controller.temp[1008]=string(tb)+"|"+string(tc)+"|"; - - diplo_text="My patience is wearing thin, Chapter Master. I have many more problems more urgent and, yet, you continue to force me away from the work assigned to me by He on Terra. Your serf on "+string(tb)+" "+scr_roman(tc)+" will be executed along with all the other puppets I ferret out. You are close to treason, Chapter Master. Choose your next words with exceptional care for they may be your last."; + + + var _event = audience_data; + var _system = _event.system; + var _planet = _event.planet; + var _star_name = planet_numeral_name(_planet, star_by_name(_system)) + diplo_text=$"My patience is wearing thin, Chapter Master. I have many more problems more urgent and, yet, you continue to force me away from the work assigned to me by He on Terra. Your serf on {_star_name} will be executed along with all the other puppets I ferret out. You are close to treason, Chapter Master. Choose your next words with exceptional care for they may be your last."; add_diplomacy_option({ option_text:"It will not happen again", @@ -1492,7 +1490,12 @@ function scr_dialogue(diplo_keyphrase) { method : function(){ scr_dialogue("you_better"); force_goodbye=1; - hunt_player_serfs(); + hunt_player_serfs(audience_data.planet, audience_data.system); + alter_dispositions([ + [eFACTION.Imperium, -15], + [eFACTION.Inquisition, -30], + [eFACTION.Ecclesiarchy, -10], + ]); exit; } }); @@ -1500,23 +1503,39 @@ function scr_dialogue(diplo_keyphrase) { option_text:"Very well", key : "serf_removal_accept", method : function(){ - clear_diplo_choices(); force_goodbye=1; - hunt_player_serfs(); - cooldown=8; - diplomacy=0; - menu=0; - obj_turn_end.alarm[1]=1; - audience=0; - force_goodbye=0; + hunt_player_serfs(audience_data.planet, audience_data.system); + + alter_dispositions([ + [eFACTION.Imperium, -15], + [eFACTION.Inquisition, -30], + [eFACTION.Ecclesiarchy, -10], + ]); exit; } }); + + if (obj_controller.disposition[eFACTION.Inquisition] >= 70){ + add_diplomacy_option({ + option_text:"Perhaps We can come to an arrangement", + tooltip : "This action will trigger a Charisma test", + method : function(){ + + } + }); + } add_diplomacy_option({ - option_text:$"You will not. {tb} is MINE!", + option_text:$"You will not. {_star_name} is MINE!", key : "serf_removal_defy", force_goodbye : 1, + method : function(){ + alter_dispositions([ + [eFACTION.Imperium, -30], + [eFACTION.Inquisition, -60], + [eFACTION.Ecclesiarchy, -30], + ]); + }, goto : "die_heretic", }); } @@ -1533,9 +1552,10 @@ function scr_dialogue(diplo_keyphrase) { if (obj_ini.fleet_type != ePlayerBase.home_world) then diplo_text="I am mobilizing the Segmentum battlefleet. You may run, heretic, but it will do you no good."; } var ev=0; - for(var v=1; v<=99; v++){if (ev=0) and (event[v]="") then ev=v;} - event[ev]="game_over_man"; - event_duration[ev]=1; + add_event({ + e_id : "game_over_man", + duration : 1, + }) } rando=choose(1,2,3); if (diplo_keyphrase=="chaos_audience1"){ diff --git a/scripts/scr_diplomacy_helpers/scr_diplomacy_helpers.gml b/scripts/scr_diplomacy_helpers/scr_diplomacy_helpers.gml index 50f5273dc1..e417726fd0 100644 --- a/scripts/scr_diplomacy_helpers/scr_diplomacy_helpers.gml +++ b/scripts/scr_diplomacy_helpers/scr_diplomacy_helpers.gml @@ -24,6 +24,15 @@ function relationship_hostility_matrix(faction){ return _rela; } +function alter_disposition(faction, alter_value){ + obj_controller.disposition[faction] = clamp(obj_controller.disposition[faction]+alter_value, -100, 100); +} + +function alter_dispositions(alterations){ + for (var i=0;i530) then sw-=0.05; - } - if (string_width(string_hash_to_newline(_opt.option_text))*sw<=530) and (sw=1){ - draw_text_transformed(xx+620,yy+696,string_hash_to_newline(_opt.option_text),sw,sw,0); - draw_text_transformed(xx+620,yy+696+2,string_hash_to_newline(_opt.option_text),sw,sw,0); - } - if (string_width(string_hash_to_newline(_opt.option_text))*sw>530){ - draw_text_ext_transformed(xx+620,yy+696-4,string_hash_to_newline(_opt.option_text),16,530/sw,sw,sw,0); - } - if scr_hit(left,top,right,base){ - draw_set_alpha(0.2); - draw_rectangle(left,top,right,base,0); - draw_set_alpha(1); - } - opt = [left,top,right,base]; - array_push(option_selections,opt); - if (point_and_click(opt)){ + if (_opt.draw()){ diplo_pressed = slot; } - opt_cord+=1; + yy+=30; } @@ -115,14 +106,14 @@ function basic_diplomacy_screen(){ if (menu==MENU.Diplomacy) and (diplomacy==10.1){ scr_emmisary_diplomacy_routes(); } - if (force_goodbye=1){ + /*if (force_goodbye=1){ draw_rectangle(xx+818,yy+796,xx+897,yy+815,0); draw_set_color(0); draw_text(xx+857.5,yy+797,"Exit"); draw_set_alpha(0.2); if (mouse_x>=xx+818) and (mouse_y>=yy+796) and (mouse_x<=xx+897) and (mouse_y<=yy+815) then draw_rectangle(xx+818,yy+796,xx+897,yy+815,0); draw_set_alpha(1); - } + }*/ } } diff --git a/scripts/scr_draw_unit_stat_data/scr_draw_unit_stat_data.gml b/scripts/scr_draw_unit_stat_data/scr_draw_unit_stat_data.gml index 8c40711179..0654b377f6 100644 --- a/scripts/scr_draw_unit_stat_data/scr_draw_unit_stat_data.gml +++ b/scripts/scr_draw_unit_stat_data/scr_draw_unit_stat_data.gml @@ -6,6 +6,8 @@ function scr_draw_unit_stat_data(manage=false, data_block = { w: 569, h: 303, }, squeezed = false){ + var _cur_font = draw_get_font(); + draw_set_font(fnt_40k_14); if (event_number==ev_gui){ xx=0; yy=0; @@ -212,109 +214,111 @@ function scr_draw_unit_stat_data(manage=false, data_block = { draw_set_valign(fa_top); draw_set_color(#50a076); - if (!obj_controller.view_squad && obj_controller.unit_bio){ - var unit_data_string = unit_profile_text(); - tooltip_draw(unit_data_string, 925, [xx+23,yy+141],,,,,true); - } + if (!obj_controller.view_squad && obj_controller.unit_bio){ + var unit_data_string = unit_profile_text(); + tooltip_draw(unit_data_string, 925, [xx+23,yy+141],,,,,true); + } - var data_lines = []; - var data_entry = {}; - data_entry.text = $"Loyalty: {loyalty}\n"; - data_entry.tooltip = "Loyalty represents the unwavering devotion to one's Chapter, their Primarch, and the Emperor himself. It is a measure of their ability to resist the temptations of Chaos, the influence of xenos artifacts, and the machinations of the Warp."; - array_push(data_lines, data_entry); - - data_entry = {}; - data_entry.text = $"Corruption: {corruption}\n"; - data_entry.tooltip = "Corruption reflects exposure to the malevolent forces of the Warp. High Corruption may indicate that the person is teetering on the brink of damnation, while a low score suggests relative purity."; - array_push(data_lines, data_entry); - - data_entry = {}; - data_entry.text = $"Assignment: {_psionic_assignment} ({psionic})\n"; - data_entry.tooltip = "The Imperium measures and records the psionic activity and power level of psychic individuals through a rating system called The Assignment. Comprised of a twenty-four point scale, The Assignment simplifies the comparison of psykers to aid Imperial authorities in recognizing possible threats."; - array_push(data_lines, data_entry); - - var forge_gen = forge_point_generation(); + var data_lines = []; + var data_entry = {}; + data_entry.text = $"Loyalty: {loyalty}\n"; + data_entry.tooltip = "Loyalty represents the unwavering devotion to one's Chapter, their Primarch, and the Emperor himself. It is a measure of their ability to resist the temptations of Chaos, the influence of xenos artifacts, and the machinations of the Warp."; + array_push(data_lines, data_entry); + + data_entry = {}; + data_entry.text = $"Corruption: {corruption}\n"; + data_entry.tooltip = "Corruption reflects exposure to the malevolent forces of the Warp. High Corruption may indicate that the person is teetering on the brink of damnation, while a low score suggests relative purity."; + array_push(data_lines, data_entry); + + data_entry = {}; + data_entry.text = $"Assignment: {_psionic_assignment} ({psionic})\n"; + data_entry.tooltip = "The Imperium measures and records the psionic activity and power level of psychic individuals through a rating system called The Assignment. Comprised of a twenty-four point scale, The Assignment simplifies the comparison of psykers to aid Imperial authorities in recognizing possible threats."; + array_push(data_lines, data_entry); + + var forge_gen = forge_point_generation(); - data_entry = {}; - data_entry.tooltip=""; - var gen_reasons = forge_gen[1]; - data_entry.text = $"Forge Production: {forge_gen[0]}\n"; - if (struct_exists(gen_reasons, "trained")){ - data_entry.tooltip+=$"Trained On Mars (TEC/10): {gen_reasons.trained}\n"; - if (struct_exists(gen_reasons, "at_forge")){ - data_entry.tooltip+=$"{gen_reasons.at_forge}(at Forge)\n"; - } + data_entry = {}; + data_entry.tooltip=""; + var gen_reasons = forge_gen[1]; + data_entry.text = $"Forge Production: {forge_gen[0]}\n"; + if (struct_exists(gen_reasons, "trained")){ + data_entry.tooltip+=$"Trained On Mars (TEC/10): {gen_reasons.trained}\n"; + if (struct_exists(gen_reasons, "at_forge")){ + data_entry.tooltip+=$"{gen_reasons.at_forge}(at Forge)\n"; } - if (struct_exists(gen_reasons, "master")){ - data_entry.tooltip+=$"Forge Master: +{gen_reasons.master}\n"; - } - if (struct_exists(gen_reasons, "crafter")){ - data_entry.tooltip+=$"Crafter: +{gen_reasons.crafter}\n"; - } - if (struct_exists(gen_reasons, "maintenance")){ - data_entry.tooltip+=$"Maintenance: +{gen_reasons.maintenance}"; - } - array_push(data_lines, data_entry); + } + if (struct_exists(gen_reasons, "master")){ + data_entry.tooltip+=$"Forge Master: +{gen_reasons.master}\n"; + } + if (struct_exists(gen_reasons, "crafter")){ + data_entry.tooltip+=$"Crafter: +{gen_reasons.crafter}\n"; + } + if (struct_exists(gen_reasons, "maintenance")){ + data_entry.tooltip+=$"Maintenance: +{gen_reasons.maintenance}"; + } + array_push(data_lines, data_entry); - - for (var i = 0; i < array_length(data_lines); i++) { - draw_text(data_block.x1+16, attribute_box.y2+16+(i*24), data_lines[i].text); // Adjust the y-coordinate for the new line - array_push(stat_tool_tips, [data_block.x1+16, attribute_box.y2+16+(i*24), data_block.x1+16+string_width(data_lines[i].text), attribute_box.y2+16+(i*24)+string_height(data_lines[i].text), data_lines[i].tooltip, ""]); - } + + for (var i = 0; i < array_length(data_lines); i++) { + draw_text(data_block.x1+16, attribute_box.y2+16+(i*24), data_lines[i].text); // Adjust the y-coordinate for the new line + array_push(stat_tool_tips, [data_block.x1+16, attribute_box.y2+16+(i*24), data_block.x1+16+string_width(data_lines[i].text), attribute_box.y2+16+(i*24)+string_height(data_lines[i].text), data_lines[i].tooltip, ""]); + } - var x1 = squeezed ? data_block.x1 + ((data_block.x2- data_block.x1)/2) +32: data_block.x2-16; - if (array_length(traits) != 0) { - for (var i=0; i0){ - repeat(max(floor(_stat_val/2),1)){ - descriptive_string += "+" - } - } else { - repeat(max(floor((_stat_val*-1)/2),1)){ - descriptive_string += "-" - } + var _trait_growth_effect = ""; + var _stat_list = ARR_stat_list; + for (var j=0;j0){ + repeat(max(floor(_stat_val/2),1)){ + descriptive_string += "+" } - _trait_growth_effect += $"{_stat_name} : {descriptive_string}\n"; + } else { + repeat(max(floor((_stat_val*-1)/2),1)){ + descriptive_string += "-" + } } + _trait_growth_effect += $"{_stat_name} : {descriptive_string}\n"; } - array_push(trait_tool_tips, [x1, y1, x2, y2, $"{trait_description}\n{trait_effect}\n{_trait_growth_effect}" + trait_effect]); } - } else { - draw_set_halign(fa_right); - draw_text(data_block.x2-16, attribute_box.y2+16, "No Traits"); - draw_set_halign(fa_left); + array_push(trait_tool_tips, [x1, y1, x2, y2, $"{trait_description}\n{trait_effect}\n{_trait_growth_effect}" + trait_effect]); } + } else { + draw_set_halign(fa_right); + draw_text(data_block.x2-16, attribute_box.y2+16, "No Traits"); + draw_set_halign(fa_left); + } - for (var i=0;i= event_data.duration){ + array_insert(obj_controller.event, i, event_data); + _inserted = true; + } + } + if (!_inserted){ + array_push(obj_controller.event, event_data); + } +} + +function find_event(e_id){ + var _event_found = -1; + for (var i=0;i= 0; i--){ + var _event = event[i]; + if (_event.e_id=="" || _event.duration<0){ + array_delete(event, i, 1); + continue; + } + + _event.duration-=1; + + if (_event.duration==0){ + if (_event.e_id=="game_over_man"){ + obj_controller.alarm[8]=1; + } + // Removes planetary governor installed by the chapter + if (_event.e_id == "remove_surf">0){ + + var _star_name = _event.system; + var _event_star = star_by_name(_event.system); + var _planet = _event.planet; + if (_event_star!="none"){ + _event_star.dispo[_planet]=-10;// Resets + var twix=$"Inquisition executes Chapter Serf in control of {pllanet_numera_name(planet, _event_star)} and installs a new Planetary Governor."; + if (_event_star.p_owner[_planet]=eFACTION.Player){ + _event_star.p_owner[_planet]=_event_star.p_first[_planet]; + } + scr_alert("","",twix,0,0); + scr_event_log("",twix, _star_name); + } + } + // Changes relation to good + if (_event.e_id=="enemy_imperium"){ + scr_alert("green","enemy","You have made amends with your enemy in the Imperium.",0,0); + disposition[eFACTION.Imperium]+=20; + scr_event_log("","Amends made with Imperium."); + } + if (_event.e_id=="enemy_mechanicus"){ + scr_alert("green","enemy","You have made amends with your Mechanicus enemy.",0,0); + disposition[eFACTION.Mechanicus]+=20; + scr_event_log("","Amends made with Mechanicus enemy."); + } + if (_event.e_id=="enemy_inquisition"){ + scr_alert("green","enemy","You have made amends with your enemy in the Inquisition.",0,0); + disposition[eFACTION.Inquisition]+=20; + scr_event_log("","Amends made with Inquisition enemy."); + } + if (_event.e_id=="enemy_ecclesiarchy"){ + scr_alert("green","enemy","You have made amends with your enemy in the Ecclesiarchy.",0,0); + disposition[eFACTION.Ecclesiarchy]+=20; + scr_event_log("","Amends made with Ecclesiarchy enemy."); + } + // Sector commander losses its mind + if (_event.e_id=="imperium_daemon"){ + var alert_string = $"Sector Commander {faction_leader[eFACTION.Imperium]} has gone insane." + scr_alert("red","lol",alert_string,0,0); + faction_defeated[eFACTION.Imperium]=1; + scr_event_log("red",alert_string); + } + // Starts chaos invasion + if (_event.e_id=="chaos_invasion"){ + var xx=0,yy=0,flee=0,dirr=0; + var star_id = scr_random_find(1,true,"",""); + if(star_id != undefined){ + scr_event_log("purple",$"Chaos Fleets exit the warp near the {star_id.name} system.", star_id.name); + for(var j=0; j<4; j++){ + dirr+=irandom_range(50,100); + xx=star_id.x+lengthdir_x(72,dirr); + yy=star_id.y+lengthdir_y(72,dirr); + flee=instance_create(xx,yy,obj_en_fleet); + flee.owner=eFACTION.Chaos; + flee.sprite_index=spr_fleet_chaos; + flee.image_index=4; + flee.capital_number=choose(0,1); + flee.frigate_number=choose(2,3); + flee.escort_number=choose(4,5,6); + flee.cargo_data.csm = true; + obj_controller.chaos_fleets+=1; + flee.action_x=star_id.x; + flee.action_y=star_id.y; + with(flee){ + set_fleet_movement(); + } + } + } + } + // Ships construction + if (_event.e_id == "ship_construction"){ + var new_ship_event=_event.ship_class; + var active_forges = []; + var chosen_star = false; + with(obj_star){ + if (owner==eFACTION.Mechanicus){ + for (f=1;f<=planets;f++){ + if (p_type[f]=="Forge") and (p_owner[f]==eFACTION.Mechanicus){ + array_push(active_forges,new PlanetData(f, self)); + } + } + } + } + if (array_length(active_forges)>0){ + var ship_spawn = active_forges[irandom(array_length(active_forges)-1)]; + var _new_player_fleet=instance_create(ship_spawn.system.x,ship_spawn.system.y,obj_p_fleet); + + // Creates the ship + var last_ship = new_player_ship(new_ship_event, ship_spawn.system.name); + + add_ship_to_fleet(last_ship, _new_player_fleet) + + // show_message(string(obj_ini.ship_class[last_ship])+":"+string(obj_ini.ship[last_ship])); + + if (obj_ini.ship_size[last_ship]!=1) then scr_popup("Ship Constructed",$"Your new {obj_ini.ship_class[last_ship]} '{obj_ini.ship[last_ship]}' has finished being constructed. It is orbiting {ship_spawn.system.name} and awaits its maiden voyage.","shipyard",""); + if (obj_ini.ship_size[last_ship]==1) then scr_popup("Ship Constructed",$"Your new {obj_ini.ship_class[last_ship]} Escort '{obj_ini.ship[last_ship]}' has finished being constructed. It is orbiting {ship_spawn.system.name} and awaits its maiden voyage.","shipyard",""); + var bob=instance_create(ship_spawn.system.x+16,ship_spawn.system.y-24,obj_star_event); + bob.image_alpha=1; + bob.image_speed=1; + } + if (array_length(active_forges)==0){ + _event.duration=2; + scr_popup("Ship Construction halted",$"A lack of suitable forge worlds in the system has halted construction of your requested ship","shipyard",""); + } + } + // Spare the inquisitor + if (_event.e_id == "inquisitor_spared"){ + var diceh=roll_dice_chapter(1, 100, "high"); + + if (diceh<=25){ + alarm[8]=1; + scr_loyalty("Crossing the Inquisition","+"); + } + if (diceh>25) and (diceh<=50){ + scr_loyalty("Crossing the Inquisition","+"); + } + if (diceh>50) and (diceh<=85){ + + } + if (diceh>85) and (_event.variation==2){ + scr_popup("Anonymous Message","You recieve an anonymous letter of thanks. It mentions that motions are underway to destroy any local forces of Chaos.","",""); + with(obj_star){ + for(var o=1; o<=planets; o++){ + p_heresy[o]=max(0,p_heresy[o]-10); + } + } + } + } + + if (string_count("strange_building",_event.e_id)>0){ + var b_event="",marine_name="",comp=0,marine_num=0,item="",unit; + explode_script(_event.e_id,"|"); + b_event=string(explode[0]); + marine_name=string(explode[1]); + comp=real(explode[2]); + marine_num=real(explode[3]); + unit=obj_ini.TTRPG[comp][marine_num]; + item=string(explode[4]); + + var killy=0,tixt=string(obj_ini.role[100][16])+" "+string(marine_name)+" has finished his work- "; + + if (item=="Icon"){ + tixt+="it is a "+string(global.chapter_name)+" Icon wrought in metal, finely decorated. Pride for his chapter seems to have overtaken him. There are no corrections to be made and the item is placed where many may view it."; + } + if (item=="Statue"){ + tixt+="it is a small, finely crafted statue wrought in metal. The "+string(obj_ini.role[100][16])+" is scolded for the waste of material, but none daresay the quality of the piece."; + } + if (item=="Bike"){ + scr_add_item("Bike",1); + tixt+="it is a finely crafted Bike, conforming mostly to STC standards. The other "+string(obj_ini.role[100][16])+" are surprised at the rapid pace of his work."; + } + if (item=="Rhino"){ + scr_add_vehicle("Rhino",0,"Storm Bolter","Storm Bolter","","Artificer Hull","Dozer Blades"); + tixt+="it is a finely crafted Rhino, conforming to STC standards. The other "+string(obj_ini.role[100][16])+" are surprised at the rapid pace of his work."; + } + if (item=="Artifact"){ + var last_artifact=0; + scr_event_log("",string(obj_ini.role[100][16])+" "+string(marine_name)+" constructs an Artifact."); + scr_add_artifact("random_nodemon","",0); + + tixt+=$"some form of divine inspiration has seemed to have taken hold of him. An artifact {obj_ini.artifact[last_artifact]} has been crafted."; + } + if (item=="baby"){ + unit.edit_corruption(choose(8,12,16,20)) + tixt+="some form of horrendous statue. A weird amalgram of limbs and tentacles, the sheer atrocity of it is made worse by the tiny, baby-like form, the once natural shape of a human child twisted nearly beyond recognition."; + } + else if (item=="robot"){ + unit.edit_corruption(choose(2,4,6,8,10)); + tixt+=$"some form of small, box-like robot. It seems to teeter around haphazardly, nearly falling over with each step. {unit.name()} maintains that it has no AI, though the other "+string(obj_ini.role[100][16])+" express skepticism."; + unit.add_trait("tech_heretic"); + } + else if (item=="demon"){ + unit.edit_corruption(choose(8,12,16,20)); + tixt+="some form of horrendous statue. What was meant to be some sort of angel, or primarch, instead has a mishappen face that is hardly human in nature. Between the fetid, ragged feathers and empty sockets it is truly blasphemous."; + unit.add_trait("tech_heretic"); + } + else if (item=="fusion"){ + //TODO if tech heretic chosen don't kill the dude + // unit.corruption+=choose(70); + tixt+=$"some kind of ill-mannered ascension. One of your battle-brothers enters the armamentarium to find {marine_name} fused to a vehicle, his flesh twisted and submerged into the frame. Mechendrites and weapons fire upon the marine without warning, a windy scream eminating from the abomination. It takes several battle-brothers to take out what was once a "+string(obj_ini.role[100][16])+"."; + + // This is causing the problem + + scr_kill_unit(comp,marine_num) + with(obj_ini){scr_company_order(0);} + } + scr_popup("He Built It",tixt,"tech_build","target_marine|"+string(marine_name)+"|"+string(comp)+"|"+string(marine_num)+"|"); + } + if (_event.duration<=0){ + array_delete(event, i ,1); + continue; + } + } + + } +} + +function handle_discovered_governor_assasinations(){ + for (var i=0;i 1){ + break; + } + if (_event.e_id != "governor_assassination"){ + continue; + } + if (_event.duration == 1 && obj_controller.faction_status[eFACTION.Imperium]!="War"){ + var _disp_hit = _event.variant == 1 ? 2 : 4; + with(obj_star){ + for (var o=1;o<=planets;o++){ + if (p_owner == eFACTION.Imperium){ + if (dispo[o]>0) and (dispo[o]<90){ + dispo[o]=max(dispo[o]-_disp_hit,0); + } + } + } + } + if (_event.variant == 1){ + alter_dispositions([ + [eFACTION.Imperium, -7], + [eFACTION.Inquisition, -10], + [eFACTION.Ecclesiarchy, -5], + ]); + + if (obj_controller.disposition[4]>0 && obj_controller.disposition[2]>0){ + _event.e_id = "assassination_angryish"; + } + } else if (_event.variant == 2){ + alter_disposition(eFACTION.Inquisition, -3); + if (obj_controller.disposition[4]>0&& obj_controller.disposition[2]>0){ + _event.e_id = "assassination_angry"; + } + } + + if (obj_controller.disposition[4]<=0) or (obj_controller.disposition[2]<=0){ + obj_controller.alarm[8]=1; + } else{ + scr_audience(4,_event.e_id,0,"",0,0,_event); + } + } + } +} +function make_faction_enemy_event(){ + log_message("RE: Enemy"); + + var factions = []; + if(known[eFACTION.Imperium] == 1){ + array_push(factions,2); + } + if(known[eFACTION.Mechanicus] == 1){ + array_push(factions,3); + } + if(known[eFACTION.Inquisition] == 1){ + array_push(factions,4); + } + if(known[eFACTION.Ecclesiarchy] == 1){ + array_push(factions,5); + } + + if(array_length(factions) == 0){ + log_error("RE: Enemy, no faction could be chosen"); + exit; + } + var chosen_faction = factions[irandom(array_length(factions)-1)]; + + var text = "You have made an enemy within the "; + var log = "An enemy has been made within the "; + var _e_name = ""; + switch(chosen_faction) { + case 2: + _e_name="enemy_imperium"; + text += "Imperium"; + log += "Imperium"; + break; + case 3: + _e_name="enemy_mechanicus"; + text += "Mechanicus"; + log += "Mechanicus"; + break; + case 4: + _e_name="enemy_inquisition"; + text += "Inquisition"; + log += "Inquisition"; + break; + case 5: + _e_name="enemy_ecclesiarchy"; + text += "Ecclesiarchy"; + log += "Ecclesiarchy"; + break; + default: + log_error("RE: Enemy, no faction could be chosen"); + exit; + } + if (_e_name != ""){ + add_event({ + duration : irandom_range(12,96), + e_id : _e_name, + }) + alter_disposition(chosen_faction, -20) + text +="; relations with them will be soured for the forseable future."; + scr_popup("Diplomatic Incident",text,"angry",""); + evented = true; + scr_event_log("red",string(log)); + return true; + } + return false; +} \ No newline at end of file diff --git a/scripts/scr_event_code/scr_event_code.yy b/scripts/scr_event_code/scr_event_code.yy new file mode 100644 index 0000000000..7ea9d41e5d --- /dev/null +++ b/scripts/scr_event_code/scr_event_code.yy @@ -0,0 +1,13 @@ +{ + "$GMScript":"v1", + "%Name":"scr_event_code", + "isCompatibility":false, + "isDnD":false, + "name":"scr_event_code", + "parent":{ + "name":"Scripts", + "path":"folders/Scripts.yy", + }, + "resourceType":"GMScript", + "resourceVersion":"2.0", +} \ No newline at end of file diff --git a/scripts/scr_inquisition_fleet_functions/scr_inquisition_fleet_functions.gml b/scripts/scr_inquisition_fleet_functions/scr_inquisition_fleet_functions.gml index 6f67c3e6b1..33088aa2d4 100644 --- a/scripts/scr_inquisition_fleet_functions/scr_inquisition_fleet_functions.gml +++ b/scripts/scr_inquisition_fleet_functions/scr_inquisition_fleet_functions.gml @@ -14,16 +14,13 @@ function base_inquis_fleet (){ } -function hunt_player_serfs(){ - explode_script(obj_controller.temp[1008],"|"); - var tb=string(explode[0]); - var tc=real(explode[1]); - var ev=0; - for(var v=1; v<=99; v++){ - if (ev==0) and (event[v]=="") then ev=v; - } - event[ev]="remove_serf|"+string(tb)+"|"+string(tc)+"|"; - event_duration[ev]=choose(1,2); +function hunt_player_serfs(planet, system){ + add_event({ + planet : planet, + system : system, + e_id : "remove_surf", + duration : irandom_range(1,4), + }); } function inquisition_fleet_inspection_chase(){ @@ -410,8 +407,12 @@ if (inspection_type="inspect_world") or (inspection_type="inspect_fleet"){ if (obj_controller.disposition[4]<=10) and (one=0){obj_controller.disposition[4]=0;one=3;} if ((obj_controller.loyalty-80)<=0) and (one<3) then one=3; - if (one=1) then with(obj_controller){scr_audience(4,"chaos_audience1",0,"",0,0);} - if (one=2) then with(obj_controller){scr_audience(4,"chaos_audience2",0,"",0,0);} + if (one=1) then with(obj_controller){ + scr_audience(4,"chaos_audience1",0,"",0,0); + } + if (one=2) then with(obj_controller){ + scr_audience(4,"chaos_audience2",0,"",0,0); + } if (one=3) then obj_controller.alarm[8]=1; } if (obj_controller.loyal[i]="Heretical Homeworld"){obj_controller.loyal_num[i]=20;obj_controller.loyal_time[i]=3;} diff --git a/scripts/scr_load/scr_load.gml b/scripts/scr_load/scr_load.gml index d6063eb829..d9fd5b77a0 100644 --- a/scripts/scr_load/scr_load.gml +++ b/scripts/scr_load/scr_load.gml @@ -63,7 +63,7 @@ function scr_load(save_part, save_id) { /// the object doesnt want to work with(obj_controller){ var exclusions = ["specialist_point_handler", "location_viewer", "id", - "techs","apoths","forge_queue","point_breakdown","apothecary_points", "forge_points"]; // skip automatic setting of certain vars, handle explicitly later + "techs","apoths","forge_queue","point_breakdown","apothecary_points", "forge_points", "chapter_master_data"]; // skip automatic setting of certain vars, handle explicitly later // Automatic var setting var all_names = struct_get_names(save_data); @@ -90,6 +90,14 @@ function scr_load(save_part, save_id) { variable_struct_set(specialist_point_handler, prop, variable_struct_get(save_data, prop)); } } + chapter_master = new scr_chapter_master(); + if (struct_exists(save_data, "chapter_master_data")){ + var _data = variable_struct_get(save_data, "chapter_master_data"); + with (chapter_master){ + move_data_to_current_scope(_data, true); + } + } + specialist_point_handler.calculate_research_points(); location_viewer = new UnitQuickFindPanel(); scr_colors_initialize(); diff --git a/scripts/scr_load_controller/scr_load_controller.gml b/scripts/scr_load_controller/scr_load_controller.gml index 230b49383b..f20fc9877e 100644 --- a/scripts/scr_load_controller/scr_load_controller.gml +++ b/scripts/scr_load_controller/scr_load_controller.gml @@ -331,11 +331,6 @@ function scr_load_controller(save_id){ obj_controller.quest_faction[g]=ini_read_real("Ongoing","quest_faction"+string(g),0); obj_controller.quest_end[g]=ini_read_real("Ongoing","quest_end"+string(g),0); } - var g;g=0; - repeat(99){g+=1; - obj_controller.event[g]=ini_read_string("Ongoing","event"+string(g),""); - obj_controller.event_duration[g]=ini_read_real("Ongoing","event_duration"+string(g),0); - } // obj_controller.justmet=0; obj_controller.check_number=ini_read_real("Controller","check_number",0); diff --git a/scripts/scr_mechanicus_missions/scr_mechanicus_missions.gml b/scripts/scr_mechanicus_missions/scr_mechanicus_missions.gml index 3308d81625..6ed389779c 100644 --- a/scripts/scr_mechanicus_missions/scr_mechanicus_missions.gml +++ b/scripts/scr_mechanicus_missions/scr_mechanicus_missions.gml @@ -76,8 +76,8 @@ function mechanicus_missions_end_turn(planet){ scr_event_log("","Mechanicus Mission Completed: The Mechanicus research team on "+string(name)+" "+scr_roman(planet)+" have completed their work."); } else if (reward==2){ - if (obj_ini.fleet_type=ePlayerBase.home_world) then scr_add_artifact("random","",0,obj_ini.home_name,2); - if (obj_ini.fleet_type != ePlayerBase.home_world) then scr_add_artifact("random","",0,obj_ini.ship[0],501); + + var last_artifact = scr_add_artifact("random", "", 0); text="The Mechanicus Research team on planet "+string(name)+" "+scr_roman(planet)+" have completed their work without any major setbacks. Pleased with your astartes' work, they have granted your Chapter an artifact, to be used as you see fit."; scr_event_log("","Mechanicus Mission Completed: The Mechanicus research team on "+string(name)+" "+scr_roman(planet)+" have completed their work."); scr_event_log("","Artifact gifted from Mechanicus."); diff --git a/scripts/scr_mission_reward/scr_mission_reward.gml b/scripts/scr_mission_reward/scr_mission_reward.gml index 5f39664cf7..f10577f195 100644 --- a/scripts/scr_mission_reward/scr_mission_reward.gml +++ b/scripts/scr_mission_reward/scr_mission_reward.gml @@ -39,8 +39,7 @@ function scr_mission_reward(mission, star, planet) { } if (roll2>=80) and (roll2<88) then found_requisition+=100; if (roll2>=88) and (roll2<96){ - if (obj_ini.fleet_type=ePlayerBase.home_world) then scr_add_artifact("random","",4,obj_ini.home_name,2); - if (obj_ini.fleet_type != ePlayerBase.home_world) then scr_add_artifact("random","",4,obj_ini.ship[0],501); + var last_artifact = scr_add_artifact("random", "", 4); found_artifact+=1; } if (roll2>=96){ diff --git a/scripts/scr_purge_world/scr_purge_world.gml b/scripts/scr_purge_world/scr_purge_world.gml index be5f2955d0..5c5cfce1dc 100644 --- a/scripts/scr_purge_world/scr_purge_world.gml +++ b/scripts/scr_purge_world/scr_purge_world.gml @@ -280,9 +280,11 @@ function scr_purge_world(star, planet, action_type, action_score) { txt+="What is thy will?"; var he;he=instance_create(star.x,star.y,obj_temp6); - var pip;pip=instance_create(0,0,obj_popup); + var pip=instance_create(0,0,obj_popup); pip.title="Planetary Governor Assassinated"; - pip.text=txt;pip.planet=planet; + pip.text=txt; + pip.planet=planet; + pip.p_data = new PlanetData(panet,star); pip.option1="Allow the official successor to become Planetary Governor."; pip.option2="Ensure that a sympathetic successor will be the one to rule."; diff --git a/scripts/scr_random_event/scr_random_event.gml b/scripts/scr_random_event/scr_random_event.gml index ed854578ac..9926567c4f 100644 --- a/scripts/scr_random_event/scr_random_event.gml +++ b/scripts/scr_random_event/scr_random_event.gml @@ -284,9 +284,9 @@ function scr_random_event(execute_now) { } var marine=marine_and_company[1]; var company=marine_and_company[0]; - var unit = obj_ini.TTRPG[company][marine]; - var role=unit.role(); - var text = unit.name_role(); + var _unit = obj_ini.TTRPG[company][marine]; + var role=_unit.role(); + var text = _unit.name_role(); var company_text = scr_convert_company_to_string(company); //var company_text = scr_company_string(company); if(company_text != ""){ @@ -296,10 +296,10 @@ function scr_random_event(execute_now) { text += " has distinguished himself.##He åis up for review to be promoted."; if (company != 10){ - unit.add_exp(10); + _unit.add_exp(10); } else { - unit.add_exp(max(20, unit.experience)); + _unit.add_exp(max(20, _unit.experience)); } scr_popup("Promotions!",text,"distinguished",""); @@ -309,73 +309,71 @@ function scr_random_event(execute_now) { else if (chosen_event == EVENT.strange_building){ log_message("RE: Fey Mood"); - var marine_and_company = scr_random_marine(obj_ini.role[100][16],0); - if(marine_and_company == "none"){ - exit; - } - var marine = marine_and_company[1]; - var company = marine_and_company[0]; - var text=""; - var unit = obj_ini.TTRPG[company][marine]; - var role= unit.role(); - text = unit.name_role(); - text+=" is taken by a strange mood and starts building!"; + var _search_params = {trait : ["crafter","tinkerer"]} + var marine_and_company = scr_random_marine(obj_ini.role[100][16],0, _search_params); + if(marine_and_company != "none"){ + var marine = marine_and_company[1]; + var company = marine_and_company[0]; + var text=""; + var _unit = fetch_unit(marine_and_company); + var role = _unit.role(); + text = _unit.name_role(); + text+=" is taken by a strange mood and starts building!"; - - var crafted_object; - var craft_roll=roll_dice_chapter(1, 100, "low"); - var heritical_item = false; - - //this bit should be improved, idk what duke was checking for here - //TODO make craft chance reflective of crafters skill, rewards players for having skilled tech area - if (scr_has_disadv("Tech-Heresy")) { - craft_roll+=20; - } - if (scr_has_adv("Crafter")) { - if (craft_roll>80) { - craft_roll-=10; + + var crafted_object; + var craft_roll=roll_dice_chapter(1, 100, "low"); + var heritical_item = false; + + //this bit should be improved, idk what duke was checking for here + //TODO make craft chance reflective of crafters skill, rewards players for having skilled tech area + if (scr_has_disadv("Tech-Heresy")) { + craft_roll+=20; } - if (craft_roll<60) { - craft_roll+=10; + if (unit.has_trait("tech_heretic")){ + craft_roll+=60; } - } - - if (craft_roll<=50){ - crafted_object=choose("Icon","Icon","Statue"); - unit.add_exp(choose(5,10)); - } - else if ((craft_roll>50) && (craft_roll<=60)) { - crafted_object=choose("Bike","Rhino"); - } - else if ((craft_roll>60) && (craft_roll<=80)) { - crafted_object="Artifact"; - } - else { - crafted_object=choose("baby","robot","demon","fusion"); - heritical_item=1; - } - - var event_index = -1; - for(var i = 0; i < array_length(event); i++){ - if(event[i] == "" || event[i] == undefined){ - event_index = i; - break; + if (scr_has_adv("Crafter")) { + if (craft_roll>80) { + craft_roll-=10; + } + if (craft_roll<60) { + craft_roll+=10; } + } + + if (craft_roll<=50){ + crafted_object=choose("Icon","Icon","Statue"); + _unit.add_exp(choose(5,10)); } - if(event_index == -1){ - // - exit; + else if ((craft_roll>50) && (craft_roll<=60)) { + crafted_object=choose("Bike","Rhino"); + } + else if ((craft_roll>60) && (craft_roll<=80)) { + crafted_object="Artifact"; } + else { + crafted_object=choose("baby","robot","demon","fusion"); + heritical_item=1; + } + + + add_event({ + e_id : "strange_building", + duration : 1, + name : _unit.name(), + company : company, + marine : marine, + crafted : crafted_object, + }) scr_popup("Can He Build marine?!?",text,"tech_build",""); evented = true; - event[event_index]="strange_building|"+unit.name()+"|"+string(company)+"|"+string(marine)+"|"+string(crafted_object)+"|"; - event_duration[event_index]=1; - - var marine_is_planetside = unit.planet_location>0; + + var marine_is_planetside = _unit.planet_location>0; if (marine_is_planetside && heritical_item) { var _system = star_by_name(obj_ini.loc[company][marine]); - var _planet = unit.planet_location; + var _planet = _unit.planet_location; if (_system!="none"){ with (_system){ p_hurssy[_planet]+=6; @@ -384,11 +382,13 @@ function scr_random_event(execute_now) { } } else if (!marine_is_planetside and heritical_item){ - var _fleet = find_ships_fleet(unit.ship_location); + var _fleet = find_ships_fleet(_unit.ship_location); if (_fleet!="none"){ //the intended code for here was to add some sort of chaos event on the ship stashed up ready to fire in a few turns } } + } + } else if (chosen_event == EVENT.sororitas){ @@ -787,72 +787,7 @@ function scr_random_event(execute_now) { } else if (chosen_event == EVENT.enemy) { - log_message("RE: Enemy"); - - var factions = []; - if(known[eFACTION.Imperium] == 1){ - array_push(factions,2); - } - if(known[eFACTION.Mechanicus] == 1){ - array_push(factions,3); - } - if(known[eFACTION.Inquisition] == 1){ - array_push(factions,4); - } - if(known[eFACTION.Ecclesiarchy] == 1){ - array_push(factions,5); - } - - if(array_length(factions) == 0){ - log_error("RE: Enemy, no faction could be chosen"); - exit; - } - var chosen_faction = factions[irandom(array_length(factions)-1)]; - var event_index = -1; - for(var i=1;i < 99; i++){ - if(event[i] == ""){ - event_index = i; - break; - } - } - if(event_index == -1){ - log_error("RE: Enemy, couldn't find an event_index"); - exit; - } - - var text = "You have made an enemy within the "; - var log = "An enemy has been made within the "; - switch(chosen_faction) { - case 2: - event[event_index]="enemy_imperium"; - text += "Imperium"; - log += "Imperium"; - break; - case 3: - event[event_index]="enemy_mechanicus"; - text += "Mechanicus"; - log += "Mechanicus"; - break; - case 4: - event[event_index]="enemy_inquisition"; - text += "Inquisition"; - log += "Inquisition"; - break; - case 5: - event[event_index]="enemy_ecclesiarchy"; - text += "Ecclesiarchy"; - log += "Ecclesiarchy"; - break; - default: - log_error("RE: Enemy, no faction could be chosen"); - exit; - } - event_duration[event_index]=irandom_range(12,96); - disposition[chosen_faction]-=20; - text +="; relations with them will be soured for the forseable future."; - scr_popup("Diplomatic Incident",text,"angry",""); - evented = true; - scr_event_log("red",string(log)); + evented = make_faction_enemy_event(); } else if ((chosen_event == EVENT.mutation)) { @@ -871,24 +806,10 @@ function scr_random_event(execute_now) { else if (chosen_event == EVENT.chaos_invasion){ log_message("RE: Chaos Invasion"); - var event_index = -1; - for(var i = 1; i < 100; i++) { - if(event[i] == ""){ - chosen_event = i; - break; - } - } - if(chosen_event == -1){ - log_error("RE: Chaos Invasion, couldn't find a id for the event"); - exit; - } - - event[chosen_event] = "chaos_invasion"; - event_duration[chosen_event] = 1; - evented = true; - - - + add_event({ + e_id : "chaos_invasion", + duration : 1 + }) var psyker_intolerant = scr_has_disadv("Psyker Intolerant"); var has_chief_psyker = scr_role_count("Chief "+string(obj_ini.role[100,17]),"") >= 1; diff --git a/scripts/scr_save_controller/scr_save_controller.gml b/scripts/scr_save_controller/scr_save_controller.gml index 803248e04f..787a93951b 100644 --- a/scripts/scr_save_controller/scr_save_controller.gml +++ b/scripts/scr_save_controller/scr_save_controller.gml @@ -225,10 +225,6 @@ function scr_save_controller(save_id){ ini_write_real("Ongoing","quest_end"+string(g),obj_controller.quest_end[g]); } var g;g=0; - repeat(99){g+=1; - ini_write_string("Ongoing","event"+string(g),obj_controller.event[g]); - ini_write_real("Ongoing","event_duration"+string(g),obj_controller.event_duration[g]); - } // ini_write_real("Controller","justmet",obj_controller.faction_justmet); ini_write_real("Controller","check_number",obj_controller.check_number); diff --git a/scripts/scr_special_view/scr_special_view.gml b/scripts/scr_special_view/scr_special_view.gml index 2704832982..ec738140f4 100644 --- a/scripts/scr_special_view/scr_special_view.gml +++ b/scripts/scr_special_view/scr_special_view.gml @@ -20,7 +20,6 @@ function scr_special_view(command_group) { penit_co[i]=0; penit_id[i]=0; } - // if (i<=100){event[i]="";event_duration[i]=0;} } reset_manage_arrays(); diff --git a/scripts/scr_struct_functions/scr_struct_functions.gml b/scripts/scr_struct_functions/scr_struct_functions.gml index 575da55180..a02457a08b 100644 --- a/scripts/scr_struct_functions/scr_struct_functions.gml +++ b/scripts/scr_struct_functions/scr_struct_functions.gml @@ -8,6 +8,18 @@ function DeepCloneStruct(clone_struct) { return variable_clone(clone_struct); } +function move_data_to_current_scope(struct, overide=true){ + var _data_names = struct_get_names(struct); + for (var i=0;i 0) { From 9b177197678ae72fc787e44234d3f0117d2d147c Mon Sep 17 00:00:00 2001 From: Nelsonh <81228864+OH296@users.noreply.github.com> Date: Tue, 15 Jul 2025 18:54:35 +0100 Subject: [PATCH 134/286] feat: Overhaul event system (#924) --- docs/CHEATCODES.md | 3 + scripts/scr_cheatcode/scr_cheatcode.gml | 7 +- scripts/scr_event_code/scr_event_code.gml | 134 ++++++++++++++---- .../scr_mechanicus_missions.gml | 12 +- scripts/scr_random_event/scr_random_event.gml | 120 +++------------- .../scr_random_marine/scr_random_marine.gml | 22 ++- 6 files changed, 161 insertions(+), 137 deletions(-) diff --git a/docs/CHEATCODES.md b/docs/CHEATCODES.md index ba474ad494..2d985ea9ed 100644 --- a/docs/CHEATCODES.md +++ b/docs/CHEATCODES.md @@ -44,6 +44,9 @@ Arguments with stars `(argument*)` can be omitted. - `techuprising` - triggers the Tech Heretics Uprising event. - `inspection` - triggers the Inquisitorial Inspection event. - `slaughtersong` - triggers the Starship event. + - `surfremove` - triggers inquisition surf removal + - `strangebuild` - triggers strange build event + - `factionenemy` - triggers the made a faction enemy event - `inquisarti` - triggers the Artifact Loan quest. - `govmission` - spawns governor missions on all planets. - `inquismission (mission*)` - triggers an inquisition mission. You must have met the inquisition for this to work diff --git a/scripts/scr_cheatcode/scr_cheatcode.gml b/scripts/scr_cheatcode/scr_cheatcode.gml index bff887ff76..b36ab22cc8 100644 --- a/scripts/scr_cheatcode/scr_cheatcode.gml +++ b/scripts/scr_cheatcode/scr_cheatcode.gml @@ -231,7 +231,12 @@ function scr_cheatcode(argument0) { system : _star_id.name, planet : irandom_range(1, _star_id.planets), }); - } else { + } else if (cheat_arguments[0] == "strangebuild"){ + show_debug_message("strange build"); + strange_build_event(); + }else if (cheat_arguments[0] == "factionenemy"){ + make_faction_enemy_event(); + }else { with (obj_controller) { scr_random_event(false); } diff --git a/scripts/scr_event_code/scr_event_code.gml b/scripts/scr_event_code/scr_event_code.gml index dbbfa8ce9a..b1d28a65be 100644 --- a/scripts/scr_event_code/scr_event_code.gml +++ b/scripts/scr_event_code/scr_event_code.gml @@ -172,20 +172,18 @@ function event_end_turn_action(){ } } - if (string_count("strange_building",_event.e_id)>0){ - var b_event="",marine_name="",comp=0,marine_num=0,item="",unit; - explode_script(_event.e_id,"|"); - b_event=string(explode[0]); - marine_name=string(explode[1]); - comp=real(explode[2]); - marine_num=real(explode[3]); - unit=obj_ini.TTRPG[comp][marine_num]; - item=string(explode[4]); + if (_event.e_id == "strange_building"){ + + var marine_name=_event.name; + var comp=_event.company; + var marine_num=_event.marine; + var _unit=fetch_unit([marine_num,comp]); + var item=_event.crafted; var killy=0,tixt=string(obj_ini.role[100][16])+" "+string(marine_name)+" has finished his work- "; if (item=="Icon"){ - tixt+="it is a "+string(global.chapter_name)+" Icon wrought in metal, finely decorated. Pride for his chapter seems to have overtaken him. There are no corrections to be made and the item is placed where many may view it."; + tixt+=$"it is a {global.chapter_name} Icon wrought in metal, finely decorated. Pride for his chapter seems to have overtaken him. There are no corrections to be made and the item is placed where many may view it."; } if (item=="Statue"){ tixt+="it is a small, finely crafted statue wrought in metal. The "+string(obj_ini.role[100][16])+" is scolded for the waste of material, but none daresay the quality of the piece."; @@ -199,29 +197,28 @@ function event_end_turn_action(){ tixt+="it is a finely crafted Rhino, conforming to STC standards. The other "+string(obj_ini.role[100][16])+" are surprised at the rapid pace of his work."; } if (item=="Artifact"){ - var last_artifact=0; scr_event_log("",string(obj_ini.role[100][16])+" "+string(marine_name)+" constructs an Artifact."); - scr_add_artifact("random_nodemon","",0); + var _last_artifact = scr_add_artifact("random_nodemon","",0); - tixt+=$"some form of divine inspiration has seemed to have taken hold of him. An artifact {obj_ini.artifact[last_artifact]} has been crafted."; + tixt+=$"some form of divine inspiration has seemed to have taken hold of him. An artifact {obj_ini.artifact[_last_artifact]} has been crafted."; } if (item=="baby"){ - unit.edit_corruption(choose(8,12,16,20)) + _unit.edit_corruption(choose(8,12,16,20)) tixt+="some form of horrendous statue. A weird amalgram of limbs and tentacles, the sheer atrocity of it is made worse by the tiny, baby-like form, the once natural shape of a human child twisted nearly beyond recognition."; } else if (item=="robot"){ - unit.edit_corruption(choose(2,4,6,8,10)); - tixt+=$"some form of small, box-like robot. It seems to teeter around haphazardly, nearly falling over with each step. {unit.name()} maintains that it has no AI, though the other "+string(obj_ini.role[100][16])+" express skepticism."; - unit.add_trait("tech_heretic"); + _unit.edit_corruption(choose(2,4,6,8,10)); + tixt+=$"some form of small, box-like robot. It seems to teeter around haphazardly, nearly falling over with each step. {_unit.name()} maintains that it has no AI, though the other "+string(obj_ini.role[100][16])+" express skepticism."; + _unit.add_trait("tech_heretic"); } else if (item=="demon"){ - unit.edit_corruption(choose(8,12,16,20)); + _unit.edit_corruption(choose(8,12,16,20)); tixt+="some form of horrendous statue. What was meant to be some sort of angel, or primarch, instead has a mishappen face that is hardly human in nature. Between the fetid, ragged feathers and empty sockets it is truly blasphemous."; - unit.add_trait("tech_heretic"); + _unit.add_trait("tech_heretic"); } else if (item=="fusion"){ //TODO if tech heretic chosen don't kill the dude - // unit.corruption+=choose(70); + // _unit.corruption+=choose(70); tixt+=$"some kind of ill-mannered ascension. One of your battle-brothers enters the armamentarium to find {marine_name} fused to a vehicle, his flesh twisted and submerged into the frame. Mechendrites and weapons fire upon the marine without warning, a windy scream eminating from the abomination. It takes several battle-brothers to take out what was once a "+string(obj_ini.role[100][16])+"."; // This is causing the problem @@ -285,20 +282,106 @@ function handle_discovered_governor_assasinations(){ } } } + +function strange_build_event(){ + log_message("RE: Fey Mood"); + var _search_params = {trait : ["crafter","tinkerer"], trait_any : true} + var marine_and_company = scr_random_marine("",0, _search_params); + if (marine_and_company == "none"){ + marine_and_company = scr_random_marine("",0, "none"); + } + if(marine_and_company != "none"){ + var marine = marine_and_company[0]; + var company = marine_and_company[1]; + var text=""; + var _unit = fetch_unit(marine_and_company); + var role = _unit.role(); + text = _unit.name_role(); + text+=" is taken by a strange mood and starts building!"; + + + var crafted_object; + var craft_roll=roll_dice_chapter(1, 100, "low"); + var heritical_item = false; + + //this bit should be improved, idk what duke was checking for here + //TODO make craft chance reflective of crafters skill, rewards players for having skilled tech area + if (scr_has_disadv("Tech-Heresy")) { + craft_roll+=20; + } + if (_unit.has_trait("tech_heretic")){ + craft_roll+=60; + } + if (scr_has_adv("Crafter")) { + if (craft_roll>80) { + craft_roll-=10; + } + if (craft_roll<60) { + craft_roll+=10; + } + } + + if (craft_roll<=50){ + crafted_object=choose("Icon","Icon","Statue"); + } + else if ((craft_roll>50) && (craft_roll<=60)) { + crafted_object=choose("Bike","Rhino"); + } + else if ((craft_roll>60) && (craft_roll<=80)) { + crafted_object="Artifact"; + } + else { + crafted_object=choose("baby","robot","demon","fusion"); + heritical_item=1; + } + + + add_event({ + e_id : "strange_building", + duration : 1, + name : _unit.name(), + company : company, + marine : marine, + crafted : crafted_object, + }) + + scr_popup("Can He Build marine?!?",text,"tech_build",""); + + var marine_is_planetside = _unit.planet_location>0; + if (marine_is_planetside && heritical_item) { + var _system = star_by_name(obj_ini.loc[company][marine]); + var _planet = _unit.planet_location; + if (_system!="none"){ + with (_system){ + p_hurssy[_planet]+=6; + p_hurssy_time[_planet]=2; + } + } + } + else if (!marine_is_planetside and heritical_item){ + var _fleet = find_ships_fleet(_unit.ship_location); + if (_fleet!="none"){ + //the intended code for here was to add some sort of chaos event on the ship stashed up ready to fire in a few turns + } + } + return true; + } + return false; +} function make_faction_enemy_event(){ log_message("RE: Enemy"); var factions = []; - if(known[eFACTION.Imperium] == 1){ + if(obj_controller.known[eFACTION.Imperium] == 1){ array_push(factions,2); } - if(known[eFACTION.Mechanicus] == 1){ + if(obj_controller.known[eFACTION.Mechanicus] == 1){ array_push(factions,3); } - if(known[eFACTION.Inquisition] == 1){ + if(obj_controller.known[eFACTION.Inquisition] == 1){ array_push(factions,4); } - if(known[eFACTION.Ecclesiarchy] == 1){ + if(obj_controller.known[eFACTION.Ecclesiarchy] == 1){ array_push(factions,5); } @@ -306,7 +389,7 @@ function make_faction_enemy_event(){ log_error("RE: Enemy, no faction could be chosen"); exit; } - var chosen_faction = factions[irandom(array_length(factions)-1)]; + var chosen_faction = array_random_element(factions); var text = "You have made an enemy within the "; var log = "An enemy has been made within the "; @@ -344,7 +427,6 @@ function make_faction_enemy_event(){ alter_disposition(chosen_faction, -20) text +="; relations with them will be soured for the forseable future."; scr_popup("Diplomatic Incident",text,"angry",""); - evented = true; scr_event_log("red",string(log)); return true; } diff --git a/scripts/scr_mechanicus_missions/scr_mechanicus_missions.gml b/scripts/scr_mechanicus_missions/scr_mechanicus_missions.gml index 6ed389779c..29ecb5ee1c 100644 --- a/scripts/scr_mechanicus_missions/scr_mechanicus_missions.gml +++ b/scripts/scr_mechanicus_missions/scr_mechanicus_missions.gml @@ -183,6 +183,7 @@ function mechanicus_missions_end_turn(planet){ function spawn_mechanicus_mission(){ log_message("RE: Mechanicus Mission"); var mechanicus_missions = [] + var _evented var _forge_stars = scr_get_stars(false, [eFACTION.Mechanicus],["Forge"]); @@ -233,17 +234,17 @@ function spawn_mechanicus_mission(){ if (chosen_mission == "mech_raider"){ var text=$"The Adeptus Mechanicus are trusting you with a special mission. They wish for you to bring a Land Raider and six {obj_ini.role[100][16]} to a Forge World in {_name} for testing and training, for a duration of 24 months. You have four years to complete this. Can your chapter handle this mission?"; scr_popup("Mechanicus Mission",text,"mechanicus",mission_data); - evented = true; + _evented = true; } else if (chosen_mission == "mech_bionics") { var text=$"The Adeptus Mechanicus are trusting you with a special mission. They desire a squad of Astartes with bionics to stay upon a Forge World in {_name} for testing, for a duration of 24 months. You have four years to complete this. Can your chapter handle this mission?"; scr_popup("Mechanicus Mission",text,"mechanicus",mission_data); - evented = true; + _evented = true; } else { var text=$"The local Adeptus Mechanicus are preparing to embark on a voyage to Mars, to delve into the catacombs in search of lost technology. Due to your close relations they have made the offer to take some of your {obj_ini.role[100][16]}s with them. Can your chapter handle this mission?"; scr_popup("Mechanicus Mission",text,"mechanicus",mission_data); - evented = true; + _evented = true; } //show_debug_message(mission_data); } @@ -273,8 +274,9 @@ function spawn_mechanicus_mission(){ } var text=$"Mechanicus Techpriests have established a research site on a Necron Tomb World in the {star.name} system. They are requesting some of your forces to provide security for the research team until the tests may be completed. Further information is on a need-to-know basis. Can your chapter handle this mission?"; scr_popup("Mechanicus Mission",text,"mechanicus",_mission_data); - evented = true; - } + _evented = true; + } + return _evented; } function mechanicus_mission_procedures(){ diff --git a/scripts/scr_random_event/scr_random_event.gml b/scripts/scr_random_event/scr_random_event.gml index 9926567c4f..9c01509c40 100644 --- a/scripts/scr_random_event/scr_random_event.gml +++ b/scripts/scr_random_event/scr_random_event.gml @@ -1,6 +1,6 @@ function scr_random_event(execute_now) { - var evented = false; + var _evented = false; /*This is some eldar mission, it should be fixed var rando4=floor(random(200))+1; if (obj_controller.turns_ignored[6]<=0) and (obj_controller.faction_gender[6]=2) then rando4-=2; @@ -217,7 +217,7 @@ function scr_random_event(execute_now) { if (chosen_event == EVENT.strange_behavior){ //TODO this event currenlty dose'nt do anything but now we have marine structs there is lots of potential here init_marine_acting_strange() - evented=true; + _evented=true; } else if (chosen_event == EVENT.space_hulk){ @@ -266,7 +266,7 @@ function scr_random_event(execute_now) { scr_alert(own?"red":"green","space_hulk",$"The Space Hulk {spaceHulk.name} appears near the {star_id.name} system.",spaceHulkX,spaceHulkY); scr_event_log("",$"The Space Hulk {spaceHulk.name} appears near the {star_id.name} system.",star_id.name); - evented = true; + _evented = true; } catch(_exception){ handle_exception(_exception); @@ -304,91 +304,11 @@ function scr_random_event(execute_now) { scr_popup("Promotions!",text,"distinguished",""); scr_event_log("green",text); - evented = true; + _evented = true; } else if (chosen_event == EVENT.strange_building){ - log_message("RE: Fey Mood"); - var _search_params = {trait : ["crafter","tinkerer"]} - var marine_and_company = scr_random_marine(obj_ini.role[100][16],0, _search_params); - if(marine_and_company != "none"){ - var marine = marine_and_company[1]; - var company = marine_and_company[0]; - var text=""; - var _unit = fetch_unit(marine_and_company); - var role = _unit.role(); - text = _unit.name_role(); - text+=" is taken by a strange mood and starts building!"; - - - var crafted_object; - var craft_roll=roll_dice_chapter(1, 100, "low"); - var heritical_item = false; - - //this bit should be improved, idk what duke was checking for here - //TODO make craft chance reflective of crafters skill, rewards players for having skilled tech area - if (scr_has_disadv("Tech-Heresy")) { - craft_roll+=20; - } - if (unit.has_trait("tech_heretic")){ - craft_roll+=60; - } - if (scr_has_adv("Crafter")) { - if (craft_roll>80) { - craft_roll-=10; - } - if (craft_roll<60) { - craft_roll+=10; - } - } - - if (craft_roll<=50){ - crafted_object=choose("Icon","Icon","Statue"); - _unit.add_exp(choose(5,10)); - } - else if ((craft_roll>50) && (craft_roll<=60)) { - crafted_object=choose("Bike","Rhino"); - } - else if ((craft_roll>60) && (craft_roll<=80)) { - crafted_object="Artifact"; - } - else { - crafted_object=choose("baby","robot","demon","fusion"); - heritical_item=1; - } - - - add_event({ - e_id : "strange_building", - duration : 1, - name : _unit.name(), - company : company, - marine : marine, - crafted : crafted_object, - }) - - scr_popup("Can He Build marine?!?",text,"tech_build",""); - evented = true; - - var marine_is_planetside = _unit.planet_location>0; - if (marine_is_planetside && heritical_item) { - var _system = star_by_name(obj_ini.loc[company][marine]); - var _planet = _unit.planet_location; - if (_system!="none"){ - with (_system){ - p_hurssy[_planet]+=6; - p_hurssy_time[_planet]=2; - } - } - } - else if (!marine_is_planetside and heritical_item){ - var _fleet = find_ships_fleet(_unit.ship_location); - if (_fleet!="none"){ - //the intended code for here was to add some sort of chaos event on the ship stashed up ready to fire in a few turns - } - } - } - + _evented = strange_build_event(); } else if (chosen_event == EVENT.sororitas){ @@ -420,7 +340,7 @@ function scr_random_event(execute_now) { var planet = eligible_planets[irandom(array_length(eligible_planets)-1)]; ++(star_id.p_sisters[planet]); - evented = true; + _evented = true; if ((own!=1) && (star_id.p_player[planet]<=0) && (star_id.present_fleet[1]==0)){ scr_alert("green","sororitas","Sororitas place a company of sisters on "+string(star_id.name)+" "+string(planet)+".",star_id.x,star_id.y); @@ -434,13 +354,13 @@ function scr_random_event(execute_now) { } } else if (chosen_event == EVENT.mechanicus_mission) { - spawn_mechanicus_mission() + evented = spawn_mechanicus_mission(); } else if (chosen_event == EVENT.inquisition_planet || chosen_event == EVENT.inquisition_mission) { scr_inquisition_mission(chosen_event); - evented = true; + _evented = true; } else if (chosen_event == EVENT.rogue_trader){ @@ -491,7 +411,7 @@ function scr_random_event(execute_now) { star_alert = instance_create(star.x+16,star.y-24,obj_star_event); star_alert.image_alpha = 1; star_alert.image_speed = 1; - evented = true; + _evented = true; } else if (chosen_event == EVENT.fleet_delay){ @@ -529,7 +449,7 @@ function scr_random_event(execute_now) { text = "Eldar pirates have attacked your fleet. Damage was minimal but the voyage has been delayed by " + string(delay)+ " months."; } scr_popup("Fleet Attacked",text,"",""); - evented = true; + _evented = true; var star_alert =instance_create(fleet.x+16,fleet.y-24,obj_star_event); star_alert.image_alpha=1; star_alert.image_speed=1; @@ -600,7 +520,7 @@ function scr_random_event(execute_now) { star_alert.image_speed=1; star_alert.col="red"; scr_event_log("red","War of Succession on "+string(text)); - evented = true; + _evented = true; } // Flavor text/events @@ -662,7 +582,7 @@ function scr_random_event(execute_now) { } scr_alert("color","lol",text,0,0); scr_event_log("red",text); - evented = true; + _evented = true; } else if (chosen_event == EVENT.warp_storms){ @@ -694,7 +614,7 @@ function scr_random_event(execute_now) { } else{ star_id.storm += time; - evented = true; + _evented = true; var _col = own == 1 ? "red" : "green"; scr_alert(_col, "Warp", $"Warp Storms rage across the {star_id.name} system.", star_id.x, star_id.y); scr_event_log(_col, $"Warp Storms rage across the {star_id.name} system.", star_id.x, star_id.y); @@ -777,17 +697,17 @@ function scr_random_event(execute_now) { } scr_alert("red","enemy", $"{text} forces suddenly appear at {star_id.name} {planet}!",star_id.x,star_id.y); scr_event_log("red",$"{text} forces suddenly appear at {star_id.name} {planet}!",star_id.x,star_id.y); - evented = true; + _evented = true; } } else if ((chosen_event == EVENT.crusade)){ //i think all events should be hanlded like this then we have far more options on when to call them and how they work - evented = launch_crusade(); + _evented = launch_crusade(); } else if (chosen_event == EVENT.enemy) { - evented = make_faction_enemy_event(); + _evented = make_faction_enemy_event(); } else if ((chosen_event == EVENT.mutation)) { @@ -795,7 +715,7 @@ function scr_random_event(execute_now) { log_message("RE: Gene-Seed Mutation"); var text = "The Chapter's gene-seed has mutated! Apothecaries are scrambling to control the damage and prevent further contamination. What is thy will?"; scr_popup("Gene-Seed Mutated!",text,"gene_bad",""); - evented = true; + _evented = true; scr_event_log("red","The Chapter Gene-Seed has mutated."); } @@ -831,15 +751,15 @@ function scr_random_event(execute_now) { } else if (chosen_event == EVENT.necron_awaken){ - evented = awaken_tomb_event(); + _evented = awaken_tomb_event(); } else if(chosen_event == EVENT.fallen){ event_fallen(); - evented = true; + _evented = true; } - if(evented) { + if(_evented) { if(force_inquisition_mission && chosen_event == EVENT.inquisition_mission) { last_mission=turn; } diff --git a/scripts/scr_random_marine/scr_random_marine.gml b/scripts/scr_random_marine/scr_random_marine.gml index c4f0fc8e11..7199353faf 100644 --- a/scripts/scr_random_marine/scr_random_marine.gml +++ b/scripts/scr_random_marine/scr_random_marine.gml @@ -88,12 +88,24 @@ function scr_random_marine(role, exp_req, search_params="none"){ if (struct_exists(search_params, "trait")){ //list of traits (all required) need an option for if only one is required if (is_array(search_params[$ "trait"])){ - for(var trait=0;trait Date: Tue, 15 Jul 2025 21:08:47 +0200 Subject: [PATCH 135/286] feat: Heresy Descriptions Update (#925) --- objects/obj_shop/Create_0.gml | 23 ++++---- objects/obj_tooltip/Draw_75.gml | 10 ++++ .../scr_culture_visuals.gml | 2 +- .../scr_initialize_custom.gml | 2 +- scripts/scr_ruins_reward/scr_ruins_reward.gml | 2 +- scripts/scr_weapon/scr_weapon.gml | 56 +++++++++---------- 6 files changed, 53 insertions(+), 42 deletions(-) diff --git a/objects/obj_shop/Create_0.gml b/objects/obj_shop/Create_0.gml index e45818b41a..ac377fc48c 100644 --- a/objects/obj_shop/Create_0.gml +++ b/objects/obj_shop/Create_0.gml @@ -653,12 +653,6 @@ if (shop = "equipment") { item_stocked[i] = scr_item_count(item[i]); item_cost[i] = 0; forge_cost[i] = 0; - i += 1; - nobuy[i] = 1; - item[i] = "Ancient Jump Pack"; - item_stocked[i] = scr_item_count(item[i]); - item_cost[i] = 0; - forge_cost[i] = 0; i += 1; var mc = 0; @@ -843,12 +837,11 @@ if (research.armour[1].stealth[0] > 0 && research.armour[1].armour[0] > 1 && obj mk_4_tool_tip = tooltip_overide[i]; tooltip_overide[i] += $"STC wargear component 6"; } -i += 1; -item[i] = "Cataphractii"; -item_stocked[i] = scr_item_count("Cataphractii"); -nobuy[i] = 1; + i += 1; + item[i] = "Cataphractii"; + item_stocked[i] = scr_item_count("Cataphractii"); + nobuy[i] = 1; - i += 1; x_mod[i] = 9; item[i] = "Jump Pack"; @@ -860,6 +853,14 @@ nobuy[i] = 1; item_cost[i] = 0; } + i += 1; + x_mod[i] = 9; + nobuy[i] = 1; + item[i] = "Serpha Jump Pack"; + item_stocked[i] = scr_item_count(item[i]); + item_cost[i] = 0; + forge_cost[i] = 0; + i += 1; x_mod[i] = 9; item[i] = "Heavy Weapons Pack"; diff --git a/objects/obj_tooltip/Draw_75.gml b/objects/obj_tooltip/Draw_75.gml index 868e2e9a1e..036d4af143 100644 --- a/objects/obj_tooltip/Draw_75.gml +++ b/objects/obj_tooltip/Draw_75.gml @@ -81,6 +81,16 @@ for (var i=0;i Date: Tue, 15 Jul 2025 20:58:07 +0100 Subject: [PATCH 136/286] feat: Stop and start random event cheats (#926) --- docs/CHEATCODES.md | 2 ++ scripts/scr_chapter_master/scr_chapter_master.gml | 1 + scripts/scr_cheatcode/scr_cheatcode.gml | 6 ++++++ 3 files changed, 9 insertions(+) diff --git a/docs/CHEATCODES.md b/docs/CHEATCODES.md index 2d985ea9ed..bc9541109c 100644 --- a/docs/CHEATCODES.md +++ b/docs/CHEATCODES.md @@ -47,6 +47,8 @@ Arguments with stars `(argument*)` can be omitted. - `surfremove` - triggers inquisition surf removal - `strangebuild` - triggers strange build event - `factionenemy` - triggers the made a faction enemy event + - `stopall` - stops random events + - `startevents` - restart random events - `inquisarti` - triggers the Artifact Loan quest. - `govmission` - spawns governor missions on all planets. - `inquismission (mission*)` - triggers an inquisition mission. You must have met the inquisition for this to work diff --git a/scripts/scr_chapter_master/scr_chapter_master.gml b/scripts/scr_chapter_master/scr_chapter_master.gml index ec28e3ba4a..02b88b5ad4 100644 --- a/scripts/scr_chapter_master/scr_chapter_master.gml +++ b/scripts/scr_chapter_master/scr_chapter_master.gml @@ -7,6 +7,7 @@ function scr_chapter_master() constructor{ static get_struct = function(){ return fetch_unit([0,0]); } + } function cm_obj(){ diff --git a/scripts/scr_cheatcode/scr_cheatcode.gml b/scripts/scr_cheatcode/scr_cheatcode.gml index b36ab22cc8..e351a42f4a 100644 --- a/scripts/scr_cheatcode/scr_cheatcode.gml +++ b/scripts/scr_cheatcode/scr_cheatcode.gml @@ -236,6 +236,12 @@ function scr_cheatcode(argument0) { strange_build_event(); }else if (cheat_arguments[0] == "factionenemy"){ make_faction_enemy_event(); + }else if (cheat_arguments[0] == "stopall"){ + obj_controller.last_event = 1000000; + show_debug_message($"last event : {obj_controller.last_event}") + }else if (cheat_arguments[0] == "startevents"){ + obj_controller.last_event = 0; + show_debug_message($"last event : {obj_controller.last_event}") }else { with (obj_controller) { scr_random_event(false); From 15dbd594037f51fc06f1b4e215f9baaa5cbd21c3 Mon Sep 17 00:00:00 2001 From: Nelsonh <81228864+OH296@users.noreply.github.com> Date: Wed, 16 Jul 2025 18:53:44 +0100 Subject: [PATCH 137/286] fix: send tech marines to mars mission (#927) --- docs/CHEATCODES.md | 14 +- objects/obj_p_fleet/Alarm_1.gml | 7 +- scripts/macros/macros.gml | 2 + scripts/scr_cheatcode/scr_cheatcode.gml | 9 +- .../scr_draw_management_unit.gml | 82 ++++++----- .../scr_fleet_functions.gml | 16 +-- .../scr_marine_struct/scr_marine_struct.gml | 9 +- .../scr_mechanicus_missions.gml | 74 ++++++---- .../scr_mission_functions.gml | 8 +- .../scr_mission_reward/scr_mission_reward.gml | 134 +++++++++++------- .../scr_pen_And_paper/scr_pen_And_paper.gml | 4 +- .../scr_unit_quick_find_pane.gml | 74 +++++----- 12 files changed, 260 insertions(+), 173 deletions(-) diff --git a/docs/CHEATCODES.md b/docs/CHEATCODES.md index bc9541109c..fcf90e217b 100644 --- a/docs/CHEATCODES.md +++ b/docs/CHEATCODES.md @@ -50,7 +50,15 @@ Arguments with stars `(argument*)` can be omitted. - `stopall` - stops random events - `startevents` - restart random events - `inquisarti` - triggers the Artifact Loan quest. -- `govmission` - spawns governor missions on all planets. +- `govmission (mission*)` - spawns governor missions on all planets. run with a mission name to spawn a particular mission + - `provide_garrison` + - `join_communion` + - `hunt_beast` + - `protect_raiders` + - `recover_artifacts` + - `purge_enemies` + - `raid_black_market` + - `show_of_power` - `inquismission (mission*)` - triggers an inquisition mission. You must have met the inquisition for this to work - `planet` - investigate planet mission - `purge` - purge planet mission @@ -60,6 +68,10 @@ Arguments with stars `(argument*)` can be omitted. - `ethereal` - not implemented yet - `tyranid_organism` - capture tyranis mission - `demon` clear demon world mission. Requires at least one planet to have demons on it +- `mechmission (mission*)` - triggers a mechaniicus mission, can be run as is or with an optional missiono parameter to specify a particular mission + - `mech_mars` + - `mech_raider` + - `mech_bionics` ### Disposition: diff --git a/objects/obj_p_fleet/Alarm_1.gml b/objects/obj_p_fleet/Alarm_1.gml index 9ad7ea80eb..064e294e74 100644 --- a/objects/obj_p_fleet/Alarm_1.gml +++ b/objects/obj_p_fleet/Alarm_1.gml @@ -27,7 +27,7 @@ try_and_report_loop("player alarm 1",function(){ } - else if (action="move") or (action="crusade1") or (action="crusade2") or (action="crusade3"){ + else if (array_contains(FLEET_MOVE_OPTIONS, action)){ var i; set_fleet_location("Warp"); @@ -42,8 +42,7 @@ try_and_report_loop("player alarm 1",function(){ y=y+lengthdir_y(spid,dir); action_eta-=1; - just_left=false; - + just_left=false; if (action_eta=0) and (action="crusade1"){ var dr=point_direction(room_width/2,room_height/2,x,y); @@ -58,7 +57,7 @@ try_and_report_loop("player alarm 1",function(){ var enemies = false; for(var i=6;i<13;i++){ if (scr_orbiting_fleet(i)!="none"){ - enemies =true; + enemies = true; break; } } diff --git a/scripts/macros/macros.gml b/scripts/macros/macros.gml index 9bec38f306..0dad3cee58 100644 --- a/scripts/macros/macros.gml +++ b/scripts/macros/macros.gml @@ -21,6 +21,8 @@ #macro FACTION_NAMES ["","Your Chapter", "Imperium of Man","Adeptus Mechanicus","Inquisition","Ecclesiarchy","Eldar","Orks", "Tyranid Hive","Tau Empire","Chaos","Heretics","Genestealer Cults", "Necron Dynasties"] #macro XENOS_FACTIONS [6,7,8,9] +#macro FLEET_MOVE_OPTIONS ["move", "crusade1","crusade2","crusade3", "mars_spelunk1"] + #macro ALLIANCE_GRADES ["Hated", "Hostile","Suspicious","Uneasy","Neutral","Allies","Close Allies","Battle Brothers"] enum eFACTION { diff --git a/scripts/scr_cheatcode/scr_cheatcode.gml b/scripts/scr_cheatcode/scr_cheatcode.gml index e351a42f4a..e080b15e8c 100644 --- a/scripts/scr_cheatcode/scr_cheatcode.gml +++ b/scripts/scr_cheatcode/scr_cheatcode.gml @@ -141,8 +141,13 @@ function scr_cheatcode(argument0) { case "mechmission": show_debug_message("mech_mission"); - spawn_mechanicus_mission(); - break; + + if (array_length(cheat_arguments)){ + spawn_mechanicus_mission(cheat_arguments[0]); + } else { + spawn_mechanicus_mission(); + } + break; case "inquismission": var mission = cheat_arguments[0]; diff --git a/scripts/scr_draw_management_unit/scr_draw_management_unit.gml b/scripts/scr_draw_management_unit/scr_draw_management_unit.gml index c4f28ea1c4..fe59ab4542 100644 --- a/scripts/scr_draw_management_unit/scr_draw_management_unit.gml +++ b/scripts/scr_draw_management_unit/scr_draw_management_unit.gml @@ -1,6 +1,6 @@ function scr_draw_management_unit(selected, yy = 0, xx = 0, draw = true) { var assignment = "none"; - var unit; + var _unit; var string_role = ""; var health_string = ""; var eventing = false; @@ -9,29 +9,33 @@ function scr_draw_management_unit(selected, yy = 0, xx = 0, draw = true) { var is_man = false; if (man[selected] == "man" && is_struct(display_unit[selected])) { is_man = true; - unit = display_unit[selected]; - if (unit.name() == "" || unit.base_group == "none") { + _unit = display_unit[selected]; + if (_unit.name() == "" || _unit.base_group == "none") { return "continue"; } - var unit_specialist = is_specialist(unit.role()); + var unit_specialist = is_specialist(_unit.role()); var unit_location_string = ""; - if (unit.in_jail()) { + if (_unit.in_jail()) { jailed = true; unit_location_string = "=Penitorium="; } else { - var unit_location = unit.marine_location(); - string_role = unit.name_role(); + var unit_location = _unit.marine_location(); + string_role = _unit.name_role(); unit_specialism_option = false; //TODO make static to handle unit_location_string = string(ma_loc[selected]); - if (unit_location[0] == location_types.planet) { - unit_location_string = unit_location[2]; - //get roman numeral for system planet - unit_location_string += scr_roman(unit_location[1]); - } else if (unit_location[0] == location_types.ship) { - unit_location_string = obj_ini.ship[unit_location[1]]; + if (_unit.controllable()){ + if (unit_location[0] == location_types.planet) { + unit_location_string = unit_location[2]; + //get roman numeral for system planet + unit_location_string += scr_roman(unit_location[1]); + } else if (unit_location[0] == location_types.ship) { + unit_location_string = obj_ini.ship[unit_location[1]]; + } + } else { + unit_location_string = ma_loc[selected]; } - assignment = unit.assignment(); + assignment = _unit.assignment(); if (assignment != "none") { unit_location_string += $"({assignment})"; } else if ((fest_planet == 0) && (fest_sid > -1) && (fest_repeats > 0) && (ma_lid[selected] == fest_sid)) { @@ -43,7 +47,7 @@ function scr_draw_management_unit(selected, yy = 0, xx = 0, draw = true) { } } if (draw) { - health_string = $"{round((unit.hp() / unit.max_health()) * 100)}% HP"; + health_string = $"{round((_unit.hp() / _unit.max_health()) * 100)}% HP"; var exp_string = $"{round(ma_exp[selected])} EXP"; @@ -61,23 +65,23 @@ function scr_draw_management_unit(selected, yy = 0, xx = 0, draw = true) { //TODO handle recursively if (ma_armour[selected] != "") { - ma_ar = gear_weapon_data("armour", unit.armour(), "abbreviation"); + ma_ar = gear_weapon_data("armour", _unit.armour(), "abbreviation"); ma_ar = is_string(ma_ar) ? ma_ar : ""; } if (ma_gear[selected] != "") { - ma_ge = gear_weapon_data("gear", unit.gear(), "abbreviation"); + ma_ge = gear_weapon_data("gear", _unit.gear(), "abbreviation"); ma_ge = is_string(ma_ge) ? ma_ge : ""; } if (ma_mobi[selected] != "") { - ma_mb = gear_weapon_data("mobility", unit.mobility_item(), "abbreviation"); + ma_mb = gear_weapon_data("mobility", _unit.mobility_item(), "abbreviation"); ma_mb = is_string(ma_mb) ? ma_mb : ""; } if (ma_wep1[selected] != "") { - ma_we1 = gear_weapon_data("weapon", unit.weapon_one(), "abbreviation"); + ma_we1 = gear_weapon_data("weapon", _unit.weapon_one(), "abbreviation"); ma_we1 = is_string(ma_we1) ? ma_we1 : ""; } if (ma_wep2[selected] != "") { - ma_we2 = gear_weapon_data("weapon", unit.weapon_two(), "abbreviation"); + ma_we2 = gear_weapon_data("weapon", _unit.weapon_two(), "abbreviation"); ma_we2 = is_string(ma_we1) ? ma_we2 : ""; } } @@ -152,38 +156,38 @@ function scr_draw_management_unit(selected, yy = 0, xx = 0, draw = true) { draw_rectangle(xx + 25, yy + 64, xx + 974, yy + 85, 1); if (man[selected] == "man" && is_struct(display_unit[selected])) { if (!unit_specialist) { - var unit = display_unit[selected]; - var _role = unit.role(); - var _experience = unit.experience; + var _unit = display_unit[selected]; + var _role = _unit.role(); + var _experience = _unit.experience; var _data, valid = false; var _circle_coords = [xx + 321, yy + 77]; var _circle_radius = 3; for (var s = 0; s <= 3; s++) { _data = obj_controller.spec_train_data[s]; - var valid = stat_valuator(_data.req, unit); + var valid = stat_valuator(_data.req, _unit); if (valid) { unit_specialism_option = true; var _draw_coords = [_circle_coords[0] + _data.coord_offset[0], _circle_coords[1] + _data.coord_offset[1]]; var _draw_coords_mouse = [_draw_coords[0] - _circle_radius, _draw_coords[1] - _circle_radius, _draw_coords[0] + _circle_radius, _draw_coords[1] + _circle_radius]; - specialistdir = unit.specialist_tooltips(_data.name, _data.min_exp); + specialistdir = _unit.specialist_tooltips(_data.name, _data.min_exp); if (scr_hit(_draw_coords_mouse)) { draw_set_alpha(0.8); if (scr_click_left()) { switch (_data.name) { case "Techmarine": - unit.role_tag[eROLE_TAG.Techmarine] = !unit.role_tag[eROLE_TAG.Techmarine]; + _unit.role_tag[eROLE_TAG.Techmarine] = !_unit.role_tag[eROLE_TAG.Techmarine]; break; case "Librarian": - unit.role_tag[eROLE_TAG.Librarian] = !unit.role_tag[eROLE_TAG.Librarian]; + _unit.role_tag[eROLE_TAG.Librarian] = !_unit.role_tag[eROLE_TAG.Librarian]; break; case "Chaplain": - unit.role_tag[eROLE_TAG.Chaplain] = !unit.role_tag[eROLE_TAG.Chaplain]; + _unit.role_tag[eROLE_TAG.Chaplain] = !_unit.role_tag[eROLE_TAG.Chaplain]; break; case "Apothecary": - unit.role_tag[eROLE_TAG.Apothecary] = !unit.role_tag[eROLE_TAG.Apothecary]; + _unit.role_tag[eROLE_TAG.Apothecary] = !_unit.role_tag[eROLE_TAG.Apothecary]; break; } } @@ -314,10 +318,10 @@ function scr_draw_management_unit(selected, yy = 0, xx = 0, draw = true) { } else { if (man[selected] == "man") { c = managing <= 10 ? managing : 0; - var unit = display_unit[selected]; + var _unit = display_unit[selected]; if ((ma_lid[selected] > -1) && (ma_wid[selected] == 0)) { - draw_sprite(spr_loc_icon, unit.is_boarder ? 2 : 1, xx + 427 + 8, yy + 66); + draw_sprite(spr_loc_icon, _unit.is_boarder ? 2 : 1, xx + 427 + 8, yy + 66); } else if (ma_wid[selected] > 0) { draw_sprite(spr_loc_icon, 0, xx + 427 + 8, yy + 66); } @@ -425,7 +429,7 @@ function scr_draw_management_unit(selected, yy = 0, xx = 0, draw = true) { } if (!wrong_location) { - wrong_location = ma_loc[selected] == "Terra"; + wrong_location = !_unit.controllable(); } var unclickable = eventing || jailed || wrong_location || impossible || instance_exists(obj_star_select); @@ -441,10 +445,10 @@ function scr_draw_management_unit(selected, yy = 0, xx = 0, draw = true) { } else if (sel_all == "man" && is_man) { changed = true; } else if (sel_all == "Command" && is_man) { - if (unit.IsSpecialist(SPECIALISTS_COMMAND)) { + if (_unit.IsSpecialist(SPECIALISTS_COMMAND)) { changed = true; - } else if (unit.squad != "none") { - if (obj_ini.squads[unit.squad].type == "command_squad") { + } else if (_unit.squad != "none") { + if (obj_ini.squads[_unit.squad].type == "command_squad") { changed = true; } } @@ -497,7 +501,7 @@ function scr_draw_management_unit(selected, yy = 0, xx = 0, draw = true) { selecting_planet = ma_wid[selected]; } ma_loc[selected] = selecting_location; - var unit_man_size = is_man ? unit.get_unit_size() : scr_unit_size("", ma_role[selected], true); + var unit_man_size = is_man ? _unit.get_unit_size() : scr_unit_size("", ma_role[selected], true); if (man_sel[selected]) { man_size += unit_man_size; } else { @@ -515,12 +519,12 @@ function scr_draw_management_unit(selected, yy = 0, xx = 0, draw = true) { } if (is_man) { force_tool = 0; - if ((temp[101] == $"{unit.role()} {unit.name}") && ((temp[102] != unit.armour()) || (temp[104] != unit.gear()) || (temp[106] == unit.mobility_item()) || (temp[108] != unit.weapon_one()) || (temp[110] != unit.weapon_two()) || (temp[114] == "refresh"))) { + if ((temp[101] == $"{_unit.role()} {_unit.name}") && ((temp[102] != _unit.armour()) || (temp[104] != _unit.gear()) || (temp[106] == _unit.mobility_item()) || (temp[108] != _unit.weapon_one()) || (temp[110] != _unit.weapon_two()) || (temp[114] == "refresh"))) { force_tool = 1; } - if (((mouse_x >= xx + 25 && mouse_y >= yy + 64 && mouse_x < xx + 974 && mouse_y < yy + 85) || force_tool == 1) && is_struct(unit)) { - temp[120] = unit; // unit_struct + if (((mouse_x >= xx + 25 && mouse_y >= yy + 64 && mouse_x < xx + 974 && mouse_y < yy + 85) || force_tool == 1) && is_struct(_unit)) { + temp[120] = _unit; // unit_struct } } if (!ma_view[selected]) { diff --git a/scripts/scr_fleet_functions/scr_fleet_functions.gml b/scripts/scr_fleet_functions/scr_fleet_functions.gml index 5f0ee9b227..a43582f6c8 100644 --- a/scripts/scr_fleet_functions/scr_fleet_functions.gml +++ b/scripts/scr_fleet_functions/scr_fleet_functions.gml @@ -139,7 +139,7 @@ function is_orbiting(){ return false; } -function set_fleet_movement(fastest_route = true, new_action="move"){ +function set_fleet_movement(fastest_route = true, new_action="move", minimum_eta=1, maximum_eta = 1000){ action = ""; @@ -184,15 +184,15 @@ function set_fleet_movement(fastest_route = true, new_action="move"){ } else if (owner = eFACTION.Inquisition) and (action_eta<2) and (string_count("_her",trade_goods)=0){ action_eta=2; } - - if (owner != eFACTION.Eldar && mine.storm) then action_eta+=10000; + if (is_orbiting()){ + if (owner != eFACTION.Eldar && mine.storm) then action_eta+=10000; + } // action_x=sys.x; // action_y=sys.y; orbiting = false; action=new_action; - minimum_eta=1; - if (minimum_eta>action_eta) and (minimum_eta>0) then action_eta=minimum_eta; + action_eta = clamp(action_eta, minimum_eta, maximum_eta) } } } @@ -495,14 +495,14 @@ function fleet_arrival_logic(){ if (owner == eFACTION.Mechanicus){ - if (string_count("spelunk1",trade_goods)=1){ + if (trade_goods == "mars_spelunk1"){ trade_goods="mars_spelunk2"; action_x=home_x; action_y=home_y; action_eta=52; + action = "move"; exit; - } - if (string_count("spelunk2",trade_goods)=1){ + } else if (trade_goods == "mars_spelunk2"){ // Unload techmarines nao plz scr_mission_reward("mars_spelunk",instance_nearest(home_x,home_y,obj_star),1); instance_destroy(); diff --git a/scripts/scr_marine_struct/scr_marine_struct.gml b/scripts/scr_marine_struct/scr_marine_struct.gml index 92b2636c9f..bfbbffb141 100644 --- a/scripts/scr_marine_struct/scr_marine_struct.gml +++ b/scripts/scr_marine_struct/scr_marine_struct.gml @@ -1933,6 +1933,10 @@ function TTRPG_stats(faction, comp, mar, class = "marine", other_spawn_data = {} return [location_type, location_id, location_name]; }; + static controllable = function(){ + return !location_out_of_player_control(obj_ini.loc[company][marine_number]); + } + //quick way of getting name and role combined in string static name_role = function() { var temp_role = role(); @@ -2014,8 +2018,11 @@ function TTRPG_stats(faction, comp, mar, class = "marine", other_spawn_data = {} static unload = function(planet_number, system) { var current_location = marine_location(); set_last_ship(); + if (!controllable()){ + return; + } if (current_location[0] == location_types.ship) { - if (!array_contains(["Warp", "Terra", "Mechanicus Vessel", "Lost"], current_location[2]) && current_location[2] == system.name) { + if (current_location[2] != "Warp" && current_location[2] == system.name) { obj_ini.loc[company][marine_number] = obj_ini.ship_location[current_location[1]]; planet_location = planet_number; ship_location = -1; diff --git a/scripts/scr_mechanicus_missions/scr_mechanicus_missions.gml b/scripts/scr_mechanicus_missions/scr_mechanicus_missions.gml index 29ecb5ee1c..962ab44777 100644 --- a/scripts/scr_mechanicus_missions/scr_mechanicus_missions.gml +++ b/scripts/scr_mechanicus_missions/scr_mechanicus_missions.gml @@ -112,17 +112,25 @@ function mechanicus_missions_end_turn(planet){ if (_unit.role()=obj_ini.role[100][eROLE.Techmarine]){ // Case 1: on planet if (obj_ini.loc[com][ide]=name) and (_unit.planet_location=planet){ - p_player[planet]-=scr_unit_size(obj_ini.armour[com][ide],obj_ini.role[com][ide],true); + p_player[planet]-=_unit.get_unit_size(); obj_ini.loc[com][ide]="Mechanicus Vessel"; _unit.planet_location=0; _unit.ship_location=-1; + _unit.job = { + type : "mechanicus mission", + } techs_taken+=1; } if (_unit.ship_location>-1){ ship_planet=obj_ini.ship_location[_unit.ship_location]; if (ship_planet=name){ - obj_ini.ship_carrying[_unit.ship_location]-=scr_unit_size(obj_ini.armour[com][ide],obj_ini.role[com][ide],true); - obj_ini.loc[com][ide]="Mechanicus Vessel";_unit.planet_location=0;_unit.ship_location=0; + obj_ini.ship_carrying[_unit.ship_location]-=_unit.get_unit_size(); + obj_ini.loc[com][ide]="Mechanicus Vessel"; + _unit.planet_location=0; + _unit.ship_location=-1; + _unit.job = { + type : "mechanicus mission", + } techs_taken+=1; } } @@ -139,22 +147,30 @@ function mechanicus_missions_end_turn(planet){ else if (techs_taken>0){ - if (techs_taken>=20) then obj_controller.disposition[3]+=max(techs_taken,4); - var taxt="Mechanicus Ship departs for the Mars catacombs. Onboard are "+string(techs_taken)+" of your "+string(obj_ini.role[100][16])+"s."; - scr_alert("","mission",taxt,0,0); - scr_event_log("green",taxt); + if (techs_taken>=5){ + obj_controller.disposition[3]+=max(techs_taken,4); + } + var _text=$"Mechanicus Ship departs for the Mars catacombs. Onboard are {techs_taken} of your {obj_ini.role[100][16]}s."; + scr_alert("","mission",_text,0,0); + scr_event_log("green",_text); + var flit=instance_create(x,y,obj_en_fleet); + + with (flit){ + owner = eFACTION.Mechanicus; + sprite_index=spr_fleet_mechanicus; + capital_number=1; + image_index=0; + image_speed=0; + trade_goods="mars_spelunk1"; + home_x=x; + home_y=y; + action_x=x+lengthdir_x(3000,obj_controller.terra_direction); + action_y=y+lengthdir_y(3000,obj_controller.terra_direction); + set_fleet_movement(false, "move", 48, 48); + } + } - - var flit=instance_create(x,y,obj_en_fleet); - flit.owner = eFACTION.Mechanicus; - flit.sprite_index=spr_fleet_mechanicus; - flit.capital_number=1;flit.image_index=0;flit.image_speed=0; - flit.trade_goods="mars_spelunk1"; - flit.home_x=x; - flit.home_y=y; - flit.action_x=x+lengthdir_x(3000,obj_controller.terra_direction); - flit.action_y=y+lengthdir_y(3000,obj_controller.terra_direction); - flit.action="move";flit.action_eta=48; + } if (has_problem_planet_and_time(planet,"mech_tomb1", 0)>-1){ var alert_text="Mechanicus Mission Failed: Necron Tomb Study at "+string(name)+" "+scr_roman(planet)+"."; @@ -180,7 +196,7 @@ function mechanicus_missions_end_turn(planet){ } -function spawn_mechanicus_mission(){ +function spawn_mechanicus_mission(chosen_mission = "random"){ log_message("RE: Mechanicus Mission"); var mechanicus_missions = [] var _evented @@ -210,12 +226,14 @@ function spawn_mechanicus_mission(){ } var mission_count = array_length(mechanicus_missions); - if(mission_count == 0){ + if (mission_count == 0 && chosen_mission== "random"){ log_error("RE: Mechanicus Mission, couldn't pick mission"); exit; } - var chosen_mission = array_random_element(mechanicus_missions); + if (chosen_mission == "random"){ + chosen_mission = array_random_element(mechanicus_missions); + } if (chosen_mission == "mech_bionics" || chosen_mission == "mech_raider" || chosen_mission == "mech_mars"){ @@ -242,7 +260,7 @@ function spawn_mechanicus_mission(){ _evented = true; } else { - var text=$"The local Adeptus Mechanicus are preparing to embark on a voyage to Mars, to delve into the catacombs in search of lost technology. Due to your close relations they have made the offer to take some of your {obj_ini.role[100][16]}s with them. Can your chapter handle this mission?"; + var text=$"The local Adeptus Mechanicus are preparing to embark on a voyage to Mars, to delve into the catacombs in search of lost technology. Due to your close relations they have made the offer to take some of your {obj_ini.role[100][16]}s with them for both their unique abilities to function as both scientific helpers and as helpers (high Weapon Skill and Technology is reccomended). Can your chapter handle this mission?"; scr_popup("Mechanicus Mission",text,"mechanicus",mission_data); _evented = true; } @@ -321,23 +339,25 @@ function mechanicus_mission_procedures(){ if (_planet.current_owner == 3 && _forge_planet) { var _mission_loc = _planet.name(); + var _nearest_fleet = instance_nearest(_star.x, _star.y, obj_p_fleet); + var _mission_time = get_viable_travel_time(5, _nearest_fleet.x, _nearest_fleet.y, _star.x, _star.y, _nearest_fleet, false); if (mission == "mech_raider") { - _planet.add_problem("mech_raider", 49, { + _planet.add_problem("mech_raider", _mission_time, { completion: 0, required_months :24 }); text = $"The Adeptus Mechanicus await your forces at {_mission_loc}. They are expecting six {obj_ini.role[100][16]}s and a Land Raider."; - scr_event_log("", $"Mechanicus Mission Accepted: Six of your {obj_ini.role[100][16]}s and a Land Raider are to be stationed at {_mission_loc} for 24 months.", _star.name); + scr_event_log("", $"Mechanicus Mission Accepted: Six of your {obj_ini.role[100][16]}s and a Land Raider are to be stationed at {_mission_loc} for {_mission_time} months.", _star.name); } else if (mission == "mech_bionics") { - _planet.add_problem("mech_bionics", 49, { + _planet.add_problem("mech_bionics", _mission_time, { completion: 0, required_months :24 }) text = $"The Adeptus Mechanicus await your forces at {_mission_loc}. They are expecting ten Astartes with bionics. (Beneficial traits: Weakness of Flesh )"; scr_event_log("", $"Mechanicus Mission Accepted: Ten Astartes with bionics are to be stationed at {_mission_loc} for 24 months for testing purposes.", _star.name); } else if (mission == "mech_mars") { - _planet.add_problem("mech_mars", 31 ) - text = $"The Adeptus Mechanicus await your {obj_ini.role[100][16]}s at {_mission_loc}. They are willing to hold on the voyage for up to 12 months."; + _planet.add_problem("mech_mars", _mission_time ) + text = $"The Adeptus Mechanicus await your {obj_ini.role[100][16]}s at {_mission_loc}. They are willing to hold on the voyage for up to {_mission_time} months."; scr_event_log("", $"Mechanicus Mission Accepted: {obj_ini.role[100][16]}s are expected at {_mission_loc} within 30 months, for the voyage to Mars.", _star.name); } with (_star) { diff --git a/scripts/scr_mission_functions/scr_mission_functions.gml b/scripts/scr_mission_functions/scr_mission_functions.gml index 4056306e83..82a2e6c9fd 100644 --- a/scripts/scr_mission_functions/scr_mission_functions.gml +++ b/scripts/scr_mission_functions/scr_mission_functions.gml @@ -5,6 +5,12 @@ function MissionHandler(planet, system) : PlanetData(planet, system) constructor{ } + + +function location_out_of_player_control(unit_loc){ + static _locs = ["Terra", "Mechanicus Vessel", "Lost", "Mars"]; + return (array_contains(_locs,unit_loc )); +} function mission_name_key(mission){ var mission_key = { "meeting_trap" : "Chaos Lord Meeting", @@ -54,7 +60,7 @@ function scr_new_governor_mission(planet, problem = ""){ problem = choose("hunt_beast", "provide_garrison"); accept_time = 6+irandom(30); } else if (planet_type == "Hive"){ - problem = choose("Show_of_power", "provide_garrison", "purge_enemies", "raid_black_market"); + problem = choose("show_of_power", "provide_garrison", "purge_enemies", "raid_black_market"); } else if (planet_type == "Temperate"){ problem = choose("provide_garrison", "train_forces", "join_parade"); }else if (planet_type == "Shrine"){ diff --git a/scripts/scr_mission_reward/scr_mission_reward.gml b/scripts/scr_mission_reward/scr_mission_reward.gml index f10577f195..381065fd3a 100644 --- a/scripts/scr_mission_reward/scr_mission_reward.gml +++ b/scripts/scr_mission_reward/scr_mission_reward.gml @@ -14,42 +14,64 @@ function scr_mission_reward(mission, star, planet) { if (mission="mars_spelunk"){ - var roll1,roll2,techs_lost,techs_alive,found_stc,found_artifact,found_requisition; - var com,i,onceh;onceh=0;com=-1;i=0; - roll1=floor(random(100))+1;// For the first STC - found_stc=0;found_artifact=0;found_requisition=0;techs_lost=0;techs_alive=0; - - repeat(11){com+=1;i=0; - repeat(300){i+=1; - if (obj_ini.role[com][i]=obj_ini.role[100][16]) and (obj_ini.loc[com][i]="Mechanicus Vessel"){ - roll2=roll_dice_chapter(1, 100, "high"); - - if (roll2<=50){obj_controller.command-=1;techs_lost+=1; - kill_and_recover(com, i, true, false); - cleanup[com]=1; - } - if (roll2>50){ - var unit = obj_ini.TTRPG[com][i]; - star.p_player[planet]+=unit.get_unit_size(); - obj_ini.loc[com][i]=star.name; - unit.planet_location=planet; - techs_alive+=1; - unit.add_experience(irandom_range(3,18)); - if (roll2<80) then found_requisition+=floor(random_range(5,40))+1; - } - if (roll2>=80) and (roll2<88) then found_requisition+=100; - if (roll2>=88) and (roll2<96){ - var last_artifact = scr_add_artifact("random", "", 4); - found_artifact+=1; - } - if (roll2>=96){ - scr_add_stc_fragment();// STC here - found_stc+=1; - } - } - } + + + var roll1=roll_dice_chapter(1, 100, "high");;// For the first STC + var found_stc=0,found_artifact=0,found_requisition=0; + var techs_lost=0, techs_alive=0; + + var _conditions = {job : "mecanicus mission"} + var _techs = collect_role_group(SPECIALISTS_TECHS, star.name, false, _conditions); + + var _tech_point_gain = 0; + + + for (var i=0;i0){ + found_requisition+=irandom_range(5,40); + } + } + if (_tech_roll>=10) and (_tech_roll<15){ + found_requisition+=100; + } + if (_tech_roll>=15) and (_tech_roll<25){ + var last_artifact = scr_add_artifact("random", "", 4); + found_artifact+=1; + } + if (_tech_roll>=25){ + scr_add_stc_fragment();// STC here + found_stc+=1; + } } + obj_controller.requisition+=found_requisition; if (techs_alive+techs_lost>=2) and (techs_alive>0){ if (roll1>=(40+(techs_alive+techs_lost)*5)){ @@ -58,21 +80,31 @@ function scr_mission_reward(mission, star, planet) { } } - var tixt;tixt="The journey into the Mars Catacombs was a success. Your "+string(techs_alive)+" remaining "+string(obj_ini.role[100][16])+"s were useful to the Mechanicus force and return with a bounty. They await retrieval at "+string(star.name)+" "+scr_roman(planet)+".#"; - tixt+="#"+string(found_requisition)+" Requisition from salvage"; - if (found_artifact!=1) then tixt+="#"+string(found_artifact)+" Unidentified Artifacts recovered"; - if (found_artifact=1) then tixt+="#"+string(found_artifact)+" Unidentified Artifact recovered"; - if (found_stc!=1) then tixt+="#"+string(found_stc)+" STC Fragments recovered"; - if (found_stc=1) then tixt+="#"+string(found_stc)+" STC Fragment recovered"; + var tixt=$"The journey into the Mars Catacombs was a success. Your {techs_alive} remaining {obj_ini.role[100][16]}s were useful to the Mechanicus force and return with a bounty. They await retrieval at {star.name} {scr_roman(planet)}.\n"; + tixt+=$"\n{found_requisition} Requisition from salvage"; + if (found_artifact > 0){ + tixt+=$"\n{string_plural("Unidentified Artifacts" ,found_artifact)} recovered"; + } + if (found_stc > 0){ + tixt+=$"\n{string_plural("STC Fragment" ,found_stc)} recovered"; + } + + if (_tech_point_gain){ + tixt+=$"\n{string_plural("Tech Point" ,_tech_point_gain)} recovered"; + } scr_popup("Mechanicus Mission Completed",tixt,"mechanicus",""); - tixt="Mechanicus Mission Completed: "+string(techs_alive)+"/"+string(techs_alive+techs_lost)+" of your "+string(obj_ini.role[100][16])+"s return with "; + tixt="Mechanicus Mission Completed: {techs_alive}/{techs_alive+techs_lost} of your {obj_ini.role[100][16]}s return with "; tixt+=string(found_requisition)+" Requisition, "; - if (found_artifact!=1) then tixt+=string(found_artifact)+" Unidentified Artifacts, "; - if (found_artifact=1) then tixt+=string(found_artifact)+" Unidentified Artifact, "; - if (found_stc!=1) then tixt+=" and "+string(found_stc)+" STC Fragments."; - if (found_stc=1) then tixt+=" and "+string(found_stc)+" STC Fragment."; - + if (found_artifact > 0){ + tixt+=$"\n{found_artifact} : {string_plural("Unidentified Artifacts" ,found_artifact)} recovered"; + } + if (found_stc > 0){ + tixt+=$"\n{found_stc} : {string_plural("STC Fragment" ,found_stc)} recovered"; + } + if (_tech_point_gain){ + tixt+=$"\n{_tech_point_gain} {string_plural("Tech Point" ,_tech_point_gain)} gained"; + } // scr_alert("green","mission",tixt,star.x,star.y,); scr_event_log("green",tixt); @@ -80,8 +112,7 @@ function scr_mission_reward(mission, star, planet) { if (found_artifact>1) then scr_event_log("",string(found_artifact)+" Artifacts recovered from Mars Catacombs."); if (found_stc=1) then scr_event_log("","STC Fragment recovered from Mars Catacombs."); if (found_stc>1) then scr_event_log("",string(found_artifact)+" STC Fragments recovered from Mars Catacombs.");*/ - - i=-1;repeat(11){i+=1;if (cleanup[i]=1){obj_controller.temp[3000]=real(i);with(obj_ini){scr_vehicle_order(obj_controller.temp[3000]);}}} + sort_all_companies_to_map(cleanup); } @@ -98,7 +129,7 @@ function scr_mission_reward(mission, star, planet) { if (roll1>66) then result="Requisition"; if (result="New"){ - scr_popup("Mechanicus Mission Completed","Your "+string(obj_ini.role[100][16])+" have worked with the Adeptus Mechanicus in a satisfactory manor. The testing and training went well, but your Land Raider was ultimately lost. 300 Requisition has been given to your Chapter and relations are better than before.","mechanicus",""); + scr_popup("Mechanicus Mission Completed",$"Your {obj_ini.role[100][16]} have worked with the Adeptus Mechanicus in a satisfactory manor. The testing and training went well, but your Land Raider was ultimately lost. 300 Requisition has been given to your Chapter and relations are better than before.","mechanicus",""); obj_controller.requisition+=300;obj_controller.disposition[3]+=2; var com,i,onceh;onceh=0;com=-1;i=0; repeat(11){ @@ -107,7 +138,8 @@ function scr_mission_reward(mission, star, planet) { if (obj_ini.veh_role[com][i]="Land Raider") and (obj_ini.veh_loc[com][i]=star.name) and (obj_ini.veh_wid[com][i]=planet){ onceh=1; obj_ini.veh_race[com][i]=0; - obj_ini.veh_loc[com][i]="";obj_ini.veh_name[com][i]="";obj_ini.veh_role[com][i]=""; + obj_ini.veh_loc[com][i]="";obj_ini.veh_name[com][i]=""; + obj_ini.veh_role[com][i]=""; obj_ini.veh_lid[com][i]=-1; obj_ini.veh_wid[com][i]=0; obj_ini.veh_wep1[com][i]=""; @@ -172,7 +204,7 @@ function scr_mission_reward(mission, star, planet) { cleanup[_unit.company]=1; } } - var unit; + if (result=="Bionics" || result=="Requisition"){ var _new_bionics = irandom_range(40,100); obj_controller.disposition[3]+=1; diff --git a/scripts/scr_pen_And_paper/scr_pen_And_paper.gml b/scripts/scr_pen_And_paper/scr_pen_And_paper.gml index 8dd51a8b23..d205ca01f1 100644 --- a/scripts/scr_pen_And_paper/scr_pen_And_paper.gml +++ b/scripts/scr_pen_And_paper/scr_pen_And_paper.gml @@ -87,10 +87,10 @@ function PenAndPaperSim() constructor{ var _reroll = test_rerollable(unit, stat); difficulty_mod+=evaluate_tags(unit, tags); var random_roll = irandom_range(1,100); - if (_reroll && random_roll>=unit[$ stat]+difficulty_mod){ + if (_reroll && random_roll >= unit[$ stat]+difficulty_mod){ random_roll = irandom_range(1,100); } - if (random_roll-1){ - obj_ini.ship_carrying[unit.ship_location]+=unit.get_unit_size(); + if (_unit.ship_location<_ship_count && _unit.ship_location>-1){ + obj_ini.ship_carrying[_unit.ship_location]+=_unit.get_unit_size(); } } } @@ -61,17 +61,17 @@ function UnitQuickFindPanel() constructor{ if (obj_ini.veh_race[co][u]==0) then continue; if (obj_ini.veh_wid[co][u]>0){ unit_location = obj_ini.veh_loc[co][u]; - unit = [co, u]; + _unit = [co, u]; if (!struct_exists(garrison_log, unit_location)){ garrison_log[$ unit_location] = { - units:[unit], + units:[_unit], vehicles:1, garrison:false, healers:0, techies:0 } } else { - array_push(garrison_log[$ unit_location].units, unit); + array_push(garrison_log[$ unit_location].units, _unit); garrison_log[$ unit_location].vehicles++; } } else if (obj_ini.veh_lid[co][u]>-1){ @@ -530,10 +530,10 @@ function toggle_selection_borders(){ for(var p=0; p-1) and (obj_ini.loc[unit.company][mar_id]!="Mechanicus Vessel"){ - unit.is_boarder = !unit.is_boarder; + var _unit=display_unit[p]; + var mar_id = _unit.marine_number; + if (_unit.ship_location>-1) and (obj_ini.loc[_unit.company][mar_id]!="Mechanicus Vessel"){ + _unit.is_boarder = !_unit.is_boarder; } } } @@ -545,13 +545,13 @@ function add_bionics_selection(){ if (bionics_before>0){ for(var p=0; p Date: Thu, 17 Jul 2025 10:24:56 +0300 Subject: [PATCH 138/286] fix: Chapter management crash (#928) --- scripts/scr_draw_management_unit/scr_draw_management_unit.gml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/scr_draw_management_unit/scr_draw_management_unit.gml b/scripts/scr_draw_management_unit/scr_draw_management_unit.gml index fe59ab4542..3194a86c30 100644 --- a/scripts/scr_draw_management_unit/scr_draw_management_unit.gml +++ b/scripts/scr_draw_management_unit/scr_draw_management_unit.gml @@ -428,7 +428,7 @@ function scr_draw_management_unit(selected, yy = 0, xx = 0, draw = true) { } } - if (!wrong_location) { + if (is_man && !wrong_location) { wrong_location = !_unit.controllable(); } From 3efd77658c9800f03110c8918aab369dfbacd01a Mon Sep 17 00:00:00 2001 From: Nelsonh <81228864+OH296@users.noreply.github.com> Date: Fri, 18 Jul 2025 14:55:12 +0100 Subject: [PATCH 139/286] chore: unneeded battle_roster script deleted (#930) --- ChapterMaster.yyp | 1 - .../scr_battle_roster/scr_battle_roster.gml | 142 ------------------ .../scr_battle_roster/scr_battle_roster.yy | 13 -- 3 files changed, 156 deletions(-) delete mode 100644 scripts/scr_battle_roster/scr_battle_roster.gml delete mode 100644 scripts/scr_battle_roster/scr_battle_roster.yy diff --git a/ChapterMaster.yyp b/ChapterMaster.yyp index 2ee619c08b..43464f12ae 100644 --- a/ChapterMaster.yyp +++ b/ChapterMaster.yyp @@ -750,7 +750,6 @@ {"id":{"name":"scr_arti_descr","path":"scripts/scr_arti_descr/scr_arti_descr.yy",},}, {"id":{"name":"scr_audience","path":"scripts/scr_audience/scr_audience.yy",},}, {"id":{"name":"scr_battle_allies","path":"scripts/scr_battle_allies/scr_battle_allies.yy",},}, - {"id":{"name":"scr_battle_roster","path":"scripts/scr_battle_roster/scr_battle_roster.yy",},}, {"id":{"name":"scr_battle_sort","path":"scripts/scr_battle_sort/scr_battle_sort.yy",},}, {"id":{"name":"scr_bionics_count","path":"scripts/scr_bionics_count/scr_bionics_count.yy",},}, {"id":{"name":"scr_boarding_actions","path":"scripts/scr_boarding_actions/scr_boarding_actions.yy",},}, diff --git a/scripts/scr_battle_roster/scr_battle_roster.gml b/scripts/scr_battle_roster/scr_battle_roster.gml deleted file mode 100644 index 84a04f220b..0000000000 --- a/scripts/scr_battle_roster/scr_battle_roster.gml +++ /dev/null @@ -1,142 +0,0 @@ -function scr_battle_roster(required_location, _target_location, _is_planet, overide_list) { - - // Determines who all will be present for the battle - - // argument 0 : planet or ship name - // argument 1 : world number (wid) - // argument 2 : is it a planet? boolean - - //-------------------------------------------------------------------------------------------------------------------- - // Global objects used. - //-------------------------------------------------------------------------------------------------------------------- - var func = function(required_location, _target_location, _is_planet){ - new_combat = obj_ncombat; - //???=obj_drop_select; - //???=obj_controller - //-------------------------------------------------------------------------------------------------------------------- - - // show_message("Container:"+string(_battle_loci)+", number:"+string(_loci_specific)+", planet?:"+string(_is_planet)); - - var stop, okay , unit, unit_location, _u_role,column_decided,squad; - stop = 0; - okay = 0; - var _spyrer_mission = string_count("spyrer", new_combat.battle_special); - - - // Formation here - setup_battle_formations(); - - var v = 0; - var _meeting = false; - - instance_activate_object(obj_pnunit); - - //For each company and the HQ - for (var company=0;company<=10;company++){ - if (new_combat.man_limit_reached) { - break; - } - for (v=0;v 0) or(new_combat.battle_special == "space_hulk") or(string_count("chaos_meeting", new_combat.battle_special) > 0); - if (_not_dread_advised) { - var _u_armour = unit.get_armour_data(); - if (is_struct(_u_armour)){ - if (_u_armour.has_tag("dreadnought")){ - okay = -1; - } - } - } - if (_spyrer_mission > 0) { - if (okay == 1) and(array_length(new_combat.unit_struct)) then okay = -1; - } - - //Normal and other battle cases checks go here - else if (okay >= 0) { - if (instance_exists(obj_ground_mission)) { //Exploring ruins ambush case - if (obj_ini.loc[company][v] == required_location) and(unit.planet_location == _target_location) { - okay = 1; - } else { - continue; - } - } else if (!instance_exists(obj_drop_select)) { // Only when attacked, normal battle - if (_is_planet) and(obj_ini.loc[company][v] == required_location) and(unit.planet_location == _target_location) then okay = 1; - else if (!_is_planet) and(unit.ship_location == _target_location) then okay = 1; - - if (instance_exists(obj_temp_meeting)) { - _meeting = true; - if (company == 0) and(v <= obj_temp_meeting.dudes) and(obj_temp_meeting.present[v] == 1) then okay = 1; - else if (company > 0) or(v > obj_temp_meeting.dudes) then okay = 0; - } - } else if (instance_exists(obj_drop_select)) { // When attacking, normal battle - //If not fighting (obj_drop_select pre-check), we skip the unit - - if (obj_drop_select.attack == 1) { - if (_is_planet) and(obj_ini.loc[company][v] == required_location) and(unit.planet_location == _target_location) then okay = 1; - else if (!_is_planet) and(unit.ship_location == _target_location) then okay = 1; - } else if (obj_drop_select.attack != 1) { - //Related to defensive battles (¿?). Without the above check, it duplicates marines on offensive ones. - if (obj_drop_select.fighting[company][v] == 1) and(unit.ship_location == _target_location) then okay = 1; - } - } - } - - // Start adding unit to battle - if (okay >= 1) { - - add_unit_to_battle(unit, _meeting); - // Vehicle checks - } - } - for (v=0;v 0) then vokay = 1; - - if (instance_exists(obj_drop_select)) { - if (obj_drop_select.attack = 0) then vokay = 0; - } - - - // if (obj_ncombat.veh_fighting[company,v]=1) then vokay=2;// Fuck on me, AI - - if (vokay >= 1) and(new_combat.dropping = 0) { - add_vehicle_to_battle(company, v) - } - } - - } - } - } - - try_and_report_loop("battle roster collection",func, false,[required_location, _target_location, _is_planet]); -} \ No newline at end of file diff --git a/scripts/scr_battle_roster/scr_battle_roster.yy b/scripts/scr_battle_roster/scr_battle_roster.yy deleted file mode 100644 index bbbf10d1fb..0000000000 --- a/scripts/scr_battle_roster/scr_battle_roster.yy +++ /dev/null @@ -1,13 +0,0 @@ -{ - "$GMScript":"v1", - "%Name":"scr_battle_roster", - "isCompatibility":false, - "isDnD":false, - "name":"scr_battle_roster", - "parent":{ - "name":"Combat", - "path":"folders/Scripts/Combat.yy", - }, - "resourceType":"GMScript", - "resourceVersion":"2.0", -} \ No newline at end of file From 805a7ad002173ead959ea38db80771151fb7d5c0 Mon Sep 17 00:00:00 2001 From: Nelsonh <81228864+OH296@users.noreply.github.com> Date: Fri, 18 Jul 2025 14:55:30 +0100 Subject: [PATCH 140/286] fix: Event eid check comparing string to int (#929) --- scripts/scr_event_code/scr_event_code.gml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/scripts/scr_event_code/scr_event_code.gml b/scripts/scr_event_code/scr_event_code.gml index b1d28a65be..bd55ce0ade 100644 --- a/scripts/scr_event_code/scr_event_code.gml +++ b/scripts/scr_event_code/scr_event_code.gml @@ -42,7 +42,7 @@ function event_end_turn_action(){ obj_controller.alarm[8]=1; } // Removes planetary governor installed by the chapter - if (_event.e_id == "remove_surf">0){ + if (_event.e_id == "remove_surf"){ var _star_name = _event.system; var _event_star = star_by_name(_event.system); @@ -58,28 +58,28 @@ function event_end_turn_action(){ } } // Changes relation to good - if (_event.e_id=="enemy_imperium"){ + else if (_event.e_id=="enemy_imperium"){ scr_alert("green","enemy","You have made amends with your enemy in the Imperium.",0,0); disposition[eFACTION.Imperium]+=20; scr_event_log("","Amends made with Imperium."); } - if (_event.e_id=="enemy_mechanicus"){ + else if (_event.e_id=="enemy_mechanicus"){ scr_alert("green","enemy","You have made amends with your Mechanicus enemy.",0,0); disposition[eFACTION.Mechanicus]+=20; scr_event_log("","Amends made with Mechanicus enemy."); } - if (_event.e_id=="enemy_inquisition"){ + else if (_event.e_id=="enemy_inquisition"){ scr_alert("green","enemy","You have made amends with your enemy in the Inquisition.",0,0); disposition[eFACTION.Inquisition]+=20; scr_event_log("","Amends made with Inquisition enemy."); } - if (_event.e_id=="enemy_ecclesiarchy"){ + else if (_event.e_id=="enemy_ecclesiarchy"){ scr_alert("green","enemy","You have made amends with your enemy in the Ecclesiarchy.",0,0); disposition[eFACTION.Ecclesiarchy]+=20; scr_event_log("","Amends made with Ecclesiarchy enemy."); } // Sector commander losses its mind - if (_event.e_id=="imperium_daemon"){ + else if (_event.e_id=="imperium_daemon"){ var alert_string = $"Sector Commander {faction_leader[eFACTION.Imperium]} has gone insane." scr_alert("red","lol",alert_string,0,0); faction_defeated[eFACTION.Imperium]=1; From 456358894d124700c915fc7c7be5c7808a5ecf9d Mon Sep 17 00:00:00 2001 From: Nelsonh <81228864+OH296@users.noreply.github.com> Date: Fri, 18 Jul 2025 15:37:52 +0100 Subject: [PATCH 141/286] chore: Phase out use of ini.loc (#931) Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com> --- objects/obj_controller/Step_0.gml | 2 +- objects/obj_creation/Create_0.gml | 1 - objects/obj_dropdown_sel/Step_0.gml | 9 ++++---- objects/obj_en_fleet/Alarm_1.gml | 14 ++++++------- objects/obj_ncombat/Alarm_7.gml | 6 +++--- .../scr_bionics_count/scr_bionics_count.gml | 7 ++++--- .../scr_company_order/scr_company_order.gml | 2 -- scripts/scr_count_forces/scr_count_forces.gml | 13 ++++++------ .../scr_destroy_planet/scr_destroy_planet.gml | 2 +- scripts/scr_dialogue/scr_dialogue.gml | 2 +- scripts/scr_enemy_ai_e/scr_enemy_ai_e.gml | 9 ++++---- scripts/scr_event_code/scr_event_code.gml | 2 +- scripts/scr_event_dudes/scr_event_dudes.gml | 2 +- .../scr_fleet_functions.gml | 2 +- .../scr_initialize_custom.gml | 8 +++---- .../scr_inquisition_fleet_functions.gml | 2 +- scripts/scr_kill_unit/scr_kill_unit.gml | 1 - scripts/scr_marine_count/scr_marine_count.gml | 2 +- .../scr_marine_struct/scr_marine_struct.gml | 21 ++++++++++--------- scripts/scr_master_loc/scr_master_loc.gml | 2 +- .../scr_mechanicus_missions.gml | 6 +++--- .../scr_mission_reward/scr_mission_reward.gml | 2 +- .../scr_move_unit_info/scr_move_unit_info.gml | 1 - .../scr_player_fleet_functions.gml | 2 +- .../scr_player_ship_functions.gml | 2 +- scripts/scr_role_count/scr_role_count.gml | 6 +++--- .../scr_specialist_training.gml | 4 ++-- .../scr_system_spawn_functions.gml | 2 +- scripts/scr_ui_advisors/scr_ui_advisors.gml | 2 +- .../scr_unit_quick_find_pane.gml | 2 +- 30 files changed, 67 insertions(+), 71 deletions(-) diff --git a/objects/obj_controller/Step_0.gml b/objects/obj_controller/Step_0.gml index 39c652e45b..651c102c96 100644 --- a/objects/obj_controller/Step_0.gml +++ b/objects/obj_controller/Step_0.gml @@ -795,7 +795,7 @@ try { } unit_id = unit.marine_number; company = unit.company; - obj_ini.loc[company][unit_id] = obj_ini.ship_location[b]; + unit.location_string = obj_ini.ship_location[b]; unit.ship_location = -1; unit.planet_location = unload; obj_ini.uid[company][unit_id] = 0; diff --git a/objects/obj_creation/Create_0.gml b/objects/obj_creation/Create_0.gml index a0ebb5e54b..e06b1e3333 100644 --- a/objects/obj_creation/Create_0.gml +++ b/objects/obj_creation/Create_0.gml @@ -1073,7 +1073,6 @@ dis_num = array_create(9, 0); for(var slot = 99; slot <= 103; slot++){ for(var i = 0; i <= 50; i++){ race[slot,i]=1; - loc[slot,i]=""; role[slot,i]=""; wep1[slot,i]=""; wep2[slot,i]=""; diff --git a/objects/obj_dropdown_sel/Step_0.gml b/objects/obj_dropdown_sel/Step_0.gml index 96569f16d9..63bfafdc4e 100644 --- a/objects/obj_dropdown_sel/Step_0.gml +++ b/objects/obj_dropdown_sel/Step_0.gml @@ -101,20 +101,21 @@ if (target="event_loc") and (determined_planets=0){ coo+=1;ide=0; repeat(300){ide+=1; - if (obj_ini.role[coo][ide]!=obj_ini.role[100][6]) and (obj_ini.role[coo][ide]!="Venerable "+string(obj_ini.role[100][6])) and (obj_ini.TTRPG[coo][ide].planet_location>0){ + var _unit = fetch_unit([coo, ide]); + if (_unit.role()!=obj_ini.role[100][6]) and (_unit.role()!="Venerable "+string(obj_ini.role[100][6])) and (_unit.planet_location>0){ var stahp,first_open;stahp=0;q=0;first_open=0; repeat(100){ if (stahp=0){q+=1; if (star[q]="") and (first_open=0) then first_open=q; - if (star[q]=obj_ini.loc[coo][ide]) and (star_planet[q]=obj_ini.TTRPG[coo][ide].planet_location){ + if (star[q]=_unit.location_string && star_planet[q]=_unit.planet_location){ stahp=1;star_mahreens[q]+=1; } } } if (stahp=0){ - star[first_open]=obj_ini.loc[coo][ide]; - star_planet[first_open]=obj_ini.TTRPG[coo][ide].planet_location; + star[first_open]=_unit.location_string; + star_planet[first_open]=_unit.planet_location; star_marheens[first_open]=1; } } diff --git a/objects/obj_en_fleet/Alarm_1.gml b/objects/obj_en_fleet/Alarm_1.gml index ec65d11fc1..64cc580801 100644 --- a/objects/obj_en_fleet/Alarm_1.gml +++ b/objects/obj_en_fleet/Alarm_1.gml @@ -637,19 +637,19 @@ if (action=="" && _is_orbiting){ // Check for xenos or demon-equip items on those planets //TODO update this to check weapon or artifact tags var e=0,ia=-1,ca=0; - var unit; + var _unit; repeat(4400){ if (ca<=10) and (ca>=0){ ia+=1; if (ia=400){ca+=1;ia=1; if (ca=11) then ca=-5;} if (ca>=0) and (ca<11){ - unit=fetch_unit([ca,ia]); - if (obj_ini.loc[ca,ia]=cur_star.name) and (unit.planet_location>0){ - if (unit.role()="Ork Sniper") and (obj_ini.race[ca,ia]!=1){tem1_base=3;} - if (unit.role()="Flash Git") and (obj_ini.race[ca,ia]!=1){tem1_base=3;} - if (unit.role()="Ranger") and (obj_ini.race[ca,ia]!=1){tem1_base=3;} - if (unit.equipped_artifact_tag("daemon")){ + _unit=fetch_unit([ca,ia]); + if (_unit.location_string=cur_star.name) and (_unit.planet_location>0){ + if (_unit.role()="Ork Sniper") and (obj_ini.race[ca,ia]!=1){tem1_base=3;} + if (_unit.role()="Flash Git") and (obj_ini.race[ca,ia]!=1){tem1_base=3;} + if (_unit.role()="Ranger") and (obj_ini.race[ca,ia]!=1){tem1_base=3;} + if (_unit.equipped_artifact_tag("daemon")){ tem1_base+=3; dem+=1; } diff --git a/objects/obj_ncombat/Alarm_7.gml b/objects/obj_ncombat/Alarm_7.gml index 72b2217d65..d2a7b63370 100644 --- a/objects/obj_ncombat/Alarm_7.gml +++ b/objects/obj_ncombat/Alarm_7.gml @@ -71,9 +71,9 @@ try { for (var co=0;co<=10;co++){ for (var i=0;i0) then count+=1; + if (obj_ini.race[com,i]=1) and (_unit.location_string=argument1) and (_unit.planet_location=argument2){ + if (argument3="total") then count+=_unit.bionics; + if (argument3="number") and (_unit.bionics>0) then count+=1; } } } diff --git a/scripts/scr_company_order/scr_company_order.gml b/scripts/scr_company_order/scr_company_order.gml index 81d0c70f75..c97368ae6b 100644 --- a/scripts/scr_company_order/scr_company_order.gml +++ b/scripts/scr_company_order/scr_company_order.gml @@ -25,7 +25,6 @@ function temp_marine_variables(co, unit_num){ } } array_push(temp_race,race[co][unit_num]); - array_push(temp_loc,loc[co][unit_num]); array_push(temp_name,name[co][unit_num]); array_push(temp_role,role[co][unit_num]); array_push(temp_wep1,wep1[co][unit_num]); @@ -339,7 +338,6 @@ function scr_company_order(company) { // Return here for (i=0;i 0){ - var _master_star = star_by_name(obj_ini.loc[0][0]); + var _master_star = star_by_name(_master.location_string); if (_master_star != "none"){ _found = true; _planet = _master.planet_location; diff --git a/scripts/scr_enemy_ai_e/scr_enemy_ai_e.gml b/scripts/scr_enemy_ai_e/scr_enemy_ai_e.gml index 1c97668e94..d0daa1616b 100644 --- a/scripts/scr_enemy_ai_e/scr_enemy_ai_e.gml +++ b/scripts/scr_enemy_ai_e/scr_enemy_ai_e.gml @@ -712,9 +712,10 @@ function scr_enemy_ai_e() { repeat(200) { i += 1; good = 0; - if (obj_ini.role[co, i] != "") and(obj_ini.loc[co, i] = name) and(obj_ini.TTRP[co, i].planet_location == floor(chaos_meeting)) then good += 1; - if (obj_ini.role[co, i] != obj_ini.role[100, 6]) and(obj_ini.role[co, i] != "Venerable " + string(obj_ini.role[100, 6])) then good += 1; - if (string_count("Dread", obj_ini.armour[co, i]) = 0) or(obj_ini.role[co, i] == obj_ini.role[100][eROLE.ChapterMaster]) then good += 1; + var _unit = fetch_unit([co,i]); + if (_unit.role() != "" && _unit.location_string = name) and(_unit.planet_location == floor(chaos_meeting)) then good += 1; + if (_unit.role() != obj_ini.role[100, 6]) and(_unit.role() != "Venerable " + string(obj_ini.role[100, 6])) then good += 1; + if (string_count("Dread", obj_ini.armour[co, i]) = 0) or(_unit.role() == obj_ini.role[100][eROLE.ChapterMaster]) then good += 1; if (good = 3) { obj_temp_meeting.dudes += 1; @@ -722,7 +723,7 @@ function scr_enemy_ai_e() { obj_temp_meeting.present[otm] = 1; obj_temp_meeting.co[otm] = co; obj_temp_meeting.ide[otm] = i; - if (obj_ini.role[co, i] == obj_ini.role[100][eROLE.ChapterMaster]) then master_present = 1; + if (_unit.role() == obj_ini.role[100][eROLE.ChapterMaster]) then master_present = 1; } } } diff --git a/scripts/scr_event_code/scr_event_code.gml b/scripts/scr_event_code/scr_event_code.gml index bd55ce0ade..5e489aea5e 100644 --- a/scripts/scr_event_code/scr_event_code.gml +++ b/scripts/scr_event_code/scr_event_code.gml @@ -349,7 +349,7 @@ function strange_build_event(){ var marine_is_planetside = _unit.planet_location>0; if (marine_is_planetside && heritical_item) { - var _system = star_by_name(obj_ini.loc[company][marine]); + var _system = star_by_name(_unit.location_string); var _planet = _unit.planet_location; if (_system!="none"){ with (_system){ diff --git a/scripts/scr_event_dudes/scr_event_dudes.gml b/scripts/scr_event_dudes/scr_event_dudes.gml index 95b18911e2..57a028deeb 100644 --- a/scripts/scr_event_dudes/scr_event_dudes.gml +++ b/scripts/scr_event_dudes/scr_event_dudes.gml @@ -35,7 +35,7 @@ function scr_event_dudes(do_action, is_planet, system_name, location_id) { if (is_planet=0) and (unit.ship_location=location_id){ if (obj_ini.race[coh,ide]=1) or (obj_ini.race[coh,ide]=5) then adding=true; } - else if (is_planet=1) and (obj_ini.loc[coh,ide]=system_name) and (unit.planet_location==location_id){ + else if (is_planet=1) and (unit.location_string=system_name) and (unit.planet_location==location_id){ if (obj_ini.race[coh,ide]=1) or (obj_ini.race[coh,ide]=5) then adding=true; } diff --git a/scripts/scr_fleet_functions/scr_fleet_functions.gml b/scripts/scr_fleet_functions/scr_fleet_functions.gml index a43582f6c8..dad428c3a6 100644 --- a/scripts/scr_fleet_functions/scr_fleet_functions.gml +++ b/scripts/scr_fleet_functions/scr_fleet_functions.gml @@ -208,7 +208,7 @@ function load_unit_to_fleet(fleet, unit){ if (obj_ini.ship_capacity[ship_ident]>obj_ini.ship_carrying[ship_ident]){ obj_ini.ship_carrying[ship_ident]+=unit.size; unit.planet_location=0; - obj_ini.loc[unit.company][unit.marine_number]=obj_ini.ship_location[ship_ident]; + unit.location_string=obj_ini.ship_location[ship_ident]; unit.ship_location=ship_ident; loaded=true; break diff --git a/scripts/scr_initialize_custom/scr_initialize_custom.gml b/scripts/scr_initialize_custom/scr_initialize_custom.gml index bd299d6efb..6cac0b3928 100644 --- a/scripts/scr_initialize_custom/scr_initialize_custom.gml +++ b/scripts/scr_initialize_custom/scr_initialize_custom.gml @@ -1353,7 +1353,6 @@ function scr_initialize_custom() { // Initialize default marines for loadouts for (var i = 0; i <= 100; i++) { race[100, i] = 1; - loc[100, i] = ""; name[100, i] = ""; role[100, i] = ""; wep1[100, i] = ""; @@ -1369,7 +1368,6 @@ function scr_initialize_custom() { // Initialize special marines for (var i = 0; i <= 500; i++) { race[0, i] = 1; - loc[0, i] = ""; name[0, i] = ""; role[0, i] = ""; wep1[0, i] = ""; @@ -2316,7 +2314,6 @@ function scr_initialize_custom() { for (var c = 0; c <11; c++){ for (var i = 0; i < 501; i++) { race[c, i] = 1; - loc[c, i] = ""; name[c, i] = ""; role[c, i] = ""; wep1[c, i] = ""; @@ -3301,14 +3298,15 @@ function add_veh_to_company(name, company, slot, wep1, wep2, wep3, upgrade, acce function add_unit_to_company(ttrpg_name, company, slot, role_name, role_id, wep1="default", wep2="default", gear="default", mobi="default", armour="default"){ // log_message($"adding unit to company ttrpg_name {ttrpg_name}, company {company}, slot {slot}, role_name {role_name}, role_id {role_id}") obj_ini.TTRPG[company][slot] = new TTRPG_stats("chapter", company, slot, ttrpg_name); + var spawn_unit = fetch_unit([company,slot]); obj_ini.race[company][slot] = 1; - obj_ini.loc[company][slot] = obj_ini.home_name; + spawn_unit.location_string = obj_ini.home_name; obj_ini.role[company][slot] = role_name; if(obj_ini.name[company][slot] == ""){ obj_ini.name[company][slot] = global.name_generator.generate_space_marine_name(); } - var spawn_unit = fetch_unit([company,slot]); + if(wep1 != ""){ if(wep1 == "default"){ diff --git a/scripts/scr_inquisition_fleet_functions/scr_inquisition_fleet_functions.gml b/scripts/scr_inquisition_fleet_functions/scr_inquisition_fleet_functions.gml index 33088aa2d4..d5065f6ba0 100644 --- a/scripts/scr_inquisition_fleet_functions/scr_inquisition_fleet_functions.gml +++ b/scripts/scr_inquisition_fleet_functions/scr_inquisition_fleet_functions.gml @@ -304,7 +304,7 @@ if (inspection_type="inspect_world") or (inspection_type="inspect_fleet"){ for (var ca=0;ca<11;ca++){ for (var ia=0;ia<500;ia++){ unit = fetch_unit([ca,ia]); - if (obj_ini.loc[ca][ia]==that.name){ + if (unit.location_string==that.name){ if (unit.role()="Ork Sniper") and (obj_ini.race[ca,ia]!=1){hurr+=1;sniper+=1;} if (unit.role()="Flash Git") and (obj_ini.race[ca,ia]!=1){hurr+=1;git+=1;} if (unit.role()="Ranger") and (obj_ini.race[ca,ia]!=1){hurr+=1;finder+=1;} diff --git a/scripts/scr_kill_unit/scr_kill_unit.gml b/scripts/scr_kill_unit/scr_kill_unit.gml index 9790ea6c03..8123303c9e 100644 --- a/scripts/scr_kill_unit/scr_kill_unit.gml +++ b/scripts/scr_kill_unit/scr_kill_unit.gml @@ -21,7 +21,6 @@ function scr_kill_unit(company, unit_slot){ function scr_wipe_unit(company, unit_slot){ obj_ini.spe[company][unit_slot]=""; obj_ini.race[company][unit_slot]=0; - obj_ini.loc[company][unit_slot]=""; obj_ini.name[company][unit_slot]=""; obj_ini.wep1[company][unit_slot]=""; obj_ini.role[company][unit_slot]=""; diff --git a/scripts/scr_marine_count/scr_marine_count.gml b/scripts/scr_marine_count/scr_marine_count.gml index ca5f2ee1f6..b75eac124c 100644 --- a/scripts/scr_marine_count/scr_marine_count.gml +++ b/scripts/scr_marine_count/scr_marine_count.gml @@ -13,7 +13,7 @@ function scr_marine_count(argument0, argument1, argument2) { if (obj_ini.name[com][ide] == "") then continue; unit=obj_ini.TTRPG[com][ide] if (check -1 ? ship_location : 0; //ship array position if (location_id < array_length(obj_ini.ship_location)) { location_name = obj_ini.ship_location[location_id]; //location of ship } else { - location_name = location_name == obj_ini.loc[company][marine_number]; + location_name = location_string; } } return [location_type, location_id, location_name]; }; static controllable = function(){ - return !location_out_of_player_control(obj_ini.loc[company][marine_number]); + return !location_out_of_player_control(location_string); } //quick way of getting name and role combined in string @@ -2023,7 +2024,7 @@ function TTRPG_stats(faction, comp, mar, class = "marine", other_spawn_data = {} } if (current_location[0] == location_types.ship) { if (current_location[2] != "Warp" && current_location[2] == system.name) { - obj_ini.loc[company][marine_number] = obj_ini.ship_location[current_location[1]]; + location_string = obj_ini.ship_location[current_location[1]]; planet_location = planet_number; ship_location = -1; get_unit_size(); @@ -2032,7 +2033,7 @@ function TTRPG_stats(faction, comp, mar, class = "marine", other_spawn_data = {} } } else { ship_location = -1; - obj_ini.loc[company][marine_number] = system.name; + location_string = system.name; planet_location = planet_number; system.p_player[planet_number] += size; } @@ -2053,7 +2054,7 @@ function TTRPG_stats(faction, comp, mar, class = "marine", other_spawn_data = {} for (var i = 1; i <= homestar.planets; i++) { if (homestar.p_owner[i] == eFACTION.Player || (obj_controller.faction_status[eFACTION.Imperium] != "War" && array_contains(obj_controller.imperial_factions, homestar.p_owner[i]))) { planet_location = i; - obj_ini.loc[company][marine_number] = obj_ini.home_name; + location_string = obj_ini.home_name; spawn_location_chosen = true; } } @@ -2077,7 +2078,7 @@ function TTRPG_stats(faction, comp, mar, class = "marine", other_spawn_data = {} static is_at_location = function(location = "", planet = 0, ship = -1) { var is_at_loc = false; if (planet > 0) { - if (obj_ini.loc[company][marine_number] == location && planet_location == planet) { + if (location_string == location && planet_location == planet) { is_at_loc = true; } } else if (ship > -1) { @@ -2089,7 +2090,7 @@ function TTRPG_stats(faction, comp, mar, class = "marine", other_spawn_data = {} if (obj_ini.ship_location[ship_location] == location) { is_at_loc = true; } - } else if (obj_ini.loc[company][marine_number] == location) { + } else if (location_string == location) { is_at_loc = true; } } diff --git a/scripts/scr_master_loc/scr_master_loc.gml b/scripts/scr_master_loc/scr_master_loc.gml index a9fbedfc2e..802a23c3b8 100644 --- a/scripts/scr_master_loc/scr_master_loc.gml +++ b/scripts/scr_master_loc/scr_master_loc.gml @@ -14,7 +14,7 @@ function scr_master_loc() { if (obj_ini.name[co][v] == "") then continue; unit = fetch_unit([co, v]); if (unit.role()==obj_ini.role[100][eROLE.ChapterMaster]){ - if (unit.planet_location>0) and (unit.ship_location<0) then lick=string(obj_ini.loc[co][v])+"."+string(unit.planet_location); + if (unit.planet_location>0) and (unit.ship_location<0) then lick=$"{unit.location_string}."+string(unit.planet_location); if (unit.planet_location<=0) and (unit.ship_location>-1) then lick=string(obj_ini.ship[unit.ship_location]); if (lick!=""){return(lick);good=false;} } diff --git a/scripts/scr_mechanicus_missions/scr_mechanicus_missions.gml b/scripts/scr_mechanicus_missions/scr_mechanicus_missions.gml index 962ab44777..e24209d683 100644 --- a/scripts/scr_mechanicus_missions/scr_mechanicus_missions.gml +++ b/scripts/scr_mechanicus_missions/scr_mechanicus_missions.gml @@ -111,9 +111,9 @@ function mechanicus_missions_end_turn(planet){ } if (_unit.role()=obj_ini.role[100][eROLE.Techmarine]){ // Case 1: on planet - if (obj_ini.loc[com][ide]=name) and (_unit.planet_location=planet){ + if (_unit.location_string=name) and (_unit.planet_location=planet){ p_player[planet]-=_unit.get_unit_size(); - obj_ini.loc[com][ide]="Mechanicus Vessel"; + _unit.location_string="Mechanicus Vessel"; _unit.planet_location=0; _unit.ship_location=-1; _unit.job = { @@ -125,7 +125,7 @@ function mechanicus_missions_end_turn(planet){ ship_planet=obj_ini.ship_location[_unit.ship_location]; if (ship_planet=name){ obj_ini.ship_carrying[_unit.ship_location]-=_unit.get_unit_size(); - obj_ini.loc[com][ide]="Mechanicus Vessel"; + _unit.location_string="Mechanicus Vessel"; _unit.planet_location=0; _unit.ship_location=-1; _unit.job = { diff --git a/scripts/scr_mission_reward/scr_mission_reward.gml b/scripts/scr_mission_reward/scr_mission_reward.gml index 381065fd3a..758755e91f 100644 --- a/scripts/scr_mission_reward/scr_mission_reward.gml +++ b/scripts/scr_mission_reward/scr_mission_reward.gml @@ -40,7 +40,7 @@ function scr_mission_reward(mission, star, planet) { else { star.p_player[planet]+= _tech.get_unit_size(); - obj_ini.loc[com][i]=star.name; + _tech.location_string=star.name; _tech.planet_location=planet; diff --git a/scripts/scr_move_unit_info/scr_move_unit_info.gml b/scripts/scr_move_unit_info/scr_move_unit_info.gml index 8345d15216..8bee01721e 100644 --- a/scripts/scr_move_unit_info/scr_move_unit_info.gml +++ b/scripts/scr_move_unit_info/scr_move_unit_info.gml @@ -10,7 +10,6 @@ function scr_move_unit_info(start_company,end_company, start_slot, end_slot, eva } obj_ini.spe[end_company][end_slot]=obj_ini.spe[start_company][start_slot]; obj_ini.race[end_company][end_slot]=obj_ini.race[start_company][start_slot]; - obj_ini.loc[end_company][end_slot]=obj_ini.loc[start_company][start_slot]; obj_ini.name[end_company][end_slot]=obj_ini.name[start_company][start_slot]; obj_ini.wep1[end_company][end_slot]=obj_ini.wep1[start_company][start_slot]; obj_ini.role[end_company][end_slot]=obj_ini.role[start_company][start_slot]; diff --git a/scripts/scr_player_fleet_functions/scr_player_fleet_functions.gml b/scripts/scr_player_fleet_functions/scr_player_fleet_functions.gml index 44edbb8d32..9dd7d4b503 100644 --- a/scripts/scr_player_fleet_functions/scr_player_fleet_functions.gml +++ b/scripts/scr_player_fleet_functions/scr_player_fleet_functions.gml @@ -502,7 +502,7 @@ function set_fleet_location(location){ for (i=0;i-1)) then match=true; + if (unit.role()=target_role) and (unit.location_string=obj_ini.home_name) and (search_location="home") then match=true; + if (unit.role()=target_role) and (search_location="field") and ((unit.location_string!=obj_ini.home_name) or (unit.ship_location>-1)) then match=true; if (search_location!="home") and (search_location!="field"){ if (unit.role()=target_role){ - var t1=string(obj_ini.loc[com][i])+"|"+string(unit.planet_location)+"|"; + var t1=unit.location_string+"|"+string(unit.planet_location)+"|"; if (search_location=t1) then match=true; } } diff --git a/scripts/scr_specialist_training/scr_specialist_training.gml b/scripts/scr_specialist_training/scr_specialist_training.gml index a2263b94a9..7cf686d1fa 100644 --- a/scripts/scr_specialist_training/scr_specialist_training.gml +++ b/scripts/scr_specialist_training/scr_specialist_training.gml @@ -361,7 +361,7 @@ function techmarine_training(){ scr_alert("red","recruitment","Not enough equipment: "+string(warn),0,0); } - if (obj_ini.loc[unit.company][unit.marine_number] == "Terra") { + if (unit.location_string == "Terra") { unit.allocate_unit_to_fresh_spawn("default"); } @@ -398,7 +398,7 @@ function techmarine_training(){ var man_size=unit.get_unit_size(); obj_ini.ship_carrying[unit.ship_location]-=man_size; } - obj_ini.loc[0][open_slot]="Terra"; + unit.location_string="Terra"; unit.planet_location=4; unit.ship_location=-1; } diff --git a/scripts/scr_system_spawn_functions/scr_system_spawn_functions.gml b/scripts/scr_system_spawn_functions/scr_system_spawn_functions.gml index ca5624d9fe..44e2e09e18 100644 --- a/scripts/scr_system_spawn_functions/scr_system_spawn_functions.gml +++ b/scripts/scr_system_spawn_functions/scr_system_spawn_functions.gml @@ -94,7 +94,7 @@ function player_home_star(home_planet){ for (var co=0;co<=obj_ini.companies;co++){ for (i=0;i-1) then draw_text(xx + 222, yy + 380, string_hash_to_newline($"Current Location: Onboard {obj_ini.ship[unit.ship_location]}#Health: {unit.hp()}%")); draw_text(xx + 222.5, yy + 380.5, string_hash_to_newline("Current Location:#Health:")); diff --git a/scripts/scr_unit_quick_find_pane/scr_unit_quick_find_pane.gml b/scripts/scr_unit_quick_find_pane/scr_unit_quick_find_pane.gml index 6cb2d3c072..04a45b4170 100644 --- a/scripts/scr_unit_quick_find_pane/scr_unit_quick_find_pane.gml +++ b/scripts/scr_unit_quick_find_pane/scr_unit_quick_find_pane.gml @@ -532,7 +532,7 @@ function toggle_selection_borders(){ if (is_struct(display_unit[p])){ var _unit=display_unit[p]; var mar_id = _unit.marine_number; - if (_unit.ship_location>-1) and (obj_ini.loc[_unit.company][mar_id]!="Mechanicus Vessel"){ + if (_unit.ship_location>-1) and (_unit.controllable()){ _unit.is_boarder = !_unit.is_boarder; } } From 3c9c14c23f364d8a5f3ba76e075e56a5327b474f Mon Sep 17 00:00:00 2001 From: Nelsonh <81228864+OH296@users.noreply.github.com> Date: Fri, 18 Jul 2025 16:59:39 +0100 Subject: [PATCH 142/286] fix: scope issue with factions declaring war on player (#932) --- scripts/scr_audience/scr_audience.gml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/scr_audience/scr_audience.gml b/scripts/scr_audience/scr_audience.gml index ba561217bc..e8b455c4cc 100644 --- a/scripts/scr_audience/scr_audience.gml +++ b/scripts/scr_audience/scr_audience.gml @@ -20,7 +20,7 @@ function scr_audience(faction_enum, topic, new_disposition = 0, new_status = "", function decare_war_on_imperium_audiences(){ - var _topic = gene_xeno>99995 ? "gene_xeno" : "declare_war"; + var _topic = obj_controller.gene_xeno>99995 ? "gene_xeno" : "declare_war"; scr_audience(eFACTION.Inquisition, _topic, -50, "War", 9999, 4); scr_audience(eFACTION.Imperium, "declare_war", -40, "War", 9999, 2); From 8132222db6fc3f1c4bbca6a2fa451a02fd8c9ff4 Mon Sep 17 00:00:00 2001 From: Nelsonh <81228864+OH296@users.noreply.github.com> Date: Fri, 18 Jul 2025 17:00:41 +0100 Subject: [PATCH 143/286] fix: typo causing crash on purge (#933) --- scripts/scr_purge_world/scr_purge_world.gml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/scr_purge_world/scr_purge_world.gml b/scripts/scr_purge_world/scr_purge_world.gml index 5c5cfce1dc..7535ad53e6 100644 --- a/scripts/scr_purge_world/scr_purge_world.gml +++ b/scripts/scr_purge_world/scr_purge_world.gml @@ -279,12 +279,12 @@ function scr_purge_world(star, planet, action_type, action_score) { txt+="What is thy will?"; - var he;he=instance_create(star.x,star.y,obj_temp6); + var he=instance_create(star.x,star.y,obj_temp6); var pip=instance_create(0,0,obj_popup); pip.title="Planetary Governor Assassinated"; pip.text=txt; pip.planet=planet; - pip.p_data = new PlanetData(panet,star); + pip.p_data = new PlanetData(planet,star); pip.option1="Allow the official successor to become Planetary Governor."; pip.option2="Ensure that a sympathetic successor will be the one to rule."; From 3a263f63909e3f64b826ccd7666376a70cbda88a Mon Sep 17 00:00:00 2001 From: Nelsonh <81228864+OH296@users.noreply.github.com> Date: Sat, 19 Jul 2025 01:54:27 +0100 Subject: [PATCH 144/286] feat: Finish Protect from raiders Governor mission (#738) Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com> --- objects/obj_controller/Create_0.gml | 1 + objects/obj_controller/Draw_64.gml | 10 +- objects/obj_controller/Step_0.gml | 9 +- objects/obj_ncombat/Alarm_0.gml | 19 + objects/obj_ncombat/Alarm_1.gml | 3 + objects/obj_ncombat/Alarm_7.gml | 103 ++-- scripts/is_specialist/is_specialist.gml | 34 +- scripts/scr_PlanetData/scr_PlanetData.gml | 4 + .../scr_company_struct/scr_company_struct.gml | 421 +++++++++------- .../scr_draw_management_unit.gml | 2 +- .../scr_draw_planet_features.gml | 27 +- .../scr_draw_unit_image.gml | 15 + scripts/scr_enemy_ai_e/scr_enemy_ai_e.gml | 1 - .../scr_manage_task_selector.gml | 458 ++++++++++-------- scripts/scr_squads/scr_squads.gml | 14 + scripts/scr_ui_manage/scr_ui_manage.gml | 34 +- scripts/scr_ui_refresh/scr_ui_refresh.gml | 14 +- 17 files changed, 702 insertions(+), 467 deletions(-) diff --git a/objects/obj_controller/Create_0.gml b/objects/obj_controller/Create_0.gml index 607bd8b277..515eb34a80 100644 --- a/objects/obj_controller/Create_0.gml +++ b/objects/obj_controller/Create_0.gml @@ -435,6 +435,7 @@ unit_bio=false; view_squad=false; company_report=false; company_data = {}; +obj_controller.unit_focus = false; filter_mode = false; pauldron_trim=0; last_unit=[0,0]; diff --git a/objects/obj_controller/Draw_64.gml b/objects/obj_controller/Draw_64.gml index 747a3deb4d..e8e8316a6b 100644 --- a/objects/obj_controller/Draw_64.gml +++ b/objects/obj_controller/Draw_64.gml @@ -197,8 +197,14 @@ function draw_line(x1, y1, y_slide, variable) { } -if ((menu == 1) && (managing > 0 || managing < 0)) { - draw_sprite_and_unit_equip_data(); +if (menu == 1) { + if (managing != 0){ + draw_sprite_and_unit_equip_data(); + } + if (managing == -1){ + scr_manage_task_selector(); + } + } diff --git a/objects/obj_controller/Step_0.gml b/objects/obj_controller/Step_0.gml index 651c102c96..5ec1038b1f 100644 --- a/objects/obj_controller/Step_0.gml +++ b/objects/obj_controller/Step_0.gml @@ -437,12 +437,12 @@ try { var unit = ""; yy += 77; } - if (is_struct(temp[120])) { + if (is_struct(unit_focus)) { var ach = 0, damage_res = 1, armour_value = 0; // Checks if the marine is not hidden - var unit = temp[120]; + var unit = unit_focus; if (!is_array(last_unit)) { last_unit = [0, 0]; } @@ -837,10 +837,7 @@ try { } // Resets selections if ((managing > 0) && (man_size == 0) && ((selecting_location != "") || (selecting_types != "") || (selecting_planet != 0) || (selecting_ship != -1))) { - selecting_location = ""; - selecting_types = ""; - selecting_planet = 0; - selecting_ship = -1; + reset_manage_selections(); } if (menu == 0 && !instances_exist([obj_ncombat,obj_fleet_controller])){ diff --git a/objects/obj_ncombat/Alarm_0.gml b/objects/obj_ncombat/Alarm_0.gml index 7ada1b0cc9..e63413dd6a 100644 --- a/objects/obj_ncombat/Alarm_0.gml +++ b/objects/obj_ncombat/Alarm_0.gml @@ -78,6 +78,25 @@ if (string_count("spyrer", battle_special) > 0) { enemies[1] = 1; u.flank = 1; } + +if (battle_special == "protect_raiders") { + fortified = 0; + threat = 3; + u = instance_create(20, 240, obj_enunit); + u.dudes[1] = "Dire Avenger"; + u.dudes_num[1] = 40; + u.dudes_special[1] = "shimmershield"; + u.dudes[2] = "Dire Avenger Exarch"; + u.dudes_num[2] = 4; + u.dudes_special[2] = "shimmershield"; + u.dudes[3] = "Autarch"; + u.dudes_num[3] = 1; + u.dudes[4] = "Farseer"; + u.dudes_num[4] = 1; + u.dudes_special[4] = "farseer_powers"; + u.dudes[5] = "Night Spinner"; + u.dudes_num[5] = 1; +} // * Small Fallen Group * if (battle_special = "fallen1") { fortified = 0; diff --git a/objects/obj_ncombat/Alarm_1.gml b/objects/obj_ncombat/Alarm_1.gml index ff2caec7c5..1d09fb3478 100644 --- a/objects/obj_ncombat/Alarm_1.gml +++ b/objects/obj_ncombat/Alarm_1.gml @@ -83,6 +83,9 @@ if (battle_special=""){ if (string_count("spyrer",battle_special)>0){ p1="Your marines search through the alleyways and corridors likely to contain the Spyrer. It does not take long before the lunatic attacks, springing off from a wall to fall among your men. Your ranks are made up of "; } +if (string_count("protect_raiders",battle_special)>0){ + p1="Following responses from scans, Your marine squad deploys and lies in wait on the planets surface. Either the elder were expecting you or the scope of the raids on the planet had been underplayed by the governor perhaps to hide his incompetance for having allowed such foul xenos actioonos to have gone on for so long without being cheacked."; +} if (string_count("fallen",battle_special)>0){ p1="Your marines search through the alleyways and dens likely to contain the Fallen. Several days pass before the search is succesful; the prey is located by Auspex and closed in upon. "; if (battle_climate="Lava") then p1="Your marines search through the broken craggs and spires of the molten planet. Among the bubbling lava, and cracking earth, they search for the Fallen. After several days of searching Auspex detect the prey. "; diff --git a/objects/obj_ncombat/Alarm_7.gml b/objects/obj_ncombat/Alarm_7.gml index d2a7b63370..fee72b98e6 100644 --- a/objects/obj_ncombat/Alarm_7.gml +++ b/objects/obj_ncombat/Alarm_7.gml @@ -197,8 +197,11 @@ try { } if (battle_special="study2b"){ battle_object.p_necrons[battle_id]=5; - awaken_tomb_world( battle_object.p_feature[battle_id]) - obj_controller.disposition[3]-=15;obj_controller.disposition[4]-=5; + awaken_tomb_world( battle_object.p_feature[battle_id]); + alter_dispositions([ + [eFACTION.Mechanicus, -15], + [eFACTION.Inquisition, -5], + ]); scr_popup("Mechanicus Mission Failed","All of your Astartes and the Mechanicus Research party have been killed down to the last man. The research is a bust. To make matters worse the Necron Tomb has fully awakened- countless numbers of the souless machines are now pouring out of the tomb. The Adeptus Mechanicus are furious with your chapter.","necron_army",""); scr_alert("","inqi","The Inquisition is displeased with your Chapter for tampering with and awakening a Necron Tomb",0,0); scr_event_log("","The Inquisition is displeased with your Chapter for tampering with and awakening a Necron Tomb"); @@ -348,11 +351,11 @@ try { image="necron_tunnels_2"; text="The energy readings are much stronger, now that your marines are deep inside the tunnels. What was once cramped is now luxuriously large, the tunnel ceiling far overhead decorated by stalactites."; } - if (obj_temp8.stage=3){ + else if (obj_temp8.stage=3){ image="necron_tunnels_3"; text="After several hours of descent the entrance to the Necron Tomb finally looms ahead- dancing, sickly green light shining free. Your marine confirms that the Plasma Bomb is ready."; } - if (obj_temp8.stage=4){ + else if (obj_temp8.stage=4){ if (obj_temp8.stage>=4){ instance_activate_object(obj_star); image=""; @@ -360,13 +363,18 @@ try { text="Your marines finally enter the deepest catacombs of the Necron Tomb. There they place the Plasma Bomb and arm it. All around are signs of increasing Necron activity. With half an hour set, your men escape back to the surface. There is a brief rumble as the charge goes off, your mission a success."; option1="";option2="";option3=""; - if (obj_controller.demanding=0) then obj_controller.disposition[4]+=1; - if (obj_controller.demanding=1) then obj_controller.disposition[4]+=choose(0,0,1); + alter_disposition(eFACTION.Inquisition, obj_controller.demanding ? choose(0,0,1) : 1); // show_message(string(obj_temp8.loc)+"."+string(obj_temp8.wid)); // obj_controller.temp[200]=obj_temp8.loc; - with(obj_star){if (name!=obj_temp8.loc) then instance_deactivate_object(id);} - with(obj_star){if (name=obj_temp8.loc) then instance_create(x,y,obj_temp5);} + with(obj_star){ + if (name!=obj_temp8.loc) then instance_deactivate_object(id); + } + with(obj_star){ + if (name=obj_temp8.loc){ + instance_create(x,y,obj_temp5); + } + } var star = star_by_name(obj_temp8.loc) var planet = obj_temp8.wid @@ -418,11 +426,11 @@ try { // title / text / image / speshul var cur_star = obj_turn_end.battle_object[obj_turn_end.current_battle]; var planet = obj_turn_end.battle_world[obj_turn_end.current_battle] - var planet_string = scr_roman_numerals()[planet-1]; + var _planet_string = scr_roman_numerals()[planet-1]; remove_planet_problem(planet ,"spyrer",cur_star) - var tixt=$"The Spyrer on {cur_star.name} {planet_string} has been removed. The citizens and craftsman may sleep more soundly, the Inquisition likely pleased." + var tixt=$"The Spyrer on {cur_star.name} {_planet_string} has been removed. The citizens and craftsman may sleep more soundly, the Inquisition likely pleased." scr_popup("Inquisition Mission Completed",tixt,"spyrer",""); @@ -433,9 +441,35 @@ try { scr_gov_disp(cur_star.name,planet,choose(1,2,3,4)); instance_deactivate_object(obj_star); + } else if (battle_special == "protect_raiders"){ + instance_activate_object(obj_star); + // show_message(obj_turn_end.current_battle); + // show_message(obj_turn_end.battle_world[obj_turn_end.current_battle]); + // title / text / image / speshul + var cur_star = battle_object; + var planet = battle_id; + var _planet = new PlanetData(planet,cur_star); + var _planet_string = _planet.name(); + _planet.remove_problem("protect_raiders"); + if (!defeat){ + + _planet.add_disposition(15); + var _special_reward = 0; + var tixt=$"The Raiding forces on {_planet_string} have been removed. The citizens and craftsman may sleep more soundly. (planet disp +15)" + + scr_popup("Planet Protected",tixt,"protect_raiders",""); + scr_event_log("",$"Governor Request completed: Raiding forces on {_planet_string} have been eliminated.", cur_star.name); + instance_deactivate_object(obj_star); + } else { + _planet.add_disposition(-15); + var tixt=$"The Raiding forces on {_planet_string} dispatched with your forces and will continue with their bloody practices. The citizens remain unsafe and the governor is unimpressed. (planet disp -15)"; + scr_popup("Planet Protected",tixt,"protect_raiders",""); + + scr_event_log("",$"Governor Request failed: Raiding forces on {_planet_string} continue to harrass population.", cur_star.name); + } } - if ((string_count("fallen",battle_special)>0)) and (defeat=0){ + else if ((string_count("fallen",battle_special)>0)) and (defeat=0){ var fallen=0; with (obj_turn_end){ remove_planet_problem(battle_world[current_battle], "fallen", battle_object[current_battle]) @@ -443,15 +477,17 @@ try { tixt+=scr_roman(battle_world[current_battle]); scr_event_log("",$"Mission Succesful: {tixt} have been captured or purged."); tixt+=$" have been captured or purged. They shall be brought to the Chapter {obj_ini.role[100][14]}s posthaste, in order to account for their sins. "; - var ran;ran=choose(1,1,2,3); - if (ran=1) then tixt+="Suffering is the beginning to penance."; - if (ran=2) then tixt+="Their screams shall be the harbringer of their contrition."; - if (ran=3) then tixt+="The shame they inflicted upon us shall be written in their flesh."; + var _tex_options = [ + "Suffering is the beginning to penance.", + "Their screams shall be the harbringer of their contrition.", + "The shame they inflicted upon us shall be written in their flesh." + ] + tixt += _tex_options[choose(0,0,1,2)]; scr_popup("Hunt the Fallen Completed",tixt,"fallen",""); } } - if (defeat=0) and (enemy=9) and (battle_special="tyranid_org"){ + else if (defeat=0) and (enemy=9) and (battle_special="tyranid_org"){ if (captured_gaunt>1){ pop=instance_create(0,0,obj_popup); pop.image="inquisition"; @@ -468,7 +504,7 @@ try { - if (enemy=1) and (on_ship=true) and (defeat=0){ + else if (enemy=1) and (on_ship=true) and (defeat=0){ var diceh=roll_dice_chapter(1, 100, "high"); if (diceh<=15){ @@ -484,8 +520,8 @@ try { var pop=instance_create(0,0,obj_popup); pop.image=""; pop.title="Ship Destroyed"; - pop.text="A handful of loyalist "+string(global.chapter_name)+" make a fighting retreat to the engine of the vessel, '"+string(obj_ini.ship[battle_id])+"', and then overload the main reactor. Your ship explodes in a brilliant cloud of fire."; - scr_event_log("red","A handful of loyalist "+string(global.chapter_name)+" overload the main reactor of your vessel '"+string(obj_ini.ship[battle_id])+"'."); + pop.text=$"A handful of loyalist {global.chapter_name} make a fighting retreat to the engine of the vessel, '"+string(obj_ini.ship[battle_id])+"', and then overload the main reactor. Your ship explodes in a brilliant cloud of fire."; + scr_event_log("red",$"A handful of loyalist {global.chapter_name} overload the main reactor of your vessel '"+string(obj_ini.ship[battle_id])+"'."); pop.mission="loyalist_destroy_ship"; scr_ini_ship_cleanup(); @@ -513,7 +549,8 @@ try { obj_turn_end.combating=0;// obj_turn_end.alarm[1]=1; } var pip;pip=instance_create(0,0,obj_popup); - pip.title="Enemies Vanquished";pip.text="Not only have you killed the Chaos Lord, "+string(obj_controller.faction_leader[eFACTION.Chaos])+", but also all of your battle brothers that questioned your rule. As you stand, alone, among the broken corpses of your enemies you begin to question what exactly it is that you accomplished. No matter the results, you feel as though your actions have been noticed."; + pip.title="Enemies Vanquished"; + pip.text="Not only have you killed the Chaos Lord, "+string(obj_controller.faction_leader[eFACTION.Chaos])+", but also all of your battle brothers that questioned your rule. As you stand, alone, among the broken corpses of your enemies you begin to question what exactly it is that you accomplished. No matter the results, you feel as though your actions have been noticed."; } } @@ -522,7 +559,8 @@ try { obj_controller.complex_event=false;obj_controller.diplomacy=0;obj_controller.menu=0; obj_controller.force_goodbye=0;obj_controller.cooldown=20; obj_controller.current_eventing="chaos_meeting_end"; - with(obj_temp_meeting){instance_destroy();}with(obj_popup){instance_destroy();} + with(obj_temp_meeting){instance_destroy();} + with(obj_popup){instance_destroy();} if (instance_exists(obj_turn_end)){ obj_turn_end.combating=0;// obj_turn_end.alarm[1]=1; } @@ -532,11 +570,11 @@ try { } if ((battle_special="cs_meeting_battle5") or (battle_special="cs_meeting_battle6")) and (defeat=0){ - var mos;mos=false; + var mos=false; with(obj_ground_mission){instance_destroy();} with(obj_pnunit){ - var j;j=0; + var j=0; repeat(300){j+=1; if (marine_type[j]="Master of Sanctity") then instance_create(0,0,obj_ground_mission); } @@ -556,7 +594,11 @@ try { obj_controller.complex_event=false;obj_controller.diplomacy=0;obj_controller.menu=0; obj_controller.force_goodbye=0;obj_controller.cooldown=20; obj_controller.current_eventing="chaos_meeting_end"; - with(obj_temp_meeting){instance_destroy();}with(obj_popup){instance_destroy();} + with(obj_temp_meeting){ + instance_destroy(); + }with(obj_popup){ + instance_destroy(); + } if (instance_exists(obj_turn_end)){ obj_turn_end.combating=0;// obj_turn_end.alarm[1]=1; } @@ -576,7 +618,7 @@ try { ship[i]=obj_ini.ship[i];ship_hp[i]=obj_ini.ship_hp[i]; if (i=battle_id){obj_ini.ship_hp[i]=-50;scr_recent("ship_destroyed",obj_ini.ship[i],i);} } - var pop;pop=instance_create(0,0,obj_popup); + var pop=instance_create(0,0,obj_popup); pop.image=""; pop.title="Ship Destroyed"; pop.text="The daemon has slayed all of your marines onboard. It works its way to the engine of the vessel, '"+string(obj_ini.ship[battle_id])+"', and then tears into the main reactor. Your ship explodes in a brilliant cloud of fire."; @@ -596,13 +638,13 @@ try { } if (hulk_treasure=1){// Requisition - var reqi=round(random_range(30,60)+1)*10; - obj_controller.requisition+=reqi; + var _reqi=irandom_range(30,60)*10; + obj_controller.requisition+=_reqi; var pop;pop=instance_create(0,0,obj_popup); pop.image="space_hulk_done"; pop.title="Space Hulk: Resources"; - pop.text="Your battle brothers have located several luxury goods and coginators within the Space Hulk. They are salvaged and returned to the ship, granting "+string(reqi)+" Requisition."; + pop.text=$"Your battle brothers have located several luxury goods and coginators within the Space Hulk. They are salvaged and returned to the ship, granting {_reqi} Requisition."; }else if (hulk_treasure=2){// Artifact //TODO this will eeroniously put artifacts in the wrong place but will resolve crashes var last_artifact = scr_add_artifact("random","random",4,loc,shi+500); @@ -652,8 +694,9 @@ try { } if (!instance_exists(obj_turn_end)){ scr_event_log("","Enemy Leader Assassinated: Chaos Lord"); - var pop;pop=instance_create(0,0,obj_popup); - pop.image="";pop.title="Black Crusade Ended"; + var pop=instance_create(0,0,obj_popup); + pop.image=""; + pop.title="Black Crusade Ended"; pop.text="The Chaos Lord "+string(obj_controller.faction_leader[eFACTION.Chaos])+" has been slain in combat. Without his leadership the Black Crusade is destined to crumble apart and disintegrate from infighting. Sector "+string(obj_ini.sector_name)+" is no longer at threat by the forces of Chaos."; } } diff --git a/scripts/is_specialist/is_specialist.gml b/scripts/is_specialist/is_specialist.gml index 0f2e6e05c3..7955765f9e 100644 --- a/scripts/is_specialist/is_specialist.gml +++ b/scripts/is_specialist/is_specialist.gml @@ -352,12 +352,22 @@ function collect_by_religeon(religion, sub_cult="", location=""){ /// @description Processes the selection of units based on group parameters and updates controller data /// @param {array} group The array of units to process for selection /// @param {struct} selection_data Data structure containing selection parameters and state + +enum MissionSelectType { + Units, + Squads +} + + function group_selection(group, selection_data) { try { var unit, s, unit_location; obj_controller.selection_data = selection_data; set_zoom_to_default(); with(obj_controller) { + if (menu != MENU.Manage){ + scr_toggle_manage(); + } basic_manage_settings(); with(obj_fleet_select) { instance_destroy(); @@ -369,20 +379,11 @@ function group_selection(group, selection_data) { exit_button = new ShutterButton(); proceed_button = new ShutterButton(); selection_data.start_count = 0; + if (!struct_exists(selection_data, "select_type")){ + selection_data.select_type = MissionSelectType.Units; + } // Resets selections for next turn - man_size = 0; - selecting_location = ""; - selecting_types = ""; - selecting_ship = -1; - selecting_planet = 0; - sel_uid = 0; - reset_manage_arrays(); - alll = 0; - cooldown = 10; - sel_loading = -1; - unload = 0; - alarm[6] = 7; - view_squad = false; + scr_ui_refresh(); managing = -1; new_company_struct(); var vehicles = []; @@ -416,6 +417,13 @@ function group_selection(group, selection_data) { other_manage_data(); man_current = 0; man_max = MANAGE_MAN_MAX; + + if (selection_data.select_type == MissionSelectType.Squads){ + new_company_struct(); + company_data.has_squads = true; + company_data.squad_location = selection_data.system.name; + company_data.squad_search(); + } } } catch (_exception) { //handle and send player back to map diff --git a/scripts/scr_PlanetData/scr_PlanetData.gml b/scripts/scr_PlanetData/scr_PlanetData.gml index 11dd810062..2b3be16102 100644 --- a/scripts/scr_PlanetData/scr_PlanetData.gml +++ b/scripts/scr_PlanetData/scr_PlanetData.gml @@ -450,6 +450,9 @@ function PlanetData(planet, system) constructor{ has_problem_planet(planet, problem, system); } + static remove_problem = function(problem){ + remove_planet_problem(planet ,problem,system) + } static find_problem = function(problem){ return find_problem_planet(planet, problem, system); } @@ -458,6 +461,7 @@ function PlanetData(planet, system) constructor{ return add_new_problem(planet, problem, timer,system, other_data); } + static name = function(){ var _name=""; diff --git a/scripts/scr_company_struct/scr_company_struct.gml b/scripts/scr_company_struct/scr_company_struct.gml index 71b2dcab2e..5c676c88a9 100644 --- a/scripts/scr_company_struct/scr_company_struct.gml +++ b/scripts/scr_company_struct/scr_company_struct.gml @@ -37,8 +37,10 @@ function CompanyStruct(comp) constructor{ delete garrison_button; delete unit_ui_panel; } + squad_location = ""; static squad_search = function(){ var _squads = obj_ini.squads; + //array_copy(_squads, 0, obj_ini.squads, 0, array_length(obj_ini.squads)); if (company>=0){ company_squads = []; var cur_squad; @@ -53,24 +55,40 @@ function CompanyStruct(comp) constructor{ } else if (company == -1){ var _disp_units = obj_controller.display_unit; for (var i=0; i0){ - array_push(company_squads,unit.squad); + array_push(company_squads,_unit.squad); } } else { - unit.squad = "none"; + _unit.squad = "none"; } } } } } + if (squad_location != ""){ + var _squads_len = array_length(company_squads); + for (var i=_squads_len-1;i>=0;i--){ + var _squad = fetch_squad(company_squads[i]); + var _squad_loc = _squad.squad_loci(); + if (_squad_loc.system != squad_location){ + array_delete(company_squads, i, 1); + } + } + } + has_squads = array_length(company_squads); + if (has_squads){ + obj_controller.unit_focus = fetch_squad(company_squads[0]).fetch_member(0); + } } + + var xx=__view_get( e__VW.XView, 0 )+0; var yy=__view_get( e__VW.YView, 0 )+0; center_width = [580,1005]; @@ -122,12 +140,26 @@ function CompanyStruct(comp) constructor{ text_color : c_green, str1 : "Allow mass equip", }); + mass_equip_toggle.update(); + squad_selection_mode = (obj_controller.managing<0 && obj_controller.selection_data.select_type==MissionSelectType.Squads); + + if (squad_selection_mode){ + select_squad_button = new UnitButtonObject({ + x1 : xx+center_width[0]+5, + y1 : yy+center_height[0]+150, + color:c_red, + label : "Select Squad", + tooltip : obj_controller.selection_data.purpose + }); + + selected_squads = []; + } + static send_squad_on_mission = function(mission_type, star){ with (star){ - var unload_squad=instance_create(x,y,obj_star_select); unload_squad.target=self; unload_squad.loading=1; @@ -141,6 +173,154 @@ function CompanyStruct(comp) constructor{ } + static draw_squad_unit_sprites = function(){ + var member_width=0, member_height=0; + var x_mod=0,y_mod=0; + + var x_overlap_mod =0; + if (unit_rollover){ + if (scr_hit(xx+25, yy+144, xx+925, yy+981)){ + x_overlap_mod =180; + } else { + unit_rollover = !unit_rollover; + } + } else { + x_overlap_mod =90+(9*rollover_sequence); + } + var sprite_draw_delay="none" + var unit_sprite_coords=[]; + for (var i=0;i0){ + rollover_sequence--; + } + } + } + if (exit_period and !scr_hit(xx+25, yy+144, xx+525, yy+981)){ + exit_period=false; + } + } + + static draw_squad_assignment_options = function(){ + if (current_squad.assignment == "none"){ + + draw_text_transformed(xx+bound_width[0]+5, yy+bound_height[0]+125, $"Squad has no current assignments",1,1,0); + + var send_on_mission=false, mission_type; + var _squad_sys = squad_loc.system; + if (squad_loc.same_system) and (_squad_sys!="Warp" && _squad_sys!="Lost"){ + if (garrison_button.draw()){ + send_on_mission=true; + mission_type="garrison"; + } + + garrison_button.keystroke = press_exclusive(ord("G")); + if (array_contains(current_squad.class, "scout")) || (array_contains(current_squad.class, "bike")){ + if (sabotage_button.draw()){ + send_on_mission=true; + mission_type="sabotage"; + } + } + } + if (send_on_mission){ + send_squad_on_mission(mission_type,star_by_name(squad_loc.system)); + } + bound_height[0] += 180; + } else { + if (is_struct(current_squad.assignment)){ + var cur_assignment = current_squad.assignment + draw_text_transformed(xx+bound_width[0]+5, yy+bound_height[0]+125, $"Assignment : {cur_assignment.type}",1,1,0); + var tooltip_text = "Cancel Assignment" + var cancel_but = draw_unit_buttons([xx+bound_width[0]+5, yy+bound_height[0]+150],tooltip_text,[1,1],c_red,,,,true); + if(point_and_click(cancel_but) || keyboard_check_pressed(ord("C"))){ + var cancel_system=noone; + with (obj_star){ + if (name == squad_loc.system){ + cancel_system=self; + } + } + if (cancel_system!=noone){ + var planet = current_squad.assignment.ident; + var operation; + for (var i=0;i=array_length(company_squads) ? 0 : cur_squad+1; @@ -148,7 +328,7 @@ function CompanyStruct(comp) constructor{ cur_squad = (cur_squad-1<0) ? array_length(company_squads)-1 : cur_squad-1; } member = grab_current_squad().members[0]; - obj_controller.temp[120] = fetch_unit(member); + obj_controller.unit_focus = fetch_unit(member); } squad_search(); @@ -156,7 +336,7 @@ function CompanyStruct(comp) constructor{ exit_period=false; unit_rollover=false; rollover_sequence=0; - selected_unit=obj_controller.temp[120]; + selected_unit=obj_controller.unit_focus; drop_down_open=false; captain = "none"; champion = "none"; @@ -185,30 +365,30 @@ function CompanyStruct(comp) constructor{ reset_squad_surface(); if (company>0 && company<11){ - var unit; + var _unit; var company_units = obj_controller.display_unit; var role_set = obj_ini.role[100]; for (var i=0;i 0){ if (selected_unit.company == company || company ==-1){ if (company_squads[cur_squad] != selected_unit.squad){ @@ -255,14 +435,10 @@ function CompanyStruct(comp) constructor{ } if (selected_unit.squad=="none"){ default_member(); - } - if (selected_unit.squad!="none"){ + }else { current_squad = obj_ini.squads[selected_unit.squad]; - var x_mod=0,y_mod=0; - var member_width=0, member_height=0; - var x_overlap_mod =0; - var bound_width = center_width; - var bound_height = center_height; + bound_width = center_width; + bound_height = center_height; draw_set_halign(fa_left); if (array_length(company_squads) > 0){ @@ -284,90 +460,47 @@ function CompanyStruct(comp) constructor{ draw_set_halign(fa_left); //should be moved elsewhere for efficiency - var squad_leader = current_squad.determine_leader(); + squad_leader = current_squad.determine_leader(); if (squad_leader != "none"){ var leader_text = $"Squad Leader : {fetch_unit(squad_leader).name_role()}" draw_text_transformed(xx+bound_width[0]+5, yy+bound_height[0]+50, leader_text,1,1,0); } - var squad_loc = current_squad.squad_loci(); + squad_loc = current_squad.squad_loci(); draw_text_transformed(xx+bound_width[0]+5, yy+bound_height[0]+75, $"Squad Members : {current_squad.life_members}",1,1,0); draw_text_transformed(xx+bound_width[0]+5, yy+bound_height[0]+100, $"Squad Location : {squad_loc.text}",1,1,0); - var send_on_mission=false, mission_type; - if (current_squad.assignment == "none"){ - - draw_text_transformed(xx+bound_width[0]+5, yy+bound_height[0]+125, $"Squad has no current assignments",1,1,0); - var _squad_sys = squad_loc.system; - if (squad_loc.same_system) and (_squad_sys!="Warp" && _squad_sys!="Lost"){ - if (garrison_button.draw()){ - send_on_mission=true; - mission_type="garrison"; - } + if (!squad_selection_mode){ + draw_squad_assignment_options(); + } else { + var _select_action = false; + if (array_contains(selected_squads, company_squads[cur_squad])){ + select_squad_button.update({ + color:c_red, + label : "De-select Squad", + }); + } else { - garrison_button.keystroke = press_exclusive(ord("G")); - if (array_contains(current_squad.class, "scout")) || (array_contains(current_squad.class, "bike")){ - if (sabotage_button.draw()){ - send_on_mission=true; - mission_type="sabotage"; - } - } - } - if (send_on_mission){ - send_squad_on_mission(mission_type,star_by_name(squad_loc.system)); + select_squad_button.update({ + color:c_green, + label : "Select Squad", + }); + _select_action = true; } - bound_height[0] += 180; - } else { - if (is_struct(current_squad.assignment)){ - var cur_assignment = current_squad.assignment - draw_text_transformed(xx+bound_width[0]+5, yy+bound_height[0]+125, $"Assignment : {cur_assignment.type}",1,1,0); - var tooltip_text = "Cancel Assignment" - var cancel_but = draw_unit_buttons([xx+bound_width[0]+5, yy+bound_height[0]+150],tooltip_text,[1,1],c_red,,,,true); - if(point_and_click(cancel_but) || keyboard_check_pressed(ord("C"))){ - var cancel_system=noone; - with (obj_star){ - if (name == squad_loc.system){ - cancel_system=self; - } - } - if (cancel_system!=noone){ - var planet = current_squad.assignment.ident; - var operation; - for (var i=0;i0){ - rollover_sequence--; - } - } - } - if (exit_period and !scr_hit(xx+25, yy+144, xx+525, yy+981)){ - exit_period=false; - } + + draw_squad_unit_sprites(); } } } diff --git a/scripts/scr_draw_management_unit/scr_draw_management_unit.gml b/scripts/scr_draw_management_unit/scr_draw_management_unit.gml index 3194a86c30..222893740e 100644 --- a/scripts/scr_draw_management_unit/scr_draw_management_unit.gml +++ b/scripts/scr_draw_management_unit/scr_draw_management_unit.gml @@ -524,7 +524,7 @@ function scr_draw_management_unit(selected, yy = 0, xx = 0, draw = true) { } if (((mouse_x >= xx + 25 && mouse_y >= yy + 64 && mouse_x < xx + 974 && mouse_y < yy + 85) || force_tool == 1) && is_struct(_unit)) { - temp[120] = _unit; // unit_struct + unit_focus = _unit; // unit_struct } } if (!ma_view[selected]) { diff --git a/scripts/scr_draw_planet_features/scr_draw_planet_features.gml b/scripts/scr_draw_planet_features/scr_draw_planet_features.gml index 1c186ea863..8bcf478e0f 100644 --- a/scripts/scr_draw_planet_features/scr_draw_planet_features.gml +++ b/scripts/scr_draw_planet_features/scr_draw_planet_features.gml @@ -51,6 +51,7 @@ function FeatureSelected(Feature, system, planet) constructor{ var area_height = main_slate.height; var generic = false; var title="", body=""; + var _button_tooltip = ""; //draw_glow_dot(xx+150, yy+150); //rack_and_pinion(xx+230, yy+170); var rectangle = []; @@ -243,6 +244,7 @@ function FeatureSelected(Feature, system, planet) constructor{ break; case "hunt_beast": mission_description=$"The governor of {planet_name} has bemoaned the raiding of huge beasts on the fringes of the planets largest city, the numbers have swelled recently and are causing huge damage to the planets small economy. You could send a force to intervene, it would provide a fine test of metal for any that partake."; + help = "This is a good opportunity to provide experience and training, having at least one marine with experience in such matters would be advisable"; button_text = "Send Hunters"; button_function = function(){ var dudes = collect_role_group("all", obj_star_select.target.name); @@ -261,7 +263,24 @@ function FeatureSelected(Feature, system, planet) constructor{ break; case "protect_raiders": mission_description=$"The governor of {planet_name} has sent many requests to the sector commander for help with defending against xenos raids on the populace of the planet, the reports seem to suggest the xenos in question are in fact dark elder."; - help = "Set a squad to ambush "; + help = "Set a squad to ambush"; + button_text = "Send Squad"; + _button_tooltip = "milage may vary on playability of this mission progress at your own risk"; + button_function = function(){ + var dudes = collect_role_group("all", obj_star_select.target.name); + group_selection(dudes,{ + purpose:"Select Squad for Ambush", + purpose_code : feature.problem, + number:1, + system:planet_data.system, + feature:obj_star_select.feature, + planet : planet_data.planet, + array_slot : feature.array_position, + select_type : MissionSelectType.Squads, + selections : [] + }); + destroy=true; + } break; case "train_forces": mission_description=$"The governor of {planet_name} fears the planet will not hold in the case of major incursion, it has not seen war in some time and he fears the ineptitude of the commanders available, he asks for aid in planning a thorough plan for defense and schedule of works for a period of at least 6 months."; @@ -297,7 +316,11 @@ function FeatureSelected(Feature, system, planet) constructor{ } if (button_text!="none"){ - if (point_and_click(draw_unit_buttons([xx+((area_width/2)-(string_width(button_text)/2)), yy+40+text_body_height+10], button_text))){ + var _button = draw_unit_buttons([xx+((area_width/2)-(string_width(button_text)/2)), yy+40+text_body_height+10], button_text); + if (_button_tooltip != "" && scr_hit(_button)){ + tooltip_draw(_button_tooltip); + } + if (point_and_click(_button)){ if (is_callable(button_function)){ button_function(); destroy=true; 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 64cdcd96d5..2de53bb0da 100644 --- a/scripts/scr_draw_unit_image/scr_draw_unit_image.gml +++ b/scripts/scr_draw_unit_image/scr_draw_unit_image.gml @@ -55,6 +55,11 @@ function surface_clear_and_free(_surface) { function UnitImage(_unit_sprite) constructor { unit_sprite = _unit_sprite; + x1 = 0; + y1 = 0; + x2 = 0; + y2 = 0; + static draw = function(xx, yy, _background = false,xscale = 1, yscale=1, rot=0, col=c_white, alpha=1) { if (_background) { draw_rectangle_color_simple(xx - 1, yy - 1, xx + 1 + 166, yy + 271 + 1, 0, c_black); @@ -76,9 +81,19 @@ function UnitImage(_unit_sprite) constructor { if (sprite_exists(unit_sprite)) { draw_sprite_part(unit_sprite, 0, left + 200, top + 90, width, height, xx, yy); } + x1 = xx; + y1 = yy; + x2 = xx + width; + y2 = yy + height; }; + static hit = function(){ + return scr_hit(x1, y1, x2, y2); + } + static box = function(){ + return [x1, y1, x2, y2]; + } static destroy_image = function() { if (sprite_exists(unit_sprite)) { sprite_delete(unit_sprite); diff --git a/scripts/scr_enemy_ai_e/scr_enemy_ai_e.gml b/scripts/scr_enemy_ai_e/scr_enemy_ai_e.gml index d0daa1616b..76730c1faa 100644 --- a/scripts/scr_enemy_ai_e/scr_enemy_ai_e.gml +++ b/scripts/scr_enemy_ai_e/scr_enemy_ai_e.gml @@ -515,7 +515,6 @@ function scr_enemy_ai_e() { } } } - } if (p_player[run] > 0 && has_problem_planet(run,"necron")) { log_message($"player on planet with necron mission {name} planet: {run}") diff --git a/scripts/scr_manage_task_selector/scr_manage_task_selector.gml b/scripts/scr_manage_task_selector/scr_manage_task_selector.gml index 799387f950..57cf7fc0fd 100644 --- a/scripts/scr_manage_task_selector/scr_manage_task_selector.gml +++ b/scripts/scr_manage_task_selector/scr_manage_task_selector.gml @@ -1,225 +1,259 @@ // Script assets have changed for v2.3.0 see // https://help.yoyogames.com/hc/en-us/articles/360005277377 for more information function scr_manage_task_selector(){ - if (exit_button.draw_shutter(xx+400,yy+70, "Exit", 0.5, true)){ - if (is_real(selection_data.system) && selection_data.system <= 10 && selection_data.system >= 0){ - managing = selection_data.system; - update_general_manage_view(); - } else { - exit_adhoc_manage(); - exit; - } + if (exit_button.draw_shutter(400,70, "Exit", 0.5, true)){ + if (is_real(selection_data.system) && selection_data.system <= 10 && selection_data.system >= 0){ + managing = selection_data.system; + update_general_manage_view(); + } else { + exit_adhoc_manage(); + exit; } + } + if (selection_data.select_type == MissionSelectType.Units){ man_count = array_sum(man_sel); - if (selection_data.purpose_code!="manage"){ - if ((man_count==0 || man_count>selection_data.number)){ - proceed_button.draw_shutter(xx+1110,yy+70, "Proceed", 0.5, false); + } else { + man_count = array_length(company_data.selected_squads); + } + if (selection_data.purpose_code!="manage"){ + if ((man_count==0 || man_count>selection_data.number)){ + proceed_button.draw_shutter(1110,70, "Proceed", 0.5, false); + } else if (proceed_button.draw_shutter(1110,70, "Proceed", 0.5, true)){ + if (selection_data.select_type == MissionSelectType.Units){ + task_selector_man_manage(); } else { - if (proceed_button.draw_shutter(xx+1110,yy+70, "Proceed", 0.5, true)){ - selections = []; - var unit; - for (var i=0; i= 0;i--){ + unit = fetch_unit(members[i]); + if (unit.name() == ""){ + array_delete(members, i, 1); + continue; + } else { + array_push(_struct_array, unit); + } + } + return _struct_array; + } // for creating a new sergeant from existing squad members static new_sergeant = function(veteran=false){ var exp_unit=""; diff --git a/scripts/scr_ui_manage/scr_ui_manage.gml b/scripts/scr_ui_manage/scr_ui_manage.gml index 434e427b63..b6f6e42717 100644 --- a/scripts/scr_ui_manage/scr_ui_manage.gml +++ b/scripts/scr_ui_manage/scr_ui_manage.gml @@ -136,10 +136,12 @@ function alternative_manage_views(x1, y1) { keystroke: keyboard_check_pressed(ord("S")) }); - if (_squad_button.draw(!text_bar)) { - view_squad = !view_squad; - if (view_squad) { - new_company_struct(); + if (company_data.has_squads){ + if (_squad_button.draw(!text_bar)) { + view_squad = !view_squad; + if (view_squad) { + new_company_struct(); + } } } @@ -182,8 +184,8 @@ function draw_sprite_and_unit_equip_data(){ var yy = company_data.unit_ui_panel.YY; // draw_line(xx+1005,yy+519,xx+1576,yy+519); draw_set_font(fnt_40k_14b); - if (is_struct(obj_controller.temp[120])) { - var selected_unit = obj_controller.temp[120]; //unit struct + if (is_struct(obj_controller.unit_focus)) { + var selected_unit = obj_controller.unit_focus; //unit struct ///tooltip_text stacks hover over type tooltips into an array and draws them last so as not to create drawing order issues draw_set_color(c_red); var no_other_instances = !instance_exists(obj_temp3) && !instance_exists(obj_popup); @@ -539,10 +541,7 @@ function scr_ui_manage() { squad_sel_action = -1; } if (man_size < 1) { - selecting_location = ""; - selecting_ship = -1; - selecting_planet = 0; - man_size = 0; + reset_manage_selections(); } var unit, x1, x2, x3, y1, y2, y3, text; var tooltip_text = "", bionic_tooltip = ""; @@ -593,6 +592,9 @@ function scr_ui_manage() { if (struct_exists(selection_data, "purpose")) { draw_text(xx + 800, yy + 74, $"{selection_data.purpose}"); } + if (selection_data.select_type == MissionSelectType.Squads){ + view_squad = true; + } } if (managing <= 10 && managing > 0) { @@ -628,13 +630,11 @@ function scr_ui_manage() { // var we;we=string_width(string(global.chapter_name)+" "+string(fx))/2; - if (managing > 0) { + if (managing >= 0) { // Draw arrows draw_sprite_ext(spr_arrow, 0, xx + 25, yy + 70, 2, 2, 0, c_white, 1); // Back draw_sprite_ext(spr_arrow, 0, xx + 429, yy + 70, 2, 2, 0, c_white, 1); // Left draw_sprite_ext(spr_arrow, 1, xx + 1110, yy + 70, 2, 2, 0, c_white, 1); // Right - } else { - scr_manage_task_selector(); } var right_ui_block = { x1: xx + 1008, @@ -934,8 +934,8 @@ function scr_ui_manage() { button.label = "Reload"; //button.keystroke = (keyboard_check(vk_shift) && (keyboard_check_pressed(ord("F")))); - if (instance_exists(obj_controller) && is_struct(obj_controller.temp[120])) { - var selected_unit = obj_controller.temp[120]; + if (instance_exists(obj_controller) && is_struct(obj_controller.unit_focus)) { + var selected_unit = obj_controller.unit_focus; button.tooltip = $"{selected_unit.last_ship.name}"; //Press Shift F"; } reload_possible = man_size > 0 && sel_loading == -1; @@ -1215,8 +1215,8 @@ function scr_ui_manage() { draw_set_color(#3f7e5d); scr_scrollbar(974, 172, 1005, 790, 34, man_max, man_current); } - if (instance_exists(obj_controller) && is_struct(obj_controller.temp[120])) { - var selected_unit = obj_controller.temp[120]; + if (instance_exists(obj_controller) && is_struct(obj_controller.unit_focus)) { + var selected_unit = obj_controller.unit_focus; if ((selected_unit.name() != "") && (selected_unit.race() != 0)) { draw_set_alpha(1); var xx = __view_get(e__VW.XView, 0) + 0, yy = __view_get(e__VW.YView, 0) + 0; diff --git a/scripts/scr_ui_refresh/scr_ui_refresh.gml b/scripts/scr_ui_refresh/scr_ui_refresh.gml index e1338acf45..27dd87feed 100644 --- a/scripts/scr_ui_refresh/scr_ui_refresh.gml +++ b/scripts/scr_ui_refresh/scr_ui_refresh.gml @@ -1,10 +1,7 @@ // Refreshes the UI, reinitializes variables to defaults function scr_ui_refresh() { - man_size = 0; - selecting_location = ""; - selecting_types = ""; - selecting_ship = -1; + reset_manage_selections(); sel_uid = 0; reset_manage_arrays(); @@ -13,4 +10,11 @@ function scr_ui_refresh() { sel_loading = -1; unload = 0; alarm[6] = 7; -} \ No newline at end of file +} +function reset_manage_selections(){ + selecting_location = ""; + selecting_types = ""; + selecting_planet = 0; + selecting_ship = -1; + man_size = 0; +}; \ No newline at end of file From bf81eac670943f8c625626309419b698ef0dcdcf Mon Sep 17 00:00:00 2001 From: Nelsonh <81228864+OH296@users.noreply.github.com> Date: Sat, 19 Jul 2025 02:47:36 +0100 Subject: [PATCH 145/286] fix: better use of controllable static and disallow empty key (#934) --- .../scr_unit_quick_find_pane/scr_unit_quick_find_pane.gml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/scripts/scr_unit_quick_find_pane/scr_unit_quick_find_pane.gml b/scripts/scr_unit_quick_find_pane/scr_unit_quick_find_pane.gml index 04a45b4170..ddc40f8a15 100644 --- a/scripts/scr_unit_quick_find_pane/scr_unit_quick_find_pane.gml +++ b/scripts/scr_unit_quick_find_pane/scr_unit_quick_find_pane.gml @@ -28,10 +28,9 @@ function UnitQuickFindPanel() constructor{ for (var u=0;u Date: Sun, 20 Jul 2025 01:25:06 +0300 Subject: [PATCH 146/286] feat: Don't destroy equipment with perils (#936) --- .../scr_marine_struct/scr_marine_struct.gml | 75 +++++++++++++++++++ scripts/scr_perils_table/scr_perils_table.gml | 4 +- 2 files changed, 77 insertions(+), 2 deletions(-) diff --git a/scripts/scr_marine_struct/scr_marine_struct.gml b/scripts/scr_marine_struct/scr_marine_struct.gml index b821461477..080c67a7c5 100644 --- a/scripts/scr_marine_struct/scr_marine_struct.gml +++ b/scripts/scr_marine_struct/scr_marine_struct.gml @@ -43,6 +43,15 @@ enum location_types { #macro ARR_psy_levels ["Rho", "Pi", "Omicron", "Xi", "Nu", "Mu", "Lambda", "Kappa", "Iota", "Theta", "Eta", "Zeta", "Epsilon", "Delta", "Gamma", "Beta", "Alpha", "Alpha Plus", "Beta", "Gamma Plus"] #macro ARR_negative_psy_levels ["Rho", "Sigma", "Tau", "Upsilon", "Phi", "Chi", "Psi", "Omega"] +enum EquipmentSlot { + ARMOUR, + WEAPON_ONE, + WEAPON_TWO, + GEAR, + MOBILITY, + ALL, +} + global.base_stats = { //tempory stats subject to change by anyone that wishes to try their luck "chapter_master": { @@ -2329,6 +2338,72 @@ function TTRPG_stats(faction, comp, mar, class = "marine", other_spawn_data = {} arti.bearer = [end_company, end_slot]; } }; + + /// @param {Enum.EquipmentSlot} _slot + add_equipment_repairs = function(_slot = EquipmentSlot.ALL) { + var _slots = array_create(0); + + switch (_slot) { + case EquipmentSlot.ARMOUR: + _slots = [EquipmentSlot.ARMOUR]; + break; + case EquipmentSlot.WEAPON_ONE: + _slots = [EquipmentSlot.WEAPON_ONE]; + break; + case EquipmentSlot.WEAPON_TWO: + _slots = [EquipmentSlot.WEAPON_TWO]; + break; + case EquipmentSlot.GEAR: + _slots = [EquipmentSlot.GEAR]; + break; + case EquipmentSlot.MOBILITY: + _slots = [EquipmentSlot.MOBILITY]; + break; + case EquipmentSlot.ALL: + _slots = [EquipmentSlot.ARMOUR, EquipmentSlot.WEAPON_ONE, EquipmentSlot.WEAPON_TWO, EquipmentSlot.GEAR, EquipmentSlot.MOBILITY]; + break; + } + + for (var i = 0; i < array_length(_slots); i++) { + var _cur_slot = _slots[i]; + switch (_cur_slot) { + case EquipmentSlot.ARMOUR: + obj_controller.specialist_point_handler.add_to_armoury_repair(armour()); + if (instance_exists(obj_ncombat)) { + obj_ncombat.slime += get_armour_data("maintenance"); + } + break; + + case EquipmentSlot.WEAPON_ONE: + obj_controller.specialist_point_handler.add_to_armoury_repair(weapon_one()); + if (instance_exists(obj_ncombat)) { + obj_ncombat.slime += get_weapon_one_data("maintenance"); + } + break; + + case EquipmentSlot.WEAPON_TWO: + obj_controller.specialist_point_handler.add_to_armoury_repair(weapon_two()); + if (instance_exists(obj_ncombat)) { + obj_ncombat.slime += get_weapon_two_data("maintenance"); + } + break; + + case EquipmentSlot.GEAR: + obj_controller.specialist_point_handler.add_to_armoury_repair(gear()); + if (instance_exists(obj_ncombat)) { + obj_ncombat.slime += get_gear_data("maintenance"); + } + break; + + case EquipmentSlot.MOBILITY: + obj_controller.specialist_point_handler.add_to_armoury_repair(mobility_item()); + if (instance_exists(obj_ncombat)) { + obj_ncombat.slime += get_mobility_data("maintenance"); + } + break; + } + } + }; } function jsonify_marine_struct(company, marine, stringify=true) { diff --git a/scripts/scr_perils_table/scr_perils_table.gml b/scripts/scr_perils_table/scr_perils_table.gml index b3586c6ad3..ba52ce80d4 100644 --- a/scripts/scr_perils_table/scr_perils_table.gml +++ b/scripts/scr_perils_table/scr_perils_table.gml @@ -170,8 +170,8 @@ function scr_perils_table(perils_strength, unit, psy_discipline, power_name, uni } } } - unit.alter_equipment({wep1: "", wep2: "", armour: "", gear: "", mobi: ""}, false, false); - var flavour_text2 = "A massive shockwave eminates from the marine, who is knocked out cold! All of his equipment is destroyed!"; + unit.add_equipment_repairs(EquipmentSlot.ALL); + var flavour_text2 = "A massive shockwave eminates from the marine, who is knocked out cold! All of his equipment is damaged!"; return flavour_text2; } ], From b037d0137fb61e20f8b9a1484fa4cc306268fe73 Mon Sep 17 00:00:00 2001 From: Nelsonh <81228864+OH296@users.noreply.github.com> Date: Sat, 19 Jul 2025 23:28:20 +0100 Subject: [PATCH 147/286] fix: central method for clearing popup options (#935) --- ChapterMaster.yyp | 1 + objects/obj_ncombat/Alarm_7.gml | 4 +- objects/obj_popup/Create_0.gml | 18 ++----- objects/obj_popup/Step_0.gml | 47 +++++-------------- .../scr_mechanicus_missions.gml | 7 +-- .../scr_popup_functions.gml | 10 ++++ .../scr_popup_functions.yy | 13 +++++ scripts/scr_purge_world/scr_purge_world.gml | 4 +- 8 files changed, 47 insertions(+), 57 deletions(-) create mode 100644 scripts/scr_popup_functions/scr_popup_functions.gml create mode 100644 scripts/scr_popup_functions/scr_popup_functions.yy diff --git a/ChapterMaster.yyp b/ChapterMaster.yyp index 43464f12ae..f0dc048162 100644 --- a/ChapterMaster.yyp +++ b/ChapterMaster.yyp @@ -875,6 +875,7 @@ {"id":{"name":"scr_player_fleet_functions","path":"scripts/scr_player_fleet_functions/scr_player_fleet_functions.yy",},}, {"id":{"name":"scr_player_ship_functions","path":"scripts/scr_player_ship_functions/scr_player_ship_functions.yy",},}, {"id":{"name":"scr_population_influence","path":"scripts/scr_population_influence/scr_population_influence.yy",},}, + {"id":{"name":"scr_popup_functions","path":"scripts/scr_popup_functions/scr_popup_functions.yy",},}, {"id":{"name":"scr_popup","path":"scripts/scr_popup/scr_popup.yy",},}, {"id":{"name":"scr_powers","path":"scripts/scr_powers/scr_powers.yy",},}, {"id":{"name":"scr_punit_combat_heplers","path":"scripts/scr_punit_combat_heplers/scr_punit_combat_heplers.yy",},}, diff --git a/objects/obj_ncombat/Alarm_7.gml b/objects/obj_ncombat/Alarm_7.gml index fee72b98e6..0e059d6104 100644 --- a/objects/obj_ncombat/Alarm_7.gml +++ b/objects/obj_ncombat/Alarm_7.gml @@ -361,7 +361,7 @@ try { image=""; title="Inquisition Mission Completed"; text="Your marines finally enter the deepest catacombs of the Necron Tomb. There they place the Plasma Bomb and arm it. All around are signs of increasing Necron activity. With half an hour set, your men escape back to the surface. There is a brief rumble as the charge goes off, your mission a success."; - option1="";option2="";option3=""; + reset_popup_options(); alter_disposition(eFACTION.Inquisition, obj_controller.demanding ? choose(0,0,1) : 1); @@ -387,7 +387,7 @@ try { seal_tomb_world(star.p_feature[planet]); - pip.option1="";pip.option2="";pip.option3=""; + reset_popup_options(); scr_event_log("","Inquisition Mission Completed: Your Astartes have sealed the Necron Tomb on "+string(star.name)+" "+string(scr_roman(planet))+"."); scr_gov_disp(star.name,planet,choose(1,2,3,4,5)); diff --git a/objects/obj_popup/Create_0.gml b/objects/obj_popup/Create_0.gml index 1d7415884d..a378861d11 100644 --- a/objects/obj_popup/Create_0.gml +++ b/objects/obj_popup/Create_0.gml @@ -15,10 +15,7 @@ fancy_title=0; text_center=0; text=""; text2=""; -option1=""; -option2=""; -option3=""; -option4=""; +reset_popup_options(); pathway=""; option1enter=false; option2enter=false; @@ -59,11 +56,7 @@ all_good=0; prev_selected = 0; new_target=0; -function reset_popup_option(){ - option1 = ""; - option2 = ""; - option3 = ""; -} + if (instance_exists(obj_controller)){obj_controller.cooldown=8000;} number=0; company_promote_data = [ @@ -82,12 +75,7 @@ company_promote_data = [ for (var i=0;i<=10;i++){i+=1;role_name[i]="";role_exp[i]=0;} -reset_options = function(){ - option1=""; - option2=""; - option3=""; - option4=""; -} + // TODO: connect this logic with the other_manage_data() to reduce verboseness; get_unit_promotion_options = function(){ diff --git a/objects/obj_popup/Step_0.gml b/objects/obj_popup/Step_0.gml index 3ec72fe3e9..79d068eb67 100644 --- a/objects/obj_popup/Step_0.gml +++ b/objects/obj_popup/Step_0.gml @@ -302,9 +302,7 @@ try { } obj_controller.disposition[10] -= 10; text = "The heretic is killed in a most violent fashion. With a lack of go-between the meeting cannot proceed."; - option1 = ""; - option2 = ""; - option3 = ""; + reset_popup_options(); mission = ""; // image=""; if (obj_controller.blood_debt == 1) { obj_controller.penitent_current += 1; @@ -320,9 +318,7 @@ try { obj_controller.complex_event = true; obj_controller.current_eventing = "chaos_meeting_1"; text = $"{global.chapter_name} signal your readiness to the heretic. Nearly twenty minutes of following the man passes before {global.chapter_name} all enter an ordinary-looking structure. Down, within the basement, {global.chapter_name} then pass into the entrance of a tunnel. As the trek downward continues more and more heretics appear- cultists, renegades that appear to be from the local garrison, and occasionally even the fallen of your kind. Overall the heretics seem well supplied and equip. This observation is interrupted as your group enters into a larger chamber, revealing a network of tunnels and what appears to be ancient catacombs. Bones of the ancient dead, the forgotten, litter the walls and floor. And the chamber seems to open up wider, and wider, until {global.chapter_name} find yourself within a hall. Within this hall, waiting for {global.chapter_name}, are several dozen Chaos Terminators, a Greater Daemon of Tzeentch and Slaanesh, and Chaos Lord " + string(obj_controller.faction_leader[eFACTION.Chaos]) + "."; - option1 = ""; - option2 = ""; - option3 = ""; + reset_popup_options(); mission = "cslord1"; image = ""; img = 0; @@ -338,9 +334,7 @@ try { obj_controller.complex_event = true; obj_controller.current_eventing = "chaos_trap"; text = $"{global.chapter_name} signal your readiness to the heretic. Nearly twenty minutes of following the man passes before {global.chapter_name} all enter an ordinary-looking structure. Down, within the basement, {global.chapter_name} then pass into the entrance of a tunnel. As the trek downward continues more and more heretics appear- cultists, renegades that appear to be from the local garrison, and occasionally even the fallen of your kind. Overall the heretics seem well supplied and equip. This observation is interrupted as your group enters into a larger chamber, revealing a network of tunnels and what appears to be ancient catacombs. Bones of the ancient dead, the forgotten, litter the walls and floor. And the chamber seems to open up wider, and wider, until {global.chapter_name} find yourself within a hall. Within this hall, waiting for {global.chapter_name}, are several dozen Chaos Terminators, a handful of Helbrute, and many more Chaos Space Marines. The Chaos Lord is nowhere to be seen. It is a trap."; - option1 = ""; - option2 = ""; - option3 = ""; + reset_popup_options(); mission = "cslord1t"; image = ""; img = 0; @@ -459,8 +453,7 @@ try { delete_artifact(contraband[i]); } obj_controller.cooldown = 10; - option1 = ""; - option2 = ""; + reset_popup_options(); loc = ""; text = $"All Chaos and Daemonic Artifacts present have been handed over to the Inquisitor. They remain seething, but your destruction has been stalled. Or so {global.chapter_name} imagine."; exit; @@ -656,9 +649,7 @@ try { obj_ground_mission.ruins_battle = ruins_battle; obj_ground_mission.battle_threat = battle_threat; - option1 = ""; - option2 = ""; - option3 = ""; + reset_popup_options(); text = "Your marines descended into the ancient ruins, mapping them out as they go. They quickly determine the ruins were once "; switch (_ruins.ruins_race) { case eFACTION.Player: @@ -942,9 +933,7 @@ try { image = ""; title = "Inquisition Mission Completed"; text = "Your marines finally enter the deepest catacombs of the Necron Tomb. There they place the Plasma Bomb and arm it. All around are signs of increasing Necron activity. With half an hour set, your men escape back to the surface. There is a brief rumble as the charge goes off, your mission a success."; - option1 = ""; - option2 = ""; - option3 = ""; + reset_popup_options(); if (obj_controller.demanding == 0) { obj_controller.disposition[4] += 1; @@ -1131,9 +1120,7 @@ try { if (demand) { text = $"The Inquisition demands that your Chapter demonstrate its loyalty. {global.chapter_name} have been given a Plasma Bomb to seal the Necron Tomb on {mission_star.name} {scr_roman(onceh)}. It is expected to be completed within {estimate} months."; } - option1 = ""; - option2 = ""; - option3 = ""; + reset_popup_options(); scr_add_item("Plasma Bomb", 1); obj_controller.cooldown = 10; if (demand) { @@ -1151,9 +1138,7 @@ try { text = $"The Inquisition demands that your Chapter demonstrate its loyalty to the Imperium of Mankind and the Emperor. {global.chapter_name} are to capture a Gaunt organism and return it, unharmed- 4x Webbers have been provided for this purpose."; } - option1 = ""; - option2 = ""; - option3 = ""; + reset_popup_options(); scr_add_item("Webber", 4); obj_controller.cooldown = 10; scr_event_log("", $"Inquisition Mission Accepted: The Inquisition wishes for the capture of a particular strain Gaunt noticed on {mission_star.name} {scr_roman(planet)} is advisable.", mission_star.name); @@ -1223,9 +1208,7 @@ try { scr_event_log("", "Inquisition Mission Accepted: The Inquisition has left an Artifact in your care."); text += $" It is some form of {obj_ini.artifact[last_artifact]}."; - option1 = ""; - option2 = ""; - option3 = ""; + reset_popup_options(); obj_controller.cooldown = 10; exit; } @@ -1233,9 +1216,7 @@ try { if (demand) { demand = 0; - option1 = ""; - option2 = ""; - option3 = ""; + reset_popup_options(); exit; } // Remove multi-choices } @@ -1396,9 +1377,7 @@ try { title = "Inquisition Mission Completed"; image = "exploding_ship"; text = $"{global.chapter_name} allow communications. As soon as the vox turns on {global.chapter_name} hear a sickly, hateful voice. They begin to speak of the inevitable death of your marines, the fall of all that is and ever shall be, and " + string(gender2) + " Lord of Decay. Their ship is fired upon and destroyed without hesitation."; - option1 = ""; - option2 = ""; - option3 = ""; + reset_popup_options(); scr_event_log("", "Inquisition Mission Completed: The radical Inquisitor has been purged."); exit; } @@ -1702,7 +1681,7 @@ try { } else if (lacks < ((array_length(techs) - 1) * 0.65)) { text += "Most are unhappy with the decision but your word is final"; } - reset_options(); + reset_popup_options(); press = 0; pathway = "end_splash"; if (pick.company > 0) { @@ -1807,7 +1786,7 @@ try { } else if (press == 3) { text = "The extremists and heretics that have been allowed to grow like a cancer in the Armentarium are rooted out and disposed of."; } - reset_options(); + reset_popup_options(); press = 0; pathway = "end_splash"; } diff --git a/scripts/scr_mechanicus_missions/scr_mechanicus_missions.gml b/scripts/scr_mechanicus_missions/scr_mechanicus_missions.gml index e24209d683..62e5bf8e44 100644 --- a/scripts/scr_mechanicus_missions/scr_mechanicus_missions.gml +++ b/scripts/scr_mechanicus_missions/scr_mechanicus_missions.gml @@ -323,8 +323,7 @@ function mechanicus_mission_procedures(){ scr_event_log("", "Mechanicus Mission Accepted: At least two squads of marines are expected at {_name} within 16 months.", _star.name); new_star_event_marker("green"); title = "Mechanicus Mission Accepted"; - option1 = ""; - option2 = ""; + reset_popup_options(); cooldown = 15; exit; @@ -365,9 +364,7 @@ function mechanicus_mission_procedures(){ } cooldown = 15; title = "Mechanicus Mission Accepted"; - option1 = ""; - option2 = ""; - option3 = ""; + reset_popup_options(); exit; } } diff --git a/scripts/scr_popup_functions/scr_popup_functions.gml b/scripts/scr_popup_functions/scr_popup_functions.gml new file mode 100644 index 0000000000..a56fe43139 --- /dev/null +++ b/scripts/scr_popup_functions/scr_popup_functions.gml @@ -0,0 +1,10 @@ +/// @function reset_popup_options() +/// @description Resets all popup option variables to empty strings +function reset_popup_options(){ + with (obj_popup){ + option1=""; + option2=""; + option3=""; + option4=""; + } +} \ No newline at end of file diff --git a/scripts/scr_popup_functions/scr_popup_functions.yy b/scripts/scr_popup_functions/scr_popup_functions.yy new file mode 100644 index 0000000000..161ffa6e9b --- /dev/null +++ b/scripts/scr_popup_functions/scr_popup_functions.yy @@ -0,0 +1,13 @@ +{ + "$GMScript":"v1", + "%Name":"scr_popup_functions", + "isCompatibility":false, + "isDnD":false, + "name":"scr_popup_functions", + "parent":{ + "name":"Scripts", + "path":"folders/Scripts.yy", + }, + "resourceType":"GMScript", + "resourceVersion":"2.0", +} \ No newline at end of file diff --git a/scripts/scr_purge_world/scr_purge_world.gml b/scripts/scr_purge_world/scr_purge_world.gml index 7535ad53e6..14fd147b62 100644 --- a/scripts/scr_purge_world/scr_purge_world.gml +++ b/scripts/scr_purge_world/scr_purge_world.gml @@ -300,7 +300,9 @@ function scr_purge_world(star, planet, action_type, action_score) { } // If there are enemy non-chaos forces then they may be used as a cover // Does not work with chaos because if the governor dies, with chaos present, the new governor would possibly be investigated - if (star.p_orks[planet]>=4) or (star.p_necrons[planet]>=3) or (star.p_tyranids[planet]>=5) then pip.estimate=pip.estimate*0.5; + if (star.p_orks[planet]>=4) or (star.p_necrons[planet]>=3) or (star.p_tyranids[planet]>=5){ + pip.estimate=pip.estimate*0.5; + } } From 9ce1a20b81626dd2048ef82748700bbcd4b9b643 Mon Sep 17 00:00:00 2001 From: Nelsonh <81228864+OH296@users.noreply.github.com> Date: Mon, 21 Jul 2025 00:03:20 +0100 Subject: [PATCH 148/286] fix: resolve crash from cancelling garrisons (#937) --- scripts/scr_company_struct/scr_company_struct.gml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/scripts/scr_company_struct/scr_company_struct.gml b/scripts/scr_company_struct/scr_company_struct.gml index 5c676c88a9..d4e1b1b7bc 100644 --- a/scripts/scr_company_struct/scr_company_struct.gml +++ b/scripts/scr_company_struct/scr_company_struct.gml @@ -249,12 +249,12 @@ function CompanyStruct(comp) constructor{ } static draw_squad_assignment_options = function(){ + var _squad_sys = squad_loc.system; if (current_squad.assignment == "none"){ draw_text_transformed(xx+bound_width[0]+5, yy+bound_height[0]+125, $"Squad has no current assignments",1,1,0); var send_on_mission=false, mission_type; - var _squad_sys = squad_loc.system; if (squad_loc.same_system) and (_squad_sys!="Warp" && _squad_sys!="Lost"){ if (garrison_button.draw()){ send_on_mission=true; @@ -270,7 +270,7 @@ function CompanyStruct(comp) constructor{ } } if (send_on_mission){ - send_squad_on_mission(mission_type,star_by_name(squad_loc.system)); + send_squad_on_mission(mission_type,star_by_name(_squad_sys)); } bound_height[0] += 180; } else { @@ -282,7 +282,7 @@ function CompanyStruct(comp) constructor{ if(point_and_click(cancel_but) || keyboard_check_pressed(ord("C"))){ var cancel_system=noone; with (obj_star){ - if (name == squad_loc.system){ + if (name == _squad_sys){ cancel_system=self; } } From ee2c3c57657296fd3f42c70e3e9d4715608ba897 Mon Sep 17 00:00:00 2001 From: EttyKitty <20323032+EttyKitty@users.noreply.github.com> Date: Mon, 21 Jul 2025 20:49:01 +0300 Subject: [PATCH 149/286] fix: Oblitereated fleet numbers (by @CptMacTavish2224) (#940) Co-authored-by: CptMacTavish2224 <95313759+CptMacTavish2224@users.noreply.github.com> --- scripts/scr_initialize_custom/scr_initialize_custom.gml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/scr_initialize_custom/scr_initialize_custom.gml b/scripts/scr_initialize_custom/scr_initialize_custom.gml index 6cac0b3928..624301a718 100644 --- a/scripts/scr_initialize_custom/scr_initialize_custom.gml +++ b/scripts/scr_initialize_custom/scr_initialize_custom.gml @@ -807,8 +807,6 @@ function scr_initialize_custom() { } } - if (scr_has_adv ("Kings of Space")) {battle_barges += 1;} - if (scr_has_adv("Boarders")){ strike_cruisers += 2;} if (scr_has_disadv("Obliterated")){ if (obj_creation.fleet_type == ePlayerBase.home_world) { battle_barges = 0; strike_cruisers = 2; @@ -821,6 +819,8 @@ function scr_initialize_custom() { hunters = 0; } } + if (scr_has_adv ("Kings of Space")) {battle_barges += 1;} + if (scr_has_adv("Boarders")){ strike_cruisers += 2;} if(struct_exists(obj_creation, "extra_ships")){ battle_barges = battle_barges + obj_creation.extra_ships.battle_barges; strike_cruisers = strike_cruisers + obj_creation.extra_ships.strike_cruisers; From 0c733e0e67d12d04ddb01bff7ff861d02df24673 Mon Sep 17 00:00:00 2001 From: Frost-bit-jpg Date: Wed, 23 Jul 2025 21:49:22 +1000 Subject: [PATCH 150/286] fix: Add missing weapons to the default role equip pool (#942) --- .../scr_get_item_names/scr_get_item_names.gml | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) 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 9d8dd70614..f678ca3b7f 100644 --- a/scripts/scr_get_item_names/scr_get_item_names.gml +++ b/scripts/scr_get_item_names/scr_get_item_names.gml @@ -22,7 +22,7 @@ function get_none_or_any_item_names(_item_names, _with_none=false, _with_any=fal /// @param {array} _item_names - The list of ranged weapons to append to. /// @returns {void} function push_marine_ranged_weapons_item_names(_item_names) { - var item_count = 22 + var item_count = 29; var initial_size = array_length(_item_names); array_resize(_item_names, initial_size + item_count); @@ -33,6 +33,12 @@ function push_marine_ranged_weapons_item_names(_item_names) { _item_names[@ index++] = "Bolter"; _item_names[@ index++] = "Stalker Pattern Bolter"; _item_names[@ index++] = "Combiflamer"; + _item_names[@ index++] = "Combiplasma"; + _item_names[@ index++] = "Combimelta"; + _item_names[@ index++] = "Combigrav"; + _item_names[@ index++] = "Grav-Pistol"; + _item_names[@ index++] = "Grav-Gun"; + _item_names[@ index++] = "Grav-Cannon"; _item_names[@ index++] = "Flamer"; _item_names[@ index++] = "Heavy Bolter"; _item_names[@ index++] = "Heavy Flamer"; @@ -44,18 +50,19 @@ function push_marine_ranged_weapons_item_names(_item_names) { _item_names[@ index++] = "Missile Launcher"; _item_names[@ index++] = "Multi-Melta"; _item_names[@ index++] = "Autocannon"; + _item_names[@ index++] = "Plasma Cannon"; _item_names[@ index++] = "Plasma Gun"; _item_names[@ index++] = "Plasma Pistol"; _item_names[@ index++] = "Sniper Rifle"; _item_names[@ index++] = "Storm Bolter"; - _item_names[@ index++] = "Webber"; // 22 + _item_names[@ index++] = "Webber"; // 29 } /// @description This function returns the hard-coded list of melee weapons. /// @param {array} _item_names - The list to append to. /// @returns {void} function push_marine_melee_weapons_item_names(_item_names) { - var item_count = 17; + var item_count = 19; var initial_size = array_length(_item_names); array_resize(_item_names, initial_size + item_count); @@ -66,17 +73,19 @@ function push_marine_melee_weapons_item_names(_item_names) { _item_names[@ index++] = "Eviscerator"; _item_names[@ index++] = "Power Sword"; _item_names[@ index++] = "Power Axe"; + _item_names[@ index++] = "Power Spear"; _item_names[@ index++] = "Power Fist"; _item_names[@ index++] = "Boltstorm Gauntlet"; _item_names[@ index++] = "Chainfist"; _item_names[@ index++] = "Lightning Claw"; _item_names[@ index++] = "Force Staff"; _item_names[@ index++] = "Thunder Hammer"; + _item_names[@ index++] = "Heavy Thunder Hammer"; _item_names[@ index++] = "Crozius Arcanum"; _item_names[@ index++] = "Boarding Shield"; _item_names[@ index++] = "Storm Shield"; _item_names[@ index++] = "Bolt Pistol"; - _item_names[@ index++] = "Bolter"; // 17 + _item_names[@ index++] = "Bolter"; // 19 } From 4f6bca91d978726f77d56f17c6f50ebbdd1003f4 Mon Sep 17 00:00:00 2001 From: Nelsonh <81228864+OH296@users.noreply.github.com> Date: Wed, 23 Jul 2025 21:06:16 +0100 Subject: [PATCH 151/286] feat: Refactor and improve all obj_popup visuals and logics (#943) --- ChapterMaster.yyp | 4 + objects/obj_controller/Draw_64.gml | 37 +- objects/obj_dropdown_sel/Draw_0.gml | 6 +- objects/obj_ncombat/Alarm_7.gml | 8 +- objects/obj_popup/Create_0.gml | 172 +- objects/obj_popup/Draw_0.gml | 1589 +---------------- objects/obj_popup/Draw_64.gml | 12 + objects/obj_popup/Mouse_50.gml | 566 +----- objects/obj_popup/Step_0.gml | 63 +- objects/obj_popup/obj_popup.yy | 1 + objects/obj_tooltip/Draw_75.gml | 14 +- scripts/is_specialist/is_specialist.gml | 8 +- scripts/scr_DataSlate/scr_DataSlate.gml | 13 +- scripts/scr_add_artifact/scr_add_artifact.gml | 132 +- scripts/scr_buttons/scr_buttons.gml | 103 +- .../scr_company_order/scr_company_order.gml | 2 +- .../scr_company_struct/scr_company_struct.gml | 33 +- .../scr_controller_helpers.gml | 8 +- .../scr_diplomacy_helpers.gml | 13 + .../scr_draw_armentarium.gml | 196 +- .../scr_draw_management_unit.gml | 4 +- .../scr_draw_planet_features.gml | 4 +- scripts/scr_draw_text/scr_draw_text.gml | 10 + .../scr_get_item_names/scr_get_item_names.gml | 131 +- scripts/scr_gift_items/scr_gift_items.gml | 292 +++ scripts/scr_gift_items/scr_gift_items.yy | 13 + scripts/scr_librarium/scr_librarium.gml | 579 +++--- .../scr_manage_task_selector.gml | 196 +- .../scr_marine_struct/scr_marine_struct.gml | 4 +- .../scr_mission_functions.gml | 114 +- .../scr_pen_And_paper/scr_pen_And_paper.gml | 24 + .../scr_popup_functions.gml | 368 ++++ scripts/scr_promote/scr_promote.gml | 340 ++++ scripts/scr_promote/scr_promote.yy | 13 + .../scr_reequip_units/scr_reequip_units.gml | 807 +++++++++ .../scr_reequip_units/scr_reequip_units.yy | 13 + scripts/scr_special_view/scr_special_view.gml | 44 +- scripts/scr_squads/scr_squads.gml | 5 + .../scr_transfer_marines.gml | 192 ++ .../scr_transfer_marines.yy | 13 + scripts/scr_ui_diplomacy/scr_ui_diplomacy.gml | 6 +- scripts/scr_ui_manage/scr_ui_manage.gml | 49 +- .../scr_unit_quick_find_pane.gml | 162 +- .../spr_pixel_button_left.yy | 6 +- .../531933e7-b10e-42c4-96fd-7b6aaf423b29.png | Bin 464 -> 460 bytes .../7dc4c8c2-7af4-42fa-8949-052b7fe7a314.png | Bin 0 -> 561 bytes .../a3934012-92f7-4b26-ba15-b4043a5867b4.png | Bin 464 -> 460 bytes .../a3934012-92f7-4b26-ba15-b4043a5867b4.png | Bin 0 -> 561 bytes .../spr_pixel_button_right.yy | 12 +- 49 files changed, 3147 insertions(+), 3234 deletions(-) create mode 100644 objects/obj_popup/Draw_64.gml create mode 100644 scripts/scr_gift_items/scr_gift_items.gml create mode 100644 scripts/scr_gift_items/scr_gift_items.yy create mode 100644 scripts/scr_promote/scr_promote.gml create mode 100644 scripts/scr_promote/scr_promote.yy create mode 100644 scripts/scr_reequip_units/scr_reequip_units.gml create mode 100644 scripts/scr_reequip_units/scr_reequip_units.yy create mode 100644 scripts/scr_transfer_marines/scr_transfer_marines.gml create mode 100644 scripts/scr_transfer_marines/scr_transfer_marines.yy create mode 100644 sprites/spr_pixel_button_right/7dc4c8c2-7af4-42fa-8949-052b7fe7a314.png create mode 100644 sprites/spr_pixel_button_right/layers/7dc4c8c2-7af4-42fa-8949-052b7fe7a314/a3934012-92f7-4b26-ba15-b4043a5867b4.png diff --git a/ChapterMaster.yyp b/ChapterMaster.yyp index f0dc048162..5680c9d324 100644 --- a/ChapterMaster.yyp +++ b/ChapterMaster.yyp @@ -820,6 +820,7 @@ {"id":{"name":"scr_get_diag_integer","path":"scripts/scr_get_diag_integer/scr_get_diag_integer.yy",},}, {"id":{"name":"scr_get_diag_string","path":"scripts/scr_get_diag_string/scr_get_diag_string.yy",},}, {"id":{"name":"scr_get_item_names","path":"scripts/scr_get_item_names/scr_get_item_names.yy",},}, + {"id":{"name":"scr_gift_items","path":"scripts/scr_gift_items/scr_gift_items.yy",},}, {"id":{"name":"scr_gov_disp","path":"scripts/scr_gov_disp/scr_gov_disp.yy",},}, {"id":{"name":"scr_ground_ai_helpers","path":"scripts/scr_ground_ai_helpers/scr_ground_ai_helpers.yy",},}, {"id":{"name":"scr_has_adv","path":"scripts/scr_has_adv/scr_has_adv.yy",},}, @@ -878,6 +879,7 @@ {"id":{"name":"scr_popup_functions","path":"scripts/scr_popup_functions/scr_popup_functions.yy",},}, {"id":{"name":"scr_popup","path":"scripts/scr_popup/scr_popup.yy",},}, {"id":{"name":"scr_powers","path":"scripts/scr_powers/scr_powers.yy",},}, + {"id":{"name":"scr_promote","path":"scripts/scr_promote/scr_promote.yy",},}, {"id":{"name":"scr_punit_combat_heplers","path":"scripts/scr_punit_combat_heplers/scr_punit_combat_heplers.yy",},}, {"id":{"name":"scr_purge_world","path":"scripts/scr_purge_world/scr_purge_world.yy",},}, {"id":{"name":"scr_quest","path":"scripts/scr_quest/scr_quest.yy",},}, @@ -886,6 +888,7 @@ {"id":{"name":"scr_random_marine","path":"scripts/scr_random_marine/scr_random_marine.yy",},}, {"id":{"name":"scr_recent","path":"scripts/scr_recent/scr_recent.yy",},}, {"id":{"name":"scr_recruit_data","path":"scripts/scr_recruit_data/scr_recruit_data.yy",},}, + {"id":{"name":"scr_reequip_units","path":"scripts/scr_reequip_units/scr_reequip_units.yy",},}, {"id":{"name":"scr_restart_variables","path":"scripts/scr_restart_variables/scr_restart_variables.yy",},}, {"id":{"name":"scr_return_ship","path":"scripts/scr_return_ship/scr_return_ship.yy",},}, {"id":{"name":"scr_role_count","path":"scripts/scr_role_count/scr_role_count.yy",},}, @@ -925,6 +928,7 @@ {"id":{"name":"scr_trade_add","path":"scripts/scr_trade_add/scr_trade_add.yy",},}, {"id":{"name":"scr_trade_dep","path":"scripts/scr_trade_dep/scr_trade_dep.yy",},}, {"id":{"name":"scr_trade","path":"scripts/scr_trade/scr_trade.yy",},}, + {"id":{"name":"scr_transfer_marines","path":"scripts/scr_transfer_marines/scr_transfer_marines.yy",},}, {"id":{"name":"scr_turn_first","path":"scripts/scr_turn_first/scr_turn_first.yy",},}, {"id":{"name":"scr_ui_advisors","path":"scripts/scr_ui_advisors/scr_ui_advisors.yy",},}, {"id":{"name":"scr_ui_diplomacy","path":"scripts/scr_ui_diplomacy/scr_ui_diplomacy.yy",},}, diff --git a/objects/obj_controller/Draw_64.gml b/objects/obj_controller/Draw_64.gml index e8e8316a6b..102f5aa160 100644 --- a/objects/obj_controller/Draw_64.gml +++ b/objects/obj_controller/Draw_64.gml @@ -18,9 +18,12 @@ if (is_test_map==true){ } // if (instance_exists(obj_turn_end)) then exit; +draw_set_valign(fa_top); +draw_set_halign(fa_left); var xx = 0; var yy = 0; if (menu == MENU.Diplomacy){ + add_draw_return_values(); if (diplomacy > 0){ draw_diplomacy_diplo_text(); if (trading==true){ @@ -42,25 +45,28 @@ if (menu == MENU.Diplomacy){ draw_character_diplomacy(); } } + pop_draw_return_values(); } // Main UI if (!zoomed && !zui){ draw_sprite(spr_new_ui,menu==0,0,0); draw_set_color(c_white); - menu_buttons.chapter_manage.draw(34,838+y_slide, "Chapter Management",1,1,145) - menu_buttons.chapter_settings.draw(179,838+y_slide, "Chapter Settings",1,1,145) - menu_buttons.apoth.draw(357,838+y_slide, "Apothecarium") - menu_buttons.reclu.draw(473,838+y_slide, "Reclusium") - menu_buttons.lib.draw(590,838+y_slide, "Librarium") - menu_buttons.arm.draw(706,838+y_slide, "Armamentarium") - menu_buttons.recruit.draw(822,838+y_slide, "Recruitment") - menu_buttons.fleet.draw(938,838+y_slide, "Fleet") - menu_buttons.diplo.draw(1130,838+y_slide, "Diplomacy",1,1,145) - menu_buttons.event.draw(1275,838+y_slide, "Event Log",1,1,145) - menu_buttons.end_turn.draw(1420,838+y_slide, "End Turn",1,1,145); - menu_buttons.help.draw(1374,8+y_slide, "Help"); - menu_buttons.menu.draw(1484,8+y_slide, "Menu"); + if (!instance_exists(obj_popup)){ + menu_buttons.chapter_manage.draw(34,838+y_slide, "Chapter Management",1,1,145) + menu_buttons.chapter_settings.draw(179,838+y_slide, "Chapter Settings",1,1,145) + menu_buttons.apoth.draw(357,838+y_slide, "Apothecarium") + menu_buttons.reclu.draw(473,838+y_slide, "Reclusium") + menu_buttons.lib.draw(590,838+y_slide, "Librarium") + menu_buttons.arm.draw(706,838+y_slide, "Armamentarium") + menu_buttons.recruit.draw(822,838+y_slide, "Recruitment") + menu_buttons.fleet.draw(938,838+y_slide, "Fleet") + menu_buttons.diplo.draw(1130,838+y_slide, "Diplomacy",1,1,145) + menu_buttons.event.draw(1275,838+y_slide, "Event Log",1,1,145) + menu_buttons.end_turn.draw(1420,838+y_slide, "End Turn",1,1,145); + menu_buttons.help.draw(1374,8+y_slide, "Help"); + menu_buttons.menu.draw(1484,8+y_slide, "Menu"); + } if (y_slide>0) then draw_set_alpha((100-(y_slide*2))/100); @@ -82,6 +88,7 @@ if (!zoomed && !zui){ draw_set_color(38144); draw_set_font(fnt_menu); draw_set_halign(fa_center); + draw_set_valign(fa_top); // Draws the sector name var _sector_string = $"Sector {obj_ini.sector_name ?? "Terra Nova"}"; draw_text(775,17,_sector_string); @@ -205,6 +212,10 @@ if (menu == 1) { scr_manage_task_selector(); } +} else if (menu == MENU.Armamentarium) { + scr_draw_armentarium_gui(); +} else if (menu == MENU.Librarium){ + scr_librarium_gui(); } diff --git a/objects/obj_dropdown_sel/Draw_0.gml b/objects/obj_dropdown_sel/Draw_0.gml index c6de74a804..9ca101db53 100644 --- a/objects/obj_dropdown_sel/Draw_0.gml +++ b/objects/obj_dropdown_sel/Draw_0.gml @@ -29,7 +29,7 @@ if (scr_hit(x,y,x+width,y+height)=true) and (obj_controller.dropdown_open=0){ tooltip=option[option_selected]; if (target="event_display") and (option[option_selected]!="None"){ tooltip=option[option_selected]; - tooltip2=obj_ini.artifact_struct[option_id[option_selected]].description(); + tooltip2=fetch_artifact(option_id[option_selected]).description(); } if (target="event_display") and (option[option_selected]="None"){ tooltip="Display"; @@ -63,7 +63,9 @@ if (opened=1){ draw_rectangle(x,y5,x+width,y5+hi,0); tooltip=option[ii]; - if (target="event_display") and (option[ii]!="None"){tooltip=option[ii];tooltip2=obj_ini.artifact_struct[option_id[ii]].description();} + if (target="event_display") and (option[ii]!="None"){ + tooltip=option[ii]; + tooltip2=fetch_artifact(option_id[ii]).description();} if (target="event_display") and (option[ii]="None"){tooltip="Display";tooltip2="There is no Artifact set to be displayed at the event.";} if (scr_click_left()){ diff --git a/objects/obj_ncombat/Alarm_7.gml b/objects/obj_ncombat/Alarm_7.gml index 0e059d6104..238e87df65 100644 --- a/objects/obj_ncombat/Alarm_7.gml +++ b/objects/obj_ncombat/Alarm_7.gml @@ -458,18 +458,18 @@ try { var tixt=$"The Raiding forces on {_planet_string} have been removed. The citizens and craftsman may sleep more soundly. (planet disp +15)" scr_popup("Planet Protected",tixt,"protect_raiders",""); - scr_event_log("",$"Governor Request completed: Raiding forces on {_planet_string} have been eliminated.", cur_star.name); - instance_deactivate_object(obj_star); + scr_event_log("",$"Governor Request completed: Raiding forces on {_planet_string} have been eliminated.", cur_star.name); } else { _planet.add_disposition(-15); var tixt=$"The Raiding forces on {_planet_string} dispatched with your forces and will continue with their bloody practices. The citizens remain unsafe and the governor is unimpressed. (planet disp -15)"; scr_popup("Planet Protected",tixt,"protect_raiders",""); scr_event_log("",$"Governor Request failed: Raiding forces on {_planet_string} continue to harrass population.", cur_star.name); - } + } + instance_deactivate_object(obj_star); } - else if ((string_count("fallen",battle_special)>0)) and (defeat=0){ + else if ((string_count("fallen",battle_special)>0) && defeat==0){ var fallen=0; with (obj_turn_end){ remove_planet_problem(battle_world[current_battle], "fallen", battle_object[current_battle]) diff --git a/objects/obj_popup/Create_0.gml b/objects/obj_popup/Create_0.gml index a378861d11..7700d787f2 100644 --- a/objects/obj_popup/Create_0.gml +++ b/objects/obj_popup/Create_0.gml @@ -45,6 +45,8 @@ press=0; reset=0; demand=0; +subtype = 0; + company=0; target_comp=-1; target_role=0; @@ -60,17 +62,18 @@ new_target=0; if (instance_exists(obj_controller)){obj_controller.cooldown=8000;} number=0; company_promote_data = [ + {exp : 0}, //index 0 = draw x, 1 = draw y, 2 = exp requirement for company - [1030,230,100],//1st company - [1140,230,65], - [1250,230,65], - [1360,230,65], - [1470,230,65], - [1030,250,45], - [1140,250,45], - [1250,250,35], - [1360,250,25], - [1470,250,15],//10th company + {exp :100},//1st company + {exp :65}, + {exp :65}, + {exp :65}, + {exp :65}, + {exp :45}, + {exp :45}, + {exp :35}, + {exp :25}, + {exp :15},//10th company ] for (var i=0;i<=10;i++){i+=1;role_name[i]="";role_exp[i]=0;} @@ -115,12 +118,12 @@ get_unit_promotion_options = function(){ if (scr_role_count(obj_ini.role[100][11],"1")==0){ //company ancient i+=1; role_name[i]=obj_ini.role[100][11]; - role_exp[i]=company_promote_data[target_comp-1][2]+10; + role_exp[i]=company_promote_data[target_comp].exp+10; } if (scr_role_count(obj_ini.role[100][7],"1")==0){ //company champ i+=1; role_name[i]=obj_ini.role[100][7]; - role_exp[i]=company_promote_data[target_comp-1][2]+10;//may as well have this liniked to weapon skill + role_exp[i]=company_promote_data[target_comp].exp+10;//may as well have this liniked to weapon skill } i+=1; role_name[i]=obj_ini.role[100][6]; //dreadnought @@ -131,7 +134,7 @@ get_unit_promotion_options = function(){ if (array_contains([2, 3, 4, 5, 6, 7], target_comp)){ i+=1; role_name[i]=obj_ini.role[100][8]; //tacts - role_exp[i]=company_promote_data[target_comp-1][2]; + role_exp[i]=company_promote_data[target_comp].exp; if (obj_controller.command_set[2]==0){ role_exp[i]=0; } @@ -140,7 +143,7 @@ get_unit_promotion_options = function(){ if (array_contains([2, 3, 4, 5, 8], target_comp)){ i+=1; role_name[i]=obj_ini.role[100][10]; //assualts - role_exp[i]=company_promote_data[target_comp-1][2]; + role_exp[i]=company_promote_data[target_comp].exp; if (obj_controller.command_set[2]==0){ role_exp[i]=0; } @@ -149,7 +152,7 @@ get_unit_promotion_options = function(){ if (array_contains([2, 3, 4, 5, 9], target_comp)){ i+=1; role_name[i]=obj_ini.role[100][9]; //devs - role_exp[i]=company_promote_data[target_comp-1][2]; + role_exp[i]=company_promote_data[target_comp].exp; if (obj_controller.command_set[2]==0){ role_exp[i]=0; } @@ -164,7 +167,7 @@ get_unit_promotion_options = function(){ if (target_comp == 10){ i+=1; role_name[i]=obj_ini.role[100][12]; //scouts - role_exp[i]=company_promote_data[target_comp-1][2]; + role_exp[i]=company_promote_data[target_comp].exp; if (obj_controller.command_set[2]==0){ role_exp[i]=0; } @@ -230,140 +233,3 @@ move_to_next_stage = function(){ press_exclusive(vk_space) || press_exclusive(vk_enter)); } - - -calculate_equipment_needs = function (){ - var i=0,rall="",all_good=0; - - req_armour=""; - req_armour_num=0; - have_armour_num=0; - req_gear=""; - req_gear_num=0; - have_gear_num=0; - req_mobi=""; - req_mobi_num=0; - have_mobi_num=0; - req_wep1=""; - req_wep1_num=0; - have_wep1_num=0; - req_wep2=""; - req_wep2_num=0; - have_wep2_num=0; - - rall=role_name[target_role]; - - /*if (rall=obj_ini.role[100][14]) and (global.chapter_name!="Space Wolves") and (global.chapter_name!="Iron Hands"){ - req_armour="";req_armour_num=0;req_wep1="";req_wep1_num=0;req_wep2="";req_wep2_num=0;req_mobi="";req_mobi_num=0; - }*/ - if (rall="Codiciery"){ - req_armour="";req_armour_num=0;req_wep1="";req_wep1_num=0;req_wep2="";req_wep2_num=0;req_mobi="";req_mobi_num=0;req_gear=obj_ini.gear[100,17];req_gear_num=units; - } else if (rall="Lexicanum"){ - req_armour=""; - req_armour_num=0; - req_wep1=""; - req_wep1_num=0; - req_wep2=""; - req_wep2_num=0; - req_mobi=""; - req_mobi_num=0; - } else if (rall=obj_ini.role[100][11]){ - req_armour=STR_ANY_POWER_ARMOUR; - req_armour_num=units; - req_wep2="Company Standard"; - req_wep2_num=units; - } else { - for (var i=2;i<20;i++){ - if (obj_ini.role[100][i]==rall){ - req_armour=obj_ini.armour[100][i]; - req_armour_num=units;req_wep1=obj_ini.wep1[100][i]; - req_wep1_num=units; - req_wep2=obj_ini.wep2[100][i]; - req_wep2_num=units; - req_mobi=obj_ini.mobi[100][i]; - req_mobi_num=units; - req_gear=obj_ini.gear[100][i]; - req_gear_num=units; - break; - } - } - } - - if (rall=obj_ini.role[100][6]){req_armour="Dreadnought";req_armour_num=units;req_wep1=obj_ini.wep1[100,6];req_wep1_num=units;req_wep2=obj_ini.wep2[100,6];req_wep2_num=units;} - if (rall=$"Venerable {obj_ini.role[100][6]}"){req_armour="";req_armour_num=0;req_wep1="";req_wep1_num=0;req_wep2="";req_wep2_num=0;} - - - var unit_armour; - var unit_wep_one; - for (var i=0; i=min_exp){ - if (is_struct(unit_armour)) { - if (req_armour == STR_ANY_POWER_ARMOUR) { - if (array_contains(LIST_BASIC_POWER_ARMOUR, unit_armour.name)) { - have_armour_num += 1; - } - } - if (req_armour == STR_ANY_TERMINATOR_ARMOUR) { - if (array_contains(LIST_TERMINATOR_ARMOUR, unit_armour.name)) { - have_armour_num += 1; - } - } - } - - if (obj_controller.ma_wep1[i]=req_wep1) or (obj_controller.ma_wep2[i]=req_wep1) then have_wep1_num+=1; - if (obj_controller.ma_wep2[i]=req_wep2) or (obj_controller.ma_wep1[i]=req_wep2) then have_wep2_num+=1; - - - if (obj_controller.ma_gear[i]=req_gear) then have_gear_num+=1; - if (obj_controller.ma_mobi[i]=req_mobi) then have_mobi_num+=1; - - if (req_wep1=="Heavy Ranged" && is_struct(unit_wep_one)){ - if (unit_wep_one.has_tag("heavy_ranged")) then have_wep1_num+=1; - } - } - - // if (n_wep1=n_wep2) and ((o_wep1!=n_wep1) or (o_wep2!=n_wep2)){have_wep1_num-=1;have_wep2_num-=1;} - - }// End Repeat - - // This checks to see if there is any more in the armoury - if (req_armour==STR_ANY_POWER_ARMOUR){ - var _armour_list = LIST_BASIC_POWER_ARMOUR; - for (i=0;i=req_armour_num) or (req_armour="")) and ((have_wep1_num>=req_wep1_num) or (req_wep1="")) and ((have_wep2_num>=req_wep2_num) or (req_wep2="")) then all_good=0.4; - if (req_gear="") or (req_gear_num<=have_gear_num) then all_good+=0.3; - if (req_mobi="") or (req_mobi_num<=have_mobi_num) then all_good+=0.3; -} diff --git a/objects/obj_popup/Draw_0.gml b/objects/obj_popup/Draw_0.gml index 9bf161649c..5b77bf45c3 100644 --- a/objects/obj_popup/Draw_0.gml +++ b/objects/obj_popup/Draw_0.gml @@ -16,7 +16,7 @@ try { exit; } - if (type == 99) { + if (type == POPUP_TYPE.FLEET_MOVE) { draw_set_font(fnt_large); draw_set_halign(fa_center); draw_set_color(38144); @@ -35,205 +35,7 @@ try { draw_rectangle(0, 0, room_width, room_height, 0); draw_set_alpha(1); exit; - } else if (((type == 9) || (type == 9.1)) && instance_exists(obj_controller)) { - draw_sprite(spr_planet_screen, 0, xx + 231 + 314, yy + 112); - draw_set_font(fnt_40k_14); - draw_set_halign(fa_center); - draw_set_color(c_gray); - - var ch = "", inq_hide = 0; - if (type == 9) { - if (array_contains(obj_ini.artifact_tags[obj_controller.menu_artifact], "inq")) { - if (array_contains(obj_controller.quest, "artifact_loan")) { - inq_hide = 1; - } - if (array_contains(obj_controller.quest, "artifact_return")) { - inq_hide = 2; - } - } - } - var iter = 0, spacer = 0; - for (var i = 2; i <= 8; i++) { - draw_set_font(fnt_40k_14); - draw_set_halign(fa_center); - draw_set_color(c_gray); - draw_set_alpha(0.33); - if (i == 7) { - continue; - } - if (obj_controller.known[i]) { - draw_set_alpha(1); - } - spacer = iter * 40; - ch = obj_controller.disposition[i] > 0 ? "+" : ""; - if (obj_controller.known[i] > 1) { - draw_text(xx + 740, yy + 140 + spacer, $"{scr_faction_string_name(i)} ({ch}{obj_controller.disposition[i]})"); - // draw_text(xx+740,yy+140+spacer,$"{obj_controller.faction_title[i]}"); - iter++; - } else { - continue; - } - draw_line(xx + 239 + 420, yy + 162 + spacer, xx + 398 + 420, yy + 162 + spacer); - if ((mouse_x >= xx + 240 + 420) && (mouse_x <= xx + 387 + 420)) { - if ((mouse_y >= yy + 131 + spacer) && (mouse_y <= yy + 159 + spacer) && (obj_controller.known[i] > 1)) { - if (i == eFACTION.Inquisition) { - if ((inq_hide != 2) && (inq_hide == 1)) { - continue; - } - } - draw_set_alpha(0.33); - draw_set_color(c_gray); - draw_rectangle(xx + 240 + 420, yy + 135 + spacer, xx + 398 + 420, yy + 160 + spacer, 0); - if (mouse_check_button_pressed(mb_left)) { - giveto = i; - } - } - } - } - draw_set_alpha(1); - draw_set_color(38144); - if (point_and_click(draw_unit_buttons([xx + 700, yy + 370], "Cancel", [1, 1], c_red))) { - obj_controller.cooldown = 8000; - instance_destroy(); - exit; - } - if ((giveto > 0) && (type == 9)) { - var arti_index = obj_controller.menu_artifact; - - var artifact_struct = obj_ini.artifact_struct[arti_index]; - var cur_tags = obj_ini.artifact_tags[arti_index]; - - // obj_controller.artifacts-=1; // this is done by delete_artifact() that is run later; - - obj_controller.cooldown = 10; - if (obj_controller.menu_artifact > obj_controller.artifacts) { - obj_controller.menu_artifact = obj_controller.artifacts; - } - - scr_toggle_diplomacy(); - obj_controller.diplomacy = giveto; - obj_controller.force_goodbye = -1; - var the = ""; - - if ((giveto != 7) && (giveto != 10)) { - the = "the "; - } - - scr_event_log("", $"Artifact gifted to {the} {obj_controller.faction[giveto]}."); - var is_daemon = artifact_struct.has_tag("daemonic"); - var is_chaos = artifact_struct.has_tag("chaos"); - if (inq_hide != 2) { - with (obj_controller) { - if ((!is_daemon) || ((diplomacy != 4) && (diplomacy != 5) && (diplomacy != 2))) { - scr_dialogue("artifact_thanks"); - } - if (is_daemon && ((diplomacy == 4) || (diplomacy == 5) || (diplomacy == 2))) { - scr_dialogue("artifact_daemon"); - } - } - } - if ((inq_hide == 2) && (obj_controller.diplomacy == 4)) { - with (obj_controller) { - scr_dialogue("artifact_returned"); - } - } - - if (artifact_struct.has_tag("MINOR")) { - obj_controller.disposition[giveto] = clamp(obj_controller.disposition[giveto] + 1, -100, 100); - } else { - var daemon_arts = function(faction, is_chaos, is_daemon) { - switch (faction) { - case eFACTION.Imperium: - if (is_daemon) { - var v = 0, ev = 0; - add_event({ - e_id : "imperium_daemon", - duration : 1, - }); - with (obj_star) { - for (var i = 1; i <= planets; i++) { - if (p_owner[i] == 2) { - p_heresy[i] += choose(30, 40, 50, 60); - } - } - } - } - if (is_chaos) { - with (obj_star) { - for (var i = 1; i <= planets; i++) { - if ((p_owner[i] == 2) && (p_heresy[i] > 0)) { - p_heresy[i] += 10; - } - } - } - } - break; - case eFACTION.Tau: - if (is_daemon) { - with (obj_star) { - for (var i = 1; i <= planets; i++) { - if (p_owner[i] == 8) { - p_heresy[i] += 40; - } - } - } - } - break; - } - } - - var specialmod = 0 - switch (giveto) { - case eFACTION.Imperium: - break; - case eFACTION.Mechanicus: - break; - case eFACTION.Inquisition: - if (inq_hide == 2) { - specialmod -= 1; - } - - if (is_chaos) { - specialmod += 2; - } - - if (is_daemon) { - specialmod += 4; - } - break; - case eFACTION.Ecclesiarchy: - if (!is_daemon) { - if (scr_has_adv("Reverent Guardians")) { - specialmod += 2; - } - } else { - specialmod -= 2; - } - break; - case eFACTION.Eldar: - if (scr_has_disadv("Tolerant")) { - specialmod += 1; - } - break; - case eFACTION.Tau: - if (scr_has_disadv("Tolerant")) { - specialmod += 1; - } - break; - } - - daemon_arts(giveto, is_chaos, is_daemon) - var tagmod = artifact_struct.artifact_faction_value(giveto); - obj_controller.disposition[giveto] = clamp(obj_controller.disposition[giveto] + 2 + specialmod + tagmod, -100, 100); - } - - // Need to modify ^^^^ based on if it is chaos or daemonic - - delete_artifact(arti_index); - instance_destroy(); - exit; - } - } + } var zoom = 0; if (instance_exists(obj_controller)) { @@ -331,193 +133,8 @@ try { // if (image!="") then draw_text_ext(x1+126+150,y1+152,string(text),-1,384-150); // if (text2!="") then draw_text_ext(x1+126,y1+309,string(text2),-1,384); // TODO change this into an array in a function (like romanNumerals does in here) - var img = -1; - if (image == "") { - img = -1; - } - if (image == "orks") { - img = 0; - } - if (image == "tau") { - img = 1; - } - if (image == "chaos") { - img = 2; - } - if (image == "shadow") { - img = 3; - } - if (image == "distinguished") { - img = 4; - } - if (image == "tech_build") { - img = 5; - } - if (image == "sororitas") { - img = 6; - } - if (image == "angry") { - img = 7; - } - if (image == "gene_bad") { - img = 8; - } - if (image == "lost_warp") { - img = 10; - } - if (image == "Warp") { - img = 11; - } - if (image == "crusade") { - img = 12; - } - if (image == "fuklaw") { - img = 13; - } - if ((image == "artifact") || (image == "artifact2")) { - img = 14; - } - if (image == "artifact_recovered") { - img = 15; - } - if (image == "artifact_given") { - img = 15; - } - if (image == "waaagh") { - img = 16; - } - if (image == "shipyard") { - img = 17; - } - if (image == "inquisition") { - img = 18; - } - if (image == "succession") { - img = 19; - } - if (image == "rogue_trader") { - img = 20; - } - if (image == "necron_tomb") { - img = 21; - } - if (image == "webber") { - img = 22; - } - if (image == "spyrer") { - img = 23; - } - if (image == "fortress") { - img = 24; - } - if (image == "fortress_hive") { - img = 25; - } - if (image == "fortress_death") { - img = 26; - } - if (image == "fortress_ice") { - img = 27; - } - if (image == "fortress_lava") { - img = 28; - } - if (image == "fortress_dorf") { - img = 29; - } - if (image == "exploding_ship") { - img = 30; - } - if (image == "necron_cave") { - img = 31; - } - if (image == "exterminatus_new") { - img = 32; - } - if (image == "necron_tunnels_1") { - img = 33; - } - if (image == "necron_tunnels_2") { - img = 34; - } - if (image == "necron_tunnels_3") { - img = 35; - } - if (image == "necron_army") { - img = 36; - } - if (image == "harlequin") { - img = 37; - } - if (image == "black_rage") { - img = 39; - } - if (image == "exterminatus") { - img = 40; - } - if (image == "stc") { - img = 41; - } - if (image == "thallax") { - img = 42; - } - if (image == "space_hulk_done") { - img = 44; - } - if (image == "ancient_ruins") { - img = 45; - } - if (image == "geneseed_lab") { - img = 47; - } - if (image == "ruins_bunker") { - img = 48; - } - if (image == "ruins_fort") { - img = 49; - } - if (image == "ruins_ship") { - img = 50; - } - if (image == "fallen") { - img = 51; - } - if (image == "debug_banshee") { - img = 52; - } - if (image == "mechanicus") { - img = 53; - } - if (image == "chaos_cultist") { - img = 54; - } - if (image == "chaos_symbol") { - img = 55; - } - if (image == "chaos_messenger") { - img = 56; - } - if (image == "event_feast") { - img = 57; - } - if (image == "event_tournament") { - img = 58; - } - if (image == "event_deathmatch") { - img = 59; - } - if (image == "event_mass") { - img = 60; - } - if (image == "event_ccult") { - img = 61; - } - if (image == "event_crelic") { - img = 62; - } - if (image == "event_march") { - img = 63; - } + var img = default_popup_image_index(); + if ((img != -1) && (image != "") && (image_wid > 0)) { var sh = 999; @@ -639,1208 +256,10 @@ try { } } } - - // ** Equip Artifact ** - if ((type == 8) && instance_exists(obj_controller)) { - var x2 = xx + 951; - var y2 = yy + 48; - var before = target_comp; - var temp_alpha = 1; - arti = obj_ini.artifact_struct[obj_controller.menu_artifact]; - - // draw_sprite(spr_popup_large,0,x2,y2); - - draw_set_font(fnt_40k_14b); - draw_set_halign(fa_center); - draw_set_color(c_gray); - - draw_text(x2 + 312, y2 + 26, $"Equip Artifact ({obj_ini.artifact[obj_controller.menu_artifact]})"); - // draw_text(x2+320.5,yy+123.5,"Equip Artifact ("+string(obj_ini.artifact[obj_controller.menu_artifact])+")"); - - draw_set_font(fnt_40k_12); - draw_set_halign(fa_left); - draw_text(x2 + 31, y2 + 35, "Select Company:"); - - // Draw HQ button - temp_alpha = (target_comp == 0) ? 1 : 0.5; - var hq_text = $"HQ"; - var hq_button = draw_unit_buttons([x2 + 60, y2 + 75, x2 + 60 + 60, y2 + 75 + 20], hq_text, [1, 1], , , fnt_40k_12, temp_alpha); // Position for HQ - if (point_and_click(hq_button)) { - target_comp = 0; - } - - // Draw other company buttons - for (var i = 1; i < 11; i++) { - temp_alpha = (target_comp == i) ? 1 : 0.5; - var item_text = $"{romanNumerals[i - 1]}"; - var x_offset = x2 + 141 + (81 * (i - (i < 6 ? 1 : 6))); - var y_offset = y2 + (i < 6 ? 60 : 90); - var company_button = draw_unit_buttons([x_offset, y_offset, x_offset + 60, y_offset + 20], item_text, [1, 1], , , fnt_40k_12, temp_alpha); - if (point_and_click(company_button)) { - target_comp = i; - } - } - - if (before != target_comp) { - units = 0; - with (obj_controller) { - if (obj_popup.target_comp > 0) { - scr_company_view(obj_popup.target_comp); - } - if (obj_popup.target_comp == 0) { - scr_special_view(0); - } - } - var i; - i = -1; - repeat (array_length(obj_controller.display_unit)) { - i += 1; - obj_controller.man_sel[i] = 0; - } - i = -1; - } - - // Weapon slot buttons - if (arti.determine_base_type() == "weapon") { - draw_text(x2 + 30, y2 + 128, "Replace:"); - - temp_alpha = (target_role == 1) ? 1 : 0.5; - if (point_and_click(draw_unit_buttons([x2 + 150, y2 + 120, x2 + 150 + 120, y2 + 120 + 20], $"1st Weapon", [1, 1], , , fnt_40k_12, temp_alpha))) { - target_role = 1; - } - - temp_alpha = (target_role == 2) ? 1 : 0.5; - if (point_and_click(draw_unit_buttons([x2 + 300, y2 + 120, x2 + 300 + 120, y2 + 120 + 20], $"2nd Weapon", [1, 1], , , fnt_40k_12, temp_alpha))) { - target_role = 2; - } - } else { - target_role = 3; - } - - // Soldier list - draw_set_font(fnt_40k_12); - draw_rectangle(x2 + 29, y2 + 160, x2 + 569, y2 + 363 + 356, 1); // Main rectangle? - scr_scrollbar(1520, 220, 1543, 761, 23, obj_controller.man_max, obj_controller.man_current); - draw_rectangle(x2 + 569, y2 + 171, x2 + 592, y2 + 357 + 356, 1); // Inside of scroll - draw_rectangle(x2 + 569, y2 + 150, x2 + 592, y2 + 378 + 356, 1); // Outside of scroll - draw_sprite_stretched(spr_arrow, 2, x2 + 569, y2 + 150, 23, 22); - draw_sprite_stretched(spr_arrow, 3, x2 + 569, y2 + 357 + 356, 23, 22); - - if (target_comp != -1) { - var top, sel, temp1, temp2, temp3, temp4, temp5; - temp1 = ""; - temp2 = ""; - temp3 = ""; - temp4 = ""; - temp5 = ""; - top = obj_controller.man_current; - sel = top; - var unit_x = x2; - var unit_y = y2; - var ma_ar, ma_we1, ma_we2, ma_ge, ma_mb, ttt; - ma_ar = ""; - ma_we1 = ""; - ma_we2 = ""; - ma_ge = ""; - ma_mb = ""; - ttt = 0; - - repeat (min(obj_controller.man_max, 23)) { - if (sel >= array_length(obj_controller.man)) { - break; - } - if (obj_controller.man[sel] == "man") { - var unit = obj_controller.display_unit[sel]; - temp1 = unit.name_role(); - temp2 = obj_controller.ma_loc[sel]; - if (obj_controller.ma_wid[sel] != 0) { - temp2 += scr_roman_numerals()[obj_controller.ma_wid[sel] - 1]; - } - if (obj_controller.ma_health[sel] >= 100) { - temp3 = "Unwounded"; - } - if ((obj_controller.ma_health[sel] >= 70) && (obj_controller.ma_health[sel] < 100)) { - temp3 = "Lightly Wounded"; - } - if ((obj_controller.ma_health[sel] >= 40) && (obj_controller.ma_health[sel] < 70)) { - temp3 = "Wounded"; - } - if ((obj_controller.ma_health[sel] >= 8) && (obj_controller.ma_health[sel] < 40)) { - temp3 = "Badly Wounded"; - } - if (obj_controller.ma_health[sel] < 8) { - temp3 = "CRITICAL"; - } - temp4 = string(obj_controller.ma_exp[sel]) + " exp"; - - ma_ar = unit.armour(); - ma_we1 = unit.weapon_two(); - ma_we2 = unit.weapon_one(); - ma_ge = unit.gear(); - ma_mb = unit.mobility_item(); - ttt = 0; - - if (obj_controller.ma_gear[sel] != "") { - temp5 = "((" + string(ma_ar) + " + " + string(ma_mb) + ")) | " + string(ma_we1) + " | " + string(ma_we2) + " + (" + string(ma_ge) + ")"; - } - if (obj_controller.ma_gear[sel] == "") { - temp5 = "((" + string(ma_ar) + " + " + string(ma_mb) + ")) | " + string(ma_we1) + " | " + string(ma_we2) + ""; - } - } - if (obj_controller.man[sel] == "vehicle") { - temp1 = string(obj_controller.ma_role[sel]); - temp2 = string(obj_controller.ma_loc[sel]); - if (obj_controller.ma_wid[sel] != 0) { - temp2 += scr_roman_numerals()[obj_controller.ma_wid[sel] - 1]; - } - temp3 = "Undamaged"; - temp4 = ""; - temp5 = "(" + string(obj_controller.ma_wep1[sel]) + " | " + string(obj_controller.ma_wep2[sel]) + " | " + string(obj_controller.ma_gear[sel]) + ")"; - } - - if (obj_controller.man_sel[sel] == 0) { - draw_set_color(c_black); - } - if (obj_controller.man_sel[sel] != 0) { - draw_set_color(6052956); - } - draw_rectangle(unit_x + 29, unit_y + 150, unit_x + 569, unit_y + 175.4, 0); - draw_set_color(c_gray); - draw_rectangle(unit_x + 29, unit_y + 150, unit_x + 569, unit_y + 175.4, 1); - - // if (obj_controller.man[sel]="man") and (obj_controller.ma_promote[sel]>0) then draw_set_color(c_yellow); - if (ma_ar == "") { - draw_set_alpha(0.5); - } - draw_text_transformed(unit_x + 32, unit_y + 151, string_hash_to_newline(string(temp1)), 1, 1, 0); - draw_text_transformed(unit_x + 32.5, unit_y + 151.5, string_hash_to_newline(string(temp1)), 1, 1, 0); - draw_set_color(c_gray); - draw_set_alpha(1); - - draw_text_transformed(unit_x + 271, unit_y + 151, string_hash_to_newline(string(temp2)), 1, 1, 0); - if ((obj_controller.man[sel] == "man") && (obj_controller.ma_lid[sel] == -1)) { - draw_text_transformed(unit_x + 271, unit_y + 151, string_hash_to_newline(string(temp2)), 1, 1, 0); - } - if ((obj_controller.man[sel] == "vehicle") && (obj_controller.ma_lid[sel] == -1)) { - draw_text_transformed(unit_x + 271, unit_y + 151, string_hash_to_newline(string(temp2)), 1, 1, 0); - } - - if (temp3 == "CRITICAL") { - draw_set_color(c_red); - } - draw_text_transformed(unit_x + 400, unit_y + 151, string_hash_to_newline(string(temp3)), 1, 1, 0); - draw_set_color(c_gray); - - draw_text_transformed(unit_x + 506, unit_y + 151, string_hash_to_newline(string(temp4)), 1, 1, 0); - - draw_set_color(c_gray); - if (string_count("Artifact", temp5) > 0) { - draw_set_color(881503); - } - draw_text_transformed(unit_x + 38, unit_y + 164, string_hash_to_newline(string(temp5)), 1, 1, 0); - draw_set_color(38144); - - if (point_and_click([unit_x + 29, unit_y + 150, unit_x + 569, unit_y + 175.4])) { - if (obj_controller.man_sel[sel] == 0) { - units = 1; - if (prev_selected != 0) { - obj_controller.man_sel[prev_selected] = 0; - } - obj_controller.man_sel[sel] = 1; - prev_selected = sel; - } else if (obj_controller.man_sel[sel] == 1) { - units = 0; - obj_controller.man_sel[sel] = 0; - } - } - unit_y += 25.4; - sel += 1; - } - } - - if ((target_role > 0) && (target_comp != -1) && (units == 1)) { - all_good = 1; - } else { - all_good = 0; - } - if (arti.determine_base_type() == "weapon" && target_role > 2) { - all_good = 0; - } - - // Screen bottom buttons and shit - // - var screen_bottom_x = x2; - var screen_bottom_y = y2 + 350; - draw_set_alpha(1); - draw_set_font(fnt_small); - draw_set_color(c_gray); - draw_rectangle(screen_bottom_x + 121, screen_bottom_y + 393, screen_bottom_x + 231, screen_bottom_y + 414, 1); - draw_set_alpha(0.5); - draw_rectangle(screen_bottom_x + 122, screen_bottom_y + 394, screen_bottom_x + 230, screen_bottom_y + 413, 1); - - if (all_good == 1) { - draw_set_alpha(1); - draw_rectangle(screen_bottom_x + 408, screen_bottom_y + 393, screen_bottom_x + 518, screen_bottom_y + 414, 1); - draw_set_alpha(0.5); - draw_rectangle(screen_bottom_x + 409, screen_bottom_y + 394, screen_bottom_x + 517, screen_bottom_y + 413, 1); - } - if (all_good != 1) { - draw_set_alpha(0.25); - draw_rectangle(screen_bottom_x + 408, screen_bottom_y + 393, screen_bottom_x + 518, screen_bottom_y + 414, 1); - draw_rectangle(screen_bottom_x + 409, screen_bottom_y + 394, screen_bottom_x + 517, screen_bottom_y + 413, 1); - } - - draw_set_alpha(1); - - draw_set_halign(fa_center); - draw_text(screen_bottom_x + 173, screen_bottom_y + 397, string_hash_to_newline("Cancel")); - draw_text(screen_bottom_x + 173.5, screen_bottom_y + 397.5, string_hash_to_newline("Cancel")); - - if (all_good == 1) { - draw_text(screen_bottom_x + 464, screen_bottom_y + 397, string_hash_to_newline("Equip!")); - draw_text(screen_bottom_x + 464.5, screen_bottom_y + 397.5, string_hash_to_newline("Equip!")); - if (point_and_click([screen_bottom_x + 430, screen_bottom_y + 393, screen_bottom_x + 518, screen_bottom_y + 414])) { - obj_controller.cooldown = 8000; - - var i = -1, this = 0, dwarn = false, unit; - var arti_index = obj_controller.menu_artifact; - var arti = obj_ini.artifact_struct[arti_index]; - var arti_base = arti.type(); - repeat (min(obj_controller.man_max, 23)) { - i += 1; - if ((this == 0) && (obj_controller.man_sel[i] == 1)) { - this = i; - } - } - i = this; - - if ((obj_controller.man[i] != "") && obj_controller.man_sel[i]) { - var replace = ""; - - if (target_role == 1) { - replace = "weapon1"; - } - if (target_role == 2) { - replace = "weapon2"; - } - if (target_role > 2) { - if (gear_weapon_data("armour", arti_base) != false) { - replace = "armour"; - } else if (gear_weapon_data("gear", arti_base) != false) { - replace = "gear"; - } else if (gear_weapon_data("mobility", arti_base) != false) { - replace = "mobility"; - } - } - if ((replace == "armour") && (obj_controller.ma_race[i] > 5)) { - cooldown = 8; - obj_controller.cooldown = 8; - exit; - } - - if (target_comp > 10) { - target_comp = 0; - } - - unit = obj_ini.TTRPG[target_comp][obj_controller.ide[i]]; - if (arti.has_tag("daemonic") || arti.has_tag("chaos")) { - unit.corruption += irandom(10 + 2); - if (unit.role() == obj_ini.role[100][eROLE.ChapterMaster]) { - dwarn = true; - } - } - - if (replace == "armour") { - unit.update_armour(arti_index); - } else if (replace == "gear") { - unit.update_gear(arti_index); - } - if (replace == "mobility") { - unit.update_mobility_item(arti_index); - } - if (replace == "weapon1") { - unit.update_weapon_one(arti_index); - } - if (replace == "weapon2") { - unit.update_weapon_two(arti_index); - } - var g = arti_index; - obj_controller.cooldown = 10; - - //if (obj_controller.menu_artifact>obj_controller.artifacts) then obj_controller.menu_artifact=obj_controller.artifacts; - if (dwarn == true) { - var pip = instance_create(0, 0, obj_popup); - pip.title = "Daemon Artifacts"; - pip.text = "Some artifacts, like the one you now wield, are a blasphemous union of the Materium's matter and the Immaterium's spirit, containing the essence of a bound daemon. While they may offer great power, and enhanced perception, they are known to whisper poisonous lies to the wielder. The path to damnation begins with good intentions, and many times artifacts such as these have been the cause."; - pip.image = ""; - pip.cooldown = 8; - obj_controller.cooldown = 8; - } - - instance_destroy(); - exit; - } - } - } - if (all_good != 1) { - draw_set_alpha(0.25); - draw_text(screen_bottom_x + 464, screen_bottom_y + 397, "Equip!"); - draw_text(screen_bottom_x + 464.5, screen_bottom_y + 397.5, "Equip!"); - } - draw_set_alpha(1); - } - var xx, yy; xx = __view_get(e__VW.XView, 0); yy = __view_get(e__VW.YView, 0); - // Changing Equipment - if ((zoom == 0) && (type == 6) && instance_exists(obj_controller)) { - draw_set_color(0); - draw_rectangle(xx + 1006, yy + 143, xx + 1577, yy + 518, 0); - - draw_set_font(fnt_40k_14b); - draw_set_halign(fa_center); - draw_set_color(c_gray); - - draw_text(xx + 1292, yy + 145, "Change Equipment"); - - draw_set_font(fnt_40k_12); - var comp = ""; - if (company <= 10 && company > 0) { - comp = romanNumerals[company - 1]; - } else if (company > 10) { - comp = "HQ"; - } - - if (vehicle_equipment == 0) { - draw_text(xx + 1292, yy + 170, $"{comp} Company, {units} Marines"); - } - if (vehicle_equipment == 1) { - draw_text(xx + 1292, yy + 170, $"{comp} Company, {units} Vehicles"); - } - - draw_set_halign(fa_left); - draw_set_color(c_gray); - - draw_rectangle(xx + 1010, yy + 215, xx + 1288, yy + 315, 1); - draw_rectangle(xx + 1574, yy + 215, xx + 1296, yy + 315, 1); - - var show_name = ""; - // Need to not show the artifact tags here somehow - - draw_text(xx + 1010, yy + 195, "Before"); - draw_text(xx + 1010.5, yy + 195.5, "Before"); - - show_name = o_wep1; - if (a_wep1 != "") { - show_name = a_wep1; - } - if (o_wep1 != "") { - draw_text(xx + 1014, yy + 215, string_hash_to_newline(show_name)); - } else { - draw_text(xx + 1014, yy + 215, ITEM_NAME_NONE); - } - - show_name = o_wep2; - if (a_wep2 != "") { - show_name = a_wep2; - } - if (o_wep2 != "") { - draw_text(xx + 1014, yy + 235, string_hash_to_newline(string(show_name))); - } else { - draw_text(xx + 1014, yy + 235, ITEM_NAME_NONE); - } - - show_name = o_armour; - if (a_armour != "") { - show_name = a_armour; - } - if (o_armour != "") { - draw_text(xx + 1014, yy + 255, string_hash_to_newline(string(show_name))); - } else { - draw_text(xx + 1014, yy + 255, ITEM_NAME_NONE); - } - - show_name = o_gear; - if (a_gear != "") { - show_name = a_gear; - } - if (o_gear != "") { - draw_text(xx + 1014, yy + 275, string_hash_to_newline(string(show_name))); - } else { - draw_text(xx + 1014, yy + 275, ITEM_NAME_NONE); - } - - show_name = o_mobi; - if (a_mobi != "") { - show_name = a_mobi; - } - if (o_mobi != "") { - draw_text(xx + 1014, yy + 295, string_hash_to_newline(string(show_name))); - } else { - draw_text(xx + 1014, yy + 295, ITEM_NAME_NONE); - } - - draw_text(xx + 1296, yy + 195, string_hash_to_newline("After")); - draw_text(xx + 1296.5, yy + 195.5, "After"); - - draw_set_color(c_gray); - if (n_good1 == 0) { - draw_set_color(255); - } - show_name = n_wep1; - if ((a_wep1 != "") && (n_wep1 == o_wep1)) { - show_name = a_wep1; - } - if (n_wep1 != "") { - draw_text(xx + 1300, yy + 215, string_hash_to_newline(string(show_name))); - } else { - draw_text(xx + 1300, yy + 215, string_hash_to_newline(ITEM_NAME_NONE)); - } - - draw_set_color(c_gray); - if (n_good2 == 0) { - draw_set_color(255); - } - show_name = n_wep2; - if ((a_wep2 != "") && (n_wep2 == o_wep2)) { - show_name = a_wep2; - } - if (n_wep2 != "") { - draw_text(xx + 1300, yy + 235, string_hash_to_newline(string(show_name))); - } else { - draw_text(xx + 1300, yy + 235, string_hash_to_newline(ITEM_NAME_NONE)); - } - - draw_set_color(c_gray); - if (n_good3 == 0) { - draw_set_color(255); - } - show_name = n_armour; - if ((a_armour != "") && (n_armour == o_armour)) { - show_name = a_armour; - } - if (n_armour != "") { - draw_text(xx + 1300, yy + 255, string_hash_to_newline(string(show_name))); - } else { - draw_text(xx + 1300, yy + 255, string_hash_to_newline(ITEM_NAME_NONE)); - } - - draw_set_color(c_gray); - if (n_good4 == 0) { - draw_set_color(255); - } - show_name = n_gear; - if ((a_gear != "") && (n_gear == o_gear)) { - show_name = a_gear; - } - if (n_gear != "") { - draw_text(xx + 1300, yy + 275, string_hash_to_newline(string(show_name))); - } else { - draw_text(xx + 1300, yy + 275, string_hash_to_newline(ITEM_NAME_NONE)); - } - - draw_set_color(c_gray); - if (n_good5 == 0) { - draw_set_color(255); - } - show_name = n_mobi; - if ((a_mobi != "") && (n_mobi == o_mobi)) { - show_name = a_mobi; - } - if (n_mobi != "") { - draw_text(xx + 1300, yy + 295, string_hash_to_newline(string(show_name))); - } else { - draw_text(xx + 1300, yy + 295, string_hash_to_newline(ITEM_NAME_NONE)); - } - - draw_set_color(c_gray); - - for (var i = 1; i <= 5; i++) { - if (target_comp == i) { - draw_text(xx + 1292, yy + 195 + (20 * i), "->"); - break; - } - } - - if ((mouse_x >= xx + 1296) && (mouse_x < xx + 1574)) { - if ((mouse_y >= yy + 215) && (mouse_y < yy + 235)) { - draw_set_alpha(0.5); - draw_line(xx + 1296, yy + 230, xx + 1574, yy + 230); - } - if ((mouse_y >= yy + 235) && (mouse_y < yy + 255)) { - draw_set_alpha(0.5); - draw_line(xx + 1296, yy + 250, xx + 1574, yy + 250); - } - if ((mouse_y >= yy + 255) && (mouse_y < yy + 275)) { - draw_set_alpha(0.5); - draw_line(xx + 1296, yy + 270, xx + 1574, yy + 270); - } - if ((mouse_y >= yy + 275) && (mouse_y < yy + 295)) { - draw_set_alpha(0.5); - draw_line(xx + 1296, yy + 290, xx + 1574, yy + 290); - } - if ((mouse_y >= yy + 295) && (mouse_y < yy + 315)) { - draw_set_alpha(0.5); - draw_line(xx + 1296, yy + 310, xx + 1574, yy + 310); - } - } - draw_set_alpha(1); - - if (target_comp != -1) { - var check = " "; - var mct = master_crafted == 1 ? 0.7 : 1; - var column = 0; - var row = 0; - var item_string; - var box = []; - var box_x; - var box_y; - var top = -1; - - var selected_item_name = [n_wep1, n_wep2, n_armour, n_gear, n_mobi]; - selected_item_name = selected_item_name[target_comp - 1]; - - for (var o = 0; o < array_length(item_name); o++) { - box_x = xx + 1016 + (row * 154); - box_y = yy + 355 + (column * 20); - box = [box_x, box_y, box_x + 144, box_y + 20]; - check = selected_item_name == item_name[o] ? "x" : " "; - item_string = $"[{check}] {item_name[o]}"; - draw_text_transformed(box_x, box_y, item_string, mct, 1, 0); - - if (point_and_click(box)) { - top = o; - } - column++; - if (column > 6) { - column = 0; - row++; - } - } - - if (top != -1) { - warning = ""; - switch (target_comp) { - case 1: - n_wep1 = item_name[top]; - sel1 = top; - break; - case 2: - n_wep2 = item_name[top]; - sel2 = top; - break; - case 3: - n_armour = item_name[top]; - sel3 = top; - break; - case 4: - n_gear = item_name[top]; - sel4 = top; - break; - case 5: - n_mobi = item_name[top]; - sel5 = top; - break; - } - } - - if (target_comp == 1 && (n_wep1 == ITEM_NAME_NONE || n_wep1 == "")) { - n_good1 = 1; - } - if (target_comp == 2 && (n_wep2 == ITEM_NAME_NONE || n_wep2 == "")) { - n_good2 = 1; - } - if (target_comp == 3 && (n_armour == ITEM_NAME_NONE || n_armour == "")) { - n_good3 = 1; - } - if (target_comp == 4 && (n_gear == ITEM_NAME_NONE || n_gear == "")) { - n_good4 = 1; - } - if (target_comp == 5 && (n_mobi == ITEM_NAME_NONE || n_mobi == "")) { - n_good5 = 1; - } - - var weapon_one_data = gear_weapon_data("weapon", n_wep1); - var weapon_two_data = gear_weapon_data("weapon", n_wep2); - var armour_data = gear_weapon_data("armour", n_armour); - - if ((target_comp == 1) && is_struct(weapon_one_data)) { - // Check numbers - req_wep1_num = units; - have_wep1_num = 0; - var i = -1; - repeat (array_length(obj_controller.display_unit)) { - i += 1; - if ((vehicle_equipment != -1) && (obj_controller.ma_wep1[i] == n_wep1)) { - have_wep1_num += 1; - } - } - have_wep1_num += scr_item_count(n_wep1); - if (have_wep1_num >= req_wep1_num || n_wep1 == ITEM_NAME_NONE) { - n_good1 = 1; - } - if (have_wep1_num < req_wep1_num && (n_wep1 != ITEM_NAME_ANY && n_wep1 != ITEM_NAME_NONE)) { - n_good1 = 0; - warning = "Not enough " + string(n_wep1) + "; " + string(req_wep1_num - have_wep1_num) + " more are required."; - } - - //TODO wrap this up in a function - if (weapon_one_data.req_exp > 0) { - var g = -1, exp_check = 0; - for (var g = 0; g < array_length(obj_controller.display_unit); g++) { - if (obj_controller.man_sel[g] == 1 && is_struct(obj_controller.display_unit[g])) { - if (obj_controller.display_unit[g].experience < weapon_one_data.req_exp) { - exp_check = 1; - n_good1 = 0; - warning = $"A unit must have {weapon_one_data.req_exp}+ EXP to use a {weapon_one_data.name}."; - break; - } - } - } - } - if (is_struct(armour_data)) { - if (((!array_contains(armour_data.tags, "terminator")) && (!array_contains(armour_data.tags, "dreadnought"))) && (n_wep1 == "Assault Cannon")) { - n_good1 = 0; - warning = "Cannot use Assault Cannons without Terminator/Dreadnought Armour."; - } - if ((!array_contains(armour_data.tags, "dreadnought")) && (n_wep1 == "Close Combat Weapon")) { - n_good1 = 0; - warning = "Only " + string(obj_ini.role[100][6]) + " can use Close Combat Weapons."; - } - } - } - if ((target_comp == 2) && is_struct(weapon_two_data)) { - // Check numbers - req_wep2_num = units; - have_wep2_num = 0; - var i = -1; - repeat (array_length(obj_controller.display_unit)) { - i += 1; - if ((vehicle_equipment != -1) && (obj_controller.ma_wep2[i] == n_wep2)) { - have_wep2_num += 1; - } - } - // req_wep2_num+=scr_item_count(n_wep2); - have_wep2_num += scr_item_count(n_wep2); - // req_wep2_num=units; - - if (have_wep2_num >= req_wep2_num || n_wep2 == ITEM_NAME_NONE) { - n_good2 = 1; - } - if (have_wep2_num < req_wep2_num && (n_wep2 != ITEM_NAME_ANY && n_wep2 != ITEM_NAME_NONE)) { - n_good2 = 0; - warning = $"Not enough {n_wep2}; {req_wep2_num - have_wep2_num} more are required."; - } - //TODO standardise exp check - if (weapon_two_data.req_exp > 0) { - var g, exp_check; - g = -1; - exp_check = 0; - for (var g = 0; g < array_length(obj_controller.display_unit); g++) { - if (obj_controller.man_sel[g] == 1 && is_struct(obj_controller.display_unit[g])) { - if (obj_controller.display_unit[g].experience < weapon_two_data.req_exp) { - exp_check = 1; - n_good1 = 0; - warning = $"A unit must have {weapon_two_data.req_exp}+ EXP to use a {weapon_two_data.name}."; - break; - } - } - } - } - if (is_struct(armour_data)) { - if (((!array_contains(armour_data.tags, "terminator")) && (!array_contains(armour_data.tags, "dreadnought"))) && (n_wep2 == "Assault Cannon")) { - n_good2 = 0; - warning = "Cannot use Assault Cannons without Terminator/Dreadnought Armour."; - } - if ((!array_contains(armour_data.tags, "dreadnought")) && (n_wep2 == "Close Combat Weapon")) { - n_good2 = 0; - warning = "Only " + string(obj_ini.role[100][6]) + " can use Close Combat Weapons."; - } - if (((string_count("Terminator", n_armour) > 0) || (string_count("Tartaros", n_armour) > 0) || (string_count("Dreadnought", n_armour) > 0)) && (n_mobi != "")) { - n_good2 = 0; - } - if (((string_count("Terminator", o_armour) > 0) || (string_count("Tartaros", o_armour) > 0) || (string_count("Dreadnought", o_armour) > 0)) && (n_mobi != "")) { - n_good2 = 0; - } - } - } - if ((target_comp == 3) && is_struct(armour_data)) { - // Check numbers - req_armour_num = units; - have_armour_num = 0; - var i; - i = -1; - repeat (array_length(obj_controller.display_unit)) { - i += 1; - if ((vehicle_equipment != -1) && (obj_controller.man_sel[i] == 1) && (obj_controller.ma_armour[i] == n_armour)) { - have_armour_num += 1; - } - } - have_armour_num += scr_item_count(n_armour); - - if (have_armour_num >= req_armour_num || n_armour == ITEM_NAME_NONE) { - n_good3 = 1; - } - if (have_armour_num < req_armour_num && (n_armour != ITEM_NAME_ANY && n_armour != ITEM_NAME_NONE)) { - n_good3 = 0; - warning = $"Not enough {n_armour} : {units - have_armour_num} more are required."; - } - - var g = -1, exp_check = 0; - if (armour_data.has_tag("terminator")) { - if (armour_data.req_exp > 0) { - var g, exp_check; - g = -1; - exp_check = 0; - for (var g = 0; g < array_length(obj_controller.display_unit); g++) { - if (obj_controller.man_sel[g] == 1 && is_struct(obj_controller.display_unit[g])) { - if (obj_controller.display_unit[g].experience < armour_data.req_exp) { - exp_check = 1; - n_good1 = 0; - warning = $"A unit must have {armour_data.req_exp}+ EXP to use a {armour_data.name}."; - break; - } - } - } - } - } - - if ((string_count("Dread", o_armour) > 0) && (string_count("Dread", n_armour) == 0)) { - n_good4 = 0; - warning = "Marines may not exit Dreadnoughts."; - } - } - if ((target_comp == 4) && (n_gear != "Assortment") && (n_gear != ITEM_NAME_NONE)) { - // Check numbers - req_gear_num = units; - have_gear_num = 0; - var i; - i = -1; - repeat (array_length(obj_controller.display_unit)) { - i += 1; - if ((vehicle_equipment != -1) && (obj_controller.man_sel[i] == 1) && (obj_controller.ma_gear[i] == n_gear)) { - have_gear_num += 1; - } - } - have_gear_num += scr_item_count(n_gear); - - if (have_gear_num >= req_gear_num || n_gear == ITEM_NAME_NONE) { - n_good4 = 1; - } - if (have_gear_num < req_gear_num && (n_gear != ITEM_NAME_ANY && n_gear != ITEM_NAME_NONE)) { - n_good4 = 0; - 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)) { - n_good4 = 0; - warning = "Dreadnoughts may not use infantry equipment."; - } - } - if ((target_comp == 5) && (n_mobi != "Assortment") && (n_mobi != ITEM_NAME_NONE)) { - // Check numbers - req_mobi_num = units; - have_mobi_num = 0; - var i; - i = -1; - repeat (array_length(obj_controller.display_unit)) { - i += 1; - if ((vehicle_equipment != -1) && (obj_controller.man_sel[i] == 1) && (obj_controller.ma_mobi[i] == n_mobi)) { - have_mobi_num += 1; - } - } - have_mobi_num += scr_item_count(n_mobi); - - if (have_mobi_num >= req_mobi_num || n_mobi == ITEM_NAME_NONE) { - n_good5 = 1; - } - if (have_mobi_num < req_mobi_num && (n_mobi != ITEM_NAME_ANY && n_mobi != ITEM_NAME_NONE)) { - n_good5 = 0; - warning = "Not enough " + string(n_mobi) + "; " + string(units - req_mobi_num) + " more are required."; - } - - var terminator_mobi = ["", "Servo-arm", "Servo-harness", "Conversion Beamer Pack"]; - if ((!array_contains(terminator_mobi, n_mobi)) && ((n_armour == "Terminator Armour") || (n_armour == "Tartaros"))) { - n_good5 = 0; - warning = "Cannot use this gear with Terminator Armour."; - } - - if ((n_mobi != ITEM_NAME_NONE) && (n_mobi != "") && (n_armour == "Dreadnought")) { - n_good5 = 0; - warning = string(obj_ini.role[100][6]) + "s may not use mobility gear."; - } - } - } - - draw_set_halign(fa_center); - if ((target_comp == 1) || (target_comp == 2)) { - var msc = " "; - if (master_crafted == 1) { - msc = "x"; - } - if (tab == 1) { - draw_text(xx + 1292, yy + 318, string_hash_to_newline("Tab 1 [x] Tab 2 [ ] Master-Crafted [" + string(msc) + "]")); - } - if (tab == 2) { - draw_text(xx + 1292, yy + 318, string_hash_to_newline("Tab 1 [ ] Tab 2 [x] Master-Crafted [" + string(msc) + "]")); - } - } - - draw_set_color(255); - draw_set_halign(fa_center); - draw_text(xx + 1292, yy + 476, string_hash_to_newline(warning)); - - draw_set_color(c_gray); - draw_set_halign(fa_left); - draw_rectangle(xx + 1006, yy + 499, xx + 1115, yy + 518, 1); - draw_set_alpha(0.5); - draw_rectangle(xx + 1007, yy + 500, xx + 1114, yy + 517, 1); - - if (n_good1 + n_good2 + n_good3 + n_good4 + n_good5 == 5) { - draw_set_alpha(1); - draw_rectangle(xx + 1465, yy + 499, xx + 1576, yy + 518, 1); - draw_set_alpha(0.5); - draw_rectangle(xx + 1466, yy + 500, xx + 1575, yy + 517, 1); - } - if (n_good1 + n_good2 + n_good3 + n_good4 + n_good5 != 5) { - draw_set_alpha(0.25); - draw_rectangle(xx + 1465, yy + 499, xx + 1576, yy + 518, 1); - draw_rectangle(xx + 1466, yy + 500, xx + 1575, yy + 517, 1); - } - - draw_set_alpha(1); - draw_set_halign(fa_center); - draw_text(xx + 1061, yy + 501, string_hash_to_newline("Cancel")); - draw_text(xx + 1061.5, yy + 501.5, string_hash_to_newline("Cancel")); - - if (n_good1 + n_good2 + n_good3 + n_good4 == 4) { - draw_text(xx + 1521, yy + 501, string_hash_to_newline("Equip!")); - draw_text(xx + 1521.5, yy + 501.5, string_hash_to_newline("Equip!")); - } - if (n_good1 + n_good2 + n_good3 + n_good4 != 4) { - draw_set_alpha(0.25); - draw_text(xx + 1521, yy + 501, string_hash_to_newline("Equip!")); - draw_text(xx + 1521.5, yy + 501.5, string_hash_to_newline("Equip!")); - } - draw_set_alpha(1); - } - - // ** Promoting ** - if ((zoom == 0) && (type == 5) && instance_exists(obj_controller)) { - draw_set_color(0); - draw_rectangle(xx + 1006, yy + 143, xx + 1577, yy + 518, 0); - - draw_set_font(fnt_40k_14b); - draw_set_halign(fa_center); - draw_set_color(c_gray); - draw_text(xx + 1292, yy + 145, string_hash_to_newline("Promoting")); - - draw_set_font(fnt_40k_12); - var comp = ""; - if (company <= 10 && company > 0) { - comp = romanNumerals[company - 1]; - } else if (company > 10) { - comp = "HQ"; - } - draw_text(xx + 1292, yy + 170, string_hash_to_newline(string(comp) + " Company " + string(unit_role))); - - draw_set_halign(fa_left); - draw_set_color(c_gray); - draw_text(xx + 1014, yy + 210, string_hash_to_newline("Target Company:")); - - var check = " "; - draw_set_alpha(1); - - // HQ Company - if ((target_comp == 0) || (target_comp > 10)) { - check = "x"; - } - draw_text(xx + 1470, yy + 210, string_hash_to_newline("HQ [" + string(check) + "]")); - check = " "; - // if (obj_controller.command_set[1]!=0 && !is_specialist(unit_role, SPECIALISTS_LIBRARIANS)){ - for (i = 1; i <= 10; i++) { - var comp_data = company_promote_data[i - 1]; - if (obj_controller.command_set[2] == 1) { - //cecks if exp requirements are activated - if (min_exp < comp_data[2]) { - draw_set_alpha(0.6); - } - } - check = " "; - if (target_comp == i) { - check = "x"; - } - var select_text = $"{romanNumerals[i - 1]} [{check}]"; - draw_text(xx + comp_data[0], yy + comp_data[1], select_text); - if (point_and_click([xx + comp_data[0], yy + comp_data[1], xx + comp_data[0] + 90, yy + comp_data[1] + 20])) { - target_comp = i; - target_role = 0; - get_unit_promotion_options(); - cooldown = 8000; - } - } - // } - - draw_text(xx + 1014, yy + 290, string_hash_to_newline("Target Role:")); //choose new role - var role_x = 0; - role_y = 0; - if (target_comp != -1) { - for (var r = 1; r <= 11; r++) { - if (role_name[r] != "") { - draw_set_alpha(1); - check = " "; - if (target_role == r) { - check = "x"; - } - if (min_exp < role_exp[r]) { - draw_set_alpha(0.25); - } - draw_text(xx + 1030 + role_x, yy + 310 + role_y, string_hash_to_newline(string(role_name[r]) + " [" + string(check) + "]")); - if (point_and_click([xx + 1030 + role_x, yy + 310 + role_y, xx + 1180 + role_x, yy + 330 + role_y])) { - if (min_exp >= role_exp[r]) { - target_role = r; - calculate_equipment_needs(); - all_good = 1; - cooldown = 8; - } - } - if (r % 3 == 0) { - role_y += 20; - role_x = 0; - } else { - role_x += 170; - } - } - } - } - - draw_set_alpha(1); - - draw_text(xx + 1014, yy + 370, string_hash_to_newline("Required Gear:")); - var gr = 0, tox = ""; - - if (target_role > 0) { - if (req_armour != "") { - gr = req_armour_num - have_armour_num; - tox = ""; - if (gr > 0) { - draw_set_color(c_red); - } else { - draw_set_color(c_gray); - } - draw_text(xx + 1030, yy + 390, $"{req_armour_num} {req_armour} (Have {have_armour_num})"); - } - if (req_gear != "") { - gr = req_gear_num - have_gear_num; - tox = ""; - if (gr > 0) { - draw_set_color(c_red); - } else { - draw_set_color(c_gray); - } - draw_text(xx + 1030, yy + 410, $"{req_gear_num} {req_gear} (Have {have_gear_num})"); - } - if (req_mobi != "") { - gr = req_mobi_num - have_mobi_num; - tox = ""; - if (gr > 0) { - draw_set_color(c_red); - } else { - draw_set_color(c_gray); - } - draw_text(xx + 1030, yy + 430, $"{req_mobi_num} {req_mobi} (Have {have_mobi_num})"); - } - if (req_wep1 != "") { - gr = req_wep1_num - have_wep1_num; - tox = ""; - if (gr > 0) { - draw_set_color(c_red); - } else { - draw_set_color(c_gray); - } - draw_text(xx + 1260, yy + 390, $"{req_wep1_num} {req_wep1} (Have {have_wep1_num})"); - } - if (req_wep2 != "") { - gr = req_wep2_num - have_wep2_num; - tox = ""; - if (gr > 0) { - draw_set_color(c_red); - } else { - draw_set_color(c_gray); - } - draw_text(xx + 1260, yy + 410, $"{req_wep2_num} {req_wep2} (Have {have_wep2_num})"); - } - } - - draw_set_alpha(1); - - draw_set_color(c_gray); - draw_set_halign(fa_left); - draw_rectangle(xx + 1006, yy + 499, xx + 1115, yy + 518, 1); - draw_set_alpha(0.5); - draw_rectangle(xx + 1007, yy + 500, xx + 1114, yy + 517, 1); - - if (all_good == 1) { - draw_set_alpha(1); - draw_rectangle(xx + 1465, yy + 499, xx + 1576, yy + 518, 1); - draw_set_alpha(0.5); - draw_rectangle(xx + 1466, yy + 500, xx + 1575, yy + 517, 1); - } - if (all_good != 1) { - draw_set_alpha(0.25); - draw_rectangle(xx + 1465, yy + 499, xx + 1576, yy + 518, 1); - draw_rectangle(xx + 1466, yy + 500, xx + 1575, yy + 517, 1); - } - - draw_set_alpha(1); - draw_set_halign(fa_center); - draw_text(xx + 1061, yy + 501, string_hash_to_newline("Cancel")); - draw_text(xx + 1061.5, yy + 501.5, string_hash_to_newline("Cancel")); - - if (all_good == 1) { - draw_text(xx + 1521, yy + 501, string_hash_to_newline("Promote!")); - draw_text(xx + 1521.5, yy + 501.5, string_hash_to_newline("Promote!")); - } - if (all_good != 1) { - draw_set_alpha(0.25); - draw_text(xx + 1521, yy + 501, string_hash_to_newline("Promote!")); - draw_text(xx + 1521.5, yy + 501.5, string_hash_to_newline("Promote!")); - } - draw_set_alpha(1); - } - - // ** Transfering ** - if ((zoom == 0) && (type == 5.1) && instance_exists(obj_controller)) { - draw_set_color(0); - draw_rectangle(xx + 1006, yy + 143, xx + 1577, yy + 518, 0); - - draw_set_font(fnt_40k_14b); - draw_set_halign(fa_center); - draw_set_color(c_gray); - draw_text(xx + 1292, yy + 145, string_hash_to_newline("Transfering")); - - draw_set_font(fnt_40k_12); - var comp = ""; - if (company <= 10 && company > 0) { - comp = romanNumerals[company - 1]; - } else if (company > 10) { - comp = "HQ"; - } - draw_text(xx + 1292, yy + 170, string_hash_to_newline(string(comp) + " Company " + string(unit_role))); - - draw_set_halign(fa_left); - draw_set_color(c_gray); - draw_text(xx + 1014, yy + 210, string_hash_to_newline("Target Company:")); - - var check = " "; - // HQ Company - if ((target_comp == 0) || (target_comp > 10)) { - check = "x"; - } - draw_text(xx + 1470, yy + 210, string_hash_to_newline("HQ [" + string(check) + "]")); - check = " "; - - if (((unit_role != obj_ini.role[100, 17]) || (obj_controller.command_set[1] != 0)) && (unit_role != "Lexicanum") && (unit_role != "Codiciery")) { - // I Company - if (target_comp == 1) { - check = "x"; - } - draw_text(xx + 1030, yy + 230, string_hash_to_newline(romanNumerals[0] + " [" + string(check) + "]")); - check = " "; - // II Company - if (target_comp == 2) { - check = "x"; - } - draw_text(xx + 1140, yy + 230, string_hash_to_newline(romanNumerals[1] + " [" + string(check) + "]")); - check = " "; - // III Company - if (target_comp == 3) { - check = "x"; - } - draw_text(xx + 1250, yy + 230, string_hash_to_newline(romanNumerals[2] + " [" + string(check) + "]")); - check = " "; - // IV Company - if (target_comp == 4) { - check = "x"; - } - draw_text(xx + 1360, yy + 230, string_hash_to_newline(romanNumerals[3] + " [" + string(check) + "]")); - check = " "; - // V Company - if (target_comp == 5) { - check = "x"; - } - draw_text(xx + 1470, yy + 230, string_hash_to_newline(romanNumerals[4] + " [" + string(check) + "]")); - check = " "; - // VI Company - if (target_comp == 6) { - check = "x"; - } - draw_text(xx + 1030, yy + 250, string_hash_to_newline(romanNumerals[5] + " [" + string(check) + "]")); - check = " "; - // VII Company - if (target_comp == 7) { - check = "x"; - } - draw_text(xx + 1140, yy + 250, string_hash_to_newline(romanNumerals[6] + " [" + string(check) + "]")); - check = " "; - // VIII Company - if (target_comp == 8) { - check = "x"; - } - draw_text(xx + 1250, yy + 250, string_hash_to_newline(romanNumerals[7] + " [" + string(check) + "]")); - check = " "; - // IX Company - if (target_comp == 9) { - check = "x"; - } - draw_text(xx + 1360, yy + 250, string_hash_to_newline(romanNumerals[8] + " [" + string(check) + "]")); - check = " "; - // X Company - if (target_comp == 10) { - check = "x"; - } - draw_text(xx + 1470, yy + 250, string_hash_to_newline(romanNumerals[9] + " [" + string(check) + "]")); - check = " "; - } - - draw_set_alpha(1); - - draw_set_color(c_gray); - draw_set_halign(fa_left); - draw_rectangle(xx + 1006, yy + 499, xx + 1115, yy + 518, 1); - draw_set_alpha(0.5); - draw_rectangle(xx + 1007, yy + 500, xx + 1114, yy + 517, 1); - - if ((company != target_comp) && (target_comp >= 0)) { - draw_set_alpha(1); - draw_rectangle(xx + 1465, yy + 499, xx + 1576, yy + 518, 1); - draw_set_alpha(0.5); - draw_rectangle(xx + 1466, yy + 500, xx + 1575, yy + 517, 1); - } - if ((company == target_comp) || (target_comp < 0)) { - draw_set_alpha(0.25); - draw_rectangle(xx + 1465, yy + 499, xx + 1576, yy + 518, 1); - draw_rectangle(xx + 1466, yy + 500, xx + 1575, yy + 517, 1); - } - - draw_set_alpha(1); - draw_set_halign(fa_center); - draw_text(xx + 1061, yy + 501, "Cancel"); - draw_text(xx + 1061.5, yy + 501.5, "Cancel"); - - if ((company != target_comp) && (target_comp >= 0)) { - draw_text(xx + 1521, yy + 501, "Transfer!"); - draw_text(xx + 1521.5, yy + 501.5, "Transfer!"); - } - if ((company == target_comp) || (target_comp < 0)) { - draw_set_alpha(0.25); - draw_text(xx + 1521, yy + 501, "Transfer!"); - draw_text(xx + 1521.5, yy + 501.5, "Transfer!"); - } - draw_set_alpha(1); - } if (type == "duel") {} } catch (_exception) { diff --git a/objects/obj_popup/Draw_64.gml b/objects/obj_popup/Draw_64.gml new file mode 100644 index 0000000000..38036a5c40 --- /dev/null +++ b/objects/obj_popup/Draw_64.gml @@ -0,0 +1,12 @@ + // ** Promoting ** + if (type == POPUP_TYPE.PROMOTION) { + draw_popup_promotion(); + } else if (type == 5.1){ + draw_popup_transfer(); + } else if (type == POPUP_TYPE.EQUIP){ + draw_popup_equip(); + }else if (type == POPUP_TYPE.ITEM_GIFT) { + draw_gift_items_popup(); + } else if (type == POPUP_TYPE.ARTIFACT_EQUIP){ + equip_artifact_popup_draw(); + } \ No newline at end of file diff --git a/objects/obj_popup/Mouse_50.gml b/objects/obj_popup/Mouse_50.gml index d90eae607c..234a5709ba 100644 --- a/objects/obj_popup/Mouse_50.gml +++ b/objects/obj_popup/Mouse_50.gml @@ -30,7 +30,9 @@ if (type=98){ if (option1=="") and (type<5){ obj_controller.cooldown=10; - if (instance_exists(obj_turn_end)) and (obj_controller.complex_event==false){if (number!=0) then obj_turn_end.alarm[1]=4;} + if (instance_exists(obj_turn_end) && obj_controller.complex_event==false){ + if (number!=0) then obj_turn_end.alarm[1]=4; + } instance_destroy(); } @@ -44,50 +46,6 @@ if (type>4) and (type!=9) and (cooldown<=0){ } } - - -if (type=5.1) and (cooldown<=0){ - var xx,yy,before,before2; - xx=__view_get( e__VW.XView, 0 );yy=__view_get( e__VW.YView, 0 ); - before=target_comp; - before2=target_role; - - if (mouse_y>=yy+210) and (mouse_y=xx+1468) and (mouse_x<=xx+1515){target_comp=0;cooldown=8000;} - } - if (mouse_y>=yy+230) and (mouse_y=xx+1030) and (mouse_x<=xx+1120){target_comp=1;cooldown=8000;} - if (mouse_x>=xx+1140) and (mouse_x<=xx+1230){target_comp=2;cooldown=8000;} - if (mouse_x>=xx+1250) and (mouse_x<=xx+1340){target_comp=3;cooldown=8000;} - if (mouse_x>=xx+1360) and (mouse_x<=xx+1450){target_comp=4;cooldown=8000;} - if (mouse_x>=xx+1470) and (mouse_x<=xx+1560){target_comp=5;cooldown=8000;} - } - if (mouse_y>=yy+250) and (mouse_y=xx+1030) and (mouse_x<=xx+1120){target_comp=6;cooldown=8000;} - if (mouse_x>=xx+1140) and (mouse_x<=xx+1230){target_comp=7;cooldown=8000;} - if (mouse_x>=xx+1250) and (mouse_x<=xx+1340){target_comp=8;cooldown=8000;} - if (mouse_x>=xx+1360) and (mouse_x<=xx+1450){target_comp=9;cooldown=8000;} - if (mouse_x>=xx+1470) and (mouse_x<=xx+1560){target_comp=10;cooldown=8000;} - } -} - -if (type=5) and (cooldown<=0){ - var xx,yy,before,before2; - xx=__view_get( e__VW.XView, 0 );yy=__view_get( e__VW.YView, 0 ); - before=target_comp; - before2=target_role; - - if (unit_role!=obj_ini.role[100,17]) or (obj_controller.command_set[1]!=0){ - if (mouse_y>=yy+210) and (mouse_y=xx+1468) and (mouse_x<=xx+1515) and (min_exp>=0){ - target_comp=0; - get_unit_promotion_options(); - cooldown=8000; - } - } - } -} - /* */ var xx,yy,change_tab; @@ -95,140 +53,6 @@ xx=__view_get( e__VW.XView, 0 ); yy=__view_get( e__VW.YView, 0 ); change_tab=0; - -if (mouse_x>=xx+1465) and (mouse_y>=yy+499) and (mouse_x10) then target_comp=0; - manag=obj_controller.managing; - if (manag>10) then manag=0; - company=manag - } - if (type=5.1) and (cooldown<=0) and (company!=target_comp) and (target_comp!=-1){ - cooldown=999; - obj_controller.cooldown=8000; - - var mahreens=0,w=0,god=0,vehi=0,god2=0; - - for (w=1;w<500;w++){ // Gets the number of marines in the target company - if (obj_ini.name[target_comp,w]=="" && obj_ini.name[target_comp,w+1]==""){ - mahreens=w; - break; - } - } - - for (w=1;w<101;w++){// Gets the number of vehicles in the target company - if (god2=0 and obj_ini.veh_role[target_comp,w]=""){god2=1;vehi=w;break;} - } - - // The MAHREENS and TARGET/FROM seems to check out - var unit, move_squad, move_members, moveable, squad; - for (w=0;w= 1) and (target_comp <= 10) { - obj_ini.veh_race[target_comp][vehi]=obj_ini.veh_race[veh_data[0]][veh_data[1]]; - obj_ini.veh_loc[target_comp][vehi]=obj_ini.veh_loc[veh_data[0]][veh_data[1]]; - obj_ini.veh_role[target_comp][vehi]=obj_ini.veh_role[veh_data[0]][veh_data[1]]; - obj_ini.veh_wep1[target_comp][vehi]=obj_ini.veh_wep1[veh_data[0]][veh_data[1]]; - obj_ini.veh_wep2[target_comp][vehi]=obj_ini.veh_wep2[veh_data[0]][veh_data[1]]; - obj_ini.veh_wep3[target_comp][vehi]=obj_ini.veh_wep3[veh_data[0]][veh_data[1]]; - obj_ini.veh_upgrade[target_comp][vehi]=obj_ini.veh_upgrade[veh_data[0]][veh_data[1]]; - obj_ini.veh_acc[target_comp][vehi]=obj_ini.veh_acc[veh_data[0]][veh_data[1]]; - obj_ini.veh_hp[target_comp][vehi]=obj_ini.veh_hp[veh_data[0]][veh_data[1]]; - obj_ini.veh_chaos[target_comp][vehi]=obj_ini.veh_chaos[veh_data[0]][veh_data[1]]; - obj_ini.veh_pilots[target_comp][vehi]=0; - obj_ini.veh_lid[target_comp][vehi]=obj_ini.veh_lid[veh_data[0]][veh_data[1]]; - obj_ini.veh_wid[target_comp][vehi]=obj_ini.veh_wid[veh_data[0]][veh_data[1]]; - - destroy_vehicle(veh_data[0],veh_data[1]); - - vehi++; - } - - } - } - - } - - // Check this - - if (obj_controller.managing>0){ - with(obj_controller){scr_management(1);} - } - obj_ini.selected_company=company; - obj_ini.temp_target_company=target_comp; - with(obj_ini){ - for (var co=0;co<11;co++){ - scr_company_order(co); - scr_vehicle_order(co); - } - } - - with(obj_controller){ - // man_current=0; - var i=-1; - man_size=0; - selecting_location=""; - selecting_types=""; - selecting_ship=-1; - - if (obj_controller.managing>0){ - reset_manage_arrays(); - alll=0; - update_general_manage_view(); - } - } - - with(obj_managment_panel){instance_destroy();} - - obj_controller.cooldown=10; - instance_destroy(); - } -} - /* */ var xx,yy,change_tab,do_not_change; @@ -237,390 +61,6 @@ yy=__view_get( e__VW.YView, 0 ); change_tab=0; do_not_change=false; -if (type=6) and (cooldown<=0){// Actually changing equipment right here - if (target_comp=1) or (target_comp=2){ - if (mouse_y>=yy+318) and (mouse_y=xx+1190) and (mouse_x=yy+318) and (mouse_y=xx+1263) and (mouse_x=yy+318) and (mouse_y=xx+1409) and (mouse_x=xx+1296) and (mouse_x=yy+215) and (mouse_y=yy+235) and (mouse_y=yy+255) and (mouse_y=yy+275) and (mouse_y=yy+295) and (mouse_y=0) and (role_name[target_role]!=""){ - cooldown=999; - obj_controller.cooldown=8000; - - var mahreens=0;i=-1; - - if (target_comp>10) then target_comp=0; - manag=obj_controller.managing; - if (manag>10) then manag=0; - var company=manag; - - for(i=0;i<498;i++){ - if (obj_ini.name[target_comp][i]=="" and obj_ini.name[target_comp][i+1]=="") { - mahreens=i; - break; - } - } - // Gets the number of marines in the target company - var unit, squad_mover,moveable; - var role_squad_equivilances = {};//this is the only way to set variables as keys in gml - variable_struct_set(role_squad_equivilances,obj_ini.role[100][8],"tactical_squad"); - variable_struct_set(role_squad_equivilances,obj_ini.role[100][9],"devastator_squad"); - variable_struct_set(role_squad_equivilances,obj_ini.role[100][10],"assault_squad"); - variable_struct_set(role_squad_equivilances,obj_ini.role[100][12],"scout_squad"); - variable_struct_set(role_squad_equivilances,obj_ini.role[100][3],"sternguard_veteran_squad"); - variable_struct_set(role_squad_equivilances,obj_ini.role[100][4],"terminator_squad"); - - for(i=0;i=min_exp){ - moveable=true; - unit = obj_controller.display_unit[i]; - if (unit.squad != "none"){ // this evaluates if you are trying promote a whole squad - move_squad = unit.squad; - squad = obj_ini.squads[move_squad]; - squad.update_fulfilment(); - move_members = squad.members; - if (array_length(move_members)==1){ - unit.squad = "none"; - moveable = false; - } - for (var mem = 0;mem=xx+1465) and (mouse_y>=yy+499) and (mouse_x=xx+240) and (mouse_x<=xx+387) and (type!=88)) or (((type=9) or (type=9.1)) and (mouse_x>=xx+240+420) and (mouse_x=xx+240+420) and (mouse_x=yy+325) and (mouse_y0) { - var r1,r2,cn;r2=0;cn=obj_controller; - r1=floor(random(cn.stc_wargear_un+cn.stc_vehicles_un+cn.stc_ships_un))+1; - - if (r10) then r2=1; - if (r1>cn.stc_wargear_un) and (r1<=cn.stc_wargear_un+cn.stc_vehicles_un) and (cn.stc_vehicles_un>0) then r2=2; - if (r1>cn.stc_wargear_un+cn.stc_vehicles_un) and (r2<=cn.stc_wargear_un+cn.stc_vehicles_un+cn.stc_ships_un) and (cn.stc_ships_un>0) then r2=3; - - if (cn.stc_wargear_un>0) and (cn.stc_vehicles_un+cn.stc_ships_un=0) then r2=1; - if (cn.stc_vehicles_un>0) and (cn.stc_wargear_un+cn.stc_ships_un=0) then r2=2; - if (cn.stc_ships_un>0) and (cn.stc_vehicles_un+cn.stc_wargear_un=0) then r2=3; - - cn.stc_un_total-=1; - if (r2=1) then cn.stc_wargear_un-=1; - if (r2=2) then cn.stc_vehicles_un-=1; - if (r2=3) then cn.stc_ships_un-=1; - - // Modify disposition here - if (giveto = eFACTION.Imperium){ - obj_controller.disposition[giveto]+=3; - } - else if (giveto = eFACTION.Mechanicus){ - obj_controller.disposition[giveto]+=choose(5,6,7,8); - } - else if (giveto = eFACTION.Inquisition){ - obj_controller.disposition[giveto]+=3; - } - else if (giveto = eFACTION.Ecclesiarchy) { - obj_controller.disposition[giveto]+=3; - if (scr_has_adv("Reverent Guardians")){ - obj_controller.disposition[giveto]+=2; - } - } - - if (giveto=eFACTION.Eldar) - obj_controller.disposition[giveto] +=2; - if (giveto=eFACTION.Tau) { - obj_controller.disposition[giveto]+=15; - }// 137 ; chance for mechanicus to get very pissed - // End disposition - obj_controller.cooldown=7000; - scr_toggle_diplomacy(); - obj_controller.diplomacy=giveto; - obj_controller.force_goodbye=-1; - var the; - the=""; - if (giveto!=eFACTION.Ork) and (giveto!=eFACTION.Chaos) then the="the "; - - scr_event_log("",$"STC Fragment gifted to {the}{obj_controller.faction[giveto]}."); - - with(obj_controller ) { - scr_dialogue("stc_thanks"); - } - instance_destroy(); - exit; - } -} - - xx=__view_get( e__VW.XView, 0 )+951;yy=__view_get( e__VW.YView, 0 )+398; if (mouse_x>=xx+121) and (mouse_y>=yy+393) and (mouse_x 0)) { if (press == 1) { var del = obj_saveload.save[save]; @@ -94,6 +88,36 @@ try { instance_destroy(); } exit; + } else if (pathway == "protect_raiders_disappear"){ + if (press == 1){ + title = "Captains Disgruntled"; + options1 = "continue"; + pathway = ""; + var _caps = scr_role_count(obj_ini.roles[100][eROLE.Captain]); + var _worst = -1; + var _worst_hit = -1; + for (var i=0;i_worst_hit){ + _worst_hit = _loyalty_hit; + _worst = i; + } + } + } + + if (_worst == -1){ + text = $"You are able to convince your captains of the strategic need to cover up the incidence, various excuses are made and fake logs that cove up the disaster of the mission" + } else { + text = $"Not all of your captains are convinced of the need to use deceit and a none have breached the order but it has soured your relations with a few namely {_caps[_worst].name_role()}" + } + } else if (press == 2){ + reset_popup_options(); + options1 = "continue"; + _pdata.add_disposition(-30); + text = $"You prepare to have a large public memorial for your fallen marines on the planet surface as a show of defiance. The chapter are pleased by such an act and the population of the planet are mesmerized by the spectacle. The governor is furious not only has his incompetence to deal with the planets xenos issue been made public in such a way that the sector commander has now heard about it but he perceives his failures are being paraded in font of him\n nGovernor Disposition : -30"; + } } if ((image == "debug_banshee") && (cooldown <= 0)) { @@ -443,7 +467,7 @@ try { var contraband = []; for (var i = 0; i < array_length(obj_ini.artifact_struct); i++) { if (obj_ini.artifact != "") { - arti = obj_ini.artifact_struct[i]; + arti = fetch_artifact(i); if (arti.inquisition_disaprove()) { array_push(contraband, i); } @@ -739,25 +763,6 @@ try { exit; } - if (type == 6) { - // Equipment - if (target_comp == 1) { - target_role = sel1; - } - if (target_comp == 2) { - target_role = sel2; - } - if (target_comp == 3) { - target_role = sel3; - } - if (target_comp == 4) { - target_role = sel4; - } - if (target_comp == 5) { - target_role = sel5; - } - } - if (image == "gene_bad") { option1 = "Dispose of "; if (obj_controller.gene_seed <= 30) { @@ -1542,13 +1547,13 @@ try { obj_controller.exit_all = 1; // 135 - /*there should be a chance for things to go terribly wrong when mission_star give a gift + /*there should be a chance for things to go terribly wrong when you give a gift Imperium: if chaos, increase the global corruption of imperial planets a bit? Imperium: if daemonic, the commander goes chaos after a few turns? Mechanicus: if daemonic vastly increases corruption on forge worlds? - Ecclesiarchy: if daemonic they get really pissed at mission_star? - Eldar: if daemonic they get really pissed at mission_star? + Ecclesiarchy: if daemonic they get really pissed at you? + Eldar: if daemonic they get really pissed at you? Tau: if daemonic all their worlds get big corruption boosts?*/ with (obj_ground_mission) { diff --git a/objects/obj_popup/obj_popup.yy b/objects/obj_popup/obj_popup.yy index bb8d2a37ae..62e8a8ccf0 100644 --- a/objects/obj_popup/obj_popup.yy +++ b/objects/obj_popup/obj_popup.yy @@ -16,6 +16,7 @@ {"$GMEvent":"v1","%Name":"","collisionObjectId":null,"eventNum":50,"eventType":6,"isDnD":false,"name":"","resourceType":"GMEvent","resourceVersion":"2.0",}, {"$GMEvent":"v1","%Name":"","collisionObjectId":null,"eventNum":0,"eventType":8,"isDnD":false,"name":"","resourceType":"GMEvent","resourceVersion":"2.0",}, {"$GMEvent":"v1","%Name":"","collisionObjectId":null,"eventNum":32,"eventType":9,"isDnD":false,"name":"","resourceType":"GMEvent","resourceVersion":"2.0",}, + {"$GMEvent":"v1","%Name":"","collisionObjectId":null,"eventNum":64,"eventType":8,"isDnD":false,"name":"","resourceType":"GMEvent","resourceVersion":"2.0",}, ], "managed":true, "name":"obj_popup", diff --git a/objects/obj_tooltip/Draw_75.gml b/objects/obj_tooltip/Draw_75.gml index 036d4af143..4931710062 100644 --- a/objects/obj_tooltip/Draw_75.gml +++ b/objects/obj_tooltip/Draw_75.gml @@ -7,6 +7,7 @@ for (var i=0;i width-(5*scale)){ @@ -446,6 +452,7 @@ function ShutterButton() constructor{ } else { return false; } + pop_draw_return_values(); } } diff --git a/scripts/scr_add_artifact/scr_add_artifact.gml b/scripts/scr_add_artifact/scr_add_artifact.gml index 3f1e069862..a03349212b 100644 --- a/scripts/scr_add_artifact/scr_add_artifact.gml +++ b/scripts/scr_add_artifact/scr_add_artifact.gml @@ -546,6 +546,38 @@ function ArtifactStruct(Index) constructor { obj_ini.artifact_equipped[index] = false; }; + static equip_on_unit = function(unit, slot=-1){ + var _item = determine_base_type(); + if (_item == "mobility"){ + unit.update_mobility_item(index); + } else if (_item == "gear"){ + unit.update_gear(index); + } else if (_item == "armour"){ + unit.update_armour(index); + } else if (_item == "weapon"){ + if (slot == -1 || slot == 0){ + unit.update_weapon_one(index); + } else { + unit.update_weapon_two(index); + } + } + var _dwarn = false; + if (has_tag("daemonic") || has_tag("chaos")) { + unit.corruption += irandom(10 + 2); + if (unit.role() == obj_ini.role[100][eROLE.ChapterMaster]) { + _dwarn = true; + } + } + if (_dwarn == true) { + var pip = instance_create(0, 0, obj_popup); + pip.title = "Daemon Artifacts"; + pip.text = "Some artifacts, like the one you now wield, are a blasphemous union of the Materium's matter and the Immaterium's spirit, containing the essence of a bound daemon. While they may offer great power, and enhanced perception, they are known to whisper poisonous lies to the wielder. The path to damnation begins with good intentions, and many times artifacts such as these have been the cause."; + pip.image = ""; + pip.cooldown = 8; + obj_controller.cooldown = 8; + } + } + custom_data = {}; name = ""; custom_description = ""; @@ -556,16 +588,19 @@ function ArtifactStruct(Index) constructor { function corrupt_artifact_collectors(last_artifact) { try { - var arti = obj_ini.artifact_struct[last_artifact]; + var arti = fetch_artifact(last_artifact); if (arti.inquisition_disprove()) { for (var i = 0; i < array_length(obj_controller.display_unit); i++) { + var _unit = obj_controller.display_unit[i]; if (obj_controller.man_sel[i] == 1) { if (obj_controller.man[i] == "man") { - if (is_struct(obj_controller.display_unit[i])) { - obj_controller.display_unit[i].edit_corruption(choose(0, 2, 4, 6, 8)); + if (is_struct(_unit)) { + _unit.edit_corruption(choose(0, 2, 4, 6, 8)); } - } else if (obj_controller.man[i] == "vehicle" && is_array(obj_controller.display_unit[i])) { - obj_ini.veh_chaos[obj_controller.display_unit[i][0]][obj_controller.display_unit[i][1]] += choose(0, 2, 4, 6, 8); + } else if (obj_controller.man[i] == "vehicle" && is_array(_unit)) { + var _val = get_deep_array(obj_ini.veh_chaos,_unit) + _val += choose(0, 2, 4, 6, 8); + alter_deep_array(obj_ini.veh_chaos,_unit, _val) } } } @@ -575,6 +610,12 @@ function corrupt_artifact_collectors(last_artifact) { } } +function fetch_artifact(index){ + if (index < 0 || index >= array_length(obj_ini.artifact_struct)) { + return undefined; + } + return obj_ini.artifact_struct[index]; +} function delete_artifact(index) { if (index < array_length(obj_ini.artifact)) { with(obj_ini) { @@ -588,9 +629,90 @@ function delete_artifact(index) { artifact_equipped[index] = false; artifact_struct[index] = new ArtifactStruct(index); } + /*for (var i=index;i0){ + var _index = _array_length-1; + var _values = global.draw_return_stack[_index]; + draw_set_alpha(_values.cur_alpha); + draw_set_font(_values.cur_font); + draw_set_color(_values.cur_color); + draw_set_halign(_values.cur_halign); + draw_set_valign(_values.cur_valign); + array_delete(global.draw_return_stack, _index, 1); + } +} + + function draw_unit_buttons(position, text, size_mod=[1.5,1.5],colour=c_gray,_halign=fa_center, font=fnt_40k_14b, alpha_mult=1, bg=false, bg_color=c_black){ // TODO: fix halign usage // Store current state of all global vars - var cur_alpha = draw_get_alpha(); - var cur_font = draw_get_font(); - var cur_color = draw_get_color(); - var cur_halign = draw_get_halign(); - var cur_valign = draw_get_valign(); + add_draw_return_values(); draw_set_font(font); draw_set_halign(fa_center); @@ -40,11 +64,7 @@ function draw_unit_buttons(position, text, size_mod=[1.5,1.5],colour=c_gray,_hal } // Reset all global vars to their previous state - draw_set_alpha(cur_alpha); - draw_set_font(cur_font); - draw_set_color(cur_color); - draw_set_halign(cur_halign); - draw_set_valign(cur_valign); + pop_draw_return_values() return [position[0],position[1], x2,y2]; } @@ -58,6 +78,7 @@ function UnitButtonObject(data = false) constructor{ h = 30; h_gap= 4; v_gap= 4; + text_scale = 1; label= ""; alpha= 1; color = #50a076; @@ -65,6 +86,7 @@ function UnitButtonObject(data = false) constructor{ tooltip = ""; bind_method = ""; bind_scope = false; + set_width = false; style = "standard"; font=fnt_40k_14b set_height_width = false; @@ -72,7 +94,13 @@ function UnitButtonObject(data = false) constructor{ static update_loc = function(){ if (label != ""){ - w = string_width(label) + 10; + if (!set_width){ + w = string_width(label) + 10; + h = string_height(label) + 4; + } else { + text_scale = calc_text_scale_confines(label, w, 10); + } + h = string_height(label) + 4; }; x2 = x1 + w; y2 = y1 + h; @@ -114,18 +142,14 @@ function UnitButtonObject(data = false) constructor{ } static disabled = false; static draw = function(allow_click = true){ - var cur_alpha = draw_get_alpha(); - var cur_font = draw_get_font(); - var cur_color = draw_get_color(); - var cur_halign = draw_get_halign(); - var cur_valign = draw_get_valign(); + add_draw_return_values(); if (style = "standard"){ var _temp_alpha = alpha; if (disabled){ _temp_alpha = 0.5; allow_click = false; } - var _button_click_area = draw_unit_buttons(w > 0 ? [x1, y1, x2, y2] : [x1, y1] , label, [1,1],color,,font,_temp_alpha); + var _button_click_area = draw_unit_buttons(w > 0 ? [x1, y1, x2, y2] : [x1, y1] , label, [text_scale,text_scale],color,,font,_temp_alpha); } else if (style = "pixel"){ var _widths = [sprite_get_width(spr_pixel_button_left), sprite_get_width(spr_pixel_button_middle), sprite_get_width(spr_pixel_button_right)] @@ -137,24 +161,21 @@ function UnitButtonObject(data = false) constructor{ var _width_scale = w/_widths[1]; _widths[1] *= _width_scale; draw_sprite_ext(spr_pixel_button_middle, 0, x1 + _widths[0], y1, _width_scale, height_scale, 0, c_white, 1); - draw_sprite_ext(spr_pixel_button_right, 0, x1 + _widths[0] + _widths[1] ,y1, height_scale, height_scale, 0, c_white, 1); + draw_sprite_ext(spr_pixel_button_right, allow_click, x1 + _widths[0] + _widths[1] ,y1, height_scale, height_scale, 0, c_white, 1); var _text_position_x = x1 + ((_widths[0] + 2) * height_scale); _text_position_x += (_widths[1]) / 2; draw_set_font(font); draw_set_halign(fa_center); draw_set_valign(fa_middle); draw_set_color(color); - draw_text_transformed(_text_position_x, y1 + ( (h * height_scale)/2), label, 1, 1, 0); + + draw_text_transformed(_text_position_x, y1 + ( (h * height_scale)/2), label, text_scale, text_scale, 0); + x2 = x1 + array_sum(_widths); y2 = y1 + h; var _button_click_area = [x1, y1, x2, y2]; } - draw_set_alpha(cur_alpha); - draw_set_font(cur_font); - draw_set_color(cur_color); - draw_set_halign(cur_halign); - draw_set_valign(cur_valign); if (scr_hit(x1, y1, x2, y2) && tooltip!=""){ tooltip_draw(tooltip); @@ -179,12 +200,14 @@ function UnitButtonObject(data = false) constructor{ } else { return false; } + pop_draw_return_values(); } } function PurchaseButton(req) : UnitButtonObject() constructor{ req_value = req; static draw = function(allow_click=true){ + add_draw_return_values(); var _but = draw_unit_buttons([x1, y1, x2, y2], label, [1,1],color,,,alpha); var _sh = sprite_get_height(spr_requisition); @@ -205,7 +228,8 @@ function PurchaseButton(req) : UnitButtonObject() constructor{ return clicked } else { return false; - } + } + pop_draw_return_values(); } } @@ -227,6 +251,7 @@ function slider_bar() constructor{ } } function draw(){ + add_draw_return_values(); if (value 0){ + if (draw_title){ + draw_text(x1+(max_width/2) - (string_length(draw_title)/2), y1, title); + } + } else { + if (draw_title){ + draw_text(x1 + (string_length(draw_title)/2), y1, title); + } } changed = false; @@ -504,6 +546,11 @@ function radio_set(options_array, title)constructor{ if (_start_current_selection != current_selection){ changed = true; } + pop_draw_return_values(); + } + + static selection_val = function(value){ + return toggles[current_selection][$value]; } } diff --git a/scripts/scr_company_order/scr_company_order.gml b/scripts/scr_company_order/scr_company_order.gml index c97368ae6b..57326eb1ee 100644 --- a/scripts/scr_company_order/scr_company_order.gml +++ b/scripts/scr_company_order/scr_company_order.gml @@ -235,7 +235,7 @@ function scr_company_order(company) { squad.empty_squad(); for (var m=0;m 0; + if (!_has_stc){ + var _tools = "No STCs Available"; + gift_stc_button.tooltip = _tools; + identify_stc_button.tooltip = _tools; + } + if (gift_stc_button.draw(_has_stc)){ + setup_gift_stc_popup(); + } + identify_stc_button.update({x1 :gift_stc_button.x2}); + if (identify_stc_button.draw(_has_stc)){ + audio_play_sound(snd_stc,-500,0) + audio_sound_gain(snd_stc,master_volume*effect_volume,0); + + + if (stc_wargear_un > 0 && + stc_wargear < MAX_STC_PER_SUBCATEGORY) { + + stc_wargear_un--; + identify_stc("wargear"); + } + else if (stc_vehicles_un > 0 && + stc_vehicles < MAX_STC_PER_SUBCATEGORY) { + + stc_vehicles_un--; + identify_stc("vehicles"); + } + else if(stc_ships_un > 0 && + stc_ships < MAX_STC_PER_SUBCATEGORY) { + + stc_ships_un--; + identify_stc("ships"); + } + + // Refresh the shop + instance_create(1000,1000,obj_shop); + set_up_armentarium(); + } + } +} + function scr_draw_armentarium(){ var _recruit_pace = ARR_recruitment_pace; var _train_tiers = ARR_techmarine_training_tiers; @@ -133,83 +201,7 @@ function scr_draw_armentarium(){ if (!in_forge){ - draw_set_font(fnt_40k_14); - draw_set_halign(fa_left); - draw_text(xx + 384, yy + 468, string_hash_to_newline(string(stc_wargear_un + stc_vehicles_un + stc_ships_un) + " Unidentified Fragments")); - - draw_set_halign(fa_center); - - // Identify STC - if (stc_wargear_un + stc_vehicles_un + stc_ships_un = 0) then draw_set_alpha(0.5); - draw_set_color(c_gray); - draw_rectangle(xx + 621, yy + 466, xx + 720, yy + 486, 0); - draw_set_color(0); - draw_text(xx + 670, yy + 467, string_hash_to_newline("Identify")); - if (mouse_x > xx + 621) and(mouse_y > yy + 466) and(mouse_x < xx + 720) and(mouse_y < yy + 486) { - draw_set_color(0); - draw_set_alpha(0.2); - draw_rectangle(xx + 621, yy + 466, xx + 720, yy + 486, 0); - if (mouse_check_button_pressed(mb_left)){ - if (stc_wargear_un + stc_vehicles_un + stc_ships_un > 0){ - - cooldown=8000; - audio_play_sound(snd_stc,-500,0) - audio_sound_gain(snd_stc,master_volume*effect_volume,0); - - - if (stc_wargear_un > 0 && - stc_wargear < MAX_STC_PER_SUBCATEGORY) { - - stc_wargear_un--; - identify_stc("wargear"); - } - else if (stc_vehicles_un > 0 && - stc_vehicles < MAX_STC_PER_SUBCATEGORY) { - - stc_vehicles_un--; - identify_stc("vehicles"); - } - else if(stc_ships_un > 0 && - stc_ships < MAX_STC_PER_SUBCATEGORY) { - - stc_ships_un--; - identify_stc("ships"); - } - - // Refresh the shop - instance_create(1000,1000,obj_shop); - set_up_armentarium(); - } - } - } - draw_set_alpha(1); - if (stc_wargear_un + stc_vehicles_un + stc_ships_un = 0) then draw_set_alpha(0.5); - draw_set_color(c_gray); - draw_rectangle(xx + 733, yy + 466, xx + 790, yy + 486, 0); - draw_set_color(0); - draw_text(xx + 761, yy + 467, string_hash_to_newline("Gift")); - if (mouse_x > xx + 733) and(mouse_y > yy + 466) and(mouse_x < xx + 790) and(mouse_y < yy + 486) { - draw_set_color(0); - draw_set_alpha(0.2); - draw_rectangle(xx + 733, yy + 466, xx + 790, yy + 486, 0); - if (mouse_check_button_pressed(mb_left)){ - if (stc_wargear_un+stc_vehicles_un+stc_ships_un>0){ - var chick=0; - if (known[eFACTION.Imperium]>1) and (faction_defeated[2]==0) then chick=1; - if (known[eFACTION.Mechanicus]>1) and (faction_defeated[3]==0) then chick=1; - if (known[eFACTION.Inquisition]>1) and (faction_defeated[4]==0) then chick=1; - if (known[eFACTION.Ecclesiarchy]>1) and (faction_defeated[5]==0) then chick=1; - if (known[eFACTION.Eldar]>1) and (faction_defeated[6]==0) then chick=1; - if (known[eFACTION.Tau]>1) and (faction_defeated[8]==0) then chick=1; - if (chick!=0){ - var pop=instance_create(0,0,obj_popup); - pop.type=9.1; - cooldown=8000; - } - } - } - } draw_set_alpha(1); draw_set_font(fnt_40k_12); @@ -288,13 +280,13 @@ function scr_draw_armentarium(){ - var forge_buttons= [xx + 450 + 16, y_offset+40+string_height(research_eta_message), 0, 0] + var forge_buttons = [xx + 450 + 16, y_offset+40+string_height(research_eta_message), 0, 0] if (forge_button.draw_shutter(forge_buttons[0]+60, forge_buttons[1], "Enter Forge", 0.5)){ in_forge=true; } draw_set_font(fnt_40k_30b); draw_set_halign(fa_center); - draw_text_transformed(xx + 605, yy + 432, string_hash_to_newline("STC Fragments"), 0.75, 0.75, 0); + draw_text_transformed(xx + 605, yy + 432, "STC Fragments", 0.75, 0.75, 0); draw_set_font(fnt_40k_12); draw_set_halign(fa_left); draw_set_color(c_gray); diff --git a/scripts/scr_draw_management_unit/scr_draw_management_unit.gml b/scripts/scr_draw_management_unit/scr_draw_management_unit.gml index 222893740e..e621c67bd7 100644 --- a/scripts/scr_draw_management_unit/scr_draw_management_unit.gml +++ b/scripts/scr_draw_management_unit/scr_draw_management_unit.gml @@ -1,4 +1,4 @@ -function scr_draw_management_unit(selected, yy = 0, xx = 0, draw = true) { +function scr_draw_management_unit(selected, yy = 0, xx = 0, draw = true, click_lock=false) { var assignment = "none"; var _unit; var string_role = ""; @@ -434,7 +434,7 @@ function scr_draw_management_unit(selected, yy = 0, xx = 0, draw = true) { var unclickable = eventing || jailed || wrong_location || impossible || instance_exists(obj_star_select); - if (!unclickable) { + if (!unclickable && !click_lock) { var changed = false; if (sel_all != "") { diff --git a/scripts/scr_draw_planet_features/scr_draw_planet_features.gml b/scripts/scr_draw_planet_features/scr_draw_planet_features.gml index 8bcf478e0f..2c2e36c34e 100644 --- a/scripts/scr_draw_planet_features/scr_draw_planet_features.gml +++ b/scripts/scr_draw_planet_features/scr_draw_planet_features.gml @@ -272,7 +272,7 @@ function FeatureSelected(Feature, system, planet) constructor{ purpose:"Select Squad for Ambush", purpose_code : feature.problem, number:1, - system:planet_data.system, + system : planet_data.system, feature:obj_star_select.feature, planet : planet_data.planet, array_slot : feature.array_position, @@ -280,7 +280,7 @@ function FeatureSelected(Feature, system, planet) constructor{ selections : [] }); destroy=true; - } + } break; case "train_forces": mission_description=$"The governor of {planet_name} fears the planet will not hold in the case of major incursion, it has not seen war in some time and he fears the ineptitude of the commanders available, he asks for aid in planning a thorough plan for defense and schedule of works for a period of at least 6 months."; diff --git a/scripts/scr_draw_text/scr_draw_text.gml b/scripts/scr_draw_text/scr_draw_text.gml index 8bf76252f1..1ed1b56092 100644 --- a/scripts/scr_draw_text/scr_draw_text.gml +++ b/scripts/scr_draw_text/scr_draw_text.gml @@ -119,6 +119,16 @@ function draw_text_shadow(_x, _y, _text){ draw_text(_x, _y, _text); } +function calc_text_scale_confines(text, width, buffer){ + var _scale = 1; + var _string_width = string_width(text); + if (_string_width > (width - buffer)){ + _scale = (width - buffer)/_string_width + } + + return _scale; +} + /// @function draw_text_ext_shadow /// @description This function will draw text in a similar way to draw_text_ext(), only now the text will have a diagonal shadow. function draw_text_ext_shadow(_x, _y, _text, _sep=-1, _w=9999){ 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 f678ca3b7f..da0793e12f 100644 --- a/scripts/scr_get_item_names/scr_get_item_names.gml +++ b/scripts/scr_get_item_names/scr_get_item_names.gml @@ -513,15 +513,6 @@ function get_filtered_equipment_item_names(_item_names, _equip_category, _melee_ return _item_names; } -enum eEQUIPMENT_TYPE { - None, - PrimaryWeapon = 1, // LeftHand, Turret, Front, Primary - SecondaryWeapon = 2, // RightHand, Sponson, Secondary - Armour = 3, - GearUpgrade = 4, - MobilityAccessory = 5 -} - enum eENGAGEMENT { None = 0, Ranged = 1, // Regular land raider weapons @@ -553,58 +544,58 @@ function get_slot_name(_role, _slot) { case eROLE.Sergeant: case eROLE.VeteranSergeant: switch (_slot) { - case 1: return "First Weapon"; - case 2: return "Second Weapon"; - case 3: return "Armour"; - case 4: return "Gear"; - case 5: return "Mobility"; + case 0: return "First Weapon"; + case 1: return "Second Weapon"; + case 2: return "Armour"; + case 3: return "Gear"; + case 4: return "Mobility"; default: return "Unknown"; } case eROLE.Dreadnought: switch (_slot) { - case 1: return "First Weapon"; - case 2: return "Second Weapon"; - case 5: return "Accessory"; + case 0: return "First Weapon"; + case 1: return "Second Weapon"; + case 4: return "Accessory"; default: return "Unknown"; } case eROLE.LandRaider: switch (_slot) { - case 1: return "Front"; - case 2: return "Sponson"; - case 3: return "Pintle"; - case 4: return "Upgrade"; - case 5: return "Accessory"; + case 0: return "Front"; + case 1: return "Sponson"; + case 2: return "Pintle"; + case 3: return "Upgrade"; + case 4: return "Accessory"; default: return "Unknown"; } case eROLE.Rhino: switch (_slot) { - case 1: return "Weapon"; - case 2: return "Side"; - case 4: return "Upgrade"; - case 5: return "Accessory"; + case 0: return "Weapon"; + case 1: return "Side"; + case 3: return "Upgrade"; + case 4: return "Accessory"; default: return "Unknown"; } case eROLE.Predator: switch (_slot) { - case 1: return "Turret"; - case 2: return "Sponsons"; - case 3: return "Pintle"; - case 4: return "Upgrade"; - case 5: return "Accessory"; + case 0: return "Turret"; + case 1: return "Sponsons"; + case 2: return "Pintle"; + case 3: return "Upgrade"; + case 4: return "Accessory"; default: return "Unknown"; } case eROLE.LandSpeeder: switch (_slot) { - case 1: return "First Weapon"; - case 2: return "Second Weapon"; + case 0: return "First Weapon"; + case 1: return "Second Weapon"; default: return "Unknown"; } case eROLE.Whirlwind: switch (_slot) { - case 1: return "Missiles"; - case 2: return "Pintle"; - case 4: return "Upgrade"; - case 5: return "Accessory"; + case 0: return "Missiles"; + case 1: return "Pintle"; + case 3: return "Upgrade"; + case 4: return "Accessory"; default: return "Unknown"; } default: @@ -653,8 +644,8 @@ function scr_get_item_names(_item_names, _role, _slot, _engagement, _include_com case eROLE.Sergeant: case eROLE.VeteranSergeant: switch (_slot) { + case 0: case 1: - case 2: if (_engagement == eENGAGEMENT.Ranged) { if (_show_available_only) { get_filtered_equipment_item_names( @@ -712,7 +703,7 @@ function scr_get_item_names(_item_names, _role, _slot, _engagement, _include_com return; } break; - case 3: + case 2: if (_show_available_only) { _item_names = get_filtered_equipment_item_names( _item_names, @@ -729,7 +720,7 @@ function scr_get_item_names(_item_names, _role, _slot, _engagement, _include_com push_marine_armour_item_names(_item_names); } break; - case 4: + case 3: if (_show_available_only) { get_filtered_equipment_item_names( _item_names, @@ -746,7 +737,7 @@ function scr_get_item_names(_item_names, _role, _slot, _engagement, _include_com push_marine_gear_item_names(_item_names); } break; - case 5: + case 4: if (_show_available_only) { get_filtered_equipment_item_names( _item_names, @@ -770,8 +761,8 @@ function scr_get_item_names(_item_names, _role, _slot, _engagement, _include_com break; case eROLE.Dreadnought: switch (_slot) { - case 1: - case 2: + case EquipmentSlot.WEAPON_ONE: + case EquipmentSlot.WEAPON_TWO: if (_engagement == eENGAGEMENT.Ranged) { if (_show_available_only) { get_filtered_equipment_item_names( @@ -826,12 +817,12 @@ function scr_get_item_names(_item_names, _role, _slot, _engagement, _include_com return; } break; - case 5: + case EquipmentSlot.MOBILITY: get_none_or_any_item_names(_item_names, _with_none_if_not_skip, false); push_tank_accessory_item_names(_item_names, false, true); break; - case 3: - case 4: + case EquipmentSlot.GEAR: + case EquipmentSlot.ARMOUR: // Dreadnought doesn't have these slots, but empty lists are shown in the UI break; default: @@ -842,7 +833,7 @@ function scr_get_item_names(_item_names, _role, _slot, _engagement, _include_com case eROLE.LandRaider: get_none_or_any_item_names(_item_names, _with_none_if_not_skip, false); switch (_slot) { - case 1: + case EquipmentSlot.WEAPON_ONE: if (_engagement == eENGAGEMENT.Ranged) { // Regular land raider weapons push_land_raider_front_weapons_item_names(_item_names); } else if (_engagement == eENGAGEMENT.Melee) { // Relic land raider weapons @@ -855,7 +846,7 @@ function scr_get_item_names(_item_names, _role, _slot, _engagement, _include_com return; } break; - case 2: + case EquipmentSlot.WEAPON_TWO: if (_engagement == eENGAGEMENT.Ranged) { // Regular land raider weapons push_land_raider_regular_sponsons_item_names(_item_names); } else if (_engagement == eENGAGEMENT.Melee) { // Relic land raider weapons @@ -868,9 +859,9 @@ function scr_get_item_names(_item_names, _role, _slot, _engagement, _include_com return; } break; - case 3: push_land_raider_pintle_item_names(_item_names); break; - case 4: push_tank_upgrade_item_names(_item_names, _with_none_if_not_skip); break; - case 5: push_tank_accessory_item_names(_item_names, _with_none_if_not_skip, false); break; + case EquipmentSlot.ARMOUR: push_land_raider_pintle_item_names(_item_names); break; + case EquipmentSlot.GEAR: push_tank_upgrade_item_names(_item_names, _with_none_if_not_skip); break; + case EquipmentSlot.MOBILITY: push_tank_accessory_item_names(_item_names, _with_none_if_not_skip, false); break; default: assert_error_popup($"Invalid slot for land raider: {_slot}"); return; @@ -879,11 +870,11 @@ function scr_get_item_names(_item_names, _role, _slot, _engagement, _include_com case eROLE.Rhino: get_none_or_any_item_names(_item_names, _with_none_if_not_skip, false); switch (_slot) { - case 1: push_rhino_weapons_item_names(_item_names); break; - case 2: push_rhino_side_item_names(_item_names); break; - case 4: push_tank_upgrade_item_names(_item_names, false); break; - case 5: push_tank_accessory_item_names(_item_names, false, false); break; - case 3: + case 0: push_rhino_weapons_item_names(_item_names); break; + case 1: push_rhino_side_item_names(_item_names); break; + case EquipmentSlot.GEAR: push_tank_upgrade_item_names(_item_names, false); break; + case EquipmentSlot.MOBILITY: push_tank_accessory_item_names(_item_names, false, false); break; + case EquipmentSlot.ARMOUR: // Rhino doesn't have these slots, but empty lists are shown in the UI break; default: @@ -894,11 +885,11 @@ function scr_get_item_names(_item_names, _role, _slot, _engagement, _include_com case eROLE.Predator: get_none_or_any_item_names(_item_names, _with_none_if_not_skip, false); switch (_slot) { - case 1: push_predator_turret_item_names(_item_names); break; - case 2: push_predator_sponsons_item_names(_item_names); break; - case 3: push_predator_pintle_item_names(_item_names); break; - case 4: push_tank_upgrade_item_names(_item_names, false); break; - case 5: push_tank_accessory_item_names(_item_names, false, false); break; + case 0: push_predator_turret_item_names(_item_names); break; + case 1: push_predator_sponsons_item_names(_item_names); break; + case 2: push_predator_pintle_item_names(_item_names); break; + case 3: push_tank_upgrade_item_names(_item_names, false); break; + case 4: push_tank_accessory_item_names(_item_names, false, false); break; default: assert_error_popup($"Invalid slot for predator: {_slot}"); return; @@ -907,11 +898,11 @@ function scr_get_item_names(_item_names, _role, _slot, _engagement, _include_com case eROLE.LandSpeeder: get_none_or_any_item_names(_item_names, _with_none_if_not_skip, false); switch (_slot) { - case 1: push_land_speeder_primary_item_names(_item_names); break; - case 2: push_land_speeder_secondary_item_names(_item_names); break; - case 4: + case 0: push_land_speeder_primary_item_names(_item_names); break; + case 1: push_land_speeder_secondary_item_names(_item_names); break; case 3: - case 5: + case 2: + case 4: // Land speeder doesn't have these slots, but empty lists are shown in the UI break; default: @@ -922,11 +913,11 @@ function scr_get_item_names(_item_names, _role, _slot, _engagement, _include_com case eROLE.Whirlwind: get_none_or_any_item_names(_item_names, _with_none_if_not_skip, false); switch (_slot) { - case 1: push_whirlwind_missiles_item_names(_item_names); break; - case 2: push_whirlwind_pintle_item_names(_item_names); break; - case 4: push_tank_upgrade_item_names(_item_names, false); break; - case 5: push_tank_accessory_item_names(_item_names, false, false); break; - case 3: + case 0: push_whirlwind_missiles_item_names(_item_names); break; + case 1: push_whirlwind_pintle_item_names(_item_names); break; + case 3: push_tank_upgrade_item_names(_item_names, false); break; + case 4: push_tank_accessory_item_names(_item_names, false, false); break; + case 2: // Whirlwind doesn't have this slot, but an empty list is shown in the UI break; default: diff --git a/scripts/scr_gift_items/scr_gift_items.gml b/scripts/scr_gift_items/scr_gift_items.gml new file mode 100644 index 0000000000..e753ce8351 --- /dev/null +++ b/scripts/scr_gift_items/scr_gift_items.gml @@ -0,0 +1,292 @@ + + +function draw_gift_items_popup(){ + draw_sprite(spr_planet_screen, 0, 231 + 314, 112); + draw_set_font(fnt_40k_14); + draw_set_halign(fa_center); + draw_set_color(c_gray); + + var inq_hide = 0; + if (subtype == 0) { + if (array_contains(obj_ini.artifact_tags[obj_controller.menu_artifact], "inq")) { + if (array_contains(obj_controller.quest, "artifact_loan")) { + inq_hide = 1; + } + if (array_contains(obj_controller.quest, "artifact_return")) { + inq_hide = 2; + } + } + } + var iter = 0, spacer = 0; + for (var i = 0; i < array_length(fac_buttons); i++) { + var _button = fac_buttons[i]; + var _fac = _button.faction; + if (_button.draw(obj_controller.known[_fac]>=1)){ + if (_fac == eFACTION.Inquisition) { + if (inq_hide == 1) { + continue; + } + } + giveto = _fac; + } + } + draw_set_alpha(1); + draw_set_color(38144); + if (cancel_button.draw()) { + instance_destroy(); + exit; + } + if (giveto > 0) { + if (subtype == 0){ + gift_artifact(); + } else if (subtype == 1){ + gift_stc_fragment(); + } + } +} +function gift_artifact(){ + var arti_index = obj_controller.menu_artifact; + + var artifact_struct = obj_ini.artifact_struct[arti_index]; + var cur_tags = obj_ini.artifact_tags[arti_index]; + + // obj_controller.artifacts-=1; // this is done by delete_artifact() that is run later; + + obj_controller.cooldown = 10; + if (obj_controller.menu_artifact > obj_controller.artifacts) { + obj_controller.menu_artifact = obj_controller.artifacts; + } + + scr_toggle_diplomacy(); + obj_controller.diplomacy = giveto; + obj_controller.force_goodbye = -1; + var the = ""; + + if ((giveto != 7) && (giveto != 10)) { + the = "the "; + } + + scr_event_log("", $"Artifact gifted to {the} {obj_controller.faction[giveto]}."); + var is_daemon = artifact_struct.has_tag("daemonic"); + var is_chaos = artifact_struct.has_tag("chaos"); + if (inq_hide != 2) { + with (obj_controller) { + if ((!is_daemon) || ((diplomacy != 4) && (diplomacy != 5) && (diplomacy != 2))) { + scr_dialogue("artifact_thanks"); + } + if (is_daemon && ((diplomacy == 4) || (diplomacy == 5) || (diplomacy == 2))) { + scr_dialogue("artifact_daemon"); + } + } + } + if ((inq_hide == 2) && (obj_controller.diplomacy == 4)) { + with (obj_controller) { + scr_dialogue("artifact_returned"); + } + } + + if (artifact_struct.has_tag("MINOR")) { + obj_controller.disposition[giveto] = clamp(obj_controller.disposition[giveto] + 1, -100, 100); + } else { + var daemon_arts = function(faction, is_chaos, is_daemon) { + switch (faction) { + case eFACTION.Imperium: + if (is_daemon) { + var v = 0, ev = 0; + add_event({ + e_id : "imperium_daemon", + duration : 1, + }); + with (obj_star) { + for (var i = 1; i <= planets; i++) { + if (p_owner[i] == 2) { + p_heresy[i] += choose(30, 40, 50, 60); + } + } + } + } + if (is_chaos) { + with (obj_star) { + for (var i = 1; i <= planets; i++) { + if ((p_owner[i] == 2) && (p_heresy[i] > 0)) { + p_heresy[i] += 10; + } + } + } + } + break; + case eFACTION.Tau: + if (is_daemon) { + with (obj_star) { + for (var i = 1; i <= planets; i++) { + if (p_owner[i] == 8) { + p_heresy[i] += 40; + } + } + } + } + break; + } + } + + var specialmod = 0 + switch (giveto) { + case eFACTION.Imperium: + break; + case eFACTION.Mechanicus: + break; + case eFACTION.Inquisition: + if (inq_hide == 2) { + specialmod -= 1; + } + + if (is_chaos) { + specialmod += 2; + } + + if (is_daemon) { + specialmod += 4; + } + break; + case eFACTION.Ecclesiarchy: + if (!is_daemon) { + if (scr_has_adv("Reverent Guardians")) { + specialmod += 2; + } + } else { + specialmod -= 2; + } + break; + } + + daemon_arts(giveto, is_chaos, is_daemon) + var tagmod = artifact_struct.artifact_faction_value(giveto); + + alter_disposition(giveto, 2 + specialmod + tagmod) + } + + // Need to modify ^^^^ based on if it is chaos or daemonic + + delete_artifact(arti_index); + instance_destroy(); + exit; +} +function are_giftable_factions(){ + var chick=false; + //list of all giftable factions enum numbers + var giftable_factions = [eFACTION.Imperium, eFACTION.Mechanicus,eFACTION.Inquisition,eFACTION.Ecclesiarchy,eFACTION.Eldar,eFACTION.Tau] + for (var i = 0; i < array_length(giftable_factions); i++){ + var gift_faction = giftable_factions[i]; + if (known[gift_faction] && !faction_defeated[gift_faction]) then chick=true; + } + return chick; +} + +function setup_gift_popup(){ + if (are_giftable_factions()){ + var pop=instance_create(0,0,obj_popup); + pop.type=9; + with (pop){ + cancel_button = new UnitButtonObject( + { + x1: 700, + y1: 370, + style : "pixel", + label : "Cancel", + } + ); + + fac_buttons = []; + + for (var i=2;i<=8;i++){ + if (i==7){ + continue; + } + var _y1 = 131; + if (i>2){ + var _y1 = _last_y; + } + var _fac_but = new UnitButtonObject( + { + x1: 660, + w : 147, + set_width : true, + y1: _y1, + style : "pixel", + label : obj_controller.faction[i], + faction : i, + tooltip : $"Disposition : {obj_controller.disposition[i]}", + } + ); + var _last_y = _fac_but.y2; + array_push(fac_buttons, _fac_but); + } + } + return pop; + } +} +function setup_gift_artifact_popup(){ + setup_gift_popup(); +} + +function setup_gift_stc_popup(){ + var _pip = setup_gift_popup(); + if (instance_exists(obj_popup)){ + _pip.subtype = 1; + } +} + +function gift_stc_fragment(){ + + var r1,r2,cn;r2=0;cn=obj_controller; + r1=floor(random(cn.stc_wargear_un+cn.stc_vehicles_un+cn.stc_ships_un))+1; + + if (r10) then r2=1; + if (r1>cn.stc_wargear_un) and (r1<=cn.stc_wargear_un+cn.stc_vehicles_un) and (cn.stc_vehicles_un>0) then r2=2; + if (r1>cn.stc_wargear_un+cn.stc_vehicles_un) and (r2<=cn.stc_wargear_un+cn.stc_vehicles_un+cn.stc_ships_un) and (cn.stc_ships_un>0) then r2=3; + + if (cn.stc_wargear_un>0) and (cn.stc_vehicles_un+cn.stc_ships_un=0) then r2=1; + if (cn.stc_vehicles_un>0) and (cn.stc_wargear_un+cn.stc_ships_un=0) then r2=2; + if (cn.stc_ships_un>0) and (cn.stc_vehicles_un+cn.stc_wargear_un=0) then r2=3; + + cn.stc_un_total-=1; + if (r2=1) then cn.stc_wargear_un-=1; + if (r2=2) then cn.stc_vehicles_un-=1; + if (r2=3) then cn.stc_ships_un-=1; + + // Modify disposition here + if (giveto = eFACTION.Imperium){ + obj_controller.disposition[giveto]+=3; + } + else if (giveto = eFACTION.Mechanicus){ + obj_controller.disposition[giveto]+=choose(5,6,7,8); + } + else if (giveto = eFACTION.Inquisition){ + obj_controller.disposition[giveto]+=3; + } + else if (giveto = eFACTION.Ecclesiarchy) { + obj_controller.disposition[giveto]+=3; + } + + if (giveto=eFACTION.Eldar) + obj_controller.disposition[giveto] +=2; + if (giveto=eFACTION.Tau) { + obj_controller.disposition[giveto]+=15; + }// 137 ; chance for mechanicus to get very pissed + // End disposition + obj_controller.cooldown=7000; + scr_toggle_diplomacy(); + obj_controller.diplomacy=giveto; + obj_controller.force_goodbye=-1; + var the; + the=""; + if (giveto!=eFACTION.Ork) and (giveto!=eFACTION.Chaos) then the="the "; + + scr_event_log("",$"STC Fragment gifted to {the}{obj_controller.faction[giveto]}."); + + with(obj_controller ) { + scr_dialogue("stc_thanks"); + } + instance_destroy(); + exit; +} \ No newline at end of file diff --git a/scripts/scr_gift_items/scr_gift_items.yy b/scripts/scr_gift_items/scr_gift_items.yy new file mode 100644 index 0000000000..c04fc3dfcd --- /dev/null +++ b/scripts/scr_gift_items/scr_gift_items.yy @@ -0,0 +1,13 @@ +{ + "$GMScript":"v1", + "%Name":"scr_gift_items", + "isCompatibility":false, + "isDnD":false, + "name":"scr_gift_items", + "parent":{ + "name":"Scripts", + "path":"folders/Scripts.yy", + }, + "resourceType":"GMScript", + "resourceVersion":"2.0", +} \ No newline at end of file diff --git a/scripts/scr_librarium/scr_librarium.gml b/scripts/scr_librarium/scr_librarium.gml index a74ef6fc2a..f201465dcb 100644 --- a/scripts/scr_librarium/scr_librarium.gml +++ b/scripts/scr_librarium/scr_librarium.gml @@ -15,345 +15,322 @@ function set_chapter_arti_data(){ } } } -function scr_librarium(){ - var blurp=""; - var xx = __view_get(e__VW.XView, 0) + 0; - var yy = __view_get(e__VW.YView, 0) + 0; - draw_sprite(spr_rock_bg, 0, xx, yy); - draw_set_alpha(0.75); - draw_set_color(0); - draw_rectangle(xx + 326 + 16, yy + 66, xx + 887 + 16, yy + 818, 0); - draw_set_alpha(1); - draw_set_color(c_gray); - draw_rectangle(xx + 326 + 16, yy + 66, xx + 887 + 16, yy + 818, 1); // Center librarium box - draw_line(xx + 326 + 16, yy + 426, xx + 887 + 16, yy + 426); - draw_set_alpha(0.75); - draw_set_color(0); - draw_rectangle(xx + 945, yy + 66, xx + 1580, yy + 818, 0); - draw_set_alpha(1); - draw_set_color(c_gray); - draw_rectangle(xx + 945, yy + 66, xx + 1580, yy + 818, 1); // Right librarium box +function scr_librarium_gui(){ + if (artifacts == 0){ + return; + } + var cur_arti = obj_ini.artifact_struct[menu_artifact]; + identifiable = cur_arti.is_identifiable(); + + if (cur_arti.type() != "") { + var artif_descr = $"This artifact is an unidentified {cur_arti.type()}.##It is stored on {cur_arti.ship_id()>=0 ? "the ship" :""} '{cur_arti.location_string()}'."; + if (cur_arti.identified() > 0) and (identifiable = 0) { + draw_set_color(881503); + artif_descr += $"#To be identified it must be brought to a fleet with a Battle Barge or your Homeworld."; + }else if (cur_arti.identified() > 0) and(identifiable = 1) { + draw_set_color(881503); + artif_descr += $"##It will be identified in {cur_arti.identified()} turns. #You may spend 150 Requisition to identify it immediately."; - if (menu_adept = 0) { - // draw_sprite(spr_advisors,3,xx+16,yy+43); - if(struct_exists(obj_ini.custom_advisors, "librarian")){ - scr_image("advisor/splash", obj_ini.custom_advisors.librarian, xx + 16, yy + 43, 310, 828); - } else { - scr_image("advisor/splash", 4, xx + 16, yy + 43, 310, 828); + //TODO solidify following button into a proper styled struct button + var ident_button = draw_unit_buttons([532,765], "IDENTIFY NOW",[1,1],c_black,,fnt_40k_14b,,1,c_gray); + if (point_and_click(ident_button)){ + if (requisition>=150){ + obj_ini.artifact_identified[menu_artifact]=0; + requisition-=150; + cooldown=8000; + identifiable=0; + audio_play_sound(snd_identify,-500,0); + audio_sound_gain(snd_identify,master_volume*effect_volume,0); + } } - // if (global.chapter_name = "Space Wolves") then scr_image("advisor", 10, xx + 16, yy + 43, 310, 828); - // draw_sprite(spr_advisors,10,xx+16,yy+43); - draw_set_halign(fa_left); - draw_set_color(c_gray); - draw_set_font(fnt_40k_30b); - draw_text_transformed(xx + 336 + 16, yy + 66, string_hash_to_newline("Librarium"), 1, 1, 0); - draw_text_transformed(xx + 336 + 16, yy + 100, string_hash_to_newline("Chief " + string(obj_ini.role[100, 17]) + " " + string(obj_ini.name[0, 4])), 0.6, 0.6, 0); - draw_set_font(fnt_40k_14); - } - if (menu_adept = 1) { - // draw_sprite(spr_advisors,0,xx+16,yy+43); - scr_image("advisor/splash", 1, xx + 16, yy + 43, 310, 828); - draw_set_halign(fa_left); - draw_set_color(c_gray); - draw_set_font(fnt_large); - draw_text_transformed(xx + 336 + 16, yy + 66, string_hash_to_newline("Librarium"), 1, 1, 0); - draw_text_transformed(xx + 336 + 16, yy + 100, string_hash_to_newline("Adept " + string(obj_controller.adept_name)), 0.6, 0.6, 0); - draw_set_font(fnt_40k_14); } + else if (cur_arti.identified() < 1) { + draw_set_color(881503); + artif_descr = ""; + try{ + artif_descr = cur_arti.description(); + } catch( _exception){ + handle_exception(_exception); + } + tooltip = ""; + tooltip_other = ""; + var arti_data = gear_weapon_data("any",cur_arti.type(), "all", false, cur_arti.quality()); - var tip2 = ""; + var _can_equip = cur_arti.can_equip(); + if (_can_equip){ + if (cur_arti.equipped()) then _can_equip = false; - // Set pace of recruitment based on training psyker value - if (training_psyker >= 0 && training_psyker <= 6){ - var _recruit_pace = ARR_recruitment_pace; - blurp += _recruit_pace[training_psyker]; - } + if (_can_equip){ + if (artifact_equip.draw_shutter(385, 770, "EQUIP", 0.3,true)){ + if (_can_equip && !instance_exists(obj_popup)){ + equip_artifact_popup_setup(); + } - var artif = "", - artif_descr = "", - tp = 0; + } + } else if (is_array(cur_arti.bearer)) { + if (artifact_equip.draw_shutter(385, 770, "UNEQUIP", 0.3,true)){ + cur_arti.unequip_from_unit(); + } + } + } - if (unused_artifacts = 0) { artif = "no unused artifacts.";} - else if (unused_artifacts = 1) { artif = "one unused artifact.";} - else if (unused_artifacts > 1) { artif = string(unused_artifacts) + " unused artifacts.";} + if (artifact_gift.draw_shutter(575, 770, "GIFT", 0.3, true)){ + setup_gift_artifact_popup() + } + if (artifact_destroy.draw_shutter(765, 770, "DESTROY", 0.3, true)){ + // Below here cleans up the artifacts - // Greetings message - if (menu_adept = 0) then draw_text_ext(xx + 336 + 16, yy + 130, string_hash_to_newline("Chapter Master " + string(obj_ini.name[0, 0]) + ", greetings.#I assume you've come for the report? The Chapter currently possesses " + string(temp[36]) + " Epistolaries, " + string(temp[37]) + " Codiceries, and " + string(temp[38]) + " Lexicanum. We are working to identify additional warp-sensitive brothers before they cause harm, and the training is " + string(blurp) + ".##We could likely speed up the identification and application of appropriate training, but we would need more resources...I don't suppose we can spare some?##Our Chapter has " + string(artif)), -1, 536); - if (menu_adept = 1) then draw_text_ext(xx + 336 + 16, yy + 130, string_hash_to_newline("Your Chapter contains " + string(temp[36]) + " " + string(obj_ini.role[100, 17]) + "s, " + string(temp[37]) + " Codiceries, and " + string(temp[38]) + " Lexicanum.##Training of more " + string(obj_ini.role[100, 17]) + "s is " + string(blurp) + ".##Your chapter has " + string(artif)), -1, 536); + if (menu_artifact==fest_display) then fest_display=0; - draw_set_color(881503); - draw_set_halign(fa_center); - identifiable = 0; - if (artifacts > 0) { - var usey =0; - for (var i = 0, ilen = array_length(obj_ini.artifact); i < ilen; i++) { - if (obj_ini.artifact[i]!="") { - usey++; - } - if (i == menu_artifact) { - break; - } - } - draw_text(xx + 622, yy + 440, $"[Artifact {usey} of {artifacts}]"); + cur_arti.destroy_arti(); - if scr_hit(xx + 326 + 16, yy + 426, xx + 887 + 16, yy + 818) { - var arrow_hovered = false; - var scroll_engaged = false; - var arrow = [xx+400,yy+437,xx+445,yy+461]; - if (scr_hit(arrow[0],arrow[1],arrow[2],arrow[3])) { - arrow_hovered = true; - if (scr_click_left()){ - scroll_engaged = true; + //TODO centralise into function + for (var e = 0, elen = array_length(obj_controller.recent_keyword); e < elen; e++) { + if (obj_ini.artifact_tags[menu_artifact] == obj_controller.recent_keyword[e]) { + with (obj_controller) { + array_delete(recent_keyword, e, 1); + array_delete(recent_type, e, 1); + array_delete(recent_turn, e, 1); + array_delete(recent_number, e, 1); + } + scr_recent("artifact_destroyed", obj_controller.recent_keyword,2); + scr_recent("", "", 0); + break; } } - if (mouse_wheel_down()){ - scroll_engaged = true; + delete_artifact(menu_artifact); + set_chapter_arti_data(); + } + var base_type = cur_arti.determine_base_type(); + if (arti_data && base_type!="device"){ + if (arti_data.armour_value != 0) { + tip2 += $"{arti_data.armour_value} Armour#"; } - - if (scroll_engaged) { - artifact_namer.allow_input=false; - identifiable=false; - artifact_equip = new ShutterButton(); - artifact_gift = new ShutterButton(); - artifact_destroy = new ShutterButton(); - var done = false; - while (menu_artifact > 0) { - menu_artifact--; - if (obj_ini.artifact[menu_artifact] != "") { - done = true; - break; - } - } - if (!done and menu_artifact <= 0) { - // we didn't find a lower artifact to goto, so we find the highest - for (var i = array_length(obj_ini.artifact) - 1; i >= 0; i--) { - if (obj_ini.artifact[i] != "") { - menu_artifact = i; - break; - } - } - } + if (arti_data.attack != 0) { + tip2 = $"{arti_data.attack} Damage#"; } - if (arrow_hovered) { - tooltip_draw("Click here or use mouse wheel to scroll the artifact list."); + if (arti_data.hp_mod != 0) { + tip2 += $"{arti_data.hp_mod}% Health Bonus#"; } - - arrow_hovered = false; - scroll_engaged = false; - arrow = [xx+790,yy+437,xx+832,yy+461]; - if (scr_hit(arrow[0],arrow[1],arrow[2],arrow[3])) { - arrow_hovered = true; - if (scr_click_left()){ - scroll_engaged = true; - } + if (arti_data.melee_mod != 0) { + tip2 += $"{arti_data.melee_mod}% Melee Bonus#"; } - if (mouse_wheel_up()){ - scroll_engaged = true; + if (arti_data.ranged_mod != 0) { + tip2 += $"{arti_data.ranged_mod}% Ranged Bonus#"; } - - if (scroll_engaged) { - artifact_namer.allow_input=false; - identifiable=0; - artifact_equip = new ShutterButton(); - artifact_gift = new ShutterButton(); - artifact_destroy = new ShutterButton(); - var max_index = array_length(obj_ini.artifact) - 1; - var done = false; - while (menu_artifact < max_index) { - menu_artifact++; - if (obj_ini.artifact[menu_artifact] != "") { - done = true; - break; - } - } - if (!done and menu_artifact >= max_index) { - // we didn't find a higher artifact to goto, so we find the lowest - for (var i = 0, ilen = array_length(obj_ini.artifact); i < ilen; i++) { - if (obj_ini.artifact[i] != "") { - menu_artifact = i; - break; - } - } - } + if (arti_data.damage_resistance_mod != 0) { + tip2 += $"{arti_data.damage_resistance_mod}% Resistance Bonus#"; } - if (arrow_hovered) { - tooltip_draw("Click on this arrow or use mouse wheel to scroll the artifact list."); + if (base_type=="gear") { // Gear + tip2 = tooltip_other; } } - var artifact_name = obj_ini.artifact_struct[menu_artifact].name; - if (artifact_name == "") then artifact_name = obj_ini.artifact[menu_artifact]; - obj_ini.artifact_struct[menu_artifact].name = artifact_namer.draw(artifact_name); - draw_sprite(spr_arrow, 0, xx + 403, yy + 433); - draw_sprite(spr_arrow, 1, xx + 795, yy + 433); - // Artifact description box - var description_box = { - x: xx + 392, - y: yy + 500, - x2: xx + 852, - y2: yy + 740, - } - draw_rectangle_outline(description_box.x, description_box.y, description_box.x2, description_box.y2, c_black, c_gray, 1); - var cur_arti = obj_ini.artifact_struct[menu_artifact]; - identifiable = cur_arti.is_identifiable(); + artifact_slate.body_text = artif_descr; - if (cur_arti.type() != "") { - var artif_descr = $"This artifact is an unidentified {cur_arti.type()}.##It is stored on {cur_arti.ship_id()>=0 ? "the ship" :""} '{cur_arti.location_string()}'."; - if (cur_arti.identified() > 0) and (identifiable = 0) { - draw_set_color(881503); - artif_descr += $"#To be identified it must be brought to a fleet with a Battle Barge or your Homeworld."; - }else if (cur_arti.identified() > 0) and(identifiable = 1) { - draw_set_color(881503); - artif_descr += $"##It will be identified in {cur_arti.identified()} turns. #You may spend 150 Requisition to identify it immediately."; + artifact_slate.draw_with_dimensions(); + + } else { + artifact_destroy.draw_shutter(765, 740, "DESTROY", 0.3, false); + artifact_equip.draw_shutter(385, 740, "EQUIP", 0.3, false); + artifact_gift.draw_shutter(575, 740, "GIFT", 0.3, false); + } - //TODO solidify following button into a proper styled struct button - var ident_button = draw_unit_buttons([xx+532,yy+765], "IDENTIFY NOW",[1,1],c_black,,fnt_40k_14b,,1,c_gray); - if (point_and_click(ident_button)){ - if (requisition>=150){ - obj_ini.artifact_identified[menu_artifact]=0; - requisition-=150; - cooldown=8000; - identifiable=0; - audio_play_sound(snd_identify,-500,0); - audio_sound_gain(snd_identify,master_volume*effect_volume,0); - } - } - } - else if (cur_arti.identified() < 1) { - draw_set_color(881503); - artif_descr = ""; - try{ - artif_descr = cur_arti.description(); - } catch( _exception){ - handle_exception(_exception); - } - tooltip = ""; - tooltip_other = ""; - var arti_data = gear_weapon_data("any",cur_arti.type(), "all", false, cur_arti.quality()); + // identifiable=0; + } +} - var _can_equip = cur_arti.can_equip(); - if (_can_equip){ - if (cur_arti.equipped()) then _can_equip = false; - - if (_can_equip){ - if (artifact_equip.draw_shutter(xx + 385, yy + 770, "EQUIP", 0.3,true)){ - if (_can_equip && !instance_exists(obj_popup)){ - var pop=instance_create(0,0,obj_popup); - pop.type=8; - cooldown=8; - } - - } - } else if (is_array(cur_arti.bearer)) { - if (artifact_equip.draw_shutter(xx + 385, yy + 770, "UNEQUIP", 0.3,true)){ - cur_arti.unequip_from_unit(); - } - } - } +function scr_librarium(){ + var blurp=""; + var xx = __view_get(e__VW.XView, 0) + 0; + var yy = __view_get(e__VW.YView, 0) + 0; + draw_sprite(spr_rock_bg, 0, xx, yy); - if (artifact_gift.draw_shutter(xx + 575, yy + 770, "GIFT", 0.3, true)){ - //show_debug_message("Clicked"); - var chick=false; - //list of all giftable factions enum numbers - var giftable_factions = [eFACTION.Imperium, eFACTION.Mechanicus,eFACTION.Inquisition,eFACTION.Ecclesiarchy,eFACTION.Eldar,eFACTION.Tau] - for (var i = 0; i < array_length(giftable_factions); i++){ - var gift_faction = giftable_factions[i]; - if (known[gift_faction] && !faction_defeated[gift_faction]) then chick=true; - } + draw_set_alpha(0.75); + draw_set_color(0); + draw_rectangle(xx + 326 + 16, yy + 66, xx + 887 + 16, yy + 818, 0); + draw_set_alpha(1); + draw_set_color(c_gray); + draw_rectangle(xx + 326 + 16, yy + 66, xx + 887 + 16, yy + 818, 1); // Center librarium box + draw_line(xx + 326 + 16, yy + 426, xx + 887 + 16, yy + 426); + draw_set_alpha(0.75); + draw_set_color(0); + draw_rectangle(xx + 945, yy + 66, xx + 1580, yy + 818, 0); + draw_set_alpha(1); + draw_set_color(c_gray); + draw_rectangle(xx + 945, yy + 66, xx + 1580, yy + 818, 1); // Right librarium box - if (chick){ - var pop=instance_create(0,0,obj_popup); - pop.type=9; - cooldown=8; - } - } - if (artifact_destroy.draw_shutter(xx + 765, yy + 770, "DESTROY", 0.3, true)){ - // Below here cleans up the artifacts + if (menu_adept = 0) { + // draw_sprite(spr_advisors,3,xx+16,yy+43); + if(struct_exists(obj_ini.custom_advisors, "librarian")){ + scr_image("advisor/splash", obj_ini.custom_advisors.librarian, xx + 16, yy + 43, 310, 828); + } else { + scr_image("advisor/splash", 4, xx + 16, yy + 43, 310, 828); + } + // if (global.chapter_name = "Space Wolves") then scr_image("advisor", 10, xx + 16, yy + 43, 310, 828); + // draw_sprite(spr_advisors,10,xx+16,yy+43); + draw_set_halign(fa_left); + draw_set_color(c_gray); + draw_set_font(fnt_40k_30b); + draw_text_transformed(xx + 336 + 16, yy + 66, string_hash_to_newline("Librarium"), 1, 1, 0); + draw_text_transformed(xx + 336 + 16, yy + 100, string_hash_to_newline("Chief " + string(obj_ini.role[100, 17]) + " " + string(obj_ini.name[0, 4])), 0.6, 0.6, 0); + draw_set_font(fnt_40k_14); + } + if (menu_adept = 1) { + // draw_sprite(spr_advisors,0,xx+16,yy+43); + scr_image("advisor/splash", 1, xx + 16, yy + 43, 310, 828); + draw_set_halign(fa_left); + draw_set_color(c_gray); + draw_set_font(fnt_large); + draw_text_transformed(xx + 336 + 16, yy + 66, string_hash_to_newline("Librarium"), 1, 1, 0); + draw_text_transformed(xx + 336 + 16, yy + 100, string_hash_to_newline("Adept " + string(obj_controller.adept_name)), 0.6, 0.6, 0); + draw_set_font(fnt_40k_14); + } - if (menu_artifact==fest_display) then fest_display=0; + var tip2 = ""; - cur_arti.destroy_arti(); + // Set pace of recruitment based on training psyker value + if (training_psyker >= 0 && training_psyker <= 6){ + var _recruit_pace = ARR_recruitment_pace; + blurp += _recruit_pace[training_psyker]; + } - //TODO centralise into function - for (var e = 0, elen = array_length(obj_controller.recent_keyword); e < elen; e++) { - if (obj_ini.artifact_tags[menu_artifact] == obj_controller.recent_keyword[e]) { - with (obj_controller) { - array_delete(recent_keyword, e, 1); - array_delete(recent_type, e, 1); - array_delete(recent_turn, e, 1); - array_delete(recent_number, e, 1); - } - scr_recent("artifact_destroyed", obj_controller.recent_keyword,2); - scr_recent("", "", 0); - break; - } - } - delete_artifact(menu_artifact); - set_chapter_arti_data(); + var artif = "", + artif_descr = "", + tp = 0; + + if (unused_artifacts = 0) { artif = "no unused artifacts.";} + else if (unused_artifacts = 1) { artif = "one unused artifact.";} + else if (unused_artifacts > 1) { artif = string(unused_artifacts) + " unused artifacts.";} + + // Greetings message + if (menu_adept = 0) then draw_text_ext(xx + 336 + 16, yy + 130, string_hash_to_newline("Chapter Master " + string(obj_ini.name[0, 0]) + ", greetings.#I assume you've come for the report? The Chapter currently possesses " + string(temp[36]) + " Epistolaries, " + string(temp[37]) + " Codiceries, and " + string(temp[38]) + " Lexicanum. We are working to identify additional warp-sensitive brothers before they cause harm, and the training is " + string(blurp) + ".##We could likely speed up the identification and application of appropriate training, but we would need more resources...I don't suppose we can spare some?##Our Chapter has " + string(artif)), -1, 536); + if (menu_adept = 1) then draw_text_ext(xx + 336 + 16, yy + 130, string_hash_to_newline("Your Chapter contains " + string(temp[36]) + " " + string(obj_ini.role[100, 17]) + "s, " + string(temp[37]) + " Codiceries, and " + string(temp[38]) + " Lexicanum.##Training of more " + string(obj_ini.role[100, 17]) + "s is " + string(blurp) + ".##Your chapter has " + string(artif)), -1, 536); + + draw_set_color(881503); + draw_set_halign(fa_center); + identifiable = 0; + if (artifacts > 0) { + var usey =0; + for (var i = 0, ilen = array_length(obj_ini.artifact); i < ilen; i++) { + if (obj_ini.artifact[i]!="") { + usey++; + } + if (i == menu_artifact) { + break; + } + } + draw_text(xx + 622, yy + 440, $"[Artifact {usey} of {artifacts}]"); + + if scr_hit(xx + 326 + 16, yy + 426, xx + 887 + 16, yy + 818) { + var arrow_hovered = false; + var scroll_engaged = false; + var arrow = [xx+400,yy+437,xx+445,yy+461]; + if (scr_hit(arrow[0],arrow[1],arrow[2],arrow[3])) { + arrow_hovered = true; + if (scr_click_left()){ + scroll_engaged = true; + } + } + if (mouse_wheel_down()){ + scroll_engaged = true; + } + + if (scroll_engaged) { + artifact_namer.allow_input=false; + identifiable=false; + artifact_equip = new ShutterButton(); + artifact_gift = new ShutterButton(); + artifact_destroy = new ShutterButton(); + var done = false; + while (menu_artifact > 0) { + menu_artifact--; + if (obj_ini.artifact[menu_artifact] != "") { + done = true; + break; } - var base_type = cur_arti.determine_base_type(); - if (arti_data && base_type!="device"){ - if (arti_data.armour_value != 0) { - tip2 += $"{arti_data.armour_value} Armour#"; - } - if (arti_data.attack != 0) { - tip2 = $"{arti_data.attack} Damage#"; - } - if (arti_data.hp_mod != 0) { - tip2 += $"{arti_data.hp_mod}% Health Bonus#"; - } - if (arti_data.melee_mod != 0) { - tip2 += $"{arti_data.melee_mod}% Melee Bonus#"; - } - if (arti_data.ranged_mod != 0) { - tip2 += $"{arti_data.ranged_mod}% Ranged Bonus#"; - } - if (arti_data.damage_resistance_mod != 0) { - tip2 += $"{arti_data.damage_resistance_mod}% Resistance Bonus#"; - } - if (base_type=="gear") { // Gear - tip2 = tooltip_other; + } + if (!done and menu_artifact <= 0) { + // we didn't find a lower artifact to goto, so we find the highest + for (var i = array_length(obj_ini.artifact) - 1; i >= 0; i--) { + if (obj_ini.artifact[i] != "") { + menu_artifact = i; + break; } } - } else { - artifact_destroy.draw_shutter(xx + 765, yy + 740, "DESTROY", 0.3, false); - artifact_equip.draw_shutter(xx + 385, yy + 740, "EQUIP", 0.3, false); - artifact_gift.draw_shutter(xx + 575, yy + 740, "GIFT", 0.3, false); } - draw_set_halign(fa_center); - draw_set_font(fnt_40k_14); - draw_set_color(c_gray); - draw_text_ext(xx + 622, yy + 510, string_hash_to_newline(string(artif_descr)), -1, 436); - draw_set_font(fnt_40k_14b); - draw_set_color(c_gray); - var spack = string_height_ext(string_hash_to_newline(string(artif_descr)), -1, 436); - draw_text_ext(xx + 622, yy + 514 + spack, string_hash_to_newline(tip2), -1, 436); + } + if (arrow_hovered) { + tooltip_draw("Click here or use mouse wheel to scroll the artifact list."); + } - // identifiable=0; + arrow_hovered = false; + scroll_engaged = false; + arrow = [xx+790,yy+437,xx+832,yy+461]; + if (scr_hit(arrow[0],arrow[1],arrow[2],arrow[3])) { + arrow_hovered = true; + if (scr_click_left()){ + scroll_engaged = true; + } + } + if (mouse_wheel_up()){ + scroll_engaged = true; + } + + if (scroll_engaged) { + artifact_namer.allow_input=false; + identifiable=0; + artifact_equip = new ShutterButton(); + artifact_gift = new ShutterButton(); + artifact_destroy = new ShutterButton(); + var max_index = array_length(obj_ini.artifact) - 1; + var done = false; + while (menu_artifact < max_index) { + menu_artifact++; + if (obj_ini.artifact[menu_artifact] != "") { + done = true; + break; + } + } + if (!done and menu_artifact >= max_index) { + // we didn't find a higher artifact to goto, so we find the lowest + for (var i = 0, ilen = array_length(obj_ini.artifact); i < ilen; i++) { + if (obj_ini.artifact[i] != "") { + menu_artifact = i; + break; + } + } + } + } + if (arrow_hovered) { + tooltip_draw("Click on this arrow or use mouse wheel to scroll the artifact list."); } - }else if (artifacts == 0){ - draw_text(xx + 622, yy + 440, "[No Artifacts]") - artifact_destroy.draw_shutter(xx + 765, yy + 740, "DESTROY", 0.3, false); - artifact_equip.draw_shutter(xx + 385, yy + 740, "EQUIP", 0.3, false); - artifact_gift.draw_shutter(xx + 575, yy + 740, "GIFT", 0.3, false); } - draw_set_color(881503); - draw_set_halign(fa_center); + var artifact_name = obj_ini.artifact_struct[menu_artifact].name; + if (artifact_name == "") then artifact_name = obj_ini.artifact[menu_artifact]; + obj_ini.artifact_struct[menu_artifact].name = artifact_namer.draw(artifact_name); + draw_sprite(spr_arrow, 0, xx + 403, yy + 433); + draw_sprite(spr_arrow, 1, xx + 795, yy + 433); if (instance_exists(obj_p_fleet)) { with(obj_p_fleet) { + var _cur_arti = obj_ini.artifact_struct[obj_controller.menu_artifact]; var good = 0; - if (obj_controller.artifacts>0){ - for (var i = 1; i <= 20; i++) { - if (i <= 9 && i= 0){ - managing = selection_data.system; - update_general_manage_view(); + if (selection_data.purpose_code == "artifact_equip"){ + scr_toggle_lib(); + obj_controller.menu_artifact = selection_data.artifact; + equip_artifact_popup_setup(); + exit; + } + + if (struct_exists(selection_data, "target_company")){ + if (is_real(selection_data.target_company) && selection_data.target_company <= 10 && selection_data.target_company >= 0){ + managing = selection_data.target_company; + update_general_manage_view(); + exit; + } } else { exit_adhoc_manage(); exit; @@ -32,20 +42,7 @@ function task_selector_squad_manage(){ var _squad = obj_ini.squads[company_data.selected_squads[i]]; switch(selection_data.purpose_code){ case "protect_raiders": - instance_create(0,0,obj_ncombat); - obj_ncombat.enemy=eFACTION.Eldar; - obj_ncombat.battle_object = selection_data.system; - obj_ncombat.battle_loc = selection_data.system.name; - obj_ncombat.battle_id = selection_data.planet; - obj_ncombat.battle_special = "protect_raiders"; - _roster = new Roster(); - with (_roster){ - selected_units=_squad.get_squad_structs(); - setup_battle_formations(); - add_to_battle(); - } - exit_adhoc_manage(); - delete _roster; + init_protect_raider_mission(_squad); break; } } @@ -54,189 +51,158 @@ function task_selector_squad_manage(){ function task_selector_man_manage(){ man_count = array_sum(man_sel); selections = []; - var unit; + var _unit; for (var i=0; i 75 && _trainer.intelligence > 45){ - _mission_string += $"{_trainer.name()} has proven themselves a great strategist when it comes to defensive structures beyond previousy known "; - var _start_stats = variable_clone(_trainer.get_stat_line()); - _trainer.add_trait("siege_master"); - var end_stat = _trainer.get_stat_line(); - var _stat_diff = compare_stats(end_stat,_start_stats); - _unit_report_string += $"{_trainer.name_role()} Has gained the trait {global.trait_list.siege_master.display_name}, {(print_stat_diffs(_stat_diff))}\n"; - _mission_string += "The new insights have allowed for minor improvements to planetary fortifications (fortification +1)"; - planet.alter_fortification(1); - } - } + } else { + if (roll_dice(1, 100) > 75 && _trainer.intelligence > 45){ + _mission_string += $"{_trainer.name()} has proven themselves a great strategist when it comes to defensive structures beyond previousy known "; + var _start_stats = variable_clone(_trainer.get_stat_line()); + _trainer.add_trait("siege_master"); + var end_stat = _trainer.get_stat_line(); + var _stat_diff = compare_stats(end_stat,_start_stats); + _unit_report_string += $"{_trainer.name_role()} Has gained the trait {global.trait_list.siege_master.display_name}, {(print_stat_diffs(_stat_diff))}\n"; + _mission_string += "The new insights have allowed for minor improvements to planetary fortifications (fortification +1)"; + planet.alter_fortification(1); + } + } } else { disp_loss = -5; _mission_string += "The orgional training mission was a failiure" diff --git a/scripts/scr_pen_And_paper/scr_pen_And_paper.gml b/scripts/scr_pen_And_paper/scr_pen_And_paper.gml index d205ca01f1..6e13099205 100644 --- a/scripts/scr_pen_And_paper/scr_pen_And_paper.gml +++ b/scripts/scr_pen_And_paper/scr_pen_And_paper.gml @@ -75,6 +75,19 @@ function PenAndPaperSim() constructor{ if (unit.has_trait("harsh_born")){ total_mod+=3; } + } else if (tag=="ambush"){ + if (scr_has_adv("Ambushers")){ + total_mod+=10; + } + if (unit.has_trait("harsh_born")){ + total_mod+=3; + } + if (unit.has_trait("cunning")){ + total_mod+=6; + } + if (unit.has_trait("brute")){ + total_mod-=6; + } } } return total_mod; @@ -207,3 +220,14 @@ function roll_dice_unit(dices = 1, faces = 6, player_benefit_at, unit) { return _total_roll; } + +function stat_average(units, stat){ + var _tally = 0; + for (var i=0;i=min_exp){ + if (is_struct(unit_armour)) { + if (req_armour == STR_ANY_POWER_ARMOUR) { + if (array_contains(LIST_BASIC_POWER_ARMOUR, unit_armour.name)) { + have_armour_num += 1; + } + } + if (req_armour == STR_ANY_TERMINATOR_ARMOUR) { + if (array_contains(LIST_TERMINATOR_ARMOUR, unit_armour.name)) { + have_armour_num += 1; + } + } + } + + if (obj_controller.ma_wep1[i]=req_wep1) or (obj_controller.ma_wep2[i]=req_wep1) then have_wep1_num+=1; + if (obj_controller.ma_wep2[i]=req_wep2) or (obj_controller.ma_wep1[i]=req_wep2) then have_wep2_num+=1; + + + if (obj_controller.ma_gear[i]=req_gear) then have_gear_num+=1; + if (obj_controller.ma_mobi[i]=req_mobi) then have_mobi_num+=1; + + if (req_wep1=="Heavy Ranged" && is_struct(unit_wep_one)){ + if (unit_wep_one.has_tag("heavy_ranged")) then have_wep1_num+=1; + } + } + + // if (n_wep1=n_wep2) and ((o_wep1!=n_wep1) or (o_wep2!=n_wep2)){have_wep1_num-=1;have_wep2_num-=1;} + + }// End Repeat + + // This checks to see if there is any more in the armoury + if (req_armour==STR_ANY_POWER_ARMOUR){ + var _armour_list = LIST_BASIC_POWER_ARMOUR; + for (i=0;i=req_armour_num) or (req_armour="")) and ((have_wep1_num>=req_wep1_num) or (req_wep1="")) and ((have_wep2_num>=req_wep2_num) or (req_wep2="")) then all_good=0.4; + if (req_gear="") or (req_gear_num<=have_gear_num) then all_good+=0.3; + if (req_mobi="") or (req_mobi_num<=have_mobi_num) then all_good+=0.3; + return floor(all_good); + +} + + + +function default_popup_image_index(){ + var _img = -1; + if (image == "") { + _img = -1; + } + else if (image == "orks") { + _img = 0; + } + else if (image == "tau") { + _img = 1; + } + else if (image == "chaos") { + _img = 2; + } + else if (image == "shadow") { + _img = 3; + } + else if (image == "distinguished") { + _img = 4; + } + else if (image == "tech_build") { + _img = 5; + } + else if (image == "sororitas") { + _img = 6; + } + else if (image == "angry") { + _img = 7; + } + else if (image == "gene_bad") { + _img = 8; + } + else if (image == "lost_warp") { + _img = 10; + } + else if (image == "Warp") { + _img = 11; + } + else if (image == "crusade") { + _img = 12; + } + else if (image == "fuklaw") { + _img = 13; + } + if ((image == "artifact") || (image == "artifact2")) { + _img = 14; + } + else if (image == "artifact_recovered") { + _img = 15; + } + else if (image == "artifact_given") { + _img = 15; + } + else if (image == "waaagh") { + _img = 16; + } + else if (image == "shipyard") { + _img = 17; + } + else if (image == "inquisition") { + _img = 18; + } + else if (image == "succession") { + _img = 19; + } + else if (image == "rogue_trader") { + _img = 20; + } + else if (image == "necron_tomb") { + _img = 21; + } + else if (image == "webber") { + _img = 22; + } + else if (image == "spyrer") { + _img = 23; + } + else if (image == "fortress") { + _img = 24; + } + else if (image == "fortress_hive") { + _img = 25; + } + else if (image == "fortress_death") { + _img = 26; + } + else if (image == "fortress_ice") { + _img = 27; + } + else if (image == "fortress_lava") { + _img = 28; + } + else if (image == "fortress_dorf") { + _img = 29; + } + else if (image == "exploding_ship") { + _img = 30; + } + else if (image == "necron_cave") { + _img = 31; + } + else if (image == "exterminatus_new") { + _img = 32; + } + else if (image == "necron_tunnels_1") { + _img = 33; + } + else if (image == "necron_tunnels_2") { + _img = 34; + } + else if (image == "necron_tunnels_3") { + _img = 35; + } + else if (image == "necron_army") { + _img = 36; + } + else if (image == "harlequin") { + _img = 37; + } + else if (image == "black_rage") { + _img = 39; + } + else if (image == "exterminatus") { + _img = 40; + } + else if (image == "stc") { + _img = 41; + } + else if (image == "thallax") { + _img = 42; + } + else if (image == "space_hulk_done") { + _img = 44; + } + else if (image == "ancient_ruins") { + _img = 45; + } + else if (image == "geneseed_lab") { + _img = 47; + } + else if (image == "ruins_bunker") { + _img = 48; + } + else if (image == "ruins_fort") { + _img = 49; + } + else if (image == "ruins_ship") { + _img = 50; + } + else if (image == "fallen") { + _img = 51; + } + else if (image == "debug_banshee") { + _img = 52; + } + else if (image == "mechanicus") { + _img = 53; + } + else if (image == "chaos_cultist") { + _img = 54; + } + else if (image == "chaos_symbol") { + _img = 55; + } + else if (image == "chaos_messenger") { + _img = 56; + } + else if (image == "event_feast") { + _img = 57; + } + else if (image == "event_tournament") { + _img = 58; + } + else if (image == "event_deathmatch") { + _img = 59; + } + else if (image == "event_mass") { + _img = 60; + } + else if (image == "event_ccult") { + _img = 61; + } + else if (image == "event_crelic") { + _img = 62; + } + else if (image == "event_march") { + _img = 63; + } + + return _img; } \ No newline at end of file diff --git a/scripts/scr_promote/scr_promote.gml b/scripts/scr_promote/scr_promote.gml new file mode 100644 index 0000000000..8be40d5598 --- /dev/null +++ b/scripts/scr_promote/scr_promote.gml @@ -0,0 +1,340 @@ + +function setup_promotion_popup(){ + if ((sel_promoting == 1) && (instance_number(obj_popup) == 0)) { + var pip = instance_create(0, 0, obj_popup); + pip.type = 5; + pip.company = managing; + + var god = 0, nuuum = 0; + for (var f = 0; f < array_length(display_unit); f++) { + if ((ma_promote[f] >= 1 || is_specialist(ma_role[f], SPECIALISTS_RANK_AND_FILE) || is_specialist(ma_role[f], SPECIALISTS_SQUAD_LEADERS)) && man_sel[f] == 1) { + nuuum += 1; + if (pip.min_exp == 0) { + pip.min_exp = ma_exp[f]; + } + pip.min_exp = min(ma_exp[f], pip.min_exp); + } + if ((god == 0) && (ma_promote[f] >= 1) && (man_sel[f] == 1)) { + god = 1; + pip.unit_role = ma_role[f]; + } + } + if (nuuum > 1) { + pip.unit_role = "Marines"; + } + with (pip){ + units = nuuum; + promote_button = new UnitButtonObject( + { + x1: 1450, + y1: 491, + style : "pixel", + label : "Promote" + } + ); + promote_button.bind_method = function(){ + + var mahreens=0,i=-1; + + if (target_comp>10){ + target_comp=0; + } + + for(i=0;i<498;i++){ + if (obj_ini.name[target_comp][i]=="" and obj_ini.name[target_comp][i+1]=="") { + mahreens=i; + break; + } + } + // Gets the number of marines in the target company + var unit, squad_mover,moveable; + var role_squad_equivilances = {};//this is the only way to set variables as keys in gml + variable_struct_set(role_squad_equivilances,obj_ini.role[100][8],"tactical_squad"); + variable_struct_set(role_squad_equivilances,obj_ini.role[100][9],"devastator_squad"); + variable_struct_set(role_squad_equivilances,obj_ini.role[100][10],"assault_squad"); + variable_struct_set(role_squad_equivilances,obj_ini.role[100][12],"scout_squad"); + variable_struct_set(role_squad_equivilances,obj_ini.role[100][3],"sternguard_veteran_squad"); + variable_struct_set(role_squad_equivilances,obj_ini.role[100][4],"terminator_squad"); + + for(i=0;i=min_exp){ + moveable=true; + unit = obj_controller.display_unit[i]; + if (unit.squad != "none"){ // this evaluates if you are trying promote a whole squad + var move_squad = unit.squad; + squad = obj_ini.squads[move_squad]; + squad.update_fulfilment(); + move_members = squad.members; + if (array_length(move_members)==1){ + unit.squad = "none"; + moveable = false; + } + for (var mem = 0;mem10) then manag=0; + var company=manag; + draw_set_color(0); + main_slate.draw_with_dimensions(); + + draw_set_font(fnt_40k_14b); + draw_set_halign(fa_center); + draw_set_color(CM_GREEN_COLOR); + draw_text(1292, 150, "Promoting"); + var romanNumerals = scr_roman_numerals(); + + draw_set_font(fnt_40k_12); + var comp = ""; + if (company <= 10 && company > 0) { + comp = romanNumerals[company - 1]; + } else if (company > 10) { + comp = "HQ"; + } + draw_text(1292, 175, $"{comp} Company {unit_role}"); + + companies_select.draw(); + if (companies_select.changed){ + target_comp = companies_select.selection_val("val"); + target_role = 0; + get_unit_promotion_options(); + } + // } + draw_set_halign(fa_left); + draw_text(1020, 290, "Target Role:"); //choose new role + var role_x = 0; + role_y = 0; + if (target_comp != -1) { + + for (var r = 1; r <= 11; r++) { + if (role_name[r] != "") { + draw_set_alpha(1); + check = " "; + if (target_role == r) { + check = "x"; + } + if (min_exp < role_exp[r]) { + draw_set_alpha(0.25); + } + draw_text(1030 + role_x, 310 + role_y, $"{role_name[r]} [{check}]"); + if (point_and_click([1030 + role_x, 310 + role_y, 1180 + role_x, 330 + role_y])) { + if (min_exp >= role_exp[r]) { + target_role = r; + all_good = calculate_equipment_needs(); + } + } + if (r % 3 == 0) { + role_y += 20; + role_x = 0; + } else { + role_x += 170; + } + } + } + } + + draw_set_alpha(1); + + draw_text(1020, 370, string_hash_to_newline("Required Gear:")); + var gr = 0, tox = ""; + + if (target_role > 0) { + if (req_armour != "") { + gr = req_armour_num - have_armour_num; + tox = ""; + if (gr > 0) { + draw_set_color(c_red); + } else { + draw_set_color(CM_GREEN_COLOR); + } + draw_text(1030, 390, $"{req_armour_num} {req_armour} (Have {have_armour_num})"); + } + if (req_gear != "") { + gr = req_gear_num - have_gear_num; + tox = ""; + if (gr > 0) { + draw_set_color(c_red); + } else { + draw_set_color(CM_GREEN_COLOR); + } + draw_text(1030, 410, $"{req_gear_num} {req_gear} (Have {have_gear_num})"); + } + if (req_mobi != "") { + gr = req_mobi_num - have_mobi_num; + tox = ""; + if (gr > 0) { + draw_set_color(c_red); + } else { + draw_set_color(CM_GREEN_COLOR); + } + draw_text(1030, 430, $"{req_mobi_num} {req_mobi} (Have {have_mobi_num})"); + } + if (req_wep1 != "") { + gr = req_wep1_num - have_wep1_num; + tox = ""; + if (gr > 0) { + draw_set_color(c_red); + } else { + draw_set_color(CM_GREEN_COLOR); + } + draw_text(1280, 390, $"{req_wep1_num} {req_wep1} (Have {have_wep1_num})"); + } + if (req_wep2 != "") { + gr = req_wep2_num - have_wep2_num; + tox = ""; + if (gr > 0) { + draw_set_color(c_red); + } else { + draw_set_color(CM_GREEN_COLOR); + } + draw_text(1280, 410, $"{req_wep2_num} {req_wep2} (Have {have_wep2_num})"); + } + } + + if(cancel_button.draw()){ + instance_destroy(); + } + + promote_button.draw(all_good); + pop_draw_return_values(); +} \ No newline at end of file diff --git a/scripts/scr_promote/scr_promote.yy b/scripts/scr_promote/scr_promote.yy new file mode 100644 index 0000000000..750fbf68fb --- /dev/null +++ b/scripts/scr_promote/scr_promote.yy @@ -0,0 +1,13 @@ +{ + "$GMScript":"v1", + "%Name":"scr_promote", + "isCompatibility":false, + "isDnD":false, + "name":"scr_promote", + "parent":{ + "name":"Scripts", + "path":"folders/Scripts.yy", + }, + "resourceType":"GMScript", + "resourceVersion":"2.0", +} \ No newline at end of file diff --git a/scripts/scr_reequip_units/scr_reequip_units.gml b/scripts/scr_reequip_units/scr_reequip_units.gml new file mode 100644 index 0000000000..9a653a7c3e --- /dev/null +++ b/scripts/scr_reequip_units/scr_reequip_units.gml @@ -0,0 +1,807 @@ +function set_up_equip_popup(){ + if (instance_number(obj_popup)==0){ + var f=0,god=0,nuuum=0; + var o_wep1="",o_wep2="",o_armour="",o_gear="",o_mobi=""; + var b_wep1=0,b_wep2=0,b_armour=0,b_gear=0,b_mobi=0; + var vih=0, _unit; + var company = managing<=10 ? managing :10; + var prev_role; + var allow = true; + + // Need to make sure that group selected is all the same type + for (var f=0; f=50){ + if (man[f]=="man"){ + allow=false; + break; + } else if(man[f]=="vehicle"){ + if (prev_role != ma_role[f]){ + allow=false; + break; + } + } + } + } + + if (vih>0){ + nuuum+=1; + if (o_wep1=="") and (ma_wep1[f]!="") then o_wep1=ma_wep1[f]; + if (o_wep2=="") and (ma_wep2[f]!="") then o_wep2=ma_wep2[f]; + if (o_armour=="") and (ma_armour[f]!="") then o_armour=ma_armour[f]; + if (o_gear=="") and (ma_gear[f]!="") then o_gear=ma_gear[f]; + if (o_mobi=="") and (ma_mobi[f]!="") then o_mobi=ma_mobi[f]; + + if (ma_wep1[f]=="") then b_wep1+=1; + if (ma_wep2[f]=="") then b_wep2+=1; + if (ma_armour[f]=="") then b_armour+=1; + if (ma_gear[f]=="") then b_gear+=1; + if (ma_mobi[f]=="") then b_mobi+=1; + + if ((o_wep1!="") and (ma_wep1[f]!=o_wep1)) or (b_wep1==1) then o_wep1="Assortment"; + if ((o_wep2!="") and (ma_wep2[f]!=o_wep2)) or (b_wep2==1) then o_wep2="Assortment"; + if ((o_armour!="") and (ma_armour[f]!=o_armour)) or (b_armour==1) then o_armour="Assortment"; + if ((o_gear!="") and (ma_gear[f]!=o_gear)) or (b_gear==1) then o_gear="Assortment"; + if ((o_mobi!="") and (ma_mobi[f]!=o_mobi)) or (b_mobi==1) then o_mobi="Assortment"; + } + } + + if (b_wep1==nuuum) then o_wep1=""; + if (b_wep2==nuuum) then o_wep2=""; + if (b_armour==nuuum) then o_armour=""; + if (b_gear==nuuum) then o_gear=""; + if (b_mobi==nuuum) then o_mobi=""; + + if (vih>0 && man_size>0 && allow){ + + var pip=instance_create(0,0,obj_popup); + pip.type=6; + pip.o_wep1=o_wep1; + pip.o_wep2=o_wep2; + pip.o_armour=o_armour; + pip.o_gear=o_gear; + pip.n_wep1=o_wep1; + pip.n_wep2=o_wep2; + pip.n_armour=o_armour; + pip.n_gear=o_gear; + pip.o_mobi=o_mobi; + pip.n_mobi=o_mobi; + pip.company=managing; + pip.units=nuuum; + + //Forwards vih selection to the vehicle_equipment variable used in mouse_50 obj_popup and weapons_equip script + pip.vehicle_equipment=vih; + with (pip){ + equipmet_area = -1; + cancel_button = new UnitButtonObject( + { + x1: 1061, + y1: 491, + style : "pixel", + label : "Cancel" + } + ); + equip_button = new UnitButtonObject( + { + x1: 1450, + y1: 491, + style : "pixel", + label : "Equip" + } + ); + + main_slate = new DataSlate({ + style : "decorated", + XX : 1006, + YY : 143, + set_width : true, + width : 571, + height : 350, + }); + + var _quality_options = [ + { + str1 : "Standard", + font : fnt_40k_14b, + val : 0 + }, + { + str1 : "Master Crafted", + font : fnt_40k_14b, + val : 1 + }, + { + str1 : "Artificer", + font : fnt_40k_14b, + val : 2 + } + ]; + quality_radio = new radio_set(_quality_options, "", {max_width : 500, x1:1040, y1:308}); + + range_melee_radio = new radio_set([ + { + str1 : "Ranged", + font : fnt_40k_14b, + val : eENGAGEMENT.Ranged + }, + { + str1 : "Melee", + font : fnt_40k_14b, + val : eENGAGEMENT.Melee + } + ], "", {max_width : 500, x1:1040, y1:328}); + + weapon1_select = new UnitButtonObject( + { + x1: 1300, + y1: 215, + label : "", + font : fnt_40k_12, + } + ); + weapon2_select = new UnitButtonObject( + { + x1: 1300, + y1: 235, + label : "", + font : fnt_40k_12, + } + ); + armour_select= new UnitButtonObject( + { + x1: 1300, + y1: 255, + label : "", + font : fnt_40k_12, + } + ); + gear_select = new UnitButtonObject( + { + x1: 1300, + y1: 275, + label : "", + font : fnt_40k_12, + } + ); + mobility_select = new UnitButtonObject( + { + x1: 1300, + y1: 295, + label : "", + font : fnt_40k_12, + } + ); + + } + } + } +} + + +function reload_items(){ + item_name = []; + scr_get_item_names( + item_name, + vehicle_equipment, // eROLE + equipmet_area, // slot + range_melee_radio.selection_val("val"), + false, // include company standard + true, // limit to available equipment + quality_radio.selection_val("val"), + ); +} +function draw_popup_equip(){ + + main_slate.draw_with_dimensions(); + draw_set_color(CM_GREEN_COLOR); + draw_text(1302, 150, "Change Equipment"); + + draw_set_font(fnt_40k_12); + var comp = ""; + if (company <= 10 && company > 0) { + comp = int_to_roman(company); + } else if (company > 10) { + comp = "HQ"; + } + + if (vehicle_equipment < 6) { + draw_text(1292, 175, $"{comp} Company, {units} Marines"); + }else if (vehicle_equipment == 6) { + draw_text(1292, 175, $"{comp} Company, {units} Dreadnoughts"); + } + else { + draw_text(1292, 175, $"{comp} Company, {units} Vehicles"); + } + + draw_set_halign(fa_left); + draw_set_color(CM_GREEN_COLOR); + + var show_name = ""; + // Need to not show the artifact tags here somehow + + draw_text(1010, 195, "Before"); + draw_text(1010.5, 195.5, "Before"); + + show_name = o_wep1; + if (a_wep1 != "") { + show_name = a_wep1; + } + if (o_wep1 != "") { + draw_text(1014, 215, string_hash_to_newline(show_name)); + } else { + draw_text(1014, 215, ITEM_NAME_NONE); + } + + show_name = o_wep2; + if (a_wep2 != "") { + show_name = a_wep2; + } + if (o_wep2 != "") { + draw_text(1014, 235, string_hash_to_newline(string(show_name))); + } else { + draw_text(1014, 235, ITEM_NAME_NONE); + } + + show_name = o_armour; + if (a_armour != "") { + show_name = a_armour; + } + if (o_armour != "") { + draw_text(1014, 255, string_hash_to_newline(string(show_name))); + } else { + draw_text(1014, 255, ITEM_NAME_NONE); + } + + show_name = o_gear; + if (a_gear != "") { + show_name = a_gear; + } + if (o_gear != "") { + draw_text(1014, 275, string_hash_to_newline(string(show_name))); + } else { + draw_text(1014, 275, ITEM_NAME_NONE); + } + + show_name = o_mobi; + if (a_mobi != "") { + show_name = a_mobi; + } + if (o_mobi != "") { + draw_text(1014, 295, string_hash_to_newline(string(show_name))); + } else { + draw_text(1014, 295, ITEM_NAME_NONE); + } + + draw_text(1296, 195, string_hash_to_newline("After")); + draw_text(1296.5, 195.5, "After"); + + show_name = n_wep1; + if ((a_wep1 != "") && (n_wep1 == o_wep1)) { + show_name = a_wep1; + } + + weapon1_select.update({ + label : show_name != "" ? show_name : ITEM_NAME_NONE, + color : n_good1 == 0 ? CM_RED_COLOR : CM_GREEN_COLOR, + }) + + + show_name = n_wep2; + if ((a_wep2 != "") && (n_wep2 == o_wep2)) { + show_name = a_wep2; + } + + weapon2_select.update({ + label : show_name != "" ? show_name : ITEM_NAME_NONE, + color : n_good2 == 0 ? CM_RED_COLOR : CM_GREEN_COLOR, + }) + + + show_name = n_armour; + if ((a_armour != "") && (n_armour == o_armour)) { + show_name = a_armour; + } + + armour_select.update({ + label : show_name != "" ? show_name : ITEM_NAME_NONE, + color : n_good3 == 0 ? CM_RED_COLOR : CM_GREEN_COLOR, + }); + + + + show_name = n_gear; + if ((a_gear != "") && (n_gear == o_gear)) { + show_name = a_gear; + } + gear_select.update({ + label : show_name != "" ? show_name : ITEM_NAME_NONE, + color : n_good4 == 0 ? CM_RED_COLOR : CM_GREEN_COLOR, + }); + + show_name = n_mobi; + if ((a_mobi != "") && (n_mobi == o_mobi)) { + show_name = a_mobi; + } + + mobility_select.update({ + label : show_name != "" ? show_name : ITEM_NAME_NONE, + color : n_good5 == 0 ? CM_RED_COLOR : CM_GREEN_COLOR, + }); + + + draw_set_color(CM_GREEN_COLOR); + var _buttons = [weapon1_select, weapon2_select,armour_select, gear_select, mobility_select]; + + var _area_change = false; + for (var i = 0; i <= 4; i++) { + var _button = _buttons[i]; + if (_button.draw(equipmet_area != i)){ + equipmet_area = i; + _area_change = true; + } + if (equipmet_area == i) { + draw_text(1292, 195 + (20 * (i+1)), "->"); + } + } + + draw_set_alpha(1); + + if (equipmet_area != -1) { + var check = " "; + var mct = master_crafted == 1 ? 0.7 : 1; + var column = 0; + var row = 0; + var item_string; + var box = []; + var box_x; + var box_y; + var top = -1; + + var selected_item_name = [n_wep1, n_wep2, n_armour, n_gear, n_mobi]; + selected_item_name = selected_item_name[equipmet_area]; + + for (var o = 0; o < array_length(item_name); o++) { + box_x = 1016 + (row * 154); + box_y = 355 + (column * 20); + box = [box_x, box_y, box_x + 144, box_y + 20]; + check = selected_item_name == item_name[o] ? "x" : " "; + item_string = $"[{check}] {item_name[o]}"; + draw_text_transformed(box_x, box_y, item_string, mct, 1, 0); + + if (point_and_click(box)) { + top = o; + } + column++; + if (column > 6) { + column = 0; + row++; + } + } + + if (top != -1) { + warning = ""; + switch (equipmet_area) { + case 0: + n_wep1 = item_name[top]; + sel1 = top; + break; + case 1: + n_wep2 = item_name[top]; + sel2 = top; + break; + case 2: + n_armour = item_name[top]; + sel3 = top; + break; + case 3: + n_gear = item_name[top]; + sel4 = top; + break; + case 4: + n_mobi = item_name[top]; + sel5 = top; + break; + } + } + + if (equipmet_area == EquipmentSlot.WEAPON_ONE && (n_wep1 == ITEM_NAME_NONE || n_wep1 == "")) { + n_good1 = 1; + } + if (equipmet_area == EquipmentSlot.WEAPON_TWO && (n_wep2 == ITEM_NAME_NONE || n_wep2 == "")) { + n_good2 = 1; + } + if (equipmet_area == EquipmentSlot.ARMOUR && (n_armour == ITEM_NAME_NONE || n_armour == "")) { + n_good3 = 1; + } + if (equipmet_area == EquipmentSlot.GEAR && (n_gear == ITEM_NAME_NONE || n_gear == "")) { + n_good4 = 1; + } + if (equipmet_area == EquipmentSlot.MOBILITY && (n_mobi == ITEM_NAME_NONE || n_mobi == "")) { + n_good5 = 1; + } + + var weapon_one_data = gear_weapon_data("weapon", n_wep1); + var weapon_two_data = gear_weapon_data("weapon", n_wep2); + var armour_data = gear_weapon_data("armour", n_armour); + + if ((equipmet_area == EquipmentSlot.WEAPON_ONE) && is_struct(weapon_one_data)) { + // Check numbers + req_wep1_num = units; + have_wep1_num = 0; + var i = -1; + repeat (array_length(obj_controller.display_unit)) { + i += 1; + if ((vehicle_equipment != -1) && (obj_controller.ma_wep1[i] == n_wep1)) { + have_wep1_num += 1; + } + } + have_wep1_num += scr_item_count(n_wep1); + if (have_wep1_num >= req_wep1_num || n_wep1 == ITEM_NAME_NONE) { + n_good1 = 1; + } + if (have_wep1_num < req_wep1_num && (n_wep1 != ITEM_NAME_ANY && n_wep1 != ITEM_NAME_NONE)) { + n_good1 = 0; + warning = "Not enough " + string(n_wep1) + "; " + string(req_wep1_num - have_wep1_num) + " more are required."; + } + + //TODO wrap this up in a function + if (weapon_one_data.req_exp > 0) { + var g = -1, exp_check = 0; + for (var g = 0; g < array_length(obj_controller.display_unit); g++) { + if (obj_controller.man_sel[g] == 1 && is_struct(obj_controller.display_unit[g])) { + if (obj_controller.display_unit[g].experience < weapon_one_data.req_exp) { + exp_check = 1; + n_good1 = 0; + warning = $"A unit must have {weapon_one_data.req_exp}+ EXP to use a {weapon_one_data.name}."; + break; + } + } + } + } + if (is_struct(armour_data)) { + if (((!array_contains(armour_data.tags, "terminator")) && (!array_contains(armour_data.tags, "dreadnought"))) && (n_wep1 == "Assault Cannon")) { + n_good1 = 0; + warning = "Cannot use Assault Cannons without Terminator/Dreadnought Armour."; + } + if ((!array_contains(armour_data.tags, "dreadnought")) && (n_wep1 == "Close Combat Weapon")) { + n_good1 = 0; + warning = "Only " + string(obj_ini.role[100][6]) + " can use Close Combat Weapons."; + } + } + } + if ((equipmet_area == EquipmentSlot.WEAPON_TWO) && is_struct(weapon_two_data)) { + // Check numbers + req_wep2_num = units; + have_wep2_num = 0; + var i = -1; + repeat (array_length(obj_controller.display_unit)) { + i += 1; + if ((vehicle_equipment != -1) && (obj_controller.ma_wep2[i] == n_wep2)) { + have_wep2_num += 1; + } + } + // req_wep2_num+=scr_item_count(n_wep2); + have_wep2_num += scr_item_count(n_wep2); + // req_wep2_num=units; + + if (have_wep2_num >= req_wep2_num || n_wep2 == ITEM_NAME_NONE) { + n_good2 = 1; + } + if (have_wep2_num < req_wep2_num && (n_wep2 != ITEM_NAME_ANY && n_wep2 != ITEM_NAME_NONE)) { + n_good2 = 0; + warning = $"Not enough {n_wep2}; {req_wep2_num - have_wep2_num} more are required."; + } + //TODO standardise exp check + if (weapon_two_data.req_exp > 0) { + var g, exp_check; + g = -1; + exp_check = 0; + for (var g = 0; g < array_length(obj_controller.display_unit); g++) { + if (obj_controller.man_sel[g] == 1 && is_struct(obj_controller.display_unit[g])) { + if (obj_controller.display_unit[g].experience < weapon_two_data.req_exp) { + exp_check = 1; + n_good2 = 0; + warning = $"A unit must have {weapon_two_data.req_exp}+ EXP to use a {weapon_two_data.name}."; + break; + } + } + } + } + if (is_struct(armour_data)) { + if (((!array_contains(armour_data.tags, "terminator")) && (!array_contains(armour_data.tags, "dreadnought"))) && (n_wep2 == "Assault Cannon")) { + n_good2 = 0; + warning = "Cannot use Assault Cannons without Terminator/Dreadnought Armour."; + } + if ((!array_contains(armour_data.tags, "dreadnought")) && (n_wep2 == "Close Combat Weapon")) { + n_good2 = 0; + warning = "Only " + string(obj_ini.role[100][6]) + " can use Close Combat Weapons."; + } + if (((string_count("Terminator", n_armour) > 0) || (string_count("Tartaros", n_armour) > 0) || (string_count("Dreadnought", n_armour) > 0)) && (n_mobi != "")) { + n_good2 = 0; + } + if (((string_count("Terminator", o_armour) > 0) || (string_count("Tartaros", o_armour) > 0) || (string_count("Dreadnought", o_armour) > 0)) && (n_mobi != "")) { + n_good2 = 0; + } + } + } + if ((equipmet_area == EquipmentSlot.ARMOUR) && is_struct(armour_data)) { + // Check numbers + req_armour_num = units; + have_armour_num = 0; + var i; + i = -1; + repeat (array_length(obj_controller.display_unit)) { + i += 1; + if ((vehicle_equipment != -1) && (obj_controller.man_sel[i] == 1) && (obj_controller.ma_armour[i] == n_armour)) { + have_armour_num += 1; + } + } + have_armour_num += scr_item_count(n_armour); + + if (have_armour_num >= req_armour_num || n_armour == ITEM_NAME_NONE) { + n_good3 = 1; + } + if (have_armour_num < req_armour_num && (n_armour != ITEM_NAME_ANY && n_armour != ITEM_NAME_NONE)) { + n_good3 = 0; + warning = $"Not enough {n_armour} : {units - have_armour_num} more are required."; + } + + var g = -1, exp_check = 0; + if (armour_data.has_tag("terminator")) { + if (armour_data.req_exp > 0) { + var g, exp_check; + g = -1; + exp_check = 0; + for (var g = 0; g < array_length(obj_controller.display_unit); g++) { + if (obj_controller.man_sel[g] == 1 && is_struct(obj_controller.display_unit[g])) { + if (obj_controller.display_unit[g].experience < armour_data.req_exp) { + exp_check = 1; + n_good3 = 0; + warning = $"A unit must have {armour_data.req_exp}+ EXP to use a {armour_data.name}."; + break; + } + } + } + } + } + + if ((string_count("Dread", o_armour) > 0) && (string_count("Dread", n_armour) == 0)) { + n_good4 = 0; + warning = "Marines may not exit Dreadnoughts."; + } + } + if ((equipmet_area == EquipmentSlot.GEAR) && (n_gear != "Assortment") && (n_gear != ITEM_NAME_NONE)) { + // Check numbers + req_gear_num = units; + have_gear_num = 0; + var i; + i = -1; + repeat (array_length(obj_controller.display_unit)) { + i += 1; + if ((vehicle_equipment != -1) && (obj_controller.man_sel[i] == 1) && (obj_controller.ma_gear[i] == n_gear)) { + have_gear_num += 1; + } + } + have_gear_num += scr_item_count(n_gear); + + if (have_gear_num >= req_gear_num || n_gear == ITEM_NAME_NONE) { + n_good4 = 1; + } + if (have_gear_num < req_gear_num && (n_gear != ITEM_NAME_ANY && n_gear != ITEM_NAME_NONE)) { + n_good4 = 0; + 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)) { + n_good4 = 0; + warning = "Dreadnoughts may not use infantry equipment."; + } + } + if ((equipmet_area == EquipmentSlot.MOBILITY) && (n_mobi != "Assortment") && (n_mobi != ITEM_NAME_NONE)) { + // Check numbers + req_mobi_num = units; + have_mobi_num = 0; + var i; + i = -1; + repeat (array_length(obj_controller.display_unit)) { + i += 1; + if ((vehicle_equipment != -1) && (obj_controller.man_sel[i] == 1) && (obj_controller.ma_mobi[i] == n_mobi)) { + have_mobi_num += 1; + } + } + have_mobi_num += scr_item_count(n_mobi); + + if (have_mobi_num >= req_mobi_num || n_mobi == ITEM_NAME_NONE) { + n_good5 = 1; + } + if (have_mobi_num < req_mobi_num && (n_mobi != ITEM_NAME_ANY && n_mobi != ITEM_NAME_NONE)) { + n_good5 = 0; + warning = "Not enough " + string(n_mobi) + "; " + string(units - req_mobi_num) + " more are required."; + } + + var terminator_mobi = ["", "Servo-arm", "Servo-harness", "Conversion Beamer Pack"]; + if ((!array_contains(terminator_mobi, n_mobi)) && ((n_armour == "Terminator Armour") || (n_armour == "Tartaros"))) { + n_good5 = 0; + warning = "Cannot use this gear with Terminator Armour."; + } + + if ((n_mobi != ITEM_NAME_NONE) && (n_mobi != "") && (n_armour == "Dreadnought")) { + n_good5 = 0; + warning = string(obj_ini.role[100][6]) + "s may not use mobility gear."; + } + } + } + + //draw_set_halign(fa_center); + if ((equipmet_area == EquipmentSlot.WEAPON_ONE) || (equipmet_area == EquipmentSlot.WEAPON_TWO)) { + range_melee_radio.draw(); + } + + if (equipmet_area != -1){ + quality_radio.draw(); + } + + if (quality_radio.changed || range_melee_radio.changed ||_area_change){ + reload_items(); + } + + draw_set_color(255); + draw_set_halign(fa_center); + draw_text(1292, 476, string_hash_to_newline(warning)); + + cancel_button.draw(); + + var _valid = ((n_good1 + n_good2 + n_good3 + n_good4 + n_good5) == 5); + + + if (equip_button.draw(_valid)){ + reequip_selection(); + } + +} + + +function reequip_selection(){ + if (n_wep1=ITEM_NAME_NONE) then n_wep1=""; + if (n_wep2=ITEM_NAME_NONE) then n_wep2=""; + if (n_armour=ITEM_NAME_NONE) then n_armour=""; + if (n_gear=ITEM_NAME_NONE) then n_gear=""; + if (n_mobi=ITEM_NAME_NONE) then n_mobi=""; + + + for (var i=0;i-1){ - var ham=obj_ini.TTRPG[0][v].ship_location; - if (obj_ini.ship_location[ham]=="Lost") then continue; - } - - unit = obj_ini.TTRPG[0][v]; - var yep=0; - if (unit.base_group!="astartes") and (unit.base_group!="none"){ - yep=1; - } - if ((unit.role()==obj_ini.role[100][eROLE.ChapterMaster] || unit.role()==obj_ini.role[100][eROLE.HonourGuard])){ - yep=1; - } - if (yep==1){ - add_man_to_manage_arrays(unit); - } - } - } + var _already_used = []; if (command_group==12) or (command_group==0){// Apothecarion var apothecaries = collect_role_group([SPECIALISTS_APOTHECARIES,true]); for (var i=0;i-1){ + var ham=obj_ini.TTRPG[0][v].ship_location; + if (obj_ini.ship_location[ham]=="Lost") then continue; + } + + unit = obj_ini.TTRPG[0][v]; + yep = !(array_contains(_already_used, v)); + if (yep==1){ + add_man_to_manage_arrays(unit); + } + } + } + diff --git a/scripts/scr_squads/scr_squads.gml b/scripts/scr_squads/scr_squads.gml index aaeaaa5c35..07e0fd54c9 100644 --- a/scripts/scr_squads/scr_squads.gml +++ b/scripts/scr_squads/scr_squads.gml @@ -289,6 +289,11 @@ function UnitSquad(squad_type = undefined, company = undefined) constructor{ } } + + static stat_average = function(stat){ + + } + static add_type_data = function(data){ type_data=data; display_name = type_data[$"display_data"]; diff --git a/scripts/scr_transfer_marines/scr_transfer_marines.gml b/scripts/scr_transfer_marines/scr_transfer_marines.gml new file mode 100644 index 0000000000..2eef6c484c --- /dev/null +++ b/scripts/scr_transfer_marines/scr_transfer_marines.gml @@ -0,0 +1,192 @@ +function draw_popup_transfer(){ + main_slate.draw_with_dimensions(); + draw_set_color(CM_GREEN_COLOR); + draw_text(1292, 145, "Transferring"); + + draw_set_font(fnt_40k_12); + if (((unit_role != obj_ini.role[100, 17]) || (obj_controller.command_set[1] != 0)) && (unit_role != "Lexicanum") && (unit_role != "Codiciery")) { + companies_select.draw(); + } + if (companies_select.changed){ + target_comp = companies_select.selection_val("val"); + } + if (cancel_button.draw()){ + instance_destroy(); + } + + if (transfer_button.draw(target_comp != company && target_comp!=-1)){ + transfer_marines(); + } +} + +function transfer_marines(){ + var mahreens=0,w=0,god=0,vehi=0,god2=0; + + + mahreens = find_company_open_slot(target_comp); + + for (w=1;w<101;w++){// Gets the number of vehicles in the target company + if (god2==0 and obj_ini.veh_role[target_comp,w]=""){ + god2=1; + vehi=w; + break; + } + } + + // The MAHREENS and TARGET/FROM seems to check out + var unit, move_squad, move_members, moveable, squad; + for (w=0;w= 1) and (target_comp <= 10) { + obj_ini.veh_race[target_comp][vehi]=obj_ini.veh_race[veh_data[0]][veh_data[1]]; + obj_ini.veh_loc[target_comp][vehi]=obj_ini.veh_loc[veh_data[0]][veh_data[1]]; + obj_ini.veh_role[target_comp][vehi]=obj_ini.veh_role[veh_data[0]][veh_data[1]]; + obj_ini.veh_wep1[target_comp][vehi]=obj_ini.veh_wep1[veh_data[0]][veh_data[1]]; + obj_ini.veh_wep2[target_comp][vehi]=obj_ini.veh_wep2[veh_data[0]][veh_data[1]]; + obj_ini.veh_wep3[target_comp][vehi]=obj_ini.veh_wep3[veh_data[0]][veh_data[1]]; + obj_ini.veh_upgrade[target_comp][vehi]=obj_ini.veh_upgrade[veh_data[0]][veh_data[1]]; + obj_ini.veh_acc[target_comp][vehi]=obj_ini.veh_acc[veh_data[0]][veh_data[1]]; + obj_ini.veh_hp[target_comp][vehi]=obj_ini.veh_hp[veh_data[0]][veh_data[1]]; + obj_ini.veh_chaos[target_comp][vehi]=obj_ini.veh_chaos[veh_data[0]][veh_data[1]]; + obj_ini.veh_pilots[target_comp][vehi]=0; + obj_ini.veh_lid[target_comp][vehi]=obj_ini.veh_lid[veh_data[0]][veh_data[1]]; + obj_ini.veh_wid[target_comp][vehi]=obj_ini.veh_wid[veh_data[0]][veh_data[1]]; + + destroy_vehicle(veh_data[0],veh_data[1]); + + vehi++; + } + + } + } + + } + + // Check this + + if (obj_controller.managing>0){ + with(obj_controller){scr_management(1);} + } + obj_ini.selected_company=company; + obj_ini.temp_target_company=target_comp; + with(obj_ini){ + for (var co=0;co<11;co++){ + scr_company_order(co); + scr_vehicle_order(co); + } + } + + with(obj_controller){ + // man_current=0; + var i=-1; + man_size=0; + selecting_location=""; + selecting_types=""; + selecting_ship=-1; + + if (obj_controller.managing>0){ + reset_manage_arrays(); + alll=0; + update_general_manage_view(); + } + } + + with(obj_managment_panel){instance_destroy();} + + obj_controller.cooldown=10; + instance_destroy(); +} + + +function set_up_transfer_popup(){ + if (instance_number(obj_popup)==0){ + var pip=instance_create(0,0,obj_popup); + pip.type=5.1; + pip.company=managing; + + var god=0,nuuum=0,nuuum2=0,checky=0,check_number=0; + var _min_exp = 0; + for (var f=0; f1) then pip.unit_role="Marines"; + if (nuuum2>1) then pip.unit_role="Vehicles"; + if (nuuum>0) and (nuuum2>0) then pip.unit_role="Units"; + pip.units=nuuum+nuuum2; + if (nuuum>0) and (check_number>0){ + if (command_set[1]==0){ + cooldown=8000; + with(pip){ + instance_destroy(); + } + } + } + } +} diff --git a/scripts/scr_transfer_marines/scr_transfer_marines.yy b/scripts/scr_transfer_marines/scr_transfer_marines.yy new file mode 100644 index 0000000000..e0e2656051 --- /dev/null +++ b/scripts/scr_transfer_marines/scr_transfer_marines.yy @@ -0,0 +1,13 @@ +{ + "$GMScript":"v1", + "%Name":"scr_transfer_marines", + "isCompatibility":false, + "isDnD":false, + "name":"scr_transfer_marines", + "parent":{ + "name":"Scripts", + "path":"folders/Scripts.yy", + }, + "resourceType":"GMScript", + "resourceVersion":"2.0", +} \ No newline at end of file diff --git a/scripts/scr_ui_diplomacy/scr_ui_diplomacy.gml b/scripts/scr_ui_diplomacy/scr_ui_diplomacy.gml index 42cc400635..0dd73f4adf 100644 --- a/scripts/scr_ui_diplomacy/scr_ui_diplomacy.gml +++ b/scripts/scr_ui_diplomacy/scr_ui_diplomacy.gml @@ -215,9 +215,11 @@ function set_up_diplomacy_buttons(){ exit_all=0; } if (diplo_last=="artifact_thanks") and (force_goodbye!=0){ - - scr_toggle_armamentarium(); + scr_toggle_lib(); _close_diplomacy = false; + } else if (diplo_last=="stc_thanks"){ + scr_toggle_armamentarium(); + _close_diplomacy = false; } // Exits back to diplomacy thing if (audience==0){ diff --git a/scripts/scr_ui_manage/scr_ui_manage.gml b/scripts/scr_ui_manage/scr_ui_manage.gml index b6f6e42717..28cab876d8 100644 --- a/scripts/scr_ui_manage/scr_ui_manage.gml +++ b/scripts/scr_ui_manage/scr_ui_manage.gml @@ -81,7 +81,6 @@ function load_marines_into_ship(system, ship, units, reload = false) { if (reload == false) { menu = 1; } - cooldown = 8; selecting_ship = -1; if (managing == -1 && obj_controller.selection_data.purpose != "Ship Management") { update_garrison_manage(); @@ -99,7 +98,7 @@ function command_slot_prompt(search_params, role_group_params, purpose, purpose_ purpose: purpose, purpose_code: purpose_code, number: 1, - system: managing, + target_company: managing, feature: "none", planet: 0, selections: [] @@ -280,7 +279,7 @@ function draw_sprite_and_unit_equip_data(){ // Equipment var armour = selected_unit.armour(); if (armour != "") { - text = selected_unit.equipments_qual_string("armour", true); + text = selected_unit.equipments_qual_string("armour", false); tooltip_text = obj_controller.temp[103]; x1 = x_left; y1 = yy + 179; @@ -293,7 +292,7 @@ function draw_sprite_and_unit_equip_data(){ var gear = selected_unit.gear(); if (selected_unit.gear() != "") { - text = selected_unit.equipments_qual_string("gear", true); + text = selected_unit.equipments_qual_string("gear", false); tooltip_text = obj_controller.temp[105]; x1 = x_left; y1 = yy + 305; @@ -305,7 +304,7 @@ function draw_sprite_and_unit_equip_data(){ var mobi = selected_unit.mobility_item(); if (mobi != "") { - text = selected_unit.equipments_qual_string("mobi", true); + text = selected_unit.equipments_qual_string("mobi", false); tooltip_text = obj_controller.temp[107]; x1 = x_left; y1 = yy + 326; @@ -317,7 +316,7 @@ function draw_sprite_and_unit_equip_data(){ var wep1 = selected_unit.weapon_one(); if (wep1 != "") { - text = selected_unit.equipments_qual_string("wep1", true); + text = selected_unit.equipments_qual_string("wep1", false); tooltip_text = obj_controller.temp[109]; x1 = x_left; y1 = yy + 204; @@ -329,7 +328,7 @@ function draw_sprite_and_unit_equip_data(){ var wep2 = selected_unit.weapon_two(); if (wep2 != "") { - text = selected_unit.equipments_qual_string("wep2", true); + text = selected_unit.equipments_qual_string("wep2", false); tooltip_text = obj_controller.temp[111]; x1 = x_left; y1 = yy + 254; @@ -810,15 +809,17 @@ function scr_ui_manage() { } } + var _only_display_selected = (instance_exists(obj_popup) && (obj_popup.type == 5 || obj_popup.type == 5.1 || obj_popup.type == 6)); for (var i = 0; i < max(0, repetitions); i++) { draw_set_font(fnt_40k_14); if (sel >= array_length(display_unit)) { break; } - while ((man[sel] == "hide") && (sel < array_length(display_unit) - 1)) { + + while ((man[sel] == "hide" || man_sel[sel] != 1 && _only_display_selected) && (sel < array_length(display_unit) - 1)) { sel += 1; } - if (scr_draw_management_unit(sel, yy, xx) == "continue") { + if (scr_draw_management_unit(sel, yy, xx, true, _only_display_selected) == "continue") { sel++; i--; continue; @@ -966,7 +967,7 @@ function scr_ui_manage() { button.tooltip = "Press Shift E"; if (button.draw() && equip_possible) { - equip_selection(); + set_up_equip_popup(); } button.move("right"); @@ -981,30 +982,7 @@ function scr_ui_manage() { button.alpha = promote_possible ? 1 : 0.5; if (button.draw()) { if (promote_possible) { - if ((sel_promoting == 1) && (instance_number(obj_popup) == 0)) { - var pip = instance_create(0, 0, obj_popup); - pip.type = 5; - pip.company = managing; - - var god = 0, nuuum = 0; - for (var f = 0; f < array_length(display_unit); f++) { - if ((ma_promote[f] >= 1 || is_specialist(ma_role[f], SPECIALISTS_RANK_AND_FILE) || is_specialist(ma_role[f], SPECIALISTS_SQUAD_LEADERS)) && man_sel[f] == 1) { - nuuum += 1; - if (pip.min_exp == 0) { - pip.min_exp = ma_exp[f]; - } - pip.min_exp = min(ma_exp[f], pip.min_exp); - } - if ((god == 0) && (ma_promote[f] >= 1) && (man_sel[f] == 1)) { - god = 1; - pip.unit_role = ma_role[f]; - } - } - if (nuuum > 1) { - pip.unit_role = "Marines"; - } - pip.units = nuuum; - } + setup_promotion_popup(); } } button.move("right", true); @@ -1077,7 +1055,7 @@ function scr_ui_manage() { if (transfer_possible) { button.alpha = 1; if (button.draw()) { - transfer_selection(); + set_up_transfer_popup(); } } else { button.alpha = 0.5; @@ -1139,7 +1117,6 @@ function scr_ui_manage() { button.keystroke = false; button.alpha = 1; if (button.draw()) { - cooldown = 8; // scr_load_all(loading); //not sure whether loading was intentional or not sel_all = "all"; } diff --git a/scripts/scr_unit_quick_find_pane/scr_unit_quick_find_pane.gml b/scripts/scr_unit_quick_find_pane/scr_unit_quick_find_pane.gml index ddc40f8a15..dba3a286fa 100644 --- a/scripts/scr_unit_quick_find_pane/scr_unit_quick_find_pane.gml +++ b/scripts/scr_unit_quick_find_pane/scr_unit_quick_find_pane.gml @@ -480,51 +480,6 @@ function update_general_manage_view(){ } } - -function transfer_selection(){ - if (instance_number(obj_popup)==0){ - var pip=instance_create(0,0,obj_popup); - pip.type=5.1; - pip.company=managing; - - var god=0,nuuum=0,nuuum2=0,checky=0,check_number=0; - for(var f=1; f1) then pip.unit_role="Marines"; - if (nuuum2>1) then pip.unit_role="Vehicles"; - if (nuuum>0) and (nuuum2>0) then pip.unit_role="Units"; - pip.units=nuuum+nuuum2; - if (nuuum>0) and (check_number>0){ - if (command_set[1]==0){ - cooldown=8000; - with(pip){instance_destroy();} - } - } - } -} - function toggle_selection_borders(){ for(var p=0; p=50){ - if (man[f]=="man"){ - allow=false; - break; - } else if(man[f]=="vehicle"){ - if (prev_role != ma_role[f]){ - allow=false; - break; - } - } - } - } - - if (vih>0){ - nuuum+=1; - if (o_wep1=="") and (ma_wep1[f]!="") then o_wep1=ma_wep1[f]; - if (o_wep2=="") and (ma_wep2[f]!="") then o_wep2=ma_wep2[f]; - if (o_armour=="") and (ma_armour[f]!="") then o_armour=ma_armour[f]; - if (o_gear=="") and (ma_gear[f]!="") then o_gear=ma_gear[f]; - if (o_mobi=="") and (ma_mobi[f]!="") then o_mobi=ma_mobi[f]; - - if (ma_wep1[f]=="") then b_wep1+=1; - if (ma_wep2[f]=="") then b_wep2+=1; - if (ma_armour[f]=="") then b_armour+=1; - if (ma_gear[f]=="") then b_gear+=1; - if (ma_mobi[f]=="") then b_mobi+=1; - - if ((o_wep1!="") and (ma_wep1[f]!=o_wep1)) or (b_wep1==1) then o_wep1="Assortment"; - if ((o_wep2!="") and (ma_wep2[f]!=o_wep2)) or (b_wep2==1) then o_wep2="Assortment"; - if ((o_armour!="") and (ma_armour[f]!=o_armour)) or (b_armour==1) then o_armour="Assortment"; - if ((o_gear!="") and (ma_gear[f]!=o_gear)) or (b_gear==1) then o_gear="Assortment"; - if ((o_mobi!="") and (ma_mobi[f]!=o_mobi)) or (b_mobi==1) then o_mobi="Assortment"; - } - } - - if (b_wep1==nuuum) then o_wep1=""; - if (b_wep2==nuuum) then o_wep2=""; - if (b_armour==nuuum) then o_armour=""; - if (b_gear==nuuum) then o_gear=""; - if (b_mobi==nuuum) then o_mobi=""; - - if (vih>0 && man_size>0 && allow){ - - var pip=instance_create(0,0,obj_popup); - pip.type=6; - pip.o_wep1=o_wep1; - pip.o_wep2=o_wep2; - pip.o_armour=o_armour; - pip.o_gear=o_gear; - pip.n_wep1=o_wep1; - pip.n_wep2=o_wep2; - pip.n_armour=o_armour; - pip.n_gear=o_gear; - pip.o_mobi=o_mobi; - pip.n_mobi=o_mobi; - pip.company=managing; - pip.units=nuuum; - - //Forwards vih selection to the vehicle_equipment variable used in mouse_50 obj_popup and weapons_equip script - pip.vehicle_equipment=vih; - } - } -} - function load_selection(){ if (man_size>0) and (selecting_location!="Terra") and (selecting_location!="Mechanicus Vessel") and (selecting_location!="Lost"){ scr_company_load(selecting_location); diff --git a/sprites/spr_pixel_button_left/spr_pixel_button_left.yy b/sprites/spr_pixel_button_left/spr_pixel_button_left.yy index 51dd8a856d..bd1753d363 100644 --- a/sprites/spr_pixel_button_left/spr_pixel_button_left.yy +++ b/sprites/spr_pixel_button_left/spr_pixel_button_left.yy @@ -63,12 +63,16 @@ "playbackSpeedType":0, "resourceType":"GMSequence", "resourceVersion":"2.0", + "seqHeight":28.0, + "seqWidth":14.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":"8a326ff2-8fec-4031-abef-2b299f66f9b0","path":"sprites/spr_pixel_button_left/spr_pixel_button_left.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"c35b10b1-5374-4d18-bff9-7373fd5c1c8d","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"8a326ff2-8fec-4031-abef-2b299f66f9b0","path":"sprites/spr_pixel_button_left/spr_pixel_button_left.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"c35b10b1-5374-4d18-bff9-7373fd5c1c8d","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_pixel_button_right/531933e7-b10e-42c4-96fd-7b6aaf423b29.png b/sprites/spr_pixel_button_right/531933e7-b10e-42c4-96fd-7b6aaf423b29.png index b878b3c467ab0457477a86a9a8ef66a1cc726e5f..d5fc93deae5ba453ef7f1bb27c2b627c864b0a77 100644 GIT binary patch delta 304 zcmcb>e1>^KQvH5U7sn8b(|afH>@TVMoGu1rzD_%?j z$J5$-qE1c=5zA+2v03XZW9s)bs(-~)7j4g^Afd@jAFSs6SGV)b-o80XT6z1kz^5*G zwwWb)js_B|?|-}X+kcIVTk8QIO@2~?3dG)FSQ-b$6vPJ zoAZNp>rJQCva_dVgLe9S3j3^P6HA|$N#@>r*7q%?>6PBYxZ9qZ?j+@hP?8_VT+F_?%c-yT3gTk z%TyMHzOP)8wW`uVks%BmJLk7&nD9NF)&D}fbG=HZpJxfzfv>*%{?4zk+#hvSB{@95 zUpAmFJJrPMxWSv=tM9)@J-2LnU~o1=Ik|Y#o{SZSRjf(AtRGq!(qvMy7puEC$G6|e z_A~$T=m>wFrc~hH=x?Gcc Y7-f~Q=reKTxyk?pp00i_>zopr05~jjRR910 diff --git a/sprites/spr_pixel_button_right/7dc4c8c2-7af4-42fa-8949-052b7fe7a314.png b/sprites/spr_pixel_button_right/7dc4c8c2-7af4-42fa-8949-052b7fe7a314.png new file mode 100644 index 0000000000000000000000000000000000000000..485540ef4968a14ff3981b4ca0faa52f629863f4 GIT binary patch literal 561 zcmeAS@N?(olHy`uVBq!ia0vp^d_XM2!3HD)!}=V7ltQvckS_y6l^O#>Lkk1LFQ8Dv z3kHT#0|tgy2@DKYGZ+}e3+C(!v;j)6C3(BMF#HF>1$&oIW?*1c@pN$vu{gbVim(46 z2N75Q?7I?1xfgp?d^v8p^%Op4s_)MJzfL;LW$_e&0@bCl4adA9Jr+7Izaa7IuFtc_ zdwxGV+kS25dzCjAkE=}h6)3UjKP!{LHuY0k>ysz;Y~sEwvbxx2?QMoHzyBqEpTR7B zuIcq`sX`+KKeiiR^$#U%lg_c=PW|%iXrSSYR=*?GdC`Y+vtJu7U-|T)&XrFo*H=e7 zbG~Mnrn$kVvDQp=h6{s@jhyzwxuJWDlUIg%R`&Vpvl+y1y?^w9Nl#d8_q6Q~isw1) ze^r{C<@D_Wx;urOsv>F0Hv@b&0z*)>#5JNM zC9x#cD!C{XNHG{07@6uCnCluDgczDw8Jhx;wt<0_fr0wnmUt8mx%nxXX_dG&gf-Ya k25QiN+fb63n_66wm|K8b593r>P`omDy85}Sb4q9e0KQVwrT_o{ literal 0 HcmV?d00001 diff --git a/sprites/spr_pixel_button_right/layers/531933e7-b10e-42c4-96fd-7b6aaf423b29/a3934012-92f7-4b26-ba15-b4043a5867b4.png b/sprites/spr_pixel_button_right/layers/531933e7-b10e-42c4-96fd-7b6aaf423b29/a3934012-92f7-4b26-ba15-b4043a5867b4.png index b878b3c467ab0457477a86a9a8ef66a1cc726e5f..d5fc93deae5ba453ef7f1bb27c2b627c864b0a77 100644 GIT binary patch delta 304 zcmcb>e1>^KQvH5U7sn8b(|afH>@TVMoGu1rzD_%?j z$J5$-qE1c=5zA+2v03XZW9s)bs(-~)7j4g^Afd@jAFSs6SGV)b-o80XT6z1kz^5*G zwwWb)js_B|?|-}X+kcIVTk8QIO@2~?3dG)FSQ-b$6vPJ zoAZNp>rJQCva_dVgLe9S3j3^P6HA|$N#@>r*7q%?>6PBYxZ9qZ?j+@hP?8_VT+F_?%c-yT3gTk z%TyMHzOP)8wW`uVks%BmJLk7&nD9NF)&D}fbG=HZpJxfzfv>*%{?4zk+#hvSB{@95 zUpAmFJJrPMxWSv=tM9)@J-2LnU~o1=Ik|Y#o{SZSRjf(AtRGq!(qvMy7puEC$G6|e z_A~$T=m>wFrc~hH=x?Gcc Y7-f~Q=reKTxyk?pp00i_>zopr05~jjRR910 diff --git a/sprites/spr_pixel_button_right/layers/7dc4c8c2-7af4-42fa-8949-052b7fe7a314/a3934012-92f7-4b26-ba15-b4043a5867b4.png b/sprites/spr_pixel_button_right/layers/7dc4c8c2-7af4-42fa-8949-052b7fe7a314/a3934012-92f7-4b26-ba15-b4043a5867b4.png new file mode 100644 index 0000000000000000000000000000000000000000..485540ef4968a14ff3981b4ca0faa52f629863f4 GIT binary patch literal 561 zcmeAS@N?(olHy`uVBq!ia0vp^d_XM2!3HD)!}=V7ltQvckS_y6l^O#>Lkk1LFQ8Dv z3kHT#0|tgy2@DKYGZ+}e3+C(!v;j)6C3(BMF#HF>1$&oIW?*1c@pN$vu{gbVim(46 z2N75Q?7I?1xfgp?d^v8p^%Op4s_)MJzfL;LW$_e&0@bCl4adA9Jr+7Izaa7IuFtc_ zdwxGV+kS25dzCjAkE=}h6)3UjKP!{LHuY0k>ysz;Y~sEwvbxx2?QMoHzyBqEpTR7B zuIcq`sX`+KKeiiR^$#U%lg_c=PW|%iXrSSYR=*?GdC`Y+vtJu7U-|T)&XrFo*H=e7 zbG~Mnrn$kVvDQp=h6{s@jhyzwxuJWDlUIg%R`&Vpvl+y1y?^w9Nl#d8_q6Q~isw1) ze^r{C<@D_Wx;urOsv>F0Hv@b&0z*)>#5JNM zC9x#cD!C{XNHG{07@6uCnCluDgczDw8Jhx;wt<0_fr0wnmUt8mx%nxXX_dG&gf-Ya k25QiN+fb63n_66wm|K8b593r>P`omDy85}Sb4q9e0KQVwrT_o{ literal 0 HcmV?d00001 diff --git a/sprites/spr_pixel_button_right/spr_pixel_button_right.yy b/sprites/spr_pixel_button_right/spr_pixel_button_right.yy index 37b0751f74..dedd2a7436 100644 --- a/sprites/spr_pixel_button_right/spr_pixel_button_right.yy +++ b/sprites/spr_pixel_button_right/spr_pixel_button_right.yy @@ -13,6 +13,7 @@ "For3D":false, "frames":[ {"$GMSpriteFrame":"v1","%Name":"531933e7-b10e-42c4-96fd-7b6aaf423b29","name":"531933e7-b10e-42c4-96fd-7b6aaf423b29","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"7dc4c8c2-7af4-42fa-8949-052b7fe7a314","name":"7dc4c8c2-7af4-42fa-8949-052b7fe7a314","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -49,7 +50,7 @@ }, "eventStubScript":null, "eventToFunction":{}, - "length":1.0, + "length":2.0, "lockOrigin":false, "moments":{ "$KeyframeStore":"", @@ -63,12 +64,19 @@ "playbackSpeedType":0, "resourceType":"GMSequence", "resourceVersion":"2.0", + "seqHeight":28.0, + "seqWidth":14.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":"531933e7-b10e-42c4-96fd-7b6aaf423b29","path":"sprites/spr_pixel_button_right/spr_pixel_button_right.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"bb32a9c7-a6e7-47d3-86a8-a0bc2d995ce5","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"531933e7-b10e-42c4-96fd-7b6aaf423b29","path":"sprites/spr_pixel_button_right/spr_pixel_button_right.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"bb32a9c7-a6e7-47d3-86a8-a0bc2d995ce5","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"7dc4c8c2-7af4-42fa-8949-052b7fe7a314","path":"sprites/spr_pixel_button_right/spr_pixel_button_right.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"48a1fccd-8bf3-4261-96af-634ed4221bbd","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, From ade45c52bedcbb02f2e8ad1262550f495431f9fc Mon Sep 17 00:00:00 2001 From: Blogaugis <105600180+Blogaugis@users.noreply.github.com> Date: Sat, 26 Jul 2025 01:02:19 +0300 Subject: [PATCH 152/286] fix: add webber to armamentarium list (#944) --- objects/obj_shop/Create_0.gml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/objects/obj_shop/Create_0.gml b/objects/obj_shop/Create_0.gml index ac377fc48c..8fa9d20615 100644 --- a/objects/obj_shop/Create_0.gml +++ b/objects/obj_shop/Create_0.gml @@ -527,6 +527,11 @@ if (shop = "equipment") { item_stocked[i] = scr_item_count(item[i]); nobuy[i] = 1; i += 1; + x_mod[i] = 9; + item[i] = "Webber"; + item_stocked[i] = scr_item_count(item[i]); + nobuy[i] = 1; + i += 1; item[i] = "Sniper Rifle"; forge_cost[i] = 200; item_stocked[i] = scr_item_count(item[i]); From f4ffbcbe52094dd47cae67994e92d95532768fd3 Mon Sep 17 00:00:00 2001 From: Nelsonh <81228864+OH296@users.noreply.github.com> Date: Fri, 25 Jul 2025 23:32:17 +0100 Subject: [PATCH 153/286] feat: Create tagging system for marines and Fix Transfer crash (#945) --- ChapterMaster.yyp | 3 + objects/obj_controller/Create_0.gml | 2 + objects/obj_controller/Draw_64.gml | 3 + objects/obj_controller/Step_0.gml | 1 + objects/obj_popup/Draw_64.gml | 2 + scripts/scr_DataSlate/scr_DataSlate.gml | 19 +- .../scr_array_functions.gml | 16 + scripts/scr_buttons/scr_buttons.gml | 64 ++- scripts/scr_clean/scr_clean.gml | 4 +- scripts/scr_company_view/scr_company_view.gml | 5 +- .../scr_controller_helpers.gml | 4 +- .../scr_draw_management_unit.gml | 42 ++ scripts/scr_manage_tags/scr_manage_tags.gml | 302 +++++++++++++ scripts/scr_manage_tags/scr_manage_tags.yy | 13 + .../scr_manage_task_selector.gml | 26 +- .../scr_marine_struct/scr_marine_struct.gml | 2 + .../scr_popup_functions.gml | 1 + .../scr_system_search_helpers.gml | 2 +- .../scr_transfer_marines.gml | 28 ++ scripts/scr_ui_manage/scr_ui_manage.gml | 142 +++--- .../spr_company_title/spr_company_title.yy | 22 +- sprites/spr_data_slate/spr_data_slate.yy | 10 +- .../b39b5ff0-3a40-4c08-84c7-d1d9c6dd0bb6.png | Bin 0 -> 295 bytes .../5f8a8902-d3e2-4d02-bd8e-3552df863e7d.png | Bin 0 -> 295 bytes sprites/spr_defeat/spr_defeat.yy | 19 +- sprites/spr_forge_holo/spr_forge_holo.yy | 6 +- sprites/spr_ingame_menu/spr_ingame_menu.yy | 6 +- sprites/spr_load_splash/spr_load_splash.yy | 6 +- sprites/spr_load_text/spr_load_text.yy | 14 +- .../spr_loadbar_cover/spr_loadbar_cover.yy | 406 +++++++++++++----- .../spr_loadbar_empty/spr_loadbar_empty.yy | 6 +- sprites/spr_master_title/spr_master_title.yy | 6 +- .../spr_mm_butts_small/spr_mm_butts_small.yy | 10 +- sprites/spr_new_banner/spr_new_banner.yy | 6 +- sprites/spr_new_mm/spr_new_mm.yy | 6 +- .../spr_pixel_button_middle.yy | 6 +- sprites/spr_research_bar/spr_research_bar.yy | 14 +- .../bd12575d-6936-47ed-b150-8734d5c98140.png | Bin 0 -> 665171 bytes .../f80bbb04-8bfb-4be3-b6f4-2914d55a9273.png | Bin 0 -> 103262 bytes .../6e76129b-a811-4d40-b548-3faeffb7e88e.png | Bin 0 -> 665171 bytes .../6e76129b-a811-4d40-b548-3faeffb7e88e.png | Bin 0 -> 103262 bytes .../spr_slate_featureless.yy | 96 +++++ .../bd12575d-6936-47ed-b150-8734d5c98140.png | Bin 0 -> 20033 bytes .../f80bbb04-8bfb-4be3-b6f4-2914d55a9273.png | Bin 0 -> 13974 bytes .../6e76129b-a811-4d40-b548-3faeffb7e88e.png | Bin 0 -> 20033 bytes .../6e76129b-a811-4d40-b548-3faeffb7e88e.png | Bin 0 -> 13974 bytes sprites/spr_slate_top/spr_slate_top.yy | 96 +++++ sprites/spr_star_screen/spr_star_screen.yy | 30 +- sprites/spr_tooltip1/spr_tooltip1.yy | 10 +- 49 files changed, 1199 insertions(+), 257 deletions(-) create mode 100644 scripts/scr_manage_tags/scr_manage_tags.gml create mode 100644 scripts/scr_manage_tags/scr_manage_tags.yy create mode 100644 sprites/spr_defeat/b39b5ff0-3a40-4c08-84c7-d1d9c6dd0bb6.png create mode 100644 sprites/spr_defeat/layers/b39b5ff0-3a40-4c08-84c7-d1d9c6dd0bb6/5f8a8902-d3e2-4d02-bd8e-3552df863e7d.png create mode 100644 sprites/spr_slate_featureless/bd12575d-6936-47ed-b150-8734d5c98140.png create mode 100644 sprites/spr_slate_featureless/f80bbb04-8bfb-4be3-b6f4-2914d55a9273.png create mode 100644 sprites/spr_slate_featureless/layers/bd12575d-6936-47ed-b150-8734d5c98140/6e76129b-a811-4d40-b548-3faeffb7e88e.png create mode 100644 sprites/spr_slate_featureless/layers/f80bbb04-8bfb-4be3-b6f4-2914d55a9273/6e76129b-a811-4d40-b548-3faeffb7e88e.png create mode 100644 sprites/spr_slate_featureless/spr_slate_featureless.yy create mode 100644 sprites/spr_slate_top/bd12575d-6936-47ed-b150-8734d5c98140.png create mode 100644 sprites/spr_slate_top/f80bbb04-8bfb-4be3-b6f4-2914d55a9273.png create mode 100644 sprites/spr_slate_top/layers/bd12575d-6936-47ed-b150-8734d5c98140/6e76129b-a811-4d40-b548-3faeffb7e88e.png create mode 100644 sprites/spr_slate_top/layers/f80bbb04-8bfb-4be3-b6f4-2914d55a9273/6e76129b-a811-4d40-b548-3faeffb7e88e.png create mode 100644 sprites/spr_slate_top/spr_slate_top.yy diff --git a/ChapterMaster.yyp b/ChapterMaster.yyp index 5680c9d324..09fa95f3cb 100644 --- a/ChapterMaster.yyp +++ b/ChapterMaster.yyp @@ -849,6 +849,7 @@ {"id":{"name":"scr_load","path":"scripts/scr_load/scr_load.yy",},}, {"id":{"name":"scr_log","path":"scripts/scr_log/scr_log.yy",},}, {"id":{"name":"scr_loyalty","path":"scripts/scr_loyalty/scr_loyalty.yy",},}, + {"id":{"name":"scr_manage_tags","path":"scripts/scr_manage_tags/scr_manage_tags.yy",},}, {"id":{"name":"scr_manage_task_selector","path":"scripts/scr_manage_task_selector/scr_manage_task_selector.yy",},}, {"id":{"name":"scr_management","path":"scripts/scr_management/scr_management.yy",},}, {"id":{"name":"scr_map_and_warp_functions","path":"scripts/scr_map_and_warp_functions/scr_map_and_warp_functions.yy",},}, @@ -1588,7 +1589,9 @@ {"id":{"name":"spr_skull_on_chain","path":"sprites/spr_skull_on_chain/spr_skull_on_chain.yy",},}, {"id":{"name":"spr_skulls_belt","path":"sprites/spr_skulls_belt/spr_skulls_belt.yy",},}, {"id":{"name":"spr_slate_2","path":"sprites/spr_slate_2/spr_slate_2.yy",},}, + {"id":{"name":"spr_slate_featureless","path":"sprites/spr_slate_featureless/spr_slate_featureless.yy",},}, {"id":{"name":"spr_slate_side","path":"sprites/spr_slate_side/spr_slate_side.yy",},}, + {"id":{"name":"spr_slate_top","path":"sprites/spr_slate_top/spr_slate_top.yy",},}, {"id":{"name":"spr_sororitas1","path":"sprites/spr_sororitas1/spr_sororitas1.yy",},}, {"id":{"name":"spr_space_bg","path":"sprites/spr_space_bg/spr_space_bg.yy",},}, {"id":{"name":"spr_special_helm","path":"sprites/spr_special_helm/spr_special_helm.yy",},}, diff --git a/objects/obj_controller/Create_0.gml b/objects/obj_controller/Create_0.gml index 515eb34a80..d10d5054af 100644 --- a/objects/obj_controller/Create_0.gml +++ b/objects/obj_controller/Create_0.gml @@ -437,11 +437,13 @@ company_report=false; company_data = {}; obj_controller.unit_focus = false; filter_mode = false; +manage_tags = []; pauldron_trim=0; last_unit=[0,0]; ui_coloring=""; ui_melee_penalty=0; ui_ranged_penalty=0; +management_tags = []; // ** Sets default mouse vars ** current_target=false; diff --git a/objects/obj_controller/Draw_64.gml b/objects/obj_controller/Draw_64.gml index 102f5aa160..da5da02adf 100644 --- a/objects/obj_controller/Draw_64.gml +++ b/objects/obj_controller/Draw_64.gml @@ -211,6 +211,9 @@ if (menu == 1) { if (managing == -1){ scr_manage_task_selector(); } + if (managing > 0){ + company_specific_management(); + } } else if (menu == MENU.Armamentarium) { scr_draw_armentarium_gui(); diff --git a/objects/obj_controller/Step_0.gml b/objects/obj_controller/Step_0.gml index 5ec1038b1f..7f6e3cbbf4 100644 --- a/objects/obj_controller/Step_0.gml +++ b/objects/obj_controller/Step_0.gml @@ -743,6 +743,7 @@ try { } // Check if fleet is minimized or not if (instance_exists(obj_popup)) { + allow_shortcuts = false; if (obj_popup.type == 99) { fleet_minimized = 1; } diff --git a/objects/obj_popup/Draw_64.gml b/objects/obj_popup/Draw_64.gml index 38036a5c40..ae05fd4a8d 100644 --- a/objects/obj_popup/Draw_64.gml +++ b/objects/obj_popup/Draw_64.gml @@ -9,4 +9,6 @@ draw_gift_items_popup(); } else if (type == POPUP_TYPE.ARTIFACT_EQUIP){ equip_artifact_popup_draw(); + } else if (type == POPUP_TYPE.ADD_TAGS){ + draw_tag_manager(); } \ No newline at end of file diff --git a/scripts/scr_DataSlate/scr_DataSlate.gml b/scripts/scr_DataSlate/scr_DataSlate.gml index 39965aacdd..96e76678fa 100644 --- a/scripts/scr_DataSlate/scr_DataSlate.gml +++ b/scripts/scr_DataSlate/scr_DataSlate.gml @@ -11,6 +11,8 @@ function DataSlate(data={}) constructor{ percent_cut=0; set_width = false; + top_anchor = [340, 14]; + style = "default"; tooltip_drawing = []; @@ -19,6 +21,11 @@ function DataSlate(data={}) constructor{ move_data_to_current_scope(data, true); + draw_top_piece = true; + + top_piece_style = "aquila"; + + static entered = function(){ return (scr_hit( XX-4, @@ -53,9 +60,11 @@ function DataSlate(data={}) constructor{ height = 850*scale_y; } + decoration_scale = min(scale_x, scale_y) + switch (style){ case "default": - draw_sprite_ext(spr_data_slate,1, XX,YY, scale_x, scale_y, 0, c_white, 1); + draw_sprite_ext(spr_slate_featureless,1, XX,YY, scale_x, scale_y, 0, c_white, 1); break; case "decorated": draw_sprite_stretched(spr_data_slate_back, 0, XX,YY, width, height); @@ -103,6 +112,14 @@ function DataSlate(data={}) constructor{ var _slate_scaley = height/sprite_get_height(spr_slate_side); draw_sprite(spr_data_slate_corner_decoration, 0,XX+width - (70*_slate_scalex), YY + (7*_slate_scaley)); break; + case "default": + if (draw_top_piece){ + if (top_piece_style == "aquila"){ + draw_sprite_ext(spr_slate_top,1, XX+(top_anchor[0]*scale_x),YY + (top_anchor[1] * scale_y ), decoration_scale, decoration_scale, 0, c_white, 1); + } + + } + break; } x2 = XX+width; diff --git a/scripts/scr_array_functions/scr_array_functions.gml b/scripts/scr_array_functions/scr_array_functions.gml index ba15fe965e..751c0b8e29 100644 --- a/scripts/scr_array_functions/scr_array_functions.gml +++ b/scripts/scr_array_functions/scr_array_functions.gml @@ -68,6 +68,22 @@ function array_delete_value(choice_array, value){ array_delete(choice_array, i, 1); } } + + return choice_array; +} + +function array_delete_values(choice_array, values){ + for (var i = array_length(choice_array) - 1; i >= 0; i--) { + for (var s=0;s0) then cooloff--; if (allow_input){ @@ -311,15 +314,21 @@ function TextBarArea(XX,YY,Max_width = 400, requires_input = false) constructor{ var bar_wid=max_width,click_check, string_h; draw_set_alpha(0.25); if (string_area!=""){ - bar_wid=max(max_width,string_width(string_hash_to_newline(string_area))); + bar_wid=max(max_width,string_width(string_area)); } else { if (requires_input){ - draw_set_color(c_red); + draw_set_color(CM_RED_COLOR); + } else { + draw_set_color(CM_GREEN_COLOR) } } string_h = string_height("LOL"); var rect = [xx-(bar_wid/2),yy,xx+(bar_wid/2),yy-8+string_h] - draw_rectangle(rect[0],rect[1],rect[2],rect[3],1); + background.XX = rect[0]; + background.YY = rect[1]; + background.width = rect[2] - rect[0]; + background.height = rect[3] - rect[1]; + click_check = point_and_click(rect); obj_cursor.image_index=0; if (cooloff==0){ @@ -337,17 +346,18 @@ function TextBarArea(XX,YY,Max_width = 400, requires_input = false) constructor{ draw_set_alpha(1); draw_set_font(fnt_fancy); - if (!allow_input) then draw_text(xx,yy+2,string_hash_to_newline("''"+string(string_area)+"'' ")); - if (allow_input){ - obj_cursor.image_index=2; - draw_text(xx,yy+2,$"''{string_area}|''") - }; - - draw_set_font(old_font); - draw_set_halign(old_halign); - + current_text = string_area; + background.inside_method = function(){ + draw_set_valign(fa_top); + if (!allow_input) then draw_text(xx,yy+2,$"''{current_text}'' "); + if (allow_input){ + obj_cursor.image_index=2; + draw_text(xx,yy+2,$"''{current_text}|''") + }; + } + background.draw_with_dimensions(); + pop_draw_return_values(); return string_area; - pop_draw_return_values(); } } @@ -390,7 +400,7 @@ function drop_down(selection, draw_x, draw_y, options,open_marker){ pop_draw_return_values(); } -function multi_select(options_array, title)constructor{ +function multi_select(options_array, title, data = {})constructor{ self.title = title; x_gap = 10; y_gap = 5; @@ -400,7 +410,7 @@ function multi_select(options_array, title)constructor{ y2 = 0; on_change = false; active_col = #009500; - innactive_col = c_gray; + inactive_col = c_gray; max_width = 0; max_height = 0; toggles = []; @@ -410,7 +420,10 @@ function multi_select(options_array, title)constructor{ array_push(toggles, _next_tog); } static update = item_data_updater - static draw = function(){ + + update(data); + + static draw = function(allow_changes = true){ add_draw_return_values(); var _change_method = is_callable(on_change); draw_text(x1, y1, title); @@ -423,12 +436,12 @@ function multi_select(options_array, title)constructor{ _cur_opt.x1 = _prev_x; _cur_opt.y1 = _prev_y; _cur_opt.update() - if (_cur_opt.clicked()){ + if (_cur_opt.clicked() && allow_changes){ if (_change_method){ on_change(); } } - _cur_opt.button_color = _cur_opt.active ? active_col: innactive_col; + _cur_opt.button_color = _cur_opt.active ? active_col: inactive_col; _cur_opt.draw(); items_on_row++ @@ -458,6 +471,13 @@ function multi_select(options_array, title)constructor{ } } } + + static deselect_all = function(){ + for (var i=0;i=0;t--){ + var _tag = _unit.manage_tags[t]; + if (!array_contains(obj_controller.management_tags, _tag)){ + array_delete(_unit.manage_tags, t, 1); + } else { + _tooltip += $"{_tag}\n" + } + } + _tooltip += "Click to set filter to units tags"; + tooltip_draw(_tooltip); + } + if (point_and_click(_tag_button)){ + manage_tags = _unit.manage_tags; + if (instance_exists(obj_popup) && obj_popup.type == POPUP_TYPE.ADD_TAGS){ + obj_popup.tag_selects.set(manage_tags); + } + } + } } var cols = [c_gray, c_gray, 881503]; if (man[selected] != "man") { diff --git a/scripts/scr_manage_tags/scr_manage_tags.gml b/scripts/scr_manage_tags/scr_manage_tags.gml new file mode 100644 index 0000000000..13f0057bb7 --- /dev/null +++ b/scripts/scr_manage_tags/scr_manage_tags.gml @@ -0,0 +1,302 @@ +function set_up_tag_manager(){ + instance_destroy(obj_popup); + var pip = instance_create(0, 0, obj_popup); + pip.type = POPUP_TYPE.ADD_TAGS; + pip.subtype = TAGMANAGER.SELECTION; + + + with (pip){ + var _tag_options = []; + for (var i=0;i < array_length(obj_controller.management_tags);i++){ + + array_push(_tag_options,{ + str1 : obj_controller.management_tags[i], + font : fnt_40k_14b, + }); + } + tag_selects = new multi_select(_tag_options, "Tags", {max_width : 500, x1:1040, y1:210}); + + tag_selects.set(obj_controller.manage_tags); + exit_button = new UnitButtonObject( + { + x1: 1061, + y1: 491, + style : "pixel", + label : "Exit", + tooltip : "All tag filters will remain in place re-open the tag manager to add oor remove filters" + } + ); + main_slate = new DataSlate({ + style : "decorated", + XX : 1006, + YY : 143, + set_width : true, + width : 571, + height : 350, + }); + + create_tag_button = new UnitButtonObject( + { + x1: 1056, + y1: 325, + label : "Create Tag", + tooltip : "Create more tags" + } + ); + delete_tag_button = new UnitButtonObject( + { + x1: create_tag_button.x2, + y1: 325, + label : "Delete Tags", + tooltip : "Delete tags permenantly" + } + ); + add_tag_button = new UnitButtonObject( + { + x1: delete_tag_button.x2, + y1: 325, + label : "Add Tags", + tooltip : "Add tags to current Marine selection" + } + ); + remove_tag_button = new UnitButtonObject( + { + x1: add_tag_button.x2, + y1: 325, + label : "Remove Tags", + tooltip : "Remove Tags from current Marine selection" + } + ); + + cancel_button = new UnitButtonObject( + { + x1: create_tag_button.x2, + y1: 350, + label : "Cancel" + } + ); + + delete_tags = new UnitButtonObject( + { + x1: delete_tag_button.x2, + y1: 350, + label : "Delete" + } + ); + create_tags = new UnitButtonObject( + { + x1: delete_tag_button.x2, + y1: 350, + label : "Create" + } + ); + + add_tags = new UnitButtonObject( + { + x1: delete_tag_button.x2, + y1: 350, + label : "Add", + tooltip : "The selected tags will be added to the current selection", + } + ); + remove_tags = new UnitButtonObject( + { + x1: delete_tag_button.x2, + y1: 325, + label : "Remove", + tooltip : "The selected tags will be removed from the current selection", + } + ); + new_tag_name = new TextBarArea(1285, 275, 530, true); + } +} + +enum TAGMANAGER{ + SELECTION, + CREATE, + DELETE, + ADD, + REMOVE +} +function draw_tag_manager(){ + add_draw_return_values(); + main_slate.draw(); + tag_selects.draw(); + if (exit_button.draw()){ + instance_destroy(); + } + + if (subtype == TAGMANAGER.SELECTION){ + obj_controller.manage_tags = tag_selects.selections(); + if (create_tag_button.draw()){ + subtype = TAGMANAGER.CREATE; + new_tag = ""; + } + if (delete_tag_button.draw()){ + subtype = TAGMANAGER.DELETE; + tag_selects.deselect_all(); + //new_tag = ""; + } + + var _addable = array_length(obj_controller.management_tags); + var _tool = "Add tags to current Marine selection"; + add_tag_button.disabled = false; + if (!_addable){ + _tool = "Make some tags to add them to marines"; + } else { + if (!array_contains(obj_controller.man_sel , 1)){ + _tool = "Select some marine to be able to add tags to"; + _addable = false; + } + } + add_tag_button.update({tooltip : _tool}); + if (!_addable){ + add_tag_button.disabled = true; + } + if (add_tag_button.draw(_addable)){ + subtype = TAGMANAGER.ADD; + var _selecs = []; + var _selec_keys = []; + for(var i=0;i TAGMANAGER.SELECTION){ + if (cancel_button.draw()){ + instance_destroy(); + set_up_tag_manager(); + } + } + + if (subtype == TAGMANAGER.CREATE){ + new_tag = new_tag_name.draw(new_tag); + + if (new_tag != ""){ + if (create_tags.draw()){ + array_push(obj_controller.management_tags, new_tag); + instance_destroy(); + set_up_tag_manager(); + } + } + } else if (subtype == TAGMANAGER.DELETE){ + if (delete_tags.draw()){ + var _deletes = tag_selects.selections(); + obj_controller.management_tags = array_delete_values(obj_controller.management_tags,_deletes ); + instance_destroy(); + set_up_tag_manager(); + } + } else if (subtype == TAGMANAGER.ADD){ + if (add_tags.draw()){ + var _tags = tag_selects.selections(); + for(var i=0;i=0;t--){ + if (array_contains(_removals, _unit.manage_tags[t])){ + array_delete(_unit.manage_tags, t, 1); + } + } + } + instance_destroy(); + set_up_tag_manager(); + } + } + } + pop_draw_return_values(); +} \ No newline at end of file diff --git a/scripts/scr_manage_tags/scr_manage_tags.yy b/scripts/scr_manage_tags/scr_manage_tags.yy new file mode 100644 index 0000000000..728c4f3326 --- /dev/null +++ b/scripts/scr_manage_tags/scr_manage_tags.yy @@ -0,0 +1,13 @@ +{ + "$GMScript":"v1", + "%Name":"scr_manage_tags", + "isCompatibility":false, + "isDnD":false, + "name":"scr_manage_tags", + "parent":{ + "name":"Scripts", + "path":"folders/Scripts.yy", + }, + "resourceType":"GMScript", + "resourceVersion":"2.0", +} \ No newline at end of file diff --git a/scripts/scr_manage_task_selector/scr_manage_task_selector.gml b/scripts/scr_manage_task_selector/scr_manage_task_selector.gml index 92b7aa306a..cc3454b731 100644 --- a/scripts/scr_manage_task_selector/scr_manage_task_selector.gml +++ b/scripts/scr_manage_task_selector/scr_manage_task_selector.gml @@ -76,7 +76,7 @@ function task_selector_man_manage(){ var _endslot = find_company_open_slot(_end_company); scr_move_unit_info(_start_company, _end_company, _unit.marine_number,_endslot); with (obj_ini){ - scr_company_order(start_company); + scr_company_order(_start_company); scr_company_order(_end_company); } managing = _end_company; @@ -110,12 +110,12 @@ function task_selector_man_manage(){ break; case "chaplain_promote": _unit.squad="none"; - var start_company = _unit.company; + var _start_company = _unit.company; var _end_company = selection_data.target_company; var endslot = find_company_open_slot(_end_company); - scr_move_unit_info(start_company, _end_company, _unit.marine_number,endslot); + scr_move_unit_info(_start_company, _end_company, _unit.marine_number,endslot); with (obj_ini){ - scr_company_order(start_company); + scr_company_order(_start_company); scr_company_order(_end_company); } managing = _end_company; @@ -124,12 +124,12 @@ function task_selector_man_manage(){ break; case "apothecary_promote": _unit.squad="none"; - var start_company = _unit.company; + var _start_company = _unit.company; var _end_company = selection_data.target_company; var endslot = find_company_open_slot(_end_company); - scr_move_unit_info(start_company, _end_company, _unit.marine_number,endslot); + scr_move_unit_info(_start_company, _end_company, _unit.marine_number,endslot); with (obj_ini){ - scr_company_order(start_company); + scr_company_order(_start_company); scr_company_order(_end_company); } managing = _end_company; @@ -138,12 +138,12 @@ function task_selector_man_manage(){ break; case "tech_marine_promote": _unit.squad="none"; - var start_company = _unit.company; + var _start_company = _unit.company; var _end_company = selection_data.target_company; var endslot = find_company_open_slot(_end_company); - scr_move_unit_info(start_company, _end_company, _unit.marine_number,endslot); + scr_move_unit_info(_start_company, _end_company, _unit.marine_number,endslot); with (obj_ini){ - scr_company_order(start_company); + scr_company_order(_start_company); scr_company_order(_end_company); } managing = _end_company; @@ -152,12 +152,12 @@ function task_selector_man_manage(){ break; case "librarian_promote": _unit.squad="none"; - var start_company = _unit.company; + var _start_company = _unit.company; var _end_company = selection_data.target_company; var endslot = find_company_open_slot(_end_company); - scr_move_unit_info(start_company, _end_company, _unit.marine_number,endslot); + scr_move_unit_info(_start_company, _end_company, _unit.marine_number,endslot); with (obj_ini){ - scr_company_order(start_company); + scr_company_order(_start_company); scr_company_order(_end_company); } managing = _end_company; diff --git a/scripts/scr_marine_struct/scr_marine_struct.gml b/scripts/scr_marine_struct/scr_marine_struct.gml index f18cfdcacb..5d81409d9b 100644 --- a/scripts/scr_marine_struct/scr_marine_struct.gml +++ b/scripts/scr_marine_struct/scr_marine_struct.gml @@ -508,6 +508,8 @@ function TTRPG_stats(faction, comp, mar, class = "marine", other_spawn_data = {} personal_livery = {}; personal_culture = []; + manage_tags = []; + static set_exp = function(new_val) { experience = new_val; var _powers_learned = 0; diff --git a/scripts/scr_popup_functions/scr_popup_functions.gml b/scripts/scr_popup_functions/scr_popup_functions.gml index 818135c9aa..93d319e7a6 100644 --- a/scripts/scr_popup_functions/scr_popup_functions.gml +++ b/scripts/scr_popup_functions/scr_popup_functions.gml @@ -6,6 +6,7 @@ enum POPUP_TYPE { EQUIP = 6, ARTIFACT_EQUIP = 8, ITEM_GIFT = 9, + ADD_TAGS = 12, FLEET_MOVE = 99, } diff --git a/scripts/scr_system_search_helpers/scr_system_search_helpers.gml b/scripts/scr_system_search_helpers/scr_system_search_helpers.gml index de17cd7fd1..9f4364ad63 100644 --- a/scripts/scr_system_search_helpers/scr_system_search_helpers.gml +++ b/scripts/scr_system_search_helpers/scr_system_search_helpers.gml @@ -150,7 +150,7 @@ function scr_get_stars(shuffled=false, ownership=[], types = []) { } if (_add && _types_sort){ for (var i=1;i<=planets;i++){ - array_delete_value(types, p_type[i]); + types = array_delete_value(types, p_type[i]); if (!array_length(types)){ break; } diff --git a/scripts/scr_transfer_marines/scr_transfer_marines.gml b/scripts/scr_transfer_marines/scr_transfer_marines.gml index 2eef6c484c..e6e8818ddb 100644 --- a/scripts/scr_transfer_marines/scr_transfer_marines.gml +++ b/scripts/scr_transfer_marines/scr_transfer_marines.gml @@ -187,6 +187,34 @@ function set_up_transfer_popup(){ instance_destroy(); } } + } else { + with (pip){ + cancel_button = new UnitButtonObject( + { + x1: 1061, + y1: 491, + style : "pixel", + label : "Cancel" + } + ); + main_slate = new DataSlate({ + style : "decorated", + XX : 1006, + YY : 143, + set_width : true, + width : 571, + height : 350, + }); + target_company_radio(_min_exp); + transfer_button = new UnitButtonObject( + { + x1: 1450, + y1: 491, + style : "pixel", + label : "Transfer" + } + ); + } } } } diff --git a/scripts/scr_ui_manage/scr_ui_manage.gml b/scripts/scr_ui_manage/scr_ui_manage.gml index 28cab876d8..55ebd9842c 100644 --- a/scripts/scr_ui_manage/scr_ui_manage.gml +++ b/scripts/scr_ui_manage/scr_ui_manage.gml @@ -126,13 +126,61 @@ function command_slot_draw(xx, yy, slot_text){ } } + +function company_specific_management(){ + add_draw_return_values(); + draw_set_font(fnt_40k_30b); + draw_set_halign(fa_center); + draw_set_color(c_gray); // 38144 + var _allow_shorts = false; + var _comp = ""; + if (managing > 20) { + _comp = managing - 10; + } else if ((managing >= 1) && (managing <= 10)) { + _company_name = int_to_roman(managing) + " Company"; + _comp = managing; + } else if (managing > 10) { + switch (managing) { + case 11: + _company_name = "Headquarters"; + break; + case 12: + _company_name = "Apothecarion"; + break; + case 13: + _company_name = "Librarium"; + break; + case 14: + _company_name = "Reclusium"; + break; + case 15: + _company_name = "Armamentarium"; + break; + } + } + // Draw the company followed by chapters name + draw_text(800, 74, $"{_company_name}, {global.chapter_name}"); + if (managing <= 10 ) { + var _text_input = management_buttons.company_namer; + + obj_ini.company_title[managing] = _text_input.draw(obj_ini.company_title[managing]); + _allow_shorts = !_text_input.allow_input; + } else { + _allow_shorts = true; + } + if (allow_shortcuts){ + allow_shortcuts = _allow_shorts; + } + pop_draw_return_values() +} + function alternative_manage_views(x1, y1) { var _squad_button = management_buttons.squad_toggle; _squad_button.update({ x1: x1 + 5, y1: y1 + 6, label: !obj_controller.view_squad && !obj_controller.company_report ? "Squad View" : "Company View", - keystroke: keyboard_check_pressed(ord("S")) + keystroke: keyboard_check_pressed(ord("S")) && allow_shortcuts }); if (company_data.has_squads){ @@ -150,7 +198,7 @@ function alternative_manage_views(x1, y1) { label: !unit_profile ? "Show Profile" : "Hide Profile", x1: _squad_button.x2, y1: _squad_button.y1, - keystroke: keyboard_check_pressed(ord("P")) + keystroke: keyboard_check_pressed(ord("P")) && allow_shortcuts }); if (_profile_toggle.draw(!text_bar)) { unit_profile = !unit_profile; @@ -162,7 +210,7 @@ function alternative_manage_views(x1, y1) { label: !unit_bio ? "Show Bio" : "Hide Bio", x1: _profile_toggle.x2, y1: _profile_toggle.y1, - keystroke: keyboard_check_pressed(ord("B")) + keystroke: keyboard_check_pressed(ord("B")) && allow_shortcuts }); if (bio_toggle.draw(!text_bar)) { unit_bio = !unit_bio; @@ -522,7 +570,7 @@ function scr_ui_manage() { if (managing > 0) { company_manage_actions(); } - if (!text_bar) { + if (allow_shortcuts) { ui_manage_hotkeys(); } } @@ -557,37 +605,10 @@ function scr_ui_manage() { draw_set_color(c_gray); // 38144 // Var declarations - var c = 0, fx = "", skin = obj_ini.skin_color; + var c = 0, _company_name = "", skin = obj_ini.skin_color; static stats_displayed = false; - if (managing > 0) { - if (managing > 20) { - c = managing - 10; - } else if ((managing >= 1) && (managing <= 10)) { - fx = int_to_roman(managing) + " Company"; - c = managing; - } else if (managing > 10) { - switch (managing) { - case 11: - fx = "Headquarters"; - break; - case 12: - fx = "Apothecarion"; - break; - case 13: - fx = "Librarium"; - break; - case 14: - fx = "Reclusium"; - break; - case 15: - fx = "Armamentarium"; - break; - } - } - // Draw the company followed by chapters name - draw_text(xx + 800, yy + 74, string(fx) + ", " + string(global.chapter_name)); - } else if (managing < 0) { + if (managing < 0) { if (struct_exists(selection_data, "purpose")) { draw_text(xx + 800, yy + 74, $"{selection_data.purpose}"); } @@ -596,38 +617,8 @@ function scr_ui_manage() { } } - if (managing <= 10 && managing > 0) { - var bar_wid = 0, click_check, string_h; - draw_set_alpha(0.25); - if (obj_ini.company_title[managing] != "") { - bar_wid = max(400, string_width(obj_ini.company_title[managing])); - } - if (obj_ini.company_title[managing] == "") { - bar_wid = 400; - } - string_h = string_height("LOL"); - draw_rectangle(xx + 800 - (bar_wid / 2), yy + 108, xx + 800 + (bar_wid / 2), yy + 100 + string_h, 1); - click_check = point_and_click([xx + 800 - (bar_wid / 2), yy + 108, xx + 800 + (bar_wid / 2), yy + 100 + string_h]); - obj_cursor.image_index = 0; - text_bar = false; - if (click_check) { - obj_cursor.image_index = 2; - text_bar = true; - keyboard_string = obj_ini.company_title[managing]; - } - draw_set_alpha(1); - - if ((obj_ini.company_title[managing] != "") || (text_bar > 0)) { - draw_set_font(fnt_fancy); - if ((text_bar == 0) || (text_bar > 31)) { - draw_text(xx + 800, yy + 110, $"''{obj_ini.company_title[managing]} {(text_bar > 0 && text_bar <= 31) ? "|" : ""}'' "); - } - } - } - draw_set_font(fnt_40k_14); - // var we;we=string_width(string(global.chapter_name)+" "+string(fx))/2; if (managing >= 0) { // Draw arrows @@ -816,9 +807,12 @@ function scr_ui_manage() { break; } - while ((man[sel] == "hide" || man_sel[sel] != 1 && _only_display_selected) && (sel < array_length(display_unit) - 1)) { + while ((sel <= array_length(display_unit) - 1) && (man[sel] == "hide" || (man_sel[sel] != 1 && _only_display_selected))) { sel += 1; } + if (sel >= array_length(display_unit)) { + break; + } if (scr_draw_management_unit(sel, yy, xx, true, _only_display_selected) == "continue") { sel++; i--; @@ -1079,20 +1073,18 @@ function scr_ui_manage() { button.move("right", true); - button.label = "Add Tag"; + button.label = "Manage Tags"; button.keystroke = keyboard_check(vk_shift) && keyboard_check_pressed(ord("F")); - button.tooltip = "Coming soon"; //Press Shift F"; - tag_possible = man_size > 0; - tag_possible = false; + button.tooltip = "Press Shift F" //Press Shift F"; button.alpha = 0.5; - if (tag_possible) { - button.alpha = 1; - if (button.draw()) { - load_selection(); + + button.alpha = 1; + if (button.draw()) { + if (!instance_exists(obj_popup)){ + set_up_tag_manager(); + } else if (obj_popup.type == POPUP_TYPE.ADD_TAGS){ + instance_destroy(obj_popup); } - } else { - button.alpha = 0.5; - button.draw(false); } if (sel_uni[1] != "") { diff --git a/sprites/spr_company_title/spr_company_title.yy b/sprites/spr_company_title/spr_company_title.yy index 18e967eaff..adc402ee74 100644 --- a/sprites/spr_company_title/spr_company_title.yy +++ b/sprites/spr_company_title/spr_company_title.yy @@ -67,16 +67,28 @@ "playbackSpeedType":1, "resourceType":"GMSequence", "resourceVersion":"2.0", + "seqHeight":4.0, + "seqWidth":107.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":"96f4818d-2abf-4dbb-9091-dda8c16f8d91","path":"sprites/spr_company_title/spr_company_title.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"348ed9fe-7199-4bdd-b0ae-c09c62700796","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"78cdfbff-e2ab-4284-a510-7bd46996352c","path":"sprites/spr_company_title/spr_company_title.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"3de06e82-26f1-4b66-bcf9-3b1743d5a100","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"0c92f00f-18d5-4e3e-95a5-d2e445da36ff","path":"sprites/spr_company_title/spr_company_title.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"80742708-10df-4876-99f2-c603ebc8b4f3","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"bb1570f7-dfce-415e-a264-421464e1321a","path":"sprites/spr_company_title/spr_company_title.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"dcfe9a46-7af9-443f-898b-0a1cadf8d2ea","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"40f0521b-75e7-4e26-b6c8-de7784fefbbc","path":"sprites/spr_company_title/spr_company_title.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"344993fa-4ffe-4352-851f-29ca1116afaf","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"96f4818d-2abf-4dbb-9091-dda8c16f8d91","path":"sprites/spr_company_title/spr_company_title.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"348ed9fe-7199-4bdd-b0ae-c09c62700796","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"78cdfbff-e2ab-4284-a510-7bd46996352c","path":"sprites/spr_company_title/spr_company_title.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"3de06e82-26f1-4b66-bcf9-3b1743d5a100","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"0c92f00f-18d5-4e3e-95a5-d2e445da36ff","path":"sprites/spr_company_title/spr_company_title.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"80742708-10df-4876-99f2-c603ebc8b4f3","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"bb1570f7-dfce-415e-a264-421464e1321a","path":"sprites/spr_company_title/spr_company_title.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"dcfe9a46-7af9-443f-898b-0a1cadf8d2ea","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"40f0521b-75e7-4e26-b6c8-de7784fefbbc","path":"sprites/spr_company_title/spr_company_title.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"344993fa-4ffe-4352-851f-29ca1116afaf","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_data_slate/spr_data_slate.yy b/sprites/spr_data_slate/spr_data_slate.yy index 88b0c699d7..f2aede4936 100644 --- a/sprites/spr_data_slate/spr_data_slate.yy +++ b/sprites/spr_data_slate/spr_data_slate.yy @@ -64,13 +64,19 @@ "playbackSpeedType":0, "resourceType":"GMSequence", "resourceVersion":"2.0", + "seqHeight":860.0, + "seqWidth":850.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":"f80bbb04-8bfb-4be3-b6f4-2914d55a9273","path":"sprites/spr_data_slate/spr_data_slate.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"e0535903-fd8e-4ce5-a8b1-44582bfc84b2","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"bd12575d-6936-47ed-b150-8734d5c98140","path":"sprites/spr_data_slate/spr_data_slate.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"777e253c-d627-4024-b69e-8a0be5b877cf","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"f80bbb04-8bfb-4be3-b6f4-2914d55a9273","path":"sprites/spr_data_slate/spr_data_slate.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"e0535903-fd8e-4ce5-a8b1-44582bfc84b2","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"bd12575d-6936-47ed-b150-8734d5c98140","path":"sprites/spr_data_slate/spr_data_slate.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"777e253c-d627-4024-b69e-8a0be5b877cf","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_defeat/b39b5ff0-3a40-4c08-84c7-d1d9c6dd0bb6.png b/sprites/spr_defeat/b39b5ff0-3a40-4c08-84c7-d1d9c6dd0bb6.png new file mode 100644 index 0000000000000000000000000000000000000000..da96d18e57eb5fa5c444ba83753cd756c59fccb4 GIT binary patch literal 295 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=k0Y$sR$z3=CCj3=9n|3=F@3LJcn% z7)lKo7+xhXFj&oCU=S~uvn$XBD8ZKG?e464!{5l*E!$tK_0oAjM#0U}UOmV6JOq9Aac_Wo&6> zVytaoU}a!Xqj$a;MMG|WN@iLmZVkM}<@P`g8gLs*GILXlOA>PnaO;Um3wr?6!{F)a K=d#Wzp$P!A98A*y literal 0 HcmV?d00001 diff --git a/sprites/spr_defeat/layers/b39b5ff0-3a40-4c08-84c7-d1d9c6dd0bb6/5f8a8902-d3e2-4d02-bd8e-3552df863e7d.png b/sprites/spr_defeat/layers/b39b5ff0-3a40-4c08-84c7-d1d9c6dd0bb6/5f8a8902-d3e2-4d02-bd8e-3552df863e7d.png new file mode 100644 index 0000000000000000000000000000000000000000..da96d18e57eb5fa5c444ba83753cd756c59fccb4 GIT binary patch literal 295 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=k0Y$sR$z3=CCj3=9n|3=F@3LJcn% z7)lKo7+xhXFj&oCU=S~uvn$XBD8ZKG?e464!{5l*E!$tK_0oAjM#0U}UOmV6JOq9Aac_Wo&6> zVytaoU}a!Xqj$a;MMG|WN@iLmZVkM}<@P`g8gLs*GILXlOA>PnaO;Um3wr?6!{F)a K=d#Wzp$P!A98A*y literal 0 HcmV?d00001 diff --git a/sprites/spr_defeat/spr_defeat.yy b/sprites/spr_defeat/spr_defeat.yy index 6f09eb5ff5..eb5ff4c72a 100644 --- a/sprites/spr_defeat/spr_defeat.yy +++ b/sprites/spr_defeat/spr_defeat.yy @@ -11,7 +11,9 @@ "DynamicTexturePage":false, "edgeFiltering":false, "For3D":false, - "frames":[], + "frames":[ + {"$GMSpriteFrame":"v1","%Name":"b39b5ff0-3a40-4c08-84c7-d1d9c6dd0bb6","name":"b39b5ff0-3a40-4c08-84c7-d1d9c6dd0bb6","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":"b39b5ff0-3a40-4c08-84c7-d1d9c6dd0bb6","path":"sprites/spr_defeat/spr_defeat.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"b24613cb-a809-41ee-8f18-3c1cb6d12596","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_forge_holo/spr_forge_holo.yy b/sprites/spr_forge_holo/spr_forge_holo.yy index 78c33c16bf..628c9b7fc7 100644 --- a/sprites/spr_forge_holo/spr_forge_holo.yy +++ b/sprites/spr_forge_holo/spr_forge_holo.yy @@ -63,12 +63,16 @@ "playbackSpeedType":0, "resourceType":"GMSequence", "resourceVersion":"2.0", + "seqHeight":500.0, + "seqWidth":600.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":"f41be05e-734f-47ef-9186-d8292a3f7b91","path":"sprites/spr_forge_holo/spr_forge_holo.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"be63aa50-0d74-4281-81ab-928c1b946504","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"f41be05e-734f-47ef-9186-d8292a3f7b91","path":"sprites/spr_forge_holo/spr_forge_holo.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"be63aa50-0d74-4281-81ab-928c1b946504","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_ingame_menu/spr_ingame_menu.yy b/sprites/spr_ingame_menu/spr_ingame_menu.yy index 5c4c96064f..dbd9b1eae5 100644 --- a/sprites/spr_ingame_menu/spr_ingame_menu.yy +++ b/sprites/spr_ingame_menu/spr_ingame_menu.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":"b65f6694-b366-414f-9654-e26918f980bb","path":"sprites/spr_ingame_menu/spr_ingame_menu.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"2ba6d12f-8596-48c6-9521-69317197d1f5","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"b65f6694-b366-414f-9654-e26918f980bb","path":"sprites/spr_ingame_menu/spr_ingame_menu.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"2ba6d12f-8596-48c6-9521-69317197d1f5","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_load_splash/spr_load_splash.yy b/sprites/spr_load_splash/spr_load_splash.yy index 8e28f807ca..981a0cc925 100644 --- a/sprites/spr_load_splash/spr_load_splash.yy +++ b/sprites/spr_load_splash/spr_load_splash.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":"9f37f9ad-5acf-4749-b330-653b00bf1685","path":"sprites/spr_load_splash/spr_load_splash.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"f4a62229-0821-40e8-ba11-6460df7dfcbf","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"9f37f9ad-5acf-4749-b330-653b00bf1685","path":"sprites/spr_load_splash/spr_load_splash.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"f4a62229-0821-40e8-ba11-6460df7dfcbf","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_load_text/spr_load_text.yy b/sprites/spr_load_text/spr_load_text.yy index 307254ed1f..1630400e62 100644 --- a/sprites/spr_load_text/spr_load_text.yy +++ b/sprites/spr_load_text/spr_load_text.yy @@ -65,14 +65,22 @@ "playbackSpeedType":1, "resourceType":"GMSequence", "resourceVersion":"2.0", + "seqHeight":53.0, + "seqWidth":187.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":"babe11d3-8f2c-4fc0-8eb3-ffc125e6fb5c","path":"sprites/spr_load_text/spr_load_text.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"70d9d206-2244-4eb3-ab1e-db128d778083","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"b065e4b2-6233-4f3b-8c82-cf5a9264d1e8","path":"sprites/spr_load_text/spr_load_text.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"e3e5baa6-38ac-4bc8-874e-4765f803541f","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"5a4b62e7-6e59-4e4e-b377-fc2bda6b5e79","path":"sprites/spr_load_text/spr_load_text.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"f6fb65d0-5839-486c-b262-bb90df98c9dd","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"babe11d3-8f2c-4fc0-8eb3-ffc125e6fb5c","path":"sprites/spr_load_text/spr_load_text.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"70d9d206-2244-4eb3-ab1e-db128d778083","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"b065e4b2-6233-4f3b-8c82-cf5a9264d1e8","path":"sprites/spr_load_text/spr_load_text.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"e3e5baa6-38ac-4bc8-874e-4765f803541f","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"5a4b62e7-6e59-4e4e-b377-fc2bda6b5e79","path":"sprites/spr_load_text/spr_load_text.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"f6fb65d0-5839-486c-b262-bb90df98c9dd","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_loadbar_cover/spr_loadbar_cover.yy b/sprites/spr_loadbar_cover/spr_loadbar_cover.yy index 96e076bab2..d73eda019f 100644 --- a/sprites/spr_loadbar_cover/spr_loadbar_cover.yy +++ b/sprites/spr_loadbar_cover/spr_loadbar_cover.yy @@ -163,112 +163,316 @@ "playbackSpeedType":1, "resourceType":"GMSequence", "resourceVersion":"2.0", + "seqHeight":13.0, + "seqWidth":443.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":"ee0d14e4-33e3-41e9-b76d-dca309d76ad9","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"2b0b789b-4bdb-401e-96da-afd7c75c6210","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"f270f2a7-106e-4206-b281-695e204d1fb5","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"bbdbe1e1-971b-4311-9cb1-02d712e9c45d","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"522fa573-e304-4534-9cd1-3a7eb9d1fa85","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"739b10e1-22aa-4249-b5ef-46e7de8f01ba","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"936fdbeb-4b78-4752-a6f2-e034907abe7b","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"7e7b972c-c86c-4927-9a87-3f5f42040f25","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"2f30c4f3-a697-4fd9-9169-f435b4405a16","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"005472ef-931c-469f-9b69-bf219369c957","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"4d46705d-b833-4d6e-8abd-6033c5cd5ce5","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"f8a29f74-64aa-4e66-a3ff-04705653ca26","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"7d5b3d2c-0241-4728-995f-e7677c1e7e2e","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"ad0a45db-46f4-4610-af7e-61aad464033d","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"16d84a8d-7b48-4f33-83f4-26d64fcb25c2","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"d278022c-ce16-41a7-8353-cdde545725cb","IsCreationKey":false,"Key":7.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"96733f64-cd1f-4cec-8e30-dc22a2e69a46","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"03b3f0d0-dfbd-4da7-9d9b-c8af86b22b49","IsCreationKey":false,"Key":8.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"39e4d2ef-0a45-4891-aba7-fe8fee30953e","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"c722e800-1cf3-4261-9f64-975857febd9f","IsCreationKey":false,"Key":9.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"cd69f163-4f5d-498f-9626-78607c751537","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"24bc6109-dc30-4c93-961c-08deaecc686e","IsCreationKey":false,"Key":10.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"5b8470f0-1f27-4104-b687-cb965c775614","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"38a86e47-5cb0-4b12-80bd-64a52904c277","IsCreationKey":false,"Key":11.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"b4d0f773-f488-4932-9aa3-265920a8f897","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"984d49d9-9992-46a5-bc95-9bdd882f1d74","IsCreationKey":false,"Key":12.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"996a27ed-d5bc-4d10-bc45-024bb9576ff8","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"9431008b-0236-4d32-b6b9-d9b49ff2d1f9","IsCreationKey":false,"Key":13.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"112e4e63-bd13-4011-8039-f279dadb602e","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"d975b258-346e-4e6e-ad69-749afe3437e1","IsCreationKey":false,"Key":14.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"aa241cbb-d783-4a57-b89f-a3d03e66f21d","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"44699ee4-d5f8-43ea-b53f-b0c8b6edf660","IsCreationKey":false,"Key":15.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"dd62d727-be6c-415a-99cd-f5de4fdb103a","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"16b61097-3845-4557-b2bf-d98cd8802e98","IsCreationKey":false,"Key":16.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"f4ff012a-ee06-4fe8-84b7-82842d5fb3e9","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"24153104-6610-48e7-ae67-f3e70f6eddb9","IsCreationKey":false,"Key":17.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"2b1b8ba1-1c08-4982-aa07-e7b934a90a91","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"6d6f6a2b-0fad-4e3e-8e22-ffebef9054c5","IsCreationKey":false,"Key":18.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"16883075-4215-499b-8420-ae62da7885b3","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"37dafa46-2c53-4558-b0bb-dd9fc36d7436","IsCreationKey":false,"Key":19.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"67ca0cc1-b3e6-4030-a21b-3fbccb49e569","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"37d06089-d4dc-4d9f-8610-eb87e097c6bb","IsCreationKey":false,"Key":20.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"073c6354-9f1a-403c-af4c-9f7e11558113","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"cf884d00-1749-4528-823d-3f8d181e6e01","IsCreationKey":false,"Key":21.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"c50586b8-1616-46a7-ab52-621258e72d24","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"a159d481-4be3-4d4d-b7f7-ec8fd2c7c9d0","IsCreationKey":false,"Key":22.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"7dea7750-7395-4a7e-bc4c-1622df7a2cbf","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"2b573560-5787-4e28-9679-1437b238717e","IsCreationKey":false,"Key":23.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"92b7ffac-f927-44fe-95f2-bd4341b5f27a","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"292929e6-f71b-4075-b1a8-09b429e1452a","IsCreationKey":false,"Key":24.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"bc92382f-39f4-4234-a7ec-9adff3753797","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"53aaea6d-7fec-406d-9cd5-c4b3ffa4fdf9","IsCreationKey":false,"Key":25.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"e61b5912-0ae5-4c54-bde5-a78fc0369549","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"30b8af86-0f0c-456b-abfc-9ae65d1468b2","IsCreationKey":false,"Key":26.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"086ee7b7-2a83-46bd-801c-034bd3897145","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"cee99131-344c-47b4-a677-40fd26cc818c","IsCreationKey":false,"Key":27.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"17186ae0-6f03-47a5-b79b-a745ced48618","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"cf16cec1-c3ee-4125-a420-a75feffded91","IsCreationKey":false,"Key":28.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"f0011933-8620-4fe5-90bc-2fe2b3df5bef","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"7f9fead9-cae1-4f65-b3ed-b2b74007d2b6","IsCreationKey":false,"Key":29.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"b330b6b2-192a-4de0-adfd-cba28cdd83d2","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"bd6760f6-1268-414b-8766-6b54ef3dfb54","IsCreationKey":false,"Key":30.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"88dff011-f0d7-43fc-94a8-32f332baf6c1","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"ac0acf35-3b64-4e58-a163-7fe24cea802e","IsCreationKey":false,"Key":31.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"2eb5da78-7aaf-42fe-b31a-9e8bcb4a721c","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"d6724212-220c-49e5-b2d1-d5ca38544c0e","IsCreationKey":false,"Key":32.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"59b94851-05b4-424c-a678-d9df694da13f","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"1bebb4de-d816-40e6-a212-be02c23b7371","IsCreationKey":false,"Key":33.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"48e6e0df-250c-4313-9521-88fc5cee2be2","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"7faec82c-af74-4e1a-b2d4-4b26d90177e2","IsCreationKey":false,"Key":34.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"6706cebb-96d9-4335-8dec-4fc2285a98e1","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"9d4f482a-716b-4e29-bf35-eaf601939091","IsCreationKey":false,"Key":35.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"ab4ed675-82c1-4f80-abd4-ddbcadbf7114","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"e9620a79-e6dd-4938-a234-5dc3801cf2b3","IsCreationKey":false,"Key":36.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"b54bf828-8d29-4e6b-9e09-5863969f44b4","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"0bc6d2e7-33fc-4e30-b3e7-aa4d0f97618c","IsCreationKey":false,"Key":37.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"82780114-bc2c-4080-95ea-0b3908914da6","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"9c13ea8e-eefe-470c-bdf6-41c08f6ee95d","IsCreationKey":false,"Key":38.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"df11f0c7-ba0c-4c65-b86e-a368c90d8094","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"7d902a25-39e8-4a6c-aeb2-39658d78e27c","IsCreationKey":false,"Key":39.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"425a2b21-1b7c-4060-9429-39cc3011d999","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"ae86d625-c635-47ba-9df2-ffddc11d41cc","IsCreationKey":false,"Key":40.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"913e2d4b-0ca1-4bbd-bc01-4fd5e599053a","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"8576f60e-16af-42f7-a350-ed6edb82f163","IsCreationKey":false,"Key":41.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"7a265b9c-cde0-4ff5-bf6e-364d90bcdb5e","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"d21af454-b326-4b54-b79d-4266b32b7f32","IsCreationKey":false,"Key":42.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"ee4e0a74-c9e9-4bab-b85c-183df0b5070b","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"79c3668c-6b4e-4f08-93ad-d241bffbfa8f","IsCreationKey":false,"Key":43.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"5439c2d6-ee02-4bc7-ab82-4a5854ee1d2c","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"0964d0e0-8720-49e0-b660-21d00d6afc67","IsCreationKey":false,"Key":44.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"aed5da4d-ea30-4654-a61f-16967414002e","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"7a539e36-19c9-4b11-bf0c-543c10ce9d5c","IsCreationKey":false,"Key":45.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"c5bba97a-d671-49c8-84d2-f995712fc403","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"a82a0bf8-2e6b-4d8e-b502-3bbaad4b3e1b","IsCreationKey":false,"Key":46.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"daa9667b-a496-4f30-b167-6af80c119e30","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"1442d228-921c-44f3-8190-d495e0b40d7c","IsCreationKey":false,"Key":47.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"f22c2d34-46b9-4440-a86f-37fd859f7cda","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"64cb21de-5b8f-4c11-876d-84c96c118770","IsCreationKey":false,"Key":48.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"a9cd073b-de37-49db-9f59-f6cd38490c52","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"20e56132-6426-44ab-bd71-83a8e39e5e25","IsCreationKey":false,"Key":49.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"24bea0d7-bb4e-469d-a9c0-97635743d8ed","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"c6a4a33c-b0ee-4efa-a014-74cf6037c262","IsCreationKey":false,"Key":50.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"4f82e291-5fc6-45bc-a208-3647e5830f17","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"414d5ad0-8dc3-445e-a5e1-3529223ce19e","IsCreationKey":false,"Key":51.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"c113a74f-504d-475b-8115-f90294743c81","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"b0b3db1b-5491-4baf-a0e5-f2b5f75624e6","IsCreationKey":false,"Key":52.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"be762ab0-d12d-48d2-bb53-d4730721531b","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"95e3bd3f-ca82-4058-8ceb-65f74e7a5c89","IsCreationKey":false,"Key":53.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"e0e1e619-158f-4bba-b8b5-94dcc1953491","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"cd83a6b7-311f-4808-873c-c58f1b0db25f","IsCreationKey":false,"Key":54.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"71bd4d2e-1907-49d9-b5b0-6ee0d6aabb00","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"62d887ff-579d-4210-a7db-8129c8e81fde","IsCreationKey":false,"Key":55.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"af6c6100-804f-4c05-8d22-71e0211d277a","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"7311716e-8bfc-494e-8c50-f96a90f80b50","IsCreationKey":false,"Key":56.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"44daeebc-81f7-4a3e-9566-e297f548509d","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"e425231f-3a7e-4074-8576-7784f54854b5","IsCreationKey":false,"Key":57.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"76358f9c-44de-4773-bf94-08cfd0b706b7","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"f29bee25-b9a9-414e-9f6f-af7368b6b2e3","IsCreationKey":false,"Key":58.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"f3a1b3c0-9b73-40e4-bbcf-e3c2b025a98b","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"d29a2eb1-995f-416f-8d57-591692b16f8f","IsCreationKey":false,"Key":59.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"5324fcf9-6bd3-4064-9ebf-0af8b4c636d7","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"78090b8e-e008-4abe-b9d9-cd85610ceb8b","IsCreationKey":false,"Key":60.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"428c192f-e278-49f5-8d3b-74b07cd088b1","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"ce03e653-b78e-487d-8d27-d7c309147c31","IsCreationKey":false,"Key":61.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"a53ac2d7-2889-41a4-8d1b-6a0bf2f7bac9","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"ac0b54a5-db44-4308-96c3-c2ac0ed47b6d","IsCreationKey":false,"Key":62.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"51927562-4d2a-436b-adbb-62a690d6c661","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"de398855-c826-42e4-8362-bc3e291045b5","IsCreationKey":false,"Key":63.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"59b0bcf3-19ed-4f4c-b0e5-2c349fc1a26b","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"de94934c-4ebf-44dd-b634-54132bf008b5","IsCreationKey":false,"Key":64.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"f45bfd5f-8167-4b03-a26c-6468a48db3f1","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"0c870f91-064e-48c8-8038-9edb0c837366","IsCreationKey":false,"Key":65.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"8af43abe-2954-4429-a96e-5553ad6375c9","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"55054fbe-46a5-4879-acb7-40660cfdc7e5","IsCreationKey":false,"Key":66.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"578f1ad8-ccce-405b-af49-70f5b5ec6bc5","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"40b36087-ab89-4d97-8a24-749b87b03beb","IsCreationKey":false,"Key":67.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"16dfc277-8209-4c38-a4fa-acff85d6b150","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"58ab3ae2-4ba4-472d-88d7-451f6e5ca2eb","IsCreationKey":false,"Key":68.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"f068b9df-7ba7-4686-85c5-88a2ec6ce6a9","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"2ff78728-0939-4a0e-9b9c-9851d8047ffd","IsCreationKey":false,"Key":69.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"43771aa1-f221-4485-9c32-0ca06344e04c","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"a4857572-07c1-4a73-bf58-d9f8464fc2fb","IsCreationKey":false,"Key":70.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"6d9c5187-edc7-4f27-a6b0-7c3fb4a355d7","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"8d58b775-994c-4ca0-a3bf-a8742b9c21de","IsCreationKey":false,"Key":71.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"6f3452a1-a45b-4c09-a126-a8f0afafd909","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"d993ee28-a89d-42cc-bef9-51c5caf584d8","IsCreationKey":false,"Key":72.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"e522eb85-b82f-4feb-b671-5108350cfb16","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"97a668ce-c178-4d92-9e9b-dc4aff0cb736","IsCreationKey":false,"Key":73.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"b398bcd4-2967-43bd-aceb-351f1a577bd9","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"46a5df03-5cf0-4b89-a27c-ee7e2d3a2c80","IsCreationKey":false,"Key":74.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"71ff8ca0-3f42-4dda-9730-4a2ac4530c17","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"1f8dc377-3aa1-4816-a121-6a259c18db36","IsCreationKey":false,"Key":75.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"db054ef7-2537-41d7-bcaf-34b5f9073296","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"6f82652c-28d3-4186-b10c-c9109b2c55e8","IsCreationKey":false,"Key":76.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"7e595fd1-f058-4eb0-92b2-7112b02693f0","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"1492999b-1cb4-4c01-80f0-35941c4bf15d","IsCreationKey":false,"Key":77.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"73be05d6-bdbf-488d-824a-4fe1cb89e070","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"b5dee69b-eb3a-47a8-b11d-b76de78a9a28","IsCreationKey":false,"Key":78.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"76cd8d8c-db17-401c-a660-84e8565440be","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"f4f905d2-ad21-47e7-a476-1fb03417644f","IsCreationKey":false,"Key":79.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"fa9a6a5f-d27f-4915-bd3c-654e9b88bad4","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"73da1b91-82d6-4fb1-9452-acad9f6d75fc","IsCreationKey":false,"Key":80.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"59a7ad1b-f30b-468a-b661-11fa1a07fcff","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"4a13fa07-b693-4d51-910f-92c8867be917","IsCreationKey":false,"Key":81.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"beea7bcb-bb67-48bd-abce-529db7dbe41c","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"62a6e637-eb9f-4f76-a6fa-ca9c1e6de9df","IsCreationKey":false,"Key":82.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"8698f1a0-7ff8-4a84-8bd2-e389ec25a420","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"a53e3b90-cf7f-47b2-9ad2-3105e0b2fc3c","IsCreationKey":false,"Key":83.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"932663f3-9530-4c49-8d84-8c20a41549ef","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"2b82f6ff-199b-46dc-a0cd-f754e229ceb1","IsCreationKey":false,"Key":84.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"13c95d20-70e5-4988-b859-c15ab08abd85","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"82405c83-797a-4506-bceb-490563a38732","IsCreationKey":false,"Key":85.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"b709ce77-9b28-4388-bd75-f096350846ff","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"ca72f368-e6aa-4854-87b0-a68da0221055","IsCreationKey":false,"Key":86.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"f8fe5a01-de13-4476-9af8-bcc7f187bba4","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"2ee0754e-dac4-4409-b340-891ed282fa74","IsCreationKey":false,"Key":87.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"164fb034-c917-4aeb-8e30-0c4c989a3560","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"7bd3efdd-0bc5-41af-af15-2795d790b5ad","IsCreationKey":false,"Key":88.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"bbe1b91b-58af-460f-abd5-80225a8dde77","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"707bed96-75aa-4dd0-81fd-c35afaab1262","IsCreationKey":false,"Key":89.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"d1aff5b9-0c78-4ddc-8cf9-1e2daf3607b0","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"26e6d9d7-a200-4539-936f-c8b5aa45c97b","IsCreationKey":false,"Key":90.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"e3adda1a-086e-4eab-92b9-84b6bbaa6b58","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"463084e1-f006-476e-82bb-0be3e235ae58","IsCreationKey":false,"Key":91.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"df79b26f-f1ee-45c0-a52a-17bd22edf09b","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"a90247f4-f046-491d-8522-841702b91185","IsCreationKey":false,"Key":92.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"1769e8b5-3c03-48a9-90a2-0502b8dd5d79","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"fa446947-631d-4127-8790-7011d8c63b45","IsCreationKey":false,"Key":93.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"83b76c05-deaf-4543-862f-8e5bc4f242d4","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"49be7cd9-0092-467a-b854-351a2c2d014a","IsCreationKey":false,"Key":94.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"2dddb531-3570-44ff-bfb0-d647ac3c37ed","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"f9a92718-eab9-4754-94f9-64c6c5907072","IsCreationKey":false,"Key":95.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"7df26bce-c930-4969-ab20-6aaa30f85c2e","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"f09d320d-b486-4965-849c-91ef3f2f5d7b","IsCreationKey":false,"Key":96.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"b1ef6c7d-b668-4ece-9607-822177143185","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"de182601-fc79-4a18-afa5-6ae0564ce725","IsCreationKey":false,"Key":97.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"a261ce25-dc09-4e9c-b2ab-ca494eb7f6af","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"a7a40882-8686-40cd-98b5-60b337991b92","IsCreationKey":false,"Key":98.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"3c32a1e3-ebc0-4ac5-bad5-8a1aca452527","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"0ccf1f50-5300-4601-af65-e0d89fe4dd67","IsCreationKey":false,"Key":99.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"92f5ddbd-2444-4532-808e-3b2e26795ba7","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"63a97d6d-c248-471b-baff-5c341a6781d7","IsCreationKey":false,"Key":100.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"ee0d14e4-33e3-41e9-b76d-dca309d76ad9","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"2b0b789b-4bdb-401e-96da-afd7c75c6210","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"f270f2a7-106e-4206-b281-695e204d1fb5","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"bbdbe1e1-971b-4311-9cb1-02d712e9c45d","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"522fa573-e304-4534-9cd1-3a7eb9d1fa85","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"739b10e1-22aa-4249-b5ef-46e7de8f01ba","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"936fdbeb-4b78-4752-a6f2-e034907abe7b","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"7e7b972c-c86c-4927-9a87-3f5f42040f25","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"2f30c4f3-a697-4fd9-9169-f435b4405a16","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"005472ef-931c-469f-9b69-bf219369c957","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"4d46705d-b833-4d6e-8abd-6033c5cd5ce5","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"f8a29f74-64aa-4e66-a3ff-04705653ca26","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"7d5b3d2c-0241-4728-995f-e7677c1e7e2e","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"ad0a45db-46f4-4610-af7e-61aad464033d","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"16d84a8d-7b48-4f33-83f4-26d64fcb25c2","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"d278022c-ce16-41a7-8353-cdde545725cb","IsCreationKey":false,"Key":7.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"96733f64-cd1f-4cec-8e30-dc22a2e69a46","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"03b3f0d0-dfbd-4da7-9d9b-c8af86b22b49","IsCreationKey":false,"Key":8.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"39e4d2ef-0a45-4891-aba7-fe8fee30953e","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"c722e800-1cf3-4261-9f64-975857febd9f","IsCreationKey":false,"Key":9.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"cd69f163-4f5d-498f-9626-78607c751537","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"24bc6109-dc30-4c93-961c-08deaecc686e","IsCreationKey":false,"Key":10.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"5b8470f0-1f27-4104-b687-cb965c775614","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"38a86e47-5cb0-4b12-80bd-64a52904c277","IsCreationKey":false,"Key":11.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"b4d0f773-f488-4932-9aa3-265920a8f897","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"984d49d9-9992-46a5-bc95-9bdd882f1d74","IsCreationKey":false,"Key":12.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"996a27ed-d5bc-4d10-bc45-024bb9576ff8","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"9431008b-0236-4d32-b6b9-d9b49ff2d1f9","IsCreationKey":false,"Key":13.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"112e4e63-bd13-4011-8039-f279dadb602e","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"d975b258-346e-4e6e-ad69-749afe3437e1","IsCreationKey":false,"Key":14.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"aa241cbb-d783-4a57-b89f-a3d03e66f21d","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"44699ee4-d5f8-43ea-b53f-b0c8b6edf660","IsCreationKey":false,"Key":15.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"dd62d727-be6c-415a-99cd-f5de4fdb103a","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"16b61097-3845-4557-b2bf-d98cd8802e98","IsCreationKey":false,"Key":16.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"f4ff012a-ee06-4fe8-84b7-82842d5fb3e9","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"24153104-6610-48e7-ae67-f3e70f6eddb9","IsCreationKey":false,"Key":17.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"2b1b8ba1-1c08-4982-aa07-e7b934a90a91","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"6d6f6a2b-0fad-4e3e-8e22-ffebef9054c5","IsCreationKey":false,"Key":18.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"16883075-4215-499b-8420-ae62da7885b3","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"37dafa46-2c53-4558-b0bb-dd9fc36d7436","IsCreationKey":false,"Key":19.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"67ca0cc1-b3e6-4030-a21b-3fbccb49e569","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"37d06089-d4dc-4d9f-8610-eb87e097c6bb","IsCreationKey":false,"Key":20.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"073c6354-9f1a-403c-af4c-9f7e11558113","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"cf884d00-1749-4528-823d-3f8d181e6e01","IsCreationKey":false,"Key":21.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"c50586b8-1616-46a7-ab52-621258e72d24","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"a159d481-4be3-4d4d-b7f7-ec8fd2c7c9d0","IsCreationKey":false,"Key":22.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"7dea7750-7395-4a7e-bc4c-1622df7a2cbf","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"2b573560-5787-4e28-9679-1437b238717e","IsCreationKey":false,"Key":23.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"92b7ffac-f927-44fe-95f2-bd4341b5f27a","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"292929e6-f71b-4075-b1a8-09b429e1452a","IsCreationKey":false,"Key":24.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"bc92382f-39f4-4234-a7ec-9adff3753797","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"53aaea6d-7fec-406d-9cd5-c4b3ffa4fdf9","IsCreationKey":false,"Key":25.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"e61b5912-0ae5-4c54-bde5-a78fc0369549","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"30b8af86-0f0c-456b-abfc-9ae65d1468b2","IsCreationKey":false,"Key":26.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"086ee7b7-2a83-46bd-801c-034bd3897145","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"cee99131-344c-47b4-a677-40fd26cc818c","IsCreationKey":false,"Key":27.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"17186ae0-6f03-47a5-b79b-a745ced48618","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"cf16cec1-c3ee-4125-a420-a75feffded91","IsCreationKey":false,"Key":28.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"f0011933-8620-4fe5-90bc-2fe2b3df5bef","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"7f9fead9-cae1-4f65-b3ed-b2b74007d2b6","IsCreationKey":false,"Key":29.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"b330b6b2-192a-4de0-adfd-cba28cdd83d2","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"bd6760f6-1268-414b-8766-6b54ef3dfb54","IsCreationKey":false,"Key":30.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"88dff011-f0d7-43fc-94a8-32f332baf6c1","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"ac0acf35-3b64-4e58-a163-7fe24cea802e","IsCreationKey":false,"Key":31.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"2eb5da78-7aaf-42fe-b31a-9e8bcb4a721c","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"d6724212-220c-49e5-b2d1-d5ca38544c0e","IsCreationKey":false,"Key":32.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"59b94851-05b4-424c-a678-d9df694da13f","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"1bebb4de-d816-40e6-a212-be02c23b7371","IsCreationKey":false,"Key":33.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"48e6e0df-250c-4313-9521-88fc5cee2be2","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"7faec82c-af74-4e1a-b2d4-4b26d90177e2","IsCreationKey":false,"Key":34.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"6706cebb-96d9-4335-8dec-4fc2285a98e1","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"9d4f482a-716b-4e29-bf35-eaf601939091","IsCreationKey":false,"Key":35.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"ab4ed675-82c1-4f80-abd4-ddbcadbf7114","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"e9620a79-e6dd-4938-a234-5dc3801cf2b3","IsCreationKey":false,"Key":36.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"b54bf828-8d29-4e6b-9e09-5863969f44b4","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"0bc6d2e7-33fc-4e30-b3e7-aa4d0f97618c","IsCreationKey":false,"Key":37.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"82780114-bc2c-4080-95ea-0b3908914da6","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"9c13ea8e-eefe-470c-bdf6-41c08f6ee95d","IsCreationKey":false,"Key":38.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"df11f0c7-ba0c-4c65-b86e-a368c90d8094","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"7d902a25-39e8-4a6c-aeb2-39658d78e27c","IsCreationKey":false,"Key":39.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"425a2b21-1b7c-4060-9429-39cc3011d999","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"ae86d625-c635-47ba-9df2-ffddc11d41cc","IsCreationKey":false,"Key":40.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"913e2d4b-0ca1-4bbd-bc01-4fd5e599053a","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"8576f60e-16af-42f7-a350-ed6edb82f163","IsCreationKey":false,"Key":41.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"7a265b9c-cde0-4ff5-bf6e-364d90bcdb5e","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"d21af454-b326-4b54-b79d-4266b32b7f32","IsCreationKey":false,"Key":42.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"ee4e0a74-c9e9-4bab-b85c-183df0b5070b","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"79c3668c-6b4e-4f08-93ad-d241bffbfa8f","IsCreationKey":false,"Key":43.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"5439c2d6-ee02-4bc7-ab82-4a5854ee1d2c","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"0964d0e0-8720-49e0-b660-21d00d6afc67","IsCreationKey":false,"Key":44.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"aed5da4d-ea30-4654-a61f-16967414002e","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"7a539e36-19c9-4b11-bf0c-543c10ce9d5c","IsCreationKey":false,"Key":45.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"c5bba97a-d671-49c8-84d2-f995712fc403","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"a82a0bf8-2e6b-4d8e-b502-3bbaad4b3e1b","IsCreationKey":false,"Key":46.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"daa9667b-a496-4f30-b167-6af80c119e30","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"1442d228-921c-44f3-8190-d495e0b40d7c","IsCreationKey":false,"Key":47.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"f22c2d34-46b9-4440-a86f-37fd859f7cda","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"64cb21de-5b8f-4c11-876d-84c96c118770","IsCreationKey":false,"Key":48.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"a9cd073b-de37-49db-9f59-f6cd38490c52","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"20e56132-6426-44ab-bd71-83a8e39e5e25","IsCreationKey":false,"Key":49.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"24bea0d7-bb4e-469d-a9c0-97635743d8ed","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"c6a4a33c-b0ee-4efa-a014-74cf6037c262","IsCreationKey":false,"Key":50.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"4f82e291-5fc6-45bc-a208-3647e5830f17","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"414d5ad0-8dc3-445e-a5e1-3529223ce19e","IsCreationKey":false,"Key":51.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"c113a74f-504d-475b-8115-f90294743c81","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"b0b3db1b-5491-4baf-a0e5-f2b5f75624e6","IsCreationKey":false,"Key":52.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"be762ab0-d12d-48d2-bb53-d4730721531b","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"95e3bd3f-ca82-4058-8ceb-65f74e7a5c89","IsCreationKey":false,"Key":53.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"e0e1e619-158f-4bba-b8b5-94dcc1953491","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"cd83a6b7-311f-4808-873c-c58f1b0db25f","IsCreationKey":false,"Key":54.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"71bd4d2e-1907-49d9-b5b0-6ee0d6aabb00","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"62d887ff-579d-4210-a7db-8129c8e81fde","IsCreationKey":false,"Key":55.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"af6c6100-804f-4c05-8d22-71e0211d277a","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"7311716e-8bfc-494e-8c50-f96a90f80b50","IsCreationKey":false,"Key":56.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"44daeebc-81f7-4a3e-9566-e297f548509d","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"e425231f-3a7e-4074-8576-7784f54854b5","IsCreationKey":false,"Key":57.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"76358f9c-44de-4773-bf94-08cfd0b706b7","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"f29bee25-b9a9-414e-9f6f-af7368b6b2e3","IsCreationKey":false,"Key":58.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"f3a1b3c0-9b73-40e4-bbcf-e3c2b025a98b","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"d29a2eb1-995f-416f-8d57-591692b16f8f","IsCreationKey":false,"Key":59.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"5324fcf9-6bd3-4064-9ebf-0af8b4c636d7","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"78090b8e-e008-4abe-b9d9-cd85610ceb8b","IsCreationKey":false,"Key":60.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"428c192f-e278-49f5-8d3b-74b07cd088b1","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"ce03e653-b78e-487d-8d27-d7c309147c31","IsCreationKey":false,"Key":61.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"a53ac2d7-2889-41a4-8d1b-6a0bf2f7bac9","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"ac0b54a5-db44-4308-96c3-c2ac0ed47b6d","IsCreationKey":false,"Key":62.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"51927562-4d2a-436b-adbb-62a690d6c661","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"de398855-c826-42e4-8362-bc3e291045b5","IsCreationKey":false,"Key":63.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"59b0bcf3-19ed-4f4c-b0e5-2c349fc1a26b","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"de94934c-4ebf-44dd-b634-54132bf008b5","IsCreationKey":false,"Key":64.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"f45bfd5f-8167-4b03-a26c-6468a48db3f1","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"0c870f91-064e-48c8-8038-9edb0c837366","IsCreationKey":false,"Key":65.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"8af43abe-2954-4429-a96e-5553ad6375c9","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"55054fbe-46a5-4879-acb7-40660cfdc7e5","IsCreationKey":false,"Key":66.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"578f1ad8-ccce-405b-af49-70f5b5ec6bc5","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"40b36087-ab89-4d97-8a24-749b87b03beb","IsCreationKey":false,"Key":67.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"16dfc277-8209-4c38-a4fa-acff85d6b150","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"58ab3ae2-4ba4-472d-88d7-451f6e5ca2eb","IsCreationKey":false,"Key":68.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"f068b9df-7ba7-4686-85c5-88a2ec6ce6a9","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"2ff78728-0939-4a0e-9b9c-9851d8047ffd","IsCreationKey":false,"Key":69.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"43771aa1-f221-4485-9c32-0ca06344e04c","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"a4857572-07c1-4a73-bf58-d9f8464fc2fb","IsCreationKey":false,"Key":70.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"6d9c5187-edc7-4f27-a6b0-7c3fb4a355d7","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"8d58b775-994c-4ca0-a3bf-a8742b9c21de","IsCreationKey":false,"Key":71.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"6f3452a1-a45b-4c09-a126-a8f0afafd909","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"d993ee28-a89d-42cc-bef9-51c5caf584d8","IsCreationKey":false,"Key":72.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"e522eb85-b82f-4feb-b671-5108350cfb16","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"97a668ce-c178-4d92-9e9b-dc4aff0cb736","IsCreationKey":false,"Key":73.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"b398bcd4-2967-43bd-aceb-351f1a577bd9","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"46a5df03-5cf0-4b89-a27c-ee7e2d3a2c80","IsCreationKey":false,"Key":74.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"71ff8ca0-3f42-4dda-9730-4a2ac4530c17","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"1f8dc377-3aa1-4816-a121-6a259c18db36","IsCreationKey":false,"Key":75.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"db054ef7-2537-41d7-bcaf-34b5f9073296","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"6f82652c-28d3-4186-b10c-c9109b2c55e8","IsCreationKey":false,"Key":76.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"7e595fd1-f058-4eb0-92b2-7112b02693f0","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"1492999b-1cb4-4c01-80f0-35941c4bf15d","IsCreationKey":false,"Key":77.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"73be05d6-bdbf-488d-824a-4fe1cb89e070","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"b5dee69b-eb3a-47a8-b11d-b76de78a9a28","IsCreationKey":false,"Key":78.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"76cd8d8c-db17-401c-a660-84e8565440be","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"f4f905d2-ad21-47e7-a476-1fb03417644f","IsCreationKey":false,"Key":79.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"fa9a6a5f-d27f-4915-bd3c-654e9b88bad4","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"73da1b91-82d6-4fb1-9452-acad9f6d75fc","IsCreationKey":false,"Key":80.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"59a7ad1b-f30b-468a-b661-11fa1a07fcff","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"4a13fa07-b693-4d51-910f-92c8867be917","IsCreationKey":false,"Key":81.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"beea7bcb-bb67-48bd-abce-529db7dbe41c","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"62a6e637-eb9f-4f76-a6fa-ca9c1e6de9df","IsCreationKey":false,"Key":82.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"8698f1a0-7ff8-4a84-8bd2-e389ec25a420","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"a53e3b90-cf7f-47b2-9ad2-3105e0b2fc3c","IsCreationKey":false,"Key":83.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"932663f3-9530-4c49-8d84-8c20a41549ef","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"2b82f6ff-199b-46dc-a0cd-f754e229ceb1","IsCreationKey":false,"Key":84.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"13c95d20-70e5-4988-b859-c15ab08abd85","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"82405c83-797a-4506-bceb-490563a38732","IsCreationKey":false,"Key":85.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"b709ce77-9b28-4388-bd75-f096350846ff","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"ca72f368-e6aa-4854-87b0-a68da0221055","IsCreationKey":false,"Key":86.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"f8fe5a01-de13-4476-9af8-bcc7f187bba4","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"2ee0754e-dac4-4409-b340-891ed282fa74","IsCreationKey":false,"Key":87.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"164fb034-c917-4aeb-8e30-0c4c989a3560","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"7bd3efdd-0bc5-41af-af15-2795d790b5ad","IsCreationKey":false,"Key":88.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"bbe1b91b-58af-460f-abd5-80225a8dde77","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"707bed96-75aa-4dd0-81fd-c35afaab1262","IsCreationKey":false,"Key":89.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"d1aff5b9-0c78-4ddc-8cf9-1e2daf3607b0","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"26e6d9d7-a200-4539-936f-c8b5aa45c97b","IsCreationKey":false,"Key":90.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"e3adda1a-086e-4eab-92b9-84b6bbaa6b58","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"463084e1-f006-476e-82bb-0be3e235ae58","IsCreationKey":false,"Key":91.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"df79b26f-f1ee-45c0-a52a-17bd22edf09b","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"a90247f4-f046-491d-8522-841702b91185","IsCreationKey":false,"Key":92.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"1769e8b5-3c03-48a9-90a2-0502b8dd5d79","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"fa446947-631d-4127-8790-7011d8c63b45","IsCreationKey":false,"Key":93.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"83b76c05-deaf-4543-862f-8e5bc4f242d4","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"49be7cd9-0092-467a-b854-351a2c2d014a","IsCreationKey":false,"Key":94.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"2dddb531-3570-44ff-bfb0-d647ac3c37ed","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"f9a92718-eab9-4754-94f9-64c6c5907072","IsCreationKey":false,"Key":95.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"7df26bce-c930-4969-ab20-6aaa30f85c2e","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"f09d320d-b486-4965-849c-91ef3f2f5d7b","IsCreationKey":false,"Key":96.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"b1ef6c7d-b668-4ece-9607-822177143185","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"de182601-fc79-4a18-afa5-6ae0564ce725","IsCreationKey":false,"Key":97.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"a261ce25-dc09-4e9c-b2ab-ca494eb7f6af","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"a7a40882-8686-40cd-98b5-60b337991b92","IsCreationKey":false,"Key":98.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"3c32a1e3-ebc0-4ac5-bad5-8a1aca452527","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"0ccf1f50-5300-4601-af65-e0d89fe4dd67","IsCreationKey":false,"Key":99.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"92f5ddbd-2444-4532-808e-3b2e26795ba7","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"63a97d6d-c248-471b-baff-5c341a6781d7","IsCreationKey":false,"Key":100.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_loadbar_empty/spr_loadbar_empty.yy b/sprites/spr_loadbar_empty/spr_loadbar_empty.yy index fb7fb75f26..f62d4bfdf5 100644 --- a/sprites/spr_loadbar_empty/spr_loadbar_empty.yy +++ b/sprites/spr_loadbar_empty/spr_loadbar_empty.yy @@ -63,12 +63,16 @@ "playbackSpeedType":1, "resourceType":"GMSequence", "resourceVersion":"2.0", + "seqHeight":13.0, + "seqWidth":443.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":"c2994374-2a5e-4831-bc9e-33b033839c5c","path":"sprites/spr_loadbar_empty/spr_loadbar_empty.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"7068dcdf-b01a-46c2-a3ad-05538327613e","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"c2994374-2a5e-4831-bc9e-33b033839c5c","path":"sprites/spr_loadbar_empty/spr_loadbar_empty.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"7068dcdf-b01a-46c2-a3ad-05538327613e","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_master_title/spr_master_title.yy b/sprites/spr_master_title/spr_master_title.yy index c10f643174..a3ab58e622 100644 --- a/sprites/spr_master_title/spr_master_title.yy +++ b/sprites/spr_master_title/spr_master_title.yy @@ -63,12 +63,16 @@ "playbackSpeedType":1, "resourceType":"GMSequence", "resourceVersion":"2.0", + "seqHeight":3.0, + "seqWidth":151.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":"79c91420-f39c-4f56-9743-270274c42515","path":"sprites/spr_master_title/spr_master_title.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"94770730-06c8-4e1f-a4c7-7c71948ab98d","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"79c91420-f39c-4f56-9743-270274c42515","path":"sprites/spr_master_title/spr_master_title.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"94770730-06c8-4e1f-a4c7-7c71948ab98d","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_mm_butts_small/spr_mm_butts_small.yy b/sprites/spr_mm_butts_small/spr_mm_butts_small.yy index a5014c3ab4..331e857a00 100644 --- a/sprites/spr_mm_butts_small/spr_mm_butts_small.yy +++ b/sprites/spr_mm_butts_small/spr_mm_butts_small.yy @@ -64,13 +64,19 @@ "playbackSpeedType":1, "resourceType":"GMSequence", "resourceVersion":"2.0", + "seqHeight":20.0, + "seqWidth":144.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":"a490443b-3cdf-4753-9ffc-2896f0104827","path":"sprites/spr_mm_butts_small/spr_mm_butts_small.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"7f7c9bd0-1068-40a4-9cd4-3638dca38bb5","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"8122bd56-7d5c-49d3-a373-6548e3cf9b7b","path":"sprites/spr_mm_butts_small/spr_mm_butts_small.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"ab03fb07-e69f-4023-b23b-278203142e4a","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"a490443b-3cdf-4753-9ffc-2896f0104827","path":"sprites/spr_mm_butts_small/spr_mm_butts_small.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"7f7c9bd0-1068-40a4-9cd4-3638dca38bb5","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"8122bd56-7d5c-49d3-a373-6548e3cf9b7b","path":"sprites/spr_mm_butts_small/spr_mm_butts_small.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"ab03fb07-e69f-4023-b23b-278203142e4a","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_new_banner/spr_new_banner.yy b/sprites/spr_new_banner/spr_new_banner.yy index 49db4b6e17..4042519b21 100644 --- a/sprites/spr_new_banner/spr_new_banner.yy +++ b/sprites/spr_new_banner/spr_new_banner.yy @@ -63,12 +63,16 @@ "playbackSpeedType":1, "resourceType":"GMSequence", "resourceVersion":"2.0", + "seqHeight":198.0, + "seqWidth":161.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":"affc02cd-401a-4d10-8d72-28cb9fc69444","path":"sprites/spr_new_banner/spr_new_banner.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"3187ab50-787e-4692-9541-b46b5dd9ffd0","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"affc02cd-401a-4d10-8d72-28cb9fc69444","path":"sprites/spr_new_banner/spr_new_banner.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"3187ab50-787e-4692-9541-b46b5dd9ffd0","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_new_mm/spr_new_mm.yy b/sprites/spr_new_mm/spr_new_mm.yy index 285d68329c..d92d63b1f9 100644 --- a/sprites/spr_new_mm/spr_new_mm.yy +++ b/sprites/spr_new_mm/spr_new_mm.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":"24507153-8c4a-4a69-b14f-9a079657f166","path":"sprites/spr_new_mm/spr_new_mm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"5ccf15d7-8a86-430e-a2ca-93818cb6d7f7","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"24507153-8c4a-4a69-b14f-9a079657f166","path":"sprites/spr_new_mm/spr_new_mm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"5ccf15d7-8a86-430e-a2ca-93818cb6d7f7","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_pixel_button_middle/spr_pixel_button_middle.yy b/sprites/spr_pixel_button_middle/spr_pixel_button_middle.yy index 583ac2fb85..5660d89173 100644 --- a/sprites/spr_pixel_button_middle/spr_pixel_button_middle.yy +++ b/sprites/spr_pixel_button_middle/spr_pixel_button_middle.yy @@ -63,12 +63,16 @@ "playbackSpeedType":0, "resourceType":"GMSequence", "resourceVersion":"2.0", + "seqHeight":28.0, + "seqWidth":14.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":"7ab35a5d-4138-4cd7-a5ce-654faab31f81","path":"sprites/spr_pixel_button_middle/spr_pixel_button_middle.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"0b9d0197-8c88-4a7d-908c-67e942c40821","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"7ab35a5d-4138-4cd7-a5ce-654faab31f81","path":"sprites/spr_pixel_button_middle/spr_pixel_button_middle.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"0b9d0197-8c88-4a7d-908c-67e942c40821","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_research_bar/spr_research_bar.yy b/sprites/spr_research_bar/spr_research_bar.yy index 879f57927b..63bfdf4f1d 100644 --- a/sprites/spr_research_bar/spr_research_bar.yy +++ b/sprites/spr_research_bar/spr_research_bar.yy @@ -65,14 +65,22 @@ "playbackSpeedType":0, "resourceType":"GMSequence", "resourceVersion":"2.0", + "seqHeight":400.0, + "seqWidth":200.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":"cd763fd7-8004-4d62-bc1a-be3268cef684","path":"sprites/spr_research_bar/spr_research_bar.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"805a2c94-7484-4778-84be-453aa5d791f3","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"63f140c0-9df0-45cf-bc48-c71f52cccbf1","path":"sprites/spr_research_bar/spr_research_bar.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"938b49cd-3ce1-4611-8b7b-36691b2a339e","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"d5b48025-2525-46d9-8c75-c549648ded91","path":"sprites/spr_research_bar/spr_research_bar.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"6ce8ad41-35df-4164-ba8e-1d0ad7fc40a5","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"cd763fd7-8004-4d62-bc1a-be3268cef684","path":"sprites/spr_research_bar/spr_research_bar.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"805a2c94-7484-4778-84be-453aa5d791f3","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"63f140c0-9df0-45cf-bc48-c71f52cccbf1","path":"sprites/spr_research_bar/spr_research_bar.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"938b49cd-3ce1-4611-8b7b-36691b2a339e","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"d5b48025-2525-46d9-8c75-c549648ded91","path":"sprites/spr_research_bar/spr_research_bar.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"6ce8ad41-35df-4164-ba8e-1d0ad7fc40a5","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_slate_featureless/bd12575d-6936-47ed-b150-8734d5c98140.png b/sprites/spr_slate_featureless/bd12575d-6936-47ed-b150-8734d5c98140.png new file mode 100644 index 0000000000000000000000000000000000000000..b12b7ad10ba2b7414e07cf53117f4120dc43ec02 GIT binary patch literal 665171 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௱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 bn}7cgqk7-vNWID<00000NkvXXu0mjf$a{d% literal 0 HcmV?d00001 diff --git a/datafiles/main/chapters/36.json b/datafiles/main/chapters/36.json new file mode 100644 index 0000000000..20b224dcc2 --- /dev/null +++ b/datafiles/main/chapters/36.json @@ -0,0 +1,1028 @@ +{ + "chapter": { + "id": 36, + "name": "Raptors", + "flavor": "The Raptors are a Successor Chapter of the Raven Guard, created in the Second Founding. They are famous for their exceptional survival abilities, and extremely skilled in guerrilla warfare and infiltration operations", + "origin": 2, // 1 - Founding, 2 - Successor, 3 - Other/non-canon/fanmade, 4 - Custom + "points": 150, + "founding": 9, // The id of the founding chapter, 0 for unknown or none, 10 for random + "splash": 36, // in \images\creation\chapters\splash folder, the img number, 1 being Dark Angels etc. + "icon_name": "raptors", + "fleet_type": 1, // 1= Homeworld, 2 = Fleet based, 3 = Penitent + "strength": 5, // 1-10 + "purity": 9, // 1-10 + "stability": 99, // 1-99 + "cooperation": 5, // 1-10 + "homeworld_exists": 1, // 1 = true + "recruiting_exists": 1, // 1 = true + "homeworld_rule": 3, // 1 = Govenor, 2 = Countries, 3 = Personal Rule + "homeworld": "Temperate", // one of "Lava" "Desert" "Forge" "Hive" "Death" "Agri" "Feudal" "Temperate" "Ice" "Dead" "Shrine" + "homeworld_name": "Tarrengast", // Homeworld Planet name, leave blank to autogenerate + "recruiting": "Death", // one of "Lava" "Desert" "Forge" "Hive" "Death" "Agri" "Feudal" "Temperate" "Ice" "Dead" "Shrine" + "recruiting_name": "Numina", // Recruiting Planet name, leave blank to autogenerate + "discipline": "librarius", // one of 'default' 'biomancy' 'pyromancy' 'telekinesis' 'rune_magic' + "aspirant_trial": "HUNTING", // one of "BLOODDUEL" "HUNTING" "SURVIVAL" "EXPOSURE" "KNOWLEDGE" "CHALLENGE" "APPRENTICESHIP" + "advantages": [ + "", // leave the first entry blank for now + "Ambushers", + "", + "", + "", + "", + "", + "", + "" + ], + "disadvantages": [ + "", // leave the first entry blank for now + "", + "", + "", + "", + "", + "", + "", + "" + ], + "colors": { + "main": "Raptors Green", + "secondary": "Raptors Green", + "pauldron_r": "Raptors Green", + "pauldron_l": "Raptors Green", + "trim": "Raptors Green", + "lens": "Red", + "weapon": "Raptors Green", + "special": 0, // 0 - normal, 1 - Breastplate, 2 - Vertical, 3 - Quadrant + }, + "complex_livery_data": { + "sgt": { + "helm_lens": 9.0, + "helm_pattern": 0.0, + "helm_primary": 38.0, + "helm_secondary": 38.0, + "helm_detail": 0.0 + }, + "veteran": { + "helm_lens": 9.0, + "helm_pattern": 0.0, + "helm_primary": 38.0, + "helm_secondary": 38.0, + "helm_detail": 0.0 + }, + "vet_sgt": { + "helm_lens": 9.0, + "helm_pattern": 0.0, + "helm_primary": 38.0, + "helm_secondary": 38.0, + "helm_detail": 0.0 + }, + "captain": { + "helm_lens": 9.0, + "helm_pattern": 0.0, + "helm_primary": 38.0, + "helm_secondary": 38.0, + "helm_detail": 0.0 + } + }, + "names": { + //Chapter Staff + "hchaplain": "", // Head Chaplain + "clibrarian": "", // Chief Librarian + "fmaster": "", // Forge Master + "hapothecary": "", // Head Apothecary + //Company Captains 1 - 10 + "honorcapt": "Kassayan", + "watchmaster": "", + "arsenalmaster": "Orelius", + "admiral": "Nigelus", + "marchmaster": "Benedict", + "ritesmaster": "", + "victualler": "", + "lordexec": "", + "relmaster": "", + "recruiter": "" + }, + "battle_cry": "...", + "equal_specialists": 1, // 0 if no, 1 if yes. If yes, will distribute specialist roles like Assaults and Devastators equally between companies. Otherwise all Assaults go in Company 8 and all Devastators in Company 9 + "load_to_ships": { + "escort_load": 2, // 0 no, 2 yes, 1 doesnt do anything :) + "split_scouts": 1, // 0 no, 1 yes. If yes, splits scouts between companies equally. Otherwise all scouts are kept in 10th Company. + "split_vets": 0 // 0 no, 1 yes. If yes, all veterans are distrubuted equally between companies. Otherwise all veterans are kept in the 1st Company + }, + "successors": 0, //total number of successor chapters + "mutations": { + "preomnor": 0, + "voice": 0, + "doomed": 0, + "lyman": 0, + "omophagea": 0, + "ossmodula": 0, + "membrane": 0, + "zygote": 0, + "betchers": 0, + "catalepsean": 0, + "secretions": 0, + "occulobe": 0, + "mucranoid": 1 + }, + "disposition": [ + 0, // nothing + 0, // Progenitor faction + 50, // Imperium + 50, // Admech + 50, //Inquisition + 50, // Ecclesiarchy + 50, // Astartes + 0 // nothing + ], + "chapter_master": { + "name": "Lias Issodon", + "specialty": 1, //1 Leader, 2 Champion, 3 Psyker, + "melee": 5, // 1 twin power fists ... 8 force staff + "ranged": 3, // 1 boltstorm gauntlets ... 7 storm shield + // All chapter masters have the trait `Lead by Example` by default + "traits": [ + "" + ], + "gear": "", + "mobi": "", + "armour": "" // default is Artificer armour, only needed to set if changing to something else. + }, + "artifact": [ + { + "name": "Malius", + "description": "Malice has been with Lias since his time in the Raptors' scout company and shares most characteristics of the standard bolter but is capable of a higher rate of fire and has an extended range", + "base_weapon_type": "Stalker Pattern Bolter", + "slot": "wep2" + } + ], + "company_titles": [ + "", + "1st Company", + "2nd Company", + "3rd Company", + "4th Company", + "5th Company", + "6th Company", + "7th Company", + "8th Company", + "9th Company", + "10th Company" + ], + "flagship_name": "Accipiter", // leave blank to autogenerate + /** + * * Default fleet composition + * * Homeworld + * - 2 Battle Barges, 8 Strike cruisers, 7 Gladius, 3 Hunters + * * Fleet based and Penitent + * - 4 Battle Barges, 3 Strike Cruisers, 7 Gladius, 3 Hunters + * + * use negative numbers to subtract ships + * * Stacks with advantages/disadvantages + */ + "extra_ships": { + "battle_barges": 0, + "gladius": 0, + "strike_cruisers": 0, + "hunters": 0 + }, + /** + * * Default HQ Layout (Does not include company specialists) + * - 8 Chaplains, 8 Techmarines, 8 Apothecary, 2 Epistolary (librarian), + * - 2 Codiciery, 4 Lexicanum + * * Default Company specialists (divided based on `load_to_ships.split_vets` setting) + * - 20 Terminators, 85 Veterans, 20 Devastators, 20 Assault + * Use negative numbers to subtract + * * Stacks with advantages/disadvantages + */ + "extra_specialists": { + "chaplains": 0, + "techmarines": 0, + "apothecary": 0, + "epistolary": 0, + "codiciery": 0, + "lexicanum": 0, + "terminator": 0, + "assault": 0, + "veteran": 0, + "devastator": 0 + }, + /** + * * Default Marine strength + * - 100 marines per company + * use negative numbers to subtract + * * Stacks with strength for non-founding chapters only + */ + "extra_marines": { + "second": 0, + "third": 0, + "fourth": 0, + "fifth": 0, + "sixth": 0, + "seventh": 0, + "eighth": 0, + "ninth": 0, + "tenth": 0 + }, + /** + * All vehicles are added to the 10th company at the start of the game + */ + "extra_vehicles": { + "rhino": 0, + "whirlwind": 0, + "predator": 0, + "land_raider": 0, + "land_speeder": 0 + }, + /** Add extra starting items ["Item Name", Number to add] */ + "extra_equipment": [ + // [ + // "Bolter", + // 20 + // ] + ], + /** + * Provide a place to change the default name and equipment preferences of roles for this chapter + * `custom_roles` should be used for specialist/leadership type roles, + * To affect an entire squad, see `custom_squads` below + */ + "custom_roles": { + // "honour_guard": { + // "name": "Honour Guard", + // "wep1": "Power Sword", + // "wep2": "Bolter" + // }, + // "veteran": { + // "name": "Veteran", + // "wep1": "Chainaxe" + // }, + // "captain": { + // "name": "Captain", + // "wep1": "Power Sword" + // }, + // "tactical": { + // "name": "Tactical" + // }, + // "devastator": { + // "name": "Devastator" + // }, + // "assault": { + // "name": "Assault", + // "wep1": "Chainsword" + // }, + // "scout": { + // "name": "Scout", + // "wep1": "Sniper Rifle" + // }, + // "chaplain": { + // "name": "Chaplain", + // }, + // "techmarine": { + // "name": "Techmarine", + // "wep1": "Power Axe" + // }, + // "apothecary": { + // "name": "Apothecary", + // "wep1": "Power Axe" + // }, + // "librarian": { + // "name": "Librarian", + // "wep1": "Force Staff" + // }, + // "sergeant": { + // "name": "Sergeant", + // "wep1": "Chainaxe" + // }, + // "veteran_sergeant": { + // "name": "Veteran Sergeant", + // "wep1": "Chainaxe" + // } + }, + /** + * * Custom squad roles, loadouts and formations + * When companies are made, squads are formed based on these rules: + * - squad name: one of captain, terminator, terminator_assault, sternguard_veteran, + vanguard_veteran, devastator, tactical, assault, scout, scout_sniper + * - squad array layout [Role, Role, ...Role, type_data] + * - each element of the array is a default Role, and their settings. + - if you changed the role using `custom_roles` you need to reference the role with this new name + - for non-leader roles it is better to change the name of the role in the squad layout instead + * - unit layout [Role Name, Settings Struct] + * - settings struct: + * - max: The most amount of this unit is allowed per squad + * - min: The squad can't be formed unless at least 1 of this unit is in it + * - role: The name of the unit when it is a member of the squad. This is where you rename roles e.g. + "Terminator" > "Deathwing Terminator" + ** - loadout: Struct containing Required and Optional weaponry this unit can equip + a required loadout always follows this syntax :[,] + so "wep1":["Bolter",4], will mean four marines are always equipped with 4 bolters in the wep1 slot + * option loadouts follow the following syntax :[[],] + for example [["Flamer", "Meltagun"],1], means the role can have a max of one flamer or meltagun + [["Plasma Pistol","Bolt Pistol"], 4] means the role can have a mix of 4 plasma pistols and bolt pistols on top + of all required loadout options + - wep1: right hand weapon + - wep2: left hand weapon + - mobi: Mobility item, e.g. Jump Packs. + - armour: required armour + - gear: special equipment needed for certain roles, like a Roasrius or Narthecium + * - type_data: names the squad, allows certain formations + */ + "squad_name": "Squad", + "custom_squads": {}, + "full_liveries": [ + { + "is_changed": true, + "left_leg_lower": 38.0, + "left_leg_upper": 38.0, + "left_leg_knee": 38.0, + "right_leg_lower": 38.0, + "right_leg_upper": 38.0, + "right_leg_knee": 38.0, + "metallic_trim": 3.0, + "right_trim": 38.0, + "left_trim": 38.0, + "left_chest": 38.0, + "right_chest": 38.0, + "left_thorax": 0.0, + "right_thorax": 0.0, + "left_arm": 38.0, + "left_hand": 38.0, + "right_arm": 38.0, + "right_hand": 38.0, + "left_head": 38.0, + "right_head": 38.0, + "left_muzzle": 38.0, + "right_muzzle": 38.0, + "eye_lense": 9.0, + "right_backpack": 38.0, + "left_backpack": 38.0, + "weapon_primary": 38.0, + "weapon_secondary": 38.0, + "company_marks": 0.0, + "company_marks_loc": 0.0, + "right_pauldron": 38.0, + "left_pauldron": 38.0 + }, + { + "is_changed": true, + "left_leg_lower": 38.0, + "left_leg_upper": 38.0, + "left_leg_knee": 38.0, + "right_leg_lower": 38.0, + "right_leg_upper": 38.0, + "right_leg_knee": 38.0, + "metallic_trim": 3.0, + "right_trim": 38.0, + "left_trim": 38.0, + "left_chest": 38.0, + "right_chest": 38.0, + "left_thorax": 0.0, + "right_thorax": 0.0, + "left_arm": 38.0, + "left_hand": 38.0, + "right_arm": 38.0, + "right_hand": 38.0, + "left_head": 38.0, + "right_head": 38.0, + "left_muzzle": 38.0, + "right_muzzle": 38.0, + "eye_lense": 9.0, + "right_backpack": 38.0, + "left_backpack": 38.0, + "weapon_primary": 38.0, + "weapon_secondary": 38.0, + "company_marks": 0.0, + "company_marks_loc": 0.0, + "right_pauldron": 38.0, + "left_pauldron": 38.0 + }, + { + "is_changed": true, + "left_leg_lower": 38.0, + "left_leg_upper": 38.0, + "left_leg_knee": 38.0, + "right_leg_lower": 38.0, + "right_leg_upper": 38.0, + "right_leg_knee": 38.0, + "metallic_trim": 3.0, + "right_trim": 38.0, + "left_trim": 38.0, + "left_chest": 38.0, + "right_chest": 38.0, + "left_thorax": 0.0, + "right_thorax": 0.0, + "left_arm": 38.0, + "left_hand": 38.0, + "right_arm": 38.0, + "right_hand": 38.0, + "left_head": 38.0, + "right_head": 38.0, + "left_muzzle": 38.0, + "right_muzzle": 38.0, + "eye_lense": 9.0, + "right_backpack": 38.0, + "left_backpack": 38.0, + "weapon_primary": 38.0, + "weapon_secondary": 38.0, + "company_marks": 0.0, + "company_marks_loc": 0.0, + "right_pauldron": 38.0, + "left_pauldron": 38.0 + }, + { + "is_changed": true, + "left_leg_lower": 38.0, + "left_leg_upper": 38.0, + "left_leg_knee": 38.0, + "right_leg_lower": 38.0, + "right_leg_upper": 38.0, + "right_leg_knee": 38.0, + "metallic_trim": 3.0, + "right_trim": 38.0, + "left_trim": 38.0, + "left_chest": 38.0, + "right_chest": 38.0, + "left_thorax": 0.0, + "right_thorax": 0.0, + "left_arm": 38.0, + "left_hand": 38.0, + "right_arm": 38.0, + "right_hand": 38.0, + "left_head": 38.0, + "right_head": 38.0, + "left_muzzle": 38.0, + "right_muzzle": 38.0, + "eye_lense": 9.0, + "right_backpack": 38.0, + "left_backpack": 38.0, + "weapon_primary": 38.0, + "weapon_secondary": 38.0, + "company_marks": 0.0, + "company_marks_loc": 0.0, + "right_pauldron": 38.0, + "left_pauldron": 38.0 + }, + { + "is_changed": true, + "left_leg_lower": 38.0, + "left_leg_upper": 38.0, + "left_leg_knee": 38.0, + "right_leg_lower": 38.0, + "right_leg_upper": 38.0, + "right_leg_knee": 38.0, + "metallic_trim": 3.0, + "right_trim": 38.0, + "left_trim": 38.0, + "left_chest": 38.0, + "right_chest": 38.0, + "left_thorax": 0.0, + "right_thorax": 0.0, + "left_arm": 38.0, + "left_hand": 38.0, + "right_arm": 38.0, + "right_hand": 38.0, + "left_head": 38.0, + "right_head": 38.0, + "left_muzzle": 38.0, + "right_muzzle": 38.0, + "eye_lense": 9.0, + "right_backpack": 38.0, + "left_backpack": 38.0, + "weapon_primary": 38.0, + "weapon_secondary": 38.0, + "company_marks": 0.0, + "company_marks_loc": 0.0, + "right_pauldron": 38.0, + "left_pauldron": 38.0 + }, + { + "is_changed": true, + "left_leg_lower": 38.0, + "left_leg_upper": 38.0, + "left_leg_knee": 38.0, + "right_leg_lower": 38.0, + "right_leg_upper": 38.0, + "right_leg_knee": 38.0, + "metallic_trim": 3.0, + "right_trim": 38.0, + "left_trim": 38.0, + "left_chest": 38.0, + "right_chest": 38.0, + "left_thorax": 0.0, + "right_thorax": 0.0, + "left_arm": 38.0, + "left_hand": 38.0, + "right_arm": 38.0, + "right_hand": 38.0, + "left_head": 38.0, + "right_head": 38.0, + "left_muzzle": 38.0, + "right_muzzle": 38.0, + "eye_lense": 9.0, + "right_backpack": 38.0, + "left_backpack": 38.0, + "weapon_primary": 38.0, + "weapon_secondary": 38.0, + "company_marks": 0.0, + "company_marks_loc": 0.0, + "right_pauldron": 38.0, + "left_pauldron": 38.0 + }, + { + "is_changed": true, + "left_leg_lower": 38.0, + "left_leg_upper": 38.0, + "left_leg_knee": 38.0, + "right_leg_lower": 38.0, + "right_leg_upper": 38.0, + "right_leg_knee": 38.0, + "metallic_trim": 3.0, + "right_trim": 38.0, + "left_trim": 38.0, + "left_chest": 38.0, + "right_chest": 38.0, + "left_thorax": 0.0, + "right_thorax": 0.0, + "left_arm": 38.0, + "left_hand": 38.0, + "right_arm": 38.0, + "right_hand": 38.0, + "left_head": 38.0, + "right_head": 38.0, + "left_muzzle": 38.0, + "right_muzzle": 38.0, + "eye_lense": 9.0, + "right_backpack": 38.0, + "left_backpack": 38.0, + "weapon_primary": 38.0, + "weapon_secondary": 38.0, + "company_marks": 0.0, + "company_marks_loc": 0.0, + "right_pauldron": 38.0, + "left_pauldron": 38.0 + }, + { + "is_changed": true, + "left_leg_lower": 38.0, + "left_leg_upper": 38.0, + "left_leg_knee": 38.0, + "right_leg_lower": 38.0, + "right_leg_upper": 38.0, + "right_leg_knee": 38.0, + "metallic_trim": 3.0, + "right_trim": 38.0, + "left_trim": 38.0, + "left_chest": 38.0, + "right_chest": 38.0, + "left_thorax": 0.0, + "right_thorax": 0.0, + "left_arm": 38.0, + "left_hand": 38.0, + "right_arm": 38.0, + "right_hand": 38.0, + "left_head": 38.0, + "right_head": 38.0, + "left_muzzle": 38.0, + "right_muzzle": 38.0, + "eye_lense": 9.0, + "right_backpack": 38.0, + "left_backpack": 38.0, + "weapon_primary": 38.0, + "weapon_secondary": 38.0, + "company_marks": 0.0, + "company_marks_loc": 0.0, + "right_pauldron": 38.0, + "left_pauldron": 38.0 + }, + { + "is_changed": true, + "left_leg_lower": 38.0, + "left_leg_upper": 38.0, + "left_leg_knee": 38.0, + "right_leg_lower": 38.0, + "right_leg_upper": 38.0, + "right_leg_knee": 38.0, + "metallic_trim": 3.0, + "right_trim": 38.0, + "left_trim": 38.0, + "left_chest": 38.0, + "right_chest": 38.0, + "left_thorax": 0.0, + "right_thorax": 0.0, + "left_arm": 38.0, + "left_hand": 38.0, + "right_arm": 38.0, + "right_hand": 38.0, + "left_head": 38.0, + "right_head": 38.0, + "left_muzzle": 38.0, + "right_muzzle": 38.0, + "eye_lense": 9.0, + "right_backpack": 38.0, + "left_backpack": 38.0, + "weapon_primary": 38.0, + "weapon_secondary": 38.0, + "company_marks": 0.0, + "company_marks_loc": 0.0, + "right_pauldron": 38.0, + "left_pauldron": 38.0 + }, + { + "is_changed": true, + "left_leg_lower": 38.0, + "left_leg_upper": 38.0, + "left_leg_knee": 38.0, + "right_leg_lower": 38.0, + "right_leg_upper": 38.0, + "right_leg_knee": 38.0, + "metallic_trim": 3.0, + "right_trim": 38.0, + "left_trim": 38.0, + "left_chest": 38.0, + "right_chest": 38.0, + "left_thorax": 0.0, + "right_thorax": 0.0, + "left_arm": 38.0, + "left_hand": 38.0, + "right_arm": 38.0, + "right_hand": 38.0, + "left_head": 38.0, + "right_head": 38.0, + "left_muzzle": 38.0, + "right_muzzle": 38.0, + "eye_lense": 9.0, + "right_backpack": 38.0, + "left_backpack": 38.0, + "weapon_primary": 38.0, + "weapon_secondary": 38.0, + "company_marks": 0.0, + "company_marks_loc": 0.0, + "right_pauldron": 38.0, + "left_pauldron": 38.0 + }, + { + "is_changed": true, + "left_leg_lower": 38.0, + "left_leg_upper": 38.0, + "left_leg_knee": 38.0, + "right_leg_lower": 38.0, + "right_leg_upper": 38.0, + "right_leg_knee": 38.0, + "metallic_trim": 3.0, + "right_trim": 38.0, + "left_trim": 38.0, + "left_chest": 38.0, + "right_chest": 38.0, + "left_thorax": 0.0, + "right_thorax": 0.0, + "left_arm": 38.0, + "left_hand": 38.0, + "right_arm": 38.0, + "right_hand": 38.0, + "left_head": 38.0, + "right_head": 38.0, + "left_muzzle": 38.0, + "right_muzzle": 38.0, + "eye_lense": 9.0, + "right_backpack": 38.0, + "left_backpack": 38.0, + "weapon_primary": 38.0, + "weapon_secondary": 38.0, + "company_marks": 0.0, + "company_marks_loc": 0.0, + "right_pauldron": 38.0, + "left_pauldron": 38.0 + }, + { + "is_changed": true, + "left_leg_lower": 38.0, + "left_leg_upper": 38.0, + "left_leg_knee": 38.0, + "right_leg_lower": 38.0, + "right_leg_upper": 38.0, + "right_leg_knee": 38.0, + "metallic_trim": 3.0, + "right_trim": 38.0, + "left_trim": 38.0, + "left_chest": 38.0, + "right_chest": 38.0, + "left_thorax": 0.0, + "right_thorax": 0.0, + "left_arm": 38.0, + "left_hand": 38.0, + "right_arm": 38.0, + "right_hand": 38.0, + "left_head": 38.0, + "right_head": 38.0, + "left_muzzle": 38.0, + "right_muzzle": 38.0, + "eye_lense": 9.0, + "right_backpack": 38.0, + "left_backpack": 38.0, + "weapon_primary": 38.0, + "weapon_secondary": 38.0, + "company_marks": 0.0, + "company_marks_loc": 0.0, + "right_pauldron": 38.0, + "left_pauldron": 38.0 + }, + { + "is_changed": true, + "left_leg_lower": 38.0, + "left_leg_upper": 38.0, + "left_leg_knee": 38.0, + "right_leg_lower": 38.0, + "right_leg_upper": 38.0, + "right_leg_knee": 38.0, + "metallic_trim": 3.0, + "right_trim": 38.0, + "left_trim": 38.0, + "left_chest": 38.0, + "right_chest": 38.0, + "left_thorax": 0.0, + "right_thorax": 0.0, + "left_arm": 38.0, + "left_hand": 38.0, + "right_arm": 38.0, + "right_hand": 38.0, + "left_head": 38.0, + "right_head": 38.0, + "left_muzzle": 38.0, + "right_muzzle": 38.0, + "eye_lense": 9.0, + "right_backpack": 38.0, + "left_backpack": 38.0, + "weapon_primary": 38.0, + "weapon_secondary": 38.0, + "company_marks": 0.0, + "company_marks_loc": 0.0, + "right_pauldron": 38.0, + "left_pauldron": 38.0 + }, + { + "is_changed": true, + "left_leg_lower": 38.0, + "left_leg_upper": 38.0, + "left_leg_knee": 38.0, + "right_leg_lower": 38.0, + "right_leg_upper": 38.0, + "right_leg_knee": 38.0, + "metallic_trim": 3.0, + "right_trim": 38.0, + "left_trim": 38.0, + "left_chest": 38.0, + "right_chest": 38.0, + "left_thorax": 0.0, + "right_thorax": 0.0, + "left_arm": 38.0, + "left_hand": 38.0, + "right_arm": 38.0, + "right_hand": 38.0, + "left_head": 38.0, + "right_head": 38.0, + "left_muzzle": 38.0, + "right_muzzle": 38.0, + "eye_lense": 9.0, + "right_backpack": 38.0, + "left_backpack": 38.0, + "weapon_primary": 38.0, + "weapon_secondary": 38.0, + "company_marks": 0.0, + "company_marks_loc": 0.0, + "right_pauldron": 38.0, + "left_pauldron": 38.0 + }, + { + "is_changed": true, + "left_leg_lower": 8, + "left_leg_upper": 8, + "left_leg_knee": 8, + "right_leg_lower": 8, + "right_leg_upper": 8, + "right_leg_knee": 8, + "metallic_trim": 3.0, + "right_trim": 38.0, + "left_trim": 38.0, + "left_chest": 8, + "right_chest": 8, + "left_thorax": 0.0, + "right_thorax": 0.0, + "left_arm": 8, + "left_hand": 8, + "right_arm": 8, + "right_hand": 8, + "left_head": 8, + "right_head": 8, + "left_muzzle": 8, + "right_muzzle": 8, + "eye_lense": 9, + "right_backpack": 8, + "left_backpack": 8, + "weapon_primary": 38.0, + "weapon_secondary": 38.0, + "company_marks": 0.0, + "company_marks_loc": 0.0, + "right_pauldron": 8, + "left_pauldron": 38.0 + }, + { + "is_changed": true, + "left_leg_lower": 0, + "left_leg_upper": 0, + "left_leg_knee": 0, + "right_leg_lower": 0, + "right_leg_upper": 0, + "right_leg_knee": 0, + "metallic_trim": 3.0, + "right_trim": 38.0, + "left_trim": 38.0, + "left_chest": 0, + "right_chest": 0, + "left_thorax": 0.0, + "right_thorax": 0.0, + "left_arm": 0, + "left_hand": 0, + "right_arm": 0, + "right_hand": 0, + "left_head": 0, + "right_head": 0, + "left_muzzle": 0, + "right_muzzle": 0, + "eye_lense": 9, + "right_backpack": 0, + "left_backpack": 0, + "weapon_primary": 38.0, + "weapon_secondary": 38.0, + "company_marks": 0.0, + "company_marks_loc": 0.0, + "right_pauldron": 0, + "left_pauldron": 38.0 + }, + { + "is_changed": true, + "left_leg_lower": 9, + "left_leg_upper": 9, + "left_leg_knee": 9, + "right_leg_lower": 9, + "right_leg_upper": 9, + "right_leg_knee": 9, + "metallic_trim": 3.0, + "right_trim": 38.0, + "left_trim": 38.0, + "left_chest": 9, + "right_chest": 9, + "left_thorax": 0.0, + "right_thorax": 0.0, + "left_arm": 9, + "left_hand": 9, + "right_arm": 9, + "right_hand": 9, + "left_head": 9, + "right_head": 9, + "left_muzzle": 9, + "right_muzzle": 9, + "eye_lense": 23, + "right_backpack": 9, + "left_backpack": 9, + "weapon_primary": 38.0, + "weapon_secondary": 38.0, + "company_marks": 0.0, + "company_marks_loc": 0.0, + "right_pauldron": 9, + "left_pauldron": 38.0 + }, + { + "is_changed": true, + "left_leg_lower": 34, + "left_leg_upper": 34, + "left_leg_knee": 34, + "right_leg_lower": 34, + "right_leg_upper": 34, + "right_leg_knee": 34, + "metallic_trim": 3.0, + "right_trim": 38.0, + "left_trim": 38.0, + "left_chest": 34, + "right_chest": 34, + "left_thorax": 0.0, + "right_thorax": 0.0, + "left_arm": 34, + "left_hand": 34, + "right_arm": 34, + "right_hand": 34, + "left_head": 34, + "right_head": 34, + "left_muzzle": 34, + "right_muzzle": 34, + "eye_lense": 28, + "right_backpack": 34, + "left_backpack": 34, + "weapon_primary": 38.0, + "weapon_secondary": 38.0, + "company_marks": 0.0, + "company_marks_loc": 0.0, + "right_pauldron": 34, + "left_pauldron": 38.0 + }, + { + "is_changed": true, + "left_leg_lower": 38.0, + "left_leg_upper": 38.0, + "left_leg_knee": 38.0, + "right_leg_lower": 38.0, + "right_leg_upper": 38.0, + "right_leg_knee": 38.0, + "metallic_trim": 3.0, + "right_trim": 38.0, + "left_trim": 38.0, + "left_chest": 38.0, + "right_chest": 38.0, + "left_thorax": 0.0, + "right_thorax": 0.0, + "left_arm": 38.0, + "left_hand": 38.0, + "right_arm": 38.0, + "right_hand": 38.0, + "left_head": 38.0, + "right_head": 38.0, + "left_muzzle": 38.0, + "right_muzzle": 38.0, + "eye_lense": 9.0, + "right_backpack": 38.0, + "left_backpack": 38.0, + "weapon_primary": 38.0, + "weapon_secondary": 38.0, + "company_marks": 0.0, + "company_marks_loc": 0.0, + "right_pauldron": 38.0, + "left_pauldron": 38.0 + }, + { + "is_changed": true, + "left_leg_lower": 38.0, + "left_leg_upper": 38.0, + "left_leg_knee": 38.0, + "right_leg_lower": 38.0, + "right_leg_upper": 38.0, + "right_leg_knee": 38.0, + "metallic_trim": 3.0, + "right_trim": 38.0, + "left_trim": 38.0, + "left_chest": 38.0, + "right_chest": 38.0, + "left_thorax": 0.0, + "right_thorax": 0.0, + "left_arm": 38.0, + "left_hand": 38.0, + "right_arm": 38.0, + "right_hand": 38.0, + "left_head": 38.0, + "right_head": 38.0, + "left_muzzle": 38.0, + "right_muzzle": 38.0, + "eye_lense": 9.0, + "right_backpack": 38.0, + "left_backpack": 38.0, + "weapon_primary": 38.0, + "weapon_secondary": 38.0, + "company_marks": 0.0, + "company_marks_loc": 0.0, + "right_pauldron": 38.0, + "left_pauldron": 38.0 + }, + { + "is_changed": true, + "left_leg_lower": 38.0, + "left_leg_upper": 38.0, + "left_leg_knee": 38.0, + "right_leg_lower": 38.0, + "right_leg_upper": 38.0, + "right_leg_knee": 38.0, + "metallic_trim": 3.0, + "right_trim": 38.0, + "left_trim": 38.0, + "left_chest": 38.0, + "right_chest": 38.0, + "left_thorax": 0.0, + "right_thorax": 0.0, + "left_arm": 38.0, + "left_hand": 38.0, + "right_arm": 38.0, + "right_hand": 38.0, + "left_head": 38.0, + "right_head": 38.0, + "left_muzzle": 38.0, + "right_muzzle": 38.0, + "eye_lense": 9.0, + "right_backpack": 38.0, + "left_backpack": 38.0, + "weapon_primary": 38.0, + "weapon_secondary": 38.0, + "company_marks": 0.0, + "company_marks_loc": 0.0, + "right_pauldron": 38.0, + "left_pauldron": 38.0 + } + ], + } +} \ No newline at end of file diff --git a/datafiles/main/chapters/template.JSON b/datafiles/main/chapters/template.JSON index 19dc0970c6..6a47dea768 100644 --- a/datafiles/main/chapters/template.JSON +++ b/datafiles/main/chapters/template.JSON @@ -77,8 +77,8 @@ "equal_specialists": 0, // 0 if no, 1 if yes. If yes, will distribute specialist roles like Assaults and Devastators equally between companies. Otherwise all Assaults go in Company 8 and all Devastators in Company 9 "load_to_ships": { "escort_load": 2, // 0 no, 2 yes, 1 doesnt do anything :) - "split_scouts": 0, // 0 no, 1 yes. If yes, splits scouts between companies equally. Otherwise all scouts are kept in 10th Company. - "split_vets": 0 // 0 no, 1 yes. If yes, all veterans are distrubuted equally between companies. Otherwise all veterans are kept in the 1st Company + "split_scouts": 0, // 0 no, 1 yes. If yes, splits scouts between ships equally. Otherwise all scouts are kept on the homeworld. + "split_vets": 0 // 0 no, 1 yes. If yes, all veterans are distrubuted equally between ships. Otherwise all veterans are kept in the flagship }, "successors": 0, //total number of successor chapters "mutations": { diff --git a/scripts/scr_colors_initialize/scr_colors_initialize.gml b/scripts/scr_colors_initialize/scr_colors_initialize.gml index bbb3b30a4b..f1ebae5ee1 100644 --- a/scripts/scr_colors_initialize/scr_colors_initialize.gml +++ b/scripts/scr_colors_initialize/scr_colors_initialize.gml @@ -1,5 +1,5 @@ enum Colors { - White, + White = 0, Silver, Fenrisian_Grey, Grey, @@ -9,7 +9,7 @@ enum Colors { Lighter_Black, Black, Red, - Sanguine_Red, + Sanguine_Red = 10, Dark_Red, Gold, Orange, @@ -19,7 +19,7 @@ enum Colors { Deathwing, Bone, Yellow, - Dark_Gold, + Dark_Gold = 20, Copper, Lime, Green, @@ -29,14 +29,15 @@ enum Colors { Dark_Green, Cyan, Turqoise, - Light_Blue, + Light_Blue = 30, Blue, Enchanted_Blue, Ultramarine, Dark_Ultramarine, Purple, Pink, - Imperial_Fists + Imperial_Fists, + Raptors_Green } function scr_colors_initialize() { @@ -78,7 +79,9 @@ function scr_colors_initialize() { ["Dark Ultramarine", 31, 74, 127], ["Purple", 117, 0, 217], ["Pink", 255, 0, 198], - ["Imperial Fists", 255, 200, 0] + ["Imperial Fists", 255, 200, 0], + ["Raptors Green", 65, 74, 29], + ]; global.colors_count = array_length(colors_array); From 8707d514ffa8a81246d36af54a4b7d24746f91ba Mon Sep 17 00:00:00 2001 From: EttyKitty <20323032+EttyKitty@users.noreply.github.com> Date: Wed, 14 May 2025 01:51:13 +0300 Subject: [PATCH 037/286] refactor: Move star_sprites ds_map to global scope (#818) --- objects/obj_controller/CleanUp_0.gml | 4 ++-- objects/obj_controller/Create_0.gml | 2 -- objects/obj_star/Draw_0.gml | 10 +++++----- scripts/__init_global/__init_global.gml | 1 + 4 files changed, 8 insertions(+), 9 deletions(-) diff --git a/objects/obj_controller/CleanUp_0.gml b/objects/obj_controller/CleanUp_0.gml index 4686f609d9..e43d58b1e2 100644 --- a/objects/obj_controller/CleanUp_0.gml +++ b/objects/obj_controller/CleanUp_0.gml @@ -1,7 +1,7 @@ global.name_generator = new NameGenerator(); var _star_arrays = []; -ds_map_values_to_array(obj_controller.star_sprites,_star_arrays); +ds_map_values_to_array(global.star_sprites,_star_arrays); for (var i=0;i Date: Wed, 14 May 2025 08:53:06 +1000 Subject: [PATCH 038/286] feat: Consecrators chapter + ancient armoury trait (#815) --- ChapterMaster.yyp | 5 + .../creation/chapters/icons/consecrators.png | Bin 0 -> 5541 bytes datafiles/main/chapters/37.json | 339 ++++++++++++++++++ objects/obj_creation/Create_0.gml | 6 + scripts/scr_ComplexSet/scr_ComplexSet.gml | 3 + .../scr_creation_draw_slides.gml | 2 + .../scr_initialize_custom.gml | 9 + .../scr_unit_spawn_functions.gml | 12 +- 8 files changed, 375 insertions(+), 1 deletion(-) create mode 100644 datafiles/images/creation/chapters/icons/consecrators.png create mode 100644 datafiles/main/chapters/37.json diff --git a/ChapterMaster.yyp b/ChapterMaster.yyp index 3032f1412f..adc4282c28 100644 --- a/ChapterMaster.yyp +++ b/ChapterMaster.yyp @@ -131,6 +131,8 @@ {"$GMIncludedFile":"","%Name":"blood_angels.png","CopyToMask":-1,"filePath":"datafiles/images/creation/chapters/icons","name":"blood_angels.png","resourceType":"GMIncludedFile","resourceVersion":"2.0",}, {"$GMIncludedFile":"","%Name":"blood_ravens.png","CopyToMask":-1,"filePath":"datafiles/images/creation/chapters/icons","name":"blood_ravens.png","resourceType":"GMIncludedFile","resourceVersion":"2.0",}, {"$GMIncludedFile":"","%Name":"carcharodons.png","CopyToMask":-1,"filePath":"datafiles/images/creation/chapters/icons","name":"carcharodons.png","resourceType":"GMIncludedFile","resourceVersion":"2.0",}, + {"$GMIncludedFile":"","%Name":"consecrators.png","CopyToMask":-1,"filePath":"datafiles/images/creation/chapters/icons","name":"consecrators.png","resourceType":"GMIncludedFile","resourceVersion":"2.0",}, + {"$GMIncludedFile":"","%Name":"celestial_lions.png","CopyToMask":-1,"filePath":"datafiles/images/creation/chapters/icons","name":"celestial_lions.png","resourceType":"GMIncludedFile","resourceVersion":"2.0",}, {"$GMIncludedFile":"","%Name":"conservators.png","CopyToMask":-1,"filePath":"datafiles/images/creation/chapters/icons","name":"conservators.png","resourceType":"GMIncludedFile","resourceVersion":"2.0",}, {"$GMIncludedFile":"","%Name":"crimson_fists.png","CopyToMask":-1,"filePath":"datafiles/images/creation/chapters/icons","name":"crimson_fists.png","resourceType":"GMIncludedFile","resourceVersion":"2.0",}, @@ -519,6 +521,9 @@ {"$GMIncludedFile":"","%Name":"32.JSON","CopyToMask":-1,"filePath":"datafiles/main/chapters","name":"32.JSON","resourceType":"GMIncludedFile","resourceVersion":"2.0",}, {"$GMIncludedFile":"","%Name":"33.json","CopyToMask":-1,"filePath":"datafiles/main/chapters","name":"33.json","resourceType":"GMIncludedFile","resourceVersion":"2.0",}, {"$GMIncludedFile":"","%Name":"34.json","CopyToMask":-1,"filePath":"datafiles/main/chapters","name":"34.json","resourceType":"GMIncludedFile","resourceVersion":"2.0",}, + + {"$GMIncludedFile":"","%Name":"37.json","CopyToMask":-1,"filePath":"datafiles/main/chapters","name":"37.json","resourceType":"GMIncludedFile","resourceVersion":"2.0",}, + {"$GMIncludedFile":"","%Name":"36.json","CopyToMask":-1,"filePath":"datafiles/main/chapters","name":"36.json","resourceType":"GMIncludedFile","resourceVersion":"2.0",}, {"$GMIncludedFile":"","%Name":"35.json","CopyToMask":-1,"filePath":"datafiles/main/chapters","name":"35.json","resourceType":"GMIncludedFile","resourceVersion":"2.0",}, {"$GMIncludedFile":"","%Name":"4.JSON","CopyToMask":-1,"filePath":"datafiles/main/chapters","name":"4.JSON","resourceType":"GMIncludedFile","resourceVersion":"2.0",}, diff --git a/datafiles/images/creation/chapters/icons/consecrators.png b/datafiles/images/creation/chapters/icons/consecrators.png new file mode 100644 index 0000000000000000000000000000000000000000..a2f2f6e50c7f5977cd65eef7eccf1b532c8a4d33 GIT binary patch literal 5541 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 b|IKts "Deathwing Terminator" + ** - loadout: Struct containing Required and Optional weaponry this unit can equip + a required loadout always follows this syntax :[,] + so "wep1":["Bolter",4], will mean four marines are always equipped with 4 bolters in the wep1 slot + * option loadouts follow the following syntax :[[],] + for example [["Flamer", "Meltagun"],1], means the role can have a max of one flamer or meltagun + [["Plasma Pistol","Bolt Pistol"], 4] means the role can have a mix of 4 plasma pistols and bolt pistols on top + of all required loadout options + - wep1: right hand weapon + - wep2: left hand weapon + - mobi: Mobility item, e.g. Jump Packs. + - armour: required armour + - gear: special equipment needed for certain roles, like a Roasrius or Narthecium + * - type_data: names the squad, allows certain formations + */ + "squad_name": "Squad", + "custom_squads": {} + } +} \ No newline at end of file diff --git a/objects/obj_creation/Create_0.gml b/objects/obj_creation/Create_0.gml index a66a7e27e6..0aed28948b 100644 --- a/objects/obj_creation/Create_0.gml +++ b/objects/obj_creation/Create_0.gml @@ -785,6 +785,12 @@ var all_advantages = [ value : 40, meta : ["Gear Quality"] }, + { + name : "Ancient Armoury", + description : "Your chapter is dedicated to preserving ancient wargear and as such have substantially higher amounts of rare Heresy-era armour than normal.", + value: 20, + meta : ["Gear Quality"] + }, { name : "Enemy: Eldar", description : "Eldar are particularly hated by your chapter. When fighting Eldar damage is increased.", diff --git a/scripts/scr_ComplexSet/scr_ComplexSet.gml b/scripts/scr_ComplexSet/scr_ComplexSet.gml index c8d1801983..6ebe733381 100644 --- a/scripts/scr_ComplexSet/scr_ComplexSet.gml +++ b/scripts/scr_ComplexSet/scr_ComplexSet.gml @@ -798,6 +798,9 @@ function ComplexSet(_unit) constructor { _complex_helm = _comp_helms.captain; } else if (unit_role == _role[eROLE.Veteran] || (unit_role == _role[eROLE.Terminator] && unit.company == 1)) { _complex_helm = _comp_helms.veteran; + } else if (struct_exists(_comp_helms, "all_others")){ + // there's probably room to improve this but consecrators demand the stripe + _complex_helm = _comp_helms.all_others; } if (is_struct(_complex_helm) && struct_exists(self, "head") && draw_helms) { complex_helms(_complex_helm); diff --git a/scripts/scr_creation_draw_slides/scr_creation_draw_slides.gml b/scripts/scr_creation_draw_slides/scr_creation_draw_slides.gml index 913ba4f3ce..8892a865d1 100644 --- a/scripts/scr_creation_draw_slides/scr_creation_draw_slides.gml +++ b/scripts/scr_creation_draw_slides/scr_creation_draw_slides.gml @@ -265,6 +265,8 @@ function draw_chapter_select(){ grid.new_cell(); + grid.new_cell(); + grid.new_cell(); //padding between fanmade and the custom/random buttons // Blank Custom Chapter diff --git a/scripts/scr_initialize_custom/scr_initialize_custom.gml b/scripts/scr_initialize_custom/scr_initialize_custom.gml index b5d6404c58..2d67d4132c 100644 --- a/scripts/scr_initialize_custom/scr_initialize_custom.gml +++ b/scripts/scr_initialize_custom/scr_initialize_custom.gml @@ -3203,6 +3203,15 @@ function scr_initialize_custom() { scr_add_item("MK4 Maximus", irandom_range(3, 18)); } + if(scr_has_adv("Ancient Armoury")){ + scr_add_item("MK4 Maximus", irandom_range(5, 10)); + scr_add_item("MK5 Heresy", irandom_range(5, 10)); + scr_add_item("MK3 Iron Armour", irandom_range(1, 5)); + scr_add_item("MK6 Corvus", irandom_range(10, 15)); + scr_add_item("MK7 Aquila", -10); + scr_add_item("MK8 Errant", -1); + } + gene_slaves = []; var bloo = 0, diff --git a/scripts/scr_unit_spawn_functions/scr_unit_spawn_functions.gml b/scripts/scr_unit_spawn_functions/scr_unit_spawn_functions.gml index 2325f7822f..c843572bf7 100644 --- a/scripts/scr_unit_spawn_functions/scr_unit_spawn_functions.gml +++ b/scripts/scr_unit_spawn_functions/scr_unit_spawn_functions.gml @@ -186,6 +186,12 @@ function scr_marine_spawn_armour() { ["MK4 Maximus", 1], ["MK3 Iron Armour", 1] ], + ancient_armour: [ + ["MK6 Corvus", 5], + ["MK5 Heresy", 3], + ["MK4 Maximus", 1], + ["MK3 Iron Armour", 1] + ], }; var _terminator_roles_array = [obj_ini.role[100][eROLE.Captain], obj_ini.role[100][eROLE.Champion], obj_ini.role[100][eROLE.Ancient], obj_ini.role[100][eROLE.Chaplain], obj_ini.role[100][eROLE.Apothecary], obj_ini.role[100][eROLE.Librarian], obj_ini.role[100][eROLE.Techmarine]]; @@ -221,7 +227,9 @@ function scr_marine_spawn_armour() { case obj_ini.role[100][eROLE.Devastator]: case obj_ini.role[100][eROLE.Assault]: case obj_ini.role[100][eROLE.Sergeant]: - if (_total_score > 280) { + if(scr_has_adv("Ancient Armoury")){ + update_armour(choose_weighted(_armour_weighted_lists.ancient_armour), false, false); + } else if (_total_score > 280) { update_armour(choose_weighted(_armour_weighted_lists.old_armour), false, false); } else if (_total_score > 180) { update_armour(choose_weighted(_armour_weighted_lists.quality_armour), false, false); @@ -234,6 +242,8 @@ function scr_marine_spawn_armour() { case obj_ini.role[100][eROLE.Techmarine]: if (_total_score > 280) { update_armour("Artificer Armour", false, false); + } else if(scr_has_adv("Ancient Armoury")){ + update_armour(choose_weighted(_armour_weighted_lists.ancient_armour), false, false); } else if (_total_score > 180) { update_armour(choose_weighted(_armour_weighted_lists.quality_armour), false, false); } else if (_total_score > 100) { From b7660f81894e46f0cb2d4f34d527c24b5f554536 Mon Sep 17 00:00:00 2001 From: EttyKitty <20323032+EttyKitty@users.noreply.github.com> Date: Wed, 14 May 2025 01:57:12 +0300 Subject: [PATCH 039/286] refactor: eCHAPTER_TYPE enum and str slider fix (#819) --- objects/obj_controller/Create_0.gml | 4 +- objects/obj_creation/Create_0.gml | 2 +- objects/obj_creation/Draw_0.gml | 28 +++++------ objects/obj_creation/Step_0.gml | 6 +-- objects/obj_ncombat/Alarm_1.gml | 2 +- scripts/scr_creation/scr_creation.gml | 12 ++--- .../scr_creation_draw_slides.gml | 42 ++++++++--------- .../scr_creation_home_planet_create.gml | 24 +++++----- .../scr_initialize_custom.gml | 26 +++++------ scripts/scr_livery_setup/scr_livery_setup.gml | 46 +++++++++---------- .../scr_load_controller.gml | 2 +- scripts/scr_powers/scr_powers.gml | 2 +- .../scr_restart_variables.gml | 4 +- .../scr_system_spawn_functions.gml | 2 +- scripts/scr_ui_settings/scr_ui_settings.gml | 12 ++--- 15 files changed, 107 insertions(+), 107 deletions(-) diff --git a/objects/obj_controller/Create_0.gml b/objects/obj_controller/Create_0.gml index 6aaa7b57b9..4318459c67 100644 --- a/objects/obj_controller/Create_0.gml +++ b/objects/obj_controller/Create_0.gml @@ -1415,7 +1415,7 @@ if (global.load>=0){ var xx,yy,me,dist,go,planet; -global.custom=1; +global.custom=eCHAPTER_TYPE.RANDOM; // ** Sets up base training level and trainees at game start ** training_apothecary=0; @@ -1508,7 +1508,7 @@ ork=1; eldar=1; // if tau = 1 then tau spawn. also does eldar /* -if (global.custom=1){ +if (global.custom==eCHAPTER_TYPE.RANDOM){ tau=choose(0,0,1); eldar=choose(0,1); } diff --git a/objects/obj_creation/Create_0.gml b/objects/obj_creation/Create_0.gml index 0aed28948b..ece6cde89e 100644 --- a/objects/obj_creation/Create_0.gml +++ b/objects/obj_creation/Create_0.gml @@ -384,7 +384,7 @@ chapter_name="Unnamed"; chapter_string="Unnamed"; chapter_year=0; /// @instancevar {Real} custom 0 if premade, 1 if random, 2 if custom -custom=0; +custom=eCHAPTER_TYPE.PREMADE; /// @instancevar {Enum.ePROGENITOR} founding founding=ePROGENITOR.NONE; chapter_tooltip=""; diff --git a/objects/obj_creation/Draw_0.gml b/objects/obj_creation/Draw_0.gml index 403b83e704..4ec0c875b6 100644 --- a/objects/obj_creation/Draw_0.gml +++ b/objects/obj_creation/Draw_0.gml @@ -35,7 +35,7 @@ try { draw_line(xx + 30, yy + 70 + (slate3 * 36), xx + 790, yy + 70 + (slate3 * 36)); } - allow_colour_click = (custom > 1) && (!instance_exists(obj_creation_popup)); + allow_colour_click = (custom == eCHAPTER_TYPE.CUSTOM) && (!instance_exists(obj_creation_popup)); draw_set_alpha(slate4 / 30); if (slate4 > 0) { @@ -53,10 +53,10 @@ try { tooltip2 = ""; if (goto_slide != 1) { - if (custom == 2) { + if (custom == eCHAPTER_TYPE.CUSTOM) { draw_sprite(spr_creation_other, 4, 0, 68); } - if (custom == 1) { + if (custom == eCHAPTER_TYPE.RANDOM) { draw_sprite(spr_creation_other, 5, 0, 68); } @@ -101,7 +101,7 @@ try { tooltip2 = "The parent Chapter whos Gene-Seed your own originates from."; } - if (custom > 1) { + if (custom == eCHAPTER_TYPE.CUSTOM) { draw_sprite_stretched(spr_creation_arrow, 0, 1164 - 194, 160, 32, 32); draw_sprite_stretched(spr_creation_arrow, 1, 1164 - 144, 160, 32, 32); @@ -182,7 +182,7 @@ try { var x1, y1, spac = 34; - if (custom < 2 || purity == 10) { + if (custom != eCHAPTER_TYPE.CUSTOM || purity == 10) { draw_set_alpha(0.5); } var mutations_defects = [{ @@ -390,10 +390,10 @@ try { draw_text_transformed(580, 100, string_hash_to_newline("Chapter Master Name: "), 0.9, 0.9, 0); draw_set_font(fnt_40k_14b); - if ((text_selected != "cm") || (custom == 0)) { + if ((text_selected != "cm") || (custom == eCHAPTER_TYPE.PREMADE)) { draw_text_ext(580, 144, string_hash_to_newline(string(chapter_master_name)), -1, 580); } - if ((custom > 0) && (restarted == 0)) { + if ((custom != eCHAPTER_TYPE.PREMADE) && (restarted == 0)) { if ((text_selected == "cm") && (text_bar > 30)) { draw_text(580, 144, string_hash_to_newline(string(chapter_master_name))); } @@ -439,7 +439,7 @@ try { x6 = 444; y6 = 265; spac = 25; - if ((custom == 0) || (restarted > 0)) { + if ((custom == eCHAPTER_TYPE.PREMADE) || (restarted > 0)) { draw_set_alpha(0.5); } @@ -476,7 +476,7 @@ try { } draw_sprite(spr_creation_check, yar, x6, y6); yar = 0; - if (point_and_click([x6, y6, x6 + 32, y6 + 32]) && (custom > 0) && (restarted == 0) && (!instance_exists(obj_creation_popup))) { + if (point_and_click([x6, y6, x6 + 32, y6 + 32]) && (custom != eCHAPTER_TYPE.PREMADE) && (restarted == 0) && (!instance_exists(obj_creation_popup))) { var onceh; onceh = 0; if ((chapter_master_melee == melee_choice_order) && (onceh == 0)) { @@ -509,7 +509,7 @@ try { } draw_sprite(spr_creation_check, yar, x6, y6); yar = 0; - if (point_and_click([x6, y6, x6 + 32, y6 + 32]) && (custom > 0) && (restarted == 0) && (!instance_exists(obj_creation_popup)) && (!array_contains([1, 2, 7], chapter_master_melee))) { + if (point_and_click([x6, y6, x6 + 32, y6 + 32]) && (custom != eCHAPTER_TYPE.PREMADE) && (restarted == 0) && (!instance_exists(obj_creation_popup)) && (!array_contains([1, 2, 7], chapter_master_melee))) { var onceh = 0; if (chapter_master_ranged == ranged_choice_order) { chapter_master_ranged = 0; @@ -548,7 +548,7 @@ try { if (nope) { draw_set_alpha(0.5); } - if ((custom < 2) || (restarted > 0)) { + if ((custom != eCHAPTER_TYPE.CUSTOM) || (restarted > 0)) { draw_set_alpha(0.5); } @@ -559,7 +559,7 @@ try { draw_sprite(spr_creation_check, chapter_master_specialty == h, x6, y6 + 214); - if (point_and_click([x6, y6 + 214, x6 + 32, y6 + 32 + 214]) && (custom > 1) && (restarted == 0) && (nope == 0)) { + if (point_and_click([x6, y6 + 214, x6 + 32, y6 + 32 + 214]) && (custom == eCHAPTER_TYPE.CUSTOM) && (restarted == 0) && (nope == 0)) { var onceh = 0; if ((chapter_master_specialty != h) && (onceh == 0)) { chapter_master_specialty = h; @@ -577,7 +577,7 @@ try { //adds "Save Chapter" button if custom chapter in a save slot - if (custom > 0 && global.chapter_id != eCHAPTERS.UNKNOWN) { + if (custom != eCHAPTER_TYPE.PREMADE && global.chapter_id != eCHAPTERS.UNKNOWN) { /// save chapter box var _sc_box = { x1: 980, @@ -703,7 +703,7 @@ try { } // skip to end >> button - if ((slide >= 2) && (slide < 6) && (custom != 2)) { + if ((slide >= 2) && (slide < 6) && (custom != eCHAPTER_TYPE.CUSTOM)) { draw_set_alpha(0.8); if ((popup == "") && ((change_slide >= 70) || (change_slide <= 0)) && scr_hit(927 + 64 + 12, 761 + 12, 927 + 128 - 12, 761 + 64 - 12)) { draw_set_alpha(1); diff --git a/objects/obj_creation/Step_0.gml b/objects/obj_creation/Step_0.gml index 343a851772..2f57804bf1 100644 --- a/objects/obj_creation/Step_0.gml +++ b/objects/obj_creation/Step_0.gml @@ -6,7 +6,7 @@ if (slide==1){ scr_chapter_new(chapter_name); keyboard_string=""; if (chapter_name!="nopw_nopw"){ - custom=0; + custom=eCHAPTER_TYPE.PREMADE; change_slide=1; goto_slide=2; chapter_string=chapter_name; @@ -66,7 +66,7 @@ if (change_slide==35) or (change_slide==36) or (chapter_name=="Doom Benefactors" chapter_name="Unnamed"; chapter_string="Unnamed"; - custom=0; + custom=eCHAPTER_TYPE.PREMADE; founding=ePROGENITOR.NONE; points=0; maxpoints=100; @@ -157,7 +157,7 @@ if (text_bar>60) then text_bar=1; if (cooldown>0) and (cooldown<=5000) then cooldown-=1; // Checks if the name already exists -if (custom==2){ +if (custom==eCHAPTER_TYPE.CUSTOM){ name_bad=0; if (chapter_name=="") then name_bad=1; if (chapter_name=="Dark Angels") then name_bad=1; diff --git a/objects/obj_ncombat/Alarm_1.gml b/objects/obj_ncombat/Alarm_1.gml index cd758f8e86..ff2caec7c5 100644 --- a/objects/obj_ncombat/Alarm_1.gml +++ b/objects/obj_ncombat/Alarm_1.gml @@ -492,7 +492,7 @@ if (temp>=100) and (threat>1) and (big_mofo>0) and (big_mofo<10) and (dropping=0 // show_message(string(global.chapter_name)+"|"+string(global.custom)+"|"+string(standard_cry)); - if (global.chapter_name="Iron Warriors") and (global.custom=0){standard_cry=1; + if (global.chapter_name="Iron Warriors") and (global.custom==eCHAPTER_TYPE.PREMADE){standard_cry=1; var rand;rand=choose(1,2,3,4,5); if (rand=1) and (big_mofo!=1){p2="breaks the silence, begining the Chapter Battlecry-";}if (rand=1) and (big_mofo=1){p2="break the silence, begining the Chapter Battlecry-";} if (rand=2) and (big_mofo!=1){p2="roars the first half of the Chapter Battlecry-";}if (rand=2) and (big_mofo=1){p2="roar the first half of the Chapter Battlecry-";} diff --git a/scripts/scr_creation/scr_creation.gml b/scripts/scr_creation/scr_creation.gml index 9fae62a0ad..9fa2d9c6db 100644 --- a/scripts/scr_creation/scr_creation.gml +++ b/scripts/scr_creation/scr_creation.gml @@ -19,7 +19,7 @@ function scr_creation(slide_num) { // 6 = Chapter Master show_debug_message($"calling scr_creation with input {slide_num}"); - if (slide_num=2 && custom>0){ + if (slide_num=2 && custom!=eCHAPTER_TYPE.PREMADE){ if (name_bad=1){/*(sound_play(bad);*/} if (name_bad=0){ change_slide=1;goto_slide=3;race[100,17]=1; @@ -27,7 +27,7 @@ function scr_creation(slide_num) { } } - if (slide_num=2 && custom==0){ + if (slide_num=2 && custom==eCHAPTER_TYPE.PREMADE){ change_slide=1; goto_slide=3; race[100,eROLE.Chaplain]=1; @@ -76,11 +76,11 @@ function scr_creation(slide_num) { } if (slide_num=4){ - if (custom == 0 || (hapothecary!="" && hchaplain!="" && clibrarian!="" && fmaster!="" && recruiter!="" && admiral!="" && battle_cry!="")){ + if (custom == eCHAPTER_TYPE.PREMADE || (hapothecary!="" && hchaplain!="" && clibrarian!="" && fmaster!="" && recruiter!="" && admiral!="" && battle_cry!="")){ change_slide=1; goto_slide=5; - if (custom=2){ + if (custom==eCHAPTER_TYPE.CUSTOM){ mutations_selected=0; preomnor=0; voice=0; @@ -98,7 +98,7 @@ function scr_creation(slide_num) { mutations = 10 - purity } - if (custom > 0) { + if (custom != eCHAPTER_TYPE.PREMADE) { disposition[0] = 0; disposition[eSTART_FACTION.Progenitor] = 60 + ((cooperation - 5) * 4); // Prog disposition[eSTART_FACTION.Imperium] = 50 + ((cooperation - 5) * 4); // Imp @@ -172,7 +172,7 @@ function scr_creation(slide_num) { // 5 to 6 if (slide_num=5){ - if (custom=0 || mutations<=mutations_selected){ + if (custom==eCHAPTER_TYPE.PREMADE || mutations<=mutations_selected){ change_slide=1; goto_slide=6; } diff --git a/scripts/scr_creation_draw_slides/scr_creation_draw_slides.gml b/scripts/scr_creation_draw_slides/scr_creation_draw_slides.gml index 8892a865d1..6775d782e6 100644 --- a/scripts/scr_creation_draw_slides/scr_creation_draw_slides.gml +++ b/scripts/scr_creation_draw_slides/scr_creation_draw_slides.gml @@ -103,7 +103,7 @@ function draw_chapter_select(){ if (!chap.disabled) { if (scr_chapter_new(chapter_name)) { scr_load_chapter_icon(chap.icon_name, true); - custom = 0; + custom = eCHAPTER_TYPE.PREMADE; change_slide = 1; goto_slide = 2; chapter_string = chapter_name; @@ -147,7 +147,7 @@ function draw_chapter_select(){ if (!chap.disabled) { if (scr_chapter_new(chapter_name)) { scr_load_chapter_icon(chap.icon_name, true); - custom = 0; + custom = eCHAPTER_TYPE.PREMADE; change_slide = 1; goto_slide = 2; chapter_string = chapter_name; @@ -202,13 +202,13 @@ function draw_chapter_select(){ global.chapter_id = chap.id; change_slide = 1; goto_slide = 2; - custom = 2; + custom = eCHAPTER_TYPE.CUSTOM; scr_chapter_new(chap.id); } else { global.chapter_id = chap.id; change_slide = 1; goto_slide = 2; - custom = 2; + custom = eCHAPTER_TYPE.CUSTOM; scr_chapter_random(0); } } @@ -251,7 +251,7 @@ function draw_chapter_select(){ // global.chapter_icon_path = $"creation/chapters/icons"; // global.chapter_icon_filename = chap.icon_name; global.chapter_id = chap.id; - custom = 0; + custom = eCHAPTER_TYPE.PREMADE; change_slide = 1; goto_slide = 2; chapter_string = chapter_name; @@ -291,7 +291,7 @@ function draw_chapter_select(){ scr_load_chapter_icon("unknown", true); change_slide = 1; goto_slide = 2; - custom = 2; + custom = eCHAPTER_TYPE.CUSTOM; scr_chapter_random(0); } } @@ -319,7 +319,7 @@ function draw_chapter_select(){ scr_load_chapter_icon(array_random_element(global.chapter_icons_array), true); change_slide = 1; goto_slide = 2; - custom = 1; + custom = eCHAPTER_TYPE.RANDOM; scr_chapter_random(1); } } @@ -401,8 +401,8 @@ function draw_chapter_trait_select(){ obj_cursor.image_index=0; if (name_bad=1) then draw_set_color(c_red); - if (text_selected!="chapter") or (custom!=2) then draw_text(800,80,string_hash_to_newline(string(chapter_name))); - if (custom=2){ + if (text_selected!="chapter") or (custom!=eCHAPTER_TYPE.CUSTOM) then draw_text(800,80,string_hash_to_newline(string(chapter_name))); + if (custom==eCHAPTER_TYPE.CUSTOM){ if (text_selected="chapter") and (text_bar>30) then draw_text(800,80,string_hash_to_newline(string(chapter_name))); if (text_selected="chapter") and (text_bar<=30) then draw_text(805,80,string_hash_to_newline(string(chapter_name)+"|")); if (scr_text_hit(800,80,true,chapter_name)){ @@ -421,7 +421,7 @@ function draw_chapter_trait_select(){ obj_cursor.image_index=0; - if (custom>0) and (restarted=0){ + if (custom!=eCHAPTER_TYPE.PREMADE) and (restarted=0){ if (scr_hit(436,74,436+128,74+128)) and (popup=""){ obj_cursor.image_index=1; if (scr_click_left()){ @@ -430,7 +430,7 @@ function draw_chapter_trait_select(){ } } - /*if (custom>0) and (restarted=0){ + /*if (custom!=eCHAPTER_TYPE.PREMADE) and (restarted=0){ draw_sprite_stretched(spr_creation_arrow,0,550,160,32,32); draw_sprite_stretched(spr_creation_arrow,1,597,160,32,32); }*/ @@ -441,7 +441,7 @@ function draw_chapter_trait_select(){ draw_line(445,202,1125,202); if (popup=""){ - if (custom<2) then draw_set_alpha(0.5); + if (custom!=eCHAPTER_TYPE.CUSTOM) then draw_set_alpha(0.5); draw_text_transformed(800,211,string_hash_to_newline("Chapter Type"),0.6,0.6,0); draw_set_halign(fa_left); @@ -458,11 +458,11 @@ function draw_chapter_trait_select(){ tooltip2="As with Fleet Based, but you must crusade and fight until your penitence meter runs out. Note that recruiting is disabled until then."; }// Avoiding fights will result in excomunicatus traitorus. - if (custom<2) then draw_set_alpha(0.5); + if (custom!=eCHAPTER_TYPE.CUSTOM) then draw_set_alpha(0.5); yar=0; if (fleet_type=1) then yar=1; draw_sprite(spr_creation_check,yar,519,239);yar=0; - if (custom=2 && point_and_click([519,239,519+32,239+32])){ + if (custom==eCHAPTER_TYPE.CUSTOM && point_and_click([519,239,519+32,239+32])){ if (points+20<=maxpoints) and (fleet_type=3){points+=20;fleet_type=1;} if (fleet_type=2){fleet_type=1;} } @@ -471,7 +471,7 @@ function draw_chapter_trait_select(){ yar=0; if (fleet_type=2) then yar=1; draw_sprite(spr_creation_check,yar,771,239);yar=0; - if (custom=2 && point_and_click([771,239,771+32,239+32])) { + if (custom==eCHAPTER_TYPE.CUSTOM && point_and_click([771,239,771+32,239+32])) { if (points+20<=maxpoints) and (fleet_type=3){points+=20;fleet_type=2;} if (fleet_type=1){fleet_type=2;} } @@ -480,7 +480,7 @@ function draw_chapter_trait_select(){ yar=0; if (fleet_type=3) then yar=1; draw_sprite(spr_creation_check,yar,958,239);yar=0; - if (custom=2 && point_and_click([958,239,958+32,239+32])){ + if (custom==eCHAPTER_TYPE.CUSTOM && point_and_click([958,239,958+32,239+32])){ if (fleet_type!=3) { points-=20; } @@ -510,7 +510,7 @@ function draw_chapter_trait_select(){ var scores_max = [10, 10, 10, 99]; var scores_min = [1, 1, 1, 1]; var click_change = keyboard_check(vk_control) ? 10 : 1; - if (custom == 2) { + if (custom == eCHAPTER_TYPE.CUSTOM) { for (var i = 0; i < 4; i++) { draw_sprite_stretched(spr_arrow, 0, 436, 325 + (i * 55), 32, 32); if (scr_hit(436, 325 + (i * 55), 436 + sprite_get_width(spr_arrow), 357 + (i * 55))) { @@ -562,11 +562,11 @@ function draw_chapter_trait_select(){ draw_rectangle(445, 551, 1125, 553, 0); } - if (popup!="") or (custom<2) then draw_set_alpha(0.5); + if (popup!="") or (custom!=eCHAPTER_TYPE.CUSTOM) then draw_set_alpha(0.5); if (popup!="icons"){ - var advantage_click_allow = custom>1; + var advantage_click_allow = custom==eCHAPTER_TYPE.CUSTOM; draw_set_halign(fa_left); draw_set_font(fnt_40k_30b); draw_text_transformed(436,564,"Chapter Advantages",0.5,0.5,0); @@ -585,7 +585,7 @@ function draw_chapter_trait_select(){ draw_text(adv_txt.x1,adv_txt.y1+(i*adv_txt.h), draw_string); if (scr_hit(adv_txt.x1,adv_txt.y1+(i*adv_txt.h),adv_txt.x2,adv_txt.y2+(i*adv_txt.h))){ - if (points>=maxpoints) and (adv_num[i]=0) and (popup="") and (custom>1){ + if (points>=maxpoints) and (adv_num[i]=0) and (popup="") and (custom==eCHAPTER_TYPE.CUSTOM){ tooltip="Insufficient Points"; tooltip2="Add disadvantages or decrease Chapter Stats"; } @@ -914,7 +914,7 @@ function draw_chapter_homeworld_select(){ var trial_data = scr_trial_data(); draw_text_transformed(160,90,"Aspirant Trial",0.6,0.6,0); - if (custom>1){ + if (custom==eCHAPTER_TYPE.CUSTOM){ draw_sprite_stretched(spr_creation_arrow,0,40,90,32,32); if (point_and_click([40,90,40+32,90+32])){ aspirant_trial++; diff --git a/scripts/scr_creation_home_planet_create/scr_creation_home_planet_create.gml b/scripts/scr_creation_home_planet_create/scr_creation_home_planet_create.gml index cf947f7002..dffc108bb6 100644 --- a/scripts/scr_creation_home_planet_create/scr_creation_home_planet_create.gml +++ b/scripts/scr_creation_home_planet_create/scr_creation_home_planet_create.gml @@ -2,13 +2,13 @@ // https://help.yoyogames.com/hc/en-us/articles/360005277377 for more information function player_recruit_planet_selection(){ with (obj_creation){ - if (fleet_type!=1) or (custom<2) then draw_set_alpha(0.5); + if (fleet_type!=1) or (custom!=eCHAPTER_TYPE.CUSTOM) then draw_set_alpha(0.5); yar=0; var _recruit_home = buttons.recruit_home_relationship; _recruit_home.x1 = 1265; _recruit_home.y1 = 110; - if (custom==0){ + if (custom==eCHAPTER_TYPE.PREMADE){ _recruit_home.allow_changes = false; } _recruit_home.draw(); @@ -21,7 +21,7 @@ function player_recruit_planet_selection(){ } var _cur_planet_index2 = scr_planet_image_numbers(recruiting); - if (custom>1 && _recruit_world_type>0){ + if (custom==eCHAPTER_TYPE.CUSTOM && _recruit_world_type>0){ draw_sprite_stretched(spr_creation_arrow,0,1265,285,32,32); draw_sprite_stretched(spr_creation_arrow,1,1455,285,32,32); recruiting = list_traveler(planet_types, recruiting, [1265,285,1265+32,285+32],[1455,285,1455+32,285+32]); @@ -44,8 +44,8 @@ function player_recruit_planet_selection(){ if (fleet_type=1 && _recruit_world_type<2) and (homeworld_name=recruiting_name) then name_bad=1; //TODO make a centralised logic for player renaming things in the creation screen if (name_bad=1) then draw_set_color(c_red); - if (text_selected!="recruiting_name") or (custom<2) then draw_text_transformed(1044+333,398,recruiting_name,0.5,0.5,0); - if (custom>1 && _recruit_world_type==2){ + if (text_selected!="recruiting_name") or (custom!=eCHAPTER_TYPE.CUSTOM) then draw_text_transformed(1044+333,398,recruiting_name,0.5,0.5,0); + if (custom==eCHAPTER_TYPE.CUSTOM && _recruit_world_type==2){ if (text_selected="recruiting_name") and (text_bar>30) then draw_text_transformed(1044+333,398,recruiting_name,0.5,0.5,0); if (text_selected="recruiting_name") and (text_bar<=30) then draw_text_transformed(1044+333,398,$"{recruiting_name}|",0.5,0.5,0); if (scr_text_hit(1044+333,398,true,recruiting_name)){ @@ -90,9 +90,9 @@ function scr_creation_home_planet_create(){ draw_text_transformed(644,378,homeworld,0.5,0.5,0); // draw_text_transformed(644,398,string(homeworld_name),0.5,0.5,0); - if (text_selected!="home_name") or (custom<2) then draw_text_transformed(644,398,homeworld_name,0.5,0.5,0); + if (text_selected!="home_name") or (custom!=eCHAPTER_TYPE.CUSTOM) then draw_text_transformed(644,398,homeworld_name,0.5,0.5,0); - if (custom>1){ + if (custom==eCHAPTER_TYPE.CUSTOM){ if (text_selected="home_name") { draw_text_transformed(644,398,homeworld_name+(text_bar>30?"":"|"),0.5,0.5,0); @@ -118,7 +118,7 @@ function scr_creation_home_planet_create(){ } } - if (custom>1){ + if (custom==eCHAPTER_TYPE.CUSTOM){ draw_sprite_stretched(spr_creation_arrow,0,525,285,32,32); draw_sprite_stretched(spr_creation_arrow,1,725,285,32,32); homeworld = list_traveler(planet_types, homeworld, [525,285,525+32,285+32],[725,285,725+32,285+32]); @@ -135,10 +135,10 @@ function scr_creation_home_planet_create(){ draw_text_transformed(644,378,"Battle Barge",0.5,0.5,0); // draw_text_transformed(644,398,string(homeworld_name),0.5,0.5,0); - if (text_selected!="flagship_name") or (custom=0) then draw_text_transformed(644,398,flagship_name,0.5,0.5,0); + if (text_selected!="flagship_name") or (custom==eCHAPTER_TYPE.PREMADE) then draw_text_transformed(644,398,flagship_name,0.5,0.5,0); //TODO swap out for TextBarArea constructor - if (custom>1){ + if (custom==eCHAPTER_TYPE.CUSTOM){ if (text_selected="flagship_name") and (text_bar>30) then draw_text_transformed(644,398,flagship_name,0.5,0.5,0); if (text_selected="flagship_name") and (text_bar<=30) then draw_text_transformed(644,398,flagship_name+"|",0.5,0.5,0); if (scr_text_hit(644,398,true,flagship_name)){ @@ -213,7 +213,7 @@ function scr_creation_home_planet_create(){ //TODO move to OOP checkboxes if (fleet_type == ePlayerBase.home_world){ - if (custom<2) then draw_set_alpha(0.5); + if (custom!=eCHAPTER_TYPE.CUSTOM) then draw_set_alpha(0.5); var _homeworld_types = [ { name : "Planetary Governer", @@ -244,7 +244,7 @@ function scr_creation_home_planet_create(){ if (scr_hit(_draw_x, _draw_y,_draw_x+32, _draw_y+32)){ tooltip = _home_rule_type.tooltip; tooltip2 = _home_rule_type.tooltip2; - if (scr_click_left() && custom>1){ + if (scr_click_left() && custom==eCHAPTER_TYPE.CUSTOM){ homeworld_rule = i+1; } } diff --git a/scripts/scr_initialize_custom/scr_initialize_custom.gml b/scripts/scr_initialize_custom/scr_initialize_custom.gml index 2d67d4132c..a9c466dda0 100644 --- a/scripts/scr_initialize_custom/scr_initialize_custom.gml +++ b/scripts/scr_initialize_custom/scr_initialize_custom.gml @@ -39,6 +39,12 @@ enum ePROGENITOR { RANDOM, } +enum eCHAPTER_TYPE { + PREMADE, + RANDOM, + CUSTOM, +} + function progenitor_map(){ var founding_chapters = [ "", @@ -107,7 +113,7 @@ function select_livery_data(livery_data, specific) { function helmet_livery(progenitor, specific = "none") { var livery_data; - if ((obj_creation.custom == 0) && (global.chapter_creation_object.origin == 1)) { + if ((obj_creation.custom == eCHAPTER_TYPE.PREMADE) && (global.chapter_creation_object.origin == 1)) { progenitor = progenitor_map(); } @@ -786,7 +792,7 @@ function scr_initialize_custom() { * * Fleet based and Penitent * - 4 Battle Barges, 3 Strike Cruisers, 7 Gladius, 3 Hunters */ - if (obj_creation.custom == 0) { + if (obj_creation.custom == eCHAPTER_TYPE.PREMADE) { flagship_name = obj_creation.flagship_name; if (obj_creation.fleet_type == ePlayerBase.home_world) { battle_barges = 2; @@ -1111,9 +1117,8 @@ function scr_initialize_custom() { if(global.chapter_name == "Iron Hands"){ predator += 1; } - - // Strength ratings are made up for founding chapters - if (progenitor > ePROGENITOR.NONE && progenitor < ePROGENITOR.RANDOM) { + + if (obj_creation.custom != eCHAPTER_TYPE.PREMADE) { if (obj_creation.strength <= 4) then ninth = 0; if (obj_creation.strength <= 3) then eighth = 0; if (obj_creation.strength <= 2) then seventh = 0; @@ -1121,11 +1126,6 @@ function scr_initialize_custom() { var bonus_marines = 0; if (obj_creation.strength > 5) then bonus_marines = (obj_creation.strength - 5) * 50; - } - - if (obj_creation.custom != 0) { - var bonus_marines = 0; - if (obj_creation.strength > 5) then bonus_marines = (obj_creation.strength - 5) * 50; if scr_has_disadv("Obliterated") then bonus_marines = (obj_creation.strength - 1) * 10; var i = 0; while (bonus_marines >= 5) { @@ -1274,7 +1274,7 @@ function scr_initialize_custom() { if(epistolary <= 0) {epistolary_per_company = 0}; - if (obj_creation.custom == 0) { + if (obj_creation.custom == eCHAPTER_TYPE.PREMADE) { if (veteran >= 20) and(global.founding = ePROGENITOR.NONE) { veteran -= 20; terminator += 20; @@ -1552,7 +1552,7 @@ function scr_initialize_custom() { */ var squad_name = "Squad"; - if(obj_creation.custom != 0){ + if(obj_creation.custom != eCHAPTER_TYPE.PREMADE){ if (obj_ini.progenitor == ePROGENITOR.SPACE_WOLVES) { squad_name = "Pack"; } @@ -2484,7 +2484,7 @@ function scr_initialize_custom() { if (scr_has_adv("Retinue of Renown")){ _honour_guard_count += 10; } - if (progenitor == ePROGENITOR.DARK_ANGELS && obj_creation.custom == 0) { + if (progenitor == ePROGENITOR.DARK_ANGELS && obj_creation.custom == eCHAPTER_TYPE.PREMADE) { _honour_guard_count += 6; } if (_honour_guard_count == 0) { diff --git a/scripts/scr_livery_setup/scr_livery_setup.gml b/scripts/scr_livery_setup/scr_livery_setup.gml index e4942e9680..ea9efa3d0f 100644 --- a/scripts/scr_livery_setup/scr_livery_setup.gml +++ b/scripts/scr_livery_setup/scr_livery_setup.gml @@ -119,9 +119,9 @@ function scr_livery_setup(){ draw_set_font(fnt_40k_30b); draw_text_transformed(444,215,"Basic Livelry",0.6,0.6,0); - var button_alpha = custom < 2 ? 0.5 : 1; + var button_alpha = custom != eCHAPTER_TYPE.CUSTOM ? 0.5 : 1; var livery_swap_button = draw_unit_buttons([570,215], complex_livery? "Simple Livery":"Complex Livery",[1,1], 38144,, fnt_40k_14b, button_alpha); - if (point_and_click(livery_swap_button) && custom >= 2){ + if (point_and_click(livery_swap_button) && custom == eCHAPTER_TYPE.CUSTOM){ complex_livery=!complex_livery; } var str,str_width,hei,x8,y8;x8=0;y8=0; @@ -130,7 +130,7 @@ function scr_livery_setup(){ /*function draw_checkbox (cords, text, main_alpha, checked){ draw_set_alpha(main_alpha); yar = col_special==(i+1) ?1:0; - if (custom<2) then draw_set_alpha(0.5); + if (custom!=eCHAPTER_TYPE.CUSTOM) then draw_set_alpha(0.5); draw_sprite(spr_creation_check,yar,cur_button.cords[0],cur_button.cords[1]); if (scr_hit(cur_button.cords[0],cur_button.cords[1],cur_button.cords[0]+32,cur_button.cords[1]+32) and allow_colour_click){ @@ -189,13 +189,13 @@ function scr_livery_setup(){ var button_cords, cur_button; for (var i=0;i= 2){ + if (point_and_click(button_cords) && custom == eCHAPTER_TYPE.CUSTOM){ instance_destroy(obj_creation_popup); var pp=instance_create(0,0,obj_creation_popup); @@ -221,7 +221,7 @@ function scr_livery_setup(){ for (var i=0;i0) and (scr_click_left()) and (custom=2){ + if (scr_click_left() and custom==eCHAPTER_TYPE.CUSTOM){ instance_destroy(obj_creation_popup); var pp=instance_create(0,0,obj_creation_popup); pp.type=role_id+100; @@ -506,7 +506,7 @@ function scr_livery_setup(){ draw_set_alpha(1); draw_set_font(fnt_40k_30b); - if (custom<2) then draw_set_alpha(0.5); + if (custom != eCHAPTER_TYPE.CUSTOM) then draw_set_alpha(0.5); yar=0; if (equal_specialists=1) then yar=1; draw_sprite(spr_creation_check,yar,860,645);yar=0; @@ -603,8 +603,8 @@ function scr_livery_setup(){ if (race[100,15]!=0){ draw_set_color(38144); if (hapothecary="") then draw_set_color(c_red); - if (text_selected!="apoth") or (custom<2) then draw_text_ext(600,575,string_hash_to_newline(string(hapothecary)),-1,580); - if (custom>1){ + if (text_selected!="apoth") or (custom != eCHAPTER_TYPE.CUSTOM) then draw_text_ext(600,575,string_hash_to_newline(string(hapothecary)),-1,580); + if (custom == eCHAPTER_TYPE.CUSTOM){ if (text_selected="capoth") and (text_bar>30) then draw_text_ext(600,575,string_hash_to_newline(string(hapothecary)),-1,580); if (text_selected="capoth") and (text_bar<=30) then draw_text_ext(600,575,string_hash_to_newline(string(hapothecary)+"|"),-1,580); var str_width,hei;str_width=0;hei=string_height_ext(string_hash_to_newline(hapothecary),-2,580); @@ -630,8 +630,8 @@ function scr_livery_setup(){ if (race[100,14]!=0){ draw_set_color(38144);if (hchaplain="") then draw_set_color(c_red); - if (text_selected!="chap") or (custom<2) then draw_text_ext(600,597,string_hash_to_newline(string(hchaplain)),-1,580); - if (custom>1){ + if (text_selected!="chap") or (custom != eCHAPTER_TYPE.CUSTOM) then draw_text_ext(600,597,string_hash_to_newline(string(hchaplain)),-1,580); + if (custom == eCHAPTER_TYPE.CUSTOM){ if (text_selected="chap") and (text_bar>30) then draw_text_ext(600,597,string_hash_to_newline(string(hchaplain)),-1,580); if (text_selected="chap") and (text_bar<=30) then draw_text_ext(600,597,string_hash_to_newline(string(hchaplain)+"|"),-1,580); var str_width,hei;str_width=0;hei=string_height_ext(string_hash_to_newline(hchaplain),-2,580); @@ -653,8 +653,8 @@ function scr_livery_setup(){ if (race[100,17]!=0){ draw_set_color(38144);if (clibrarian="") then draw_set_color(c_red); - if (text_selected!="libra") or (custom<2) then draw_text_ext(600,619,string_hash_to_newline(string(clibrarian)),-1,580); - if (custom>1){ + if (text_selected!="libra") or (custom != eCHAPTER_TYPE.CUSTOM) then draw_text_ext(600,619,string_hash_to_newline(string(clibrarian)),-1,580); + if (custom == eCHAPTER_TYPE.CUSTOM){ if (text_selected="libra") and (text_bar>30) then draw_text_ext(600,619,string_hash_to_newline(string(clibrarian)),-1,580); if (text_selected="libra") and (text_bar<=30) then draw_text_ext(600,619,string_hash_to_newline(string(clibrarian)+"|"),-1,580); var str_width,hei;str_width=0;hei=string_height_ext(string_hash_to_newline(clibrarian),-2,580); @@ -676,8 +676,8 @@ function scr_livery_setup(){ if (race[100,16]!=0){ draw_set_color(38144);if (fmaster="") then draw_set_color(c_red); - if (text_selected!="forge") or (custom<2) then draw_text_ext(600,641,string_hash_to_newline(string(fmaster)),-1,580); - if (custom>1){ + if (text_selected!="forge") or (custom != eCHAPTER_TYPE.CUSTOM) then draw_text_ext(600,641,string_hash_to_newline(string(fmaster)),-1,580); + if (custom == eCHAPTER_TYPE.CUSTOM){ if (text_selected="forge") and (text_bar>30) then draw_text_ext(600,641,string_hash_to_newline(string(fmaster)),-1,580); if (text_selected="forge") and (text_bar<=30) then draw_text_ext(600,641,string_hash_to_newline(string(fmaster)+"|"),-1,580); var str_width,hei;str_width=0;hei=string_height_ext(string_hash_to_newline(fmaster),-2,580); @@ -698,8 +698,8 @@ function scr_livery_setup(){ } draw_set_color(38144);if (recruiter="") then draw_set_color(c_red); - if (text_selected!="recr") or (custom<2) then draw_text_ext(600,663,string_hash_to_newline(string(recruiter)),-1,580); - if (custom>1){ + if (text_selected!="recr") or (custom != eCHAPTER_TYPE.CUSTOM) then draw_text_ext(600,663,string_hash_to_newline(string(recruiter)),-1,580); + if (custom == eCHAPTER_TYPE.CUSTOM){ if (text_selected="recr") and (text_bar>30) then draw_text_ext(600,663,string_hash_to_newline(string(recruiter)),-1,580); if (text_selected="recr") and (text_bar<=30) then draw_text_ext(600,663,string_hash_to_newline(string(recruiter)+"|"),-1,580); var str_width,hei;str_width=0;hei=string_height_ext(string_hash_to_newline(recruiter),-2,580); @@ -719,8 +719,8 @@ function scr_livery_setup(){ } draw_set_color(38144);if (admiral="") then draw_set_color(c_red); - if (text_selected!="admi") or (custom<2) then draw_text_ext(600,685,string_hash_to_newline(string(admiral)),-1,580); - if (custom>1){ + if (text_selected!="admi") or (custom != eCHAPTER_TYPE.CUSTOM) then draw_text_ext(600,685,string_hash_to_newline(string(admiral)),-1,580); + if (custom == eCHAPTER_TYPE.CUSTOM){ if (text_selected="admi") and (text_bar>30) then draw_text_ext(600,685,string_hash_to_newline(string(admiral)),-1,580); if (text_selected="admi") and (text_bar<=30) then draw_text_ext(600,685,string_hash_to_newline(string(admiral)+"|"),-1,580); var str_width,hei;str_width=0;hei=string_height_ext(string_hash_to_newline(admiral),-2,580); diff --git a/scripts/scr_load_controller/scr_load_controller.gml b/scripts/scr_load_controller/scr_load_controller.gml index 1f741bc09d..9f87a65514 100644 --- a/scripts/scr_load_controller/scr_load_controller.gml +++ b/scripts/scr_load_controller/scr_load_controller.gml @@ -51,7 +51,7 @@ function scr_load_controller(save_id){ obj_ini.progenitor=ini_read_real("Save","founding",ePROGENITOR.NONE); // global.founding_secret=ini_read_string("Save","founding_secret","Error"); - global.custom=ini_read_real("Save","custom",1); + global.custom=ini_read_real("Save","custom", eCHAPTER_TYPE.RANDOM); stars=ini_read_real("Save","stars",0); // pfleets=ini_read_real("Save","p_fleets",0); // efleets=ini_read_real("Save","en_fleets",0); diff --git a/scripts/scr_powers/scr_powers.gml b/scripts/scr_powers/scr_powers.gml index c7e707a0d9..5bc90366b4 100644 --- a/scripts/scr_powers/scr_powers.gml +++ b/scripts/scr_powers/scr_powers.gml @@ -461,7 +461,7 @@ function player_select_powers() { var _psy_info = get_discipline_data(discipline, "description"); draw_text_transformed(440, 729, _psy_info, 0.5, 0.5, 0); - if (custom == 2) { + if (custom == eCHAPTER_TYPE.CUSTOM) { draw_sprite_stretched(spr_creation_arrow, 0, 437, 688, 32, 32); draw_sprite_stretched(spr_creation_arrow, 1, 475, 688, 32, 32); if (point_and_click([437, 688, 437 + 32, 688 + 32])) { diff --git a/scripts/scr_restart_variables/scr_restart_variables.gml b/scripts/scr_restart_variables/scr_restart_variables.gml index def321cbd7..2797ddfae2 100644 --- a/scripts/scr_restart_variables/scr_restart_variables.gml +++ b/scripts/scr_restart_variables/scr_restart_variables.gml @@ -601,7 +601,7 @@ function reset_creation_variables(){ points = 100; maxpoints = 100; - custom = 0; + custom = eCHAPTER_TYPE.PREMADE; hapothecary = global.name_generator.generate_space_marine_name(); hchaplain = global.name_generator.generate_space_marine_name(); @@ -819,7 +819,7 @@ function reset_creation_variables(){ mobi[100, i] = obj_restart_vars.r_mobi[100, i]; } - custom = 1; + custom = eCHAPTER_TYPE.RANDOM; restarted = 1; mutations_selected = mutations; diff --git a/scripts/scr_system_spawn_functions/scr_system_spawn_functions.gml b/scripts/scr_system_spawn_functions/scr_system_spawn_functions.gml index 6662682288..ca5624d9fe 100644 --- a/scripts/scr_system_spawn_functions/scr_system_spawn_functions.gml +++ b/scripts/scr_system_spawn_functions/scr_system_spawn_functions.gml @@ -78,7 +78,7 @@ function player_home_star(home_planet){ p_lasers[home_planet]=8; p_silo[home_planet]=100; p_defenses[home_planet]=75; - if (obj_ini.custom==0){ + if (obj_ini.custom==eCHAPTER_TYPE.PREMADE){ p_lasers[home_planet]=32; p_silo[home_planet]=300; p_defenses[home_planet]=225; diff --git a/scripts/scr_ui_settings/scr_ui_settings.gml b/scripts/scr_ui_settings/scr_ui_settings.gml index 7011a6ee8c..dd9e47eb25 100644 --- a/scripts/scr_ui_settings/scr_ui_settings.gml +++ b/scripts/scr_ui_settings/scr_ui_settings.gml @@ -834,13 +834,13 @@ function scr_ui_settings() { draw_set_alpha(1); if (obj_ini.race[100,ide]!=0){// Creates mass_equip here - // if (custom<2) then draw_set_alpha(0.5); + // if (custom!=eCHAPTER_TYPE.CUSTOM) then draw_set_alpha(0.5); yyy+=31; draw_set_color(c_gray); draw_rectangle(xxx,yyy,xxx+289,yyy+20,0); draw_set_color(0); draw_text(xxx,yyy,obj_ini.role[100,ide]); - if (scr_hit(xxx,yyy,xxx+289,yyy+20)=true){/*if (custom=2) then draw_set_alpha(0.2);if (custom<2) then */ + if (scr_hit(xxx,yyy,xxx+289,yyy+20)=true){/*if (custom==eCHAPTER_TYPE.CUSTOM) then draw_set_alpha(0.2);if (custom!=eCHAPTER_TYPE.CUSTOM) then */ draw_set_alpha(0.1); draw_set_color(c_white); draw_rectangle(xxx,yyy,xxx+289,yyy+20,0); @@ -862,7 +862,7 @@ function scr_ui_settings() { for (var ides=0; ides<=10; ides++){ draw_set_alpha(1); - // if (custom<2) then draw_set_alpha(0.5); + // if (custom!=eCHAPTER_TYPE.CUSTOM) then draw_set_alpha(0.5); yyy+=31;draw_set_color(c_gray);draw_rectangle(xxx,yyy,xxx+289,yyy+20,0); draw_set_color(0); @@ -871,7 +871,7 @@ function scr_ui_settings() { if (ides>0) then shw=romanNumerals[ides - 1] + " Company"; draw_text(xxx,yyy,string(shw)); - if (scr_hit(xxx,yyy,xxx+289,yyy+20)=true){/*if (custom=2) then draw_set_alpha(0.2);if (custom<2) then */ + if (scr_hit(xxx,yyy,xxx+289,yyy+20)=true){/*if (custom==eCHAPTER_TYPE.CUSTOM) then draw_set_alpha(0.2);if (custom!=eCHAPTER_TYPE.CUSTOM) then */ draw_set_alpha(0.1); draw_set_color(c_white); draw_rectangle(xxx,yyy,xxx+289,yyy+20,0); @@ -887,7 +887,7 @@ function scr_ui_settings() { for(var i=1; i<=11;i++){ draw_set_alpha(1); - // if (custom<2) then draw_set_alpha(0.5); + // if (custom!=eCHAPTER_TYPE.CUSTOM) then draw_set_alpha(0.5); yyy+=31;draw_set_color(c_gray); if (bat_formation[i]!="") then draw_rectangle(xxx,yyy,xxx+289,yyy+20,0); @@ -910,7 +910,7 @@ function scr_ui_settings() { if (shw!="") or (isnew=true){ draw_text(xxx,yyy,string(shw)); - if (scr_hit(xxx,yyy,xxx+289,yyy+20)=true){/*if (custom=2) then draw_set_alpha(0.2);if (custom<2) then */ + if (scr_hit(xxx,yyy,xxx+289,yyy+20)=true){/*if (custom==eCHAPTER_TYPE.CUSTOM) then draw_set_alpha(0.2);if (custom!=eCHAPTER_TYPE.CUSTOM) then */ draw_set_alpha(0.1); draw_set_color(c_white); draw_rectangle(xxx,yyy,xxx+289,yyy+20,0); From a76b0926775e6e1ad96816ececbeca0aed7248a0 Mon Sep 17 00:00:00 2001 From: EttyKitty <20323032+EttyKitty@users.noreply.github.com> Date: Wed, 14 May 2025 02:23:24 +0300 Subject: [PATCH 040/286] refactor: obj_controller and ui_manage temp array stuff (#817) --- objects/obj_controller/Create_0.gml | 13 ++- .../scr_array_functions.gml | 11 +++ scripts/scr_ui_manage/scr_ui_manage.gml | 83 ++++++++++--------- 3 files changed, 58 insertions(+), 49 deletions(-) diff --git a/objects/obj_controller/Create_0.gml b/objects/obj_controller/Create_0.gml index 4318459c67..8a584e6472 100644 --- a/objects/obj_controller/Create_0.gml +++ b/objects/obj_controller/Create_0.gml @@ -748,14 +748,11 @@ trade_chip=0; trade_info=0; zui=0; // Variables for management -for(var t=0; i<200; t++){ - temp[t]=""; -} -temp[90]=0; -temp[9000]=""; -for(var t=4700; t<=4719; t++){ - temp[t]=0;temp[t+100]=0; -} +var array_size = 9001; +temp = array_create(array_size, 0); +array_set_range(temp, 0, 199, ""); +temp[90] = 0; +temp[9000] = ""; // ** Resets all audiences ** audiences=0; audien[0]=0; diff --git a/scripts/scr_array_functions/scr_array_functions.gml b/scripts/scr_array_functions/scr_array_functions.gml index 688a5b848b..2dda8146a8 100644 --- a/scripts/scr_array_functions/scr_array_functions.gml +++ b/scripts/scr_array_functions/scr_array_functions.gml @@ -266,3 +266,14 @@ function is_basic_array(_array, _max_depth = 1, _current_depth = 1) { return true; } + +/// @description Sets a range of elements in an array to a specific value. +/// @param {Array} _array The array to modify. +/// @param {Real} _start_index The starting index (inclusive). +/// @param {Real} _end_index The ending index (inclusive). +/// @param {Any} _value The value to set for the elements. +function array_set_range(_array, _start_index, _end_index, _value) { + for (var i = _start_index; i <= _end_index; i++) { + _array[@ i] = _value; + } +} diff --git a/scripts/scr_ui_manage/scr_ui_manage.gml b/scripts/scr_ui_manage/scr_ui_manage.gml index 018dcc61dc..61c47acf1d 100644 --- a/scripts/scr_ui_manage/scr_ui_manage.gml +++ b/scripts/scr_ui_manage/scr_ui_manage.gml @@ -335,9 +335,8 @@ function scr_ui_manage() { draw_set_color(c_gray); // draw_line(xx+1005,yy+519,xx+1576,yy+519); draw_set_font(fnt_40k_14b); - var cn = obj_controller; - if (instance_exists(cn) && is_struct(temp[120])) { - var selected_unit = temp[120]; //unit struct + if (instance_exists(obj_controller) && is_struct(obj_controller.temp[120])) { + var selected_unit = obj_controller.temp[120]; //unit struct ///tooltip_text stacks hover over type tooltips into an array and draws them last so as not to create drawing order issues draw_set_color(c_red); var no_other_instances = !instance_exists(obj_temp3) && !instance_exists(obj_popup); @@ -375,8 +374,8 @@ function scr_ui_manage() { // Draw unit image draw_set_color(c_white); - if (is_struct(temp[121])) { - temp[121].draw(xx + 1328, yy + 250); + if (is_struct(obj_controller.temp[121])) { + obj_controller.temp[121].draw(xx + 1328, yy + 250); } //TODO implement tooltip explaining potential loyalty hit of demoting a sgt @@ -433,7 +432,7 @@ function scr_ui_manage() { var armour = selected_unit.armour(); if (armour != "") { text = selected_unit.equipments_qual_string("armour", true); - tooltip_text = cn.temp[103]; + tooltip_text = obj_controller.temp[103]; x1 = x_left; y1 = yy + 320; x2 = x1 + string_width_ext(text, -1, 187); @@ -446,7 +445,7 @@ function scr_ui_manage() { var gear = selected_unit.gear(); if (selected_unit.gear() != "") { text = selected_unit.equipments_qual_string("gear", true); - tooltip_text = cn.temp[105]; + tooltip_text = obj_controller.temp[105]; x1 = x_left; y1 = yy + 446; x2 = x1 + string_width_ext(text, -1, 187); @@ -458,7 +457,7 @@ function scr_ui_manage() { var mobi = selected_unit.mobility_item(); if (mobi != "") { text = selected_unit.equipments_qual_string("mobi", true); - tooltip_text = cn.temp[107]; + tooltip_text = obj_controller.temp[107]; x1 = x_left; y1 = yy + 467; x2 = x1 + string_width_ext(text, -1, 187); @@ -470,7 +469,7 @@ function scr_ui_manage() { var wep1 = selected_unit.weapon_one(); if (wep1 != "") { text = selected_unit.equipments_qual_string("wep1", true); - tooltip_text = cn.temp[109]; + tooltip_text = obj_controller.temp[109]; x1 = x_left; y1 = yy + 345; x2 = x1 + string_width_ext(text, -1, 187); @@ -482,7 +481,7 @@ function scr_ui_manage() { var wep2 = selected_unit.weapon_two(); if (wep2 != "") { text = selected_unit.equipments_qual_string("wep2", true); - tooltip_text = cn.temp[111]; + tooltip_text = obj_controller.temp[111]; x1 = x_left; y1 = yy + 395; x2 = x1 + string_width_ext(text, -1, 187); @@ -493,9 +492,9 @@ function scr_ui_manage() { // Stats // Bionics tracker - if (cn.temp[128] != "") { - text = cn.temp[128]; - tooltip_text = cn.temp[129]; + if (obj_controller.temp[128] != "") { + text = obj_controller.temp[128]; + tooltip_text = obj_controller.temp[129]; x1 = x_left + 110; y1 = yy + 208; x2 = x1 + string_width(text); @@ -509,9 +508,9 @@ function scr_ui_manage() { } // Armour Rating - if (cn.temp[126] != "") { - text = cn.temp[126]; - tooltip_text = cn.temp[127]; + if (obj_controller.temp[126] != "") { + text = obj_controller.temp[126]; + tooltip_text = obj_controller.temp[127]; x1 = x_left + 20; y1 = yy + 232; x2 = x1 + string_width(text); @@ -524,9 +523,9 @@ function scr_ui_manage() { } // Health - if (cn.temp[124] != "") { - text = cn.temp[124]; - tooltip_text = cn.temp[125]; + if (obj_controller.temp[124] != "") { + text = obj_controller.temp[124]; + tooltip_text = obj_controller.temp[125]; x1 = x_left + 20; y1 = yy + 208; x2 = x1 + string_width(text); @@ -539,8 +538,8 @@ function scr_ui_manage() { } // Experience - if (cn.temp[113] != "") { - text = cn.temp[113]; + if (obj_controller.temp[113] != "") { + text = obj_controller.temp[113]; tooltip_text = "A measureme of how battle-hardened the unit is. Provides a lot of various bonuses across the board."; x1 = x_left + 20; y1 = yy + 184; @@ -553,9 +552,9 @@ function scr_ui_manage() { draw_text_outline(x1, y1, text); } - if (cn.temp[118] != "") { - text = cn.temp[118]; // Damage Resistance - tooltip_text = cn.temp[130]; + if (obj_controller.temp[118] != "") { + text = obj_controller.temp[118]; // Damage Resistance + tooltip_text = obj_controller.temp[130]; x1 = x_left + 110; y1 = yy + 232; x2 = x1 + string_width(text); @@ -568,9 +567,9 @@ function scr_ui_manage() { } // Psyker things - if (cn.temp[119] != "") { - text = cn.temp[119]; - tooltip_text = cn.temp[123]; + if (obj_controller.temp[119] != "") { + text = obj_controller.temp[119]; + tooltip_text = obj_controller.temp[123]; x1 = x_left + 110; y1 = yy + 184; x2 = x1 + string_width(text); @@ -582,9 +581,9 @@ function scr_ui_manage() { array_push(tooltip_drawing, [tooltip_text, [x3, y1, x2, y2], "Psychic Stats"]); } - if (is_array(cn.temp[117])) { - text = $"{round(cn.temp[116][0])}"; // melee attack - tooltip_text = string(cn.temp[116][1]); + if (is_array(obj_controller.temp[117])) { + text = $"{round(obj_controller.temp[116][0])}"; // melee attack + tooltip_text = string(obj_controller.temp[116][1]); x1 = x_left + 20; y1 = yy + 256; x2 = x1 + string_width(text); @@ -601,9 +600,9 @@ function scr_ui_manage() { array_push(tooltip_drawing, [tooltip_text, [x3, y1, x2, y2], "Melee Attack"]); } - if (is_array(cn.temp[117])) { - text = $"{round(cn.temp[117][0])}"; // ranged attack - tooltip_text = string(cn.temp[117][1]); + if (is_array(obj_controller.temp[117])) { + text = $"{round(obj_controller.temp[117][0])}"; // ranged attack + tooltip_text = string(obj_controller.temp[117][1]); x1 = x_left + 20; y1 = yy + 280; x2 = x1 + string_width(text); @@ -619,8 +618,8 @@ function scr_ui_manage() { draw_set_color(line_color); } - if (is_array(cn.temp[116])) { - carry_data = cn.temp[116][2]; + if (is_array(obj_controller.temp[116])) { + var carry_data = obj_controller.temp[116][2]; var carry_string = $"{carry_data[0]}/{carry_data[1]}"; // Melee Burden x1 = x_left + 110; y1 = yy + 256; @@ -638,8 +637,8 @@ function scr_ui_manage() { draw_set_color(line_color); } - if (is_array(cn.temp[117])) { - carry_data = cn.temp[117][2]; + if (is_array(obj_controller.temp[117])) { + var carry_data = obj_controller.temp[117][2]; var carry_string = $"{carry_data[0]}/{carry_data[1]}"; // Ranged Burden x1 = x_left + 110; y1 = yy + 280; @@ -936,8 +935,9 @@ function scr_ui_manage() { button.label = "Reload"; //button.keystroke = (keyboard_check(vk_shift) && (keyboard_check_pressed(ord("F")))); - if (instance_exists(cn) && is_struct(temp[120])) { - button.tooltip = $"{temp[120].last_ship.name}"; //Press Shift F"; + if (instance_exists(obj_controller) && is_struct(obj_controller.temp[120])) { + var selected_unit = obj_controller.temp[120]; + button.tooltip = $"{selected_unit.last_ship.name}"; //Press Shift F"; } reload_possible = man_size > 0 && sel_loading == -1; if (reload_possible) { @@ -1216,8 +1216,9 @@ function scr_ui_manage() { draw_set_color(#3f7e5d); scr_scrollbar(974, 172, 1005, 790, 34, man_max, man_current); } - if (is_struct(cn.temp[120])) { - if ((cn.temp[120].name() != "") && (cn.temp[120].race() != 0)) { + if (instance_exists(obj_controller) && is_struct(obj_controller.temp[120])) { + var selected_unit = obj_controller.temp[120]; + if ((selected_unit.name() != "") && (selected_unit.race() != 0)) { draw_set_alpha(1); var xx = __view_get(e__VW.XView, 0) + 0, yy = __view_get(e__VW.YView, 0) + 0; if ((obj_controller.unit_profile) && !instance_exists(obj_popup)) { From b6ca02d222f11703c02636008838e1b2b7015bfa Mon Sep 17 00:00:00 2001 From: EttyKitty <20323032+EttyKitty@users.noreply.github.com> Date: Wed, 14 May 2025 17:09:44 +0300 Subject: [PATCH 041/286] ci: Debug the old release deletion again (#820) --- .github/workflows/release_dev.yml | 26 +++++++++++++++++++++----- 1 file changed, 21 insertions(+), 5 deletions(-) diff --git a/.github/workflows/release_dev.yml b/.github/workflows/release_dev.yml index e7a5c8d757..f4539c0b46 100644 --- a/.github/workflows/release_dev.yml +++ b/.github/workflows/release_dev.yml @@ -124,21 +124,37 @@ jobs: # This assumes your tag format is always 'branch-name/date' BRANCH_PREFIX="${TAG_NAME%%/*}/" - echo "Checking releases with prefix: $BRANCH_PREFIX" + echo "Starting cleanup for releases with prefix: ${BRANCH_PREFIX}" + + # --- Added Step: List all tag names found before filtering --- + echo "--- All tag names found by 'gh release list --json tagName': ---" + # Get all tag names first + ALL_TAG_NAMES=$(gh release list --limit 100 --json tagName | jq -r '.[].tagName' || true) + if [ -z "$ALL_TAG_NAMES" ]; then + echo "No releases found at all." + else + echo "$ALL_TAG_NAMES" | cat -n # List all found tags with line numbers + fi + echo "-----------------------------------------------------------" + - # Get tag names starting with the prefix from the gh release list, sort reverse chronologically by tag name. + # Get tag names starting with the prefix, sort reverse chronologically by tag name. + # We use the previously fetched ALL_TAG_NAMES to avoid calling gh release list again # Use || true at the end of the pipe to prevent the step from failing if no releases match the prefix - TAGS_TO_PROCESS=$(gh release list --limit 100 --json tagName | jq -r '.[].tagName' | grep "^${BRANCH_PREFIX}" | sort -r || true) + TAGS_TO_PROCESS=$(echo "$ALL_TAG_NAMES" | grep "^${BRANCH_PREFIX}" | sort -r || true) if [ -z "$TAGS_TO_PROCESS" ]; then echo "No releases found matching prefix '${BRANCH_PREFIX}'. No cleanup needed." exit 0 fi - COUNT=0 + # --- The rest of the logic (count, keep, delete) remains the same --- + # Count the filtered tags + NUM_MATCHING=$(echo "$TAGS_TO_PROCESS" | wc -l) RELEASES_TO_KEEP=10 # How many releases per branch prefix to keep - echo "Found releases matching prefix '${BRANCH_PREFIX}'. Will keep the latest $RELEASES_TO_KEEP." + echo "Found ${NUM_MATCHING} releases matching prefix '${BRANCH_PREFIX}'. Will keep the latest $RELEASES_TO_KEEP." + COUNT=0 IFS=$'\n' # Set IFS to newline to correctly iterate over tags for TAG in $TAGS_TO_PROCESS; do COUNT=$((COUNT + 1)) From 28c77d971ab2eaea417a2a346c9efc00f6c38a9b Mon Sep 17 00:00:00 2001 From: Luke Van Epen Date: Fri, 16 May 2025 20:23:21 +1000 Subject: [PATCH 042/286] fix: Saveload screen fixed (#821) --- objects/obj_ncombat/Alarm_2.gml | 27 --------------------------- objects/obj_saveload/Create_0.gml | 11 +++++------ objects/obj_saveload/Draw_0.gml | 5 +++-- objects/obj_saveload/Mouse_60.gml | 2 +- 4 files changed, 9 insertions(+), 36 deletions(-) diff --git a/objects/obj_ncombat/Alarm_2.gml b/objects/obj_ncombat/Alarm_2.gml index bf67e79f26..7cf595f3ab 100644 --- a/objects/obj_ncombat/Alarm_2.gml +++ b/objects/obj_ncombat/Alarm_2.gml @@ -67,31 +67,4 @@ if (ally>0) and (ally_forces>0){ -// scr_newtext(); - -/*if (newline!=""){ - var breaks,first_open; - newline=scr_lines(89,newline); - breaks=max(1,string_count("@",newline)); - first_open=liness+1; - - var b,f;b=first_open;f=-1; - explode_script(newline,"@"); - f+=1;lines[b+f]=string("-"+explode[f]); - repeat(breaks-1){f+=1; - lines[b+f]=string(explode[f]); - } - liness+=string_count("@",newline); - - repeat(100){ - if (liness>30){scr_lines_increase(1);liness-=1;} - } -} - -newline="";*/ - - instance_activate_object(obj_enunit); - -/* */ -/* */ diff --git a/objects/obj_saveload/Create_0.gml b/objects/obj_saveload/Create_0.gml index 6287bd8a18..14213cd64e 100644 --- a/objects/obj_saveload/Create_0.gml +++ b/objects/obj_saveload/Create_0.gml @@ -40,7 +40,7 @@ if (instance_exists(obj_controller)) { } } -save = array_create(201, 0); +save = array_create(201, -1); save_turn = array_create(201, 0); save_chapter = array_create(201, ""); save_master = array_create(201, ""); @@ -57,10 +57,9 @@ saves = 0; var i = 0; repeat (100) { - i += 1; if (file_exists(string(PATH_save_files, i))) { - saves += 1; save[saves] = i; + saves += 1; } if ((!file_exists(string(PATH_save_files, i))) && (i > 0) && (max_ini == 0)) { max_ini = i; @@ -68,17 +67,17 @@ repeat (100) { if (file_exists(string(PATH_save_files, i + 1)) && (max_ini > 0)) { max_ini = 0; } + i += 1; } -first_open=saves+1; +first_open=saves; if (file_exists("saves.ini")){ ini_open("saves.ini"); - i=-1; - repeat(200){i+=1; + for(var i = 0; i <= 200; i++){ if (save[i]>=0){ if (ini_section_exists(string(save[i]))){ save_turn[save[i]]=ini_read_real(string(save[i]),"turn",0); diff --git a/objects/obj_saveload/Draw_0.gml b/objects/obj_saveload/Draw_0.gml index 1092f63650..1b15be1a40 100644 --- a/objects/obj_saveload/Draw_0.gml +++ b/objects/obj_saveload/Draw_0.gml @@ -57,7 +57,8 @@ if (menu=1) or (menu=2){// This is the other one var o,x2,y2,s;o=top;x2=__view_get( e__VW.XView, 0 )+32;y2=__view_get( e__VW.YView, 0 )+166;s=0; repeat(4){ - if ((save[o]>=0) or ((first_open=o) and (menu=1)) or (global.load=o) or (save_number=o)) and (save_number=0){s=save[o]; + if ((save[o]>=0) or ((first_open=o) and (menu=1)) or (global.load=o) or (save_number=o)) and (save_number=0){ + s=save[o]; draw_set_font(fnt_40k_30b); draw_set_halign(fa_left); draw_set_color(0); @@ -210,7 +211,7 @@ if (menu=1) or (menu=2){// This is the other one } } - if (menu=1) and ((save[o]>0) or (first_open=o)){// Save + if (menu=1) and ((save[o]>=0) or (first_open=o)){// Save draw_set_alpha(1); draw_set_color(c_gray);draw_rectangle(x2+1317,y2+113,x2+1461,y2+146,0); draw_set_color(c_black);draw_rectangle(x2+1317,y2+113,x2+1461,y2+146,1); diff --git a/objects/obj_saveload/Mouse_60.gml b/objects/obj_saveload/Mouse_60.gml index 980c3b9a89..62188dfc13 100644 --- a/objects/obj_saveload/Mouse_60.gml +++ b/objects/obj_saveload/Mouse_60.gml @@ -3,7 +3,7 @@ if (slow<0) then slow=0; slow+=1; if (slow >= 3) { - if (top > 1) { + if (top > 0) { top -= 1; } } From b56b75994b1f55be03b45c217583de7cbe51aa56 Mon Sep 17 00:00:00 2001 From: Luke Van Epen Date: Fri, 16 May 2025 20:23:35 +1000 Subject: [PATCH 043/286] fix: Extra ships not applying to custom chaps (#822) --- .../scr_initialize_custom/scr_initialize_custom.gml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/scripts/scr_initialize_custom/scr_initialize_custom.gml b/scripts/scr_initialize_custom/scr_initialize_custom.gml index a9c466dda0..23febb6cc8 100644 --- a/scripts/scr_initialize_custom/scr_initialize_custom.gml +++ b/scripts/scr_initialize_custom/scr_initialize_custom.gml @@ -805,12 +805,6 @@ function scr_initialize_custom() { gladius = 7; hunters = 3; } - - battle_barges = battle_barges + obj_creation.extra_ships.battle_barges; - strike_cruisers = strike_cruisers + obj_creation.extra_ships.strike_cruisers; - gladius = gladius + obj_creation.extra_ships.gladius; - hunters = hunters + obj_creation.extra_ships.hunters; - } if (scr_has_adv ("Kings of Space")) {battle_barges += 1;} @@ -827,6 +821,12 @@ function scr_initialize_custom() { hunters = 0; } } + + battle_barges = battle_barges + obj_creation.extra_ships.battle_barges; + strike_cruisers = strike_cruisers + obj_creation.extra_ships.strike_cruisers; + gladius = gladius + obj_creation.extra_ships.gladius; + hunters = hunters + obj_creation.extra_ships.hunters; + var ship_summary_str = $"Ships: bb: {battle_barges} sc: {strike_cruisers} g: {gladius} h: {hunters}" // log_message(ship_summary_str); // show_debug_message(ship_summary_str); From 91914677bd4f0cde4fc4c8bc544f4d2ceb5e2697 Mon Sep 17 00:00:00 2001 From: EttyKitty <20323032+EttyKitty@users.noreply.github.com> Date: Sat, 17 May 2025 01:02:53 +0300 Subject: [PATCH 044/286] docs: Update CODE_STYLE.md (#823) Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com> --- docs/CODE_STYLE.md | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/docs/CODE_STYLE.md b/docs/CODE_STYLE.md index 6685b600e7..9243e8b011 100644 --- a/docs/CODE_STYLE.md +++ b/docs/CODE_STYLE.md @@ -45,13 +45,17 @@ All variable names, function names, etc., should use `snake_case` unless stated ### Constants **Macros**: -- To denote their group, use a short prefix in all caps (e.g., `PREFIX_`). -- The rest should be in all caps `SNAKE_CASE`. +**Macros**: + +- Written in all caps `SNAKE_CASE`. +- Try to denote their group using a short prefix (e.g., `PREFIX_`). - Example: `#macro COL_DARK_RED`. **Enums**: -- Enum names should start with an `e` prefix and be in all caps. -- Enum entries should use `PascalCase`. + **Enums**: + + - Enum names should start with an `e` prefix and be in all caps `SNAKE_CASE`. + - Enum entries should use `PascalCase`. - Example: `enum eCOLORS` with entries `DarkRed`, `Blue`, etc. ### General Styling From 460d37d4a290c1fd02bcdd6a77e87e23ce72e25d Mon Sep 17 00:00:00 2001 From: Nelsonh <81228864+OH296@users.noreply.github.com> Date: Mon, 19 May 2025 19:15:45 +0100 Subject: [PATCH 045/286] ci: increase Ork ship spawn by about 25% (#824) --- objects/obj_controller/Alarm_5.gml | 3 ++- scripts/scr_PlanetData/scr_PlanetData.gml | 2 +- scripts/scr_ork_fleet_functions/scr_ork_fleet_functions.gml | 3 ++- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/objects/obj_controller/Alarm_5.gml b/objects/obj_controller/Alarm_5.gml index 6226408290..cfc08acce0 100644 --- a/objects/obj_controller/Alarm_5.gml +++ b/objects/obj_controller/Alarm_5.gml @@ -763,8 +763,9 @@ if (fest_scheduled>0) and (fest_repeats>0){ research_end(); merge_ork_fleets(); location_viewer.update_mission_log(); -//complex route plotting for player fleets +init_ork_waagh(); return_lost_ships_chance(); +//complex route plotting for player fleets with (obj_p_fleet){ if (array_length(complex_route)>0 && action == ""){ set_new_player_fleet_course(complex_route); diff --git a/scripts/scr_PlanetData/scr_PlanetData.gml b/scripts/scr_PlanetData/scr_PlanetData.gml index 9797f5e7f4..6e28a41604 100644 --- a/scripts/scr_PlanetData/scr_PlanetData.gml +++ b/scripts/scr_PlanetData/scr_PlanetData.gml @@ -237,7 +237,7 @@ function PlanetData(planet, system) constructor{ } if (!enemies_present){ - rando=roll_dice(1,200, "low"); + rando=roll_dice(1,150, "low"); if (_has_warboss){ rando -= 20; } diff --git a/scripts/scr_ork_fleet_functions/scr_ork_fleet_functions.gml b/scripts/scr_ork_fleet_functions/scr_ork_fleet_functions.gml index 2a9c980a4c..02ecad1f54 100644 --- a/scripts/scr_ork_fleet_functions/scr_ork_fleet_functions.gml +++ b/scripts/scr_ork_fleet_functions/scr_ork_fleet_functions.gml @@ -6,7 +6,8 @@ function new_ork_fleet(xx,yy){ fleet.owner = eFACTION.Ork; fleet.sprite_index=spr_fleet_ork; fleet.image_index=1; - fleet.capital_number=1; + fleet.capital_number = 1; + fleet.frigate_number = 1 present_fleet[7] = 1; } From 965ef34bed36f4b61a737795573dbc0ebccfdaf6 Mon Sep 17 00:00:00 2001 From: Nelsonh <81228864+OH296@users.noreply.github.com> Date: Mon, 19 May 2025 20:37:52 +0100 Subject: [PATCH 046/286] fix: Send techs to mars mission fix (#825) --- .../scr_mechanicus_missions.gml | 25 +++++++++++-------- 1 file changed, 14 insertions(+), 11 deletions(-) diff --git a/scripts/scr_mechanicus_missions/scr_mechanicus_missions.gml b/scripts/scr_mechanicus_missions/scr_mechanicus_missions.gml index b5d4efb5f9..cbaa18098a 100644 --- a/scripts/scr_mechanicus_missions/scr_mechanicus_missions.gml +++ b/scripts/scr_mechanicus_missions/scr_mechanicus_missions.gml @@ -101,25 +101,28 @@ function mechanicus_missions_end_turn(planet){ } var mars_mech_mission = has_problem_planet_and_time(planet,"mech_mars", 0); if (mars_mech_mission>-1){ - var techs_taken,com,ide,ship_planet, unit; + var techs_taken,com,ide,ship_planet, _unit; techs_taken=0;com=-1;ide=0;ship_planet=""; for (com =0; com<=10;com++){ - for (ide =0; ide<=array_length(obj_ini.role[com]);ide++){ - unit = fetch_unit([com,ide]) - if (unit.role()=obj_ini.role[100][eROLE.Techmarine]){ + for (ide = 0; ide-1){ - ship_planet=obj_ini.ship_location[unit.ship_location]; + if (_unit.ship_location>-1){ + ship_planet=obj_ini.ship_location[_unit.ship_location]; if (ship_planet=name){ - obj_ini.ship_carrying[unit.ship_location]-=scr_unit_size(obj_ini.armour[com][ide],obj_ini.role[com][ide],true); - obj_ini.loc[com][ide]="Mechanicus Vessel";unit.planet_location=0;unit.ship_location=0; + obj_ini.ship_carrying[_unit.ship_location]-=scr_unit_size(obj_ini.armour[com][ide],obj_ini.role[com][ide],true); + obj_ini.loc[com][ide]="Mechanicus Vessel";_unit.planet_location=0;_unit.ship_location=0; techs_taken+=1; } } From f967e5b695e75408c59d0dabb00ec73cfbf6cf80 Mon Sep 17 00:00:00 2001 From: EttyKitty <20323032+EttyKitty@users.noreply.github.com> Date: Wed, 21 May 2025 03:22:50 +0300 Subject: [PATCH 047/286] style: Format scr_chapter_random, argument name change (#826) --- .../scr_chapter_random/scr_chapter_random.gml | 1427 ++++++++++++----- 1 file changed, 1034 insertions(+), 393 deletions(-) diff --git a/scripts/scr_chapter_random/scr_chapter_random.gml b/scripts/scr_chapter_random/scr_chapter_random.gml index 10a5d5712f..165ea8cd3f 100644 --- a/scripts/scr_chapter_random/scr_chapter_random.gml +++ b/scripts/scr_chapter_random/scr_chapter_random.gml @@ -1,14 +1,14 @@ /// @mixin obj_creation /// @description Called when an empty custom chapter icon is picked, or the custom icon in bottom right is picked from the new game menu. -/// if "Create Custom" is picked, argument0 = 0, if "Create Random" is picked, argument0 = 1 -/// @param {Real} argument0 0 if Blank Custom, 1 if Random -function scr_chapter_random(argument0) { +/// if "Create Custom" is picked, custom_or_random = 0, if "Create Random" is picked, custom_or_random = 1 +/// @param {Real} custom_or_random 0 if Blank Custom, 1 if Random +function scr_chapter_random(custom_or_random) { + // custom_or_random = 0 = create custom + // custom_or_random = 1 = create random - // argument0 = 0 = create custom - // argument0 = 1 = create random - - // if argument0=0 then it just gives a name - var i;i=-1; + // if custom_or_random=0 then it just gives a name + var i; + i = -1; world = array_create(21, ""); world_type = array_create(21, ""); world_feature = array_create(21, ""); @@ -18,46 +18,76 @@ function scr_chapter_random(argument0) { adv_num = array_create(9, 0); dis_num = array_create(9, 0); - var ran1, ran2, phrase1, phrase2, main, secondary, lens, weapon, found_secret; - phrase1="";phrase2=""; - - chapter_name="Unnamed";chapter_string="Unnamed"; - founding=ePROGENITOR.NONE; - found_secret=0; - points=0;maxpoints=100; - fleet_type=1;strength=5;cooperation=5;purity=5;stability=90; - homeworld="Temperate";homeworld_name=global.name_generator.generate_star_name(); - recruiting="Death";recruiting_name=global.name_generator.generate_star_name(); - flagship_name=global.name_generator.generate_imperial_ship_name(); - recruiting_exists=1;homeworld_exists=1; - homeworld_rule=1;aspirant_trial=eTrials.BLOODDUEL; - discipline="librarius";battle_cry="For the Emperor"; - - main_color=1;secondary_color=1;main_trim=1; - left_pauldron=1;right_pauldron=1;// Left/Right pauldron - lens_color=1;weapon_color=1;col_special=choose(0,0,0,0,0,1,2,3); - - color_to_main=""; - color_to_secondary=""; - color_to_trim=""; - color_to_pauldron=""; - color_to_pauldron2=""; - color_to_lens=""; - color_to_weapon=""; - - hapothecary=global.name_generator.generate_space_marine_name(); - hchaplain=global.name_generator.generate_space_marine_name(); - clibrarian=global.name_generator.generate_space_marine_name(); - fmaster=global.name_generator.generate_space_marine_name(); - recruiter=global.name_generator.generate_space_marine_name(); - admiral=global.name_generator.generate_space_marine_name(); - - equal_specialists=0;load_to_ships=[2,0,0];successors=0; - - mutations=0;mutations_selected=0; - preomnor=0;voice=0;doomed=0;lyman=0;omophagea=0;ossmodula=0;membrane=0; - zygote=0;betchers=0;catalepsean=0;secretions=0;occulobe=0;mucranoid=0; + phrase1 = ""; + phrase2 = ""; + + chapter_name = "Unnamed"; + chapter_string = "Unnamed"; + founding = ePROGENITOR.NONE; + found_secret = 0; + points = 0; + maxpoints = 100; + fleet_type = 1; + strength = 5; + cooperation = 5; + purity = 5; + stability = 90; + homeworld = "Temperate"; + homeworld_name = global.name_generator.generate_star_name(); + recruiting = "Death"; + recruiting_name = global.name_generator.generate_star_name(); + flagship_name = global.name_generator.generate_imperial_ship_name(); + recruiting_exists = 1; + homeworld_exists = 1; + homeworld_rule = 1; + aspirant_trial = eTrials.BLOODDUEL; + discipline = "librarius"; + battle_cry = "For the Emperor"; + + main_color = 1; + secondary_color = 1; + main_trim = 1; + left_pauldron = 1; + right_pauldron = 1; // Left/Right pauldron + lens_color = 1; + weapon_color = 1; + col_special = choose(0, 0, 0, 0, 0, 1, 2, 3); + + color_to_main = ""; + color_to_secondary = ""; + color_to_trim = ""; + color_to_pauldron = ""; + color_to_pauldron2 = ""; + color_to_lens = ""; + color_to_weapon = ""; + + hapothecary = global.name_generator.generate_space_marine_name(); + hchaplain = global.name_generator.generate_space_marine_name(); + clibrarian = global.name_generator.generate_space_marine_name(); + fmaster = global.name_generator.generate_space_marine_name(); + recruiter = global.name_generator.generate_space_marine_name(); + admiral = global.name_generator.generate_space_marine_name(); + + equal_specialists = 0; + load_to_ships = [2, 0, 0]; + successors = 0; + + mutations = 0; + mutations_selected = 0; + preomnor = 0; + voice = 0; + doomed = 0; + lyman = 0; + omophagea = 0; + ossmodula = 0; + membrane = 0; + zygote = 0; + betchers = 0; + catalepsean = 0; + secretions = 0; + occulobe = 0; + mucranoid = 0; disposition = array_create(8, 0); // disposition[0]=0; // disposition[1]=0;// Prog @@ -67,370 +97,981 @@ function scr_chapter_random(argument0) { // disposition[5]=0;// Ecclesiarchy // disposition[6]=0;// Astartes // disposition[7]=0;// Reserved - chapter_master_name=global.name_generator.generate_space_marine_name(); - chapter_master_melee=1; - chapter_master_ranged=1; - chapter_master_specialty=choose(1,1,1,1,1,2,2,2,2,2,3); - + chapter_master_name = global.name_generator.generate_space_marine_name(); + chapter_master_melee = 1; + chapter_master_ranged = 1; + chapter_master_specialty = choose(1, 1, 1, 1, 1, 2, 2, 2, 2, 2, 3); custom_roles = {}; + // create random + if (custom_or_random == 1) { + strength = choose(2, 3, 4, 5, 6, 7, 8); + purity = choose(2, 3, 4, 5, 6, 7, 8); + if (strength < 5) { + purity += 2; + } + stability = choose(20, 30, 40, 50, 60, 70, 80); + if (purity < 5) { + stability += 19; + } + cooperation = choose(2, 3, 4, 5, 6, 7, 8); + if (stability < 90) { + cooperation += 2; + } + founding = irandom_range(ePROGENITOR.NONE, ePROGENITOR.RAVEN_GUARD); + found_secret = floor(random(10)) + 1; + points = 100; + maxpoints = 100; + battle_cry = "For the Emperor"; + discipline = choose("librarius", "librarius", "librarius", "librarius", "biomancy", "pyromancy", "telekinesis"); + } + ran1 = floor(random(86)) + 1; + ran2 = floor(random(95)) + 1; + ran3 = floor(random(9)) + 1; + //create random + if (custom_or_random == 1) { + mutations = 0; + mutations_selected = 0; + mutation = ""; + preomnor = 0; + voice = 0; + doomed = 0; + lyman = 0; + omophagea = 0; + ossmodula = 0; + membrane = 0; + zygote = 0; + betchers = 0; + catalepsean = 0; + secretions = 0; + occulobe = 0; + mucranoid = 0; + var mutat; + mutat = 0; - // create random - if (argument0=1){ - strength=choose(2,3,4,5,6,7,8); - purity=choose(2,3,4,5,6,7,8);if (strength<5) then purity+=2; - stability=choose(20,30,40,50,60,70,80);if (purity<5) then stability+=19; - cooperation=choose(2,3,4,5,6,7,8);if (stability<90) then cooperation+=2; - founding=irandom_range(ePROGENITOR.NONE, ePROGENITOR.RAVEN_GUARD); - found_secret=floor(random(10))+1; - - points=100;maxpoints=100; - battle_cry="For the Emperor"; - - discipline=choose("librarius","librarius","librarius","librarius","biomancy","pyromancy","telekinesis"); - - } - - - ran1=floor(random(86))+1; - ran2=floor(random(95))+1; - ran3=floor(random(9))+1; + if (found_secret == 1) { + adv[1] = "Enemy: Fallen"; + dis[1] = "Never Forgive"; + } + if (found_secret == 2) { + adv[1] = "Lightning Warriors"; + } + if (found_secret == 3) { + adv[1] = "Assault Doctrine"; + dis[1] = "Suspicious"; + } + if (found_secret == 4) { + adv[1] = "Bolter Drilling"; + betchers = 1; + membrane = 1; + mutations_selected += 2; + mutations += 2; + mutat = 2; + } + if (found_secret == 5) { + adv[1] = "Assault Doctrine"; + dis[1] = "Black Rage"; + disadvantage1 = 1; + } + if (found_secret == 6) { + adv[1] = "Tech-Brothers"; + dis[1] = "Psyker Intolerant"; + } + // if (found_secret=7) then founding="Ultramarines"; + if (found_secret == 8) { + adv[1] = "Crafters"; + dis[1] = "Tolerant"; + secretions = 1; + mutations += 1; + mutations_selected += 1; + mutat += 1; + } + if (found_secret == 9) { + adv[1] = "Ambushers"; + } - //create random - if (argument0=1){ - mutations=0;mutations_selected=0;mutation=""; - preomnor=0;voice=0;doomed=0;lyman=0;omophagea=0;ossmodula=0;membrane=0; - zygote=0;betchers=0;catalepsean=0;secretions=0;occulobe=0;mucranoid=0; - var mutat;mutat=0; - - if (found_secret=1){adv[1]="Enemy: Fallen";dis[1]="Never Forgive";} - if (found_secret=2) then adv[1]="Lightning Warriors"; - if (found_secret=3){adv[1]="Assault Doctrine";dis[1]="Suspicious";} - if (found_secret=4){adv[1]="Bolter Drilling";betchers=1;membrane=1;mutations_selected+=2;mutations+=2;mutat=2;} - if (found_secret=5){adv[1]="Assault Doctrine";dis[1]="Black Rage";disadvantage1=1;} - if (found_secret=6){adv[1]="Tech-Brothers";dis[1]="Psyker Intolerant";} - // if (found_secret=7) then founding="Ultramarines"; - if (found_secret=8){adv[1]="Crafters";dis[1]="Tolerant";secretions=1;mutations+=1;mutations_selected+=1;mutat+=1;} - if (found_secret=9){adv[1]="Ambushers";} - - /* + /* mutations=0;mutations_selected=0;mutation=""; preomnor=0;voice=0;doomed=0;lyman=0;omophagea=0;ossmodula=0;membrane=0; zygote=0;betchers=0;catalepsean=0;secretions=0;occulobe=0;mucranoid=0; */ + mutations += round(4 - (purity / 2.5)); + + repeat(50) { + if (mutat < mutations) { + if ((preomnor == 0) && (floor(random(12)) + 1 == 2)) { + preomnor = 1; + mutat += 1; + } + if ((voice == 0) && (floor(random(12)) + 1 == 2)) { + voice = 1; + mutat += 1; + } + if ((doomed == 0) && (floor(random(30)) + 1 == 2)) { + doomed = 1; + mutat += 4; + } + if ((lyman == 0) && (floor(random(12)) + 1 == 2)) { + lyman = 1; + mutat += 1; + } + if ((omophagea == 0) && (floor(random(12)) + 1 == 2)) { + omophagea = 1; + mutat += 1; + } + if ((ossmodula == 0) && (floor(random(12)) + 1 == 2)) { + ossmodula = 1; + mutat += 1; + } + if ((membrane == 0) && (floor(random(12)) + 1 == 2)) { + membrane = 1; + mutat += 1; + } + if ((zygote == 0) && (floor(random(12)) + 1 == 2)) { + zygote = 1; + mutat += 2; + } + if ((betchers == 0) && (floor(random(12)) + 1 == 2)) { + betchers = 1; + mutat += 1; + } + if ((catalepsean == 0) && (floor(random(12)) + 1 == 2)) { + catalepsean = 1; + mutat += 1; + } + if ((secretions == 0) && (floor(random(12)) + 1 == 2)) { + secretions = 1; + mutat += 1; + } + if ((occulobe == 0) && (floor(random(12)) + 1 == 2)) { + occulobe = 1; + mutat += 1; + } + if ((mucranoid == 0) && (floor(random(12)) + 1 == 2)) { + mucranoid = 1; + mutat += 1; + } + } + } + + mutations_selected = mutat; + + homeworld = "Temperate"; + recruiting = "Death"; + } + + var col_main, col_second, col_lens, col_trim, col_weapon; + col_main = ""; + col_second = ""; + col_lens = ""; + col_trim = ""; + col_weapon = ""; + + if (ran1 == 1) { + phrase1 = "Android"; + col_main = "Silver"; + } + if (ran1 == 2) { + phrase1 = "Alpha"; + col_main = "Black"; + } + if (ran1 == 3) { + phrase1 = "Amethyst"; + col_main = "Purple"; + } + if (ran1 == 4) { + phrase1 = "Arctic"; + col_main = "White"; + homeworld = "Ice"; + } + if (ran1 == 5) { + phrase1 = "Astral"; + col_main = "White"; + } + if (ran1 == 6) { + phrase1 = "Atomic"; + col_main = "Blue"; + } + if (ran1 == 7) { + phrase1 = "Azure"; + col_main = "Blue"; + } + if (ran1 == 8) { + phrase1 = "Battle"; + col_main = "Yellow"; + } + if (ran1 == 9) { + phrase1 = "Black"; + col_main = "Black"; + } + if (ran1 == 10) { + phrase1 = "Blood"; + col_main = "Red"; + } + if (ran1 == 11) { + phrase1 = "Blue"; + col_main = "Blue"; + } + if (ran1 == 12) { + phrase1 = "Brawling"; + col_main = "Orange"; + } + if (ran1 == 13) { + phrase1 = "Brazen"; + col_main = "Yellow"; + } + if (ran1 == 14) { + phrase1 = "Crimson"; + col_main = "Dark Red"; + } + if (ran1 == 15) { + phrase1 = "Cryptic"; + col_main = "Black"; + } + if (ran1 == 16) { + phrase1 = "Dancing"; + col_main = "Pink"; + } + if (ran1 == 17) { + phrase1 = "Dark"; + col_main = "Dark Green"; + } + if (ran1 == 18) { + phrase1 = "Death"; + col_main = "Black"; + homeworld = "Lava"; + } + if (ran1 == 19) { + phrase1 = "Delta"; + col_main = "Green"; + } + if (ran1 == 20) { + phrase1 = "Desert"; + col_main = "Dark Gold"; + homeworld = "Desert"; + } + if (ran1 == 21) { + phrase1 = "Desolation"; + col_main = "Black"; + } + if (ran1 == 22) { + phrase1 = "Diamond"; + col_main = "White"; + } + if (ran1 == 23) { + phrase1 = "Doom"; + col_main = "Red"; + } + if (ran1 == 24) { + phrase1 = "Emerald"; + col_main = "Green"; + } + if (ran1 == 25) { + phrase1 = "Fighting"; + col_main = "Yellow"; + } + if (ran1 == 26) { + phrase1 = "Fire"; + col_main = "Orange"; + } + if (ran1 == 27) { + phrase1 = "Flying"; + col_main = "White"; + fleet_type = 1; + } + if (ran1 == 28) { + phrase1 = "Frenzied"; + col_main = "Red"; + } + if (ran1 == 29) { + phrase1 = "Furious"; + col_main = "Dark Red"; + } + if (ran1 == 30) { + phrase1 = "Golden"; + col_main = "Dark Gold"; + } + if (ran1 == 31) { + phrase1 = "Gore"; + col_main = "Red"; + } + if (ran1 == 32) { + phrase1 = "Grail"; + col_main = "Yellow"; + } + if (ran1 == 33) { + phrase1 = "Green"; + col_main = "Green"; + } + if (ran1 == 34) { + phrase1 = "Grey"; + col_main = "Silver"; + } + if (ran1 == 35) { + phrase1 = "Horned"; + col_main = "Dark Green"; + } + if (ran1 == 36) { + phrase1 = "Howling"; + col_main = "Light Blue"; + } + if (ran1 == 37) { + phrase1 = "Ice"; + col_main = "Light Blue"; + homeworld = "Ice"; + } + if (ran1 == 38) { + phrase1 = "Imperial"; + col_main = "Yellow"; + } + if (ran1 == 39) { + phrase1 = "Iron"; + col_main = "Silver"; + } + if (ran1 == 40) { + phrase1 = "Light"; + col_main = "White"; + } + if (ran1 == 41) { + phrase1 = "Maleficent"; + col_main = "Purple"; + } + if (ran1 == 42) { + phrase1 = "Malevolent"; + col_main = "Black"; + } + if (ran1 == 43) { + phrase1 = "Nova"; + col_main = "White"; + } + if (ran1 == 44) { + phrase1 = "Omega"; + col_main = "Dark Gold"; + } + if (ran1 == 45) { + phrase1 = "Orange"; + col_main = "Orange"; + } + if (ran1 == 46) { + phrase1 = "Ozone"; + col_main = "Light Blue"; + } + if (ran1 == 47) { + phrase1 = "Penitent"; + col_main = "Black"; + fleet_type = 3; + } + if (ran1 == 48) { + phrase1 = "Polar"; + col_main = "White"; + homeworld = "Ice"; + } + if (ran1 == 49) { + phrase1 = "Psi"; + col_main = "Blue"; + } + if (ran1 == 50) { + phrase1 = "Purple"; + col_main = "Purple"; + } + if (ran1 == 51) { + phrase1 = "Raging"; + col_main = "Red"; + } + if (ran1 == 52) { + phrase1 = "Regal"; + col_main = "Purple"; + } + if (ran1 == 53) { + phrase1 = "Royal"; + col_main = "Purple"; + } + if (ran1 == 54) { + phrase1 = "Rainbow"; + col_main = "Pink"; + } + if (ran1 == 55) { + phrase1 = "Red"; + col_main = "Red"; + } + if (ran1 == 56) { + phrase1 = "Repentant"; + col_main = "Black"; + } + if (ran1 == 57) { + phrase1 = "Ruby"; + col_main = "Red"; + } + if (ran1 == 58) { + phrase1 = "Sanguine"; + col_main = "Sanguine Red"; + } + if (ran1 == 59) { + phrase1 = "Sapphire"; + col_main = "Blue"; + } + if (ran1 == 60) { + phrase1 = "Savage"; + col_main = "Dark Red"; + } + if (ran1 == 61) { + phrase1 = "Screaming"; + col_main = "White"; + } + if (ran1 == 62) { + phrase1 = "Screeching"; + col_main = "Blue"; + } + if (ran1 == 63) { + phrase1 = "Shrieking"; + col_main = "Black"; + } + if (ran1 == 64) { + phrase1 = "Shadow"; + col_main = "Black"; + } + if (ran1 == 65) { + phrase1 = "Siege"; + col_main = "Silver"; + homeworld = "Hive"; + } + if (ran1 == 66) { + phrase1 = "Silver"; + col_main = "Silver"; + } + if (ran1 == 67) { + phrase1 = "Skulking"; + col_main = "Black"; + fleet_type = 3; + } + if (ran1 == 68) { + phrase1 = "Snapping"; + col_main = "Orange"; + } + if (ran1 == 69) { + phrase1 = "Snarling"; + col_main = "Dark Red"; + } + if (ran1 == 70) { + phrase1 = "Space"; + col_main = "Light Blue"; + } + if (ran1 == 71) { + phrase1 = "Star"; + col_main = "Black"; + } + if (ran1 == 72) { + phrase1 = "Stealth"; + col_main = "Black"; + } + if (ran1 == 73) { + phrase1 = "Storm"; + col_main = "Yellow"; + } + if (ran1 == 74) { + phrase1 = "Striking"; + col_main = "Green"; + } + if (ran1 == 75) { + phrase1 = "Thunder"; + col_main = "Yellow"; + } + if (ran1 == 76) { + phrase1 = "Topaz"; + col_main = "Yellow"; + } + if (ran1 == 77) { + phrase1 = "Tundra"; + col_main = "Green"; + homeworld = "Ice"; + } + if (ran1 == 78) { + phrase1 = "Vermilion"; + col_main = "Orange"; + } + if (ran1 == 79) { + phrase1 = "Vigilant"; + col_main = "White"; + } + if (ran1 == 80) { + phrase1 = "Ultra"; + col_main = "Blue"; + fleet_type = 2; + } + if (ran1 == 81) { + phrase1 = "Umbrageous"; + col_main = "White"; + } + if (ran1 == 82) { + phrase1 = "War"; + col_main = "Red"; + } + if (ran1 == 83) { + phrase1 = "White"; + col_main = "White"; + } + if (ran1 == 84) { + phrase1 = "Wicked"; + col_main = "Dark Green"; + } + if (ran1 == 85) { + phrase1 = "Wild"; + col_main = "Light Blue"; + } + if (ran1 == 86) { + phrase1 = "Zeta"; + col_main = "White"; + } + + col_second = ""; + col_lens = "Red"; + col_trim = col_main; + col_weapon = "Black"; + if (ran2 == 1) { + phrase2 = "Acolytes"; + col_second = "Red"; + } + if (ran2 == 2) { + phrase2 = "Adders"; + col_second = "Black"; + } + if (ran2 == 3) { + phrase2 = "Amazons"; + col_second = "Orange"; + } + if (ran2 == 4) { + phrase2 = "Angels"; + col_second = "Silver"; + } + if (ran2 == 5) { + phrase2 = "Archangels"; + col_second = "Silver"; + } + if (ran2 == 6) { + phrase2 = "Avengers"; + col_second = "Black"; + } + if (ran2 == 7) { + phrase2 = "Barracudas"; + } + if (ran2 == 8) { + phrase2 = "Bees"; + col_second = "Black"; + } + if (ran2 == 9) { + phrase2 = "Bringers"; + } + if (ran2 == 10) { + phrase2 = "Brothers"; + } + if (ran2 == 11) { + phrase2 = "Cats"; + } + if (ran2 == 12) { + phrase2 = "Champions"; + } + if (ran2 == 13) { + phrase2 = "Chameleons"; + } + if (ran2 == 14) { + phrase2 = "Claws"; + col_second = "White"; + } + if (ran2 == 15) { + phrase2 = "Cobras"; + } + if (ran2 == 16) { + phrase2 = "Company"; + } + if (ran2 == 17) { + phrase2 = "Consuls"; + } + if (ran2 == 18) { + phrase2 = "Corsairs"; + col_second = "Dark Red"; + } + if (ran2 == 19) { + phrase2 = "Crusaders"; + } + if (ran2 == 20) { + phrase2 = "Destroyers"; + } + if (ran2 == 21) { + phrase2 = "Devils"; + col_second = "Red"; + } + if (ran2 == 22) { + phrase2 = "Dogs"; + } + if (ran2 == 23) { + phrase2 = "Dragons"; + col_second = "Red"; + } + if (ran2 == 24) { + phrase2 = "Eagles"; + col_second = "White"; + } + if (ran2 == 25) { + phrase2 = "Eaters"; + col_second = "Red"; + } + if (ran2 == 26) { + phrase2 = "Enforcers"; + } + if (ran2 == 27) { + phrase2 = "Falcons"; + } + if (ran2 == 28) { + phrase2 = "Fists"; + } + if (ran2 == 29) { + phrase2 = "Foxes"; + } + if (ran2 == 30) { + phrase2 = "Gators"; + col_second = "Green"; + } + if (ran2 == 31) { + phrase2 = "Giants"; + } + if (ran2 == 32) { + phrase2 = "Golems"; + col_second = "Silver"; + } + if (ran2 == 33) { + phrase2 = "Gorillas"; + col_second = "Black"; + } + if (ran2 == 34) { + phrase2 = "Griffons"; + } + if (ran2 == 35) { + phrase2 = "Guard"; + } + if (ran2 == 36) { + phrase2 = "Guardians"; + } + if (ran2 == 37) { + phrase2 = "Hands"; + } + if (ran2 == 38) { + phrase2 = "Hawks"; + col_second = "Blue"; + } + if (ran2 == 39) { + phrase2 = "Hippos"; + } + if (ran2 == 40) { + phrase2 = "Hornets"; + col_second = "Yellow"; + } + if (ran2 == 41) { + phrase2 = "Hounds"; + } + if (ran2 == 42) { + phrase2 = "Hunters"; + } + if (ran2 == 43) { + phrase2 = "Inculpators"; + } + if (ran2 == 44) { + phrase2 = "Jaguars"; + col_second = "Dark Green"; + } + if (ran2 == 45) { + phrase2 = "Justiciars"; + col_second = "Black"; + } + if (ran2 == 46) { + phrase2 = "Knights"; + col_second = "Silver"; + } + if (ran2 == 47) { + phrase2 = "Krakens"; + col_second = "Green"; + fleet_type = 1; + } + if (ran2 == 48) { + phrase2 = "Lamenters"; + seconary_color = "Yellow"; + fleet_type = 3; + } + if (ran2 == 49) { + phrase2 = "Lions"; + col_second = "Orange"; + } + if (ran2 == 50) { + phrase2 = "Liberators"; + } + if (ran2 == 51) { + phrase2 = "Lords"; + } + if (ran2 == 52) { + phrase2 = "Marauders"; + col_second = "Black"; + } + if (ran2 == 53) { + phrase2 = "Marines"; + } + if (ran2 == 54) { + phrase2 = "Medusas"; + } + if (ran2 == 55) { + phrase2 = "Mentors"; + col_second = "Black"; + } + if (ran2 == 56) { + phrase2 = "Monitors"; + } + if (ran2 == 57) { + phrase2 = "Owls"; + } + if (ran2 == 58) { + phrase2 = "Paladins"; + col_second = "Silver"; + } + if (ran2 == 59) { + phrase2 = "Panthers"; + col_second = "Black"; + } + if (ran2 == 60) { + phrase2 = "Patriarchs"; + } + if (ran2 == 61) { + phrase2 = "Phantoms"; + col_second = "Black"; + } + if (ran2 == 62) { + phrase2 = "Purgators"; + } + if (ran2 == 63) { + phrase2 = "Raiders"; + } + if (ran2 == 64) { + phrase2 = "Rampagers"; + col_second = "Black"; + } + if (ran2 == 65) { + phrase2 = "Raptors"; + } + if (ran2 == 66) { + phrase2 = "Ravens"; + } + if (ran2 == 67) { + phrase2 = "Redeemers"; + } + if (ran2 == 68) { + phrase2 = "Revilers"; + } + if (ran2 == 69) { + phrase2 = "Saints"; + col_second = "White"; + } + if (ran2 == 70) { + phrase2 = "Salamanders"; + col_second = "Green"; + } + if (ran2 == 71) { + phrase2 = "Scars"; + col_second = "White"; + } + if (ran2 == 72) { + phrase2 = "Scions"; + col_second = "Purple"; + } + if (ran2 == 73) { + phrase2 = "Scorpians"; + col_second = "Orange"; + } + if (ran2 == 74) { + phrase2 = "Scythes"; + } + if (ran2 == 75) { + phrase2 = "Shades"; + } + if (ran2 == 76) { + phrase2 = "Sharks"; + col_second = "Light Blue"; + } + if (ran2 == 77) { + phrase2 = "Sisters"; + } + if (ran2 == 78) { + phrase2 = "Skulls"; + col_second = "White"; + } + if (ran2 == 79) { + phrase2 = "Sons"; + } + if (ran2 == 80) { + phrase2 = "Spectres"; + } + if (ran2 == 81) { + phrase2 = "Slayers"; + } + if (ran2 == 82) { + phrase2 = "Stalkers"; + } + if (ran2 == 83) { + phrase2 = "Swords"; + col_second = "Silver"; + } + if (ran2 == 84) { + phrase2 = "Talons"; + } + if (ran2 == 85) { + phrase2 = "Templars"; + col_second = "White"; + } + if (ran2 == 86) { + phrase2 = "Tigers"; + col_second = "Black"; + } + if (ran2 == 87) { + phrase2 = "Turtles"; + col_second = "Dark Green"; + } + if (ran2 == 88) { + phrase2 = "Vindicators"; + } + if (ran2 == 89) { + phrase2 = "Vipers"; + } + if (ran2 == 90) { + phrase2 = "Vultures"; + col_second = "Black"; + } + if (ran2 == 91) { + phrase2 = "Warriors"; + } + if (ran2 == 92) { + phrase2 = "Wasps"; + col_second = "Yellow"; + } + if (ran2 == 93) { + phrase2 = "Wizards"; + col_second = "Purple"; + name[100, 17] = "Wizard"; + master_specialty = 3; + } + if (ran2 == 94) { + phrase2 = "Wolves"; + col_second = "White"; + } + if (ran2 == 95) { + phrase2 = "Wyerns"; + } + + color_to_main = col_main; + color_to_secondary = col_second; + color_to_trim = col_trim; + color_to_pauldron = col_second; + color_to_pauldron2 = col_second; + color_to_lens = col_lens; + color_to_weapon = col_weapon; + trim = choose(0, 1); + if (color_to_main != "") { + main_color = max(array_find_value(col, color_to_main), 0); + color_to_main = ""; + } + if (color_to_secondary != "") { + secondary_color = max(array_find_value(col, color_to_secondary), 0); + color_to_secondary = ""; + } + if (color_to_trim != "") { + main_trim = max(array_find_value(col, color_to_trim), 0); + color_to_trim = ""; + } + if (color_to_pauldron != "") { + right_pauldron = max(array_find_value(col, color_to_pauldron), 0); + color_to_pauldron = ""; + } + if (color_to_pauldron2 != "") { + left_pauldron = max(array_find_value(col, color_to_pauldron2), 0); + color_to_pauldron2 = ""; + } + if (color_to_lens != "") { + lens_color = max(array_find_value(col, color_to_lens), 0); + color_to_lens = ""; + } + if (color_to_weapon != "") { + weapon_color = max(array_find_value(col, color_to_weapon), 0); + color_to_weapon = ""; + } + + //TODO add some funcky stuff for custom random complex livery + var struct_cols = { + main_color: main_color, + secondary_color: secondary_color, + main_trim: main_trim, + right_pauldron: right_pauldron, + left_pauldron: left_pauldron, + lens_color: lens_color, + weapon_color: weapon_color + }; + obj_creation.livery_picker = new ColourItem(100, 230); + + obj_creation.livery_picker.scr_unit_draw_data(-1); + obj_creation.company_liveries = array_create(11, variable_clone(obj_creation.livery_picker.map_colour)); + + obj_creation.livery_picker.scr_unit_draw_data(); + obj_creation.livery_picker.set_default_armour(struct_cols, col_special); + obj_creation.full_liveries = array_create(21, variable_clone(obj_creation.livery_picker.map_colour)); + obj_creation.full_liveries[eROLE.Librarian] = obj_creation.livery_picker.set_default_librarian(struct_cols); + + obj_creation.full_liveries[eROLE.Chaplain] = obj_creation.livery_picker.set_default_chaplain(struct_cols); - mutations+=round(4-(purity/2.5)) - - repeat(50){ - if (mutat Date: Wed, 21 May 2025 22:15:14 +1000 Subject: [PATCH 048/286] fix: Stop zooming in ground combat (#830) --- objects/obj_controller/Step_0.gml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/objects/obj_controller/Step_0.gml b/objects/obj_controller/Step_0.gml index bb7c9ac2ed..52cc45e5d5 100644 --- a/objects/obj_controller/Step_0.gml +++ b/objects/obj_controller/Step_0.gml @@ -1,7 +1,7 @@ try { // Handles most logic for main menus, audio and checks if cheats are enabled // TODO refactor will wait untill squads PR (#76) is merged - if (menu == 0 && zoomed == 0 && !instance_exists(obj_ingame_menu)) { + if (menu == 0 && zoomed == 0 && !instance_exists(obj_ingame_menu) && !instance_exists(obj_ncombat)) { scr_zoom_keys(); } if (double_click >= 0) { From 0cefa05a3a5f0482102b735b21f736a79ef9b9bd Mon Sep 17 00:00:00 2001 From: Luke Van Epen Date: Wed, 21 May 2025 22:15:40 +1000 Subject: [PATCH 049/286] fix: Bandaid fix for purge screen zoom bug (#831) --- objects/obj_drop_select/Create_0.gml | 2 ++ scripts/scr_cheatcode/scr_cheatcode.gml | 3 +++ 2 files changed, 5 insertions(+) diff --git a/objects/obj_drop_select/Create_0.gml b/objects/obj_drop_select/Create_0.gml index 617d106047..4668c55940 100644 --- a/objects/obj_drop_select/Create_0.gml +++ b/objects/obj_drop_select/Create_0.gml @@ -1,6 +1,8 @@ if !(variable_instance_exists(self, "attack")){ attack = 0; } +set_zoom_to_default(); //bandaid the purge screen flying off screen if zoomed out + once_only=0; raid_tact=1; diff --git a/scripts/scr_cheatcode/scr_cheatcode.gml b/scripts/scr_cheatcode/scr_cheatcode.gml index af8412705b..1e3b223020 100644 --- a/scripts/scr_cheatcode/scr_cheatcode.gml +++ b/scripts/scr_cheatcode/scr_cheatcode.gml @@ -343,6 +343,9 @@ function scr_cheatcode(argument0) { var _fleet = get_nearest_player_fleet(0,0); add_ship_to_fleet(new_player_ship("Gloriana"),_fleet); break; + case "zoom": + set_zoom_to_default(); + break; } } From f04b5aa3cb9eef36ba1720be941a4b98aa3a7b4d Mon Sep 17 00:00:00 2001 From: Luke Van Epen Date: Wed, 21 May 2025 22:16:02 +1000 Subject: [PATCH 050/286] fix: Extra ship missing var crash (#828) --- .../scr_initialize_custom/scr_initialize_custom.gml | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/scripts/scr_initialize_custom/scr_initialize_custom.gml b/scripts/scr_initialize_custom/scr_initialize_custom.gml index 23febb6cc8..1f28caa156 100644 --- a/scripts/scr_initialize_custom/scr_initialize_custom.gml +++ b/scripts/scr_initialize_custom/scr_initialize_custom.gml @@ -821,11 +821,12 @@ function scr_initialize_custom() { hunters = 0; } } - - battle_barges = battle_barges + obj_creation.extra_ships.battle_barges; - strike_cruisers = strike_cruisers + obj_creation.extra_ships.strike_cruisers; - gladius = gladius + obj_creation.extra_ships.gladius; - hunters = hunters + obj_creation.extra_ships.hunters; + if(struct_exists(obj_creation, "extra_ships")){ + battle_barges = battle_barges + obj_creation.extra_ships.battle_barges; + strike_cruisers = strike_cruisers + obj_creation.extra_ships.strike_cruisers; + gladius = gladius + obj_creation.extra_ships.gladius; + hunters = hunters + obj_creation.extra_ships.hunters; + } var ship_summary_str = $"Ships: bb: {battle_barges} sc: {strike_cruisers} g: {gladius} h: {hunters}" // log_message(ship_summary_str); From 4d12cf0e00104f2c053697668dcbe6ab639d368c Mon Sep 17 00:00:00 2001 From: Luke Van Epen Date: Wed, 21 May 2025 22:16:29 +1000 Subject: [PATCH 051/286] fix: Remove save and delete buttons on autosave slot (#829) --- objects/obj_saveload/Draw_0.gml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/objects/obj_saveload/Draw_0.gml b/objects/obj_saveload/Draw_0.gml index 1b15be1a40..a6684e30ae 100644 --- a/objects/obj_saveload/Draw_0.gml +++ b/objects/obj_saveload/Draw_0.gml @@ -74,7 +74,7 @@ if (menu=1) or (menu=2){// This is the other one draw_sprite(spr_save_data,0,x2,y2); if(o == 0){ //autosave - draw_text_transformed(x2+23,y2+62,string_hash_to_newline("A"),1.1,1.1,0); + draw_text_transformed(x2+21,y2+62,string_hash_to_newline("A"),1.1,1.1,0); } else { draw_text_transformed(x2+23,y2+62,string_hash_to_newline(o),1.1,1.1,0); } @@ -118,7 +118,7 @@ if (menu=1) or (menu=2){// This is the other one draw_set_font(fnt_40k_30b);draw_set_halign(fa_center); - if (save[o] >= 0) { + if (save[o] > 0) { //intentionally not allowed to delete the autosave file // Delete Data draw_set_alpha(1); draw_set_color(c_gray); @@ -211,7 +211,8 @@ if (menu=1) or (menu=2){// This is the other one } } - if (menu=1) and ((save[o]>=0) or (first_open=o)){// Save + if (menu=1) and ((save[o]>0) or (first_open=o)){ // intentionally not allowed to saveover the autosave slot manually + // Save draw_set_alpha(1); draw_set_color(c_gray);draw_rectangle(x2+1317,y2+113,x2+1461,y2+146,0); draw_set_color(c_black);draw_rectangle(x2+1317,y2+113,x2+1461,y2+146,1); From f282076bfaa83b4df4113ea7eedc538a8bfb1211 Mon Sep 17 00:00:00 2001 From: EttyKitty <20323032+EttyKitty@users.noreply.github.com> Date: Wed, 21 May 2025 18:27:18 +0300 Subject: [PATCH 052/286] refactor: And fix some minor stuff in scr_chapter_random (#827) --- .../scr_chapter_random/scr_chapter_random.gml | 116 +++++++++--------- 1 file changed, 56 insertions(+), 60 deletions(-) diff --git a/scripts/scr_chapter_random/scr_chapter_random.gml b/scripts/scr_chapter_random/scr_chapter_random.gml index 165ea8cd3f..fae68c59c5 100644 --- a/scripts/scr_chapter_random/scr_chapter_random.gml +++ b/scripts/scr_chapter_random/scr_chapter_random.gml @@ -176,7 +176,6 @@ function scr_chapter_random(custom_or_random) { if (found_secret == 5) { adv[1] = "Assault Doctrine"; dis[1] = "Black Rage"; - disadvantage1 = 1; } if (found_secret == 6) { adv[1] = "Tech-Brothers"; @@ -202,61 +201,58 @@ function scr_chapter_random(custom_or_random) { */ mutations += round(4 - (purity / 2.5)); - - repeat(50) { - if (mutat < mutations) { - if ((preomnor == 0) && (floor(random(12)) + 1 == 2)) { - preomnor = 1; - mutat += 1; - } - if ((voice == 0) && (floor(random(12)) + 1 == 2)) { - voice = 1; - mutat += 1; - } - if ((doomed == 0) && (floor(random(30)) + 1 == 2)) { - doomed = 1; - mutat += 4; - } - if ((lyman == 0) && (floor(random(12)) + 1 == 2)) { - lyman = 1; - mutat += 1; - } - if ((omophagea == 0) && (floor(random(12)) + 1 == 2)) { - omophagea = 1; - mutat += 1; - } - if ((ossmodula == 0) && (floor(random(12)) + 1 == 2)) { - ossmodula = 1; - mutat += 1; - } - if ((membrane == 0) && (floor(random(12)) + 1 == 2)) { - membrane = 1; - mutat += 1; - } - if ((zygote == 0) && (floor(random(12)) + 1 == 2)) { - zygote = 1; - mutat += 2; - } - if ((betchers == 0) && (floor(random(12)) + 1 == 2)) { - betchers = 1; - mutat += 1; - } - if ((catalepsean == 0) && (floor(random(12)) + 1 == 2)) { - catalepsean = 1; - mutat += 1; - } - if ((secretions == 0) && (floor(random(12)) + 1 == 2)) { - secretions = 1; - mutat += 1; - } - if ((occulobe == 0) && (floor(random(12)) + 1 == 2)) { - occulobe = 1; - mutat += 1; - } - if ((mucranoid == 0) && (floor(random(12)) + 1 == 2)) { - mucranoid = 1; - mutat += 1; - } + for (var r = 0; r < 50 && mutat < mutations; ++r) { + if ((preomnor == 0) && (floor(random(12)) + 1 == 2)) { + preomnor = 1; + mutat += 1; + } + if ((voice == 0) && (floor(random(12)) + 1 == 2)) { + voice = 1; + mutat += 1; + } + if ((doomed == 0) && (floor(random(30)) + 1 == 2)) { + doomed = 1; + mutat += 4; + } + if ((lyman == 0) && (floor(random(12)) + 1 == 2)) { + lyman = 1; + mutat += 1; + } + if ((omophagea == 0) && (floor(random(12)) + 1 == 2)) { + omophagea = 1; + mutat += 1; + } + if ((ossmodula == 0) && (floor(random(12)) + 1 == 2)) { + ossmodula = 1; + mutat += 1; + } + if ((membrane == 0) && (floor(random(12)) + 1 == 2)) { + membrane = 1; + mutat += 1; + } + if ((zygote == 0) && (floor(random(12)) + 1 == 2)) { + zygote = 1; + mutat += 2; + } + if ((betchers == 0) && (floor(random(12)) + 1 == 2)) { + betchers = 1; + mutat += 1; + } + if ((catalepsean == 0) && (floor(random(12)) + 1 == 2)) { + catalepsean = 1; + mutat += 1; + } + if ((secretions == 0) && (floor(random(12)) + 1 == 2)) { + secretions = 1; + mutat += 1; + } + if ((occulobe == 0) && (floor(random(12)) + 1 == 2)) { + occulobe = 1; + mutat += 1; + } + if ((mucranoid == 0) && (floor(random(12)) + 1 == 2)) { + mucranoid = 1; + mutat += 1; } } @@ -799,7 +795,7 @@ function scr_chapter_random(custom_or_random) { } if (ran2 == 48) { phrase2 = "Lamenters"; - seconary_color = "Yellow"; + col_second = "Yellow"; fleet_type = 3; } if (ran2 == 49) { @@ -957,8 +953,8 @@ function scr_chapter_random(custom_or_random) { if (ran2 == 93) { phrase2 = "Wizards"; col_second = "Purple"; - name[100, 17] = "Wizard"; - master_specialty = 3; + name[100][eROLE.Librarian] = "Wizard"; + chapter_master_specialty = 3; } if (ran2 == 94) { phrase2 = "Wolves"; @@ -1034,7 +1030,7 @@ function scr_chapter_random(custom_or_random) { obj_creation.livery_picker.scr_unit_draw_data(); obj_creation.livery_picker.set_default_armour(struct_cols, col_special); - obj_creation.livery_picker.map_colour = full_liveries[0]; + obj_creation.livery_picker.map_colour = obj_creation.full_liveries[0]; obj_creation.livery_picker.role_set = 0; chapter_name = string(phrase1) + " " + string(phrase2); chapter_string = chapter_name; From a5a9bb0936f80bc6bf8a64542f4232e79f516849 Mon Sep 17 00:00:00 2001 From: EttyKitty <20323032+EttyKitty@users.noreply.github.com> Date: Wed, 21 May 2025 20:48:04 +0300 Subject: [PATCH 053/286] style: Format obj_ground_mission alarm_6 (#832) --- objects/obj_ground_mission/Alarm_6.gml | 167 ++++++++++++++++--------- 1 file changed, 106 insertions(+), 61 deletions(-) diff --git a/objects/obj_ground_mission/Alarm_6.gml b/objects/obj_ground_mission/Alarm_6.gml index 380e9286d8..15c49db1db 100644 --- a/objects/obj_ground_mission/Alarm_6.gml +++ b/objects/obj_ground_mission/Alarm_6.gml @@ -1,88 +1,133 @@ +var comp, plan, i; +i = 0; +comp = 0; +plan = 0; +plan = instance_nearest(x, y, obj_star); +delete_features(plan.p_feature[num], P_features.Artifact); -var comp,plan,i;i=0;comp=0;plan=0; -plan=instance_nearest(x,y,obj_star); - delete_features(plan.p_feature[num], P_features.Artifact); +scr_return_ship(loc, self, num); -scr_return_ship(loc,self,num); - -with(obj_star_select){instance_destroy();} -with(obj_fleet_select){instance_destroy();} - -obj_controller.menu=20;obj_controller.diplomacy=3;obj_controller.force_goodbye=5; - -if (obj_controller.disposition[3]<=10) then obj_controller.disposition[3]+=5; -if (obj_controller.disposition[3]>10) and (obj_controller.disposition[3]<=30) then obj_controller.disposition[3]+=7; -if (obj_controller.disposition[3]>30) and (obj_controller.disposition[3]<=50) then obj_controller.disposition[3]+=9; -if (obj_controller.disposition[3]>50) then obj_controller.disposition[3]+=11; - -with(obj_controller){scr_dialogue("stc_thanks");} +with (obj_star_select) { + instance_destroy(); +} +with (obj_fleet_select) { + instance_destroy(); +} -with(obj_temp2){instance_destroy();} -with(obj_temp7){instance_destroy();} +obj_controller.menu = 20; +obj_controller.diplomacy = 3; +obj_controller.force_goodbye = 5; -if (obj_ini.fleet_type=ePlayerBase.home_world) then with(obj_star){ - if (owner = eFACTION.Player) and ((p_owner[1]=1) or (p_owner[2]=1)) then instance_create(x,y,obj_temp2); +if (obj_controller.disposition[3] <= 10) { + obj_controller.disposition[3] += 5; } -if (obj_ini.fleet_type != ePlayerBase.home_world) then with(obj_p_fleet){// Get fleet star system - if (capital_number>0) and (action="") then instance_create(instance_nearest(x,y,obj_star).x,instance_nearest(x,y,obj_star).y,obj_temp2); - if (frigate_number>0) and (action="") then instance_create(instance_nearest(x,y,obj_star).x,instance_nearest(x,y,obj_star).y,obj_temp7); +if ((obj_controller.disposition[3] > 10) && (obj_controller.disposition[3] <= 30)) { + obj_controller.disposition[3] += 7; +} +if ((obj_controller.disposition[3] > 30) && (obj_controller.disposition[3] <= 50)) { + obj_controller.disposition[3] += 9; +} +if (obj_controller.disposition[3] > 50) { + obj_controller.disposition[3] += 11; } - -if (obj_ini.fleet_type != ePlayerBase.home_world){ - with(obj_p_fleet){if (action="") then instance_deactivate_object(instance_nearest(x,y,obj_star));} +with (obj_controller) { + scr_dialogue("stc_thanks"); } -var flit, i,chasing;chasing=0;// Set target -var targ -if (instance_exists(obj_temp2)){ - targ = nearest_star_with_ownership(obj_temp2.x, obj_temp2.y,obj_controller.diplomacy ); -} else if (instance_exists(obj_temp7)){ - targ = nearest_star_with_ownership(obj_temp7.x, obj_temp7.y,obj_controller.diplomacy ); +with (obj_temp2) { + instance_destroy(); +} +with (obj_temp7) { + instance_destroy(); } +if (obj_ini.fleet_type == ePlayerBase.home_world) { + with (obj_star) { + if ((owner == eFACTION.Player) && ((p_owner[1] == 1) || (p_owner[2] == 1))) { + instance_create(x, y, obj_temp2); + } + } +} +if (obj_ini.fleet_type != ePlayerBase.home_world) { + with (obj_p_fleet) { + // Get fleet star system + if ((capital_number > 0) && (action == "")) { + instance_create(instance_nearest(x, y, obj_star).x, instance_nearest(x, y, obj_star).y, obj_temp2); + } + if ((frigate_number > 0) && (action == "")) { + instance_create(instance_nearest(x, y, obj_star).x, instance_nearest(x, y, obj_star).y, obj_temp7); + } + } +} +if (obj_ini.fleet_type != ePlayerBase.home_world) { + with (obj_p_fleet) { + if (action == "") { + instance_deactivate_object(instance_nearest(x, y, obj_star)); + } + } +} -// If player fleet is flying about then get their target for new target -else if (!instance_exists(obj_temp2)) and (!instance_exists(obj_temp7)) and (instance_exists(obj_p_fleet)) and (obj_ini.fleet_type = ePlayerBase.home_world){ - chasing=1; - with(obj_p_fleet){var pop; - if (capital_number>0) and (action!=""){ - pop=instance_create(action_x,action_y,obj_temp2); - pop.action_eta=action_eta; +var flit, i, chasing; +chasing = 0; // Set target +var targ; +if (instance_exists(obj_temp2)) { + targ = nearest_star_with_ownership(obj_temp2.x, obj_temp2.y, obj_controller.diplomacy); +} else if (instance_exists(obj_temp7)) { + targ = nearest_star_with_ownership(obj_temp7.x, obj_temp7.y, obj_controller.diplomacy); +} else if ((!instance_exists(obj_temp2)) && (!instance_exists(obj_temp7)) && instance_exists(obj_p_fleet) && (obj_ini.fleet_type == ePlayerBase.home_world)) { + // If player fleet is flying about then get their target for new target + chasing = 1; + with (obj_p_fleet) { + var pop; + if ((capital_number > 0) && (action != "")) { + pop = instance_create(action_x, action_y, obj_temp2); + pop.action_eta = action_eta; } - if (frigate_number>0) and (action!=""){ - pop=instance_create(action_x,action_y,obj_temp7); - pop.action_eta=action_eta; + if ((frigate_number > 0) && (action != "")) { + pop = instance_create(action_x, action_y, obj_temp7); + pop.action_eta = action_eta; } } } +flit = instance_create(targ.x, targ.y, obj_en_fleet); -flit=instance_create(targ.x,targ.y,obj_en_fleet); - -flit.owner=obj_controller.diplomacy; -flit.home_x=targ.x;flit.home_y=targ.y; -flit.sprite_index=spr_fleet_mechanicus; +flit.owner = obj_controller.diplomacy; +flit.home_x = targ.x; +flit.home_y = targ.y; +flit.sprite_index = spr_fleet_mechanicus; -flit.image_index=0; -flit.capital_number=1; -flit.trade_goods="Requisition!500!|"; +flit.image_index = 0; +flit.capital_number = 1; +flit.trade_goods = "Requisition!500!|"; -if (obj_ini.fleet_type != ePlayerBase.home_world){ - if (instance_exists(obj_temp2)){flit.action_x=obj_temp2.x;flit.action_y=obj_temp2.y;flit.target=instance_nearest(flit.action_x,flit.action_y,obj_p_fleet);} - if (!instance_exists(obj_temp2)) and (instance_exists(obj_temp7)){flit.action_x=obj_temp7.x;flit.action_y=obj_temp7.y;flit.target=instance_nearest(flit.action_x,flit.action_y,obj_p_fleet);} +if (obj_ini.fleet_type != ePlayerBase.home_world) { + if (instance_exists(obj_temp2)) { + flit.action_x = obj_temp2.x; + flit.action_y = obj_temp2.y; + flit.target = instance_nearest(flit.action_x, flit.action_y, obj_p_fleet); + } + if ((!instance_exists(obj_temp2)) && instance_exists(obj_temp7)) { + flit.action_x = obj_temp7.x; + flit.action_y = obj_temp7.y; + flit.target = instance_nearest(flit.action_x, flit.action_y, obj_p_fleet); + } } -if (obj_ini.fleet_type=ePlayerBase.home_world){ - targ=instance_nearest(flit.x,flit.y,obj_temp2); - flit.action_x=targ.x;flit.action_y=targ.y; +if (obj_ini.fleet_type == ePlayerBase.home_world) { + targ = instance_nearest(flit.x, flit.y, obj_temp2); + flit.action_x = targ.x; + flit.action_y = targ.y; } -flit.alarm[4]=1; +flit.alarm[4] = 1; instance_activate_all(); -with(obj_temp2){instance_destroy();} -with(obj_temp7){instance_destroy();} +with (obj_temp2) { + instance_destroy(); +} +with (obj_temp7) { + instance_destroy(); +} instance_destroy(); - - From 59ab7d80f4cedf4773b36d8963c287c6de3ae7c9 Mon Sep 17 00:00:00 2001 From: EttyKitty <20323032+EttyKitty@users.noreply.github.com> Date: Wed, 21 May 2025 21:32:57 +0300 Subject: [PATCH 054/286] style: Format ground_mission alarm_0 (#833) --- objects/obj_ground_mission/Alarm_0.gml | 253 ++++++++++++++----------- 1 file changed, 140 insertions(+), 113 deletions(-) diff --git a/objects/obj_ground_mission/Alarm_0.gml b/objects/obj_ground_mission/Alarm_0.gml index fcf3bbab78..af3b90b155 100644 --- a/objects/obj_ground_mission/Alarm_0.gml +++ b/objects/obj_ground_mission/Alarm_0.gml @@ -1,140 +1,167 @@ +if (num > 0) { + // Hmmmmmmm + var stah; + stah = instance_nearest(x, y, obj_star); + obj_controller.menu = 0; + if (planet_feature_bool(stah.p_feature[num], P_features.STC_Fragment) == 1) { + // STC is present + if ((tch > 0) && (mch == 0)) { + var pop, own; + pop = instance_create(0, 0, obj_popup); + pop.image = "stc"; + pop.title = "STC Fragment Located"; -if (num>0){// Hmmmmmmm - var stah;stah=instance_nearest(x,y,obj_star); - obj_controller.menu=0; - - - if (planet_feature_bool(stah.p_feature[num], P_features.STC_Fragment)==1){// STC is present - if (tch>0) and (mch=0){ - var pop,own; - pop=instance_create(0,0,obj_popup); - pop.image="stc"; - pop.title="STC Fragment Located"; - - - if (stah.p_owner[num]!=3) then pop.text="An STC Fragment has been located upon "+string(stah.name)+" "+string(num)+"; what it might contain is unknown. Your "+string(obj_ini.role[100][16])+"s wish to reclaim, identify, and put it to use immediately. What is thy will?"; - if (stah.p_owner[num]=3) then pop.text="An STC Fragment has been located upon "+string(stah.name)+" "+string(num)+"; what it might contain is unknown. It appears to be located deep within a Mechanicus Vault. Taking it may be seen as an act of war. What is thy will?"; - - - own=stah.p_owner[num]; - pop.option1="Swiftly take the STC Fragment."; - pop.option2="Leave it."; + if (stah.p_owner[num] != 3) { + pop.text = "An STC Fragment has been located upon " + string(stah.name) + " " + string(num) + "; what it might contain is unknown. Your " + string(obj_ini.role[100][16]) + "s wish to reclaim, identify, and put it to use immediately. What is thy will?"; + } + if (stah.p_owner[num] == 3) { + pop.text = "An STC Fragment has been located upon " + string(stah.name) + " " + string(num) + "; what it might contain is unknown. It appears to be located deep within a Mechanicus Vault. Taking it may be seen as an act of war. What is thy will?"; + } + + own = stah.p_owner[num]; + pop.option1 = "Swiftly take the STC Fragment."; + pop.option2 = "Leave it."; } - if (tch>0) and (mch>0){ - if (stah.p_owner[num]!=3){ - var pop,own; - pop=instance_create(0,0,obj_popup); - pop.image="stc"; - pop.title="STC Fragment Located"; + if ((tch > 0) && (mch > 0)) { + if (stah.p_owner[num] != 3) { + var pop, own; + pop = instance_create(0, 0, obj_popup); + pop.image = "stc"; + pop.title = "STC Fragment Located"; // pop.text="An STC Fragment has been located upon "+string(stah.name)+" "+string(num)+". Your "+string(obj_ini.role[100][16])+"s and present Mechanicus Techpriests are bickering over what should be done with it. What is thy will?"; - - pop.text="An STC Fragment has been located upon "+string(stah.name)+" "+string(num)+". Your "+string(obj_ini.role[100][16])+"s wish to reclaim, identify, and put it to use immediately, and the Tech Priests wish to send it to the closest forge world. What is thy will?"; + + pop.text = "An STC Fragment has been located upon " + string(stah.name) + " " + string(num) + ". Your " + string(obj_ini.role[100][16]) + "s wish to reclaim, identify, and put it to use immediately, and the Tech Priests wish to send it to the closest forge world. What is thy will?"; // if (stah.p_owner[num]=3) then pop.text="An STC Fragment has been located upon "+string(stah.name)+" "+string(num)+". It appears to be located deep within a Mechanicus Vault. The present Tech Priests warn that taking it will be seen as an act of war. What is thy will?"; - - own=stah.p_owner[num]; - pop.option1="Swiftly take the STC Fragment."; - pop.option2="Leave it."; - pop.option3="Send it to the Adeptus Mechanicus."; + + own = stah.p_owner[num]; + pop.option1 = "Swiftly take the STC Fragment."; + pop.option2 = "Leave it."; + pop.option3 = "Send it to the Adeptus Mechanicus."; } } - if (tch=0) and (mch>0){ - if (stah.p_owner[num]!=3){ - var pop,own; - pop=instance_create(0,0,obj_popup); - pop.image="stc"; - pop.title="STC Fragment Located"; - pop.text="An STC Fragment has been located upon "+string(stah.name)+" "+string(num)+"; what it might contain is unknown. The present Tech Priests wish to send it to Mars, and refuse to take the device off-world otherwise."; - - own=stah.p_owner[num]; - pop.option1="Leave it."; - pop.option2="Send it to the Adeptus Mechanicus."; + if ((tch == 0) && (mch > 0)) { + if (stah.p_owner[num] != 3) { + var pop, own; + pop = instance_create(0, 0, obj_popup); + pop.image = "stc"; + pop.title = "STC Fragment Located"; + pop.text = "An STC Fragment has been located upon " + string(stah.name) + " " + string(num) + "; what it might contain is unknown. The present Tech Priests wish to send it to Mars, and refuse to take the device off-world otherwise."; + + own = stah.p_owner[num]; + pop.option1 = "Leave it."; + pop.option2 = "Send it to the Adeptus Mechanicus."; } } - if (mch>0) and (stah.p_owner[num]=3){ - var pop,own; - pop=instance_create(0,0,obj_popup); - pop.image="stc"; - pop.title="STC Fragment Located"; - pop.text="An STC Fragment has been located upon "+string(stah.name)+" "+string(num)+". It appears to be located deep within a Mechanicus Vault. The present Tech Priests stress they will not condone a mission to steal the STC Fragment."; - - own=stah.p_owner[num]; - - - scr_return_ship(loc,id,num); - var man_size,ship_id,comp,plan,i; - i=0;ship_id=0;man_size=0;comp=0;plan=0; - repeat(30){i+=1;if (obj_ini.ship[i]=loc) then ship_id=i;}i=0; - obj_controller.menu=0;obj_controller.managing=0; - obj_controller.cooldown=10; - instance_destroy();exit; - + if ((mch > 0) && (stah.p_owner[num] == 3)) { + var pop, own; + pop = instance_create(0, 0, obj_popup); + pop.image = "stc"; + pop.title = "STC Fragment Located"; + pop.text = "An STC Fragment has been located upon " + string(stah.name) + " " + string(num) + ". It appears to be located deep within a Mechanicus Vault. The present Tech Priests stress they will not condone a mission to steal the STC Fragment."; + + own = stah.p_owner[num]; + + scr_return_ship(loc, id, num); + var man_size, ship_id, comp, plan, i; + i = 0; + ship_id = 0; + man_size = 0; + comp = 0; + plan = 0; + repeat (30) { + i += 1; + if (obj_ini.ship[i] == loc) { + ship_id = i; + } + } + i = 0; + obj_controller.menu = 0; + obj_controller.managing = 0; + obj_controller.cooldown = 10; + instance_destroy(); + exit; + // pop.option1="Leave it."; // get bitched at by the mechanicus } - - pop.ma_co=tch;pop.ma_id=mch; - pop.target_comp=stah.p_owner[num]; + + pop.ma_co = tch; + pop.ma_id = mch; + pop.target_comp = stah.p_owner[num]; } - - - - if (planet_feature_bool(stah.p_feature[num], P_features.Artifact)==1){// Artifact is present - if (stah.p_type[num]="Dead") or (stah.p_owner[num]=1){alarm[4]=1;exit;} - - var pop,own; - pop=instance_create(0,0,obj_popup); - pop.image="artifact"; - pop.title="Artifact Located"; - pop.text="The Artifact has been located upon "+string(stah.name)+" "+string(num)+"; its condition and class are unlikely to be determined until returned to the ship. What is thy will?"; - - own=stah.p_owner[num]; - + + if (planet_feature_bool(stah.p_feature[num], P_features.Artifact) == 1) { + // Artifact is present + if ((stah.p_type[num] == "Dead") || (stah.p_owner[num] == 1)) { + alarm[4] = 1; + exit; + } + + var pop, own; + pop = instance_create(0, 0, obj_popup); + pop.image = "artifact"; + pop.title = "Artifact Located"; + pop.text = "The Artifact has been located upon " + string(stah.name) + " " + string(num) + "; its condition and class are unlikely to be determined until returned to the ship. What is thy will?"; + + own = stah.p_owner[num]; + // show_message(own); - - if (stah.p_first[num]=3) and (stah.p_owner[num]>5){ - if (stah.p_pdf[num]>0) then own=3; + + if ((stah.p_first[num] == 3) && (stah.p_owner[num] > 5)) { + if (stah.p_pdf[num] > 0) { + own = 3; + } } - - pop.option1="Request audience with the " - if (own=1){ - pop.option1+="Planetary Governor"; - pop.option3="Gift the Artifact to the Sector Commander."; + + pop.option1 = "Request audience with the "; + if (own == 1) { + pop.option1 += "Planetary Governor"; + pop.option3 = "Gift the Artifact to the Sector Commander."; } - if (own=2){ - pop.option1+="Planetary Governor"; - pop.option3="Gift the Artifact to the Sector Commander.";} - if (own=3){ - pop.option1+="Mechanicus"; - pop.option3="Let it be. The Mechanicus' wrath is not lightly provoked.";} - if (own=4){ - pop.option1+="Inquisition"; - pop.option3="Let it be. The Inquisition's wrath is not lightly provoked.";} - if (own=5){pop.option1+="Ecclesiarchy";pop.option3="Gift the Artifact to the Ecclesiarchy.";} - if (own=6){pop.option1+="Eldar";pop.option3="Gift the Artifact to the Eldar.";} - if (own=8){pop.option1+="Tau";pop.option3="Gift the Artifact to the Tau Empire.";} - - pop.option1+=" regarding the Artifact."; - pop.option2="Swiftly take the Artifact."; - pop.target_comp=stah.p_owner[num]; - - if (own>=9) or ((own=7) and (stah.p_pdf[num]<=0)){ - pop.option1="Swiftly take the Artifact."; - pop.option2="Let it be."; - pop.option3=""; + if (own == 2) { + pop.option1 += "Planetary Governor"; + pop.option3 = "Gift the Artifact to the Sector Commander."; + } + if (own == 3) { + pop.option1 += "Mechanicus"; + pop.option3 = "Let it be. The Mechanicus' wrath is not lightly provoked."; + } + if (own == 4) { + pop.option1 += "Inquisition"; + pop.option3 = "Let it be. The Inquisition's wrath is not lightly provoked."; } - + if (own == 5) { + pop.option1 += "Ecclesiarchy"; + pop.option3 = "Gift the Artifact to the Ecclesiarchy."; + } + if (own == 6) { + pop.option1 += "Eldar"; + pop.option3 = "Gift the Artifact to the Eldar."; + } + if (own == 8) { + pop.option1 += "Tau"; + pop.option3 = "Gift the Artifact to the Tau Empire."; + } + + pop.option1 += " regarding the Artifact."; + pop.option2 = "Swiftly take the Artifact."; + pop.target_comp = stah.p_owner[num]; + + if ((own >= 9) || ((own == 7) && (stah.p_pdf[num] <= 0))) { + pop.option1 = "Swiftly take the Artifact."; + pop.option2 = "Let it be."; + pop.option3 = ""; + } + // show_message(string(pop.option1)+"/"+string(pop.option2)+"/"+string(pop.option3)); - + /*if (pop.option1=""){ pop.option1="Swiftly take the Artifact."; pop.option2="Let it be."; pop.option3=""; }*/ - } - - } /* */ From 7966e0da44d2d2b932f57921c32c64367cecc039 Mon Sep 17 00:00:00 2001 From: EttyKitty <20323032+EttyKitty@users.noreply.github.com> Date: Wed, 21 May 2025 21:56:27 +0300 Subject: [PATCH 055/286] style: Format scr_return_ship (#835) --- scripts/scr_return_ship/scr_return_ship.gml | 66 ++++++++++----------- 1 file changed, 33 insertions(+), 33 deletions(-) diff --git a/scripts/scr_return_ship/scr_return_ship.gml b/scripts/scr_return_ship/scr_return_ship.gml index 7b58ac7a6d..c04bf731cc 100644 --- a/scripts/scr_return_ship/scr_return_ship.gml +++ b/scripts/scr_return_ship/scr_return_ship.gml @@ -1,39 +1,39 @@ function scr_return_ship(ship_name, object, planet_number) { + // ship_name: name of ship + // object: object with man_selecting + // planet_number: planet number + var man_size, i; + i = 0; + man_size = 0; - // ship_name: name of ship - // object: object with man_selecting - // planet_number: planet number - var man_size,i; - i=0;man_size=0; - - /*repeat(30){ - i+=1;if (obj_ini.ship[i]=ship_name) then ship_id=i; + /*repeat(30){ + i+=1;if (obj_ini.ship[i]=ship_name) then ship_id=i; }*/ - i=0; + i = 0; - // Increase ship storage ship_carrying[i] + // Increase ship storage ship_carrying[i] - var unit; - var return_planet = obj_controller.return_object; - with (object){ - var man_size - for (var i=0; i0){ - unit = display_unit[i]; - if (is_struct(unit)){ - if (return_place[i]>0){ - unit.load_marine(return_place[i], return_planet); - } - } else if (is_array(unit)) { - if (return_place[i]>0){ - obj_ini.veh_lid[unit[0]][unit[1]]=return_place[i]; - obj_ini.veh_wid[unit[0]][unit[1]]=0; - var man_size =scr_unit_size("",obj_ini.veh_role[unit[0]][unit[1]], true); - return_planet.p_player[planet_number]-=man_size; - obj_ini.ship_carrying[return_place[i]]+=man_size; - } - } - } - } - } + var unit; + var return_planet = obj_controller.return_object; + with (object) { + var man_size; + for (var i = 0; i < array_length(display_unit); i++) { + if (object.man_sel[i] > 0) { + unit = display_unit[i]; + if (is_struct(unit)) { + if (return_place[i] > 0) { + unit.load_marine(return_place[i], return_planet); + } + } else if (is_array(unit)) { + if (return_place[i] > 0) { + obj_ini.veh_lid[unit[0]][unit[1]] = return_place[i]; + obj_ini.veh_wid[unit[0]][unit[1]] = 0; + var man_size = scr_unit_size("", obj_ini.veh_role[unit[0]][unit[1]], true); + return_planet.p_player[planet_number] -= man_size; + obj_ini.ship_carrying[return_place[i]] += man_size; + } + } + } + } + } } From cf7ff1873716a4af4340bb5ebe966c64a7f64c54 Mon Sep 17 00:00:00 2001 From: EttyKitty <20323032+EttyKitty@users.noreply.github.com> Date: Thu, 22 May 2025 02:19:02 +0300 Subject: [PATCH 056/286] ci: Update workflow action versions (#837) --- .github/workflows/gamemaker_build.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/.github/workflows/gamemaker_build.yml b/.github/workflows/gamemaker_build.yml index fa9efaacf6..fd1d10116b 100644 --- a/.github/workflows/gamemaker_build.yml +++ b/.github/workflows/gamemaker_build.yml @@ -94,15 +94,14 @@ jobs: # This step sets up the GameMaker build CLI tool Igor https://github.com/bscotch/igor-setup - id: igor_setup name: Setup Igor - uses: bscotch/igor-setup@v1.1.0 + uses: bscotch/igor-setup@v1.1.3 with: target-yyp: ${{ steps.find_yyp.outputs.yyp-path }} access-key: ${{ secrets.GM_ACCESS_KEY }} - # Update the version.json file with build date and other versioning information - id: igor_build name: Build with Igor - uses: bscotch/igor-build@v1.0.3 + uses: bscotch/igor-build@v1.0.4 with: yyp-path: ${{ steps.find_yyp.outputs.yyp-path }} user-dir: ${{ steps.igor_setup.outputs.user-dir }} From 08e1971a2c7e1ec4db81fa626d9422218e660148 Mon Sep 17 00:00:00 2001 From: EttyKitty <20323032+EttyKitty@users.noreply.github.com> Date: Sun, 25 May 2025 15:04:03 +0300 Subject: [PATCH 057/286] feat: STC retrieval refactors and edits (#834) --- docs/CHEATCODES.md | 1 + objects/obj_ground_mission/Alarm_0.gml | 199 ++++++------------ objects/obj_ground_mission/Alarm_5.gml | 2 +- objects/obj_ground_mission/Alarm_6.gml | 73 ++++--- objects/obj_popup/Step_0.gml | 123 ++--------- scripts/scr_cheatcode/scr_cheatcode.gml | 9 +- .../scr_unit_quick_find_pane.gml | 26 ++- 7 files changed, 141 insertions(+), 292 deletions(-) diff --git a/docs/CHEATCODES.md b/docs/CHEATCODES.md index 037b6a3da6..ba474ad494 100644 --- a/docs/CHEATCODES.md +++ b/docs/CHEATCODES.md @@ -18,6 +18,7 @@ Arguments with stars `(argument*)` can be omitted. - `artifact (type*) (number*)` - spawns an artifact of a random type, if unspecified. - `(type*)` - possible values: random, random_nodemon, Weapon, Armour, Gear, Device, Robot, Tome, chaos_gift, good. Case sensitive. - `artifactpopulate` - spawns artifacts on all planets. +- `stcpopulate` - spawns an STC fragment on all planets. - `additem "(name)" (number*) (quality*)` - spawns an item(s) with specified parameters. - `"(name)"` - item name in quotes, as it's written in the game. Case sensitive. "Bolter", "Power Axe", etc. - `(quality*)` - possible values: standard, master_crafted, artificer, artifact, exemplary. Case insensitive. diff --git a/objects/obj_ground_mission/Alarm_0.gml b/objects/obj_ground_mission/Alarm_0.gml index af3b90b155..6b48dd3798 100644 --- a/objects/obj_ground_mission/Alarm_0.gml +++ b/objects/obj_ground_mission/Alarm_0.gml @@ -4,165 +4,104 @@ if (num > 0) { stah = instance_nearest(x, y, obj_star); obj_controller.menu = 0; - if (planet_feature_bool(stah.p_feature[num], P_features.STC_Fragment) == 1) { - // STC is present - if ((tch > 0) && (mch == 0)) { - var pop, own; - pop = instance_create(0, 0, obj_popup); - pop.image = "stc"; - pop.title = "STC Fragment Located"; + if (planet_feature_bool(stah.p_feature[num], P_features.STC_Fragment) == 1) { // STC is present + var pop, own; + own = stah.p_owner[num]; + pop = instance_create(0, 0, obj_popup); + pop.image = "stc"; + pop.title = "STC Fragment Located"; - if (stah.p_owner[num] != 3) { - pop.text = "An STC Fragment has been located upon " + string(stah.name) + " " + string(num) + "; what it might contain is unknown. Your " + string(obj_ini.role[100][16]) + "s wish to reclaim, identify, and put it to use immediately. What is thy will?"; - } - if (stah.p_owner[num] == 3) { - pop.text = "An STC Fragment has been located upon " + string(stah.name) + " " + string(num) + "; what it might contain is unknown. It appears to be located deep within a Mechanicus Vault. Taking it may be seen as an act of war. What is thy will?"; + if (own == eFACTION.Mechanicus) { + if (mch > 0) { + pop.text = $"An STC Fragment upon {stah.name} {num} appears to be located deep within a Mechanicus Vault. The present Tech Priests stress they will not condone a mission to steal the STC Fragment."; + pop.option1 = "Leave it."; + } else if (tch > 0) { + pop.text = $"An STC Fragment upon {stah.name} {num} appears to be located deep within a Mechanicus Vault. Taking it may be seen as an act of war. What is thy will?"; + // pop.option1 = "Attempt to steal the STC Fragment."; // TODO: Fix this option, as it crashes the game when the battle starts; + pop.option1 = "Leave it."; + } else { + pop.text = $"An STC Fragment upon {stah.name} {num} appears to be located deep within a Mechanicus Vault. Taking it may be seen as an act of war. The ground team has no Techmarines, so you have no choice but to leave it be."; + pop.option1 = "Leave it."; } - - own = stah.p_owner[num]; - pop.option1 = "Swiftly take the STC Fragment."; - pop.option2 = "Leave it."; - } - if ((tch > 0) && (mch > 0)) { - if (stah.p_owner[num] != 3) { - var pop, own; - pop = instance_create(0, 0, obj_popup); - pop.image = "stc"; - pop.title = "STC Fragment Located"; - // pop.text="An STC Fragment has been located upon "+string(stah.name)+" "+string(num)+". Your "+string(obj_ini.role[100][16])+"s and present Mechanicus Techpriests are bickering over what should be done with it. What is thy will?"; - - pop.text = "An STC Fragment has been located upon " + string(stah.name) + " " + string(num) + ". Your " + string(obj_ini.role[100][16]) + "s wish to reclaim, identify, and put it to use immediately, and the Tech Priests wish to send it to the closest forge world. What is thy will?"; - // if (stah.p_owner[num]=3) then pop.text="An STC Fragment has been located upon "+string(stah.name)+" "+string(num)+". It appears to be located deep within a Mechanicus Vault. The present Tech Priests warn that taking it will be seen as an act of war. What is thy will?"; - - own = stah.p_owner[num]; + } else { + if ((tch > 0) && (mch == 0)) { + pop.text = $"An STC Fragment has been located upon {stah.name} {num}; what it might contain is unknown. Your {obj_ini.role[100][16]}s wish to reclaim, identify, and put it to use immediately. What is thy will?"; pop.option1 = "Swiftly take the STC Fragment."; pop.option2 = "Leave it."; pop.option3 = "Send it to the Adeptus Mechanicus."; - } - } - if ((tch == 0) && (mch > 0)) { - if (stah.p_owner[num] != 3) { - var pop, own; - pop = instance_create(0, 0, obj_popup); - pop.image = "stc"; - pop.title = "STC Fragment Located"; - pop.text = "An STC Fragment has been located upon " + string(stah.name) + " " + string(num) + "; what it might contain is unknown. The present Tech Priests wish to send it to Mars, and refuse to take the device off-world otherwise."; - - own = stah.p_owner[num]; + } else if (tch > 0 && mch > 0) { + pop.text = $"An STC Fragment has been located upon {stah.name} {num}. Your {obj_ini.role[100][16]}s wish to reclaim, identify, and put it to use immediately, and the Tech Priests wish to send it to the closest forge world. What is thy will?"; + pop.option1 = "Swiftly take the STC Fragment."; + pop.option2 = "Leave it."; + pop.option3 = "Send it to the Adeptus Mechanicus."; + } else if (tch == 0 && mch > 0) { + pop.text = $"An STC Fragment has been located upon {stah.name} {num}; what it might contain is unknown. The present Tech Priests wish to send it to Mars, and refuse to take the device off-world otherwise."; + pop.option1 = "Leave it."; + pop.option2 = "Send it to the Adeptus Mechanicus."; + } else { + pop.text = $"An STC Fragment has been located upon {stah.name} {num}; what it might contain is unknown. The ground team has no {obj_ini.role[100][16]}s or Tech Priests, so you have no choice but to leave it be or notify the Mechanicus about its location."; pop.option1 = "Leave it."; pop.option2 = "Send it to the Adeptus Mechanicus."; } } - if ((mch > 0) && (stah.p_owner[num] == 3)) { - var pop, own; - pop = instance_create(0, 0, obj_popup); - pop.image = "stc"; - pop.title = "STC Fragment Located"; - pop.text = "An STC Fragment has been located upon " + string(stah.name) + " " + string(num) + ". It appears to be located deep within a Mechanicus Vault. The present Tech Priests stress they will not condone a mission to steal the STC Fragment."; - - own = stah.p_owner[num]; - - scr_return_ship(loc, id, num); - var man_size, ship_id, comp, plan, i; - i = 0; - ship_id = 0; - man_size = 0; - comp = 0; - plan = 0; - repeat (30) { - i += 1; - if (obj_ini.ship[i] == loc) { - ship_id = i; - } - } - i = 0; - obj_controller.menu = 0; - obj_controller.managing = 0; - obj_controller.cooldown = 10; - instance_destroy(); - exit; - - // pop.option1="Leave it."; - // get bitched at by the mechanicus - } - - pop.ma_co = tch; - pop.ma_id = mch; - pop.target_comp = stah.p_owner[num]; } - if (planet_feature_bool(stah.p_feature[num], P_features.Artifact) == 1) { - // Artifact is present - if ((stah.p_type[num] == "Dead") || (stah.p_owner[num] == 1)) { + if (planet_feature_bool(stah.p_feature[num], P_features.Artifact) == 1) { // Artifact is present + var own = stah.p_owner[num]; + + if ((stah.p_type[num] == "Dead") || (own == eFACTION.Player)) { alarm[4] = 1; exit; } - var pop, own; - pop = instance_create(0, 0, obj_popup); + var pop = instance_create(0, 0, obj_popup); pop.image = "artifact"; pop.title = "Artifact Located"; - pop.text = "The Artifact has been located upon " + string(stah.name) + " " + string(num) + "; its condition and class are unlikely to be determined until returned to the ship. What is thy will?"; - - own = stah.p_owner[num]; - - // show_message(own); + pop.text = $"The Artifact has been located upon {stah.name} {num}; its condition and class are unlikely to be determined until returned to the ship. What is thy will?"; + pop.target_comp = stah.p_owner[num]; if ((stah.p_first[num] == 3) && (stah.p_owner[num] > 5)) { if (stah.p_pdf[num] > 0) { - own = 3; + own = eFACTION.Mechanicus; } } pop.option1 = "Request audience with the "; - if (own == 1) { - pop.option1 += "Planetary Governor"; - pop.option3 = "Gift the Artifact to the Sector Commander."; - } - if (own == 2) { - pop.option1 += "Planetary Governor"; - pop.option3 = "Gift the Artifact to the Sector Commander."; - } - if (own == 3) { - pop.option1 += "Mechanicus"; - pop.option3 = "Let it be. The Mechanicus' wrath is not lightly provoked."; - } - if (own == 4) { - pop.option1 += "Inquisition"; - pop.option3 = "Let it be. The Inquisition's wrath is not lightly provoked."; - } - if (own == 5) { - pop.option1 += "Ecclesiarchy"; - pop.option3 = "Gift the Artifact to the Ecclesiarchy."; - } - if (own == 6) { - pop.option1 += "Eldar"; - pop.option3 = "Gift the Artifact to the Eldar."; - } - if (own == 8) { - pop.option1 += "Tau"; - pop.option3 = "Gift the Artifact to the Tau Empire."; + switch (own) { + case eFACTION.Player: + case eFACTION.Imperium: + pop.option1 += "Planetary Governor"; + pop.option3 = "Gift the Artifact to the Sector Commander."; + break; + case eFACTION.Mechanicus: + pop.option1 += "Mechanicus"; + pop.option3 = "Let it be. The Mechanicus' wrath is not lightly provoked."; + break; + case eFACTION.Inquisition: + pop.option1 += "Inquisition"; + pop.option3 = "Let it be. The Inquisition's wrath is not lightly provoked."; + break; + case eFACTION.Ecclesiarchy: + pop.option1 += "Ecclesiarchy"; + pop.option3 = "Gift the Artifact to the Ecclesiarchy."; + break; + case eFACTION.Eldar: + pop.option1 += "Eldar"; + pop.option3 = "Gift the Artifact to the Eldar."; + break; + case eFACTION.Tau: + pop.option1 += "Tau"; + pop.option3 = "Gift the Artifact to the Tau Empire."; + break; } - pop.option1 += " regarding the Artifact."; - pop.option2 = "Swiftly take the Artifact."; - pop.target_comp = stah.p_owner[num]; - - if ((own >= 9) || ((own == 7) && (stah.p_pdf[num] <= 0))) { + if ((own >= eFACTION.Tyranids) || ((own == eFACTION.Ork) && (stah.p_pdf[num] <= 0))) { pop.option1 = "Swiftly take the Artifact."; pop.option2 = "Let it be."; pop.option3 = ""; + } else { + pop.option1 += " regarding the Artifact."; + pop.option2 = "Swiftly take the Artifact."; } - - // show_message(string(pop.option1)+"/"+string(pop.option2)+"/"+string(pop.option3)); - - /*if (pop.option1=""){ - pop.option1="Swiftly take the Artifact."; - pop.option2="Let it be."; - pop.option3=""; - }*/ } } - -/* */ -/* */ diff --git a/objects/obj_ground_mission/Alarm_5.gml b/objects/obj_ground_mission/Alarm_5.gml index 4658f51989..ea06f43fbc 100644 --- a/objects/obj_ground_mission/Alarm_5.gml +++ b/objects/obj_ground_mission/Alarm_5.gml @@ -101,7 +101,7 @@ if (scr_has_adv("Tech-Scavengers")){ with(obj_star_select){instance_destroy();} with(obj_fleet_select){instance_destroy();} - delete_features(plan.p_feature[num], P_features.STC_Fragment); +delete_features(plan.p_feature[num], P_features.STC_Fragment); scr_add_stc_fragment();// STC here diff --git a/objects/obj_ground_mission/Alarm_6.gml b/objects/obj_ground_mission/Alarm_6.gml index 15c49db1db..bc7d00ded3 100644 --- a/objects/obj_ground_mission/Alarm_6.gml +++ b/objects/obj_ground_mission/Alarm_6.gml @@ -1,9 +1,6 @@ -var comp, plan, i; -i = 0; -comp = 0; -plan = 0; -plan = instance_nearest(x, y, obj_star); -delete_features(plan.p_feature[num], P_features.Artifact); +var _target_planet; +_target_planet = instance_nearest(x, y, obj_star); +delete_features(_target_planet.p_feature[num], P_features.Artifact); scr_return_ship(loc, self, num); @@ -44,7 +41,7 @@ with (obj_temp7) { if (obj_ini.fleet_type == ePlayerBase.home_world) { with (obj_star) { - if ((owner == eFACTION.Player) && ((p_owner[1] == 1) || (p_owner[2] == 1))) { + if ((owner == eFACTION.Player) && ((p_owner[1] == 1) || (p_owner[2] == eFACTION.Player))) { instance_create(x, y, obj_temp2); } } @@ -69,16 +66,16 @@ if (obj_ini.fleet_type != ePlayerBase.home_world) { } } -var flit, i, chasing; -chasing = 0; // Set target -var targ; + +var _enemy_fleet; +var _target = -1; + if (instance_exists(obj_temp2)) { - targ = nearest_star_with_ownership(obj_temp2.x, obj_temp2.y, obj_controller.diplomacy); + _target = nearest_star_with_ownership(obj_temp2.x, obj_temp2.y, obj_controller.diplomacy); } else if (instance_exists(obj_temp7)) { - targ = nearest_star_with_ownership(obj_temp7.x, obj_temp7.y, obj_controller.diplomacy); + _target = nearest_star_with_ownership(obj_temp7.x, obj_temp7.y, obj_controller.diplomacy); } else if ((!instance_exists(obj_temp2)) && (!instance_exists(obj_temp7)) && instance_exists(obj_p_fleet) && (obj_ini.fleet_type == ePlayerBase.home_world)) { // If player fleet is flying about then get their target for new target - chasing = 1; with (obj_p_fleet) { var pop; if ((capital_number > 0) && (action != "")) { @@ -92,36 +89,38 @@ if (instance_exists(obj_temp2)) { } } -flit = instance_create(targ.x, targ.y, obj_en_fleet); +if (is_struct(_target)) { + _enemy_fleet = instance_create(_target.x, _target.y, obj_en_fleet); -flit.owner = obj_controller.diplomacy; -flit.home_x = targ.x; -flit.home_y = targ.y; -flit.sprite_index = spr_fleet_mechanicus; + _enemy_fleet.owner = obj_controller.diplomacy; + _enemy_fleet.home_x = _target.x; + _enemy_fleet.home_y = _target.y; + _enemy_fleet.sprite_index = spr_fleet_mechanicus; -flit.image_index = 0; -flit.capital_number = 1; -flit.trade_goods = "Requisition!500!|"; + _enemy_fleet.image_index = 0; + _enemy_fleet.capital_number = 1; + _enemy_fleet.trade_goods = "Requisition!500!|"; -if (obj_ini.fleet_type != ePlayerBase.home_world) { - if (instance_exists(obj_temp2)) { - flit.action_x = obj_temp2.x; - flit.action_y = obj_temp2.y; - flit.target = instance_nearest(flit.action_x, flit.action_y, obj_p_fleet); + if (obj_ini.fleet_type != ePlayerBase.home_world) { + if (instance_exists(obj_temp2)) { + _enemy_fleet.action_x = obj_temp2.x; + _enemy_fleet.action_y = obj_temp2.y; + _enemy_fleet.target = instance_nearest(_enemy_fleet.action_x, _enemy_fleet.action_y, obj_p_fleet); + } + if ((!instance_exists(obj_temp2)) && instance_exists(obj_temp7)) { + _enemy_fleet.action_x = obj_temp7.x; + _enemy_fleet.action_y = obj_temp7.y; + _enemy_fleet.target = instance_nearest(_enemy_fleet.action_x, _enemy_fleet.action_y, obj_p_fleet); + } } - if ((!instance_exists(obj_temp2)) && instance_exists(obj_temp7)) { - flit.action_x = obj_temp7.x; - flit.action_y = obj_temp7.y; - flit.target = instance_nearest(flit.action_x, flit.action_y, obj_p_fleet); + if (obj_ini.fleet_type == ePlayerBase.home_world) { + _target = instance_nearest(_enemy_fleet.x, _enemy_fleet.y, obj_temp2); + _enemy_fleet.action_x = _target.x; + _enemy_fleet.action_y = _target.y; } -} -if (obj_ini.fleet_type == ePlayerBase.home_world) { - targ = instance_nearest(flit.x, flit.y, obj_temp2); - flit.action_x = targ.x; - flit.action_y = targ.y; -} -flit.alarm[4] = 1; + _enemy_fleet.alarm[4] = 1; +} instance_activate_all(); with (obj_temp2) { diff --git a/objects/obj_popup/Step_0.gml b/objects/obj_popup/Step_0.gml index d0b0c70ec3..a3ae8248ef 100644 --- a/objects/obj_popup/Step_0.gml +++ b/objects/obj_popup/Step_0.gml @@ -788,118 +788,23 @@ try { } } - if (image == "stc") { - if ((ma_co > 0) && (ma_id == 0)) { - if (press == 1) { - obj_ground_mission.alarm[5] = 1; - obj_controller.cooldown = 10; - instance_destroy(); - } - if (press == 2) { - scr_return_ship(obj_ground_mission.loc, obj_ground_mission, obj_ground_mission.num); - var man_size, ship_id, comp, plan, i; - ship_id = 0; - man_size = 0; - comp = 0; - plan = 0; - ship_id = array_get_index(obj_ini.ship, obj_ground_mission.loc); - obj_controller.menu = 0; - obj_controller.managing = 0; - obj_controller.cooldown = 10; - with (obj_ground_mission) { - instance_destroy(); - } - instance_destroy(); - exit; - } - if (press == 3) { - exit; - } - } else if ((ma_co > 0) && (ma_id > 0)) { - if (press == 1) { - obj_ground_mission.alarm[5] = 1; - obj_controller.cooldown = 10; - instance_destroy(); - } - if (press == 2) { - scr_return_ship(obj_ground_mission.loc, obj_ground_mission, obj_ground_mission.num); - var man_size, ship_id, comp, plan, i; - i = 0; - ship_id = 0; - man_size = 0; - comp = 0; - plan = 0; - - ship_id = array_get_index(obj_ini.ship, obj_ground_mission.loc); - - obj_controller.menu = 0; - obj_controller.managing = 0; - obj_controller.cooldown = 10; - with (obj_ground_mission) { - instance_destroy(); - } - instance_destroy(); - exit; - } - if (press == 3) { - obj_ground_mission.alarm[6] = 1; - obj_controller.cooldown = 10; - instance_destroy(); - } - } else if ((ma_co == 0) && (ma_id > 0) && (target_comp != 3)) { - if (press == 1) { - scr_return_ship(obj_ground_mission.loc, obj_ground_mission, obj_ground_mission.num); - var man_size, ship_id, comp, plan, i; - i = 0; - ship_id = 0; - man_size = 0; - comp = 0; - plan = 0; - ship_id = array_get_index(obj_ini.ship, obj_ground_mission.loc); - obj_controller.menu = 0; - obj_controller.managing = 0; - obj_controller.cooldown = 10; - with (obj_ground_mission) { - instance_destroy(); - } - instance_destroy(); - exit; - } - if (press == 2) { - obj_ground_mission.alarm[6] = 1; - obj_controller.cooldown = 10; - instance_destroy(); - } - if (press == 3) { - exit; - } - } - if ((ma_id > 0) && (target_comp == 3)) { - if (press == 1) { - scr_return_ship(obj_ground_mission.loc, obj_ground_mission, obj_ground_mission.num); - var man_size, ship_id, comp, plan, i; - i = 0; - ship_id = 0; - man_size = 0; - comp = 0; - plan = 0; - ship_id = array_get_index(obj_ini.ship, obj_ground_mission.loc); - obj_controller.menu = 0; - obj_controller.managing = 0; - obj_controller.cooldown = 10; - with (obj_ground_mission) { - instance_destroy(); - } + if (image == "stc" && press > 0) { + var _option_picked = $"option{press}"; + _option_picked = self[$ _option_picked]; + + if (string_count("take the STC", _option_picked) || string_count("steal the STC", _option_picked)) { + obj_ground_mission.alarm[5] = 1; + } else if (string_count("Leave it", _option_picked)) { + scr_return_ship(0, obj_ground_mission, obj_ground_mission.num); + with (obj_ground_mission) { instance_destroy(); - exit; - } - if (press == 2) { - exit; - } - if (press == 3) { - exit; } + } else if (string_count("to the Adeptus Mechanicus", _option_picked)) { + obj_ground_mission.alarm[6] = 1; } + + instance_destroy(); + exit; } if (type == 6) { diff --git a/scripts/scr_cheatcode/scr_cheatcode.gml b/scripts/scr_cheatcode/scr_cheatcode.gml index 1e3b223020..02d527282c 100644 --- a/scripts/scr_cheatcode/scr_cheatcode.gml +++ b/scripts/scr_cheatcode/scr_cheatcode.gml @@ -192,7 +192,14 @@ function scr_cheatcode(argument0) { array_push(p_feature[i], new NewPlanetFeature(P_features.Ancient_Ruins)); } } - break; + break; + case "stcpopulate": + with (obj_star) { + for (var i = 1; i <= planets; i++) { + array_push(p_feature[i], new NewPlanetFeature(P_features.STC_Fragment)); + } + } + break; case "event": if (cheat_arguments[0] == "crusade") { show_debug_message("crusading"); diff --git a/scripts/scr_unit_quick_find_pane/scr_unit_quick_find_pane.gml b/scripts/scr_unit_quick_find_pane/scr_unit_quick_find_pane.gml index c8229ff8a5..7d51fdad78 100644 --- a/scripts/scr_unit_quick_find_pane/scr_unit_quick_find_pane.gml +++ b/scripts/scr_unit_quick_find_pane/scr_unit_quick_find_pane.gml @@ -905,20 +905,18 @@ function planet_selection_action(){ } } } - if (tch+mch>0){ - var arti=instance_create(target.x,target.y,obj_ground_mission);// Unloading / artifact crap - arti.num=sel_plan; - arti.alarm[0]=1; - arti.loc=obj_controller.selecting_location; - arti.managing=obj_controller.managing; - arti.tch=tch; - arti.mch=mch; - // Right here should pass the man_sel variables - // var frag;frag=-1;repeat(150){frag+=1;arti.man_sel[frag]=obj_controller.man_sel[frag];} - with (arti){ - setup_planet_mission_group(); - } - } + var arti=instance_create(target.x,target.y,obj_ground_mission);// Unloading / artifact crap + arti.num=sel_plan; + arti.alarm[0]=1; + arti.loc=obj_controller.selecting_location; + arti.managing=obj_controller.managing; + arti.tch=tch; + arti.mch=mch; + // Right here should pass the man_sel variables + // var frag;frag=-1;repeat(150){frag+=1;arti.man_sel[frag]=obj_controller.man_sel[frag];} + with (arti){ + setup_planet_mission_group(); + } } // Ancient Ruins From a71cee2e0249219449a7959a647e1699f084c04f Mon Sep 17 00:00:00 2001 From: Nelsonh <81228864+OH296@users.noreply.github.com> Date: Sun, 25 May 2025 23:28:52 +0100 Subject: [PATCH 058/286] fix: Fleet_Select create index array error (#840) --- objects/obj_fleet_select/Create_0.gml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/objects/obj_fleet_select/Create_0.gml b/objects/obj_fleet_select/Create_0.gml index 7483d4d642..3718683c2d 100644 --- a/objects/obj_fleet_select/Create_0.gml +++ b/objects/obj_fleet_select/Create_0.gml @@ -148,7 +148,7 @@ selection_window.inside_method = function(){ colu++; }*/ - if (posi<=escorts+frigates+capitals) && is_array(ship_type){ + if (posi<=escorts+frigates+capitals) && is_array(ship_type) && current_ship179){ for (var i=0;i<9;i++){ From 162005605d1c6dfe9e070a13ede4f0f444e5be02 Mon Sep 17 00:00:00 2001 From: Nelsonh <81228864+OH296@users.noreply.github.com> Date: Mon, 26 May 2025 00:18:14 +0100 Subject: [PATCH 059/286] fix: Various waaagh related issues (#839) Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com> --- ChapterMaster.yyp | 9 +- objects/obj_en_fleet/Draw_0.gml | 19 +- scripts/scr_PlanetData/scr_PlanetData.gml | 4 +- scripts/scr_cheatcode/scr_cheatcode.gml | 3 + scripts/scr_enemy_ai_e/scr_enemy_ai_e.gml | 29 ++- .../scr_fleet_functions.gml | 31 +-- .../scr_ork_fleet_functions.gml | 196 +++++++++++++++--- .../scr_planetary_feature.gml | 1 + .../scr_star_ownership/scr_star_ownership.gml | 2 +- .../scr_system_search_helpers.gml | 20 +- scripts/scr_turn_first/scr_turn_first.gml | 118 ++--------- sprites/spr_da_backpack/spr_da_backpack.yy | 2 + .../spr_faction_icons/spr_faction_icons.yy | 2 + .../spr_indomitus_backpack_variants.yy | 2 + sprites/spr_mk3_complex/spr_mk3_complex.yy | 2 + .../spr_mk3_complex_backpack.yy | 2 + .../spr_mk4_complex_backpack.yy | 2 + .../spr_psy_hood_complex.yy | 2 + sprites/spr_ship_bb/spr_ship_bb.yy | 2 + sprites/spr_ship_hunt/spr_ship_hunt.yy | 7 +- sprites/spr_ship_song/spr_ship_song.yy | 2 + sprites/spr_ship_stri/spr_ship_stri.yy | 7 +- .../spr_ultra_backpack/spr_ultra_backpack.yy | 2 + 23 files changed, 298 insertions(+), 168 deletions(-) diff --git a/ChapterMaster.yyp b/ChapterMaster.yyp index adc4282c28..af3d77c6b6 100644 --- a/ChapterMaster.yyp +++ b/ChapterMaster.yyp @@ -131,9 +131,8 @@ {"$GMIncludedFile":"","%Name":"blood_angels.png","CopyToMask":-1,"filePath":"datafiles/images/creation/chapters/icons","name":"blood_angels.png","resourceType":"GMIncludedFile","resourceVersion":"2.0",}, {"$GMIncludedFile":"","%Name":"blood_ravens.png","CopyToMask":-1,"filePath":"datafiles/images/creation/chapters/icons","name":"blood_ravens.png","resourceType":"GMIncludedFile","resourceVersion":"2.0",}, {"$GMIncludedFile":"","%Name":"carcharodons.png","CopyToMask":-1,"filePath":"datafiles/images/creation/chapters/icons","name":"carcharodons.png","resourceType":"GMIncludedFile","resourceVersion":"2.0",}, - {"$GMIncludedFile":"","%Name":"consecrators.png","CopyToMask":-1,"filePath":"datafiles/images/creation/chapters/icons","name":"consecrators.png","resourceType":"GMIncludedFile","resourceVersion":"2.0",}, - {"$GMIncludedFile":"","%Name":"celestial_lions.png","CopyToMask":-1,"filePath":"datafiles/images/creation/chapters/icons","name":"celestial_lions.png","resourceType":"GMIncludedFile","resourceVersion":"2.0",}, + {"$GMIncludedFile":"","%Name":"consecrators.png","CopyToMask":-1,"filePath":"datafiles/images/creation/chapters/icons","name":"consecrators.png","resourceType":"GMIncludedFile","resourceVersion":"2.0",}, {"$GMIncludedFile":"","%Name":"conservators.png","CopyToMask":-1,"filePath":"datafiles/images/creation/chapters/icons","name":"conservators.png","resourceType":"GMIncludedFile","resourceVersion":"2.0",}, {"$GMIncludedFile":"","%Name":"crimson_fists.png","CopyToMask":-1,"filePath":"datafiles/images/creation/chapters/icons","name":"crimson_fists.png","resourceType":"GMIncludedFile","resourceVersion":"2.0",}, {"$GMIncludedFile":"","%Name":"dark_angels.png","CopyToMask":-1,"filePath":"datafiles/images/creation/chapters/icons","name":"dark_angels.png","resourceType":"GMIncludedFile","resourceVersion":"2.0",}, @@ -521,11 +520,9 @@ {"$GMIncludedFile":"","%Name":"32.JSON","CopyToMask":-1,"filePath":"datafiles/main/chapters","name":"32.JSON","resourceType":"GMIncludedFile","resourceVersion":"2.0",}, {"$GMIncludedFile":"","%Name":"33.json","CopyToMask":-1,"filePath":"datafiles/main/chapters","name":"33.json","resourceType":"GMIncludedFile","resourceVersion":"2.0",}, {"$GMIncludedFile":"","%Name":"34.json","CopyToMask":-1,"filePath":"datafiles/main/chapters","name":"34.json","resourceType":"GMIncludedFile","resourceVersion":"2.0",}, - - {"$GMIncludedFile":"","%Name":"37.json","CopyToMask":-1,"filePath":"datafiles/main/chapters","name":"37.json","resourceType":"GMIncludedFile","resourceVersion":"2.0",}, - - {"$GMIncludedFile":"","%Name":"36.json","CopyToMask":-1,"filePath":"datafiles/main/chapters","name":"36.json","resourceType":"GMIncludedFile","resourceVersion":"2.0",}, {"$GMIncludedFile":"","%Name":"35.json","CopyToMask":-1,"filePath":"datafiles/main/chapters","name":"35.json","resourceType":"GMIncludedFile","resourceVersion":"2.0",}, + {"$GMIncludedFile":"","%Name":"36.json","CopyToMask":-1,"filePath":"datafiles/main/chapters","name":"36.json","resourceType":"GMIncludedFile","resourceVersion":"2.0",}, + {"$GMIncludedFile":"","%Name":"37.json","CopyToMask":-1,"filePath":"datafiles/main/chapters","name":"37.json","resourceType":"GMIncludedFile","resourceVersion":"2.0",}, {"$GMIncludedFile":"","%Name":"4.JSON","CopyToMask":-1,"filePath":"datafiles/main/chapters","name":"4.JSON","resourceType":"GMIncludedFile","resourceVersion":"2.0",}, {"$GMIncludedFile":"","%Name":"5.JSON","CopyToMask":-1,"filePath":"datafiles/main/chapters","name":"5.JSON","resourceType":"GMIncludedFile","resourceVersion":"2.0",}, {"$GMIncludedFile":"","%Name":"6.JSON","CopyToMask":-1,"filePath":"datafiles/main/chapters","name":"6.JSON","resourceType":"GMIncludedFile","resourceVersion":"2.0",}, diff --git a/objects/obj_en_fleet/Draw_0.gml b/objects/obj_en_fleet/Draw_0.gml index dbc8a81ae4..cd13719538 100644 --- a/objects/obj_en_fleet/Draw_0.gml +++ b/objects/obj_en_fleet/Draw_0.gml @@ -5,7 +5,7 @@ if (owner = eFACTION.Eldar) and (instance_exists(orbiting)) and (obj_controller. draw_set_color(c_red); draw_line_width(x,y,orbiting.x,orbiting.y,1); } - +var draw_icon = false; if (x<0) or (x>room_width) or (y<0) or (y>room_height) then exit; if (image_alpha=0) then exit; @@ -57,6 +57,14 @@ if (action!=""){ if (obj_controller.zoomed=0) then draw_text_transformed(x+12,y,string_hash_to_newline("ETA "+string(action_eta)),1,1,0); if (obj_controller.zoomed=1) then draw_text_transformed(x+24,y,string_hash_to_newline("ETA "+string(action_eta)),2,2,0);// was 1.4 } +switch(owner){ + case eFACTION.Ork: + var _has_warboss =false; + if (fleet_has_cargo("ork_warboss")){ + draw_icon = true; + _has_warboss = true; + } +} var fleet_descript=""; if (within=1) or (selected>0){ @@ -92,6 +100,10 @@ if (within=1) or (selected>0){ break; case eFACTION.Ork: fleet_descript="Ork Fleet"; + if (_has_warboss){ + var _warboss = cargo_data.ork_warboss; + fleet_descript += $"\nWarboss {_warboss.name}" + } break; case eFACTION.Tau: fleet_descript="Tau Fleet"; @@ -124,7 +136,7 @@ if (within=1) or (selected>0){ } if (fleet_descript!="" && within){ - draw_text_transformed(x+(coords[0]*scale),y+((coords[1])*scale+(12*scale)),string_hash_to_newline(fleet_descript),1*scale,1*scale,0); + tooltip_draw(fleet_descript); draw_circle(x+(coords[0]*scale),y+(coords[1])*scale,12*scale,0); } else { var faction_colour = global.star_name_colors[owner]; @@ -133,6 +145,9 @@ if (fleet_descript!="" && within){ draw_circle(x+(coords[0]*scale),y+(coords[1])*scale,12*scale,0); draw_set_alpha(1); } +if (draw_icon){ + draw_sprite_ext(spr_faction_icons, owner,x+(coords[0]*scale)-(32*scale),y+(coords[1]*scale)-(32*scale),1*scale,1*scale,0,c_white,1) +} draw_sprite_ext(sprite_index,image_index,x+(coords[0]*scale),y+(coords[1]*scale),1*scale,1*scale,0,c_white,1); diff --git a/scripts/scr_PlanetData/scr_PlanetData.gml b/scripts/scr_PlanetData/scr_PlanetData.gml index 6e28a41604..54ae324feb 100644 --- a/scripts/scr_PlanetData/scr_PlanetData.gml +++ b/scripts/scr_PlanetData/scr_PlanetData.gml @@ -359,8 +359,8 @@ function PlanetData(planet, system) constructor{ _warboss.turns_static = 0; _ork_fleet.cargo_data.ork_warboss = _warboss; delete_feature(P_features.OrkWarboss); - if (!_warboss.player_hidden){ - scr_alert("red","ork",$"{obj_controller.faction_leader[0]} departs {name()} as his waaagh gains momentum",0,0); + if (!_warboss.player_hidden || !irandom(5)){ + scr_alert("red","ork",$"{_warboss.name} departs {name()} as his waaagh gains momentum",0,0); } } } diff --git a/scripts/scr_cheatcode/scr_cheatcode.gml b/scripts/scr_cheatcode/scr_cheatcode.gml index 02d527282c..1e0dd52e6a 100644 --- a/scripts/scr_cheatcode/scr_cheatcode.gml +++ b/scripts/scr_cheatcode/scr_cheatcode.gml @@ -353,6 +353,9 @@ function scr_cheatcode(argument0) { case "zoom": set_zoom_to_default(); break; + case "orkinvasion": + out_of_system_warboss(); + break; } } diff --git a/scripts/scr_enemy_ai_e/scr_enemy_ai_e.gml b/scripts/scr_enemy_ai_e/scr_enemy_ai_e.gml index 8914c6fe70..e600b40464 100644 --- a/scripts/scr_enemy_ai_e/scr_enemy_ai_e.gml +++ b/scripts/scr_enemy_ai_e/scr_enemy_ai_e.gml @@ -101,19 +101,32 @@ function scr_enemy_ai_e() { if (present_fleet[f] > 0) { obj_controller.temp[1049] = self.id; obj_controller.temp[1050] = f; - + var _orbiting = self.id; + var _wanted_owner = f; + var fleet_strength = 0; with(obj_en_fleet) { - if (orbiting = obj_controller.temp[1049]) and(owner = obj_controller.temp[1050]) { - obj_controller.temp[1051] = self.escort_number + (self.frigate_number * 4) + (self.capital_number * 8); + if (orbiting = _orbiting) and(owner = _wanted_owner) { + fleet_strength = self.escort_number + (self.frigate_number * 4) + (self.capital_number * 8); + if (owner == fleet_has_cargo("ork_warboss")){ + fleet_strength*=1.5; + } } } - strength[f] = obj_controller.temp[1051]; + strength[f] = fleet_strength; - if (f = 7) and(strength[7] > 0) then strength[f] = strength[f] * 0.8; - if (f = 9) and(strength[9] > 0) then strength[f] = strength[f] * 1.1; - if (f = 10) and(strength[10] > 0) then strength[f] = strength[f] * 1.1; - if (f = 11) and(strength[13] > 0) then strength[13] = strength[13] * 2; + if (f = 7) and(strength[7] > 0){ + strength[f] = strength[f] * 0.8; + } + else if (f = 9) and(strength[9] > 0){ + strength[f] = strength[f] * 1.1; + } + else if (f = 10) and(strength[10] > 0){ + strength[f] = strength[f] * 1.1; + } + else if (f = 11) and(strength[13] > 0){ + strength[13] = strength[13] * 2; + } // if (f=10) or (f=2) then show_message("["+string(f)+"] Fleet strength: "+string(strength[f])); diff --git a/scripts/scr_fleet_functions/scr_fleet_functions.gml b/scripts/scr_fleet_functions/scr_fleet_functions.gml index 808340945b..ec8a7501a9 100644 --- a/scripts/scr_fleet_functions/scr_fleet_functions.gml +++ b/scripts/scr_fleet_functions/scr_fleet_functions.gml @@ -388,6 +388,7 @@ function scr_orbiting_fleet(faction, system="none"){ } if (_valid && action == ""){ _found_fleet = id; + break; } } } @@ -835,7 +836,11 @@ function fleet_arrival_logic(){ var stue, stue2;stue=0;stue2=0; var goood=0; - with(obj_star){if (planets=1) and (p_type[1]="Dead") then instance_deactivate_object(id);} + with(obj_star){ + if (is_dead_star()){ + instance_deactivate_object(id); + } + } stue=instance_nearest(x,y,obj_star); instance_deactivate_object(stue); repeat(10){ @@ -850,7 +855,7 @@ function fleet_arrival_logic(){ } action_x=stue2.x; action_y=stue2.y; - alarm[4]=1;// stue.present_fleets-=1; + set_fleet_movement();// stue.present_fleets-=1; instance_activate_object(obj_star); } @@ -862,26 +867,26 @@ function fleet_arrival_logic(){ // If the connected planet is owned by orks then choose a random one within 400 not owned by orks - if (owner = eFACTION.Ork){ + if (owner == eFACTION.Ork){ if (is_orbiting()){ with (orbiting){ ork_fleet_arrive_target(); } } - var kay, temp5, temp6, temp7; - kay=0;temp5=0;temp6=0;temp7=0; + + var kay=0,temp5=0,temp6=0,temp7=0; var cur_star=instance_nearest(x,y,obj_star); // This is the new check to go along code; if doesn't add up to all planets = 7 then they exit - if (!is_dead_star(cur_star)) then kay=5; - - if (kay=5){// KILL the enemy - if (cur_star.present_fleet[1]>1) or (cur_star.present_fleet[2]>1) then exit; + if (!is_dead_star(cur_star)){// KILL the enemy + if (cur_star.present_fleet[1]>1) or (cur_star.present_fleet[2]>1) then exit; } - if ((cur_star.owner = eFACTION.Chaos) and (image_index>=5) and (owner = eFACTION.Chaos)) or ((owner = eFACTION.Chaos) and (image_index>=5) and (cur_star.planets=0)) then kay=50; + if ((cur_star.owner = eFACTION.Chaos) and (image_index>=5) and (owner = eFACTION.Chaos)) or ((owner = eFACTION.Chaos) and (image_index>=5) and (cur_star.planets=0)){ + kay=50; + } if (kay=50){ @@ -889,7 +894,8 @@ function fleet_arrival_logic(){ repeat(20){ if (kay=50){ - temp5=x+choose(random(300),random(300)*-1);temp6=y+choose(random(300),random(300)*-1); + temp5=x+choose(random(300),random(300)*-1); + temp6=y+choose(random(300),random(300)*-1); temp7=instance_nearest(temp5,temp6,obj_star); if (owner = eFACTION.Ork) and (temp7.owner != eFACTION.Ork) and (temp7.planets>0) and (temp7.image_alpha>=1) then kay=55; @@ -901,7 +907,7 @@ function fleet_arrival_logic(){ if (kay=55) and (instance_exists(temp7)){ action_x=temp7.x; action_y=temp7.y; - alarm[4]=1; + set_fleet_movement(); // cur_star.present_fleets-=1; } @@ -914,7 +920,6 @@ function fleet_arrival_logic(){ } - exit;// end of eta=0 } diff --git a/scripts/scr_ork_fleet_functions/scr_ork_fleet_functions.gml b/scripts/scr_ork_fleet_functions/scr_ork_fleet_functions.gml index 02ecad1f54..bc256e013e 100644 --- a/scripts/scr_ork_fleet_functions/scr_ork_fleet_functions.gml +++ b/scripts/scr_ork_fleet_functions/scr_ork_fleet_functions.gml @@ -8,7 +8,12 @@ function new_ork_fleet(xx,yy){ fleet.image_index=1; fleet.capital_number = 1; fleet.frigate_number = 1 - present_fleet[7] = 1; + if (!is_struct(self)){ + if (object_index == obj_star){ + present_fleet[7] = 1; + } + } + return fleet; } function orks_end_turn_growth(){ @@ -60,57 +65,77 @@ function ork_fleet_arrive_target(){ var aler=0; var _imperial_ship = scr_orbiting_fleet([eFACTION.Player, eFACTION.Imperium]); - if (_imperial_ship == "none" && _ork_fleet!="none" && planets>0){ + if (_imperial_ship == "none" && planets>0){ var _allow_landing=true,ork_attack_planet=0,l=0; - + var _planets = shuffled_planet_array(); + var i=-1 repeat(planets){ - l+=1; - if (ork_attack_planet=0) and (p_tyranids[l]>0) then ork_attack_planet=l; - } - if (ork_attack_planet>0) then p_tyranids[ork_attack_planet]-=_ork_fleet.capital_number+(_ork_fleet.frigate_number/2); - - var _pdata = new PlanetData(ork_attack_planet, self); - - //generate refugee ships to spread tyranids - if (p_tyranids[ork_attack_planet]<=0){ - if (planet_feature_bool(p_feature[ork_attack_planet], P_features.Gene_Stealer_Cult)){ - _pdata.delete_feature(P_features.Gene_Stealer_Cult); - adjust_influence(eFACTION.Tyranids, -25, ork_attack_planet); - var nearest_imperial = nearest_star_with_ownership(x,y,eFACTION.Imperium, self.id); - if (nearest_imperial != "none"){ - var targ_planet = scr_get_planet_with_owner(nearest_imperial,eFACTION.Imperium); - if (targ_planet==-1) then targ_planet = irandom_range(1, nearest_imperial.planets); - _pdata.send_colony_ship(nearest_imperial.id, targ_planet, "refugee"); + i++; + l = _planets[i]; + if (ork_attack_planet=0) and (p_tyranids[l]>0){ + ork_attack_planet=l; + break; + } + } + if (ork_attack_planet>0){ + p_tyranids[ork_attack_planet]-=floor(_ork_fleet.capital_number+(_ork_fleet.frigate_number/2)); + + var _pdata = new PlanetData(ork_attack_planet, self); + + //generate refugee ships to spread tyranids + if (p_tyranids[ork_attack_planet]<=0){ + if (planet_feature_bool(p_feature[ork_attack_planet], P_features.Gene_Stealer_Cult)){ + _pdata.delete_feature(P_features.Gene_Stealer_Cult); + adjust_influence(eFACTION.Tyranids, -25, ork_attack_planet); + var nearest_imperial = nearest_star_with_ownership(x,y,eFACTION.Imperium, self.id); + if (nearest_imperial != "none"){ + var targ_planet = scr_get_planet_with_owner(nearest_imperial,eFACTION.Imperium); + if (targ_planet==-1){ + targ_planet = irandom_range(1, nearest_imperial.planets); + } + _pdata.send_colony_ship(nearest_imperial.id, targ_planet, "refugee"); + } } } } _allow_landing = !is_dead_star(); if (_allow_landing){ - for (var i=1;i<=planets;i++){ - if ((p_guardsmen[i]+p_pdf[i]+p_player[i]+p_traitors[i]+p_tau[i]>0) or ((p_owner[i]!=7) and (p_orks[i]<=0))){ - if (p_type[i]!="Dead") and (p_orks[i]<4) and (i<=planets) and (instance_exists(_ork_fleet)){ - p_orks[i]+=max(2,floor(_ork_fleet.image_index*0.8)); + for (var i=0;i0) or ((p_owner[_planet]!=7) and (p_orks[_planet]<=0))){ + if (p_type[_planet]!="Dead") and (p_orks[_planet]<4) and (i<=planets){ + p_orks[_planet]+=max(2,floor(_ork_fleet.image_index*0.8)); + var _fleet_persists = false if (fleet_has_cargo("ork_warboss",_ork_fleet)){ - array_push(p_feature[i], _ork_fleet.cargo_data.ork_warboss); - p_orks[i]=6; + array_push(p_feature[_planet], _ork_fleet.cargo_data.ork_warboss); + p_orks[_planet]=6; + struct_remove(_ork_fleet.cargo_data,"ork_warboss"); + _fleet_persists = true; } - if (p_orks[i]>6) then p_orks[i]=6; - with(_ork_fleet){ - instance_destroy(); + if (p_orks[_planet]>6) then p_orks[_planet]=6; + if (!_fleet_persists){ + with (_ork_fleet){ + instance_destroy(); + } } aler=1; + break; } } } } if (aler>0){ - scr_alert("green","owner",$"Ork ships have crashed across the {name} system.",x,y); + if (!_fleet_persists){ + scr_alert("green","owner",$"Ork ships have crashed across the {name} system.",x,y); + } else { + scr_alert("green","owner",$"Ork ships Spill their ravenouss hordes accross {name} system and the green skin captains turn their guns towards the surface.",x,y); + } } else { var new_wagh_star = distance_removed_star(x,y, choose(2,3,4,5)); if (instance_exists(new_wagh_star)){ @@ -182,7 +207,7 @@ function init_ork_waagh(overide = false){ var _waaagh_star = array_random_element(ork_waagh_activity); - } else { + } else if (array_length(_any_ork_star) > 0) { var _waaagh_star = array_random_element(_any_ork_star); } var _pdata = new PlanetData(_waaagh_star[1], _waaagh_star[0]); @@ -199,3 +224,112 @@ function init_ork_waagh(overide = false){ } } +function out_of_system_warboss(){ + + with (obj_controller){ + // More Testing + // peace_check=2; + + var did_so=false; + + if (did_so=false)&& (faction_defeated[7]=1 || known[eFACTION.Ork]== 0 ) { + known[eFACTION.Ork] = 0; + var _warboss = new NewPlanetFeature(P_features.OrkWarboss); + if (faction_defeated[7]=1){ + with(obj_turn_end){ + audiences+=1; + audien[audiences] = 7; + known[eFACTION.Chaos] = 2; + audien_topic[audiences] = "new_warboss"; + did_so=true; + } + faction_defeated[7] =-1; + faction_leader[eFACTION.Ork] = _warboss.name; + faction_title[7]="Warboss"; + faction_status[eFACTION.Ork]="War"; + disposition[7]=-40; + } else { + known[eFACTION.Ork] = 0.5; + } + + + var gold=faction_gender[7]; + if (gold=0) then gold=1; + var gnew=0; + repeat(20){ + if (gnew=0 || gnew=gold){ + gnew=choose(1,2,3,4); + } + } + faction_gender[7]=gnew; + starf=0; + + var x3 = 0,y3 = 0,fnum=0; + + var side=choose("left","right","up","down"); + if (side="left") then y3=floor(random_range(0,room_height))+1; + if (side="right"){ + y3=floor(random_range(0,room_height))+1;x3=room_width; + } + if (side="up"){ + x3=floor(random_range(0,room_width))+1; + } + if (side="down"){ + x3=floor(random_range(0,room_width))+1;y3=room_height; + } + + //lots of this can be wrapped into a single with + with(obj_star){ + if (owner = eFACTION.Eldar){ + instance_deactivate_object(id); + continue + } + if (is_dead_star() || planets==0){ + instance_deactivate_object(id); + continue + } + } + + repeat(8){ + fnum+=1; + var x4,y4,dire;x4=0;y4=0;dire=0; + if (fnum=1){ + dire=point_direction(x4,y4,room_width/2,room_height/2); + x4=x3+lengthdir_x(60,dire); + y4=y3+lengthdir_y(60,dire); + } + if (fnum>1){ + dire=point_direction(x4,y4,room_width/2,room_height/2); + x4=x3+choose(round(random_range(30,50)),round(random_range(-30,-50))); + y4=y3+choose(round(random_range(30,50)),round(random_range(-30,-50))); + } + + var _nfleet = new_ork_fleet(x4,y4); + var tplan=instance_nearest(_nfleet.x,_nfleet.y,obj_star); + _nfleet.action_x=tplan.x; + _nfleet.action_y=tplan.y; + if (fnum=1){ + starf=tplan; + _nfleet.cargo_data.ork_warboss=_warboss; + } + with (_nfleet){ + frigate_number=10; + capital_number=4; + set_fleet_movement(); + } + instance_deactivate_object(tplan.id); + + } + + instance_activate_object(obj_star); + instance_activate_object(obj_en_fleet); + + var _ork_leader = obj_controller.faction_leader[eFACTION.Ork]; + var tix=$"Warboss {_ork_leader} leads a WAAAGH! into Sector "+string(obj_ini.sector_name)+"."; + scr_alert("red","lol",string(tix),starf.x,starf.y); + scr_event_log("red",tix); + scr_popup("WAAAAGH!",$"A WAAAGH! led by the Warboss {_ork_leader} has arrived in "+string(obj_ini.sector_name)+". With him is a massive Ork fleet. Numbering in the dozens of battleships, they carry with them countless greenskins. The forefront of the WAAAGH! is destined for the "+string(starf.name)+" system.","waaagh",""); + } + } +} + diff --git a/scripts/scr_planetary_feature/scr_planetary_feature.gml b/scripts/scr_planetary_feature/scr_planetary_feature.gml index 1fc2f626a3..81046481ca 100644 --- a/scripts/scr_planetary_feature/scr_planetary_feature.gml +++ b/scripts/scr_planetary_feature/scr_planetary_feature.gml @@ -143,6 +143,7 @@ function NewPlanetFeature(feature_type, other_data={}) constructor{ player_hidden = 1; planet_display = "Ork Warboss"; Warboss = "alive"; + name = global.name_generator.generate_ork_name(); turns_static = 0; break; case P_features.OrkStronghold: diff --git a/scripts/scr_star_ownership/scr_star_ownership.gml b/scripts/scr_star_ownership/scr_star_ownership.gml index 37f19559f7..03cebbc94f 100644 --- a/scripts/scr_star_ownership/scr_star_ownership.gml +++ b/scripts/scr_star_ownership/scr_star_ownership.gml @@ -14,7 +14,7 @@ function scr_star_ownership(argument0) { } } var _set_to_first = false; - if (p_owner[run]=7 && p_orks[run]=0 && p_type[run]!="Dead"){ + if (p_owner[run]==7 && p_orks[run]<=0){ _set_to_first = true; } if (_set_to_first){ diff --git a/scripts/scr_system_search_helpers/scr_system_search_helpers.gml b/scripts/scr_system_search_helpers/scr_system_search_helpers.gml index 1b1e6e183b..dddbf01764 100644 --- a/scripts/scr_system_search_helpers/scr_system_search_helpers.gml +++ b/scripts/scr_system_search_helpers/scr_system_search_helpers.gml @@ -178,23 +178,38 @@ function star_by_name(search_name){ return "none"; } +//use this to quickly make a loop through a stars planets in an unordered way +function shuffled_planet_array(){ + var _planets = []; + for (var i=1;i<=planets;i++){ + array_push(_planets, i); + } + _planets = array_shuffle(_planets); + return _planets; + +} + function distance_removed_star(origional_x,origional_y, star_offset = choose(2,3), disclude_hulk=true, disclude_elder=true, disclude_deads=true, warp_concious=true){ var from = instance_nearest(origional_x,origional_y,obj_star); + var _deactivated = []; for(var i=0; i 100); // peace_check=1;// Testing host_p=0; if (peace_check>0){ - with(obj_temp3){instance_destroy();} - var baddy, total; - total = 0; + var baddy, + var total = 0; with(obj_star){ if (owner>5){ - baddy = 0; - o = 0; + baddy = 0; + o = 0; repeat(planets){ - o+=1; - if (p_orks[o]+p_tyranids[o]+p_chaos[o]+p_traitors[o]+p_necrons[o]>=3) then baddy+=1; - } + o+=1; + if (p_orks[o]+p_tyranids[o]+p_chaos[o]+p_traitors[o]+p_necrons[o]>=3) then baddy+=1; + } if (baddy>0) { - total++; - } + total++; + } } } - if (total<=3) then peace_check=2; - - // More Testing - // peace_check=2; - - if (peace_check=2){ - var did_so;did_so=false; + if (total<=3){ + peace_check=2; + } + if (peace_check==2){ if (turn>=150) and (faction_defeated[10]=0) and (known[eFACTION.Chaos]=0) and (faction_gender[10]=2){ // if (turn>=100000) and (faction_defeated[10]=0) and (known[eFACTION.Chaos]=0){faction_gender[10]=2; - spawn_chaos_warlord(); - - } - if (did_so=false) and (faction_defeated[7]=1){ - with(obj_turn_end){audiences+=1;audien[audiences]=7;known[eFACTION.Chaos]=2;audien_topic[audiences]="new_warboss";did_so=true;} - - faction_defeated[7]=-1;known[eFACTION.Ork]=0; - faction_leader[eFACTION.Ork]=global.name_generator.generate_ork_name(); - faction_title[7]="Warboss"; - faction_status[eFACTION.Ork]="War"; - disposition[7]=-40; - - var gold,gnew,starf;gold=faction_gender[7];if (gold=0) then gold=1;gnew=0; - repeat(20){if (gnew=0) or (gnew=gold) then gnew=choose(1,2,3,4);} - faction_gender[7]=gnew;starf=0; - - var x3,y3,fnum;fnum=0; - x3=0;y3=0; - var side=choose("left","right","up","down"); - if (side="left") then y3=floor(random_range(0,room_height))+1; - if (side="right"){y3=floor(random_range(0,room_height))+1;x3=room_width;} - if (side="up") then x3=floor(random_range(0,room_width))+1; - if (side="down"){x3=floor(random_range(0,room_width))+1;y3=room_height;} - - //lots of this can be wrapped into a single with - with(obj_star){if (owner = eFACTION.Eldar) then x-=20000;} - with(obj_star){if (planets=1) and (p_type[1]="Dead"){x-=20000;y-=20000;}} - with(obj_star){if (planets=2) and (p_type[1]="Dead")and (p_type[2]="Dead"){x-=20000;y-=20000;}} - - repeat(8){fnum+=1; - var x4,y4,dire;x4=0;y4=0;dire=0; - if (fnum=1){ - dire=point_direction(x4,y4,room_width/2,room_height/2); - x4=x3+lengthdir_x(60,dire);y4=y3+lengthdir_y(60,dire); - } - if (fnum>1){ - dire=point_direction(x4,y4,room_width/2,room_height/2); - x4=x3+choose(round(random_range(30,50)),round(random_range(-30,-50))); - y4=y3+choose(round(random_range(30,50)),round(random_range(-30,-50))); - } - - var nfleet,tplan;nfleet=instance_create(x4,y4,obj_en_fleet); - nfleet = new_ork_fleet(x4,y4); - tplan=instance_nearest(nfleet.x,nfleet.y,obj_star); - nfleet.action_x=tplan.x; - nfleet.action_y=tplan.y; - if (fnum=1){ - starf=tplan; - nfleet.cargo_data.ork_warboss=new NewPlanetFeature(OrkWarboss); - } - with (nfleet){ - frigate_number=10; - capital_number=4; - set_fleet_movement(); - } - - - nfleet.x-=20000; - nfleet.y-=20000; - tplan.x-=20000; - tplan.y-=20000; - } - - with(obj_en_fleet){if (x<-14000) and (y<-14000) and (owner = eFACTION.Ork){x+=20000;y+=20000;}} - with(obj_star){if (x<-14000) and (y<-14000){x+=20000;y+=20000;}} - with(obj_star){if (x<-14000) and (y<-14000){x+=20000;y+=20000;}} - with(obj_star){if (x<-14000) and (y<-14000){x+=20000;y+=20000;}} - with(obj_star){if (x<-14000) and (y<-14000){x+=20000;y+=20000;}} - with(obj_star){if (x<-14000) and (y<-14000){x+=20000;y+=20000;}} - - var _ork_leader = obj_controller.faction_leader[eFACTION.Ork]; - var tix=$"Warboss {_ork_leader} leads a WAAAGH! into Sector "+string(obj_ini.sector_name)+"."; - scr_alert("red","lol",string(tix),starf.x,starf.y); - scr_event_log("red",tix); - scr_popup("WAAAAGH!",$"A WAAAGH! led by the Warboss {_ork_leader} has arrived in "+string(obj_ini.sector_name)+". With him is a massive Ork fleet. Numbering in the dozens of battleships, they carry with them countless greenskins. The forefront of the WAAAGH! is destined for the "+string(starf.name)+" system.","waaagh",""); - } + spawn_chaos_warlord(); + + } else { + out_of_system_warboss(); + } } } }catch(_exception) { diff --git a/sprites/spr_da_backpack/spr_da_backpack.yy b/sprites/spr_da_backpack/spr_da_backpack.yy index c85b36121c..c513b34731 100644 --- a/sprites/spr_da_backpack/spr_da_backpack.yy +++ b/sprites/spr_da_backpack/spr_da_backpack.yy @@ -64,6 +64,8 @@ "playbackSpeedType":0, "resourceType":"GMSequence", "resourceVersion":"2.0", + "seqHeight":232.0, + "seqWidth":164.0, "showBackdrop":true, "showBackdropImage":false, "timeUnits":1, diff --git a/sprites/spr_faction_icons/spr_faction_icons.yy b/sprites/spr_faction_icons/spr_faction_icons.yy index e610646fcd..5191466385 100644 --- a/sprites/spr_faction_icons/spr_faction_icons.yy +++ b/sprites/spr_faction_icons/spr_faction_icons.yy @@ -78,6 +78,8 @@ "playbackSpeedType":0, "resourceType":"GMSequence", "resourceVersion":"2.0", + "seqHeight":64.0, + "seqWidth":64.0, "showBackdrop":true, "showBackdropImage":false, "timeUnits":1, diff --git a/sprites/spr_indomitus_backpack_variants/spr_indomitus_backpack_variants.yy b/sprites/spr_indomitus_backpack_variants/spr_indomitus_backpack_variants.yy index e61e22cd6b..327f13b0ae 100644 --- a/sprites/spr_indomitus_backpack_variants/spr_indomitus_backpack_variants.yy +++ b/sprites/spr_indomitus_backpack_variants/spr_indomitus_backpack_variants.yy @@ -65,6 +65,8 @@ "playbackSpeedType":0, "resourceType":"GMSequence", "resourceVersion":"2.0", + "seqHeight":271.0, + "seqWidth":181.0, "showBackdrop":true, "showBackdropImage":false, "timeUnits":1, diff --git a/sprites/spr_mk3_complex/spr_mk3_complex.yy b/sprites/spr_mk3_complex/spr_mk3_complex.yy index 6ae83e4d0b..c4d625e5b7 100644 --- a/sprites/spr_mk3_complex/spr_mk3_complex.yy +++ b/sprites/spr_mk3_complex/spr_mk3_complex.yy @@ -64,6 +64,8 @@ "playbackSpeedType":0, "resourceType":"GMSequence", "resourceVersion":"2.0", + "seqHeight":232.0, + "seqWidth":164.0, "showBackdrop":true, "showBackdropImage":false, "timeUnits":1, diff --git a/sprites/spr_mk3_complex_backpack/spr_mk3_complex_backpack.yy b/sprites/spr_mk3_complex_backpack/spr_mk3_complex_backpack.yy index ab43c9018e..82830d778b 100644 --- a/sprites/spr_mk3_complex_backpack/spr_mk3_complex_backpack.yy +++ b/sprites/spr_mk3_complex_backpack/spr_mk3_complex_backpack.yy @@ -63,6 +63,8 @@ "playbackSpeedType":0, "resourceType":"GMSequence", "resourceVersion":"2.0", + "seqHeight":232.0, + "seqWidth":164.0, "showBackdrop":true, "showBackdropImage":false, "timeUnits":1, diff --git a/sprites/spr_mk4_complex_backpack/spr_mk4_complex_backpack.yy b/sprites/spr_mk4_complex_backpack/spr_mk4_complex_backpack.yy index b1a2e5eee8..acce101b8e 100644 --- a/sprites/spr_mk4_complex_backpack/spr_mk4_complex_backpack.yy +++ b/sprites/spr_mk4_complex_backpack/spr_mk4_complex_backpack.yy @@ -63,6 +63,8 @@ "playbackSpeedType":0, "resourceType":"GMSequence", "resourceVersion":"2.0", + "seqHeight":232.0, + "seqWidth":164.0, "showBackdrop":true, "showBackdropImage":false, "timeUnits":1, diff --git a/sprites/spr_psy_hood_complex/spr_psy_hood_complex.yy b/sprites/spr_psy_hood_complex/spr_psy_hood_complex.yy index 2b6df338a5..1f24dcf7c6 100644 --- a/sprites/spr_psy_hood_complex/spr_psy_hood_complex.yy +++ b/sprites/spr_psy_hood_complex/spr_psy_hood_complex.yy @@ -63,6 +63,8 @@ "playbackSpeedType":0, "resourceType":"GMSequence", "resourceVersion":"2.0", + "seqHeight":232.0, + "seqWidth":167.0, "showBackdrop":true, "showBackdropImage":false, "timeUnits":1, diff --git a/sprites/spr_ship_bb/spr_ship_bb.yy b/sprites/spr_ship_bb/spr_ship_bb.yy index 50acd34237..ad04c09570 100644 --- a/sprites/spr_ship_bb/spr_ship_bb.yy +++ b/sprites/spr_ship_bb/spr_ship_bb.yy @@ -63,6 +63,8 @@ "playbackSpeedType":1, "resourceType":"GMSequence", "resourceVersion":"2.0", + "seqHeight":112.0, + "seqWidth":311.0, "showBackdrop":true, "showBackdropImage":false, "timeUnits":1, diff --git a/sprites/spr_ship_hunt/spr_ship_hunt.yy b/sprites/spr_ship_hunt/spr_ship_hunt.yy index 71c7cd41d1..d35e63257f 100644 --- a/sprites/spr_ship_hunt/spr_ship_hunt.yy +++ b/sprites/spr_ship_hunt/spr_ship_hunt.yy @@ -63,6 +63,8 @@ "playbackSpeedType":1, "resourceType":"GMSequence", "resourceVersion":"2.0", + "seqHeight":25.0, + "seqWidth":70.0, "showBackdrop":true, "showBackdropImage":false, "timeUnits":1, @@ -73,10 +75,7 @@ },"Disabled":false,"id":"7c1b99c0-ab70-44a8-9a5a-0738a1058783","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":35, "yorigin":12, diff --git a/sprites/spr_ship_song/spr_ship_song.yy b/sprites/spr_ship_song/spr_ship_song.yy index 73d98f425b..7bf1268299 100644 --- a/sprites/spr_ship_song/spr_ship_song.yy +++ b/sprites/spr_ship_song/spr_ship_song.yy @@ -63,6 +63,8 @@ "playbackSpeedType":1, "resourceType":"GMSequence", "resourceVersion":"2.0", + "seqHeight":150.0, + "seqWidth":350.0, "showBackdrop":true, "showBackdropImage":false, "timeUnits":1, diff --git a/sprites/spr_ship_stri/spr_ship_stri.yy b/sprites/spr_ship_stri/spr_ship_stri.yy index cb58b58721..23cd650996 100644 --- a/sprites/spr_ship_stri/spr_ship_stri.yy +++ b/sprites/spr_ship_stri/spr_ship_stri.yy @@ -63,6 +63,8 @@ "playbackSpeedType":1, "resourceType":"GMSequence", "resourceVersion":"2.0", + "seqHeight":51.0, + "seqWidth":131.0, "showBackdrop":true, "showBackdropImage":false, "timeUnits":1, @@ -73,10 +75,7 @@ },"Disabled":false,"id":"43a254cb-346b-4949-bbdc-8440067748f4","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":65, "yorigin":25, diff --git a/sprites/spr_ultra_backpack/spr_ultra_backpack.yy b/sprites/spr_ultra_backpack/spr_ultra_backpack.yy index 804d095f21..9799674a26 100644 --- a/sprites/spr_ultra_backpack/spr_ultra_backpack.yy +++ b/sprites/spr_ultra_backpack/spr_ultra_backpack.yy @@ -63,6 +63,8 @@ "playbackSpeedType":0, "resourceType":"GMSequence", "resourceVersion":"2.0", + "seqHeight":232.0, + "seqWidth":167.0, "showBackdrop":true, "showBackdropImage":false, "timeUnits":1, From 0d5024dd666470151edfa5404a9d5f47b1489dbb Mon Sep 17 00:00:00 2001 From: EttyKitty <20323032+EttyKitty@users.noreply.github.com> Date: Tue, 27 May 2025 18:54:18 +0300 Subject: [PATCH 060/286] ci: Bump igor-setup version (#841) --- .github/workflows/gamemaker_build.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/gamemaker_build.yml b/.github/workflows/gamemaker_build.yml index fd1d10116b..f4cf3db458 100644 --- a/.github/workflows/gamemaker_build.yml +++ b/.github/workflows/gamemaker_build.yml @@ -94,10 +94,11 @@ jobs: # This step sets up the GameMaker build CLI tool Igor https://github.com/bscotch/igor-setup - id: igor_setup name: Setup Igor - uses: bscotch/igor-setup@v1.1.3 + uses: bscotch/igor-setup@v1.1.4 with: target-yyp: ${{ steps.find_yyp.outputs.yyp-path }} access-key: ${{ secrets.GM_ACCESS_KEY }} + # Update the version.json file with build date and other versioning information - id: igor_build name: Build with Igor From c5f946c0fea6dbde4a6242f3236013729b21fba6 Mon Sep 17 00:00:00 2001 From: EttyKitty <20323032+EttyKitty@users.noreply.github.com> Date: Wed, 28 May 2025 15:57:28 +0300 Subject: [PATCH 061/286] build: Bump IDE version to latest beta (#842) --- ChapterMaster.yyp | 4 +- options/main/options_main.yy | 3 +- options/operagx/options_operagx.yy | 3 +- sounds/snd_battle/snd_battle.yy | 3 +- sounds/snd_blood/snd_blood.yy | 3 +- sounds/snd_buzz/snd_buzz.yy | 3 +- sounds/snd_click/snd_click.yy | 3 +- sounds/snd_click_small/snd_click_small.yy | 3 +- sounds/snd_defeat/snd_defeat.yy | 3 +- sounds/snd_diboz/snd_diboz.yy | 3 +- sounds/snd_end_turn/snd_end_turn.yy | 3 +- sounds/snd_error/snd_error.yy | 3 +- sounds/snd_identify/snd_identify.yy | 3 +- sounds/snd_legal/snd_legal.yy | 3 +- sounds/snd_postbattle/snd_postbattle.yy | 3 +- sounds/snd_prologue/snd_prologue.yy | 3 +- sounds/snd_redownload/snd_redownload.yy | 3 +- sounds/snd_royal/snd_royal.yy | 3 +- sounds/snd_stc/snd_stc.yy | 3 +- sounds/snd_vode/snd_vode.yy | 3 +- sprites/Sprite544/Sprite544.yy | 8 +- sprites/bg_space/bg_space.yy | 8 +- sprites/dsgsdgsdg/dsgsdgsdg.yy | 74 +-- .../mk7_chest_variants/mk7_chest_variants.yy | 14 +- sprites/spr_advisors/spr_advisors.yy | 2 +- .../spr_apoth_area_pad/spr_apoth_area_pad.yy | 8 +- .../spr_apothecary_lights.yy | 8 +- .../spr_aquila_colors/spr_aquila_colors.yy | 86 +-- sprites/spr_arrow/spr_arrow.yy | 26 +- .../spr_artifact_button.yy | 50 +- .../spr_artificer_armour.yy | 8 +- .../spr_artificer_chest.yy | 14 +- .../spr_artificer_colors.yy | 80 +-- .../spr_artificer_colors2.yy | 80 +-- .../spr_artificer_left_leg.yy | 20 +- .../spr_artificer_left_pad.yy | 8 +- .../spr_artificer_left_trim.yy | 8 +- .../spr_artificer_mouth.yy | 14 +- .../spr_artificer_right_leg.yy | 20 +- .../spr_artificer_thorax.yy | 14 +- sprites/spr_assault_ram/spr_assault_ram.yy | 8 +- sprites/spr_attacked/spr_attacked.yy | 2 +- sprites/spr_azreal/spr_azreal.yy | 8 +- sprites/spr_ba_mk5_helm/spr_ba_mk5_helm.yy | 14 +- sprites/spr_ba_mk6_helm/spr_ba_mk6_helm.yy | 14 +- sprites/spr_ba_mk7_helm/spr_ba_mk7_helm.yy | 14 +- .../spr_backpack_fastening.yy | 8 +- .../spr_ballistic_skill_icon.yy | 8 +- sprites/spr_bar/spr_bar.yy | 68 +- sprites/spr_bare_eyes/spr_bare_eyes.yy | 164 ++--- .../spr_bare_head_facial_hair.yy | 320 +++------ .../spr_bare_head_facial_hair_colourable.yy | 62 +- sprites/spr_bare_heads/spr_bare_heads.yy | 272 +++----- .../spr_bare_heads_colourable.yy | 38 +- .../spr_bare_neck_colourable.yy | 8 +- sprites/spr_bare_necks/spr_bare_necks.yy | 50 +- sprites/spr_battle_block/spr_battle_block.yy | 14 +- .../spr_battle_block2/spr_battle_block2.yy | 8 +- .../spr_beakie_colors/spr_beakie_colors.yy | 86 +-- .../spr_binders_robes/spr_binders_robes.yy | 14 +- sprites/spr_bio_fighter/spr_bio_fighter.yy | 8 +- sprites/spr_bionic_eye_2/spr_bionic_eye_2.yy | 26 +- .../spr_bionic_left_arm.yy | 14 +- .../spr_bionic_left_eyes.yy | 20 +- .../spr_bionic_leg_left.yy | 20 +- .../spr_bionic_leg_right.yy | 20 +- .../spr_bionic_right_arm.yy | 14 +- .../spr_bionic_right_eyes.yy | 20 +- sprites/spr_bionics_arm/spr_bionics_arm.yy | 14 +- .../spr_bionics_arm_2/spr_bionics_arm_2.yy | 14 +- sprites/spr_bionics_eye/spr_bionics_eye.yy | 14 +- sprites/spr_bionics_hand/spr_bionics_hand.yy | 26 +- sprites/spr_bionics_leg/spr_bionics_leg.yy | 26 +- .../spr_bionics_leg_2/spr_bionics_leg_2.yy | 26 +- .../spr_bionics_leg_3/spr_bionics_leg_3.yy | 26 +- sprites/spr_blog/spr_blog.yy | 38 +- sprites/spr_bolt/spr_bolt.yy | 8 +- .../spr_bonding_studs_left.yy | 8 +- .../spr_bonding_studs_right.yy | 8 +- sprites/spr_build_tiny/spr_build_tiny.yy | 8 +- sprites/spr_build_tiny2/spr_build_tiny2.yy | 8 +- sprites/spr_bullet/spr_bullet.yy | 20 +- sprites/spr_cancel_small/spr_cancel_small.yy | 8 +- sprites/spr_cannon/spr_cannon.yy | 8 +- .../spr_carrion_breath/spr_carrion_breath.yy | 50 +- .../spr_chain_mail_tabbard.yy | 8 +- .../spr_chap_area_pad/spr_chap_area_pad.yy | 8 +- .../spr_chap_trim_left/spr_chap_trim_left.yy | 8 +- .../spr_chap_trim_right.yy | 8 +- .../spr_chaplain_helm/spr_chaplain_helm.yy | 8 +- .../spr_chaplain_term_helm.yy | 8 +- .../spr_chaplain_wolf_helm.yy | 8 +- .../spr_chaplain_wolfterm_helm.yy | 8 +- .../spr_charisma_icon/spr_charisma_icon.yy | 8 +- .../spr_checker_texture.yy | 16 +- sprites/spr_cloak_cloth/spr_cloak_cloth.yy | 8 +- sprites/spr_cloak_fur/spr_cloak_fur.yy | 8 +- .../spr_cloak_image_0/spr_cloak_image_0.yy | 32 +- .../spr_cloak_image_1/spr_cloak_image_1.yy | 20 +- sprites/spr_cloak_scale/spr_cloak_scale.yy | 14 +- .../spr_cloth_tabbard/spr_cloth_tabbard.yy | 8 +- .../spr_clothing_colors.yy | 38 +- sprites/spr_cm_specialty/spr_cm_specialty.yy | 2 +- sprites/spr_cog_pinion/spr_cog_pinion.yy | 8 +- .../spr_company_title/spr_company_title.yy | 32 +- .../spr_constitution_icon.yy | 8 +- sprites/spr_craftworld/spr_craftworld.yy | 8 +- .../spr_creation_arrow/spr_creation_arrow.yy | 32 +- .../spr_creation_check/spr_creation_check.yy | 26 +- .../spr_creation_existing.yy | 8 +- .../spr_creation_founding.yy | 8 +- .../spr_creation_icon/spr_creation_icon.yy | 8 +- .../spr_creation_nosplash.yy | 2 +- .../spr_creation_other/spr_creation_other.yy | 2 +- .../spr_creation_slate/spr_creation_slate.yy | 2 +- sprites/spr_credits_bg/spr_credits_bg.yy | 8 +- sprites/spr_crusader/spr_crusader.yy | 8 +- .../spr_crux_on_chain/spr_crux_on_chain.yy | 8 +- .../spr_cthonian_tabbard.yy | 8 +- sprites/spr_cursor/spr_cursor.yy | 32 +- sprites/spr_da_backpack/spr_da_backpack.yy | 14 +- sprites/spr_da_chaplain/spr_da_chaplain.yy | 14 +- sprites/spr_da_mk3/spr_da_mk3.yy | 8 +- sprites/spr_da_mk4/spr_da_mk4.yy | 8 +- sprites/spr_da_mk5/spr_da_mk5.yy | 8 +- .../spr_da_mk5_helm_crests.yy | 8 +- sprites/spr_da_mk6/spr_da_mk6.yy | 8 +- .../spr_da_mk6_helm_crests.yy | 8 +- sprites/spr_da_mk7/spr_da_mk7.yy | 8 +- .../spr_da_mk7_helm_crests.yy | 8 +- sprites/spr_da_mk8/spr_da_mk8.yy | 8 +- sprites/spr_da_standard/spr_da_standard.yy | 26 +- .../spr_da_term_honor/spr_da_term_honor.yy | 8 +- sprites/spr_dante/spr_dante.yy | 14 +- sprites/spr_darkstar/spr_darkstar.yy | 8 +- sprites/spr_data_slate/spr_data_slate.yy | 14 +- .../spr_data_slate_back.yy | 8 +- .../spr_data_slate_border.yy | 8 +- .../spr_death_watch_pauldron.yy | 8 +- sprites/spr_def_fortress/spr_def_fortress.yy | 8 +- sprites/spr_def_mine/spr_def_mine.yy | 8 +- sprites/spr_def_platform/spr_def_platform.yy | 14 +- sprites/spr_def_silo/spr_def_silo.yy | 14 +- sprites/spr_def_station/spr_def_station.yy | 14 +- sprites/spr_defeat/spr_defeat.yy | 2 +- .../spr_dev_pack_complex.yy | 14 +- .../spr_dexterity_icon/spr_dexterity_icon.yy | 8 +- .../spr_diplo_symbols/spr_diplo_symbols.yy | 8 +- sprites/spr_diplomacy/spr_diplomacy.yy | 8 +- .../spr_diplomacy_dae/spr_diplomacy_dae.yy | 2 +- .../spr_diplomacy_defeated.yy | 14 +- .../spr_diplomacy_med/spr_diplomacy_med.yy | 2 +- .../spr_diplomacy_small.yy | 158 ++--- sprites/spr_disposition/spr_disposition.yy | 134 ++-- .../spr_disposition_small.yy | 122 ++-- .../spr_dread_assault_cannon.yy | 26 +- .../spr_dread_autocannon.yy | 26 +- sprites/spr_dread_claw/spr_dread_claw.yy | 26 +- sprites/spr_dread_colors/spr_dread_colors.yy | 38 +- .../spr_dread_heavy_bolter.yy | 26 +- .../spr_dread_iron_clad.yy | 26 +- .../spr_dread_lascannon.yy | 26 +- .../spr_dread_missile/spr_dread_missile.yy | 26 +- .../spr_dread_plasma_cannon.yy | 26 +- .../spr_dreadnought_chasis_colors.yy | 8 +- .../spr_dreadnought_complex.yy | 20 +- .../spr_dreadnought_decorations.yy | 20 +- sprites/spr_eldar_hire/spr_eldar_hire.yy | 14 +- .../spr_errant_colors/spr_errant_colors.yy | 86 +-- sprites/spr_explosion/spr_explosion.yy | 44 +- sprites/spr_explosion2/spr_explosion2.yy | 86 +-- sprites/spr_explosion3/spr_explosion3.yy | 146 ++--- .../spr_explosion_plas/spr_explosion_plas.yy | 44 +- .../spr_facial_colors/spr_facial_colors.yy | 38 +- .../spr_faction_icons/spr_faction_icons.yy | 98 +-- sprites/spr_faith_icon/spr_faith_icon.yy | 8 +- sprites/spr_fast_forward/spr_fast_forward.yy | 8 +- sprites/spr_fighta/spr_fighta.yy | 8 +- sprites/spr_flame/spr_flame.yy | 50 +- sprites/spr_flame2/spr_flame2.yy | 50 +- sprites/spr_flamer_new/spr_flamer_new.yy | 128 ++-- sprites/spr_fleet_alert/spr_fleet_alert.yy | 170 ++--- sprites/spr_fleet_chaos/spr_fleet_chaos.yy | 62 +- .../spr_fleet_civilian/spr_fleet_civilian.yy | 26 +- sprites/spr_fleet_eldar/spr_fleet_eldar.yy | 38 +- .../spr_fleet_imperial/spr_fleet_imperial.yy | 62 +- .../spr_fleet_inquisition.yy | 20 +- .../spr_fleet_mechanicus.yy | 8 +- sprites/spr_fleet_necron/spr_fleet_necron.yy | 56 +- sprites/spr_fleet_ork/spr_fleet_ork.yy | 62 +- sprites/spr_fleet_tau/spr_fleet_tau.yy | 68 +- sprites/spr_fleet_tiny/spr_fleet_tiny.yy | 62 +- .../spr_fleet_tyranid/spr_fleet_tyranid.yy | 74 +-- .../spr_flora_camo_texture.yy | 16 +- sprites/spr_force_icon/spr_force_icon.yy | 8 +- sprites/spr_forge_holo/spr_forge_holo.yy | 8 +- .../spr_forge_points_icon.yy | 14 +- .../spr_formation_arrow.yy | 8 +- .../spr_formation_bars/spr_formation_bars.yy | 92 +-- .../spr_formation_splash.yy | 8 +- sprites/spr_fur_tabbard/spr_fur_tabbard.yy | 8 +- .../spr_fur_tail_topknot.yy | 8 +- sprites/spr_gear_apoth/spr_gear_apoth.yy | 14 +- sprites/spr_gear_chap/spr_gear_chap.yy | 26 +- .../spr_gear_combat_shield.yy | 14 +- sprites/spr_gear_halo/spr_gear_halo.yy | 26 +- sprites/spr_gear_hood1/spr_gear_hood1.yy | 74 +-- sprites/spr_gear_hood2/spr_gear_hood2.yy | 8 +- sprites/spr_gear_hood3/spr_gear_hood3.yy | 62 +- .../spr_gear_librarian/spr_gear_librarian.yy | 8 +- .../spr_gear_librarian_term.yy | 8 +- sprites/spr_gear_techa/spr_gear_techa.yy | 8 +- .../spr_generic_honor_guard.yy | 38 +- .../spr_generic_sgt_mk3.yy | 26 +- .../spr_generic_sgt_mk4.yy | 32 +- .../spr_generic_sgt_mk5.yy | 26 +- .../spr_generic_sgt_mk6.yy | 26 +- .../spr_generic_sgt_mk7.yy | 26 +- .../spr_generic_sgt_mk8.yy | 26 +- .../spr_generic_terminator_sgt.yy | 26 +- .../spr_gladiator_crest.yy | 8 +- sprites/spr_glob/spr_glob.yy | 8 +- .../spr_gothic_numbers_right_pauldron.yy | 68 +- sprites/spr_green_las/spr_green_las.yy | 8 +- sprites/spr_ground_conv/spr_ground_conv.yy | 8 +- sprites/spr_ground_las/spr_ground_las.yy | 8 +- .../spr_ground_plasma/spr_ground_plasma.yy | 8 +- .../spr_happenings_blue.yy | 158 ++--- .../spr_happenings_green.yy | 158 ++--- .../spr_happenings_purple.yy | 158 ++--- .../spr_happenings_red/spr_happenings_red.yy | 158 ++--- .../spr_happenings_white.yy | 158 ++--- .../spr_hazzard_texture.yy | 16 +- .../spr_helm_decorations.yy | 14 +- sprites/spr_helm_stripe/spr_helm_stripe.yy | 20 +- .../spr_helm_stripe_term.yy | 14 +- sprites/spr_help_exit/spr_help_exit.yy | 14 +- sprites/spr_help_panel/spr_help_panel.yy | 8 +- .../spr_heresy_colors/spr_heresy_colors.yy | 80 +-- sprites/spr_hero/spr_hero.yy | 98 +-- sprites/spr_hero_skull/spr_hero_skull.yy | 8 +- sprites/spr_honor_helm/spr_honor_helm.yy | 32 +- .../spr_icon_apothecarion.yy | 8 +- .../spr_icon_ballistic_skill.yy | 8 +- sprites/spr_icon_bionics/spr_icon_bionics.yy | 8 +- sprites/spr_icon_change/spr_icon_change.yy | 8 +- sprites/spr_icon_health/spr_icon_health.yy | 8 +- .../spr_icon_iron_halo/spr_icon_iron_halo.yy | 8 +- .../spr_icon_iron_hands.yy | 8 +- .../spr_icon_iron_hands2.yy | 8 +- .../spr_icon_iron_hands3.yy | 8 +- .../spr_icon_librarius/spr_icon_librarius.yy | 8 +- sprites/spr_icon_psyker/spr_icon_psyker.yy | 8 +- sprites/spr_icon_shield/spr_icon_shield.yy | 8 +- sprites/spr_icon_shield2/spr_icon_shield2.yy | 8 +- .../spr_icon_telepatica.yy | 8 +- .../spr_icon_telepatica2.yy | 8 +- sprites/spr_icon_veteran/spr_icon_veteran.yy | 8 +- .../spr_icon_weapon_skill.yy | 8 +- sprites/spr_icon_weight/spr_icon_weight.yy | 8 +- sprites/spr_icon_wounds/spr_icon_wounds.yy | 8 +- sprites/spr_if_mk5_helm/spr_if_mk5_helm.yy | 20 +- sprites/spr_if_mk6_helm/spr_if_mk6_helm.yy | 32 +- sprites/spr_if_mk7_helm/spr_if_mk7_helm.yy | 14 +- sprites/spr_ih_mk5_helm/spr_ih_mk5_helm.yy | 14 +- sprites/spr_ih_mk6_helm/spr_ih_mk6_helm.yy | 14 +- sprites/spr_ih_mk7_helm/spr_ih_mk7_helm.yy | 14 +- .../spr_indomitus_backpack_variants.yy | 20 +- .../spr_indomitus_belt/spr_indomitus_belt.yy | 20 +- .../spr_indomitus_chest_variants.yy | 20 +- .../spr_indomitus_complex.yy | 8 +- .../spr_indomitus_head_variants.yy | 8 +- .../spr_indomitus_knightly_robe.yy | 8 +- .../spr_indomitus_left_arm.yy | 8 +- .../spr_indomitus_left_arm_bionic.yy | 8 +- .../spr_indomitus_left_eye_bionic.yy | 26 +- .../spr_indomitus_left_knee_crux.yy | 8 +- .../spr_indomitus_left_leg_bionic.yy | 8 +- .../spr_indomitus_left_shin.yy | 20 +- .../spr_indomitus_leg_variants.yy | 14 +- .../spr_indomitus_right_arm.yy | 8 +- .../spr_indomitus_right_arm_bionic.yy | 8 +- .../spr_indomitus_right_eye_bionic.yy | 26 +- .../spr_indomitus_right_knee_crux.yy | 8 +- .../spr_indomitus_right_leg_bionic.yy | 8 +- .../spr_indomitus_right_shin.yy | 20 +- sprites/spr_ingame_menu/spr_ingame_menu.yy | 8 +- .../spr_inspect_small/spr_inspect_small.yy | 8 +- .../spr_intelligence_icon.yy | 8 +- sprites/spr_iron2_colors/spr_iron2_colors.yy | 86 +-- sprites/spr_iron_colors/spr_iron_colors.yy | 86 +-- .../spr_jump_pack_complex.yy | 8 +- .../spr_knightly_belt/spr_knightly_belt.yy | 8 +- .../spr_knightly_personal_livery.yy | 32 +- .../spr_knightly_robes/spr_knightly_robes.yy | 20 +- sprites/spr_laurel/spr_laurel.yy | 8 +- .../spr_left_pauldron_chainmail.yy | 16 +- .../spr_left_pauldron_fur_hanging.yy | 34 +- .../spr_left_shin_spikes.yy | 8 +- .../spr_leopard_sprite/spr_leopard_sprite.yy | 16 +- sprites/spr_lib_area_pad/spr_lib_area_pad.yy | 8 +- sprites/spr_lion_belt/spr_lion_belt.yy | 8 +- sprites/spr_load_splash/spr_load_splash.yy | 8 +- sprites/spr_load_text/spr_load_text.yy | 20 +- sprites/spr_loadbar/spr_loadbar.yy | 8 +- .../spr_loadbar_cover/spr_loadbar_cover.yy | 608 ++++++------------ .../spr_loadbar_empty/spr_loadbar_empty.yy | 8 +- sprites/spr_loading/spr_loading.yy | 74 +-- sprites/spr_loading2/spr_loading2.yy | 50 +- sprites/spr_loc_icon/spr_loc_icon.yy | 32 +- sprites/spr_luck_icon/spr_luck_icon.yy | 8 +- sprites/spr_mahreen/spr_mahreen.yy | 92 +-- sprites/spr_mahreen_gun/spr_mahreen_gun.yy | 92 +-- .../spr_mahreen_secondary.yy | 92 +-- .../spr_mahreen_visor/spr_mahreen_visor.yy | 92 +-- sprites/spr_manta/spr_manta.yy | 8 +- .../spr_mantis_warriors_icon.yy | 14 +- .../spr_mar_collision/spr_mar_collision.yy | 104 +-- .../spr_mar_fire_body1/spr_mar_fire_body1.yy | 26 +- .../spr_mar_fire_body2/spr_mar_fire_body2.yy | 26 +- .../spr_mar_fire_body3/spr_mar_fire_body3.yy | 26 +- .../spr_mar_fire_pauldron1.yy | 26 +- .../spr_mar_fire_pauldron2.yy | 26 +- .../spr_mar_walk_body1/spr_mar_walk_body1.yy | 104 +-- .../spr_mar_walk_body2/spr_mar_walk_body2.yy | 104 +-- .../spr_mar_walk_body3/spr_mar_walk_body3.yy | 104 +-- .../spr_mar_walk_legs1/spr_mar_walk_legs1.yy | 104 +-- .../spr_mar_walk_legs3/spr_mar_walk_legs3.yy | 104 +-- .../spr_mar_walk_legs4/spr_mar_walk_legs4.yy | 104 +-- .../spr_mar_walk_pauldron1.yy | 104 +-- .../spr_mar_walk_pauldron2.yy | 104 +-- sprites/spr_marine_base/spr_marine_base.yy | 44 +- .../spr_marine_cloth_hood.yy | 8 +- sprites/spr_marine_head/spr_marine_head.yy | 38 +- sprites/spr_marine_robes/spr_marine_robes.yy | 14 +- .../spr_marksmans_honor.yy | 14 +- .../spr_master_splash/spr_master_splash.yy | 8 +- sprites/spr_master_title/spr_master_title.yy | 8 +- .../spr_maximus_colors/spr_maximus_colors.yy | 80 +-- .../spr_maximus_colors2.yy | 86 +-- .../spr_medicine_icon/spr_medicine_icon.yy | 8 +- sprites/spr_melta/spr_melta.yy | 50 +- .../spr_metal_tabbard/spr_metal_tabbard.yy | 8 +- sprites/spr_mk3_belt/spr_mk3_belt.yy | 8 +- sprites/spr_mk3_chest/spr_mk3_chest.yy | 8 +- sprites/spr_mk3_colors/spr_mk3_colors.yy | 106 +-- sprites/spr_mk3_complex/spr_mk3_complex.yy | 8 +- .../spr_mk3_complex_backpack.yy | 8 +- .../spr_mk3_forehead_variants.yy | 44 +- .../spr_mk3_head_variants.yy | 14 +- sprites/spr_mk3_left_arm/spr_mk3_left_arm.yy | 8 +- .../spr_mk3_left_leg_variants.yy | 20 +- .../spr_mk3_left_trim/spr_mk3_left_trim.yy | 26 +- sprites/spr_mk3_mouth/spr_mk3_mouth.yy | 20 +- .../spr_mk3_mouth_flame_cult.yy | 8 +- .../spr_mk3_mouth_prussian.yy | 8 +- .../spr_mk3_right_arm/spr_mk3_right_arm.yy | 8 +- .../spr_mk3_right_leg_variants.yy | 20 +- .../spr_mk3_right_trim/spr_mk3_right_trim.yy | 26 +- .../spr_mk3_runic_chest.yy | 8 +- .../spr_mk4_chest_fastenings.yy | 26 +- .../spr_mk4_chest_variants.yy | 14 +- sprites/spr_mk4_colors/spr_mk4_colors.yy | 98 +-- sprites/spr_mk4_complex/spr_mk4_complex.yy | 8 +- .../spr_mk4_complex_backpack.yy | 8 +- .../spr_mk4_head_variants.yy | 8 +- sprites/spr_mk4_left_arm/spr_mk4_left_arm.yy | 8 +- .../spr_mk4_left_trim/spr_mk4_left_trim.yy | 32 +- .../spr_mk4_leg_variants.yy | 26 +- .../spr_mk4_mongol_chest_variants.yy | 8 +- .../spr_mk4_mongol_hat/spr_mk4_mongol_hat.yy | 8 +- .../spr_mk4_mouth_variants.yy | 32 +- .../spr_mk4_right_arm/spr_mk4_right_arm.yy | 8 +- .../spr_mk4_right_trim/spr_mk4_right_trim.yy | 32 +- .../spr_mk5_chest_variants.yy | 8 +- sprites/spr_mk5_colors/spr_mk5_colors.yy | 86 +-- sprites/spr_mk5_complex/spr_mk5_complex.yy | 8 +- .../spr_mk5_complex_backpack.yy | 8 +- .../spr_mk5_head_variants.yy | 8 +- sprites/spr_mk5_left_arm/spr_mk5_left_arm.yy | 8 +- .../spr_mk5_right_arm/spr_mk5_right_arm.yy | 8 +- .../spr_mk5_samuri_faceplate.yy | 8 +- sprites/spr_mk6_complex/spr_mk6_complex.yy | 8 +- .../spr_mk6_complex_backpack.yy | 8 +- .../spr_mk6_cthonian_heads.yy | 8 +- .../spr_mk6_forehead_knightly.yy | 20 +- .../spr_mk6_head_variants.yy | 20 +- .../spr_mk6_knightly_mouth_variants.yy | 8 +- sprites/spr_mk6_left_arm/spr_mk6_left_arm.yy | 8 +- .../spr_mk6_mongol_chest_variants.yy | 8 +- .../spr_mk6_mouth_prussian.yy | 20 +- .../spr_mk6_mouth_variants.yy | 20 +- .../spr_mk6_right_arm/spr_mk6_right_arm.yy | 8 +- .../spr_mk7_chest_ultra.yy | 20 +- .../spr_mk7_chest_variants.yy | 32 +- sprites/spr_mk7_colors/spr_mk7_colors.yy | 86 +-- sprites/spr_mk7_complex/spr_mk7_complex.yy | 16 +- .../spr_mk7_complex_backpack.yy | 8 +- .../spr_mk7_complex_belt.yy | 20 +- .../spr_mk7_complex_crux_belt.yy | 8 +- .../spr_mk7_complex_knees.yy | 16 +- .../spr_mk7_complex_left_pauldron.yy | 16 +- .../spr_mk7_complex_right_pauldron.yy | 22 +- .../spr_mk7_full_colour.yy | 26 +- .../spr_mk7_gladiator_chest.yy | 20 +- .../spr_mk7_head_variants.yy | 8 +- .../spr_mk7_knightly_chest.yy | 8 +- sprites/spr_mk7_left_arm/spr_mk7_left_arm.yy | 8 +- .../spr_mk7_left_trim/spr_mk7_left_trim.yy | 26 +- .../spr_mk7_leg_variants.yy | 20 +- .../spr_mk7_mongol_chest_variants.yy | 14 +- .../spr_mk7_mouth_prussian.yy | 20 +- .../spr_mk7_mouth_variants.yy | 26 +- .../spr_mk7_prussia_chest.yy | 32 +- .../spr_mk7_right_arm/spr_mk7_right_arm.yy | 8 +- .../spr_mk7_right_trim/spr_mk7_right_trim.yy | 26 +- .../spr_mk7_rope_belt/spr_mk7_rope_belt.yy | 8 +- .../spr_mk7_runic_belt/spr_mk7_runic_belt.yy | 8 +- .../spr_mk7_sculpted_chest.yy | 44 +- .../spr_mk7_thorax_variants.yy | 38 +- .../spr_mk7_wolf_cult_belt.yy | 8 +- .../spr_mk7_wolf_cult_chest_variants.yy | 8 +- sprites/spr_mk8_colors/spr_mk8_colors.yy | 80 +-- sprites/spr_mk8_gorget/spr_mk8_gorget.yy | 44 +- sprites/spr_mm_butts/spr_mm_butts.yy | 32 +- .../spr_mm_butts_small/spr_mm_butts_small.yy | 14 +- sprites/spr_mm_glow/spr_mm_glow.yy | 16 +- sprites/spr_mm_glowold/spr_mm_glowold.yy | 16 +- sprites/spr_mongol_hat/spr_mongol_hat.yy | 14 +- .../spr_mongol_topknots.yy | 20 +- sprites/spr_narthecium_2/spr_narthecium_2.yy | 8 +- sprites/spr_new_banner/spr_new_banner.yy | 8 +- sprites/spr_new_mm/spr_new_mm.yy | 8 +- sprites/spr_new_resource/spr_new_resource.yy | 26 +- sprites/spr_new_ui/spr_new_ui.yy | 14 +- sprites/spr_new_ui_cover/spr_new_ui_cover.yy | 8 +- .../spr_noarmour_colors.yy | 14 +- sprites/spr_none/spr_none.yy | 8 +- .../spr_numeral_left_knee.yy | 68 +- sprites/spr_ork_target/spr_ork_target.yy | 8 +- sprites/spr_p_name_bg/spr_p_name_bg.yy | 8 +- sprites/spr_pa_arms/spr_pa_arms.yy | 14 +- .../spr_pa_arms_ornate/spr_pa_arms_ornate.yy | 14 +- sprites/spr_pa_hands/spr_pa_hands.yy | 74 +-- sprites/spr_pack_arm/spr_pack_arm.yy | 14 +- sprites/spr_pack_arms/spr_pack_arms.yy | 20 +- sprites/spr_pack_brazier/spr_pack_brazier.yy | 20 +- .../spr_pack_brazier2/spr_pack_brazier2.yy | 8 +- .../spr_pack_brazier3/spr_pack_brazier3.yy | 8 +- .../spr_pack_devastator.yy | 20 +- sprites/spr_pack_jump/spr_pack_jump.yy | 20 +- .../spr_pauldron_spikes_left.yy | 8 +- .../spr_pauldron_spikes_right.yy | 8 +- sprites/spr_penitent_ui/spr_penitent_ui.yy | 8 +- .../spr_pixel_button_left.yy | 8 +- .../spr_pixel_button_middle.yy | 8 +- .../spr_pixel_button_right.yy | 8 +- .../spr_planet_screen/spr_planet_screen.yy | 8 +- .../spr_planet_splash/spr_planet_splash.yy | 8 +- sprites/spr_planets/spr_planets.yy | 128 ++-- sprites/spr_popup/spr_popup.yy | 14 +- .../spr_popup_dialogue/spr_popup_dialogue.yy | 8 +- sprites/spr_popup_event/spr_popup_event.yy | 14 +- .../spr_popup_event_avatar.yy | 8 +- sprites/spr_popup_large/spr_popup_large.yy | 14 +- sprites/spr_popup_manage/spr_popup_manage.yy | 8 +- sprites/spr_popup_medium/spr_popup_medium.yy | 14 +- sprites/spr_popup_pic/spr_popup_pic.yy | 8 +- sprites/spr_popup_select/spr_popup_select.yy | 8 +- sprites/spr_popup_small/spr_popup_small.yy | 8 +- sprites/spr_postbattle/spr_postbattle.yy | 2 +- .../spr_postbattle_space.yy | 2 +- .../spr_prussian_spike/spr_prussian_spike.yy | 32 +- sprites/spr_psy_hood/spr_psy_hood.yy | 26 +- .../spr_psy_hood_complex.yy | 8 +- sprites/spr_pulse/spr_pulse.yy | 8 +- sprites/spr_purge_1/spr_purge_1.yy | 2 +- sprites/spr_purge_2/spr_purge_2.yy | 2 +- .../spr_purge_buttons/spr_purge_buttons.yy | 8 +- sprites/spr_purge_panel/spr_purge_panel.yy | 8 +- sprites/spr_purity_s/spr_purity_s.yy | 14 +- sprites/spr_purity_seal/spr_purity_seal.yy | 26 +- sprites/spr_rack/spr_rack.yy | 20 +- .../spr_rack_and_pinion.yy | 14 +- sprites/spr_raid/spr_raid.yy | 2 +- sprites/spr_railgun/spr_railgun.yy | 8 +- sprites/spr_rectangle/spr_rectangle.yy | 8 +- sprites/spr_red_button/spr_red_button.yy | 32 +- sprites/spr_requisition/spr_requisition.yy | 8 +- sprites/spr_research_bar/spr_research_bar.yy | 20 +- sprites/spr_rg_mk5_helm/spr_rg_mk5_helm.yy | 14 +- sprites/spr_rg_mk6_helm/spr_rg_mk6_helm.yy | 14 +- sprites/spr_rg_mk7_helm/spr_rg_mk7_helm.yy | 14 +- .../spr_right_pauldron_chainmail.yy | 16 +- .../spr_right_pauldron_fur_hanging.yy | 34 +- .../spr_right_shin_spikes.yy | 8 +- sprites/spr_rock_bg/spr_rock_bg.yy | 8 +- sprites/spr_rocket/spr_rocket.yy | 14 +- sprites/spr_rocket_ork/spr_rocket_ork.yy | 8 +- sprites/spr_rocket_whirl/spr_rocket_whirl.yy | 8 +- .../spr_roman_centurian_crest.yy | 20 +- sprites/spr_roman_cloak/spr_roman_cloak.yy | 8 +- .../spr_roman_tabbard/spr_roman_tabbard.yy | 26 +- sprites/spr_round/spr_round.yy | 8 +- .../spr_runes_hanging/spr_runes_hanging.yy | 20 +- sprites/spr_runi/spr_runi.yy | 8 +- sprites/spr_sal_mk5_helm/spr_sal_mk5_helm.yy | 14 +- sprites/spr_sal_mk6_helm/spr_sal_mk6_helm.yy | 14 +- sprites/spr_sal_mk7_helm/spr_sal_mk7_helm.yy | 14 +- .../spr_sanguin_guard/spr_sanguin_guard.yy | 14 +- sprites/spr_save_data/spr_save_data.yy | 14 +- sprites/spr_save_footer/spr_save_footer.yy | 8 +- sprites/spr_save_header/spr_save_header.yy | 8 +- sprites/spr_save_headers/spr_save_headers.yy | 14 +- sprites/spr_saveload/spr_saveload.yy | 8 +- sprites/spr_scout_arms/spr_scout_arms.yy | 14 +- sprites/spr_scout_colors/spr_scout_colors.yy | 74 +-- .../spr_scout_complex/spr_scout_complex.yy | 8 +- sprites/spr_scout_heads/spr_scout_heads.yy | 14 +- sprites/spr_scout_left/spr_scout_left.yy | 8 +- sprites/spr_scout_new/spr_scout_new.yy | 56 +- sprites/spr_scout_right/spr_scout_right.yy | 8 +- sprites/spr_servo_arm/spr_servo_arm.yy | 8 +- .../spr_servo_harness/spr_servo_harness.yy | 8 +- sprites/spr_settings_bg/spr_settings_bg.yy | 8 +- .../spr_settings_button.yy | 8 +- sprites/spr_ship_aconite/spr_ship_aconite.yy | 8 +- sprites/spr_ship_ammer/spr_ship_ammer.yy | 8 +- sprites/spr_ship_apoc/spr_ship_apoc.yy | 8 +- sprites/spr_ship_aven/spr_ship_aven.yy | 8 +- .../spr_ship_back_black.yy | 26 +- .../spr_ship_back_white.yy | 26 +- sprites/spr_ship_bb/spr_ship_bb.yy | 8 +- sprites/spr_ship_black/spr_ship_black.yy | 8 +- sprites/spr_ship_cairn/spr_ship_cairn.yy | 8 +- sprites/spr_ship_carnage/spr_ship_carnage.yy | 8 +- .../spr_ship_castellan/spr_ship_castellan.yy | 8 +- .../spr_ship_craftworld.yy | 8 +- .../spr_ship_custodian/spr_ship_custodian.yy | 8 +- sprites/spr_ship_daemon/spr_ship_daemon.yy | 8 +- sprites/spr_ship_dese/spr_ship_dese.yy | 8 +- sprites/spr_ship_deth/spr_ship_deth.yy | 8 +- sprites/spr_ship_dirge/spr_ship_dirge.yy | 8 +- .../spr_ship_dreadclaw/spr_ship_dreadclaw.yy | 8 +- .../spr_ship_emissary/spr_ship_emissary.yy | 8 +- sprites/spr_ship_glad/spr_ship_glad.yy | 8 +- sprites/spr_ship_gorbag/spr_ship_gorbag.yy | 8 +- .../spr_ship_hellebore/spr_ship_hellebore.yy | 8 +- sprites/spr_ship_hulk/spr_ship_hulk.yy | 8 +- sprites/spr_ship_hunt/spr_ship_hunt.yy | 8 +- sprites/spr_ship_icono/spr_ship_icono.yy | 8 +- sprites/spr_ship_inter/spr_ship_inter.yy | 8 +- sprites/spr_ship_jackal/spr_ship_jackal.yy | 8 +- sprites/spr_ship_krool/spr_ship_krool.yy | 8 +- sprites/spr_ship_kroozer/spr_ship_kroozer.yy | 8 +- .../spr_ship_leviathan/spr_ship_leviathan.yy | 8 +- sprites/spr_ship_nem/spr_ship_nem.yy | 8 +- .../spr_ship_protector/spr_ship_protector.yy | 8 +- sprites/spr_ship_prowler/spr_ship_prowler.yy | 8 +- sprites/spr_ship_ravager/spr_ship_ravager.yy | 8 +- .../spr_ship_razorfiend.yy | 8 +- sprites/spr_ship_reaper/spr_ship_reaper.yy | 8 +- sprites/spr_ship_shadow/spr_ship_shadow.yy | 8 +- sprites/spr_ship_shroud/spr_ship_shroud.yy | 8 +- sprites/spr_ship_slam/spr_ship_slam.yy | 8 +- sprites/spr_ship_song/spr_ship_song.yy | 8 +- sprites/spr_ship_stalker/spr_ship_stalker.yy | 8 +- sprites/spr_ship_stri/spr_ship_stri.yy | 8 +- sprites/spr_ship_sword/spr_ship_sword.yy | 8 +- sprites/spr_ship_th/spr_ship_th.yy | 8 +- sprites/spr_ship_veng/spr_ship_veng.yy | 8 +- sprites/spr_ship_void/spr_ship_void.yy | 8 +- sprites/spr_ship_warden/spr_ship_warden.yy | 8 +- .../spr_shutter_button/spr_shutter_button.yy | 44 +- .../spr_sister_hospitaler.yy | 8 +- .../spr_sister_of_battle.yy | 8 +- sprites/spr_skitarii/spr_skitarii.yy | 8 +- .../spr_skull_on_chain/spr_skull_on_chain.yy | 8 +- sprites/spr_skulls_belt/spr_skulls_belt.yy | 8 +- sprites/spr_slate_2/spr_slate_2.yy | 62 +- sprites/spr_sororitas1/spr_sororitas1.yy | 14 +- sprites/spr_space_bg/spr_space_bg.yy | 8 +- sprites/spr_special_helm/spr_special_helm.yy | 8 +- sprites/spr_star/spr_star.yy | 38 +- sprites/spr_star_hulk/spr_star_hulk.yy | 8 +- sprites/spr_star_pulse/spr_star_pulse.yy | 218 +++---- sprites/spr_star_screen/spr_star_screen.yy | 44 +- .../spr_strength_icon/spr_strength_icon.yy | 8 +- sprites/spr_sw_mk5_helm/spr_sw_mk5_helm.yy | 14 +- sprites/spr_sw_mk6_helm/spr_sw_mk6_helm.yy | 14 +- sprites/spr_sw_mk7_helm/spr_sw_mk7_helm.yy | 14 +- .../spr_sword_pendant/spr_sword_pendant.yy | 8 +- .../spr_tartaros2_colors.yy | 68 +- .../spr_tartaros_arms/spr_tartaros_arms.yy | 8 +- .../spr_tartaros_chest/spr_tartaros_chest.yy | 32 +- .../spr_tartaros_colors.yy | 62 +- .../spr_tartaros_complex.yy | 8 +- .../spr_tartaros_faceplate.yy | 14 +- .../spr_tartaros_gorget.yy | 26 +- .../spr_tartaros_head_variants.yy | 26 +- .../spr_tartaros_left_arm.yy | 8 +- .../spr_tartaros_left_leg.yy | 32 +- .../spr_tartaros_left_trim.yy | 38 +- .../spr_tartaros_right_arm.yy | 8 +- .../spr_tartaros_right_leg.yy | 32 +- .../spr_tartaros_right_trim.yy | 38 +- .../spr_tartaros_wep_fix.yy | 50 +- .../spr_tech_area_pad/spr_tech_area_pad.yy | 8 +- sprites/spr_tech_belt/spr_tech_belt.yy | 8 +- .../spr_tech_face_plate.yy | 8 +- .../spr_techmarine_chest.yy | 8 +- .../spr_techmarine_complex.yy | 8 +- .../spr_techmarine_core.yy | 62 +- .../spr_techmarine_head.yy | 8 +- .../spr_techmarine_left_leg.yy | 8 +- .../spr_techmarine_left_trim.yy | 8 +- .../spr_techmarine_right_leg.yy | 8 +- .../spr_techmarine_right_trim.yy | 8 +- .../spr_technology_icon.yy | 8 +- sprites/spr_techpriest/spr_techpriest.yy | 8 +- sprites/spr_teeth/spr_teeth.yy | 14 +- .../spr_term_left_fur_hanging.yy | 26 +- .../spr_term_right_fur_hanging.yy | 26 +- .../spr_termi_wep_fix/spr_termi_wep_fix.yy | 50 +- .../spr_terminator2_colors.yy | 74 +-- .../spr_terminator3_colors.yy | 62 +- .../spr_terminator_arms.yy | 38 +- .../spr_terminator_chap.yy | 74 +-- .../spr_terminator_colors.yy | 62 +- .../spr_terminator_complex_arm_hidden_left.yy | 8 +- ...spr_terminator_complex_arm_hidden_right.yy | 8 +- .../spr_terminator_complex_arms_upper_left.yy | 8 +- ...spr_terminator_complex_arms_upper_right.yy | 8 +- .../spr_terminator_hands.yy | 74 +-- .../spr_terminator_laurel.yy | 8 +- .../spr_terminator_metal_tabbard.yy | 8 +- sprites/spr_tooltip1/spr_tooltip1.yy | 14 +- sprites/spr_torpedo/spr_torpedo.yy | 8 +- .../spr_torpedo_board/spr_torpedo_board.yy | 8 +- sprites/spr_ui_but_1/spr_ui_but_1.yy | 152 ++--- sprites/spr_ui_but_2/spr_ui_but_2.yy | 152 ++--- sprites/spr_ui_but_3/spr_ui_but_3.yy | 152 ++--- sprites/spr_ui_but_4/spr_ui_but_4.yy | 152 ++--- sprites/spr_ui_hov_1/spr_ui_hov_1.yy | 8 +- sprites/spr_ui_hov_2/spr_ui_hov_2.yy | 8 +- sprites/spr_ui_hov_3/spr_ui_hov_3.yy | 8 +- sprites/spr_ui_hov_4/spr_ui_hov_4.yy | 8 +- .../spr_ultra_backpack/spr_ultra_backpack.yy | 8 +- sprites/spr_ultra_belt/spr_ultra_belt.yy | 8 +- .../spr_ultra_honor_guard.yy | 20 +- .../spr_ultra_honor_guard2.yy | 20 +- .../spr_ultra_right_shoulder_hanging.yy | 8 +- .../spr_ultra_tassels/spr_ultra_tassels.yy | 8 +- sprites/spr_um_mk5_helm/spr_um_mk5_helm.yy | 14 +- sprites/spr_um_mk6_helm/spr_um_mk6_helm.yy | 14 +- sprites/spr_um_mk7_helm/spr_um_mk7_helm.yy | 14 +- sprites/spr_view_small/spr_view_small.yy | 14 +- .../spr_warp_level_icon.yy | 26 +- sprites/spr_warp_storm/spr_warp_storm.yy | 344 ++++------ sprites/spr_weapon_assca/spr_weapon_assca.yy | 14 +- .../spr_weapon_autocannon.yy | 8 +- .../spr_weapon_autocannon2.yy | 8 +- sprites/spr_weapon_blank/spr_weapon_blank.yy | 8 +- .../spr_weapon_boarding.yy | 26 +- .../spr_weapon_bolter/spr_weapon_bolter.yy | 16 +- .../spr_weapon_boltpis/spr_weapon_boltpis.yy | 8 +- .../spr_weapon_boltstorm_gauntlet.yy | 14 +- .../spr_weapon_boltstorm_gauntlet_small.yy | 14 +- .../spr_weapon_chainfist.yy | 14 +- .../spr_weapon_chainfist_small.yy | 14 +- sprites/spr_weapon_chaxe/spr_weapon_chaxe.yy | 8 +- .../spr_weapon_chsword/spr_weapon_chsword.yy | 8 +- .../spr_weapon_colors/spr_weapon_colors.yy | 20 +- .../spr_weapon_comflamer.yy | 8 +- .../spr_weapon_comgrav/spr_weapon_comgrav.yy | 8 +- .../spr_weapon_commelta.yy | 8 +- .../spr_weapon_complas/spr_weapon_complas.yy | 8 +- .../spr_weapon_crozarc/spr_weapon_crozarc.yy | 14 +- .../spr_weapon_eldsword.yy | 14 +- sprites/spr_weapon_evisc/spr_weapon_evisc.yy | 14 +- .../spr_weapon_flamer/spr_weapon_flamer.yy | 8 +- .../spr_weapon_frcaxe/spr_weapon_frcaxe.yy | 8 +- .../spr_weapon_frcstaff.yy | 8 +- .../spr_weapon_grav_cannon.yy | 8 +- .../spr_weapon_grav_gun.yy | 16 +- .../spr_weapon_grav_pistol.yy | 16 +- .../spr_weapon_hand_flamer.yy | 16 +- sprites/spr_weapon_hbolt/spr_weapon_hbolt.yy | 8 +- .../spr_weapon_hflamer/spr_weapon_hflamer.yy | 8 +- .../spr_weapon_hflamer_term.yy | 14 +- .../spr_weapon_hthhammer.yy | 14 +- .../spr_weapon_inferno/spr_weapon_inferno.yy | 8 +- .../spr_weapon_infernus_hbolt.yy | 16 +- sprites/spr_weapon_knife/spr_weapon_knife.yy | 8 +- sprites/spr_weapon_lasca/spr_weapon_lasca.yy | 8 +- .../spr_weapon_lightning1.yy | 14 +- .../spr_weapon_lightning2.yy | 14 +- .../spr_weapon_mace_of_absolution.yy | 8 +- sprites/spr_weapon_melta/spr_weapon_melta.yy | 8 +- .../spr_weapon_missile/spr_weapon_missile.yy | 8 +- .../spr_weapon_mmelta/spr_weapon_mmelta.yy | 14 +- sprites/spr_weapon_plasc/spr_weapon_plasc.yy | 14 +- sprites/spr_weapon_plasg/spr_weapon_plasg.yy | 8 +- .../spr_weapon_plasma_cannon_term.yy | 14 +- sprites/spr_weapon_plasp/spr_weapon_plasp.yy | 8 +- .../spr_weapon_powaxe/spr_weapon_powaxe.yy | 8 +- .../spr_weapon_powfist/spr_weapon_powfist.yy | 14 +- .../spr_weapon_powfist2.yy | 38 +- .../spr_weapon_powfist4.yy | 14 +- .../spr_weapon_powfist_old.yy | 26 +- .../spr_weapon_powmace/spr_weapon_powmace.yy | 8 +- .../spr_weapon_powmaul/spr_weapon_powmaul.yy | 8 +- .../spr_weapon_powspear.yy | 8 +- .../spr_weapon_powspear2.yy | 26 +- .../spr_weapon_powspear3.yy | 8 +- .../spr_weapon_powswo/spr_weapon_powswo.yy | 8 +- .../spr_weapon_relbla/spr_weapon_relbla.yy | 26 +- .../spr_weapon_relic_blade.yy | 14 +- .../spr_weapon_sbolter/spr_weapon_sbolter.yy | 8 +- .../spr_weapon_skill_icon.yy | 8 +- .../spr_weapon_sniper/spr_weapon_sniper.yy | 8 +- .../spr_weapon_stalker/spr_weapon_stalker.yy | 8 +- .../spr_weapon_standard.yy | 26 +- .../spr_weapon_standard2.yy | 14 +- sprites/spr_weapon_storm/spr_weapon_storm.yy | 14 +- .../spr_weapon_storm2/spr_weapon_storm2.yy | 14 +- .../spr_weapon_storm_tall.yy | 14 +- .../spr_weapon_storm_tall_2.yy | 14 +- .../spr_weapon_sword_oriental.yy | 8 +- .../spr_weapon_sword_turk.yy | 8 +- .../spr_weapon_thhammer.yy | 14 +- .../spr_weapon_xenophase_blade_var1.yy | 8 +- .../spr_weapoon_powso_flamberge.yy | 8 +- sprites/spr_welcome_bg/spr_welcome_bg.yy | 8 +- sprites/spr_wings/spr_wings.yy | 8 +- sprites/spr_wisdom_icon/spr_wisdom_icon.yy | 8 +- sprites/spr_wolf_tail/spr_wolf_tail.yy | 20 +- .../spr_ws_mk3__pualdron_veteran.yy | 8 +- .../spr_ws_mk4_monovisor.yy | 8 +- sprites/spr_ws_mk5_helm/spr_ws_mk5_helm.yy | 14 +- sprites/spr_ws_mk6_helm/spr_ws_mk6_helm.yy | 14 +- sprites/spr_ws_mk7_helm/spr_ws_mk7_helm.yy | 14 +- .../spr_ws_mk7_scar_of_the_ancients.yy | 8 +- sprites/sprite134/sprite134.yy | 80 +-- sprites/sprite156/sprite156.yy | 8 +- sprites/sprite158/sprite158.yy | 8 +- sprites/sprite160/sprite160.yy | 8 +- sprites/sprite205/sprite205.yy | 374 ++++------- sprites/sprite221/sprite221.yy | 8 +- sprites/sprite230/sprite230.yy | 8 +- sprites/sprite235/sprite235.yy | 8 +- sprites/sprite245/sprite245.yy | 8 +- sprites/sprite266/sprite266.yy | 14 +- sprites/sprite267/sprite267.yy | 74 +-- sprites/sprite269/sprite269.yy | 104 +-- 755 files changed, 6509 insertions(+), 12324 deletions(-) diff --git a/ChapterMaster.yyp b/ChapterMaster.yyp index af3d77c6b6..227c0302fd 100644 --- a/ChapterMaster.yyp +++ b/ChapterMaster.yyp @@ -2,7 +2,7 @@ "$GMProject":"v1", "%Name":"ChapterMaster", "AudioGroups":[ - {"$GMAudioGroup":"","%Name":"audiogroup_default","name":"audiogroup_default","resourceType":"GMAudioGroup","resourceVersion":"2.0","targets":-1,}, + {"$GMAudioGroup":"v1","%Name":"audiogroup_default","exportDir":"","name":"audiogroup_default","resourceType":"GMAudioGroup","resourceVersion":"2.0","targets":-1,}, ], "configs":{ "children":[], @@ -570,7 +570,7 @@ "isEcma":false, "LibraryEmitters":[], "MetaData":{ - "IDEVersion":"2024.1300.0.785", + "IDEVersion":"2024.1400.0.808", }, "name":"ChapterMaster", "resources":[ diff --git a/options/main/options_main.yy b/options/main/options_main.yy index 858eb0c4f3..ce6c7209a8 100644 --- a/options/main/options_main.yy +++ b/options/main/options_main.yy @@ -1,7 +1,8 @@ { - "$GMMainOptions":"v3", + "$GMMainOptions":"v4", "%Name":"Main", "name":"Main", + "option_allow_instance_change":true, "option_audio_error_behaviour":false, "option_author":"", "option_collision_compatibility":false, diff --git a/options/operagx/options_operagx.yy b/options/operagx/options_operagx.yy index 92ae9c298c..2b49fa3ac3 100644 --- a/options/operagx/options_operagx.yy +++ b/options/operagx/options_operagx.yy @@ -1,5 +1,5 @@ { - "$GMOperaGXOptions":"", + "$GMOperaGXOptions":"v1", "%Name":"operagx", "name":"operagx", "option_operagx_display_cursor":true, @@ -23,6 +23,7 @@ "option_operagx_team_id":"473feff6-8a4c-48fb-8940-4d123455fe5a", "option_operagx_team_name":"ZAB1019 studio", "option_operagx_texture_page":"2048x2048", + "option_operagx_transparent_background":false, "option_operagx_version":"1.0.0.6", "resourceType":"GMOperaGXOptions", "resourceVersion":"2.0", diff --git a/sounds/snd_battle/snd_battle.yy b/sounds/snd_battle/snd_battle.yy index 6cfc476f98..8eca95eaf4 100644 --- a/sounds/snd_battle/snd_battle.yy +++ b/sounds/snd_battle/snd_battle.yy @@ -1,5 +1,5 @@ { - "$GMSound":"", + "$GMSound":"v1", "%Name":"snd_battle", "audioGroupId":{ "name":"audiogroup_default", @@ -10,6 +10,7 @@ "compression":3, "conversionMode":0, "duration":164.70705, + "exportDir":"", "name":"snd_battle", "parent":{ "name":"Themes", diff --git a/sounds/snd_blood/snd_blood.yy b/sounds/snd_blood/snd_blood.yy index 2e9cd4a2a3..d588cf2b7c 100644 --- a/sounds/snd_blood/snd_blood.yy +++ b/sounds/snd_blood/snd_blood.yy @@ -1,5 +1,5 @@ { - "$GMSound":"", + "$GMSound":"v1", "%Name":"snd_blood", "audioGroupId":{ "name":"audiogroup_default", @@ -10,6 +10,7 @@ "compression":3, "conversionMode":0, "duration":120.95194, + "exportDir":"", "name":"snd_blood", "parent":{ "name":"Themes", diff --git a/sounds/snd_buzz/snd_buzz.yy b/sounds/snd_buzz/snd_buzz.yy index e251b3745e..efb71e7707 100644 --- a/sounds/snd_buzz/snd_buzz.yy +++ b/sounds/snd_buzz/snd_buzz.yy @@ -1,5 +1,5 @@ { - "$GMSound":"", + "$GMSound":"v1", "%Name":"snd_buzz", "audioGroupId":{ "name":"audiogroup_default", @@ -10,6 +10,7 @@ "compression":0, "conversionMode":0, "duration":1.547641, + "exportDir":"", "name":"snd_buzz", "parent":{ "name":"Sounds", diff --git a/sounds/snd_click/snd_click.yy b/sounds/snd_click/snd_click.yy index 21a69821ab..8893b9b6b8 100644 --- a/sounds/snd_click/snd_click.yy +++ b/sounds/snd_click/snd_click.yy @@ -1,5 +1,5 @@ { - "$GMSound":"", + "$GMSound":"v1", "%Name":"snd_click", "audioGroupId":{ "name":"audiogroup_default", @@ -10,6 +10,7 @@ "compression":0, "conversionMode":0, "duration":0.336406, + "exportDir":"", "name":"snd_click", "parent":{ "name":"Sounds", diff --git a/sounds/snd_click_small/snd_click_small.yy b/sounds/snd_click_small/snd_click_small.yy index 7351fe51ff..c57ac785b4 100644 --- a/sounds/snd_click_small/snd_click_small.yy +++ b/sounds/snd_click_small/snd_click_small.yy @@ -1,5 +1,5 @@ { - "$GMSound":"", + "$GMSound":"v1", "%Name":"snd_click_small", "audioGroupId":{ "name":"audiogroup_default", @@ -10,6 +10,7 @@ "compression":0, "conversionMode":0, "duration":0.187857, + "exportDir":"", "name":"snd_click_small", "parent":{ "name":"Sounds", diff --git a/sounds/snd_defeat/snd_defeat.yy b/sounds/snd_defeat/snd_defeat.yy index 8bd3304dda..0f6a233732 100644 --- a/sounds/snd_defeat/snd_defeat.yy +++ b/sounds/snd_defeat/snd_defeat.yy @@ -1,5 +1,5 @@ { - "$GMSound":"", + "$GMSound":"v1", "%Name":"snd_defeat", "audioGroupId":{ "name":"audiogroup_default", @@ -10,6 +10,7 @@ "compression":3, "conversionMode":0, "duration":267.6556, + "exportDir":"", "name":"snd_defeat", "parent":{ "name":"Themes", diff --git a/sounds/snd_diboz/snd_diboz.yy b/sounds/snd_diboz/snd_diboz.yy index 9cb28ab2b0..515025db07 100644 --- a/sounds/snd_diboz/snd_diboz.yy +++ b/sounds/snd_diboz/snd_diboz.yy @@ -1,5 +1,5 @@ { - "$GMSound":"", + "$GMSound":"v1", "%Name":"snd_diboz", "audioGroupId":{ "name":"audiogroup_default", @@ -10,6 +10,7 @@ "compression":3, "conversionMode":0, "duration":214.39194, + "exportDir":"", "name":"snd_diboz", "parent":{ "name":"Themes", diff --git a/sounds/snd_end_turn/snd_end_turn.yy b/sounds/snd_end_turn/snd_end_turn.yy index 6b1d427712..ff1a8de04e 100644 --- a/sounds/snd_end_turn/snd_end_turn.yy +++ b/sounds/snd_end_turn/snd_end_turn.yy @@ -1,5 +1,5 @@ { - "$GMSound":"", + "$GMSound":"v1", "%Name":"snd_end_turn", "audioGroupId":{ "name":"audiogroup_default", @@ -10,6 +10,7 @@ "compression":0, "conversionMode":0, "duration":0.331667, + "exportDir":"", "name":"snd_end_turn", "parent":{ "name":"Sounds", diff --git a/sounds/snd_error/snd_error.yy b/sounds/snd_error/snd_error.yy index 9ad262469b..08324bf515 100644 --- a/sounds/snd_error/snd_error.yy +++ b/sounds/snd_error/snd_error.yy @@ -1,5 +1,5 @@ { - "$GMSound":"", + "$GMSound":"v1", "%Name":"snd_error", "audioGroupId":{ "name":"audiogroup_default", @@ -10,6 +10,7 @@ "compression":0, "conversionMode":0, "duration":0.274388, + "exportDir":"", "name":"snd_error", "parent":{ "name":"Sounds", diff --git a/sounds/snd_identify/snd_identify.yy b/sounds/snd_identify/snd_identify.yy index f656974441..6a25de74d9 100644 --- a/sounds/snd_identify/snd_identify.yy +++ b/sounds/snd_identify/snd_identify.yy @@ -1,5 +1,5 @@ { - "$GMSound":"", + "$GMSound":"v1", "%Name":"snd_identify", "audioGroupId":{ "name":"audiogroup_default", @@ -10,6 +10,7 @@ "compression":0, "conversionMode":0, "duration":0.773, + "exportDir":"", "name":"snd_identify", "parent":{ "name":"Sounds", diff --git a/sounds/snd_legal/snd_legal.yy b/sounds/snd_legal/snd_legal.yy index bc41571086..f45f02da1e 100644 --- a/sounds/snd_legal/snd_legal.yy +++ b/sounds/snd_legal/snd_legal.yy @@ -1,5 +1,5 @@ { - "$GMSound":"", + "$GMSound":"v1", "%Name":"snd_legal", "audioGroupId":{ "name":"audiogroup_default", @@ -10,6 +10,7 @@ "compression":3, "conversionMode":0, "duration":30.280918, + "exportDir":"", "name":"snd_legal", "parent":{ "name":"Themes", diff --git a/sounds/snd_postbattle/snd_postbattle.yy b/sounds/snd_postbattle/snd_postbattle.yy index 05a0f422be..ccb0bc0387 100644 --- a/sounds/snd_postbattle/snd_postbattle.yy +++ b/sounds/snd_postbattle/snd_postbattle.yy @@ -1,5 +1,5 @@ { - "$GMSound":"", + "$GMSound":"v1", "%Name":"snd_postbattle", "audioGroupId":{ "name":"audiogroup_default", @@ -10,6 +10,7 @@ "compression":3, "conversionMode":0, "duration":279.72418, + "exportDir":"", "name":"snd_postbattle", "parent":{ "name":"Themes", diff --git a/sounds/snd_prologue/snd_prologue.yy b/sounds/snd_prologue/snd_prologue.yy index ed99240f73..c3b900765f 100644 --- a/sounds/snd_prologue/snd_prologue.yy +++ b/sounds/snd_prologue/snd_prologue.yy @@ -1,5 +1,5 @@ { - "$GMSound":"", + "$GMSound":"v1", "%Name":"snd_prologue", "audioGroupId":{ "name":"audiogroup_default", @@ -10,6 +10,7 @@ "compression":3, "conversionMode":0, "duration":146.21767, + "exportDir":"", "name":"snd_prologue", "parent":{ "name":"Themes", diff --git a/sounds/snd_redownload/snd_redownload.yy b/sounds/snd_redownload/snd_redownload.yy index 0d9e683d88..2b31e9491a 100644 --- a/sounds/snd_redownload/snd_redownload.yy +++ b/sounds/snd_redownload/snd_redownload.yy @@ -1,5 +1,5 @@ { - "$GMSound":"", + "$GMSound":"v1", "%Name":"snd_redownload", "audioGroupId":{ "name":"audiogroup_default", @@ -10,6 +10,7 @@ "compression":0, "conversionMode":0, "duration":1.816156, + "exportDir":"", "name":"snd_redownload", "parent":{ "name":"Sounds", diff --git a/sounds/snd_royal/snd_royal.yy b/sounds/snd_royal/snd_royal.yy index 4c809dba1b..58fce7d63c 100644 --- a/sounds/snd_royal/snd_royal.yy +++ b/sounds/snd_royal/snd_royal.yy @@ -1,5 +1,5 @@ { - "$GMSound":"", + "$GMSound":"v1", "%Name":"snd_royal", "audioGroupId":{ "name":"audiogroup_default", @@ -10,6 +10,7 @@ "compression":3, "conversionMode":0, "duration":179.23112, + "exportDir":"", "name":"snd_royal", "parent":{ "name":"Themes", diff --git a/sounds/snd_stc/snd_stc.yy b/sounds/snd_stc/snd_stc.yy index a8e09fa42d..8e9cff2715 100644 --- a/sounds/snd_stc/snd_stc.yy +++ b/sounds/snd_stc/snd_stc.yy @@ -1,5 +1,5 @@ { - "$GMSound":"", + "$GMSound":"v1", "%Name":"snd_stc", "audioGroupId":{ "name":"audiogroup_default", @@ -10,6 +10,7 @@ "compression":0, "conversionMode":0, "duration":0.597109, + "exportDir":"", "name":"snd_stc", "parent":{ "name":"Sounds", diff --git a/sounds/snd_vode/snd_vode.yy b/sounds/snd_vode/snd_vode.yy index 90c4d541d5..bc6194d9c3 100644 --- a/sounds/snd_vode/snd_vode.yy +++ b/sounds/snd_vode/snd_vode.yy @@ -1,5 +1,5 @@ { - "$GMSound":"", + "$GMSound":"v1", "%Name":"snd_vode", "audioGroupId":{ "name":"audiogroup_default", @@ -10,6 +10,7 @@ "compression":3, "conversionMode":0, "duration":118.42445, + "exportDir":"", "name":"snd_vode", "parent":{ "name":"Themes", diff --git a/sprites/Sprite544/Sprite544.yy b/sprites/Sprite544/Sprite544.yy index 1dfd976825..fa0d6fe4c6 100644 --- a/sprites/Sprite544/Sprite544.yy +++ b/sprites/Sprite544/Sprite544.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"Sprite544", "bboxMode":0, "bbox_bottom":0, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"1132b02e-7adf-47d6-ae57-ba65d8120062","name":"1132b02e-7adf-47d6-ae57-ba65d8120062","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"1132b02e-7adf-47d6-ae57-ba65d8120062","name":"1132b02e-7adf-47d6-ae57-ba65d8120062","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"1132b02e-7adf-47d6-ae57-ba65d8120062","path":"sprites/Sprite544/Sprite544.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"fdc6d240-127c-4364-9fb6-649444dd8487","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"1132b02e-7adf-47d6-ae57-ba65d8120062","path":"sprites/Sprite544/Sprite544.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"fdc6d240-127c-4364-9fb6-649444dd8487","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/bg_space/bg_space.yy b/sprites/bg_space/bg_space.yy index 2168185ce0..9364828d81 100644 --- a/sprites/bg_space/bg_space.yy +++ b/sprites/bg_space/bg_space.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"bg_space", "bboxMode":0, "bbox_bottom":63, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"4d748e19-d979-4303-9ae4-0a004dd8159f","name":"4d748e19-d979-4303-9ae4-0a004dd8159f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"4d748e19-d979-4303-9ae4-0a004dd8159f","name":"4d748e19-d979-4303-9ae4-0a004dd8159f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"4d748e19-d979-4303-9ae4-0a004dd8159f","path":"sprites/bg_space/bg_space.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"5101cb29-0a09-40a1-b6ce-7afb57f5e6d3","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"4d748e19-d979-4303-9ae4-0a004dd8159f","path":"sprites/bg_space/bg_space.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"5101cb29-0a09-40a1-b6ce-7afb57f5e6d3","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":{ diff --git a/sprites/dsgsdgsdg/dsgsdgsdg.yy b/sprites/dsgsdgsdg/dsgsdgsdg.yy index f676732510..d6dc8acbcd 100644 --- a/sprites/dsgsdgsdg/dsgsdgsdg.yy +++ b/sprites/dsgsdgsdg/dsgsdgsdg.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"dsgsdgsdg", "bboxMode":0, "bbox_bottom":27, @@ -12,18 +12,18 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"8755bf76-0300-447b-98df-32603fd72412","name":"8755bf76-0300-447b-98df-32603fd72412","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"a7bef077-45bd-4b29-87f0-23e5b72345b7","name":"a7bef077-45bd-4b29-87f0-23e5b72345b7","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"4bbf7791-2c8e-4c3f-926b-d878f6f4173e","name":"4bbf7791-2c8e-4c3f-926b-d878f6f4173e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"a6da8494-1dc5-4df9-bc4f-c8a33e63f520","name":"a6da8494-1dc5-4df9-bc4f-c8a33e63f520","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"f234e3a6-cda2-4f24-bded-b5ac4e868a00","name":"f234e3a6-cda2-4f24-bded-b5ac4e868a00","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"6a0e8ece-8df5-43c0-811b-5974afa8985f","name":"6a0e8ece-8df5-43c0-811b-5974afa8985f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"83ffdcb7-a9bb-4db8-8655-da3f1a455069","name":"83ffdcb7-a9bb-4db8-8655-da3f1a455069","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"804967a3-84c6-4c2d-876f-3f43cced0531","name":"804967a3-84c6-4c2d-876f-3f43cced0531","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"1f13b59c-96ab-4efb-bc04-a7717cbe81ad","name":"1f13b59c-96ab-4efb-bc04-a7717cbe81ad","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"23437e1a-64f8-4905-81b8-6ad985ec375b","name":"23437e1a-64f8-4905-81b8-6ad985ec375b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"5270eb03-a28b-4811-8da4-46aba283ac46","name":"5270eb03-a28b-4811-8da4-46aba283ac46","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"ac5d9445-fa47-4f7a-b5c2-8b50c8264015","name":"ac5d9445-fa47-4f7a-b5c2-8b50c8264015","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"8755bf76-0300-447b-98df-32603fd72412","name":"8755bf76-0300-447b-98df-32603fd72412","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"a7bef077-45bd-4b29-87f0-23e5b72345b7","name":"a7bef077-45bd-4b29-87f0-23e5b72345b7","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"4bbf7791-2c8e-4c3f-926b-d878f6f4173e","name":"4bbf7791-2c8e-4c3f-926b-d878f6f4173e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"a6da8494-1dc5-4df9-bc4f-c8a33e63f520","name":"a6da8494-1dc5-4df9-bc4f-c8a33e63f520","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"f234e3a6-cda2-4f24-bded-b5ac4e868a00","name":"f234e3a6-cda2-4f24-bded-b5ac4e868a00","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"6a0e8ece-8df5-43c0-811b-5974afa8985f","name":"6a0e8ece-8df5-43c0-811b-5974afa8985f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"83ffdcb7-a9bb-4db8-8655-da3f1a455069","name":"83ffdcb7-a9bb-4db8-8655-da3f1a455069","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"804967a3-84c6-4c2d-876f-3f43cced0531","name":"804967a3-84c6-4c2d-876f-3f43cced0531","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"1f13b59c-96ab-4efb-bc04-a7717cbe81ad","name":"1f13b59c-96ab-4efb-bc04-a7717cbe81ad","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"23437e1a-64f8-4905-81b8-6ad985ec375b","name":"23437e1a-64f8-4905-81b8-6ad985ec375b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"5270eb03-a28b-4811-8da4-46aba283ac46","name":"5270eb03-a28b-4811-8da4-46aba283ac46","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"ac5d9445-fa47-4f7a-b5c2-8b50c8264015","name":"ac5d9445-fa47-4f7a-b5c2-8b50c8264015","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -81,42 +81,18 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"8755bf76-0300-447b-98df-32603fd72412","path":"sprites/dsgsdgsdg/dsgsdgsdg.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"89e5d789-43f1-40b3-b484-6f0542b25f84","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"a7bef077-45bd-4b29-87f0-23e5b72345b7","path":"sprites/dsgsdgsdg/dsgsdgsdg.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"157d9292-fc11-4643-9069-88002e31eeaa","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"4bbf7791-2c8e-4c3f-926b-d878f6f4173e","path":"sprites/dsgsdgsdg/dsgsdgsdg.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"783a44c2-1a13-40e7-92f1-6f83cf964635","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"a6da8494-1dc5-4df9-bc4f-c8a33e63f520","path":"sprites/dsgsdgsdg/dsgsdgsdg.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"abff51bf-3172-4302-ab1c-e897bafe9dfa","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"f234e3a6-cda2-4f24-bded-b5ac4e868a00","path":"sprites/dsgsdgsdg/dsgsdgsdg.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"2d01c3f5-d7c1-4183-98b0-440ee78f7efa","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"6a0e8ece-8df5-43c0-811b-5974afa8985f","path":"sprites/dsgsdgsdg/dsgsdgsdg.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"9356c993-17af-4903-9f3c-8cc96973e737","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"83ffdcb7-a9bb-4db8-8655-da3f1a455069","path":"sprites/dsgsdgsdg/dsgsdgsdg.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"be93f187-dff1-468e-be1e-a4c5ffb5f166","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"804967a3-84c6-4c2d-876f-3f43cced0531","path":"sprites/dsgsdgsdg/dsgsdgsdg.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"98d5250e-9736-40ca-8d41-7211dc4caad0","IsCreationKey":false,"Key":7.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"1f13b59c-96ab-4efb-bc04-a7717cbe81ad","path":"sprites/dsgsdgsdg/dsgsdgsdg.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"641d28f8-d111-4a5f-9e8b-47aa6998d58c","IsCreationKey":false,"Key":8.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"23437e1a-64f8-4905-81b8-6ad985ec375b","path":"sprites/dsgsdgsdg/dsgsdgsdg.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"a765f95f-efbd-448b-9b39-38e7f5a6ed5e","IsCreationKey":false,"Key":9.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"5270eb03-a28b-4811-8da4-46aba283ac46","path":"sprites/dsgsdgsdg/dsgsdgsdg.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"bb36a05f-c433-4722-843c-e8458f605c5f","IsCreationKey":false,"Key":10.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"ac5d9445-fa47-4f7a-b5c2-8b50c8264015","path":"sprites/dsgsdgsdg/dsgsdgsdg.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"24c3781b-1224-4c93-8cc1-3a5b08e199b5","IsCreationKey":false,"Key":11.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"8755bf76-0300-447b-98df-32603fd72412","path":"sprites/dsgsdgsdg/dsgsdgsdg.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"89e5d789-43f1-40b3-b484-6f0542b25f84","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"a7bef077-45bd-4b29-87f0-23e5b72345b7","path":"sprites/dsgsdgsdg/dsgsdgsdg.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"157d9292-fc11-4643-9069-88002e31eeaa","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"4bbf7791-2c8e-4c3f-926b-d878f6f4173e","path":"sprites/dsgsdgsdg/dsgsdgsdg.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"783a44c2-1a13-40e7-92f1-6f83cf964635","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"a6da8494-1dc5-4df9-bc4f-c8a33e63f520","path":"sprites/dsgsdgsdg/dsgsdgsdg.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"abff51bf-3172-4302-ab1c-e897bafe9dfa","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"f234e3a6-cda2-4f24-bded-b5ac4e868a00","path":"sprites/dsgsdgsdg/dsgsdgsdg.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"2d01c3f5-d7c1-4183-98b0-440ee78f7efa","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"6a0e8ece-8df5-43c0-811b-5974afa8985f","path":"sprites/dsgsdgsdg/dsgsdgsdg.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"9356c993-17af-4903-9f3c-8cc96973e737","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"83ffdcb7-a9bb-4db8-8655-da3f1a455069","path":"sprites/dsgsdgsdg/dsgsdgsdg.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"be93f187-dff1-468e-be1e-a4c5ffb5f166","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"804967a3-84c6-4c2d-876f-3f43cced0531","path":"sprites/dsgsdgsdg/dsgsdgsdg.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"98d5250e-9736-40ca-8d41-7211dc4caad0","IsCreationKey":false,"Key":7.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"1f13b59c-96ab-4efb-bc04-a7717cbe81ad","path":"sprites/dsgsdgsdg/dsgsdgsdg.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"641d28f8-d111-4a5f-9e8b-47aa6998d58c","IsCreationKey":false,"Key":8.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"23437e1a-64f8-4905-81b8-6ad985ec375b","path":"sprites/dsgsdgsdg/dsgsdgsdg.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"a765f95f-efbd-448b-9b39-38e7f5a6ed5e","IsCreationKey":false,"Key":9.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"5270eb03-a28b-4811-8da4-46aba283ac46","path":"sprites/dsgsdgsdg/dsgsdgsdg.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"bb36a05f-c433-4722-843c-e8458f605c5f","IsCreationKey":false,"Key":10.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"ac5d9445-fa47-4f7a-b5c2-8b50c8264015","path":"sprites/dsgsdgsdg/dsgsdgsdg.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"24c3781b-1224-4c93-8cc1-3a5b08e199b5","IsCreationKey":false,"Key":11.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/mk7_chest_variants/mk7_chest_variants.yy b/sprites/mk7_chest_variants/mk7_chest_variants.yy index 2467f1d624..d690dc273a 100644 --- a/sprites/mk7_chest_variants/mk7_chest_variants.yy +++ b/sprites/mk7_chest_variants/mk7_chest_variants.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"mk7_chest_variants", "bboxMode":0, "bbox_bottom":89, @@ -12,8 +12,8 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"18394c2c-6406-40fe-8ad1-ee4ebd629435","name":"18394c2c-6406-40fe-8ad1-ee4ebd629435","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"25fd73f2-dbb3-4ee5-8201-8fefbe86bbee","name":"25fd73f2-dbb3-4ee5-8201-8fefbe86bbee","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"18394c2c-6406-40fe-8ad1-ee4ebd629435","name":"18394c2c-6406-40fe-8ad1-ee4ebd629435","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"25fd73f2-dbb3-4ee5-8201-8fefbe86bbee","name":"25fd73f2-dbb3-4ee5-8201-8fefbe86bbee","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -69,12 +69,8 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"18394c2c-6406-40fe-8ad1-ee4ebd629435","path":"sprites/mk7_chest_variants/mk7_chest_variants.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"6f9f20b0-beb6-439c-bd82-d2569b74ba6a","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/mk7_chest_variants/mk7_chest_variants.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"deecab9f-9a51-4147-8f41-8240312df64e","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"18394c2c-6406-40fe-8ad1-ee4ebd629435","path":"sprites/mk7_chest_variants/mk7_chest_variants.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"6f9f20b0-beb6-439c-bd82-d2569b74ba6a","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/mk7_chest_variants/mk7_chest_variants.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"deecab9f-9a51-4147-8f41-8240312df64e","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_advisors/spr_advisors.yy b/sprites/spr_advisors/spr_advisors.yy index d11287eb2e..936cbc2346 100644 --- a/sprites/spr_advisors/spr_advisors.yy +++ b/sprites/spr_advisors/spr_advisors.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_advisors", "bboxMode":0, "bbox_bottom":0, diff --git a/sprites/spr_apoth_area_pad/spr_apoth_area_pad.yy b/sprites/spr_apoth_area_pad/spr_apoth_area_pad.yy index d857a103e9..e5ad375a7d 100644 --- a/sprites/spr_apoth_area_pad/spr_apoth_area_pad.yy +++ b/sprites/spr_apoth_area_pad/spr_apoth_area_pad.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_apoth_area_pad", "bboxMode":0, "bbox_bottom":156, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"9c1e74d7-d741-437f-8db4-140b9955efc9","name":"9c1e74d7-d741-437f-8db4-140b9955efc9","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"9c1e74d7-d741-437f-8db4-140b9955efc9","name":"9c1e74d7-d741-437f-8db4-140b9955efc9","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"9c1e74d7-d741-437f-8db4-140b9955efc9","path":"sprites/spr_apoth_area_pad/spr_apoth_area_pad.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"77dd214e-9be8-4d2a-a93c-21af64c5dd5b","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"9c1e74d7-d741-437f-8db4-140b9955efc9","path":"sprites/spr_apoth_area_pad/spr_apoth_area_pad.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"77dd214e-9be8-4d2a-a93c-21af64c5dd5b","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_apothecary_lights/spr_apothecary_lights.yy b/sprites/spr_apothecary_lights/spr_apothecary_lights.yy index 50310c7048..f8b03691d8 100644 --- a/sprites/spr_apothecary_lights/spr_apothecary_lights.yy +++ b/sprites/spr_apothecary_lights/spr_apothecary_lights.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_apothecary_lights", "bboxMode":0, "bbox_bottom":41, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"fbe2c10c-ddf0-458e-99ee-c3b5fba778d6","name":"fbe2c10c-ddf0-458e-99ee-c3b5fba778d6","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"fbe2c10c-ddf0-458e-99ee-c3b5fba778d6","name":"fbe2c10c-ddf0-458e-99ee-c3b5fba778d6","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "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_aquila_colors/spr_aquila_colors.yy b/sprites/spr_aquila_colors/spr_aquila_colors.yy index 40c3214850..43f1d4643e 100644 --- a/sprites/spr_aquila_colors/spr_aquila_colors.yy +++ b/sprites/spr_aquila_colors/spr_aquila_colors.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_aquila_colors", "bboxMode":0, "bbox_bottom":221, @@ -12,20 +12,20 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"196b945c-ac20-4bf9-9811-743bb063884e","name":"196b945c-ac20-4bf9-9811-743bb063884e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"5843a196-8071-4e10-b21d-45456dffc379","name":"5843a196-8071-4e10-b21d-45456dffc379","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"3c59acbe-3f7e-44f3-9e87-eeb9bbab01c3","name":"3c59acbe-3f7e-44f3-9e87-eeb9bbab01c3","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"a63829bc-4178-4cf8-8eee-5d1b24d504ec","name":"a63829bc-4178-4cf8-8eee-5d1b24d504ec","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"3c0ec601-323c-4e06-be22-41749ffcb84e","name":"3c0ec601-323c-4e06-be22-41749ffcb84e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"e31dc7c8-67c0-4bac-92c5-3afa1ac1d7a6","name":"e31dc7c8-67c0-4bac-92c5-3afa1ac1d7a6","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"ee592b7e-0742-407c-97d7-4123a8c1992c","name":"ee592b7e-0742-407c-97d7-4123a8c1992c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"b10e630c-c99d-4c23-9e0a-46769320b643","name":"b10e630c-c99d-4c23-9e0a-46769320b643","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"e437bbdf-1979-4fb7-b411-468a21361f65","name":"e437bbdf-1979-4fb7-b411-468a21361f65","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"c1df320b-7e47-42b6-b105-390436d863a4","name":"c1df320b-7e47-42b6-b105-390436d863a4","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"ea5e3982-0e43-4acb-bf1a-aee426e5af77","name":"ea5e3982-0e43-4acb-bf1a-aee426e5af77","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"d49d2d69-0fa6-4af5-815f-0e0657860737","name":"d49d2d69-0fa6-4af5-815f-0e0657860737","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"f5c722bf-2493-4f9d-8167-67bd3e21811d","name":"f5c722bf-2493-4f9d-8167-67bd3e21811d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"e2028e31-ad62-493d-abaa-5f1fcde51501","name":"e2028e31-ad62-493d-abaa-5f1fcde51501","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"196b945c-ac20-4bf9-9811-743bb063884e","name":"196b945c-ac20-4bf9-9811-743bb063884e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"5843a196-8071-4e10-b21d-45456dffc379","name":"5843a196-8071-4e10-b21d-45456dffc379","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"3c59acbe-3f7e-44f3-9e87-eeb9bbab01c3","name":"3c59acbe-3f7e-44f3-9e87-eeb9bbab01c3","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"a63829bc-4178-4cf8-8eee-5d1b24d504ec","name":"a63829bc-4178-4cf8-8eee-5d1b24d504ec","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"3c0ec601-323c-4e06-be22-41749ffcb84e","name":"3c0ec601-323c-4e06-be22-41749ffcb84e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"e31dc7c8-67c0-4bac-92c5-3afa1ac1d7a6","name":"e31dc7c8-67c0-4bac-92c5-3afa1ac1d7a6","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"ee592b7e-0742-407c-97d7-4123a8c1992c","name":"ee592b7e-0742-407c-97d7-4123a8c1992c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"b10e630c-c99d-4c23-9e0a-46769320b643","name":"b10e630c-c99d-4c23-9e0a-46769320b643","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"e437bbdf-1979-4fb7-b411-468a21361f65","name":"e437bbdf-1979-4fb7-b411-468a21361f65","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"c1df320b-7e47-42b6-b105-390436d863a4","name":"c1df320b-7e47-42b6-b105-390436d863a4","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"ea5e3982-0e43-4acb-bf1a-aee426e5af77","name":"ea5e3982-0e43-4acb-bf1a-aee426e5af77","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"d49d2d69-0fa6-4af5-815f-0e0657860737","name":"d49d2d69-0fa6-4af5-815f-0e0657860737","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"f5c722bf-2493-4f9d-8167-67bd3e21811d","name":"f5c722bf-2493-4f9d-8167-67bd3e21811d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"e2028e31-ad62-493d-abaa-5f1fcde51501","name":"e2028e31-ad62-493d-abaa-5f1fcde51501","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -81,48 +81,20 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"196b945c-ac20-4bf9-9811-743bb063884e","path":"sprites/spr_aquila_colors/spr_aquila_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"7d92f84e-7fda-4042-8bf3-8d75c183ffbe","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"5843a196-8071-4e10-b21d-45456dffc379","path":"sprites/spr_aquila_colors/spr_aquila_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"c1b408a5-f735-431f-a3ae-1ebeca8bd24c","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"3c59acbe-3f7e-44f3-9e87-eeb9bbab01c3","path":"sprites/spr_aquila_colors/spr_aquila_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"28aca0d5-a8be-4d70-941a-590e091741fc","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"a63829bc-4178-4cf8-8eee-5d1b24d504ec","path":"sprites/spr_aquila_colors/spr_aquila_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"b19d1431-4f05-48ff-bb03-2d023179144a","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"3c0ec601-323c-4e06-be22-41749ffcb84e","path":"sprites/spr_aquila_colors/spr_aquila_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"bb6ac728-e049-4b87-bd77-7eccb8c94350","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"e31dc7c8-67c0-4bac-92c5-3afa1ac1d7a6","path":"sprites/spr_aquila_colors/spr_aquila_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"4744f839-6997-4671-a498-e0bbbc236cb5","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"ee592b7e-0742-407c-97d7-4123a8c1992c","path":"sprites/spr_aquila_colors/spr_aquila_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"5b155f6a-092b-4ec9-8a65-5df1ede3ec1a","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"b10e630c-c99d-4c23-9e0a-46769320b643","path":"sprites/spr_aquila_colors/spr_aquila_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"bd592ee2-c0db-4e55-9055-b1548d08c069","IsCreationKey":false,"Key":7.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"e437bbdf-1979-4fb7-b411-468a21361f65","path":"sprites/spr_aquila_colors/spr_aquila_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"921cff8f-fc1c-4753-94b1-813e101db02b","IsCreationKey":false,"Key":8.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"c1df320b-7e47-42b6-b105-390436d863a4","path":"sprites/spr_aquila_colors/spr_aquila_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"435242ef-9cd1-4978-b4bc-f15d7ee199bf","IsCreationKey":false,"Key":9.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"ea5e3982-0e43-4acb-bf1a-aee426e5af77","path":"sprites/spr_aquila_colors/spr_aquila_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"ac399a32-b604-46e2-b847-b6c4f2e4746a","IsCreationKey":false,"Key":10.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"d49d2d69-0fa6-4af5-815f-0e0657860737","path":"sprites/spr_aquila_colors/spr_aquila_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"84a891a9-823a-4488-bb53-6370068347c2","IsCreationKey":false,"Key":11.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"f5c722bf-2493-4f9d-8167-67bd3e21811d","path":"sprites/spr_aquila_colors/spr_aquila_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"c81bb583-4b9b-4251-8b63-2fc42968eece","IsCreationKey":false,"Key":12.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"e2028e31-ad62-493d-abaa-5f1fcde51501","path":"sprites/spr_aquila_colors/spr_aquila_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"6b926782-d210-4324-b763-d9565e01db99","IsCreationKey":false,"Key":13.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"196b945c-ac20-4bf9-9811-743bb063884e","path":"sprites/spr_aquila_colors/spr_aquila_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"7d92f84e-7fda-4042-8bf3-8d75c183ffbe","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"5843a196-8071-4e10-b21d-45456dffc379","path":"sprites/spr_aquila_colors/spr_aquila_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"c1b408a5-f735-431f-a3ae-1ebeca8bd24c","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"3c59acbe-3f7e-44f3-9e87-eeb9bbab01c3","path":"sprites/spr_aquila_colors/spr_aquila_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"28aca0d5-a8be-4d70-941a-590e091741fc","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"a63829bc-4178-4cf8-8eee-5d1b24d504ec","path":"sprites/spr_aquila_colors/spr_aquila_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"b19d1431-4f05-48ff-bb03-2d023179144a","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"3c0ec601-323c-4e06-be22-41749ffcb84e","path":"sprites/spr_aquila_colors/spr_aquila_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"bb6ac728-e049-4b87-bd77-7eccb8c94350","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"e31dc7c8-67c0-4bac-92c5-3afa1ac1d7a6","path":"sprites/spr_aquila_colors/spr_aquila_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"4744f839-6997-4671-a498-e0bbbc236cb5","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"ee592b7e-0742-407c-97d7-4123a8c1992c","path":"sprites/spr_aquila_colors/spr_aquila_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"5b155f6a-092b-4ec9-8a65-5df1ede3ec1a","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"b10e630c-c99d-4c23-9e0a-46769320b643","path":"sprites/spr_aquila_colors/spr_aquila_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"bd592ee2-c0db-4e55-9055-b1548d08c069","IsCreationKey":false,"Key":7.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"e437bbdf-1979-4fb7-b411-468a21361f65","path":"sprites/spr_aquila_colors/spr_aquila_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"921cff8f-fc1c-4753-94b1-813e101db02b","IsCreationKey":false,"Key":8.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"c1df320b-7e47-42b6-b105-390436d863a4","path":"sprites/spr_aquila_colors/spr_aquila_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"435242ef-9cd1-4978-b4bc-f15d7ee199bf","IsCreationKey":false,"Key":9.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"ea5e3982-0e43-4acb-bf1a-aee426e5af77","path":"sprites/spr_aquila_colors/spr_aquila_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"ac399a32-b604-46e2-b847-b6c4f2e4746a","IsCreationKey":false,"Key":10.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"d49d2d69-0fa6-4af5-815f-0e0657860737","path":"sprites/spr_aquila_colors/spr_aquila_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"84a891a9-823a-4488-bb53-6370068347c2","IsCreationKey":false,"Key":11.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"f5c722bf-2493-4f9d-8167-67bd3e21811d","path":"sprites/spr_aquila_colors/spr_aquila_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"c81bb583-4b9b-4251-8b63-2fc42968eece","IsCreationKey":false,"Key":12.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"e2028e31-ad62-493d-abaa-5f1fcde51501","path":"sprites/spr_aquila_colors/spr_aquila_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"6b926782-d210-4324-b763-d9565e01db99","IsCreationKey":false,"Key":13.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_arrow/spr_arrow.yy b/sprites/spr_arrow/spr_arrow.yy index 727007b913..a15eb37b4d 100644 --- a/sprites/spr_arrow/spr_arrow.yy +++ b/sprites/spr_arrow/spr_arrow.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_arrow", "bboxMode":0, "bbox_bottom":31, @@ -12,10 +12,10 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"fb5d2731-7edf-4f03-9af3-967453712162","name":"fb5d2731-7edf-4f03-9af3-967453712162","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"8a69eefe-952d-46cd-8453-6c8cf24fe7ef","name":"8a69eefe-952d-46cd-8453-6c8cf24fe7ef","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"e54d67b1-caa3-40de-b938-fff90bba2f4d","name":"e54d67b1-caa3-40de-b938-fff90bba2f4d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"1403322b-e756-41c8-bb4b-47e54d4ca8bd","name":"1403322b-e756-41c8-bb4b-47e54d4ca8bd","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"fb5d2731-7edf-4f03-9af3-967453712162","name":"fb5d2731-7edf-4f03-9af3-967453712162","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"8a69eefe-952d-46cd-8453-6c8cf24fe7ef","name":"8a69eefe-952d-46cd-8453-6c8cf24fe7ef","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"e54d67b1-caa3-40de-b938-fff90bba2f4d","name":"e54d67b1-caa3-40de-b938-fff90bba2f4d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"1403322b-e756-41c8-bb4b-47e54d4ca8bd","name":"1403322b-e756-41c8-bb4b-47e54d4ca8bd","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -71,18 +71,10 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"fb5d2731-7edf-4f03-9af3-967453712162","path":"sprites/spr_arrow/spr_arrow.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"89adf783-a574-4edb-8f59-3b08e65bf585","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"8a69eefe-952d-46cd-8453-6c8cf24fe7ef","path":"sprites/spr_arrow/spr_arrow.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"ce331085-eb5b-4228-ac95-f2bffc05336d","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"e54d67b1-caa3-40de-b938-fff90bba2f4d","path":"sprites/spr_arrow/spr_arrow.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"0f868074-84fa-4cec-a7ca-8bd2319cf19b","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"1403322b-e756-41c8-bb4b-47e54d4ca8bd","path":"sprites/spr_arrow/spr_arrow.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"60911368-393b-4d37-8ff6-989e4ccf4777","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"fb5d2731-7edf-4f03-9af3-967453712162","path":"sprites/spr_arrow/spr_arrow.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"89adf783-a574-4edb-8f59-3b08e65bf585","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"8a69eefe-952d-46cd-8453-6c8cf24fe7ef","path":"sprites/spr_arrow/spr_arrow.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"ce331085-eb5b-4228-ac95-f2bffc05336d","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"e54d67b1-caa3-40de-b938-fff90bba2f4d","path":"sprites/spr_arrow/spr_arrow.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"0f868074-84fa-4cec-a7ca-8bd2319cf19b","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"1403322b-e756-41c8-bb4b-47e54d4ca8bd","path":"sprites/spr_arrow/spr_arrow.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"60911368-393b-4d37-8ff6-989e4ccf4777","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":{ diff --git a/sprites/spr_artifact_button/spr_artifact_button.yy b/sprites/spr_artifact_button/spr_artifact_button.yy index cc016abea8..7c5d1a9b72 100644 --- a/sprites/spr_artifact_button/spr_artifact_button.yy +++ b/sprites/spr_artifact_button/spr_artifact_button.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_artifact_button", "bboxMode":0, "bbox_bottom":10, @@ -12,14 +12,14 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"82845b71-468a-440c-a932-2862a3476e6d","name":"82845b71-468a-440c-a932-2862a3476e6d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"bb815b57-b7f2-4c4c-a0b7-10dfb52fbd85","name":"bb815b57-b7f2-4c4c-a0b7-10dfb52fbd85","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"ea2e419c-789f-401c-876c-549d09cdb741","name":"ea2e419c-789f-401c-876c-549d09cdb741","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"3896f7c7-b6f2-4312-b4a6-5e129b6643a4","name":"3896f7c7-b6f2-4312-b4a6-5e129b6643a4","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"e04a69ea-e9e9-4796-a353-52f152064318","name":"e04a69ea-e9e9-4796-a353-52f152064318","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"a2386a43-d1ec-41e4-a61c-722ac93321ac","name":"a2386a43-d1ec-41e4-a61c-722ac93321ac","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"2a3531fd-cca3-4e90-8989-6a9743b3b71e","name":"2a3531fd-cca3-4e90-8989-6a9743b3b71e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"e1957e8d-5996-4d20-aa38-30a7b11a91ac","name":"e1957e8d-5996-4d20-aa38-30a7b11a91ac","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"82845b71-468a-440c-a932-2862a3476e6d","name":"82845b71-468a-440c-a932-2862a3476e6d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"bb815b57-b7f2-4c4c-a0b7-10dfb52fbd85","name":"bb815b57-b7f2-4c4c-a0b7-10dfb52fbd85","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"ea2e419c-789f-401c-876c-549d09cdb741","name":"ea2e419c-789f-401c-876c-549d09cdb741","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"3896f7c7-b6f2-4312-b4a6-5e129b6643a4","name":"3896f7c7-b6f2-4312-b4a6-5e129b6643a4","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"e04a69ea-e9e9-4796-a353-52f152064318","name":"e04a69ea-e9e9-4796-a353-52f152064318","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"a2386a43-d1ec-41e4-a61c-722ac93321ac","name":"a2386a43-d1ec-41e4-a61c-722ac93321ac","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"2a3531fd-cca3-4e90-8989-6a9743b3b71e","name":"2a3531fd-cca3-4e90-8989-6a9743b3b71e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"e1957e8d-5996-4d20-aa38-30a7b11a91ac","name":"e1957e8d-5996-4d20-aa38-30a7b11a91ac","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -75,30 +75,14 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"82845b71-468a-440c-a932-2862a3476e6d","path":"sprites/spr_artifact_button/spr_artifact_button.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"7f957935-db04-43c1-b32e-c2ad43c45291","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"bb815b57-b7f2-4c4c-a0b7-10dfb52fbd85","path":"sprites/spr_artifact_button/spr_artifact_button.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"b6c3b3b9-aa74-4818-96f8-d3867efdf436","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"ea2e419c-789f-401c-876c-549d09cdb741","path":"sprites/spr_artifact_button/spr_artifact_button.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"88a3f009-0cc5-49f5-a65f-925ae42ce303","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"3896f7c7-b6f2-4312-b4a6-5e129b6643a4","path":"sprites/spr_artifact_button/spr_artifact_button.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"f3a3140f-a181-4e8e-84e7-37b88bc3d04d","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"e04a69ea-e9e9-4796-a353-52f152064318","path":"sprites/spr_artifact_button/spr_artifact_button.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"ef8f81e9-6668-41d7-98ce-946bba9cbbca","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"a2386a43-d1ec-41e4-a61c-722ac93321ac","path":"sprites/spr_artifact_button/spr_artifact_button.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"e90413e9-6265-427b-aba4-a327302748db","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"2a3531fd-cca3-4e90-8989-6a9743b3b71e","path":"sprites/spr_artifact_button/spr_artifact_button.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"b7297585-09fe-4043-bdf5-614258359ff1","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"e1957e8d-5996-4d20-aa38-30a7b11a91ac","path":"sprites/spr_artifact_button/spr_artifact_button.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"e13e2bdf-85b0-4465-96a0-364f599779ae","IsCreationKey":false,"Key":7.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"82845b71-468a-440c-a932-2862a3476e6d","path":"sprites/spr_artifact_button/spr_artifact_button.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"7f957935-db04-43c1-b32e-c2ad43c45291","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"bb815b57-b7f2-4c4c-a0b7-10dfb52fbd85","path":"sprites/spr_artifact_button/spr_artifact_button.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"b6c3b3b9-aa74-4818-96f8-d3867efdf436","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"ea2e419c-789f-401c-876c-549d09cdb741","path":"sprites/spr_artifact_button/spr_artifact_button.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"88a3f009-0cc5-49f5-a65f-925ae42ce303","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"3896f7c7-b6f2-4312-b4a6-5e129b6643a4","path":"sprites/spr_artifact_button/spr_artifact_button.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"f3a3140f-a181-4e8e-84e7-37b88bc3d04d","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"e04a69ea-e9e9-4796-a353-52f152064318","path":"sprites/spr_artifact_button/spr_artifact_button.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"ef8f81e9-6668-41d7-98ce-946bba9cbbca","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"a2386a43-d1ec-41e4-a61c-722ac93321ac","path":"sprites/spr_artifact_button/spr_artifact_button.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"e90413e9-6265-427b-aba4-a327302748db","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"2a3531fd-cca3-4e90-8989-6a9743b3b71e","path":"sprites/spr_artifact_button/spr_artifact_button.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"b7297585-09fe-4043-bdf5-614258359ff1","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"e1957e8d-5996-4d20-aa38-30a7b11a91ac","path":"sprites/spr_artifact_button/spr_artifact_button.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"e13e2bdf-85b0-4465-96a0-364f599779ae","IsCreationKey":false,"Key":7.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":{ diff --git a/sprites/spr_artificer_armour/spr_artificer_armour.yy b/sprites/spr_artificer_armour/spr_artificer_armour.yy index 4aa32c6701..15fd57474a 100644 --- a/sprites/spr_artificer_armour/spr_artificer_armour.yy +++ b/sprites/spr_artificer_armour/spr_artificer_armour.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_artificer_armour", "bboxMode":0, "bbox_bottom":0, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"ca4df4be-eb20-4d55-a0eb-1d8fcc0220b9","name":"ca4df4be-eb20-4d55-a0eb-1d8fcc0220b9","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"ca4df4be-eb20-4d55-a0eb-1d8fcc0220b9","name":"ca4df4be-eb20-4d55-a0eb-1d8fcc0220b9","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"ca4df4be-eb20-4d55-a0eb-1d8fcc0220b9","path":"sprites/spr_artificer_armour/spr_artificer_armour.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"d7cf7d4b-a007-4322-8222-ef43754d18e8","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"ca4df4be-eb20-4d55-a0eb-1d8fcc0220b9","path":"sprites/spr_artificer_armour/spr_artificer_armour.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"d7cf7d4b-a007-4322-8222-ef43754d18e8","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_artificer_chest/spr_artificer_chest.yy b/sprites/spr_artificer_chest/spr_artificer_chest.yy index a9e4c3eb8c..75ca80b41e 100644 --- a/sprites/spr_artificer_chest/spr_artificer_chest.yy +++ b/sprites/spr_artificer_chest/spr_artificer_chest.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_artificer_chest", "bboxMode":0, "bbox_bottom":90, @@ -12,8 +12,8 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"5fd88342-b482-465c-a602-eeb5aa891585","name":"5fd88342-b482-465c-a602-eeb5aa891585","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"4f315ebe-0e5d-40f9-85c2-c3e24833c89d","name":"4f315ebe-0e5d-40f9-85c2-c3e24833c89d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"5fd88342-b482-465c-a602-eeb5aa891585","name":"5fd88342-b482-465c-a602-eeb5aa891585","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"4f315ebe-0e5d-40f9-85c2-c3e24833c89d","name":"4f315ebe-0e5d-40f9-85c2-c3e24833c89d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -71,12 +71,8 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"5fd88342-b482-465c-a602-eeb5aa891585","path":"sprites/spr_artificer_chest/spr_artificer_chest.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"695c24c1-c493-4c97-a688-991bf8fc18c9","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"4f315ebe-0e5d-40f9-85c2-c3e24833c89d","path":"sprites/spr_artificer_chest/spr_artificer_chest.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"bb007e86-4f39-43ed-b95a-b530d3d169db","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"5fd88342-b482-465c-a602-eeb5aa891585","path":"sprites/spr_artificer_chest/spr_artificer_chest.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"695c24c1-c493-4c97-a688-991bf8fc18c9","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"4f315ebe-0e5d-40f9-85c2-c3e24833c89d","path":"sprites/spr_artificer_chest/spr_artificer_chest.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"bb007e86-4f39-43ed-b95a-b530d3d169db","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_artificer_colors/spr_artificer_colors.yy b/sprites/spr_artificer_colors/spr_artificer_colors.yy index 012b24f3cf..bf2fb89584 100644 --- a/sprites/spr_artificer_colors/spr_artificer_colors.yy +++ b/sprites/spr_artificer_colors/spr_artificer_colors.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_artificer_colors", "bboxMode":0, "bbox_bottom":259, @@ -12,19 +12,19 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"85427dac-93fd-4529-a60d-9d0419649728","name":"85427dac-93fd-4529-a60d-9d0419649728","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"748e63c4-61df-4c2a-86a2-1e54b4923668","name":"748e63c4-61df-4c2a-86a2-1e54b4923668","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"ddd4e849-0eba-4c4d-ad0e-4f505fce5db3","name":"ddd4e849-0eba-4c4d-ad0e-4f505fce5db3","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"0686cdbf-e0a5-4271-82bc-f8770c9f1b56","name":"0686cdbf-e0a5-4271-82bc-f8770c9f1b56","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"da5ca32f-41e7-4ae2-b636-7582327fdc12","name":"da5ca32f-41e7-4ae2-b636-7582327fdc12","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"ed2a9d63-551a-45db-b43f-e2d2a35b2ebe","name":"ed2a9d63-551a-45db-b43f-e2d2a35b2ebe","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"18817c48-2122-4764-80af-9e943f35821b","name":"18817c48-2122-4764-80af-9e943f35821b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"81976d8e-48bf-4ed7-8142-69c598967cfc","name":"81976d8e-48bf-4ed7-8142-69c598967cfc","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"92eb2a7c-d72f-4f7e-9729-dc1edc808464","name":"92eb2a7c-d72f-4f7e-9729-dc1edc808464","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"e3544a7f-1d6a-425a-a330-32cd5a6858d1","name":"e3544a7f-1d6a-425a-a330-32cd5a6858d1","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"87bf6c6c-2f4a-4883-9191-f602799e9305","name":"87bf6c6c-2f4a-4883-9191-f602799e9305","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"8b770cde-e547-4eb9-9b08-961733463dbc","name":"8b770cde-e547-4eb9-9b08-961733463dbc","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"d1fdc37f-2ec9-49f1-bf1e-4ca14a6006cf","name":"d1fdc37f-2ec9-49f1-bf1e-4ca14a6006cf","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"85427dac-93fd-4529-a60d-9d0419649728","name":"85427dac-93fd-4529-a60d-9d0419649728","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"748e63c4-61df-4c2a-86a2-1e54b4923668","name":"748e63c4-61df-4c2a-86a2-1e54b4923668","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"ddd4e849-0eba-4c4d-ad0e-4f505fce5db3","name":"ddd4e849-0eba-4c4d-ad0e-4f505fce5db3","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"0686cdbf-e0a5-4271-82bc-f8770c9f1b56","name":"0686cdbf-e0a5-4271-82bc-f8770c9f1b56","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"da5ca32f-41e7-4ae2-b636-7582327fdc12","name":"da5ca32f-41e7-4ae2-b636-7582327fdc12","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"ed2a9d63-551a-45db-b43f-e2d2a35b2ebe","name":"ed2a9d63-551a-45db-b43f-e2d2a35b2ebe","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"18817c48-2122-4764-80af-9e943f35821b","name":"18817c48-2122-4764-80af-9e943f35821b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"81976d8e-48bf-4ed7-8142-69c598967cfc","name":"81976d8e-48bf-4ed7-8142-69c598967cfc","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"92eb2a7c-d72f-4f7e-9729-dc1edc808464","name":"92eb2a7c-d72f-4f7e-9729-dc1edc808464","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"e3544a7f-1d6a-425a-a330-32cd5a6858d1","name":"e3544a7f-1d6a-425a-a330-32cd5a6858d1","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"87bf6c6c-2f4a-4883-9191-f602799e9305","name":"87bf6c6c-2f4a-4883-9191-f602799e9305","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"8b770cde-e547-4eb9-9b08-961733463dbc","name":"8b770cde-e547-4eb9-9b08-961733463dbc","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"d1fdc37f-2ec9-49f1-bf1e-4ca14a6006cf","name":"d1fdc37f-2ec9-49f1-bf1e-4ca14a6006cf","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -82,45 +82,19 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"85427dac-93fd-4529-a60d-9d0419649728","path":"sprites/spr_artificer_colors/spr_artificer_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"c7295045-cbef-46f8-a2b8-5509abd297c9","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"748e63c4-61df-4c2a-86a2-1e54b4923668","path":"sprites/spr_artificer_colors/spr_artificer_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"2539586c-2517-4228-9636-40fa2795a01f","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"ddd4e849-0eba-4c4d-ad0e-4f505fce5db3","path":"sprites/spr_artificer_colors/spr_artificer_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"0a3fc28c-8dfc-4a79-8eb3-a1f49a3d96d4","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"0686cdbf-e0a5-4271-82bc-f8770c9f1b56","path":"sprites/spr_artificer_colors/spr_artificer_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"3a6de5f1-2455-49b5-9a97-ee7f015f58fb","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"da5ca32f-41e7-4ae2-b636-7582327fdc12","path":"sprites/spr_artificer_colors/spr_artificer_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"ab9517bd-47b3-49eb-895f-885db3de7ff0","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"ed2a9d63-551a-45db-b43f-e2d2a35b2ebe","path":"sprites/spr_artificer_colors/spr_artificer_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"db47a5c3-c0ac-4a80-a05e-7f99ee96c715","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"18817c48-2122-4764-80af-9e943f35821b","path":"sprites/spr_artificer_colors/spr_artificer_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"760fe7ce-e9b0-49c5-8efb-55e99091e83f","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"81976d8e-48bf-4ed7-8142-69c598967cfc","path":"sprites/spr_artificer_colors/spr_artificer_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"5d041acf-d941-47e6-bc2a-247f75db3689","IsCreationKey":false,"Key":7.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"92eb2a7c-d72f-4f7e-9729-dc1edc808464","path":"sprites/spr_artificer_colors/spr_artificer_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"79f29b73-bcdf-4160-b840-a89a8ca6b9f5","IsCreationKey":false,"Key":8.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"e3544a7f-1d6a-425a-a330-32cd5a6858d1","path":"sprites/spr_artificer_colors/spr_artificer_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"74e7f222-2d83-441b-945a-9a0a5e44f75b","IsCreationKey":false,"Key":9.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"87bf6c6c-2f4a-4883-9191-f602799e9305","path":"sprites/spr_artificer_colors/spr_artificer_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"c9c8bf3e-c92a-49b2-82d5-b1910bd4e60a","IsCreationKey":false,"Key":10.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"8b770cde-e547-4eb9-9b08-961733463dbc","path":"sprites/spr_artificer_colors/spr_artificer_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"cb83b1e8-da10-42a8-994d-d5b288dd7e7e","IsCreationKey":false,"Key":11.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"d1fdc37f-2ec9-49f1-bf1e-4ca14a6006cf","path":"sprites/spr_artificer_colors/spr_artificer_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"73dc5802-b53a-49ed-922d-ffcd859fbaa4","IsCreationKey":false,"Key":12.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"85427dac-93fd-4529-a60d-9d0419649728","path":"sprites/spr_artificer_colors/spr_artificer_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"c7295045-cbef-46f8-a2b8-5509abd297c9","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"748e63c4-61df-4c2a-86a2-1e54b4923668","path":"sprites/spr_artificer_colors/spr_artificer_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"2539586c-2517-4228-9636-40fa2795a01f","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"ddd4e849-0eba-4c4d-ad0e-4f505fce5db3","path":"sprites/spr_artificer_colors/spr_artificer_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"0a3fc28c-8dfc-4a79-8eb3-a1f49a3d96d4","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"0686cdbf-e0a5-4271-82bc-f8770c9f1b56","path":"sprites/spr_artificer_colors/spr_artificer_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"3a6de5f1-2455-49b5-9a97-ee7f015f58fb","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"da5ca32f-41e7-4ae2-b636-7582327fdc12","path":"sprites/spr_artificer_colors/spr_artificer_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"ab9517bd-47b3-49eb-895f-885db3de7ff0","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"ed2a9d63-551a-45db-b43f-e2d2a35b2ebe","path":"sprites/spr_artificer_colors/spr_artificer_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"db47a5c3-c0ac-4a80-a05e-7f99ee96c715","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"18817c48-2122-4764-80af-9e943f35821b","path":"sprites/spr_artificer_colors/spr_artificer_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"760fe7ce-e9b0-49c5-8efb-55e99091e83f","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"81976d8e-48bf-4ed7-8142-69c598967cfc","path":"sprites/spr_artificer_colors/spr_artificer_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"5d041acf-d941-47e6-bc2a-247f75db3689","IsCreationKey":false,"Key":7.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"92eb2a7c-d72f-4f7e-9729-dc1edc808464","path":"sprites/spr_artificer_colors/spr_artificer_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"79f29b73-bcdf-4160-b840-a89a8ca6b9f5","IsCreationKey":false,"Key":8.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"e3544a7f-1d6a-425a-a330-32cd5a6858d1","path":"sprites/spr_artificer_colors/spr_artificer_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"74e7f222-2d83-441b-945a-9a0a5e44f75b","IsCreationKey":false,"Key":9.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"87bf6c6c-2f4a-4883-9191-f602799e9305","path":"sprites/spr_artificer_colors/spr_artificer_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"c9c8bf3e-c92a-49b2-82d5-b1910bd4e60a","IsCreationKey":false,"Key":10.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"8b770cde-e547-4eb9-9b08-961733463dbc","path":"sprites/spr_artificer_colors/spr_artificer_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"cb83b1e8-da10-42a8-994d-d5b288dd7e7e","IsCreationKey":false,"Key":11.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"d1fdc37f-2ec9-49f1-bf1e-4ca14a6006cf","path":"sprites/spr_artificer_colors/spr_artificer_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"73dc5802-b53a-49ed-922d-ffcd859fbaa4","IsCreationKey":false,"Key":12.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_artificer_colors2/spr_artificer_colors2.yy b/sprites/spr_artificer_colors2/spr_artificer_colors2.yy index 0a57964c29..2969d78809 100644 --- a/sprites/spr_artificer_colors2/spr_artificer_colors2.yy +++ b/sprites/spr_artificer_colors2/spr_artificer_colors2.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_artificer_colors2", "bboxMode":0, "bbox_bottom":259, @@ -12,19 +12,19 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"465b561c-397b-4542-b767-1c1e930f4829","name":"465b561c-397b-4542-b767-1c1e930f4829","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"648ca404-0692-44f8-a7ce-917554b0956c","name":"648ca404-0692-44f8-a7ce-917554b0956c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"179c6171-f521-4d22-bdaa-c536459871f4","name":"179c6171-f521-4d22-bdaa-c536459871f4","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"9902c9e6-50d6-48d9-a914-0d284fada227","name":"9902c9e6-50d6-48d9-a914-0d284fada227","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"da5ca32f-41e7-4ae2-b636-7582327fdc12","name":"da5ca32f-41e7-4ae2-b636-7582327fdc12","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"ed2a9d63-551a-45db-b43f-e2d2a35b2ebe","name":"ed2a9d63-551a-45db-b43f-e2d2a35b2ebe","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"18817c48-2122-4764-80af-9e943f35821b","name":"18817c48-2122-4764-80af-9e943f35821b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"23b51e59-13ca-4055-88de-7ef59a5f0e17","name":"23b51e59-13ca-4055-88de-7ef59a5f0e17","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"6a4027a4-3435-4229-85ac-88d88b368d6f","name":"6a4027a4-3435-4229-85ac-88d88b368d6f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"d0b469e1-5258-4d90-baeb-98e61280e177","name":"d0b469e1-5258-4d90-baeb-98e61280e177","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"87bf6c6c-2f4a-4883-9191-f602799e9305","name":"87bf6c6c-2f4a-4883-9191-f602799e9305","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"8b770cde-e547-4eb9-9b08-961733463dbc","name":"8b770cde-e547-4eb9-9b08-961733463dbc","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"d1fdc37f-2ec9-49f1-bf1e-4ca14a6006cf","name":"d1fdc37f-2ec9-49f1-bf1e-4ca14a6006cf","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"465b561c-397b-4542-b767-1c1e930f4829","name":"465b561c-397b-4542-b767-1c1e930f4829","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"648ca404-0692-44f8-a7ce-917554b0956c","name":"648ca404-0692-44f8-a7ce-917554b0956c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"179c6171-f521-4d22-bdaa-c536459871f4","name":"179c6171-f521-4d22-bdaa-c536459871f4","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"9902c9e6-50d6-48d9-a914-0d284fada227","name":"9902c9e6-50d6-48d9-a914-0d284fada227","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"da5ca32f-41e7-4ae2-b636-7582327fdc12","name":"da5ca32f-41e7-4ae2-b636-7582327fdc12","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"ed2a9d63-551a-45db-b43f-e2d2a35b2ebe","name":"ed2a9d63-551a-45db-b43f-e2d2a35b2ebe","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"18817c48-2122-4764-80af-9e943f35821b","name":"18817c48-2122-4764-80af-9e943f35821b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"23b51e59-13ca-4055-88de-7ef59a5f0e17","name":"23b51e59-13ca-4055-88de-7ef59a5f0e17","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"6a4027a4-3435-4229-85ac-88d88b368d6f","name":"6a4027a4-3435-4229-85ac-88d88b368d6f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"d0b469e1-5258-4d90-baeb-98e61280e177","name":"d0b469e1-5258-4d90-baeb-98e61280e177","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"87bf6c6c-2f4a-4883-9191-f602799e9305","name":"87bf6c6c-2f4a-4883-9191-f602799e9305","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"8b770cde-e547-4eb9-9b08-961733463dbc","name":"8b770cde-e547-4eb9-9b08-961733463dbc","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"d1fdc37f-2ec9-49f1-bf1e-4ca14a6006cf","name":"d1fdc37f-2ec9-49f1-bf1e-4ca14a6006cf","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -80,45 +80,19 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"465b561c-397b-4542-b767-1c1e930f4829","path":"sprites/spr_artificer_colors2/spr_artificer_colors2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"418acf20-555a-45a9-845e-a25d2b24bbd8","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"648ca404-0692-44f8-a7ce-917554b0956c","path":"sprites/spr_artificer_colors2/spr_artificer_colors2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"1c64f280-2ec1-484a-8036-1068377ef27f","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"179c6171-f521-4d22-bdaa-c536459871f4","path":"sprites/spr_artificer_colors2/spr_artificer_colors2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"f9bbf352-7a0f-4cc6-9a88-eabc4ff535f4","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"9902c9e6-50d6-48d9-a914-0d284fada227","path":"sprites/spr_artificer_colors2/spr_artificer_colors2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"6c8d96e2-d035-46d8-a4d5-0203302101a0","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"da5ca32f-41e7-4ae2-b636-7582327fdc12","path":"sprites/spr_artificer_colors2/spr_artificer_colors2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"dd722d5d-1172-4598-b0da-138a518d0047","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"ed2a9d63-551a-45db-b43f-e2d2a35b2ebe","path":"sprites/spr_artificer_colors2/spr_artificer_colors2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"49048c8d-6e33-4837-a2d1-1d77d49a7762","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"18817c48-2122-4764-80af-9e943f35821b","path":"sprites/spr_artificer_colors2/spr_artificer_colors2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"7b671afd-3196-4716-9b7a-0690b7ac935a","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"23b51e59-13ca-4055-88de-7ef59a5f0e17","path":"sprites/spr_artificer_colors2/spr_artificer_colors2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"2aab3d30-2aab-4728-94b8-c74b1f0b3be3","IsCreationKey":false,"Key":7.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"6a4027a4-3435-4229-85ac-88d88b368d6f","path":"sprites/spr_artificer_colors2/spr_artificer_colors2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"610d0051-7c39-41a4-a26a-f6a8c2e211ff","IsCreationKey":false,"Key":8.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"d0b469e1-5258-4d90-baeb-98e61280e177","path":"sprites/spr_artificer_colors2/spr_artificer_colors2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"75c7a62a-13d6-40ab-98a0-4bc64be07b71","IsCreationKey":false,"Key":9.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"87bf6c6c-2f4a-4883-9191-f602799e9305","path":"sprites/spr_artificer_colors2/spr_artificer_colors2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"ca290fe5-3c30-4380-bbdf-283c97fd9c02","IsCreationKey":false,"Key":10.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"8b770cde-e547-4eb9-9b08-961733463dbc","path":"sprites/spr_artificer_colors2/spr_artificer_colors2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"ff4263c0-1f15-4d8d-a3ba-3058bda9198e","IsCreationKey":false,"Key":11.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"d1fdc37f-2ec9-49f1-bf1e-4ca14a6006cf","path":"sprites/spr_artificer_colors2/spr_artificer_colors2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"787b89f0-2491-4d7f-8612-1ca4d9bb8d29","IsCreationKey":false,"Key":12.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"465b561c-397b-4542-b767-1c1e930f4829","path":"sprites/spr_artificer_colors2/spr_artificer_colors2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"418acf20-555a-45a9-845e-a25d2b24bbd8","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"648ca404-0692-44f8-a7ce-917554b0956c","path":"sprites/spr_artificer_colors2/spr_artificer_colors2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"1c64f280-2ec1-484a-8036-1068377ef27f","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"179c6171-f521-4d22-bdaa-c536459871f4","path":"sprites/spr_artificer_colors2/spr_artificer_colors2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"f9bbf352-7a0f-4cc6-9a88-eabc4ff535f4","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"9902c9e6-50d6-48d9-a914-0d284fada227","path":"sprites/spr_artificer_colors2/spr_artificer_colors2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"6c8d96e2-d035-46d8-a4d5-0203302101a0","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"da5ca32f-41e7-4ae2-b636-7582327fdc12","path":"sprites/spr_artificer_colors2/spr_artificer_colors2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"dd722d5d-1172-4598-b0da-138a518d0047","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"ed2a9d63-551a-45db-b43f-e2d2a35b2ebe","path":"sprites/spr_artificer_colors2/spr_artificer_colors2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"49048c8d-6e33-4837-a2d1-1d77d49a7762","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"18817c48-2122-4764-80af-9e943f35821b","path":"sprites/spr_artificer_colors2/spr_artificer_colors2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"7b671afd-3196-4716-9b7a-0690b7ac935a","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"23b51e59-13ca-4055-88de-7ef59a5f0e17","path":"sprites/spr_artificer_colors2/spr_artificer_colors2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"2aab3d30-2aab-4728-94b8-c74b1f0b3be3","IsCreationKey":false,"Key":7.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"6a4027a4-3435-4229-85ac-88d88b368d6f","path":"sprites/spr_artificer_colors2/spr_artificer_colors2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"610d0051-7c39-41a4-a26a-f6a8c2e211ff","IsCreationKey":false,"Key":8.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"d0b469e1-5258-4d90-baeb-98e61280e177","path":"sprites/spr_artificer_colors2/spr_artificer_colors2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"75c7a62a-13d6-40ab-98a0-4bc64be07b71","IsCreationKey":false,"Key":9.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"87bf6c6c-2f4a-4883-9191-f602799e9305","path":"sprites/spr_artificer_colors2/spr_artificer_colors2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"ca290fe5-3c30-4380-bbdf-283c97fd9c02","IsCreationKey":false,"Key":10.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"8b770cde-e547-4eb9-9b08-961733463dbc","path":"sprites/spr_artificer_colors2/spr_artificer_colors2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"ff4263c0-1f15-4d8d-a3ba-3058bda9198e","IsCreationKey":false,"Key":11.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"d1fdc37f-2ec9-49f1-bf1e-4ca14a6006cf","path":"sprites/spr_artificer_colors2/spr_artificer_colors2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"787b89f0-2491-4d7f-8612-1ca4d9bb8d29","IsCreationKey":false,"Key":12.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_artificer_left_leg/spr_artificer_left_leg.yy b/sprites/spr_artificer_left_leg/spr_artificer_left_leg.yy index e995554587..be59453338 100644 --- a/sprites/spr_artificer_left_leg/spr_artificer_left_leg.yy +++ b/sprites/spr_artificer_left_leg/spr_artificer_left_leg.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_artificer_left_leg", "bboxMode":0, "bbox_bottom":219, @@ -12,9 +12,9 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"4f315ebe-0e5d-40f9-85c2-c3e24833c89d","name":"4f315ebe-0e5d-40f9-85c2-c3e24833c89d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"84d1fd56-e3fe-4d4a-b85d-b17fbd92c442","name":"84d1fd56-e3fe-4d4a-b85d-b17fbd92c442","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"5fd88342-b482-465c-a602-eeb5aa891585","name":"5fd88342-b482-465c-a602-eeb5aa891585","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"4f315ebe-0e5d-40f9-85c2-c3e24833c89d","name":"4f315ebe-0e5d-40f9-85c2-c3e24833c89d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"84d1fd56-e3fe-4d4a-b85d-b17fbd92c442","name":"84d1fd56-e3fe-4d4a-b85d-b17fbd92c442","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"5fd88342-b482-465c-a602-eeb5aa891585","name":"5fd88342-b482-465c-a602-eeb5aa891585","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -72,15 +72,9 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"4f315ebe-0e5d-40f9-85c2-c3e24833c89d","path":"sprites/spr_artificer_left_leg/spr_artificer_left_leg.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"9e67f81b-7a32-423e-a9c1-8dbb4c623cdb","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"84d1fd56-e3fe-4d4a-b85d-b17fbd92c442","path":"sprites/spr_artificer_left_leg/spr_artificer_left_leg.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"de31f64a-c770-4c2c-8a6e-c95869e6e2ad","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"5fd88342-b482-465c-a602-eeb5aa891585","path":"sprites/spr_artificer_left_leg/spr_artificer_left_leg.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"a8897713-942a-4b66-b8df-16e16d0b47f1","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"4f315ebe-0e5d-40f9-85c2-c3e24833c89d","path":"sprites/spr_artificer_left_leg/spr_artificer_left_leg.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"9e67f81b-7a32-423e-a9c1-8dbb4c623cdb","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"84d1fd56-e3fe-4d4a-b85d-b17fbd92c442","path":"sprites/spr_artificer_left_leg/spr_artificer_left_leg.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"de31f64a-c770-4c2c-8a6e-c95869e6e2ad","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"5fd88342-b482-465c-a602-eeb5aa891585","path":"sprites/spr_artificer_left_leg/spr_artificer_left_leg.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"a8897713-942a-4b66-b8df-16e16d0b47f1","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_artificer_left_pad/spr_artificer_left_pad.yy b/sprites/spr_artificer_left_pad/spr_artificer_left_pad.yy index 687cf1c5b1..909640bbac 100644 --- a/sprites/spr_artificer_left_pad/spr_artificer_left_pad.yy +++ b/sprites/spr_artificer_left_pad/spr_artificer_left_pad.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_artificer_left_pad", "bboxMode":0, "bbox_bottom":73, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"4f315ebe-0e5d-40f9-85c2-c3e24833c89d","name":"4f315ebe-0e5d-40f9-85c2-c3e24833c89d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"4f315ebe-0e5d-40f9-85c2-c3e24833c89d","name":"4f315ebe-0e5d-40f9-85c2-c3e24833c89d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"4f315ebe-0e5d-40f9-85c2-c3e24833c89d","path":"sprites/spr_artificer_left_pad/spr_artificer_left_pad.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"6e614f69-695e-4467-975d-63cc4537dd4e","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"4f315ebe-0e5d-40f9-85c2-c3e24833c89d","path":"sprites/spr_artificer_left_pad/spr_artificer_left_pad.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"6e614f69-695e-4467-975d-63cc4537dd4e","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_artificer_left_trim/spr_artificer_left_trim.yy b/sprites/spr_artificer_left_trim/spr_artificer_left_trim.yy index 2b3575fb27..6312841e78 100644 --- a/sprites/spr_artificer_left_trim/spr_artificer_left_trim.yy +++ b/sprites/spr_artificer_left_trim/spr_artificer_left_trim.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_artificer_left_trim", "bboxMode":0, "bbox_bottom":80, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"4f315ebe-0e5d-40f9-85c2-c3e24833c89d","name":"4f315ebe-0e5d-40f9-85c2-c3e24833c89d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"4f315ebe-0e5d-40f9-85c2-c3e24833c89d","name":"4f315ebe-0e5d-40f9-85c2-c3e24833c89d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"4f315ebe-0e5d-40f9-85c2-c3e24833c89d","path":"sprites/spr_artificer_left_trim/spr_artificer_left_trim.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"93d3e203-1853-43a1-81a7-e0bed288b71e","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"4f315ebe-0e5d-40f9-85c2-c3e24833c89d","path":"sprites/spr_artificer_left_trim/spr_artificer_left_trim.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"93d3e203-1853-43a1-81a7-e0bed288b71e","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_artificer_mouth/spr_artificer_mouth.yy b/sprites/spr_artificer_mouth/spr_artificer_mouth.yy index 221262a13e..39ec654dea 100644 --- a/sprites/spr_artificer_mouth/spr_artificer_mouth.yy +++ b/sprites/spr_artificer_mouth/spr_artificer_mouth.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_artificer_mouth", "bboxMode":0, "bbox_bottom":42, @@ -12,8 +12,8 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"645cbee8-c921-4d89-9cd1-7e859021bce5","name":"645cbee8-c921-4d89-9cd1-7e859021bce5","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"a29e8d58-a798-4e3d-9915-8364431faf43","name":"a29e8d58-a798-4e3d-9915-8364431faf43","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"645cbee8-c921-4d89-9cd1-7e859021bce5","name":"645cbee8-c921-4d89-9cd1-7e859021bce5","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"a29e8d58-a798-4e3d-9915-8364431faf43","name":"a29e8d58-a798-4e3d-9915-8364431faf43","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -69,12 +69,8 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"645cbee8-c921-4d89-9cd1-7e859021bce5","path":"sprites/spr_artificer_mouth/spr_artificer_mouth.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"c3e5a235-58e3-4689-bd3c-820bf57833f7","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"a29e8d58-a798-4e3d-9915-8364431faf43","path":"sprites/spr_artificer_mouth/spr_artificer_mouth.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"c5ab1e7b-d255-41bc-b0a4-e686c2fe235c","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"645cbee8-c921-4d89-9cd1-7e859021bce5","path":"sprites/spr_artificer_mouth/spr_artificer_mouth.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"c3e5a235-58e3-4689-bd3c-820bf57833f7","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"a29e8d58-a798-4e3d-9915-8364431faf43","path":"sprites/spr_artificer_mouth/spr_artificer_mouth.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"c5ab1e7b-d255-41bc-b0a4-e686c2fe235c","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_artificer_right_leg/spr_artificer_right_leg.yy b/sprites/spr_artificer_right_leg/spr_artificer_right_leg.yy index b7bd20b87f..84749e3865 100644 --- a/sprites/spr_artificer_right_leg/spr_artificer_right_leg.yy +++ b/sprites/spr_artificer_right_leg/spr_artificer_right_leg.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_artificer_right_leg", "bboxMode":0, "bbox_bottom":219, @@ -12,9 +12,9 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"4f315ebe-0e5d-40f9-85c2-c3e24833c89d","name":"4f315ebe-0e5d-40f9-85c2-c3e24833c89d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"e5fe53bf-41cc-4895-8b67-8696999ebf0d","name":"e5fe53bf-41cc-4895-8b67-8696999ebf0d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"5fd88342-b482-465c-a602-eeb5aa891585","name":"5fd88342-b482-465c-a602-eeb5aa891585","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"4f315ebe-0e5d-40f9-85c2-c3e24833c89d","name":"4f315ebe-0e5d-40f9-85c2-c3e24833c89d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"e5fe53bf-41cc-4895-8b67-8696999ebf0d","name":"e5fe53bf-41cc-4895-8b67-8696999ebf0d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"5fd88342-b482-465c-a602-eeb5aa891585","name":"5fd88342-b482-465c-a602-eeb5aa891585","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -72,15 +72,9 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"4f315ebe-0e5d-40f9-85c2-c3e24833c89d","path":"sprites/spr_artificer_right_leg/spr_artificer_right_leg.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"971af348-e201-4d93-8133-17abb7dc7f61","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"e5fe53bf-41cc-4895-8b67-8696999ebf0d","path":"sprites/spr_artificer_right_leg/spr_artificer_right_leg.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"ef9ef794-b513-4f2c-af7c-384d9108b2de","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"5fd88342-b482-465c-a602-eeb5aa891585","path":"sprites/spr_artificer_right_leg/spr_artificer_right_leg.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"f77fe365-151f-4f76-aaa3-1324e7402ba7","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"4f315ebe-0e5d-40f9-85c2-c3e24833c89d","path":"sprites/spr_artificer_right_leg/spr_artificer_right_leg.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"971af348-e201-4d93-8133-17abb7dc7f61","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"e5fe53bf-41cc-4895-8b67-8696999ebf0d","path":"sprites/spr_artificer_right_leg/spr_artificer_right_leg.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"ef9ef794-b513-4f2c-af7c-384d9108b2de","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"5fd88342-b482-465c-a602-eeb5aa891585","path":"sprites/spr_artificer_right_leg/spr_artificer_right_leg.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"f77fe365-151f-4f76-aaa3-1324e7402ba7","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_artificer_thorax/spr_artificer_thorax.yy b/sprites/spr_artificer_thorax/spr_artificer_thorax.yy index 60ae20ab59..7d0c374e60 100644 --- a/sprites/spr_artificer_thorax/spr_artificer_thorax.yy +++ b/sprites/spr_artificer_thorax/spr_artificer_thorax.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_artificer_thorax", "bboxMode":0, "bbox_bottom":187, @@ -12,8 +12,8 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"5fd88342-b482-465c-a602-eeb5aa891585","name":"5fd88342-b482-465c-a602-eeb5aa891585","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"b62d8341-5361-46e5-9c5c-b0dda1433d6d","name":"b62d8341-5361-46e5-9c5c-b0dda1433d6d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"5fd88342-b482-465c-a602-eeb5aa891585","name":"5fd88342-b482-465c-a602-eeb5aa891585","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"b62d8341-5361-46e5-9c5c-b0dda1433d6d","name":"b62d8341-5361-46e5-9c5c-b0dda1433d6d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -69,12 +69,8 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"5fd88342-b482-465c-a602-eeb5aa891585","path":"sprites/spr_artificer_thorax/spr_artificer_thorax.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"f3e1a5ab-78e2-4acc-b609-c4d89a4edb47","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"b62d8341-5361-46e5-9c5c-b0dda1433d6d","path":"sprites/spr_artificer_thorax/spr_artificer_thorax.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"f6000eb1-261a-407f-8d01-43f3a113dae5","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"5fd88342-b482-465c-a602-eeb5aa891585","path":"sprites/spr_artificer_thorax/spr_artificer_thorax.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"f3e1a5ab-78e2-4acc-b609-c4d89a4edb47","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"b62d8341-5361-46e5-9c5c-b0dda1433d6d","path":"sprites/spr_artificer_thorax/spr_artificer_thorax.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"f6000eb1-261a-407f-8d01-43f3a113dae5","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_assault_ram/spr_assault_ram.yy b/sprites/spr_assault_ram/spr_assault_ram.yy index 5961be80bd..d39d0c0e4f 100644 --- a/sprites/spr_assault_ram/spr_assault_ram.yy +++ b/sprites/spr_assault_ram/spr_assault_ram.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_assault_ram", "bboxMode":0, "bbox_bottom":19, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"d34fb461-e740-4b3d-8790-5d8bc721165b","name":"d34fb461-e740-4b3d-8790-5d8bc721165b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"d34fb461-e740-4b3d-8790-5d8bc721165b","name":"d34fb461-e740-4b3d-8790-5d8bc721165b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"d34fb461-e740-4b3d-8790-5d8bc721165b","path":"sprites/spr_assault_ram/spr_assault_ram.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"2a4e024b-73cf-4acd-a21d-1f37789ba2f0","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"d34fb461-e740-4b3d-8790-5d8bc721165b","path":"sprites/spr_assault_ram/spr_assault_ram.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"2a4e024b-73cf-4acd-a21d-1f37789ba2f0","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":{ diff --git a/sprites/spr_attacked/spr_attacked.yy b/sprites/spr_attacked/spr_attacked.yy index 763a8431fa..02b64a6be0 100644 --- a/sprites/spr_attacked/spr_attacked.yy +++ b/sprites/spr_attacked/spr_attacked.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_attacked", "bboxMode":0, "bbox_bottom":0, diff --git a/sprites/spr_azreal/spr_azreal.yy b/sprites/spr_azreal/spr_azreal.yy index 03eca4d09e..151ffe8278 100644 --- a/sprites/spr_azreal/spr_azreal.yy +++ b/sprites/spr_azreal/spr_azreal.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_azreal", "bboxMode":0, "bbox_bottom":271, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"be71ab82-be2b-4ced-8f5d-75413b0dbf6c","name":"be71ab82-be2b-4ced-8f5d-75413b0dbf6c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"be71ab82-be2b-4ced-8f5d-75413b0dbf6c","name":"be71ab82-be2b-4ced-8f5d-75413b0dbf6c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"be71ab82-be2b-4ced-8f5d-75413b0dbf6c","path":"sprites/spr_azreal/spr_azreal.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"d6c71c3f-69e6-4c4d-9a42-9cff9ba784da","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"be71ab82-be2b-4ced-8f5d-75413b0dbf6c","path":"sprites/spr_azreal/spr_azreal.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"d6c71c3f-69e6-4c4d-9a42-9cff9ba784da","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_ba_mk5_helm/spr_ba_mk5_helm.yy b/sprites/spr_ba_mk5_helm/spr_ba_mk5_helm.yy index 504eed4f25..d82294c854 100644 --- a/sprites/spr_ba_mk5_helm/spr_ba_mk5_helm.yy +++ b/sprites/spr_ba_mk5_helm/spr_ba_mk5_helm.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_ba_mk5_helm", "bboxMode":0, "bbox_bottom":43, @@ -12,8 +12,8 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"c6b4deb7-05a7-44f9-8dd8-30aceb23465b","name":"c6b4deb7-05a7-44f9-8dd8-30aceb23465b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"8cdc5a48-06f4-49f2-91fd-6384f83f3a1a","name":"8cdc5a48-06f4-49f2-91fd-6384f83f3a1a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"c6b4deb7-05a7-44f9-8dd8-30aceb23465b","name":"c6b4deb7-05a7-44f9-8dd8-30aceb23465b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"8cdc5a48-06f4-49f2-91fd-6384f83f3a1a","name":"8cdc5a48-06f4-49f2-91fd-6384f83f3a1a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -69,12 +69,8 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"c6b4deb7-05a7-44f9-8dd8-30aceb23465b","path":"sprites/spr_ba_mk5_helm/spr_ba_mk5_helm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"6a167912-84a6-4e1c-9daa-41e4b7d1aa32","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"8cdc5a48-06f4-49f2-91fd-6384f83f3a1a","path":"sprites/spr_ba_mk5_helm/spr_ba_mk5_helm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"4cb102e8-fb3e-443e-ba38-700d8f8fc742","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"c6b4deb7-05a7-44f9-8dd8-30aceb23465b","path":"sprites/spr_ba_mk5_helm/spr_ba_mk5_helm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"6a167912-84a6-4e1c-9daa-41e4b7d1aa32","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"8cdc5a48-06f4-49f2-91fd-6384f83f3a1a","path":"sprites/spr_ba_mk5_helm/spr_ba_mk5_helm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"4cb102e8-fb3e-443e-ba38-700d8f8fc742","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_ba_mk6_helm/spr_ba_mk6_helm.yy b/sprites/spr_ba_mk6_helm/spr_ba_mk6_helm.yy index adb831719e..c623e7d0af 100644 --- a/sprites/spr_ba_mk6_helm/spr_ba_mk6_helm.yy +++ b/sprites/spr_ba_mk6_helm/spr_ba_mk6_helm.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_ba_mk6_helm", "bboxMode":0, "bbox_bottom":47, @@ -12,8 +12,8 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"e7e81da2-bb99-4fe9-b4a1-6e83dea28947","name":"e7e81da2-bb99-4fe9-b4a1-6e83dea28947","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"363aa087-5772-41b1-9084-0db7a73b44e2","name":"363aa087-5772-41b1-9084-0db7a73b44e2","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"e7e81da2-bb99-4fe9-b4a1-6e83dea28947","name":"e7e81da2-bb99-4fe9-b4a1-6e83dea28947","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"363aa087-5772-41b1-9084-0db7a73b44e2","name":"363aa087-5772-41b1-9084-0db7a73b44e2","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -69,12 +69,8 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"e7e81da2-bb99-4fe9-b4a1-6e83dea28947","path":"sprites/spr_ba_mk6_helm/spr_ba_mk6_helm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"d52b85e0-19df-4047-8486-1c0bd1726b78","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"363aa087-5772-41b1-9084-0db7a73b44e2","path":"sprites/spr_ba_mk6_helm/spr_ba_mk6_helm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"c45d87c6-51bb-4ae7-b263-53dc3ef0475a","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"e7e81da2-bb99-4fe9-b4a1-6e83dea28947","path":"sprites/spr_ba_mk6_helm/spr_ba_mk6_helm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"d52b85e0-19df-4047-8486-1c0bd1726b78","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"363aa087-5772-41b1-9084-0db7a73b44e2","path":"sprites/spr_ba_mk6_helm/spr_ba_mk6_helm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"c45d87c6-51bb-4ae7-b263-53dc3ef0475a","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_ba_mk7_helm/spr_ba_mk7_helm.yy b/sprites/spr_ba_mk7_helm/spr_ba_mk7_helm.yy index 1172ef4f63..5577b1c306 100644 --- a/sprites/spr_ba_mk7_helm/spr_ba_mk7_helm.yy +++ b/sprites/spr_ba_mk7_helm/spr_ba_mk7_helm.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_ba_mk7_helm", "bboxMode":0, "bbox_bottom":43, @@ -12,8 +12,8 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"36e9d046-4f4d-44a7-8c95-ac46a9430767","name":"36e9d046-4f4d-44a7-8c95-ac46a9430767","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"1efc778a-1151-49d9-9505-d60929b94eb6","name":"1efc778a-1151-49d9-9505-d60929b94eb6","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"36e9d046-4f4d-44a7-8c95-ac46a9430767","name":"36e9d046-4f4d-44a7-8c95-ac46a9430767","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"1efc778a-1151-49d9-9505-d60929b94eb6","name":"1efc778a-1151-49d9-9505-d60929b94eb6","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -69,12 +69,8 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"36e9d046-4f4d-44a7-8c95-ac46a9430767","path":"sprites/spr_ba_mk7_helm/spr_ba_mk7_helm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"13c117b6-5761-431e-8458-7954910203fa","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"1efc778a-1151-49d9-9505-d60929b94eb6","path":"sprites/spr_ba_mk7_helm/spr_ba_mk7_helm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"6d751d70-9f65-4be1-9d47-be440a07a2dc","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"36e9d046-4f4d-44a7-8c95-ac46a9430767","path":"sprites/spr_ba_mk7_helm/spr_ba_mk7_helm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"13c117b6-5761-431e-8458-7954910203fa","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"1efc778a-1151-49d9-9505-d60929b94eb6","path":"sprites/spr_ba_mk7_helm/spr_ba_mk7_helm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"6d751d70-9f65-4be1-9d47-be440a07a2dc","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_backpack_fastening/spr_backpack_fastening.yy b/sprites/spr_backpack_fastening/spr_backpack_fastening.yy index f1402144de..39e0c962cb 100644 --- a/sprites/spr_backpack_fastening/spr_backpack_fastening.yy +++ b/sprites/spr_backpack_fastening/spr_backpack_fastening.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_backpack_fastening", "bboxMode":0, "bbox_bottom":89, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"25fd73f2-dbb3-4ee5-8201-8fefbe86bbee","name":"25fd73f2-dbb3-4ee5-8201-8fefbe86bbee","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"25fd73f2-dbb3-4ee5-8201-8fefbe86bbee","name":"25fd73f2-dbb3-4ee5-8201-8fefbe86bbee","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "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_ballistic_skill_icon/spr_ballistic_skill_icon.yy b/sprites/spr_ballistic_skill_icon/spr_ballistic_skill_icon.yy index 2db9be8abf..85a5eac270 100644 --- a/sprites/spr_ballistic_skill_icon/spr_ballistic_skill_icon.yy +++ b/sprites/spr_ballistic_skill_icon/spr_ballistic_skill_icon.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_ballistic_skill_icon", "bboxMode":0, "bbox_bottom":56, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"f6b84ce9-b4d1-4e70-a1b0-b86de4228a4b","name":"f6b84ce9-b4d1-4e70-a1b0-b86de4228a4b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"f6b84ce9-b4d1-4e70-a1b0-b86de4228a4b","name":"f6b84ce9-b4d1-4e70-a1b0-b86de4228a4b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"f6b84ce9-b4d1-4e70-a1b0-b86de4228a4b","path":"sprites/spr_ballistic_skill_icon/spr_ballistic_skill_icon.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"154608a6-0aee-4e03-9bae-f9a473358190","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"f6b84ce9-b4d1-4e70-a1b0-b86de4228a4b","path":"sprites/spr_ballistic_skill_icon/spr_ballistic_skill_icon.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"154608a6-0aee-4e03-9bae-f9a473358190","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_bar/spr_bar.yy b/sprites/spr_bar/spr_bar.yy index 4bb389bfca..e59bb29c9e 100644 --- a/sprites/spr_bar/spr_bar.yy +++ b/sprites/spr_bar/spr_bar.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_bar", "bboxMode":0, "bbox_bottom":8, @@ -12,17 +12,17 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"bbcc8782-2c91-4f9b-abf9-9bb3f01af507","name":"bbcc8782-2c91-4f9b-abf9-9bb3f01af507","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"3302719a-4210-42be-8e5e-4c4c74dc2684","name":"3302719a-4210-42be-8e5e-4c4c74dc2684","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"97cf455e-c535-4150-bd71-17600daaa1f2","name":"97cf455e-c535-4150-bd71-17600daaa1f2","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"8e23f1d0-a331-45bc-a4dd-7d9bfe67069c","name":"8e23f1d0-a331-45bc-a4dd-7d9bfe67069c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"54e6c28f-437e-4703-a403-18ac521b732b","name":"54e6c28f-437e-4703-a403-18ac521b732b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"cfa6023b-0247-4a6f-8c89-bd04eecc031f","name":"cfa6023b-0247-4a6f-8c89-bd04eecc031f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"72b201ea-3f14-4dfa-b59c-047d86cadfb6","name":"72b201ea-3f14-4dfa-b59c-047d86cadfb6","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"22be5222-6191-4d42-917d-3d11768353fa","name":"22be5222-6191-4d42-917d-3d11768353fa","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"01d90c30-8886-416a-ba21-919ecb4c6aca","name":"01d90c30-8886-416a-ba21-919ecb4c6aca","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"be26eb8f-03aa-4445-804d-252d0aa43715","name":"be26eb8f-03aa-4445-804d-252d0aa43715","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"c38f130f-b02b-4962-9d09-5aa09b23d15c","name":"c38f130f-b02b-4962-9d09-5aa09b23d15c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"bbcc8782-2c91-4f9b-abf9-9bb3f01af507","name":"bbcc8782-2c91-4f9b-abf9-9bb3f01af507","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"3302719a-4210-42be-8e5e-4c4c74dc2684","name":"3302719a-4210-42be-8e5e-4c4c74dc2684","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"97cf455e-c535-4150-bd71-17600daaa1f2","name":"97cf455e-c535-4150-bd71-17600daaa1f2","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"8e23f1d0-a331-45bc-a4dd-7d9bfe67069c","name":"8e23f1d0-a331-45bc-a4dd-7d9bfe67069c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"54e6c28f-437e-4703-a403-18ac521b732b","name":"54e6c28f-437e-4703-a403-18ac521b732b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"cfa6023b-0247-4a6f-8c89-bd04eecc031f","name":"cfa6023b-0247-4a6f-8c89-bd04eecc031f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"72b201ea-3f14-4dfa-b59c-047d86cadfb6","name":"72b201ea-3f14-4dfa-b59c-047d86cadfb6","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"22be5222-6191-4d42-917d-3d11768353fa","name":"22be5222-6191-4d42-917d-3d11768353fa","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"01d90c30-8886-416a-ba21-919ecb4c6aca","name":"01d90c30-8886-416a-ba21-919ecb4c6aca","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"be26eb8f-03aa-4445-804d-252d0aa43715","name":"be26eb8f-03aa-4445-804d-252d0aa43715","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"c38f130f-b02b-4962-9d09-5aa09b23d15c","name":"c38f130f-b02b-4962-9d09-5aa09b23d15c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -78,39 +78,17 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"bbcc8782-2c91-4f9b-abf9-9bb3f01af507","path":"sprites/spr_bar/spr_bar.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"c7c88e2a-d9af-48cc-b9b7-ebaeed3cc7e8","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"3302719a-4210-42be-8e5e-4c4c74dc2684","path":"sprites/spr_bar/spr_bar.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"a427b94e-125b-46fa-ac68-4c3c7b54f6e6","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"97cf455e-c535-4150-bd71-17600daaa1f2","path":"sprites/spr_bar/spr_bar.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"48a9c317-f79d-4e3d-a5b9-ffef444d5440","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"8e23f1d0-a331-45bc-a4dd-7d9bfe67069c","path":"sprites/spr_bar/spr_bar.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"15f5e9cc-3527-4d88-a022-6309400497b9","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"54e6c28f-437e-4703-a403-18ac521b732b","path":"sprites/spr_bar/spr_bar.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"c672d436-07aa-46c2-8835-2ff6ed88e590","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"cfa6023b-0247-4a6f-8c89-bd04eecc031f","path":"sprites/spr_bar/spr_bar.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"81d8575c-958a-468a-8d75-4326025485c2","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"72b201ea-3f14-4dfa-b59c-047d86cadfb6","path":"sprites/spr_bar/spr_bar.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"fd9ad9df-9dcd-4fa2-8635-d057fb59ca05","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"22be5222-6191-4d42-917d-3d11768353fa","path":"sprites/spr_bar/spr_bar.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"97d5005b-dc82-4234-a57e-83fcf89a8367","IsCreationKey":false,"Key":7.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"01d90c30-8886-416a-ba21-919ecb4c6aca","path":"sprites/spr_bar/spr_bar.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"de31e3cd-7862-4bc7-a908-b61aa13ff288","IsCreationKey":false,"Key":8.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"be26eb8f-03aa-4445-804d-252d0aa43715","path":"sprites/spr_bar/spr_bar.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"f353cd00-f561-4ef0-be2e-492afdb075c7","IsCreationKey":false,"Key":9.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"c38f130f-b02b-4962-9d09-5aa09b23d15c","path":"sprites/spr_bar/spr_bar.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"afbe37a3-9160-4c8d-b66d-1b8072efb354","IsCreationKey":false,"Key":10.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"bbcc8782-2c91-4f9b-abf9-9bb3f01af507","path":"sprites/spr_bar/spr_bar.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"c7c88e2a-d9af-48cc-b9b7-ebaeed3cc7e8","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"3302719a-4210-42be-8e5e-4c4c74dc2684","path":"sprites/spr_bar/spr_bar.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"a427b94e-125b-46fa-ac68-4c3c7b54f6e6","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"97cf455e-c535-4150-bd71-17600daaa1f2","path":"sprites/spr_bar/spr_bar.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"48a9c317-f79d-4e3d-a5b9-ffef444d5440","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"8e23f1d0-a331-45bc-a4dd-7d9bfe67069c","path":"sprites/spr_bar/spr_bar.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"15f5e9cc-3527-4d88-a022-6309400497b9","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"54e6c28f-437e-4703-a403-18ac521b732b","path":"sprites/spr_bar/spr_bar.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"c672d436-07aa-46c2-8835-2ff6ed88e590","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"cfa6023b-0247-4a6f-8c89-bd04eecc031f","path":"sprites/spr_bar/spr_bar.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"81d8575c-958a-468a-8d75-4326025485c2","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"72b201ea-3f14-4dfa-b59c-047d86cadfb6","path":"sprites/spr_bar/spr_bar.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"fd9ad9df-9dcd-4fa2-8635-d057fb59ca05","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"22be5222-6191-4d42-917d-3d11768353fa","path":"sprites/spr_bar/spr_bar.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"97d5005b-dc82-4234-a57e-83fcf89a8367","IsCreationKey":false,"Key":7.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"01d90c30-8886-416a-ba21-919ecb4c6aca","path":"sprites/spr_bar/spr_bar.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"de31e3cd-7862-4bc7-a908-b61aa13ff288","IsCreationKey":false,"Key":8.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"be26eb8f-03aa-4445-804d-252d0aa43715","path":"sprites/spr_bar/spr_bar.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"f353cd00-f561-4ef0-be2e-492afdb075c7","IsCreationKey":false,"Key":9.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"c38f130f-b02b-4962-9d09-5aa09b23d15c","path":"sprites/spr_bar/spr_bar.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"afbe37a3-9160-4c8d-b66d-1b8072efb354","IsCreationKey":false,"Key":10.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_bare_eyes/spr_bare_eyes.yy b/sprites/spr_bare_eyes/spr_bare_eyes.yy index de92df7564..3856f73830 100644 --- a/sprites/spr_bare_eyes/spr_bare_eyes.yy +++ b/sprites/spr_bare_eyes/spr_bare_eyes.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_bare_eyes", "bboxMode":0, "bbox_bottom":30, @@ -12,33 +12,33 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"03df2bbb-ad5c-4d77-a3d8-85bdbd716370","name":"03df2bbb-ad5c-4d77-a3d8-85bdbd716370","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"b23399d2-885b-4e52-9425-1430efdac15c","name":"b23399d2-885b-4e52-9425-1430efdac15c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"c52fea3f-9cca-453d-9dc7-4f3993d646ab","name":"c52fea3f-9cca-453d-9dc7-4f3993d646ab","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"c15b49bc-cb52-4b19-a2b8-0d981c68f81e","name":"c15b49bc-cb52-4b19-a2b8-0d981c68f81e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"3c8b9800-aa82-4ef9-8378-7aae5b22d978","name":"3c8b9800-aa82-4ef9-8378-7aae5b22d978","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"d4641795-bc68-4aea-9bf8-1d787da51bfb","name":"d4641795-bc68-4aea-9bf8-1d787da51bfb","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"a7c5a85a-fcea-4d1d-875d-b46180e5d031","name":"a7c5a85a-fcea-4d1d-875d-b46180e5d031","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"141c28d7-61a8-472f-8c69-f9b3bbd5603f","name":"141c28d7-61a8-472f-8c69-f9b3bbd5603f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"1ec9262d-499a-4e8e-8738-7c9af50a3456","name":"1ec9262d-499a-4e8e-8738-7c9af50a3456","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"5984ae02-2aa0-4125-bbff-7087e26c4885","name":"5984ae02-2aa0-4125-bbff-7087e26c4885","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"a0b0960d-8f13-4171-bde3-d5b23ed1d4d1","name":"a0b0960d-8f13-4171-bde3-d5b23ed1d4d1","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"3ef928e4-ca53-4022-8cd3-6632c830d299","name":"3ef928e4-ca53-4022-8cd3-6632c830d299","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"106250b4-2149-4340-a00c-40eaf198e58d","name":"106250b4-2149-4340-a00c-40eaf198e58d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"61b28c6f-47b5-4197-9cc1-fdc37c13847f","name":"61b28c6f-47b5-4197-9cc1-fdc37c13847f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"87416d86-eb61-4546-b546-ecc00c22e2af","name":"87416d86-eb61-4546-b546-ecc00c22e2af","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"bf57ffb6-65c6-4867-8588-10a3fbd83874","name":"bf57ffb6-65c6-4867-8588-10a3fbd83874","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"f4a365f9-02c7-4529-ba9a-3f5ba26d5dd2","name":"f4a365f9-02c7-4529-ba9a-3f5ba26d5dd2","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"a6874fc7-471a-40a2-8490-c42c5bc0b865","name":"a6874fc7-471a-40a2-8490-c42c5bc0b865","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"1d0deed7-1711-4cbc-b385-04f084f99ee5","name":"1d0deed7-1711-4cbc-b385-04f084f99ee5","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"c603b973-5145-4114-bbd7-9f6aa44a7894","name":"c603b973-5145-4114-bbd7-9f6aa44a7894","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"32010768-5b4e-46ed-b4fe-183911e34ccf","name":"32010768-5b4e-46ed-b4fe-183911e34ccf","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"40df5e82-3b35-4d36-821a-686df40a235b","name":"40df5e82-3b35-4d36-821a-686df40a235b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"f2f0d39e-e4ac-41c5-8bf1-0e12224fa35b","name":"f2f0d39e-e4ac-41c5-8bf1-0e12224fa35b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"9f3c5ed3-83e9-4c7d-b1b5-60443a0f27d0","name":"9f3c5ed3-83e9-4c7d-b1b5-60443a0f27d0","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"76cf9b89-627b-40a0-aeb5-8008bcb552d1","name":"76cf9b89-627b-40a0-aeb5-8008bcb552d1","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"0f93f46f-c41e-44c9-9919-dbe1e6340707","name":"0f93f46f-c41e-44c9-9919-dbe1e6340707","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"8e52b856-813d-428a-80fb-8910534444c6","name":"8e52b856-813d-428a-80fb-8910534444c6","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"03df2bbb-ad5c-4d77-a3d8-85bdbd716370","name":"03df2bbb-ad5c-4d77-a3d8-85bdbd716370","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"b23399d2-885b-4e52-9425-1430efdac15c","name":"b23399d2-885b-4e52-9425-1430efdac15c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"c52fea3f-9cca-453d-9dc7-4f3993d646ab","name":"c52fea3f-9cca-453d-9dc7-4f3993d646ab","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"c15b49bc-cb52-4b19-a2b8-0d981c68f81e","name":"c15b49bc-cb52-4b19-a2b8-0d981c68f81e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"3c8b9800-aa82-4ef9-8378-7aae5b22d978","name":"3c8b9800-aa82-4ef9-8378-7aae5b22d978","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"d4641795-bc68-4aea-9bf8-1d787da51bfb","name":"d4641795-bc68-4aea-9bf8-1d787da51bfb","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"a7c5a85a-fcea-4d1d-875d-b46180e5d031","name":"a7c5a85a-fcea-4d1d-875d-b46180e5d031","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"141c28d7-61a8-472f-8c69-f9b3bbd5603f","name":"141c28d7-61a8-472f-8c69-f9b3bbd5603f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"1ec9262d-499a-4e8e-8738-7c9af50a3456","name":"1ec9262d-499a-4e8e-8738-7c9af50a3456","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"5984ae02-2aa0-4125-bbff-7087e26c4885","name":"5984ae02-2aa0-4125-bbff-7087e26c4885","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"a0b0960d-8f13-4171-bde3-d5b23ed1d4d1","name":"a0b0960d-8f13-4171-bde3-d5b23ed1d4d1","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"3ef928e4-ca53-4022-8cd3-6632c830d299","name":"3ef928e4-ca53-4022-8cd3-6632c830d299","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"106250b4-2149-4340-a00c-40eaf198e58d","name":"106250b4-2149-4340-a00c-40eaf198e58d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"61b28c6f-47b5-4197-9cc1-fdc37c13847f","name":"61b28c6f-47b5-4197-9cc1-fdc37c13847f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"87416d86-eb61-4546-b546-ecc00c22e2af","name":"87416d86-eb61-4546-b546-ecc00c22e2af","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"bf57ffb6-65c6-4867-8588-10a3fbd83874","name":"bf57ffb6-65c6-4867-8588-10a3fbd83874","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"f4a365f9-02c7-4529-ba9a-3f5ba26d5dd2","name":"f4a365f9-02c7-4529-ba9a-3f5ba26d5dd2","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"a6874fc7-471a-40a2-8490-c42c5bc0b865","name":"a6874fc7-471a-40a2-8490-c42c5bc0b865","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"1d0deed7-1711-4cbc-b385-04f084f99ee5","name":"1d0deed7-1711-4cbc-b385-04f084f99ee5","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"c603b973-5145-4114-bbd7-9f6aa44a7894","name":"c603b973-5145-4114-bbd7-9f6aa44a7894","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"32010768-5b4e-46ed-b4fe-183911e34ccf","name":"32010768-5b4e-46ed-b4fe-183911e34ccf","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"40df5e82-3b35-4d36-821a-686df40a235b","name":"40df5e82-3b35-4d36-821a-686df40a235b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"f2f0d39e-e4ac-41c5-8bf1-0e12224fa35b","name":"f2f0d39e-e4ac-41c5-8bf1-0e12224fa35b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"9f3c5ed3-83e9-4c7d-b1b5-60443a0f27d0","name":"9f3c5ed3-83e9-4c7d-b1b5-60443a0f27d0","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"76cf9b89-627b-40a0-aeb5-8008bcb552d1","name":"76cf9b89-627b-40a0-aeb5-8008bcb552d1","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"0f93f46f-c41e-44c9-9919-dbe1e6340707","name":"0f93f46f-c41e-44c9-9919-dbe1e6340707","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"8e52b856-813d-428a-80fb-8910534444c6","name":"8e52b856-813d-428a-80fb-8910534444c6","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -96,87 +96,33 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"03df2bbb-ad5c-4d77-a3d8-85bdbd716370","path":"sprites/spr_bare_eyes/spr_bare_eyes.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"8c81bcea-d38b-442d-a69f-be896cbb50b2","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"b23399d2-885b-4e52-9425-1430efdac15c","path":"sprites/spr_bare_eyes/spr_bare_eyes.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"dd06f395-6ed4-4701-8544-4f74f92c6f19","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"c52fea3f-9cca-453d-9dc7-4f3993d646ab","path":"sprites/spr_bare_eyes/spr_bare_eyes.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"765c16b2-97cd-4595-bd87-26f7048c4b2f","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"c15b49bc-cb52-4b19-a2b8-0d981c68f81e","path":"sprites/spr_bare_eyes/spr_bare_eyes.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"6f4ae759-db5b-467c-9269-cb8e01585675","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"3c8b9800-aa82-4ef9-8378-7aae5b22d978","path":"sprites/spr_bare_eyes/spr_bare_eyes.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"ed01b266-bc05-43af-98da-1959625f8a9f","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"d4641795-bc68-4aea-9bf8-1d787da51bfb","path":"sprites/spr_bare_eyes/spr_bare_eyes.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"f03545df-39ea-4c2b-abc7-b4df402f493e","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"a7c5a85a-fcea-4d1d-875d-b46180e5d031","path":"sprites/spr_bare_eyes/spr_bare_eyes.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"d9971f75-eca3-4942-9521-4c3e86f95439","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"141c28d7-61a8-472f-8c69-f9b3bbd5603f","path":"sprites/spr_bare_eyes/spr_bare_eyes.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"65966837-8206-40a6-9c84-64b7940b744b","IsCreationKey":false,"Key":7.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"1ec9262d-499a-4e8e-8738-7c9af50a3456","path":"sprites/spr_bare_eyes/spr_bare_eyes.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"b95c184e-c58c-4348-966d-1ddad172e997","IsCreationKey":false,"Key":8.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"5984ae02-2aa0-4125-bbff-7087e26c4885","path":"sprites/spr_bare_eyes/spr_bare_eyes.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"0c190832-c4c3-4fc8-9750-3016efb90aa8","IsCreationKey":false,"Key":9.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"a0b0960d-8f13-4171-bde3-d5b23ed1d4d1","path":"sprites/spr_bare_eyes/spr_bare_eyes.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"bf8ba618-66cf-4127-b25f-455c2366907c","IsCreationKey":false,"Key":10.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"3ef928e4-ca53-4022-8cd3-6632c830d299","path":"sprites/spr_bare_eyes/spr_bare_eyes.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"12c14c85-7c7d-413e-93d8-80f14d25fd62","IsCreationKey":false,"Key":11.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"106250b4-2149-4340-a00c-40eaf198e58d","path":"sprites/spr_bare_eyes/spr_bare_eyes.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"5dc898a8-aa4f-461e-8d45-843dcace698a","IsCreationKey":false,"Key":12.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"61b28c6f-47b5-4197-9cc1-fdc37c13847f","path":"sprites/spr_bare_eyes/spr_bare_eyes.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"24c05389-c167-4188-b220-45c8a2d20891","IsCreationKey":false,"Key":13.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"87416d86-eb61-4546-b546-ecc00c22e2af","path":"sprites/spr_bare_eyes/spr_bare_eyes.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"11cc4c2d-a5d1-41d2-8c9c-3ba048bce167","IsCreationKey":false,"Key":14.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"bf57ffb6-65c6-4867-8588-10a3fbd83874","path":"sprites/spr_bare_eyes/spr_bare_eyes.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"a2e7ea3e-8cb8-4025-b70b-14fbc68045f4","IsCreationKey":false,"Key":15.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"f4a365f9-02c7-4529-ba9a-3f5ba26d5dd2","path":"sprites/spr_bare_eyes/spr_bare_eyes.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"e21b2e24-e072-4f5c-901c-a76303bde380","IsCreationKey":false,"Key":16.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"a6874fc7-471a-40a2-8490-c42c5bc0b865","path":"sprites/spr_bare_eyes/spr_bare_eyes.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"6db00525-6cce-4697-a8c2-975f3072022f","IsCreationKey":false,"Key":17.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"1d0deed7-1711-4cbc-b385-04f084f99ee5","path":"sprites/spr_bare_eyes/spr_bare_eyes.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"d398ad08-143f-433b-8ed0-41f5bc74fdfe","IsCreationKey":false,"Key":18.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"c603b973-5145-4114-bbd7-9f6aa44a7894","path":"sprites/spr_bare_eyes/spr_bare_eyes.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"b9f16053-1ed5-45af-963f-6d1cbcb6e9ef","IsCreationKey":false,"Key":19.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"32010768-5b4e-46ed-b4fe-183911e34ccf","path":"sprites/spr_bare_eyes/spr_bare_eyes.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"f7f36fbf-2d00-4e38-8b01-02e8e0015f09","IsCreationKey":false,"Key":20.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"40df5e82-3b35-4d36-821a-686df40a235b","path":"sprites/spr_bare_eyes/spr_bare_eyes.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"9ff424d5-8526-4f58-9b4e-362fb6efd862","IsCreationKey":false,"Key":21.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"f2f0d39e-e4ac-41c5-8bf1-0e12224fa35b","path":"sprites/spr_bare_eyes/spr_bare_eyes.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"fa22bee3-2d88-43e8-a1b9-eb43d51d2eff","IsCreationKey":false,"Key":22.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"9f3c5ed3-83e9-4c7d-b1b5-60443a0f27d0","path":"sprites/spr_bare_eyes/spr_bare_eyes.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"0abdb200-5367-42cc-b7b7-371e9a129713","IsCreationKey":false,"Key":23.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"76cf9b89-627b-40a0-aeb5-8008bcb552d1","path":"sprites/spr_bare_eyes/spr_bare_eyes.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"3cee5a3c-5451-4f63-8b98-47284939f629","IsCreationKey":false,"Key":24.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"0f93f46f-c41e-44c9-9919-dbe1e6340707","path":"sprites/spr_bare_eyes/spr_bare_eyes.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"f7d535f0-de41-4255-bb5c-e04616064be7","IsCreationKey":false,"Key":25.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"8e52b856-813d-428a-80fb-8910534444c6","path":"sprites/spr_bare_eyes/spr_bare_eyes.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"8158fd96-ddc4-41bb-845b-34f6b6d3e30d","IsCreationKey":false,"Key":26.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"03df2bbb-ad5c-4d77-a3d8-85bdbd716370","path":"sprites/spr_bare_eyes/spr_bare_eyes.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"8c81bcea-d38b-442d-a69f-be896cbb50b2","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"b23399d2-885b-4e52-9425-1430efdac15c","path":"sprites/spr_bare_eyes/spr_bare_eyes.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"dd06f395-6ed4-4701-8544-4f74f92c6f19","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"c52fea3f-9cca-453d-9dc7-4f3993d646ab","path":"sprites/spr_bare_eyes/spr_bare_eyes.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"765c16b2-97cd-4595-bd87-26f7048c4b2f","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"c15b49bc-cb52-4b19-a2b8-0d981c68f81e","path":"sprites/spr_bare_eyes/spr_bare_eyes.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"6f4ae759-db5b-467c-9269-cb8e01585675","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"3c8b9800-aa82-4ef9-8378-7aae5b22d978","path":"sprites/spr_bare_eyes/spr_bare_eyes.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"ed01b266-bc05-43af-98da-1959625f8a9f","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"d4641795-bc68-4aea-9bf8-1d787da51bfb","path":"sprites/spr_bare_eyes/spr_bare_eyes.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"f03545df-39ea-4c2b-abc7-b4df402f493e","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"a7c5a85a-fcea-4d1d-875d-b46180e5d031","path":"sprites/spr_bare_eyes/spr_bare_eyes.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"d9971f75-eca3-4942-9521-4c3e86f95439","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"141c28d7-61a8-472f-8c69-f9b3bbd5603f","path":"sprites/spr_bare_eyes/spr_bare_eyes.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"65966837-8206-40a6-9c84-64b7940b744b","IsCreationKey":false,"Key":7.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"1ec9262d-499a-4e8e-8738-7c9af50a3456","path":"sprites/spr_bare_eyes/spr_bare_eyes.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"b95c184e-c58c-4348-966d-1ddad172e997","IsCreationKey":false,"Key":8.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"5984ae02-2aa0-4125-bbff-7087e26c4885","path":"sprites/spr_bare_eyes/spr_bare_eyes.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"0c190832-c4c3-4fc8-9750-3016efb90aa8","IsCreationKey":false,"Key":9.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"a0b0960d-8f13-4171-bde3-d5b23ed1d4d1","path":"sprites/spr_bare_eyes/spr_bare_eyes.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"bf8ba618-66cf-4127-b25f-455c2366907c","IsCreationKey":false,"Key":10.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"3ef928e4-ca53-4022-8cd3-6632c830d299","path":"sprites/spr_bare_eyes/spr_bare_eyes.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"12c14c85-7c7d-413e-93d8-80f14d25fd62","IsCreationKey":false,"Key":11.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"106250b4-2149-4340-a00c-40eaf198e58d","path":"sprites/spr_bare_eyes/spr_bare_eyes.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"5dc898a8-aa4f-461e-8d45-843dcace698a","IsCreationKey":false,"Key":12.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"61b28c6f-47b5-4197-9cc1-fdc37c13847f","path":"sprites/spr_bare_eyes/spr_bare_eyes.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"24c05389-c167-4188-b220-45c8a2d20891","IsCreationKey":false,"Key":13.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"87416d86-eb61-4546-b546-ecc00c22e2af","path":"sprites/spr_bare_eyes/spr_bare_eyes.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"11cc4c2d-a5d1-41d2-8c9c-3ba048bce167","IsCreationKey":false,"Key":14.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"bf57ffb6-65c6-4867-8588-10a3fbd83874","path":"sprites/spr_bare_eyes/spr_bare_eyes.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"a2e7ea3e-8cb8-4025-b70b-14fbc68045f4","IsCreationKey":false,"Key":15.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"f4a365f9-02c7-4529-ba9a-3f5ba26d5dd2","path":"sprites/spr_bare_eyes/spr_bare_eyes.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"e21b2e24-e072-4f5c-901c-a76303bde380","IsCreationKey":false,"Key":16.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"a6874fc7-471a-40a2-8490-c42c5bc0b865","path":"sprites/spr_bare_eyes/spr_bare_eyes.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"6db00525-6cce-4697-a8c2-975f3072022f","IsCreationKey":false,"Key":17.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"1d0deed7-1711-4cbc-b385-04f084f99ee5","path":"sprites/spr_bare_eyes/spr_bare_eyes.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"d398ad08-143f-433b-8ed0-41f5bc74fdfe","IsCreationKey":false,"Key":18.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"c603b973-5145-4114-bbd7-9f6aa44a7894","path":"sprites/spr_bare_eyes/spr_bare_eyes.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"b9f16053-1ed5-45af-963f-6d1cbcb6e9ef","IsCreationKey":false,"Key":19.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"32010768-5b4e-46ed-b4fe-183911e34ccf","path":"sprites/spr_bare_eyes/spr_bare_eyes.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"f7f36fbf-2d00-4e38-8b01-02e8e0015f09","IsCreationKey":false,"Key":20.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"40df5e82-3b35-4d36-821a-686df40a235b","path":"sprites/spr_bare_eyes/spr_bare_eyes.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"9ff424d5-8526-4f58-9b4e-362fb6efd862","IsCreationKey":false,"Key":21.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"f2f0d39e-e4ac-41c5-8bf1-0e12224fa35b","path":"sprites/spr_bare_eyes/spr_bare_eyes.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"fa22bee3-2d88-43e8-a1b9-eb43d51d2eff","IsCreationKey":false,"Key":22.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"9f3c5ed3-83e9-4c7d-b1b5-60443a0f27d0","path":"sprites/spr_bare_eyes/spr_bare_eyes.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"0abdb200-5367-42cc-b7b7-371e9a129713","IsCreationKey":false,"Key":23.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"76cf9b89-627b-40a0-aeb5-8008bcb552d1","path":"sprites/spr_bare_eyes/spr_bare_eyes.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"3cee5a3c-5451-4f63-8b98-47284939f629","IsCreationKey":false,"Key":24.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"0f93f46f-c41e-44c9-9919-dbe1e6340707","path":"sprites/spr_bare_eyes/spr_bare_eyes.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"f7d535f0-de41-4255-bb5c-e04616064be7","IsCreationKey":false,"Key":25.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"8e52b856-813d-428a-80fb-8910534444c6","path":"sprites/spr_bare_eyes/spr_bare_eyes.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"8158fd96-ddc4-41bb-845b-34f6b6d3e30d","IsCreationKey":false,"Key":26.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_bare_head_facial_hair/spr_bare_head_facial_hair.yy b/sprites/spr_bare_head_facial_hair/spr_bare_head_facial_hair.yy index c75d5a5864..f141f72808 100644 --- a/sprites/spr_bare_head_facial_hair/spr_bare_head_facial_hair.yy +++ b/sprites/spr_bare_head_facial_hair/spr_bare_head_facial_hair.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_bare_head_facial_hair", "bboxMode":0, "bbox_bottom":105, @@ -12,59 +12,59 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"e6edda0a-94ef-4ab5-bf36-de28c022edd0","name":"e6edda0a-94ef-4ab5-bf36-de28c022edd0","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"59c1ef31-735a-41e9-8751-c0917393ceba","name":"59c1ef31-735a-41e9-8751-c0917393ceba","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"fe47c7c6-f0cc-4337-b749-5641c896e825","name":"fe47c7c6-f0cc-4337-b749-5641c896e825","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"4265cc35-d65c-4c91-b427-d0267766b28b","name":"4265cc35-d65c-4c91-b427-d0267766b28b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"f22d5e6e-e8d6-4e57-9e3c-7dbafa638897","name":"f22d5e6e-e8d6-4e57-9e3c-7dbafa638897","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"1d631d5c-7e26-4075-bec1-bf519e78533f","name":"1d631d5c-7e26-4075-bec1-bf519e78533f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"7d2f5106-91f4-4236-af24-be2d545ec8ad","name":"7d2f5106-91f4-4236-af24-be2d545ec8ad","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"fd34e62d-4a19-4366-ab5c-063069352d39","name":"fd34e62d-4a19-4366-ab5c-063069352d39","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"ce920b9b-4f0b-49a8-b51c-b07365ab1a3d","name":"ce920b9b-4f0b-49a8-b51c-b07365ab1a3d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"84be56f9-976e-4bdf-b684-160b72c63473","name":"84be56f9-976e-4bdf-b684-160b72c63473","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"ca62d7ba-307a-453f-9ddd-b572a27c67c5","name":"ca62d7ba-307a-453f-9ddd-b572a27c67c5","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"50efae71-3499-4dc0-b4aa-37dec1af841b","name":"50efae71-3499-4dc0-b4aa-37dec1af841b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"3a680f49-2f17-40e6-b24c-9cefb1016f0f","name":"3a680f49-2f17-40e6-b24c-9cefb1016f0f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"f9808fc2-29dc-4df5-bed5-51e20d21261e","name":"f9808fc2-29dc-4df5-bed5-51e20d21261e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"119401c9-2466-48e8-b092-e7bec7b54345","name":"119401c9-2466-48e8-b092-e7bec7b54345","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"5f2896fb-a65c-47fb-ada7-4aebbf35fa60","name":"5f2896fb-a65c-47fb-ada7-4aebbf35fa60","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"edf5d09d-e228-4916-9506-2b42e7c87c1d","name":"edf5d09d-e228-4916-9506-2b42e7c87c1d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"07a12172-16e3-47ec-8381-bcb4e17a5fea","name":"07a12172-16e3-47ec-8381-bcb4e17a5fea","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"adc2ed6b-5442-4475-99f4-190d7eb468e9","name":"adc2ed6b-5442-4475-99f4-190d7eb468e9","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"a26d347c-d4ce-40b0-be4f-fbcfbb8b0aa0","name":"a26d347c-d4ce-40b0-be4f-fbcfbb8b0aa0","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"fe1b4884-bbcb-472e-9a22-cb2b147cb41d","name":"fe1b4884-bbcb-472e-9a22-cb2b147cb41d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"453ab56d-103e-412a-9a04-455992c9348b","name":"453ab56d-103e-412a-9a04-455992c9348b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"60da470d-ee25-4544-8db1-3ae06a6aca3e","name":"60da470d-ee25-4544-8db1-3ae06a6aca3e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"52d6be61-5261-4311-a0c1-07e935c25df6","name":"52d6be61-5261-4311-a0c1-07e935c25df6","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"19d5b278-59bb-4d28-8e5b-ff9fb08320d9","name":"19d5b278-59bb-4d28-8e5b-ff9fb08320d9","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"33f45c33-d49f-42e5-bc56-232649f96c22","name":"33f45c33-d49f-42e5-bc56-232649f96c22","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"b95d2cc2-0851-4928-9313-3f253a76a4bc","name":"b95d2cc2-0851-4928-9313-3f253a76a4bc","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"1f9592d5-b51d-41c8-94be-37e388fe4b9a","name":"1f9592d5-b51d-41c8-94be-37e388fe4b9a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"9a229b65-bd47-405a-ae89-b0782bc61f79","name":"9a229b65-bd47-405a-ae89-b0782bc61f79","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"ca70a07a-98c3-4408-a54c-2ba37e348e45","name":"ca70a07a-98c3-4408-a54c-2ba37e348e45","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"59c10dbe-11d0-4440-89bd-b39c2bae2164","name":"59c10dbe-11d0-4440-89bd-b39c2bae2164","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"1f5b93dc-9e53-44d1-b999-74cd6aa4f829","name":"1f5b93dc-9e53-44d1-b999-74cd6aa4f829","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"87cd986b-a055-4223-9044-fcf525bb0602","name":"87cd986b-a055-4223-9044-fcf525bb0602","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"37f5b913-0b99-4f38-9252-88800edb3655","name":"37f5b913-0b99-4f38-9252-88800edb3655","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"064b9d94-d8c7-40c4-83a4-66abb9d81082","name":"064b9d94-d8c7-40c4-83a4-66abb9d81082","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"73d9098d-abca-4da7-b713-85f9fdde4c08","name":"73d9098d-abca-4da7-b713-85f9fdde4c08","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"026245f0-7593-46b8-a3c4-eece1626f779","name":"026245f0-7593-46b8-a3c4-eece1626f779","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"2afb7a0e-f9ca-4f5e-aa3d-4b651bbbab12","name":"2afb7a0e-f9ca-4f5e-aa3d-4b651bbbab12","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"7c5a60e2-d9e8-4785-b99f-e3f21993069e","name":"7c5a60e2-d9e8-4785-b99f-e3f21993069e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"171a2df4-0da9-4780-92c6-e774fa7d5fbb","name":"171a2df4-0da9-4780-92c6-e774fa7d5fbb","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"c5005de7-88f9-4690-b2d0-75a4a3bbcf71","name":"c5005de7-88f9-4690-b2d0-75a4a3bbcf71","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"6ca665ee-1c72-40a2-a808-42fcca32e642","name":"6ca665ee-1c72-40a2-a808-42fcca32e642","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"9707ff5c-3e17-4c3a-a8af-b30c40afda13","name":"9707ff5c-3e17-4c3a-a8af-b30c40afda13","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"e73a1e60-7dda-4a3d-9536-b173e171a3f8","name":"e73a1e60-7dda-4a3d-9536-b173e171a3f8","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"6a161d00-5bea-4f52-86ee-a91a16e20bf2","name":"6a161d00-5bea-4f52-86ee-a91a16e20bf2","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"dbb51051-fd69-48a0-bdb9-1edb54a517d9","name":"dbb51051-fd69-48a0-bdb9-1edb54a517d9","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"de7d6148-126b-4524-8b72-bfe5da178758","name":"de7d6148-126b-4524-8b72-bfe5da178758","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"cb94ed63-672f-4c13-adfc-827c1574c939","name":"cb94ed63-672f-4c13-adfc-827c1574c939","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"c99613e9-341f-4d82-a5e7-8d7f91be79ce","name":"c99613e9-341f-4d82-a5e7-8d7f91be79ce","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"82379a9d-a84d-4519-a7f8-d41902a4cde0","name":"82379a9d-a84d-4519-a7f8-d41902a4cde0","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"2e5d8e1a-0e6d-4a62-ba7e-81120ab8becf","name":"2e5d8e1a-0e6d-4a62-ba7e-81120ab8becf","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"7d214730-8933-4eba-a5ad-da582ae142f9","name":"7d214730-8933-4eba-a5ad-da582ae142f9","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"9a0d46f0-3f7c-4d1f-851e-7f8585cc3f4b","name":"9a0d46f0-3f7c-4d1f-851e-7f8585cc3f4b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"e6edda0a-94ef-4ab5-bf36-de28c022edd0","name":"e6edda0a-94ef-4ab5-bf36-de28c022edd0","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"59c1ef31-735a-41e9-8751-c0917393ceba","name":"59c1ef31-735a-41e9-8751-c0917393ceba","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"fe47c7c6-f0cc-4337-b749-5641c896e825","name":"fe47c7c6-f0cc-4337-b749-5641c896e825","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"4265cc35-d65c-4c91-b427-d0267766b28b","name":"4265cc35-d65c-4c91-b427-d0267766b28b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"f22d5e6e-e8d6-4e57-9e3c-7dbafa638897","name":"f22d5e6e-e8d6-4e57-9e3c-7dbafa638897","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"1d631d5c-7e26-4075-bec1-bf519e78533f","name":"1d631d5c-7e26-4075-bec1-bf519e78533f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"7d2f5106-91f4-4236-af24-be2d545ec8ad","name":"7d2f5106-91f4-4236-af24-be2d545ec8ad","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"fd34e62d-4a19-4366-ab5c-063069352d39","name":"fd34e62d-4a19-4366-ab5c-063069352d39","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"ce920b9b-4f0b-49a8-b51c-b07365ab1a3d","name":"ce920b9b-4f0b-49a8-b51c-b07365ab1a3d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"84be56f9-976e-4bdf-b684-160b72c63473","name":"84be56f9-976e-4bdf-b684-160b72c63473","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"ca62d7ba-307a-453f-9ddd-b572a27c67c5","name":"ca62d7ba-307a-453f-9ddd-b572a27c67c5","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"50efae71-3499-4dc0-b4aa-37dec1af841b","name":"50efae71-3499-4dc0-b4aa-37dec1af841b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"3a680f49-2f17-40e6-b24c-9cefb1016f0f","name":"3a680f49-2f17-40e6-b24c-9cefb1016f0f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"f9808fc2-29dc-4df5-bed5-51e20d21261e","name":"f9808fc2-29dc-4df5-bed5-51e20d21261e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"119401c9-2466-48e8-b092-e7bec7b54345","name":"119401c9-2466-48e8-b092-e7bec7b54345","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"5f2896fb-a65c-47fb-ada7-4aebbf35fa60","name":"5f2896fb-a65c-47fb-ada7-4aebbf35fa60","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"edf5d09d-e228-4916-9506-2b42e7c87c1d","name":"edf5d09d-e228-4916-9506-2b42e7c87c1d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"07a12172-16e3-47ec-8381-bcb4e17a5fea","name":"07a12172-16e3-47ec-8381-bcb4e17a5fea","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"adc2ed6b-5442-4475-99f4-190d7eb468e9","name":"adc2ed6b-5442-4475-99f4-190d7eb468e9","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"a26d347c-d4ce-40b0-be4f-fbcfbb8b0aa0","name":"a26d347c-d4ce-40b0-be4f-fbcfbb8b0aa0","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"fe1b4884-bbcb-472e-9a22-cb2b147cb41d","name":"fe1b4884-bbcb-472e-9a22-cb2b147cb41d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"453ab56d-103e-412a-9a04-455992c9348b","name":"453ab56d-103e-412a-9a04-455992c9348b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"60da470d-ee25-4544-8db1-3ae06a6aca3e","name":"60da470d-ee25-4544-8db1-3ae06a6aca3e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"52d6be61-5261-4311-a0c1-07e935c25df6","name":"52d6be61-5261-4311-a0c1-07e935c25df6","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"19d5b278-59bb-4d28-8e5b-ff9fb08320d9","name":"19d5b278-59bb-4d28-8e5b-ff9fb08320d9","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"33f45c33-d49f-42e5-bc56-232649f96c22","name":"33f45c33-d49f-42e5-bc56-232649f96c22","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"b95d2cc2-0851-4928-9313-3f253a76a4bc","name":"b95d2cc2-0851-4928-9313-3f253a76a4bc","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"1f9592d5-b51d-41c8-94be-37e388fe4b9a","name":"1f9592d5-b51d-41c8-94be-37e388fe4b9a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"9a229b65-bd47-405a-ae89-b0782bc61f79","name":"9a229b65-bd47-405a-ae89-b0782bc61f79","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"ca70a07a-98c3-4408-a54c-2ba37e348e45","name":"ca70a07a-98c3-4408-a54c-2ba37e348e45","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"59c10dbe-11d0-4440-89bd-b39c2bae2164","name":"59c10dbe-11d0-4440-89bd-b39c2bae2164","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"1f5b93dc-9e53-44d1-b999-74cd6aa4f829","name":"1f5b93dc-9e53-44d1-b999-74cd6aa4f829","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"87cd986b-a055-4223-9044-fcf525bb0602","name":"87cd986b-a055-4223-9044-fcf525bb0602","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"37f5b913-0b99-4f38-9252-88800edb3655","name":"37f5b913-0b99-4f38-9252-88800edb3655","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"064b9d94-d8c7-40c4-83a4-66abb9d81082","name":"064b9d94-d8c7-40c4-83a4-66abb9d81082","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"73d9098d-abca-4da7-b713-85f9fdde4c08","name":"73d9098d-abca-4da7-b713-85f9fdde4c08","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"026245f0-7593-46b8-a3c4-eece1626f779","name":"026245f0-7593-46b8-a3c4-eece1626f779","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"2afb7a0e-f9ca-4f5e-aa3d-4b651bbbab12","name":"2afb7a0e-f9ca-4f5e-aa3d-4b651bbbab12","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"7c5a60e2-d9e8-4785-b99f-e3f21993069e","name":"7c5a60e2-d9e8-4785-b99f-e3f21993069e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"171a2df4-0da9-4780-92c6-e774fa7d5fbb","name":"171a2df4-0da9-4780-92c6-e774fa7d5fbb","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"c5005de7-88f9-4690-b2d0-75a4a3bbcf71","name":"c5005de7-88f9-4690-b2d0-75a4a3bbcf71","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"6ca665ee-1c72-40a2-a808-42fcca32e642","name":"6ca665ee-1c72-40a2-a808-42fcca32e642","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"9707ff5c-3e17-4c3a-a8af-b30c40afda13","name":"9707ff5c-3e17-4c3a-a8af-b30c40afda13","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"e73a1e60-7dda-4a3d-9536-b173e171a3f8","name":"e73a1e60-7dda-4a3d-9536-b173e171a3f8","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"6a161d00-5bea-4f52-86ee-a91a16e20bf2","name":"6a161d00-5bea-4f52-86ee-a91a16e20bf2","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"dbb51051-fd69-48a0-bdb9-1edb54a517d9","name":"dbb51051-fd69-48a0-bdb9-1edb54a517d9","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"de7d6148-126b-4524-8b72-bfe5da178758","name":"de7d6148-126b-4524-8b72-bfe5da178758","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"cb94ed63-672f-4c13-adfc-827c1574c939","name":"cb94ed63-672f-4c13-adfc-827c1574c939","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"c99613e9-341f-4d82-a5e7-8d7f91be79ce","name":"c99613e9-341f-4d82-a5e7-8d7f91be79ce","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"82379a9d-a84d-4519-a7f8-d41902a4cde0","name":"82379a9d-a84d-4519-a7f8-d41902a4cde0","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"2e5d8e1a-0e6d-4a62-ba7e-81120ab8becf","name":"2e5d8e1a-0e6d-4a62-ba7e-81120ab8becf","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"7d214730-8933-4eba-a5ad-da582ae142f9","name":"7d214730-8933-4eba-a5ad-da582ae142f9","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"9a0d46f0-3f7c-4d1f-851e-7f8585cc3f4b","name":"9a0d46f0-3f7c-4d1f-851e-7f8585cc3f4b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -122,165 +122,59 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"e6edda0a-94ef-4ab5-bf36-de28c022edd0","path":"sprites/spr_bare_head_facial_hair/spr_bare_head_facial_hair.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"a9e51da4-06de-4b0f-92d4-077865cabe5e","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"59c1ef31-735a-41e9-8751-c0917393ceba","path":"sprites/spr_bare_head_facial_hair/spr_bare_head_facial_hair.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"cf388989-1ec2-4a21-830d-07b0905766be","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"fe47c7c6-f0cc-4337-b749-5641c896e825","path":"sprites/spr_bare_head_facial_hair/spr_bare_head_facial_hair.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"641d15bb-071d-4744-b25e-d1f56af61040","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"4265cc35-d65c-4c91-b427-d0267766b28b","path":"sprites/spr_bare_head_facial_hair/spr_bare_head_facial_hair.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"700ade0a-a863-403d-afe5-c9eef47e66ea","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"f22d5e6e-e8d6-4e57-9e3c-7dbafa638897","path":"sprites/spr_bare_head_facial_hair/spr_bare_head_facial_hair.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"05fca8e1-2c17-4b6f-922a-2c36b32b228e","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"1d631d5c-7e26-4075-bec1-bf519e78533f","path":"sprites/spr_bare_head_facial_hair/spr_bare_head_facial_hair.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"d143f15a-7aaa-4a24-903f-cceda28a0e85","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"7d2f5106-91f4-4236-af24-be2d545ec8ad","path":"sprites/spr_bare_head_facial_hair/spr_bare_head_facial_hair.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"08e5c378-5300-49db-a001-3b0cef540331","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"fd34e62d-4a19-4366-ab5c-063069352d39","path":"sprites/spr_bare_head_facial_hair/spr_bare_head_facial_hair.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"fe404bdd-7af8-48a5-989e-e8d59bb707d6","IsCreationKey":false,"Key":7.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"ce920b9b-4f0b-49a8-b51c-b07365ab1a3d","path":"sprites/spr_bare_head_facial_hair/spr_bare_head_facial_hair.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"9ccf2321-f229-4fea-99d8-6ade77f9c840","IsCreationKey":false,"Key":8.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"84be56f9-976e-4bdf-b684-160b72c63473","path":"sprites/spr_bare_head_facial_hair/spr_bare_head_facial_hair.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"92265152-e73f-44cc-8d31-a4fbe12c16e4","IsCreationKey":false,"Key":9.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"ca62d7ba-307a-453f-9ddd-b572a27c67c5","path":"sprites/spr_bare_head_facial_hair/spr_bare_head_facial_hair.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"7b4cec6f-f300-4c95-9fac-ba0fab36e37e","IsCreationKey":false,"Key":10.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"50efae71-3499-4dc0-b4aa-37dec1af841b","path":"sprites/spr_bare_head_facial_hair/spr_bare_head_facial_hair.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"2ed3b162-394c-441e-8bbd-2700ad92168a","IsCreationKey":false,"Key":11.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"3a680f49-2f17-40e6-b24c-9cefb1016f0f","path":"sprites/spr_bare_head_facial_hair/spr_bare_head_facial_hair.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"02668362-7c95-400e-b1ec-dfec011a3fd0","IsCreationKey":false,"Key":12.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"f9808fc2-29dc-4df5-bed5-51e20d21261e","path":"sprites/spr_bare_head_facial_hair/spr_bare_head_facial_hair.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"285f3c33-4fc3-4afb-ba39-cf685a883954","IsCreationKey":false,"Key":13.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"119401c9-2466-48e8-b092-e7bec7b54345","path":"sprites/spr_bare_head_facial_hair/spr_bare_head_facial_hair.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"ad987105-bdde-4846-ae7e-6f0aa2e3cd4b","IsCreationKey":false,"Key":14.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"5f2896fb-a65c-47fb-ada7-4aebbf35fa60","path":"sprites/spr_bare_head_facial_hair/spr_bare_head_facial_hair.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"7acca3ce-8a1e-45a4-993d-bd2972a5677b","IsCreationKey":false,"Key":15.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"edf5d09d-e228-4916-9506-2b42e7c87c1d","path":"sprites/spr_bare_head_facial_hair/spr_bare_head_facial_hair.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"5763102d-e9f8-4746-8d16-e8dd6e4459d7","IsCreationKey":false,"Key":16.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"07a12172-16e3-47ec-8381-bcb4e17a5fea","path":"sprites/spr_bare_head_facial_hair/spr_bare_head_facial_hair.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"40547070-6c65-41d9-be86-8f60b05389f7","IsCreationKey":false,"Key":17.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"adc2ed6b-5442-4475-99f4-190d7eb468e9","path":"sprites/spr_bare_head_facial_hair/spr_bare_head_facial_hair.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"d78d2e7f-cd05-452c-a017-9df68175bf2f","IsCreationKey":false,"Key":18.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"a26d347c-d4ce-40b0-be4f-fbcfbb8b0aa0","path":"sprites/spr_bare_head_facial_hair/spr_bare_head_facial_hair.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"7d6f7e9b-92fd-47be-bb05-5744f87afdc7","IsCreationKey":false,"Key":19.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"fe1b4884-bbcb-472e-9a22-cb2b147cb41d","path":"sprites/spr_bare_head_facial_hair/spr_bare_head_facial_hair.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"f152782c-8280-4280-8bbe-9dc1ec5b501f","IsCreationKey":false,"Key":20.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"453ab56d-103e-412a-9a04-455992c9348b","path":"sprites/spr_bare_head_facial_hair/spr_bare_head_facial_hair.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"9f83625d-4429-4933-b1c7-b645ff2f0935","IsCreationKey":false,"Key":21.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"60da470d-ee25-4544-8db1-3ae06a6aca3e","path":"sprites/spr_bare_head_facial_hair/spr_bare_head_facial_hair.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"8a2ac66c-c54b-431e-8bf8-0e9e9e57d113","IsCreationKey":false,"Key":22.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"52d6be61-5261-4311-a0c1-07e935c25df6","path":"sprites/spr_bare_head_facial_hair/spr_bare_head_facial_hair.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"b5d3e828-d5c1-4b40-b8c4-01dea53cdbdd","IsCreationKey":false,"Key":23.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"19d5b278-59bb-4d28-8e5b-ff9fb08320d9","path":"sprites/spr_bare_head_facial_hair/spr_bare_head_facial_hair.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"b42a971c-8eb3-465d-9554-77d966f8883e","IsCreationKey":false,"Key":24.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"33f45c33-d49f-42e5-bc56-232649f96c22","path":"sprites/spr_bare_head_facial_hair/spr_bare_head_facial_hair.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"1c1ab60b-7140-47a9-b9f3-489e03bd587f","IsCreationKey":false,"Key":25.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"b95d2cc2-0851-4928-9313-3f253a76a4bc","path":"sprites/spr_bare_head_facial_hair/spr_bare_head_facial_hair.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"279c4898-51eb-4445-8427-f3fd36c0d771","IsCreationKey":false,"Key":26.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"1f9592d5-b51d-41c8-94be-37e388fe4b9a","path":"sprites/spr_bare_head_facial_hair/spr_bare_head_facial_hair.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"34843b68-25e9-4618-87fb-27befa7d8950","IsCreationKey":false,"Key":27.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"9a229b65-bd47-405a-ae89-b0782bc61f79","path":"sprites/spr_bare_head_facial_hair/spr_bare_head_facial_hair.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"4cdefec0-28e0-4132-aa41-dbf875fd0ee3","IsCreationKey":false,"Key":28.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"ca70a07a-98c3-4408-a54c-2ba37e348e45","path":"sprites/spr_bare_head_facial_hair/spr_bare_head_facial_hair.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"03dc0c18-282e-4127-9776-a50b0b9d63b7","IsCreationKey":false,"Key":29.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"59c10dbe-11d0-4440-89bd-b39c2bae2164","path":"sprites/spr_bare_head_facial_hair/spr_bare_head_facial_hair.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"a7cf473b-0620-4a60-a611-97c142cc3921","IsCreationKey":false,"Key":30.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"1f5b93dc-9e53-44d1-b999-74cd6aa4f829","path":"sprites/spr_bare_head_facial_hair/spr_bare_head_facial_hair.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"c862511f-777e-4228-b5d9-ad63167f469d","IsCreationKey":false,"Key":31.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"87cd986b-a055-4223-9044-fcf525bb0602","path":"sprites/spr_bare_head_facial_hair/spr_bare_head_facial_hair.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"c30dee50-e036-4082-bf98-678411575281","IsCreationKey":false,"Key":32.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"37f5b913-0b99-4f38-9252-88800edb3655","path":"sprites/spr_bare_head_facial_hair/spr_bare_head_facial_hair.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"d5248466-f8de-4b09-b63f-c54e557a0bf6","IsCreationKey":false,"Key":33.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"064b9d94-d8c7-40c4-83a4-66abb9d81082","path":"sprites/spr_bare_head_facial_hair/spr_bare_head_facial_hair.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"1322a47f-b05f-484b-903f-6f53fa5df61e","IsCreationKey":false,"Key":34.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"73d9098d-abca-4da7-b713-85f9fdde4c08","path":"sprites/spr_bare_head_facial_hair/spr_bare_head_facial_hair.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"a23f7d20-edad-4aaf-8284-aa2179360d89","IsCreationKey":false,"Key":35.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"026245f0-7593-46b8-a3c4-eece1626f779","path":"sprites/spr_bare_head_facial_hair/spr_bare_head_facial_hair.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"568d7249-b9e4-4592-b88c-d64728c0fdf3","IsCreationKey":false,"Key":36.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"2afb7a0e-f9ca-4f5e-aa3d-4b651bbbab12","path":"sprites/spr_bare_head_facial_hair/spr_bare_head_facial_hair.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"dd40d942-2f16-4672-98e1-4333d460eae1","IsCreationKey":false,"Key":37.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"7c5a60e2-d9e8-4785-b99f-e3f21993069e","path":"sprites/spr_bare_head_facial_hair/spr_bare_head_facial_hair.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"064dc774-30b8-4ae4-927b-64a7cd392163","IsCreationKey":false,"Key":38.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"171a2df4-0da9-4780-92c6-e774fa7d5fbb","path":"sprites/spr_bare_head_facial_hair/spr_bare_head_facial_hair.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"43374b2a-1d56-40b8-88f6-0d2337a7e332","IsCreationKey":false,"Key":39.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"c5005de7-88f9-4690-b2d0-75a4a3bbcf71","path":"sprites/spr_bare_head_facial_hair/spr_bare_head_facial_hair.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"dbe8a5cd-9a8e-4dbc-8849-aca2be9b6d6f","IsCreationKey":false,"Key":40.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"6ca665ee-1c72-40a2-a808-42fcca32e642","path":"sprites/spr_bare_head_facial_hair/spr_bare_head_facial_hair.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"736fb870-e235-4855-ba59-bdef16c1c6c6","IsCreationKey":false,"Key":41.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"9707ff5c-3e17-4c3a-a8af-b30c40afda13","path":"sprites/spr_bare_head_facial_hair/spr_bare_head_facial_hair.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"d86f54fc-a41e-4c60-abaa-8f374bdade4d","IsCreationKey":false,"Key":42.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"e73a1e60-7dda-4a3d-9536-b173e171a3f8","path":"sprites/spr_bare_head_facial_hair/spr_bare_head_facial_hair.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"87060c2c-392d-4ae5-bbf0-f76c9f362ff5","IsCreationKey":false,"Key":43.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"6a161d00-5bea-4f52-86ee-a91a16e20bf2","path":"sprites/spr_bare_head_facial_hair/spr_bare_head_facial_hair.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"504ef4f9-372d-4b40-bd45-8cc00259adfd","IsCreationKey":false,"Key":44.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"dbb51051-fd69-48a0-bdb9-1edb54a517d9","path":"sprites/spr_bare_head_facial_hair/spr_bare_head_facial_hair.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"af335c6d-90cb-41d4-84a1-a5e6b1434eb4","IsCreationKey":false,"Key":45.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"de7d6148-126b-4524-8b72-bfe5da178758","path":"sprites/spr_bare_head_facial_hair/spr_bare_head_facial_hair.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"7d20052d-7d8d-41d1-9caa-06505d709cf0","IsCreationKey":false,"Key":46.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"cb94ed63-672f-4c13-adfc-827c1574c939","path":"sprites/spr_bare_head_facial_hair/spr_bare_head_facial_hair.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"aadd3b16-c7fc-4fe8-a4d0-13d4d5797092","IsCreationKey":false,"Key":47.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"c99613e9-341f-4d82-a5e7-8d7f91be79ce","path":"sprites/spr_bare_head_facial_hair/spr_bare_head_facial_hair.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"461ee071-0dbe-44e4-a384-0554a46f3d37","IsCreationKey":false,"Key":48.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"82379a9d-a84d-4519-a7f8-d41902a4cde0","path":"sprites/spr_bare_head_facial_hair/spr_bare_head_facial_hair.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"cde633d7-5cdb-49de-87e1-827180deaf68","IsCreationKey":false,"Key":49.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"2e5d8e1a-0e6d-4a62-ba7e-81120ab8becf","path":"sprites/spr_bare_head_facial_hair/spr_bare_head_facial_hair.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"d92e8f53-7441-405b-a5cb-9f11f7b42020","IsCreationKey":false,"Key":50.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"7d214730-8933-4eba-a5ad-da582ae142f9","path":"sprites/spr_bare_head_facial_hair/spr_bare_head_facial_hair.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"fe38f50e-9a9c-415b-8de8-9607847a49e5","IsCreationKey":false,"Key":51.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"9a0d46f0-3f7c-4d1f-851e-7f8585cc3f4b","path":"sprites/spr_bare_head_facial_hair/spr_bare_head_facial_hair.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"fe39eedd-8bec-44b3-9a4d-3349c0c598d8","IsCreationKey":false,"Key":52.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"e6edda0a-94ef-4ab5-bf36-de28c022edd0","path":"sprites/spr_bare_head_facial_hair/spr_bare_head_facial_hair.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"a9e51da4-06de-4b0f-92d4-077865cabe5e","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"59c1ef31-735a-41e9-8751-c0917393ceba","path":"sprites/spr_bare_head_facial_hair/spr_bare_head_facial_hair.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"cf388989-1ec2-4a21-830d-07b0905766be","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"fe47c7c6-f0cc-4337-b749-5641c896e825","path":"sprites/spr_bare_head_facial_hair/spr_bare_head_facial_hair.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"641d15bb-071d-4744-b25e-d1f56af61040","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"4265cc35-d65c-4c91-b427-d0267766b28b","path":"sprites/spr_bare_head_facial_hair/spr_bare_head_facial_hair.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"700ade0a-a863-403d-afe5-c9eef47e66ea","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"f22d5e6e-e8d6-4e57-9e3c-7dbafa638897","path":"sprites/spr_bare_head_facial_hair/spr_bare_head_facial_hair.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"05fca8e1-2c17-4b6f-922a-2c36b32b228e","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"1d631d5c-7e26-4075-bec1-bf519e78533f","path":"sprites/spr_bare_head_facial_hair/spr_bare_head_facial_hair.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"d143f15a-7aaa-4a24-903f-cceda28a0e85","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"7d2f5106-91f4-4236-af24-be2d545ec8ad","path":"sprites/spr_bare_head_facial_hair/spr_bare_head_facial_hair.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"08e5c378-5300-49db-a001-3b0cef540331","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"fd34e62d-4a19-4366-ab5c-063069352d39","path":"sprites/spr_bare_head_facial_hair/spr_bare_head_facial_hair.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"fe404bdd-7af8-48a5-989e-e8d59bb707d6","IsCreationKey":false,"Key":7.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"ce920b9b-4f0b-49a8-b51c-b07365ab1a3d","path":"sprites/spr_bare_head_facial_hair/spr_bare_head_facial_hair.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"9ccf2321-f229-4fea-99d8-6ade77f9c840","IsCreationKey":false,"Key":8.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"84be56f9-976e-4bdf-b684-160b72c63473","path":"sprites/spr_bare_head_facial_hair/spr_bare_head_facial_hair.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"92265152-e73f-44cc-8d31-a4fbe12c16e4","IsCreationKey":false,"Key":9.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"ca62d7ba-307a-453f-9ddd-b572a27c67c5","path":"sprites/spr_bare_head_facial_hair/spr_bare_head_facial_hair.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"7b4cec6f-f300-4c95-9fac-ba0fab36e37e","IsCreationKey":false,"Key":10.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"50efae71-3499-4dc0-b4aa-37dec1af841b","path":"sprites/spr_bare_head_facial_hair/spr_bare_head_facial_hair.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"2ed3b162-394c-441e-8bbd-2700ad92168a","IsCreationKey":false,"Key":11.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"3a680f49-2f17-40e6-b24c-9cefb1016f0f","path":"sprites/spr_bare_head_facial_hair/spr_bare_head_facial_hair.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"02668362-7c95-400e-b1ec-dfec011a3fd0","IsCreationKey":false,"Key":12.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"f9808fc2-29dc-4df5-bed5-51e20d21261e","path":"sprites/spr_bare_head_facial_hair/spr_bare_head_facial_hair.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"285f3c33-4fc3-4afb-ba39-cf685a883954","IsCreationKey":false,"Key":13.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"119401c9-2466-48e8-b092-e7bec7b54345","path":"sprites/spr_bare_head_facial_hair/spr_bare_head_facial_hair.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"ad987105-bdde-4846-ae7e-6f0aa2e3cd4b","IsCreationKey":false,"Key":14.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"5f2896fb-a65c-47fb-ada7-4aebbf35fa60","path":"sprites/spr_bare_head_facial_hair/spr_bare_head_facial_hair.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"7acca3ce-8a1e-45a4-993d-bd2972a5677b","IsCreationKey":false,"Key":15.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"edf5d09d-e228-4916-9506-2b42e7c87c1d","path":"sprites/spr_bare_head_facial_hair/spr_bare_head_facial_hair.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"5763102d-e9f8-4746-8d16-e8dd6e4459d7","IsCreationKey":false,"Key":16.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"07a12172-16e3-47ec-8381-bcb4e17a5fea","path":"sprites/spr_bare_head_facial_hair/spr_bare_head_facial_hair.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"40547070-6c65-41d9-be86-8f60b05389f7","IsCreationKey":false,"Key":17.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"adc2ed6b-5442-4475-99f4-190d7eb468e9","path":"sprites/spr_bare_head_facial_hair/spr_bare_head_facial_hair.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"d78d2e7f-cd05-452c-a017-9df68175bf2f","IsCreationKey":false,"Key":18.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"a26d347c-d4ce-40b0-be4f-fbcfbb8b0aa0","path":"sprites/spr_bare_head_facial_hair/spr_bare_head_facial_hair.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"7d6f7e9b-92fd-47be-bb05-5744f87afdc7","IsCreationKey":false,"Key":19.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"fe1b4884-bbcb-472e-9a22-cb2b147cb41d","path":"sprites/spr_bare_head_facial_hair/spr_bare_head_facial_hair.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"f152782c-8280-4280-8bbe-9dc1ec5b501f","IsCreationKey":false,"Key":20.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"453ab56d-103e-412a-9a04-455992c9348b","path":"sprites/spr_bare_head_facial_hair/spr_bare_head_facial_hair.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"9f83625d-4429-4933-b1c7-b645ff2f0935","IsCreationKey":false,"Key":21.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"60da470d-ee25-4544-8db1-3ae06a6aca3e","path":"sprites/spr_bare_head_facial_hair/spr_bare_head_facial_hair.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"8a2ac66c-c54b-431e-8bf8-0e9e9e57d113","IsCreationKey":false,"Key":22.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"52d6be61-5261-4311-a0c1-07e935c25df6","path":"sprites/spr_bare_head_facial_hair/spr_bare_head_facial_hair.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"b5d3e828-d5c1-4b40-b8c4-01dea53cdbdd","IsCreationKey":false,"Key":23.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"19d5b278-59bb-4d28-8e5b-ff9fb08320d9","path":"sprites/spr_bare_head_facial_hair/spr_bare_head_facial_hair.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"b42a971c-8eb3-465d-9554-77d966f8883e","IsCreationKey":false,"Key":24.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"33f45c33-d49f-42e5-bc56-232649f96c22","path":"sprites/spr_bare_head_facial_hair/spr_bare_head_facial_hair.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"1c1ab60b-7140-47a9-b9f3-489e03bd587f","IsCreationKey":false,"Key":25.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"b95d2cc2-0851-4928-9313-3f253a76a4bc","path":"sprites/spr_bare_head_facial_hair/spr_bare_head_facial_hair.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"279c4898-51eb-4445-8427-f3fd36c0d771","IsCreationKey":false,"Key":26.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"1f9592d5-b51d-41c8-94be-37e388fe4b9a","path":"sprites/spr_bare_head_facial_hair/spr_bare_head_facial_hair.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"34843b68-25e9-4618-87fb-27befa7d8950","IsCreationKey":false,"Key":27.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"9a229b65-bd47-405a-ae89-b0782bc61f79","path":"sprites/spr_bare_head_facial_hair/spr_bare_head_facial_hair.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"4cdefec0-28e0-4132-aa41-dbf875fd0ee3","IsCreationKey":false,"Key":28.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"ca70a07a-98c3-4408-a54c-2ba37e348e45","path":"sprites/spr_bare_head_facial_hair/spr_bare_head_facial_hair.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"03dc0c18-282e-4127-9776-a50b0b9d63b7","IsCreationKey":false,"Key":29.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"59c10dbe-11d0-4440-89bd-b39c2bae2164","path":"sprites/spr_bare_head_facial_hair/spr_bare_head_facial_hair.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"a7cf473b-0620-4a60-a611-97c142cc3921","IsCreationKey":false,"Key":30.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"1f5b93dc-9e53-44d1-b999-74cd6aa4f829","path":"sprites/spr_bare_head_facial_hair/spr_bare_head_facial_hair.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"c862511f-777e-4228-b5d9-ad63167f469d","IsCreationKey":false,"Key":31.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"87cd986b-a055-4223-9044-fcf525bb0602","path":"sprites/spr_bare_head_facial_hair/spr_bare_head_facial_hair.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"c30dee50-e036-4082-bf98-678411575281","IsCreationKey":false,"Key":32.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"37f5b913-0b99-4f38-9252-88800edb3655","path":"sprites/spr_bare_head_facial_hair/spr_bare_head_facial_hair.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"d5248466-f8de-4b09-b63f-c54e557a0bf6","IsCreationKey":false,"Key":33.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"064b9d94-d8c7-40c4-83a4-66abb9d81082","path":"sprites/spr_bare_head_facial_hair/spr_bare_head_facial_hair.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"1322a47f-b05f-484b-903f-6f53fa5df61e","IsCreationKey":false,"Key":34.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"73d9098d-abca-4da7-b713-85f9fdde4c08","path":"sprites/spr_bare_head_facial_hair/spr_bare_head_facial_hair.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"a23f7d20-edad-4aaf-8284-aa2179360d89","IsCreationKey":false,"Key":35.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"026245f0-7593-46b8-a3c4-eece1626f779","path":"sprites/spr_bare_head_facial_hair/spr_bare_head_facial_hair.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"568d7249-b9e4-4592-b88c-d64728c0fdf3","IsCreationKey":false,"Key":36.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"2afb7a0e-f9ca-4f5e-aa3d-4b651bbbab12","path":"sprites/spr_bare_head_facial_hair/spr_bare_head_facial_hair.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"dd40d942-2f16-4672-98e1-4333d460eae1","IsCreationKey":false,"Key":37.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"7c5a60e2-d9e8-4785-b99f-e3f21993069e","path":"sprites/spr_bare_head_facial_hair/spr_bare_head_facial_hair.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"064dc774-30b8-4ae4-927b-64a7cd392163","IsCreationKey":false,"Key":38.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"171a2df4-0da9-4780-92c6-e774fa7d5fbb","path":"sprites/spr_bare_head_facial_hair/spr_bare_head_facial_hair.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"43374b2a-1d56-40b8-88f6-0d2337a7e332","IsCreationKey":false,"Key":39.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"c5005de7-88f9-4690-b2d0-75a4a3bbcf71","path":"sprites/spr_bare_head_facial_hair/spr_bare_head_facial_hair.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"dbe8a5cd-9a8e-4dbc-8849-aca2be9b6d6f","IsCreationKey":false,"Key":40.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"6ca665ee-1c72-40a2-a808-42fcca32e642","path":"sprites/spr_bare_head_facial_hair/spr_bare_head_facial_hair.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"736fb870-e235-4855-ba59-bdef16c1c6c6","IsCreationKey":false,"Key":41.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"9707ff5c-3e17-4c3a-a8af-b30c40afda13","path":"sprites/spr_bare_head_facial_hair/spr_bare_head_facial_hair.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"d86f54fc-a41e-4c60-abaa-8f374bdade4d","IsCreationKey":false,"Key":42.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"e73a1e60-7dda-4a3d-9536-b173e171a3f8","path":"sprites/spr_bare_head_facial_hair/spr_bare_head_facial_hair.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"87060c2c-392d-4ae5-bbf0-f76c9f362ff5","IsCreationKey":false,"Key":43.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"6a161d00-5bea-4f52-86ee-a91a16e20bf2","path":"sprites/spr_bare_head_facial_hair/spr_bare_head_facial_hair.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"504ef4f9-372d-4b40-bd45-8cc00259adfd","IsCreationKey":false,"Key":44.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"dbb51051-fd69-48a0-bdb9-1edb54a517d9","path":"sprites/spr_bare_head_facial_hair/spr_bare_head_facial_hair.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"af335c6d-90cb-41d4-84a1-a5e6b1434eb4","IsCreationKey":false,"Key":45.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"de7d6148-126b-4524-8b72-bfe5da178758","path":"sprites/spr_bare_head_facial_hair/spr_bare_head_facial_hair.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"7d20052d-7d8d-41d1-9caa-06505d709cf0","IsCreationKey":false,"Key":46.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"cb94ed63-672f-4c13-adfc-827c1574c939","path":"sprites/spr_bare_head_facial_hair/spr_bare_head_facial_hair.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"aadd3b16-c7fc-4fe8-a4d0-13d4d5797092","IsCreationKey":false,"Key":47.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"c99613e9-341f-4d82-a5e7-8d7f91be79ce","path":"sprites/spr_bare_head_facial_hair/spr_bare_head_facial_hair.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"461ee071-0dbe-44e4-a384-0554a46f3d37","IsCreationKey":false,"Key":48.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"82379a9d-a84d-4519-a7f8-d41902a4cde0","path":"sprites/spr_bare_head_facial_hair/spr_bare_head_facial_hair.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"cde633d7-5cdb-49de-87e1-827180deaf68","IsCreationKey":false,"Key":49.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"2e5d8e1a-0e6d-4a62-ba7e-81120ab8becf","path":"sprites/spr_bare_head_facial_hair/spr_bare_head_facial_hair.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"d92e8f53-7441-405b-a5cb-9f11f7b42020","IsCreationKey":false,"Key":50.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"7d214730-8933-4eba-a5ad-da582ae142f9","path":"sprites/spr_bare_head_facial_hair/spr_bare_head_facial_hair.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"fe38f50e-9a9c-415b-8de8-9607847a49e5","IsCreationKey":false,"Key":51.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"9a0d46f0-3f7c-4d1f-851e-7f8585cc3f4b","path":"sprites/spr_bare_head_facial_hair/spr_bare_head_facial_hair.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"fe39eedd-8bec-44b3-9a4d-3349c0c598d8","IsCreationKey":false,"Key":52.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_bare_head_facial_hair_colourable/spr_bare_head_facial_hair_colourable.yy b/sprites/spr_bare_head_facial_hair_colourable/spr_bare_head_facial_hair_colourable.yy index e7e79610be..aa5ebfebc5 100644 --- a/sprites/spr_bare_head_facial_hair_colourable/spr_bare_head_facial_hair_colourable.yy +++ b/sprites/spr_bare_head_facial_hair_colourable/spr_bare_head_facial_hair_colourable.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_bare_head_facial_hair_colourable", "bboxMode":0, "bbox_bottom":63, @@ -12,16 +12,16 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"7dcbfd8c-30e4-4244-9d8f-2da673c3c624","name":"7dcbfd8c-30e4-4244-9d8f-2da673c3c624","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"789a65e4-c488-4ee9-a598-5ead885fa298","name":"789a65e4-c488-4ee9-a598-5ead885fa298","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"a22c72ec-3334-4ac3-9d76-cd6f78aa94ad","name":"a22c72ec-3334-4ac3-9d76-cd6f78aa94ad","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"26323f47-b73b-4297-ba10-09aae76121a2","name":"26323f47-b73b-4297-ba10-09aae76121a2","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"25f3c04a-21a5-4eed-ae96-bac303387033","name":"25f3c04a-21a5-4eed-ae96-bac303387033","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"a952d6ec-8732-4b76-aad5-568ff548a743","name":"a952d6ec-8732-4b76-aad5-568ff548a743","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"7c16add8-7098-4881-88ed-ebb334520439","name":"7c16add8-7098-4881-88ed-ebb334520439","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"73d446e5-adf7-4e92-9af5-33c5cbd38662","name":"73d446e5-adf7-4e92-9af5-33c5cbd38662","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"72ddc6f3-ea56-494b-ab07-e01e5c6a49e5","name":"72ddc6f3-ea56-494b-ab07-e01e5c6a49e5","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"9828331d-007f-4b69-ae4f-3eaf82a38cb8","name":"9828331d-007f-4b69-ae4f-3eaf82a38cb8","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"7dcbfd8c-30e4-4244-9d8f-2da673c3c624","name":"7dcbfd8c-30e4-4244-9d8f-2da673c3c624","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"789a65e4-c488-4ee9-a598-5ead885fa298","name":"789a65e4-c488-4ee9-a598-5ead885fa298","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"a22c72ec-3334-4ac3-9d76-cd6f78aa94ad","name":"a22c72ec-3334-4ac3-9d76-cd6f78aa94ad","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"26323f47-b73b-4297-ba10-09aae76121a2","name":"26323f47-b73b-4297-ba10-09aae76121a2","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"25f3c04a-21a5-4eed-ae96-bac303387033","name":"25f3c04a-21a5-4eed-ae96-bac303387033","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"a952d6ec-8732-4b76-aad5-568ff548a743","name":"a952d6ec-8732-4b76-aad5-568ff548a743","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"7c16add8-7098-4881-88ed-ebb334520439","name":"7c16add8-7098-4881-88ed-ebb334520439","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"73d446e5-adf7-4e92-9af5-33c5cbd38662","name":"73d446e5-adf7-4e92-9af5-33c5cbd38662","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"72ddc6f3-ea56-494b-ab07-e01e5c6a49e5","name":"72ddc6f3-ea56-494b-ab07-e01e5c6a49e5","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"9828331d-007f-4b69-ae4f-3eaf82a38cb8","name":"9828331d-007f-4b69-ae4f-3eaf82a38cb8","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -79,36 +79,16 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"7dcbfd8c-30e4-4244-9d8f-2da673c3c624","path":"sprites/spr_bare_head_facial_hair_colourable/spr_bare_head_facial_hair_colourable.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"04123629-2eb4-4cd7-839e-f1c2322f04e7","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"789a65e4-c488-4ee9-a598-5ead885fa298","path":"sprites/spr_bare_head_facial_hair_colourable/spr_bare_head_facial_hair_colourable.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"aa37aa36-f8ed-47fc-95c7-cf5d6633ad2c","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"a22c72ec-3334-4ac3-9d76-cd6f78aa94ad","path":"sprites/spr_bare_head_facial_hair_colourable/spr_bare_head_facial_hair_colourable.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"25893de7-0896-49a2-98eb-655453e3aa96","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"26323f47-b73b-4297-ba10-09aae76121a2","path":"sprites/spr_bare_head_facial_hair_colourable/spr_bare_head_facial_hair_colourable.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"0de8cd1b-564a-4c59-9af5-431760147f8b","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"25f3c04a-21a5-4eed-ae96-bac303387033","path":"sprites/spr_bare_head_facial_hair_colourable/spr_bare_head_facial_hair_colourable.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"322ea2fd-c6d4-4eaf-9844-0d68a14ea771","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"a952d6ec-8732-4b76-aad5-568ff548a743","path":"sprites/spr_bare_head_facial_hair_colourable/spr_bare_head_facial_hair_colourable.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"f0196999-ef32-46a6-9de5-97e517754e8f","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"7c16add8-7098-4881-88ed-ebb334520439","path":"sprites/spr_bare_head_facial_hair_colourable/spr_bare_head_facial_hair_colourable.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"f822b6ac-ef23-4c11-ab68-15caed055570","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"73d446e5-adf7-4e92-9af5-33c5cbd38662","path":"sprites/spr_bare_head_facial_hair_colourable/spr_bare_head_facial_hair_colourable.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"9808dc33-8917-4ac1-b19b-2d671fd026ab","IsCreationKey":false,"Key":7.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"72ddc6f3-ea56-494b-ab07-e01e5c6a49e5","path":"sprites/spr_bare_head_facial_hair_colourable/spr_bare_head_facial_hair_colourable.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"f4bcadfc-516b-48e6-9b5f-ff5824903353","IsCreationKey":false,"Key":8.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"9828331d-007f-4b69-ae4f-3eaf82a38cb8","path":"sprites/spr_bare_head_facial_hair_colourable/spr_bare_head_facial_hair_colourable.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"32cfe44f-5526-44af-9e2e-5f7f9d73d419","IsCreationKey":false,"Key":9.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"7dcbfd8c-30e4-4244-9d8f-2da673c3c624","path":"sprites/spr_bare_head_facial_hair_colourable/spr_bare_head_facial_hair_colourable.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"04123629-2eb4-4cd7-839e-f1c2322f04e7","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"789a65e4-c488-4ee9-a598-5ead885fa298","path":"sprites/spr_bare_head_facial_hair_colourable/spr_bare_head_facial_hair_colourable.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"aa37aa36-f8ed-47fc-95c7-cf5d6633ad2c","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"a22c72ec-3334-4ac3-9d76-cd6f78aa94ad","path":"sprites/spr_bare_head_facial_hair_colourable/spr_bare_head_facial_hair_colourable.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"25893de7-0896-49a2-98eb-655453e3aa96","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"26323f47-b73b-4297-ba10-09aae76121a2","path":"sprites/spr_bare_head_facial_hair_colourable/spr_bare_head_facial_hair_colourable.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"0de8cd1b-564a-4c59-9af5-431760147f8b","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"25f3c04a-21a5-4eed-ae96-bac303387033","path":"sprites/spr_bare_head_facial_hair_colourable/spr_bare_head_facial_hair_colourable.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"322ea2fd-c6d4-4eaf-9844-0d68a14ea771","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"a952d6ec-8732-4b76-aad5-568ff548a743","path":"sprites/spr_bare_head_facial_hair_colourable/spr_bare_head_facial_hair_colourable.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"f0196999-ef32-46a6-9de5-97e517754e8f","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"7c16add8-7098-4881-88ed-ebb334520439","path":"sprites/spr_bare_head_facial_hair_colourable/spr_bare_head_facial_hair_colourable.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"f822b6ac-ef23-4c11-ab68-15caed055570","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"73d446e5-adf7-4e92-9af5-33c5cbd38662","path":"sprites/spr_bare_head_facial_hair_colourable/spr_bare_head_facial_hair_colourable.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"9808dc33-8917-4ac1-b19b-2d671fd026ab","IsCreationKey":false,"Key":7.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"72ddc6f3-ea56-494b-ab07-e01e5c6a49e5","path":"sprites/spr_bare_head_facial_hair_colourable/spr_bare_head_facial_hair_colourable.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"f4bcadfc-516b-48e6-9b5f-ff5824903353","IsCreationKey":false,"Key":8.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"9828331d-007f-4b69-ae4f-3eaf82a38cb8","path":"sprites/spr_bare_head_facial_hair_colourable/spr_bare_head_facial_hair_colourable.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"32cfe44f-5526-44af-9e2e-5f7f9d73d419","IsCreationKey":false,"Key":9.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_bare_heads/spr_bare_heads.yy b/sprites/spr_bare_heads/spr_bare_heads.yy index 92212b645c..db6fdf7e38 100644 --- a/sprites/spr_bare_heads/spr_bare_heads.yy +++ b/sprites/spr_bare_heads/spr_bare_heads.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_bare_heads", "bboxMode":0, "bbox_bottom":44, @@ -12,51 +12,51 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"d0394d2c-1519-4705-9cfa-bff1e4d0bce1","name":"d0394d2c-1519-4705-9cfa-bff1e4d0bce1","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"c1f4af0d-ab7c-4e9c-b66b-c6b0d3b0711e","name":"c1f4af0d-ab7c-4e9c-b66b-c6b0d3b0711e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"b70f17ac-4a82-47d2-b564-0f99c4b3b3ec","name":"b70f17ac-4a82-47d2-b564-0f99c4b3b3ec","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"05289283-cf3c-49ba-978c-c5705e259221","name":"05289283-cf3c-49ba-978c-c5705e259221","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"269de542-29d3-4e95-861d-ee5e4396f389","name":"269de542-29d3-4e95-861d-ee5e4396f389","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"1413a945-9705-40c0-8532-72c7463a559a","name":"1413a945-9705-40c0-8532-72c7463a559a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"2fc152dc-0248-4a49-86fa-8bf6e49def31","name":"2fc152dc-0248-4a49-86fa-8bf6e49def31","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"d204018f-27e8-4e54-b5e7-d50899ede96c","name":"d204018f-27e8-4e54-b5e7-d50899ede96c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"7d33ea45-2c2f-4276-adbe-04ebf5db4080","name":"7d33ea45-2c2f-4276-adbe-04ebf5db4080","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"4c551fcd-30cd-4f8b-b420-ce1a36673dac","name":"4c551fcd-30cd-4f8b-b420-ce1a36673dac","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"44032114-1f2f-47cd-a4a6-1421600214cd","name":"44032114-1f2f-47cd-a4a6-1421600214cd","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"eeaf5887-2715-4e95-9063-c97aabdd28e1","name":"eeaf5887-2715-4e95-9063-c97aabdd28e1","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"caca9d43-9453-48f3-b26f-5e8be74ea6f8","name":"caca9d43-9453-48f3-b26f-5e8be74ea6f8","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"da05b69a-1448-41be-90c3-5cfbba0a8721","name":"da05b69a-1448-41be-90c3-5cfbba0a8721","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"0dd93d11-13c8-444c-8261-6b5733f8b58b","name":"0dd93d11-13c8-444c-8261-6b5733f8b58b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"66369c74-4a0c-4542-bc5d-554d6e83c25a","name":"66369c74-4a0c-4542-bc5d-554d6e83c25a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"85cdef35-b9f6-48e7-b907-843a160b1fc7","name":"85cdef35-b9f6-48e7-b907-843a160b1fc7","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"b6f81ed7-7136-4422-835e-a2c3546f1548","name":"b6f81ed7-7136-4422-835e-a2c3546f1548","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"842d94d2-94ff-4452-951a-eea2822aea1b","name":"842d94d2-94ff-4452-951a-eea2822aea1b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"136b448f-cab9-4502-ab49-211dae6baa0b","name":"136b448f-cab9-4502-ab49-211dae6baa0b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"42f039f6-9ecd-4222-9b4c-17793d4d2f5d","name":"42f039f6-9ecd-4222-9b4c-17793d4d2f5d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"caf154c5-d8d8-498a-9695-3b4adc97fe74","name":"caf154c5-d8d8-498a-9695-3b4adc97fe74","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"6cacd7b9-2fb0-44d2-bb6a-c439104f2f54","name":"6cacd7b9-2fb0-44d2-bb6a-c439104f2f54","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"2407b5d3-1513-4a94-9fa9-12f20669831f","name":"2407b5d3-1513-4a94-9fa9-12f20669831f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"743472f3-6863-4abe-bf55-bbeff76aaf00","name":"743472f3-6863-4abe-bf55-bbeff76aaf00","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"6f343e60-f82b-408e-a5e0-1b3078ccf0f2","name":"6f343e60-f82b-408e-a5e0-1b3078ccf0f2","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"fb678b5e-7fc5-4837-b753-9f3dbadc87a0","name":"fb678b5e-7fc5-4837-b753-9f3dbadc87a0","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"8e607018-2fee-4472-af53-adf27c701121","name":"8e607018-2fee-4472-af53-adf27c701121","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"ffc63594-ebb2-47ba-8083-be578882d2b4","name":"ffc63594-ebb2-47ba-8083-be578882d2b4","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"2f939735-055a-4eeb-a48a-ba21f7ecf19b","name":"2f939735-055a-4eeb-a48a-ba21f7ecf19b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"d7bbf94c-6658-40a3-a353-9ae9f765ea80","name":"d7bbf94c-6658-40a3-a353-9ae9f765ea80","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"e4a4822c-f0ee-4a45-a579-46a46d4c4a3a","name":"e4a4822c-f0ee-4a45-a579-46a46d4c4a3a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"004d1c23-13a6-463e-8b53-7a4ab648f6a3","name":"004d1c23-13a6-463e-8b53-7a4ab648f6a3","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"e705a700-72b0-45e8-abc0-902b0b6b5480","name":"e705a700-72b0-45e8-abc0-902b0b6b5480","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"447ef73d-fd8d-4b8e-b9f8-f4f42d32fe9a","name":"447ef73d-fd8d-4b8e-b9f8-f4f42d32fe9a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"05d7a269-8f5f-416d-a32e-01ecadc03df9","name":"05d7a269-8f5f-416d-a32e-01ecadc03df9","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"a19ab7b7-1525-4f22-b385-3c6a5556bebf","name":"a19ab7b7-1525-4f22-b385-3c6a5556bebf","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"bb1a5dde-af7a-43f8-aac7-5657258cc742","name":"bb1a5dde-af7a-43f8-aac7-5657258cc742","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"412496f6-a833-4a5b-a839-cdf54c804bd9","name":"412496f6-a833-4a5b-a839-cdf54c804bd9","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"34af844a-9bf2-4670-92b2-5b8742d19f45","name":"34af844a-9bf2-4670-92b2-5b8742d19f45","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"e1456b2a-3264-4d4d-9613-e0e84a4b8d80","name":"e1456b2a-3264-4d4d-9613-e0e84a4b8d80","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"f250301d-3a8b-45be-a367-c659a8172e53","name":"f250301d-3a8b-45be-a367-c659a8172e53","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"cc3c809d-f17c-4b1d-813f-7fda90d89c1a","name":"cc3c809d-f17c-4b1d-813f-7fda90d89c1a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"a7b7e265-024b-4a01-9527-6c6fb8015a37","name":"a7b7e265-024b-4a01-9527-6c6fb8015a37","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"defe2a73-dc9a-4ac9-b679-75dd0fa37037","name":"defe2a73-dc9a-4ac9-b679-75dd0fa37037","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"d0394d2c-1519-4705-9cfa-bff1e4d0bce1","name":"d0394d2c-1519-4705-9cfa-bff1e4d0bce1","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"c1f4af0d-ab7c-4e9c-b66b-c6b0d3b0711e","name":"c1f4af0d-ab7c-4e9c-b66b-c6b0d3b0711e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"b70f17ac-4a82-47d2-b564-0f99c4b3b3ec","name":"b70f17ac-4a82-47d2-b564-0f99c4b3b3ec","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"05289283-cf3c-49ba-978c-c5705e259221","name":"05289283-cf3c-49ba-978c-c5705e259221","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"269de542-29d3-4e95-861d-ee5e4396f389","name":"269de542-29d3-4e95-861d-ee5e4396f389","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"1413a945-9705-40c0-8532-72c7463a559a","name":"1413a945-9705-40c0-8532-72c7463a559a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"2fc152dc-0248-4a49-86fa-8bf6e49def31","name":"2fc152dc-0248-4a49-86fa-8bf6e49def31","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"d204018f-27e8-4e54-b5e7-d50899ede96c","name":"d204018f-27e8-4e54-b5e7-d50899ede96c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"7d33ea45-2c2f-4276-adbe-04ebf5db4080","name":"7d33ea45-2c2f-4276-adbe-04ebf5db4080","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"4c551fcd-30cd-4f8b-b420-ce1a36673dac","name":"4c551fcd-30cd-4f8b-b420-ce1a36673dac","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"44032114-1f2f-47cd-a4a6-1421600214cd","name":"44032114-1f2f-47cd-a4a6-1421600214cd","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"eeaf5887-2715-4e95-9063-c97aabdd28e1","name":"eeaf5887-2715-4e95-9063-c97aabdd28e1","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"caca9d43-9453-48f3-b26f-5e8be74ea6f8","name":"caca9d43-9453-48f3-b26f-5e8be74ea6f8","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"da05b69a-1448-41be-90c3-5cfbba0a8721","name":"da05b69a-1448-41be-90c3-5cfbba0a8721","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"0dd93d11-13c8-444c-8261-6b5733f8b58b","name":"0dd93d11-13c8-444c-8261-6b5733f8b58b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"66369c74-4a0c-4542-bc5d-554d6e83c25a","name":"66369c74-4a0c-4542-bc5d-554d6e83c25a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"85cdef35-b9f6-48e7-b907-843a160b1fc7","name":"85cdef35-b9f6-48e7-b907-843a160b1fc7","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"b6f81ed7-7136-4422-835e-a2c3546f1548","name":"b6f81ed7-7136-4422-835e-a2c3546f1548","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"842d94d2-94ff-4452-951a-eea2822aea1b","name":"842d94d2-94ff-4452-951a-eea2822aea1b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"136b448f-cab9-4502-ab49-211dae6baa0b","name":"136b448f-cab9-4502-ab49-211dae6baa0b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"42f039f6-9ecd-4222-9b4c-17793d4d2f5d","name":"42f039f6-9ecd-4222-9b4c-17793d4d2f5d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"caf154c5-d8d8-498a-9695-3b4adc97fe74","name":"caf154c5-d8d8-498a-9695-3b4adc97fe74","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"6cacd7b9-2fb0-44d2-bb6a-c439104f2f54","name":"6cacd7b9-2fb0-44d2-bb6a-c439104f2f54","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"2407b5d3-1513-4a94-9fa9-12f20669831f","name":"2407b5d3-1513-4a94-9fa9-12f20669831f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"743472f3-6863-4abe-bf55-bbeff76aaf00","name":"743472f3-6863-4abe-bf55-bbeff76aaf00","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"6f343e60-f82b-408e-a5e0-1b3078ccf0f2","name":"6f343e60-f82b-408e-a5e0-1b3078ccf0f2","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"fb678b5e-7fc5-4837-b753-9f3dbadc87a0","name":"fb678b5e-7fc5-4837-b753-9f3dbadc87a0","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"8e607018-2fee-4472-af53-adf27c701121","name":"8e607018-2fee-4472-af53-adf27c701121","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"ffc63594-ebb2-47ba-8083-be578882d2b4","name":"ffc63594-ebb2-47ba-8083-be578882d2b4","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"2f939735-055a-4eeb-a48a-ba21f7ecf19b","name":"2f939735-055a-4eeb-a48a-ba21f7ecf19b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"d7bbf94c-6658-40a3-a353-9ae9f765ea80","name":"d7bbf94c-6658-40a3-a353-9ae9f765ea80","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"e4a4822c-f0ee-4a45-a579-46a46d4c4a3a","name":"e4a4822c-f0ee-4a45-a579-46a46d4c4a3a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"004d1c23-13a6-463e-8b53-7a4ab648f6a3","name":"004d1c23-13a6-463e-8b53-7a4ab648f6a3","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"e705a700-72b0-45e8-abc0-902b0b6b5480","name":"e705a700-72b0-45e8-abc0-902b0b6b5480","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"447ef73d-fd8d-4b8e-b9f8-f4f42d32fe9a","name":"447ef73d-fd8d-4b8e-b9f8-f4f42d32fe9a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"05d7a269-8f5f-416d-a32e-01ecadc03df9","name":"05d7a269-8f5f-416d-a32e-01ecadc03df9","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"a19ab7b7-1525-4f22-b385-3c6a5556bebf","name":"a19ab7b7-1525-4f22-b385-3c6a5556bebf","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"bb1a5dde-af7a-43f8-aac7-5657258cc742","name":"bb1a5dde-af7a-43f8-aac7-5657258cc742","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"412496f6-a833-4a5b-a839-cdf54c804bd9","name":"412496f6-a833-4a5b-a839-cdf54c804bd9","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"34af844a-9bf2-4670-92b2-5b8742d19f45","name":"34af844a-9bf2-4670-92b2-5b8742d19f45","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"e1456b2a-3264-4d4d-9613-e0e84a4b8d80","name":"e1456b2a-3264-4d4d-9613-e0e84a4b8d80","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"f250301d-3a8b-45be-a367-c659a8172e53","name":"f250301d-3a8b-45be-a367-c659a8172e53","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"cc3c809d-f17c-4b1d-813f-7fda90d89c1a","name":"cc3c809d-f17c-4b1d-813f-7fda90d89c1a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"a7b7e265-024b-4a01-9527-6c6fb8015a37","name":"a7b7e265-024b-4a01-9527-6c6fb8015a37","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"defe2a73-dc9a-4ac9-b679-75dd0fa37037","name":"defe2a73-dc9a-4ac9-b679-75dd0fa37037","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -114,141 +114,51 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"d0394d2c-1519-4705-9cfa-bff1e4d0bce1","path":"sprites/spr_bare_heads/spr_bare_heads.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"3e4d7ee5-ad96-4f30-95ce-a0c9a3b9d069","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"c1f4af0d-ab7c-4e9c-b66b-c6b0d3b0711e","path":"sprites/spr_bare_heads/spr_bare_heads.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"01840bc3-1dc1-4799-907f-aabc1736c261","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"b70f17ac-4a82-47d2-b564-0f99c4b3b3ec","path":"sprites/spr_bare_heads/spr_bare_heads.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"97fd8b82-375e-49a4-8987-8b2491eb1baf","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"05289283-cf3c-49ba-978c-c5705e259221","path":"sprites/spr_bare_heads/spr_bare_heads.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"2318329d-6aab-4533-bdaa-e7805e9b15b4","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"269de542-29d3-4e95-861d-ee5e4396f389","path":"sprites/spr_bare_heads/spr_bare_heads.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"31ad97ec-9da0-47a5-90e1-a9b26393e96d","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"1413a945-9705-40c0-8532-72c7463a559a","path":"sprites/spr_bare_heads/spr_bare_heads.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"d7f6b8d0-aa60-4dee-85bd-ae56f29450b4","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"2fc152dc-0248-4a49-86fa-8bf6e49def31","path":"sprites/spr_bare_heads/spr_bare_heads.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"74fb959e-3e19-48c0-b3a6-bd546e1a8e75","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"d204018f-27e8-4e54-b5e7-d50899ede96c","path":"sprites/spr_bare_heads/spr_bare_heads.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"73952404-cb8b-464a-a7aa-3aa9b9c4587d","IsCreationKey":false,"Key":7.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"7d33ea45-2c2f-4276-adbe-04ebf5db4080","path":"sprites/spr_bare_heads/spr_bare_heads.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"8f261bef-12bf-4b37-a300-434041e3b5d6","IsCreationKey":false,"Key":8.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"4c551fcd-30cd-4f8b-b420-ce1a36673dac","path":"sprites/spr_bare_heads/spr_bare_heads.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"ca614523-7c89-4120-abe1-58169c8f4267","IsCreationKey":false,"Key":9.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"44032114-1f2f-47cd-a4a6-1421600214cd","path":"sprites/spr_bare_heads/spr_bare_heads.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"1be6cd38-e67c-4068-814e-8bc76c469ef6","IsCreationKey":false,"Key":10.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"eeaf5887-2715-4e95-9063-c97aabdd28e1","path":"sprites/spr_bare_heads/spr_bare_heads.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"08fed482-516f-4bc4-8e62-df1f5ddd2378","IsCreationKey":false,"Key":11.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"caca9d43-9453-48f3-b26f-5e8be74ea6f8","path":"sprites/spr_bare_heads/spr_bare_heads.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"8bd26df5-8feb-4ab1-92a1-c82b9a377ddc","IsCreationKey":false,"Key":12.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"da05b69a-1448-41be-90c3-5cfbba0a8721","path":"sprites/spr_bare_heads/spr_bare_heads.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"b674b5aa-b71a-4987-991f-ad9fed6243bd","IsCreationKey":false,"Key":13.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"0dd93d11-13c8-444c-8261-6b5733f8b58b","path":"sprites/spr_bare_heads/spr_bare_heads.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"484adcfc-055b-4bd2-8a69-7f6ef1845733","IsCreationKey":false,"Key":14.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"66369c74-4a0c-4542-bc5d-554d6e83c25a","path":"sprites/spr_bare_heads/spr_bare_heads.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"89e92372-ddc8-41c5-ba42-a8f62dcc9fc6","IsCreationKey":false,"Key":15.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"85cdef35-b9f6-48e7-b907-843a160b1fc7","path":"sprites/spr_bare_heads/spr_bare_heads.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"34a79fa8-8079-48f2-97c2-cf5597257626","IsCreationKey":false,"Key":16.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"b6f81ed7-7136-4422-835e-a2c3546f1548","path":"sprites/spr_bare_heads/spr_bare_heads.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"0a6ad9ef-c588-41b9-96f4-dea51b324aef","IsCreationKey":false,"Key":17.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"842d94d2-94ff-4452-951a-eea2822aea1b","path":"sprites/spr_bare_heads/spr_bare_heads.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"179fdf05-ab39-44b0-9d53-3601823644d4","IsCreationKey":false,"Key":18.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"136b448f-cab9-4502-ab49-211dae6baa0b","path":"sprites/spr_bare_heads/spr_bare_heads.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"4040dc72-745d-4e35-a7c5-f65e7aab043c","IsCreationKey":false,"Key":19.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"42f039f6-9ecd-4222-9b4c-17793d4d2f5d","path":"sprites/spr_bare_heads/spr_bare_heads.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"b87e4893-54e4-4e14-b3de-7cbc4ad4573d","IsCreationKey":false,"Key":20.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"caf154c5-d8d8-498a-9695-3b4adc97fe74","path":"sprites/spr_bare_heads/spr_bare_heads.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"8cca6dcf-ec65-406d-843c-6e1ae18bb3c0","IsCreationKey":false,"Key":21.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"6cacd7b9-2fb0-44d2-bb6a-c439104f2f54","path":"sprites/spr_bare_heads/spr_bare_heads.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"33695af1-3f1f-4235-aaad-4394a9c7faef","IsCreationKey":false,"Key":22.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"2407b5d3-1513-4a94-9fa9-12f20669831f","path":"sprites/spr_bare_heads/spr_bare_heads.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"afbc04d4-7e38-410d-ba02-ce4314cd47ce","IsCreationKey":false,"Key":23.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"743472f3-6863-4abe-bf55-bbeff76aaf00","path":"sprites/spr_bare_heads/spr_bare_heads.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"723f7c79-4e5f-46df-9c78-5a799c698654","IsCreationKey":false,"Key":24.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"6f343e60-f82b-408e-a5e0-1b3078ccf0f2","path":"sprites/spr_bare_heads/spr_bare_heads.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"0a9d1567-0b32-43d8-8f0a-310c6728a8a6","IsCreationKey":false,"Key":25.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"fb678b5e-7fc5-4837-b753-9f3dbadc87a0","path":"sprites/spr_bare_heads/spr_bare_heads.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"859ae0fb-8969-4e1a-8d91-823ea7f0702a","IsCreationKey":false,"Key":26.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"8e607018-2fee-4472-af53-adf27c701121","path":"sprites/spr_bare_heads/spr_bare_heads.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"20532cfd-03ba-4a9d-a019-6ced8cf9b990","IsCreationKey":false,"Key":27.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"ffc63594-ebb2-47ba-8083-be578882d2b4","path":"sprites/spr_bare_heads/spr_bare_heads.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"b4ecb63b-a763-486b-8037-2ff47f6b2caa","IsCreationKey":false,"Key":28.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"2f939735-055a-4eeb-a48a-ba21f7ecf19b","path":"sprites/spr_bare_heads/spr_bare_heads.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"90a1faf0-f01f-4e58-ba2e-202426528474","IsCreationKey":false,"Key":29.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"d7bbf94c-6658-40a3-a353-9ae9f765ea80","path":"sprites/spr_bare_heads/spr_bare_heads.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"a7d032d3-ee82-4e9d-a158-09122b739dd5","IsCreationKey":false,"Key":30.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"e4a4822c-f0ee-4a45-a579-46a46d4c4a3a","path":"sprites/spr_bare_heads/spr_bare_heads.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"05424da7-a46c-451d-b736-9880cc9bd9b8","IsCreationKey":false,"Key":31.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"004d1c23-13a6-463e-8b53-7a4ab648f6a3","path":"sprites/spr_bare_heads/spr_bare_heads.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"221a454d-8e8c-440a-b4dd-bf887912c319","IsCreationKey":false,"Key":32.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"e705a700-72b0-45e8-abc0-902b0b6b5480","path":"sprites/spr_bare_heads/spr_bare_heads.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"256e01ac-92a5-4b00-b924-f737ba60a369","IsCreationKey":false,"Key":33.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"447ef73d-fd8d-4b8e-b9f8-f4f42d32fe9a","path":"sprites/spr_bare_heads/spr_bare_heads.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"eb40438e-c2f8-4710-a5c7-6b5baba67f2d","IsCreationKey":false,"Key":34.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"05d7a269-8f5f-416d-a32e-01ecadc03df9","path":"sprites/spr_bare_heads/spr_bare_heads.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"dfd1e5f3-169b-43c3-8fa1-39b1b2a0f46b","IsCreationKey":false,"Key":35.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"a19ab7b7-1525-4f22-b385-3c6a5556bebf","path":"sprites/spr_bare_heads/spr_bare_heads.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"2b06c89f-a1e5-4676-84a3-e775f1fbe9ea","IsCreationKey":false,"Key":36.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"bb1a5dde-af7a-43f8-aac7-5657258cc742","path":"sprites/spr_bare_heads/spr_bare_heads.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"423f94d0-193c-4ce2-9ab4-81d6e5dd7eaf","IsCreationKey":false,"Key":37.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"412496f6-a833-4a5b-a839-cdf54c804bd9","path":"sprites/spr_bare_heads/spr_bare_heads.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"eb8d528c-67fa-4f2d-8ce6-a5666d349c91","IsCreationKey":false,"Key":38.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"34af844a-9bf2-4670-92b2-5b8742d19f45","path":"sprites/spr_bare_heads/spr_bare_heads.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"01e51592-6bd6-474b-977d-824df4e2bf22","IsCreationKey":false,"Key":39.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"e1456b2a-3264-4d4d-9613-e0e84a4b8d80","path":"sprites/spr_bare_heads/spr_bare_heads.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"a78d6371-2bc1-40ac-875b-c103a08506e5","IsCreationKey":false,"Key":40.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"f250301d-3a8b-45be-a367-c659a8172e53","path":"sprites/spr_bare_heads/spr_bare_heads.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"eb51533d-c39b-4638-9aa5-2edf96f2546c","IsCreationKey":false,"Key":41.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"cc3c809d-f17c-4b1d-813f-7fda90d89c1a","path":"sprites/spr_bare_heads/spr_bare_heads.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"695b5b5d-17d0-4d8f-bf1e-853a0daaea94","IsCreationKey":false,"Key":42.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"a7b7e265-024b-4a01-9527-6c6fb8015a37","path":"sprites/spr_bare_heads/spr_bare_heads.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"1d6300bb-f4d2-4f29-88f7-d55305e9750e","IsCreationKey":false,"Key":43.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"defe2a73-dc9a-4ac9-b679-75dd0fa37037","path":"sprites/spr_bare_heads/spr_bare_heads.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"ad65432a-03b3-44aa-bb4d-66a7218859bb","IsCreationKey":false,"Key":44.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"d0394d2c-1519-4705-9cfa-bff1e4d0bce1","path":"sprites/spr_bare_heads/spr_bare_heads.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"3e4d7ee5-ad96-4f30-95ce-a0c9a3b9d069","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"c1f4af0d-ab7c-4e9c-b66b-c6b0d3b0711e","path":"sprites/spr_bare_heads/spr_bare_heads.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"01840bc3-1dc1-4799-907f-aabc1736c261","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"b70f17ac-4a82-47d2-b564-0f99c4b3b3ec","path":"sprites/spr_bare_heads/spr_bare_heads.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"97fd8b82-375e-49a4-8987-8b2491eb1baf","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"05289283-cf3c-49ba-978c-c5705e259221","path":"sprites/spr_bare_heads/spr_bare_heads.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"2318329d-6aab-4533-bdaa-e7805e9b15b4","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"269de542-29d3-4e95-861d-ee5e4396f389","path":"sprites/spr_bare_heads/spr_bare_heads.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"31ad97ec-9da0-47a5-90e1-a9b26393e96d","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"1413a945-9705-40c0-8532-72c7463a559a","path":"sprites/spr_bare_heads/spr_bare_heads.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"d7f6b8d0-aa60-4dee-85bd-ae56f29450b4","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"2fc152dc-0248-4a49-86fa-8bf6e49def31","path":"sprites/spr_bare_heads/spr_bare_heads.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"74fb959e-3e19-48c0-b3a6-bd546e1a8e75","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"d204018f-27e8-4e54-b5e7-d50899ede96c","path":"sprites/spr_bare_heads/spr_bare_heads.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"73952404-cb8b-464a-a7aa-3aa9b9c4587d","IsCreationKey":false,"Key":7.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"7d33ea45-2c2f-4276-adbe-04ebf5db4080","path":"sprites/spr_bare_heads/spr_bare_heads.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"8f261bef-12bf-4b37-a300-434041e3b5d6","IsCreationKey":false,"Key":8.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"4c551fcd-30cd-4f8b-b420-ce1a36673dac","path":"sprites/spr_bare_heads/spr_bare_heads.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"ca614523-7c89-4120-abe1-58169c8f4267","IsCreationKey":false,"Key":9.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"44032114-1f2f-47cd-a4a6-1421600214cd","path":"sprites/spr_bare_heads/spr_bare_heads.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"1be6cd38-e67c-4068-814e-8bc76c469ef6","IsCreationKey":false,"Key":10.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"eeaf5887-2715-4e95-9063-c97aabdd28e1","path":"sprites/spr_bare_heads/spr_bare_heads.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"08fed482-516f-4bc4-8e62-df1f5ddd2378","IsCreationKey":false,"Key":11.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"caca9d43-9453-48f3-b26f-5e8be74ea6f8","path":"sprites/spr_bare_heads/spr_bare_heads.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"8bd26df5-8feb-4ab1-92a1-c82b9a377ddc","IsCreationKey":false,"Key":12.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"da05b69a-1448-41be-90c3-5cfbba0a8721","path":"sprites/spr_bare_heads/spr_bare_heads.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"b674b5aa-b71a-4987-991f-ad9fed6243bd","IsCreationKey":false,"Key":13.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"0dd93d11-13c8-444c-8261-6b5733f8b58b","path":"sprites/spr_bare_heads/spr_bare_heads.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"484adcfc-055b-4bd2-8a69-7f6ef1845733","IsCreationKey":false,"Key":14.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"66369c74-4a0c-4542-bc5d-554d6e83c25a","path":"sprites/spr_bare_heads/spr_bare_heads.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"89e92372-ddc8-41c5-ba42-a8f62dcc9fc6","IsCreationKey":false,"Key":15.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"85cdef35-b9f6-48e7-b907-843a160b1fc7","path":"sprites/spr_bare_heads/spr_bare_heads.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"34a79fa8-8079-48f2-97c2-cf5597257626","IsCreationKey":false,"Key":16.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"b6f81ed7-7136-4422-835e-a2c3546f1548","path":"sprites/spr_bare_heads/spr_bare_heads.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"0a6ad9ef-c588-41b9-96f4-dea51b324aef","IsCreationKey":false,"Key":17.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"842d94d2-94ff-4452-951a-eea2822aea1b","path":"sprites/spr_bare_heads/spr_bare_heads.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"179fdf05-ab39-44b0-9d53-3601823644d4","IsCreationKey":false,"Key":18.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"136b448f-cab9-4502-ab49-211dae6baa0b","path":"sprites/spr_bare_heads/spr_bare_heads.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"4040dc72-745d-4e35-a7c5-f65e7aab043c","IsCreationKey":false,"Key":19.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"42f039f6-9ecd-4222-9b4c-17793d4d2f5d","path":"sprites/spr_bare_heads/spr_bare_heads.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"b87e4893-54e4-4e14-b3de-7cbc4ad4573d","IsCreationKey":false,"Key":20.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"caf154c5-d8d8-498a-9695-3b4adc97fe74","path":"sprites/spr_bare_heads/spr_bare_heads.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"8cca6dcf-ec65-406d-843c-6e1ae18bb3c0","IsCreationKey":false,"Key":21.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"6cacd7b9-2fb0-44d2-bb6a-c439104f2f54","path":"sprites/spr_bare_heads/spr_bare_heads.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"33695af1-3f1f-4235-aaad-4394a9c7faef","IsCreationKey":false,"Key":22.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"2407b5d3-1513-4a94-9fa9-12f20669831f","path":"sprites/spr_bare_heads/spr_bare_heads.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"afbc04d4-7e38-410d-ba02-ce4314cd47ce","IsCreationKey":false,"Key":23.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"743472f3-6863-4abe-bf55-bbeff76aaf00","path":"sprites/spr_bare_heads/spr_bare_heads.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"723f7c79-4e5f-46df-9c78-5a799c698654","IsCreationKey":false,"Key":24.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"6f343e60-f82b-408e-a5e0-1b3078ccf0f2","path":"sprites/spr_bare_heads/spr_bare_heads.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"0a9d1567-0b32-43d8-8f0a-310c6728a8a6","IsCreationKey":false,"Key":25.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"fb678b5e-7fc5-4837-b753-9f3dbadc87a0","path":"sprites/spr_bare_heads/spr_bare_heads.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"859ae0fb-8969-4e1a-8d91-823ea7f0702a","IsCreationKey":false,"Key":26.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"8e607018-2fee-4472-af53-adf27c701121","path":"sprites/spr_bare_heads/spr_bare_heads.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"20532cfd-03ba-4a9d-a019-6ced8cf9b990","IsCreationKey":false,"Key":27.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"ffc63594-ebb2-47ba-8083-be578882d2b4","path":"sprites/spr_bare_heads/spr_bare_heads.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"b4ecb63b-a763-486b-8037-2ff47f6b2caa","IsCreationKey":false,"Key":28.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"2f939735-055a-4eeb-a48a-ba21f7ecf19b","path":"sprites/spr_bare_heads/spr_bare_heads.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"90a1faf0-f01f-4e58-ba2e-202426528474","IsCreationKey":false,"Key":29.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"d7bbf94c-6658-40a3-a353-9ae9f765ea80","path":"sprites/spr_bare_heads/spr_bare_heads.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"a7d032d3-ee82-4e9d-a158-09122b739dd5","IsCreationKey":false,"Key":30.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"e4a4822c-f0ee-4a45-a579-46a46d4c4a3a","path":"sprites/spr_bare_heads/spr_bare_heads.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"05424da7-a46c-451d-b736-9880cc9bd9b8","IsCreationKey":false,"Key":31.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"004d1c23-13a6-463e-8b53-7a4ab648f6a3","path":"sprites/spr_bare_heads/spr_bare_heads.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"221a454d-8e8c-440a-b4dd-bf887912c319","IsCreationKey":false,"Key":32.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"e705a700-72b0-45e8-abc0-902b0b6b5480","path":"sprites/spr_bare_heads/spr_bare_heads.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"256e01ac-92a5-4b00-b924-f737ba60a369","IsCreationKey":false,"Key":33.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"447ef73d-fd8d-4b8e-b9f8-f4f42d32fe9a","path":"sprites/spr_bare_heads/spr_bare_heads.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"eb40438e-c2f8-4710-a5c7-6b5baba67f2d","IsCreationKey":false,"Key":34.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"05d7a269-8f5f-416d-a32e-01ecadc03df9","path":"sprites/spr_bare_heads/spr_bare_heads.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"dfd1e5f3-169b-43c3-8fa1-39b1b2a0f46b","IsCreationKey":false,"Key":35.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"a19ab7b7-1525-4f22-b385-3c6a5556bebf","path":"sprites/spr_bare_heads/spr_bare_heads.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"2b06c89f-a1e5-4676-84a3-e775f1fbe9ea","IsCreationKey":false,"Key":36.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"bb1a5dde-af7a-43f8-aac7-5657258cc742","path":"sprites/spr_bare_heads/spr_bare_heads.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"423f94d0-193c-4ce2-9ab4-81d6e5dd7eaf","IsCreationKey":false,"Key":37.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"412496f6-a833-4a5b-a839-cdf54c804bd9","path":"sprites/spr_bare_heads/spr_bare_heads.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"eb8d528c-67fa-4f2d-8ce6-a5666d349c91","IsCreationKey":false,"Key":38.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"34af844a-9bf2-4670-92b2-5b8742d19f45","path":"sprites/spr_bare_heads/spr_bare_heads.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"01e51592-6bd6-474b-977d-824df4e2bf22","IsCreationKey":false,"Key":39.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"e1456b2a-3264-4d4d-9613-e0e84a4b8d80","path":"sprites/spr_bare_heads/spr_bare_heads.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"a78d6371-2bc1-40ac-875b-c103a08506e5","IsCreationKey":false,"Key":40.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"f250301d-3a8b-45be-a367-c659a8172e53","path":"sprites/spr_bare_heads/spr_bare_heads.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"eb51533d-c39b-4638-9aa5-2edf96f2546c","IsCreationKey":false,"Key":41.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"cc3c809d-f17c-4b1d-813f-7fda90d89c1a","path":"sprites/spr_bare_heads/spr_bare_heads.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"695b5b5d-17d0-4d8f-bf1e-853a0daaea94","IsCreationKey":false,"Key":42.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"a7b7e265-024b-4a01-9527-6c6fb8015a37","path":"sprites/spr_bare_heads/spr_bare_heads.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"1d6300bb-f4d2-4f29-88f7-d55305e9750e","IsCreationKey":false,"Key":43.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"defe2a73-dc9a-4ac9-b679-75dd0fa37037","path":"sprites/spr_bare_heads/spr_bare_heads.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"ad65432a-03b3-44aa-bb4d-66a7218859bb","IsCreationKey":false,"Key":44.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_bare_heads_colourable/spr_bare_heads_colourable.yy b/sprites/spr_bare_heads_colourable/spr_bare_heads_colourable.yy index 705df661cf..0d2e1be36c 100644 --- a/sprites/spr_bare_heads_colourable/spr_bare_heads_colourable.yy +++ b/sprites/spr_bare_heads_colourable/spr_bare_heads_colourable.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_bare_heads_colourable", "bboxMode":0, "bbox_bottom":206, @@ -12,12 +12,12 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"d0394d2c-1519-4705-9cfa-bff1e4d0bce1","name":"d0394d2c-1519-4705-9cfa-bff1e4d0bce1","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"c1f4af0d-ab7c-4e9c-b66b-c6b0d3b0711e","name":"c1f4af0d-ab7c-4e9c-b66b-c6b0d3b0711e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"b70f17ac-4a82-47d2-b564-0f99c4b3b3ec","name":"b70f17ac-4a82-47d2-b564-0f99c4b3b3ec","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"05289283-cf3c-49ba-978c-c5705e259221","name":"05289283-cf3c-49ba-978c-c5705e259221","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"269de542-29d3-4e95-861d-ee5e4396f389","name":"269de542-29d3-4e95-861d-ee5e4396f389","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"6df39139-d1b2-4f8f-ac68-8603285c55b8","name":"6df39139-d1b2-4f8f-ac68-8603285c55b8","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"d0394d2c-1519-4705-9cfa-bff1e4d0bce1","name":"d0394d2c-1519-4705-9cfa-bff1e4d0bce1","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"c1f4af0d-ab7c-4e9c-b66b-c6b0d3b0711e","name":"c1f4af0d-ab7c-4e9c-b66b-c6b0d3b0711e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"b70f17ac-4a82-47d2-b564-0f99c4b3b3ec","name":"b70f17ac-4a82-47d2-b564-0f99c4b3b3ec","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"05289283-cf3c-49ba-978c-c5705e259221","name":"05289283-cf3c-49ba-978c-c5705e259221","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"269de542-29d3-4e95-861d-ee5e4396f389","name":"269de542-29d3-4e95-861d-ee5e4396f389","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"6df39139-d1b2-4f8f-ac68-8603285c55b8","name":"6df39139-d1b2-4f8f-ac68-8603285c55b8","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -75,24 +75,12 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"d0394d2c-1519-4705-9cfa-bff1e4d0bce1","path":"sprites/spr_bare_heads_colourable/spr_bare_heads_colourable.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"3e4d7ee5-ad96-4f30-95ce-a0c9a3b9d069","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"c1f4af0d-ab7c-4e9c-b66b-c6b0d3b0711e","path":"sprites/spr_bare_heads_colourable/spr_bare_heads_colourable.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"01840bc3-1dc1-4799-907f-aabc1736c261","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"b70f17ac-4a82-47d2-b564-0f99c4b3b3ec","path":"sprites/spr_bare_heads_colourable/spr_bare_heads_colourable.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"97fd8b82-375e-49a4-8987-8b2491eb1baf","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"05289283-cf3c-49ba-978c-c5705e259221","path":"sprites/spr_bare_heads_colourable/spr_bare_heads_colourable.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"2318329d-6aab-4533-bdaa-e7805e9b15b4","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"269de542-29d3-4e95-861d-ee5e4396f389","path":"sprites/spr_bare_heads_colourable/spr_bare_heads_colourable.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"31ad97ec-9da0-47a5-90e1-a9b26393e96d","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"6df39139-d1b2-4f8f-ac68-8603285c55b8","path":"sprites/spr_bare_heads_colourable/spr_bare_heads_colourable.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"3f158a15-d382-450f-824b-5ca1b02ddec7","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"d0394d2c-1519-4705-9cfa-bff1e4d0bce1","path":"sprites/spr_bare_heads_colourable/spr_bare_heads_colourable.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"3e4d7ee5-ad96-4f30-95ce-a0c9a3b9d069","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"c1f4af0d-ab7c-4e9c-b66b-c6b0d3b0711e","path":"sprites/spr_bare_heads_colourable/spr_bare_heads_colourable.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"01840bc3-1dc1-4799-907f-aabc1736c261","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"b70f17ac-4a82-47d2-b564-0f99c4b3b3ec","path":"sprites/spr_bare_heads_colourable/spr_bare_heads_colourable.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"97fd8b82-375e-49a4-8987-8b2491eb1baf","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"05289283-cf3c-49ba-978c-c5705e259221","path":"sprites/spr_bare_heads_colourable/spr_bare_heads_colourable.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"2318329d-6aab-4533-bdaa-e7805e9b15b4","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"269de542-29d3-4e95-861d-ee5e4396f389","path":"sprites/spr_bare_heads_colourable/spr_bare_heads_colourable.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"31ad97ec-9da0-47a5-90e1-a9b26393e96d","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"6df39139-d1b2-4f8f-ac68-8603285c55b8","path":"sprites/spr_bare_heads_colourable/spr_bare_heads_colourable.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"3f158a15-d382-450f-824b-5ca1b02ddec7","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_bare_neck_colourable/spr_bare_neck_colourable.yy b/sprites/spr_bare_neck_colourable/spr_bare_neck_colourable.yy index 7470485f59..54b0d33b20 100644 --- a/sprites/spr_bare_neck_colourable/spr_bare_neck_colourable.yy +++ b/sprites/spr_bare_neck_colourable/spr_bare_neck_colourable.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_bare_neck_colourable", "bboxMode":0, "bbox_bottom":46, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"a839b615-ebae-4696-951c-cd29fb507e1f","name":"a839b615-ebae-4696-951c-cd29fb507e1f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"a839b615-ebae-4696-951c-cd29fb507e1f","name":"a839b615-ebae-4696-951c-cd29fb507e1f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -70,9 +70,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"a839b615-ebae-4696-951c-cd29fb507e1f","path":"sprites/spr_bare_neck_colourable/spr_bare_neck_colourable.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"d4555296-60a6-4309-a491-1f0a03b9e441","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"a839b615-ebae-4696-951c-cd29fb507e1f","path":"sprites/spr_bare_neck_colourable/spr_bare_neck_colourable.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"d4555296-60a6-4309-a491-1f0a03b9e441","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_bare_necks/spr_bare_necks.yy b/sprites/spr_bare_necks/spr_bare_necks.yy index 999c353881..881a3ec792 100644 --- a/sprites/spr_bare_necks/spr_bare_necks.yy +++ b/sprites/spr_bare_necks/spr_bare_necks.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_bare_necks", "bboxMode":0, "bbox_bottom":44, @@ -12,14 +12,14 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"a839b615-ebae-4696-951c-cd29fb507e1f","name":"a839b615-ebae-4696-951c-cd29fb507e1f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"10e61cb9-19c1-4412-9af9-4c6b32200233","name":"10e61cb9-19c1-4412-9af9-4c6b32200233","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"c81351d7-a31f-453c-94a1-ae7599f9959c","name":"c81351d7-a31f-453c-94a1-ae7599f9959c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"9975d9c5-6a1f-405e-8013-5d7b117d30e6","name":"9975d9c5-6a1f-405e-8013-5d7b117d30e6","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"18722739-19a0-49d8-90fb-349ab76d829b","name":"18722739-19a0-49d8-90fb-349ab76d829b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"779641b4-cff6-4e2e-a2af-81ee601e5cea","name":"779641b4-cff6-4e2e-a2af-81ee601e5cea","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"217090ee-986a-4bde-9f6d-67271a13c19f","name":"217090ee-986a-4bde-9f6d-67271a13c19f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"15035d1a-aee3-47c2-9966-61275a3c69d8","name":"15035d1a-aee3-47c2-9966-61275a3c69d8","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"a839b615-ebae-4696-951c-cd29fb507e1f","name":"a839b615-ebae-4696-951c-cd29fb507e1f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"10e61cb9-19c1-4412-9af9-4c6b32200233","name":"10e61cb9-19c1-4412-9af9-4c6b32200233","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"c81351d7-a31f-453c-94a1-ae7599f9959c","name":"c81351d7-a31f-453c-94a1-ae7599f9959c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"9975d9c5-6a1f-405e-8013-5d7b117d30e6","name":"9975d9c5-6a1f-405e-8013-5d7b117d30e6","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"18722739-19a0-49d8-90fb-349ab76d829b","name":"18722739-19a0-49d8-90fb-349ab76d829b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"779641b4-cff6-4e2e-a2af-81ee601e5cea","name":"779641b4-cff6-4e2e-a2af-81ee601e5cea","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"217090ee-986a-4bde-9f6d-67271a13c19f","name":"217090ee-986a-4bde-9f6d-67271a13c19f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"15035d1a-aee3-47c2-9966-61275a3c69d8","name":"15035d1a-aee3-47c2-9966-61275a3c69d8","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -77,30 +77,14 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"a839b615-ebae-4696-951c-cd29fb507e1f","path":"sprites/spr_bare_necks/spr_bare_necks.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"d4555296-60a6-4309-a491-1f0a03b9e441","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"10e61cb9-19c1-4412-9af9-4c6b32200233","path":"sprites/spr_bare_necks/spr_bare_necks.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"b60ae687-354e-4c5c-834c-7287e0f3a24d","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"c81351d7-a31f-453c-94a1-ae7599f9959c","path":"sprites/spr_bare_necks/spr_bare_necks.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"17bc3897-bae6-4611-9e55-2407195f25ae","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"9975d9c5-6a1f-405e-8013-5d7b117d30e6","path":"sprites/spr_bare_necks/spr_bare_necks.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"b54d4c04-eeba-4a3f-8eeb-11669bfb8b46","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"18722739-19a0-49d8-90fb-349ab76d829b","path":"sprites/spr_bare_necks/spr_bare_necks.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"8166ac73-ec7c-4031-b95e-3a4e7b0fd6e3","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"779641b4-cff6-4e2e-a2af-81ee601e5cea","path":"sprites/spr_bare_necks/spr_bare_necks.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"f6981172-9a50-4d39-89ec-ca61a7e575ec","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"217090ee-986a-4bde-9f6d-67271a13c19f","path":"sprites/spr_bare_necks/spr_bare_necks.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"07c385d7-248c-483f-88a3-f8e67aabb43a","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"15035d1a-aee3-47c2-9966-61275a3c69d8","path":"sprites/spr_bare_necks/spr_bare_necks.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"752217ee-cefe-46c7-8d2e-887e1bd6d850","IsCreationKey":false,"Key":7.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"a839b615-ebae-4696-951c-cd29fb507e1f","path":"sprites/spr_bare_necks/spr_bare_necks.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"d4555296-60a6-4309-a491-1f0a03b9e441","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"10e61cb9-19c1-4412-9af9-4c6b32200233","path":"sprites/spr_bare_necks/spr_bare_necks.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"b60ae687-354e-4c5c-834c-7287e0f3a24d","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"c81351d7-a31f-453c-94a1-ae7599f9959c","path":"sprites/spr_bare_necks/spr_bare_necks.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"17bc3897-bae6-4611-9e55-2407195f25ae","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"9975d9c5-6a1f-405e-8013-5d7b117d30e6","path":"sprites/spr_bare_necks/spr_bare_necks.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"b54d4c04-eeba-4a3f-8eeb-11669bfb8b46","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"18722739-19a0-49d8-90fb-349ab76d829b","path":"sprites/spr_bare_necks/spr_bare_necks.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"8166ac73-ec7c-4031-b95e-3a4e7b0fd6e3","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"779641b4-cff6-4e2e-a2af-81ee601e5cea","path":"sprites/spr_bare_necks/spr_bare_necks.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"f6981172-9a50-4d39-89ec-ca61a7e575ec","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"217090ee-986a-4bde-9f6d-67271a13c19f","path":"sprites/spr_bare_necks/spr_bare_necks.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"07c385d7-248c-483f-88a3-f8e67aabb43a","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"15035d1a-aee3-47c2-9966-61275a3c69d8","path":"sprites/spr_bare_necks/spr_bare_necks.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"752217ee-cefe-46c7-8d2e-887e1bd6d850","IsCreationKey":false,"Key":7.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_battle_block/spr_battle_block.yy b/sprites/spr_battle_block/spr_battle_block.yy index a48aa3d60d..a4b8f147fb 100644 --- a/sprites/spr_battle_block/spr_battle_block.yy +++ b/sprites/spr_battle_block/spr_battle_block.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_battle_block", "bboxMode":0, "bbox_bottom":9, @@ -12,8 +12,8 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"90700d4c-3d98-40e3-bbb8-2e75f976206d","name":"90700d4c-3d98-40e3-bbb8-2e75f976206d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"faefc140-3c2a-4012-bbff-44f978c3c07e","name":"faefc140-3c2a-4012-bbff-44f978c3c07e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"90700d4c-3d98-40e3-bbb8-2e75f976206d","name":"90700d4c-3d98-40e3-bbb8-2e75f976206d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"faefc140-3c2a-4012-bbff-44f978c3c07e","name":"faefc140-3c2a-4012-bbff-44f978c3c07e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -71,12 +71,8 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"90700d4c-3d98-40e3-bbb8-2e75f976206d","path":"sprites/spr_battle_block/spr_battle_block.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"33ca9eef-ac9a-488d-af7d-8e082ec7bf1b","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"faefc140-3c2a-4012-bbff-44f978c3c07e","path":"sprites/spr_battle_block/spr_battle_block.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"1a7a7785-395a-41b1-ab12-a686d6b0bd9c","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"90700d4c-3d98-40e3-bbb8-2e75f976206d","path":"sprites/spr_battle_block/spr_battle_block.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"33ca9eef-ac9a-488d-af7d-8e082ec7bf1b","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"faefc140-3c2a-4012-bbff-44f978c3c07e","path":"sprites/spr_battle_block/spr_battle_block.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"1a7a7785-395a-41b1-ab12-a686d6b0bd9c","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_battle_block2/spr_battle_block2.yy b/sprites/spr_battle_block2/spr_battle_block2.yy index 837ffe6cac..97c49b63d1 100644 --- a/sprites/spr_battle_block2/spr_battle_block2.yy +++ b/sprites/spr_battle_block2/spr_battle_block2.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_battle_block2", "bboxMode":0, "bbox_bottom":9, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"5c31e164-e605-49ac-aa68-77d99485eb89","name":"5c31e164-e605-49ac-aa68-77d99485eb89","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"5c31e164-e605-49ac-aa68-77d99485eb89","name":"5c31e164-e605-49ac-aa68-77d99485eb89","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -70,9 +70,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"5c31e164-e605-49ac-aa68-77d99485eb89","path":"sprites/spr_battle_block2/spr_battle_block2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"72908395-beb8-49ac-a394-f574a467b190","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"5c31e164-e605-49ac-aa68-77d99485eb89","path":"sprites/spr_battle_block2/spr_battle_block2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"72908395-beb8-49ac-a394-f574a467b190","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_beakie_colors/spr_beakie_colors.yy b/sprites/spr_beakie_colors/spr_beakie_colors.yy index 444f3a1260..91665e1a48 100644 --- a/sprites/spr_beakie_colors/spr_beakie_colors.yy +++ b/sprites/spr_beakie_colors/spr_beakie_colors.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_beakie_colors", "bboxMode":0, "bbox_bottom":222, @@ -12,20 +12,20 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"6f028b25-2b7f-4a92-97fa-294e9891ef1a","name":"6f028b25-2b7f-4a92-97fa-294e9891ef1a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"43de8c67-ec68-4742-9ab1-0a85f1441487","name":"43de8c67-ec68-4742-9ab1-0a85f1441487","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"0985c171-a295-4621-a616-d603ed590110","name":"0985c171-a295-4621-a616-d603ed590110","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"50e8a95a-2b31-419d-8021-35eb7015de98","name":"50e8a95a-2b31-419d-8021-35eb7015de98","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"1a21d3ef-a16b-44cd-baf3-c5e63b7b53b1","name":"1a21d3ef-a16b-44cd-baf3-c5e63b7b53b1","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"1a89e1b5-01cf-4665-a005-932e861784e6","name":"1a89e1b5-01cf-4665-a005-932e861784e6","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"3387d0cf-df62-431c-b623-f5f1f9e26e51","name":"3387d0cf-df62-431c-b623-f5f1f9e26e51","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"91a314d9-a0bd-43fb-a6e7-232a813cb40a","name":"91a314d9-a0bd-43fb-a6e7-232a813cb40a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"ce203156-ae0e-4ead-91b9-728e91d5d262","name":"ce203156-ae0e-4ead-91b9-728e91d5d262","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"a7e135c3-4c81-4b7d-a819-423c7200c598","name":"a7e135c3-4c81-4b7d-a819-423c7200c598","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"2b679b25-536b-48e2-ac36-f3a2b1f66e2d","name":"2b679b25-536b-48e2-ac36-f3a2b1f66e2d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"c02a4cc6-33ce-47ae-b8c6-16514c505fe1","name":"c02a4cc6-33ce-47ae-b8c6-16514c505fe1","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"254c1638-b8ea-4bc0-926a-23dcf4a1617e","name":"254c1638-b8ea-4bc0-926a-23dcf4a1617e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"7d5dd366-5b56-4644-bb08-49b0548cb1b7","name":"7d5dd366-5b56-4644-bb08-49b0548cb1b7","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"6f028b25-2b7f-4a92-97fa-294e9891ef1a","name":"6f028b25-2b7f-4a92-97fa-294e9891ef1a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"43de8c67-ec68-4742-9ab1-0a85f1441487","name":"43de8c67-ec68-4742-9ab1-0a85f1441487","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"0985c171-a295-4621-a616-d603ed590110","name":"0985c171-a295-4621-a616-d603ed590110","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"50e8a95a-2b31-419d-8021-35eb7015de98","name":"50e8a95a-2b31-419d-8021-35eb7015de98","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"1a21d3ef-a16b-44cd-baf3-c5e63b7b53b1","name":"1a21d3ef-a16b-44cd-baf3-c5e63b7b53b1","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"1a89e1b5-01cf-4665-a005-932e861784e6","name":"1a89e1b5-01cf-4665-a005-932e861784e6","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"3387d0cf-df62-431c-b623-f5f1f9e26e51","name":"3387d0cf-df62-431c-b623-f5f1f9e26e51","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"91a314d9-a0bd-43fb-a6e7-232a813cb40a","name":"91a314d9-a0bd-43fb-a6e7-232a813cb40a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"ce203156-ae0e-4ead-91b9-728e91d5d262","name":"ce203156-ae0e-4ead-91b9-728e91d5d262","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"a7e135c3-4c81-4b7d-a819-423c7200c598","name":"a7e135c3-4c81-4b7d-a819-423c7200c598","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"2b679b25-536b-48e2-ac36-f3a2b1f66e2d","name":"2b679b25-536b-48e2-ac36-f3a2b1f66e2d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"c02a4cc6-33ce-47ae-b8c6-16514c505fe1","name":"c02a4cc6-33ce-47ae-b8c6-16514c505fe1","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"254c1638-b8ea-4bc0-926a-23dcf4a1617e","name":"254c1638-b8ea-4bc0-926a-23dcf4a1617e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"7d5dd366-5b56-4644-bb08-49b0548cb1b7","name":"7d5dd366-5b56-4644-bb08-49b0548cb1b7","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -81,48 +81,20 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"6f028b25-2b7f-4a92-97fa-294e9891ef1a","path":"sprites/spr_beakie_colors/spr_beakie_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"42a24f5f-59b0-4238-87c4-74423a626f08","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"43de8c67-ec68-4742-9ab1-0a85f1441487","path":"sprites/spr_beakie_colors/spr_beakie_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"09b63fe3-5ad2-4c11-9e06-aca436bd5c31","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"0985c171-a295-4621-a616-d603ed590110","path":"sprites/spr_beakie_colors/spr_beakie_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"369c16d4-95d2-44dc-8656-2f5eef632f50","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"50e8a95a-2b31-419d-8021-35eb7015de98","path":"sprites/spr_beakie_colors/spr_beakie_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"ec20f9e4-cfed-4dff-9e3a-79aa1717a8e2","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"1a21d3ef-a16b-44cd-baf3-c5e63b7b53b1","path":"sprites/spr_beakie_colors/spr_beakie_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"16538e15-b065-4274-bd4b-1a1cf8b3e275","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"1a89e1b5-01cf-4665-a005-932e861784e6","path":"sprites/spr_beakie_colors/spr_beakie_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"c3835093-5675-4489-b5dd-a6504749e7b3","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"3387d0cf-df62-431c-b623-f5f1f9e26e51","path":"sprites/spr_beakie_colors/spr_beakie_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"af6197f9-dab9-40b3-bbe5-7278167a301f","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"91a314d9-a0bd-43fb-a6e7-232a813cb40a","path":"sprites/spr_beakie_colors/spr_beakie_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"caf28f26-50fe-4772-9a62-311acb7db68f","IsCreationKey":false,"Key":7.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"ce203156-ae0e-4ead-91b9-728e91d5d262","path":"sprites/spr_beakie_colors/spr_beakie_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"f9da9649-d7c7-4cfc-8f0e-efbaaa577fc8","IsCreationKey":false,"Key":8.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"a7e135c3-4c81-4b7d-a819-423c7200c598","path":"sprites/spr_beakie_colors/spr_beakie_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"af6479d9-20ed-41d7-890d-7629734863ed","IsCreationKey":false,"Key":9.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"2b679b25-536b-48e2-ac36-f3a2b1f66e2d","path":"sprites/spr_beakie_colors/spr_beakie_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"675de54e-cf05-4de3-9eed-8770315e6bc9","IsCreationKey":false,"Key":10.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"c02a4cc6-33ce-47ae-b8c6-16514c505fe1","path":"sprites/spr_beakie_colors/spr_beakie_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"21fac7cd-71b6-46cb-9853-e22bf5cdd7f1","IsCreationKey":false,"Key":11.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"254c1638-b8ea-4bc0-926a-23dcf4a1617e","path":"sprites/spr_beakie_colors/spr_beakie_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"f14edaaa-a8a9-472f-9eae-725540b9923d","IsCreationKey":false,"Key":12.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"7d5dd366-5b56-4644-bb08-49b0548cb1b7","path":"sprites/spr_beakie_colors/spr_beakie_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"cff6cd61-580b-4057-8302-b364bf2a3387","IsCreationKey":false,"Key":13.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"6f028b25-2b7f-4a92-97fa-294e9891ef1a","path":"sprites/spr_beakie_colors/spr_beakie_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"42a24f5f-59b0-4238-87c4-74423a626f08","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"43de8c67-ec68-4742-9ab1-0a85f1441487","path":"sprites/spr_beakie_colors/spr_beakie_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"09b63fe3-5ad2-4c11-9e06-aca436bd5c31","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"0985c171-a295-4621-a616-d603ed590110","path":"sprites/spr_beakie_colors/spr_beakie_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"369c16d4-95d2-44dc-8656-2f5eef632f50","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"50e8a95a-2b31-419d-8021-35eb7015de98","path":"sprites/spr_beakie_colors/spr_beakie_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"ec20f9e4-cfed-4dff-9e3a-79aa1717a8e2","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"1a21d3ef-a16b-44cd-baf3-c5e63b7b53b1","path":"sprites/spr_beakie_colors/spr_beakie_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"16538e15-b065-4274-bd4b-1a1cf8b3e275","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"1a89e1b5-01cf-4665-a005-932e861784e6","path":"sprites/spr_beakie_colors/spr_beakie_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"c3835093-5675-4489-b5dd-a6504749e7b3","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"3387d0cf-df62-431c-b623-f5f1f9e26e51","path":"sprites/spr_beakie_colors/spr_beakie_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"af6197f9-dab9-40b3-bbe5-7278167a301f","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"91a314d9-a0bd-43fb-a6e7-232a813cb40a","path":"sprites/spr_beakie_colors/spr_beakie_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"caf28f26-50fe-4772-9a62-311acb7db68f","IsCreationKey":false,"Key":7.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"ce203156-ae0e-4ead-91b9-728e91d5d262","path":"sprites/spr_beakie_colors/spr_beakie_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"f9da9649-d7c7-4cfc-8f0e-efbaaa577fc8","IsCreationKey":false,"Key":8.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"a7e135c3-4c81-4b7d-a819-423c7200c598","path":"sprites/spr_beakie_colors/spr_beakie_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"af6479d9-20ed-41d7-890d-7629734863ed","IsCreationKey":false,"Key":9.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"2b679b25-536b-48e2-ac36-f3a2b1f66e2d","path":"sprites/spr_beakie_colors/spr_beakie_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"675de54e-cf05-4de3-9eed-8770315e6bc9","IsCreationKey":false,"Key":10.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"c02a4cc6-33ce-47ae-b8c6-16514c505fe1","path":"sprites/spr_beakie_colors/spr_beakie_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"21fac7cd-71b6-46cb-9853-e22bf5cdd7f1","IsCreationKey":false,"Key":11.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"254c1638-b8ea-4bc0-926a-23dcf4a1617e","path":"sprites/spr_beakie_colors/spr_beakie_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"f14edaaa-a8a9-472f-9eae-725540b9923d","IsCreationKey":false,"Key":12.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"7d5dd366-5b56-4644-bb08-49b0548cb1b7","path":"sprites/spr_beakie_colors/spr_beakie_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"cff6cd61-580b-4057-8302-b364bf2a3387","IsCreationKey":false,"Key":13.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_robes/spr_binders_robes.yy b/sprites/spr_binders_robes/spr_binders_robes.yy index 2d4691cd82..6ba17f71bf 100644 --- a/sprites/spr_binders_robes/spr_binders_robes.yy +++ b/sprites/spr_binders_robes/spr_binders_robes.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_binders_robes", "bboxMode":0, "bbox_bottom":227, @@ -12,8 +12,8 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"98625b1b-c315-421f-942a-61723f81b005","name":"98625b1b-c315-421f-942a-61723f81b005","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"ea737237-f34b-4a88-a92f-5d553e4e2b87","name":"ea737237-f34b-4a88-a92f-5d553e4e2b87","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"98625b1b-c315-421f-942a-61723f81b005","name":"98625b1b-c315-421f-942a-61723f81b005","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"ea737237-f34b-4a88-a92f-5d553e4e2b87","name":"ea737237-f34b-4a88-a92f-5d553e4e2b87","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -69,12 +69,8 @@ "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_bio_fighter/spr_bio_fighter.yy b/sprites/spr_bio_fighter/spr_bio_fighter.yy index b90f4af45b..048078906a 100644 --- a/sprites/spr_bio_fighter/spr_bio_fighter.yy +++ b/sprites/spr_bio_fighter/spr_bio_fighter.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_bio_fighter", "bboxMode":0, "bbox_bottom":13, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"d9871f1f-1396-4b9d-a077-beafe9c94a26","name":"d9871f1f-1396-4b9d-a077-beafe9c94a26","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"d9871f1f-1396-4b9d-a077-beafe9c94a26","name":"d9871f1f-1396-4b9d-a077-beafe9c94a26","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"d9871f1f-1396-4b9d-a077-beafe9c94a26","path":"sprites/spr_bio_fighter/spr_bio_fighter.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"f007a16a-62b9-4292-8ca8-4710f976a9b1","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"d9871f1f-1396-4b9d-a077-beafe9c94a26","path":"sprites/spr_bio_fighter/spr_bio_fighter.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"f007a16a-62b9-4292-8ca8-4710f976a9b1","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":{ diff --git a/sprites/spr_bionic_eye_2/spr_bionic_eye_2.yy b/sprites/spr_bionic_eye_2/spr_bionic_eye_2.yy index baa11aa58d..c7141e238c 100644 --- a/sprites/spr_bionic_eye_2/spr_bionic_eye_2.yy +++ b/sprites/spr_bionic_eye_2/spr_bionic_eye_2.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_bionic_eye_2", "bboxMode":0, "bbox_bottom":34, @@ -12,10 +12,10 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"f4fa1aac-6951-45c2-aa9a-7e44eeed2306","name":"f4fa1aac-6951-45c2-aa9a-7e44eeed2306","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"84fee39f-d943-4d5c-96eb-328cb7868960","name":"84fee39f-d943-4d5c-96eb-328cb7868960","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"ae4bbb98-d515-4b56-bf1a-35a210a7ddde","name":"ae4bbb98-d515-4b56-bf1a-35a210a7ddde","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"51e35673-dadd-418d-9abc-e9615a475fbc","name":"51e35673-dadd-418d-9abc-e9615a475fbc","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"f4fa1aac-6951-45c2-aa9a-7e44eeed2306","name":"f4fa1aac-6951-45c2-aa9a-7e44eeed2306","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"84fee39f-d943-4d5c-96eb-328cb7868960","name":"84fee39f-d943-4d5c-96eb-328cb7868960","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"ae4bbb98-d515-4b56-bf1a-35a210a7ddde","name":"ae4bbb98-d515-4b56-bf1a-35a210a7ddde","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"51e35673-dadd-418d-9abc-e9615a475fbc","name":"51e35673-dadd-418d-9abc-e9615a475fbc","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -71,18 +71,10 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"f4fa1aac-6951-45c2-aa9a-7e44eeed2306","path":"sprites/spr_bionic_eye_2/spr_bionic_eye_2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"0ae9abc3-6ed5-48ee-a250-e22f7819bc3d","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"84fee39f-d943-4d5c-96eb-328cb7868960","path":"sprites/spr_bionic_eye_2/spr_bionic_eye_2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"0bb6848f-08b4-4c6c-8690-c266abe32bfe","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"ae4bbb98-d515-4b56-bf1a-35a210a7ddde","path":"sprites/spr_bionic_eye_2/spr_bionic_eye_2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"2b99fe40-f32c-46ac-8d18-1e2ce6e66e1a","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"51e35673-dadd-418d-9abc-e9615a475fbc","path":"sprites/spr_bionic_eye_2/spr_bionic_eye_2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"9dca493b-9343-4366-b291-b370bbb8d3f2","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"f4fa1aac-6951-45c2-aa9a-7e44eeed2306","path":"sprites/spr_bionic_eye_2/spr_bionic_eye_2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"0ae9abc3-6ed5-48ee-a250-e22f7819bc3d","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"84fee39f-d943-4d5c-96eb-328cb7868960","path":"sprites/spr_bionic_eye_2/spr_bionic_eye_2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"0bb6848f-08b4-4c6c-8690-c266abe32bfe","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"ae4bbb98-d515-4b56-bf1a-35a210a7ddde","path":"sprites/spr_bionic_eye_2/spr_bionic_eye_2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"2b99fe40-f32c-46ac-8d18-1e2ce6e66e1a","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"51e35673-dadd-418d-9abc-e9615a475fbc","path":"sprites/spr_bionic_eye_2/spr_bionic_eye_2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"9dca493b-9343-4366-b291-b370bbb8d3f2","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_bionic_left_arm/spr_bionic_left_arm.yy b/sprites/spr_bionic_left_arm/spr_bionic_left_arm.yy index f5e7894542..fab01acf82 100644 --- a/sprites/spr_bionic_left_arm/spr_bionic_left_arm.yy +++ b/sprites/spr_bionic_left_arm/spr_bionic_left_arm.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_bionic_left_arm", "bboxMode":0, "bbox_bottom":125, @@ -12,8 +12,8 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"1760fafc-7f34-4184-937c-64a145f1e4e9","name":"1760fafc-7f34-4184-937c-64a145f1e4e9","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"cd829f66-11dc-4ec3-b718-e71b936e0974","name":"cd829f66-11dc-4ec3-b718-e71b936e0974","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"1760fafc-7f34-4184-937c-64a145f1e4e9","name":"1760fafc-7f34-4184-937c-64a145f1e4e9","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"cd829f66-11dc-4ec3-b718-e71b936e0974","name":"cd829f66-11dc-4ec3-b718-e71b936e0974","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -70,12 +70,8 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"1760fafc-7f34-4184-937c-64a145f1e4e9","path":"sprites/spr_bionic_left_arm/spr_bionic_left_arm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"5976c9a5-8277-4050-b34d-34f2d872e4da","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"cd829f66-11dc-4ec3-b718-e71b936e0974","path":"sprites/spr_bionic_left_arm/spr_bionic_left_arm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"8cbf2a21-7ada-41e5-903e-cd67592bac46","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"1760fafc-7f34-4184-937c-64a145f1e4e9","path":"sprites/spr_bionic_left_arm/spr_bionic_left_arm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"5976c9a5-8277-4050-b34d-34f2d872e4da","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"cd829f66-11dc-4ec3-b718-e71b936e0974","path":"sprites/spr_bionic_left_arm/spr_bionic_left_arm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"8cbf2a21-7ada-41e5-903e-cd67592bac46","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_bionic_left_eyes/spr_bionic_left_eyes.yy b/sprites/spr_bionic_left_eyes/spr_bionic_left_eyes.yy index 60861c0587..a80f650345 100644 --- a/sprites/spr_bionic_left_eyes/spr_bionic_left_eyes.yy +++ b/sprites/spr_bionic_left_eyes/spr_bionic_left_eyes.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_bionic_left_eyes", "bboxMode":0, "bbox_bottom":39, @@ -12,9 +12,9 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"3a76b1d9-a84c-419f-a5f5-375da469c28a","name":"3a76b1d9-a84c-419f-a5f5-375da469c28a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"84fee39f-d943-4d5c-96eb-328cb7868960","name":"84fee39f-d943-4d5c-96eb-328cb7868960","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"ae4bbb98-d515-4b56-bf1a-35a210a7ddde","name":"ae4bbb98-d515-4b56-bf1a-35a210a7ddde","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"3a76b1d9-a84c-419f-a5f5-375da469c28a","name":"3a76b1d9-a84c-419f-a5f5-375da469c28a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"84fee39f-d943-4d5c-96eb-328cb7868960","name":"84fee39f-d943-4d5c-96eb-328cb7868960","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"ae4bbb98-d515-4b56-bf1a-35a210a7ddde","name":"ae4bbb98-d515-4b56-bf1a-35a210a7ddde","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -70,15 +70,9 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"3a76b1d9-a84c-419f-a5f5-375da469c28a","path":"sprites/spr_bionic_left_eyes/spr_bionic_left_eyes.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"b28cdb8f-d22c-4a36-ae78-60b9bfaa06d7","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"84fee39f-d943-4d5c-96eb-328cb7868960","path":"sprites/spr_bionic_left_eyes/spr_bionic_left_eyes.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"e755fe34-01b8-43ee-9b7b-6853fc630075","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"ae4bbb98-d515-4b56-bf1a-35a210a7ddde","path":"sprites/spr_bionic_left_eyes/spr_bionic_left_eyes.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"5d55ecb9-522e-4979-9234-e8bcd8048c58","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"3a76b1d9-a84c-419f-a5f5-375da469c28a","path":"sprites/spr_bionic_left_eyes/spr_bionic_left_eyes.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"b28cdb8f-d22c-4a36-ae78-60b9bfaa06d7","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"84fee39f-d943-4d5c-96eb-328cb7868960","path":"sprites/spr_bionic_left_eyes/spr_bionic_left_eyes.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"e755fe34-01b8-43ee-9b7b-6853fc630075","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"ae4bbb98-d515-4b56-bf1a-35a210a7ddde","path":"sprites/spr_bionic_left_eyes/spr_bionic_left_eyes.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"5d55ecb9-522e-4979-9234-e8bcd8048c58","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_bionic_leg_left/spr_bionic_leg_left.yy b/sprites/spr_bionic_leg_left/spr_bionic_leg_left.yy index 7ea789e6aa..115597837a 100644 --- a/sprites/spr_bionic_leg_left/spr_bionic_leg_left.yy +++ b/sprites/spr_bionic_leg_left/spr_bionic_leg_left.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_bionic_leg_left", "bboxMode":0, "bbox_bottom":220, @@ -12,9 +12,9 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"c4c6abe2-0da6-47f8-ac18-5323c3571f34","name":"c4c6abe2-0da6-47f8-ac18-5323c3571f34","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"b1ebb396-c9a2-4dee-8713-c40196833bd1","name":"b1ebb396-c9a2-4dee-8713-c40196833bd1","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"ebd16397-c391-4646-97de-e5dab06667d2","name":"ebd16397-c391-4646-97de-e5dab06667d2","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"c4c6abe2-0da6-47f8-ac18-5323c3571f34","name":"c4c6abe2-0da6-47f8-ac18-5323c3571f34","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"b1ebb396-c9a2-4dee-8713-c40196833bd1","name":"b1ebb396-c9a2-4dee-8713-c40196833bd1","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"ebd16397-c391-4646-97de-e5dab06667d2","name":"ebd16397-c391-4646-97de-e5dab06667d2","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -70,15 +70,9 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"c4c6abe2-0da6-47f8-ac18-5323c3571f34","path":"sprites/spr_bionic_leg_left/spr_bionic_leg_left.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"d79241c0-c856-44b5-b854-c037f49cf072","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"b1ebb396-c9a2-4dee-8713-c40196833bd1","path":"sprites/spr_bionic_leg_left/spr_bionic_leg_left.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"903563e8-77b8-4ba8-a310-59f152994e37","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"ebd16397-c391-4646-97de-e5dab06667d2","path":"sprites/spr_bionic_leg_left/spr_bionic_leg_left.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"6d0f98b2-cc58-4c1a-8cc3-096abb41e602","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"c4c6abe2-0da6-47f8-ac18-5323c3571f34","path":"sprites/spr_bionic_leg_left/spr_bionic_leg_left.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"d79241c0-c856-44b5-b854-c037f49cf072","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"b1ebb396-c9a2-4dee-8713-c40196833bd1","path":"sprites/spr_bionic_leg_left/spr_bionic_leg_left.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"903563e8-77b8-4ba8-a310-59f152994e37","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"ebd16397-c391-4646-97de-e5dab06667d2","path":"sprites/spr_bionic_leg_left/spr_bionic_leg_left.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"6d0f98b2-cc58-4c1a-8cc3-096abb41e602","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_bionic_leg_right/spr_bionic_leg_right.yy b/sprites/spr_bionic_leg_right/spr_bionic_leg_right.yy index bcc7ff1275..a44fdf52ab 100644 --- a/sprites/spr_bionic_leg_right/spr_bionic_leg_right.yy +++ b/sprites/spr_bionic_leg_right/spr_bionic_leg_right.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_bionic_leg_right", "bboxMode":0, "bbox_bottom":220, @@ -12,9 +12,9 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"c4c6abe2-0da6-47f8-ac18-5323c3571f34","name":"c4c6abe2-0da6-47f8-ac18-5323c3571f34","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"b1ebb396-c9a2-4dee-8713-c40196833bd1","name":"b1ebb396-c9a2-4dee-8713-c40196833bd1","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"6de5a7b9-986a-41e8-8905-0d12deee68f2","name":"6de5a7b9-986a-41e8-8905-0d12deee68f2","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"c4c6abe2-0da6-47f8-ac18-5323c3571f34","name":"c4c6abe2-0da6-47f8-ac18-5323c3571f34","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"b1ebb396-c9a2-4dee-8713-c40196833bd1","name":"b1ebb396-c9a2-4dee-8713-c40196833bd1","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"6de5a7b9-986a-41e8-8905-0d12deee68f2","name":"6de5a7b9-986a-41e8-8905-0d12deee68f2","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -70,15 +70,9 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"c4c6abe2-0da6-47f8-ac18-5323c3571f34","path":"sprites/spr_bionic_leg_right/spr_bionic_leg_right.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"7ad3a1f0-7df5-4ad7-b3ca-26ba15d59820","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"b1ebb396-c9a2-4dee-8713-c40196833bd1","path":"sprites/spr_bionic_leg_right/spr_bionic_leg_right.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"83fe762c-855d-4486-97e8-4c7acfd8438b","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"6de5a7b9-986a-41e8-8905-0d12deee68f2","path":"sprites/spr_bionic_leg_right/spr_bionic_leg_right.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"ce7840e9-414a-4d55-adfe-7c61246bd61b","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"c4c6abe2-0da6-47f8-ac18-5323c3571f34","path":"sprites/spr_bionic_leg_right/spr_bionic_leg_right.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"7ad3a1f0-7df5-4ad7-b3ca-26ba15d59820","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"b1ebb396-c9a2-4dee-8713-c40196833bd1","path":"sprites/spr_bionic_leg_right/spr_bionic_leg_right.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"83fe762c-855d-4486-97e8-4c7acfd8438b","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"6de5a7b9-986a-41e8-8905-0d12deee68f2","path":"sprites/spr_bionic_leg_right/spr_bionic_leg_right.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"ce7840e9-414a-4d55-adfe-7c61246bd61b","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_bionic_right_arm/spr_bionic_right_arm.yy b/sprites/spr_bionic_right_arm/spr_bionic_right_arm.yy index 567bb7cbee..53f0635d51 100644 --- a/sprites/spr_bionic_right_arm/spr_bionic_right_arm.yy +++ b/sprites/spr_bionic_right_arm/spr_bionic_right_arm.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_bionic_right_arm", "bboxMode":0, "bbox_bottom":125, @@ -12,8 +12,8 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"1760fafc-7f34-4184-937c-64a145f1e4e9","name":"1760fafc-7f34-4184-937c-64a145f1e4e9","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"cd829f66-11dc-4ec3-b718-e71b936e0974","name":"cd829f66-11dc-4ec3-b718-e71b936e0974","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"1760fafc-7f34-4184-937c-64a145f1e4e9","name":"1760fafc-7f34-4184-937c-64a145f1e4e9","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"cd829f66-11dc-4ec3-b718-e71b936e0974","name":"cd829f66-11dc-4ec3-b718-e71b936e0974","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -70,12 +70,8 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"1760fafc-7f34-4184-937c-64a145f1e4e9","path":"sprites/spr_bionic_right_arm/spr_bionic_right_arm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"f40b0403-9c6e-4050-94b1-3fdb07c4949b","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"cd829f66-11dc-4ec3-b718-e71b936e0974","path":"sprites/spr_bionic_right_arm/spr_bionic_right_arm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"84ded38f-b057-4586-aeaf-f434c1ad998f","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"1760fafc-7f34-4184-937c-64a145f1e4e9","path":"sprites/spr_bionic_right_arm/spr_bionic_right_arm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"f40b0403-9c6e-4050-94b1-3fdb07c4949b","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"cd829f66-11dc-4ec3-b718-e71b936e0974","path":"sprites/spr_bionic_right_arm/spr_bionic_right_arm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"84ded38f-b057-4586-aeaf-f434c1ad998f","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_bionic_right_eyes/spr_bionic_right_eyes.yy b/sprites/spr_bionic_right_eyes/spr_bionic_right_eyes.yy index c7cfcf7cae..8741cfd6ea 100644 --- a/sprites/spr_bionic_right_eyes/spr_bionic_right_eyes.yy +++ b/sprites/spr_bionic_right_eyes/spr_bionic_right_eyes.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_bionic_right_eyes", "bboxMode":0, "bbox_bottom":39, @@ -12,9 +12,9 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"3a76b1d9-a84c-419f-a5f5-375da469c28a","name":"3a76b1d9-a84c-419f-a5f5-375da469c28a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"84fee39f-d943-4d5c-96eb-328cb7868960","name":"84fee39f-d943-4d5c-96eb-328cb7868960","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"ae4bbb98-d515-4b56-bf1a-35a210a7ddde","name":"ae4bbb98-d515-4b56-bf1a-35a210a7ddde","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"3a76b1d9-a84c-419f-a5f5-375da469c28a","name":"3a76b1d9-a84c-419f-a5f5-375da469c28a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"84fee39f-d943-4d5c-96eb-328cb7868960","name":"84fee39f-d943-4d5c-96eb-328cb7868960","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"ae4bbb98-d515-4b56-bf1a-35a210a7ddde","name":"ae4bbb98-d515-4b56-bf1a-35a210a7ddde","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -70,15 +70,9 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"3a76b1d9-a84c-419f-a5f5-375da469c28a","path":"sprites/spr_bionic_right_eyes/spr_bionic_right_eyes.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"63faba23-bea0-4293-b76a-0c67b3efa44c","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"84fee39f-d943-4d5c-96eb-328cb7868960","path":"sprites/spr_bionic_right_eyes/spr_bionic_right_eyes.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"a9cf283c-8a9c-4047-9850-5cc548a2862a","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"ae4bbb98-d515-4b56-bf1a-35a210a7ddde","path":"sprites/spr_bionic_right_eyes/spr_bionic_right_eyes.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"f39a3fed-6e36-4af6-82d2-1ab2c62e00f7","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"3a76b1d9-a84c-419f-a5f5-375da469c28a","path":"sprites/spr_bionic_right_eyes/spr_bionic_right_eyes.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"63faba23-bea0-4293-b76a-0c67b3efa44c","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"84fee39f-d943-4d5c-96eb-328cb7868960","path":"sprites/spr_bionic_right_eyes/spr_bionic_right_eyes.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"a9cf283c-8a9c-4047-9850-5cc548a2862a","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"ae4bbb98-d515-4b56-bf1a-35a210a7ddde","path":"sprites/spr_bionic_right_eyes/spr_bionic_right_eyes.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"f39a3fed-6e36-4af6-82d2-1ab2c62e00f7","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_bionics_arm/spr_bionics_arm.yy b/sprites/spr_bionics_arm/spr_bionics_arm.yy index 45ab7db89b..f064197d79 100644 --- a/sprites/spr_bionics_arm/spr_bionics_arm.yy +++ b/sprites/spr_bionics_arm/spr_bionics_arm.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_bionics_arm", "bboxMode":0, "bbox_bottom":125, @@ -12,8 +12,8 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"ca6b9c8e-84ec-4086-a7ba-d2990de3b060","name":"ca6b9c8e-84ec-4086-a7ba-d2990de3b060","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"d3462996-9ddf-47bc-81b0-e2fde6cd6446","name":"d3462996-9ddf-47bc-81b0-e2fde6cd6446","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"ca6b9c8e-84ec-4086-a7ba-d2990de3b060","name":"ca6b9c8e-84ec-4086-a7ba-d2990de3b060","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"d3462996-9ddf-47bc-81b0-e2fde6cd6446","name":"d3462996-9ddf-47bc-81b0-e2fde6cd6446","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -70,12 +70,8 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"ca6b9c8e-84ec-4086-a7ba-d2990de3b060","path":"sprites/spr_bionics_arm/spr_bionics_arm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"7fa16835-de7d-4daf-bd0e-a27f3a6472fa","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"d3462996-9ddf-47bc-81b0-e2fde6cd6446","path":"sprites/spr_bionics_arm/spr_bionics_arm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"ca31ccd2-4d61-4c0a-9fd5-104aa9778ae0","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"ca6b9c8e-84ec-4086-a7ba-d2990de3b060","path":"sprites/spr_bionics_arm/spr_bionics_arm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"7fa16835-de7d-4daf-bd0e-a27f3a6472fa","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"d3462996-9ddf-47bc-81b0-e2fde6cd6446","path":"sprites/spr_bionics_arm/spr_bionics_arm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"ca31ccd2-4d61-4c0a-9fd5-104aa9778ae0","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_bionics_arm_2/spr_bionics_arm_2.yy b/sprites/spr_bionics_arm_2/spr_bionics_arm_2.yy index 39d5ac74d9..4102df37d1 100644 --- a/sprites/spr_bionics_arm_2/spr_bionics_arm_2.yy +++ b/sprites/spr_bionics_arm_2/spr_bionics_arm_2.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_bionics_arm_2", "bboxMode":0, "bbox_bottom":125, @@ -12,8 +12,8 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"bab2ac30-c835-4ecd-96bc-27157d7aa3be","name":"bab2ac30-c835-4ecd-96bc-27157d7aa3be","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"84a7b5b5-20ae-4ce6-97aa-ab04171d8b21","name":"84a7b5b5-20ae-4ce6-97aa-ab04171d8b21","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"bab2ac30-c835-4ecd-96bc-27157d7aa3be","name":"bab2ac30-c835-4ecd-96bc-27157d7aa3be","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"84a7b5b5-20ae-4ce6-97aa-ab04171d8b21","name":"84a7b5b5-20ae-4ce6-97aa-ab04171d8b21","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -70,12 +70,8 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"bab2ac30-c835-4ecd-96bc-27157d7aa3be","path":"sprites/spr_bionics_arm_2/spr_bionics_arm_2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"147f2087-0542-4803-98c7-8a60024455c8","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"84a7b5b5-20ae-4ce6-97aa-ab04171d8b21","path":"sprites/spr_bionics_arm_2/spr_bionics_arm_2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"6dd4a812-1889-4907-8903-6fd2b0b91f00","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"bab2ac30-c835-4ecd-96bc-27157d7aa3be","path":"sprites/spr_bionics_arm_2/spr_bionics_arm_2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"147f2087-0542-4803-98c7-8a60024455c8","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"84a7b5b5-20ae-4ce6-97aa-ab04171d8b21","path":"sprites/spr_bionics_arm_2/spr_bionics_arm_2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"6dd4a812-1889-4907-8903-6fd2b0b91f00","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_bionics_eye/spr_bionics_eye.yy b/sprites/spr_bionics_eye/spr_bionics_eye.yy index 43396fbe4f..d890e57aeb 100644 --- a/sprites/spr_bionics_eye/spr_bionics_eye.yy +++ b/sprites/spr_bionics_eye/spr_bionics_eye.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_bionics_eye", "bboxMode":0, "bbox_bottom":39, @@ -12,8 +12,8 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"c4118479-ad65-4797-9dc7-4bd95085c46f","name":"c4118479-ad65-4797-9dc7-4bd95085c46f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"232f1278-69c8-4504-9f7e-4c192ac2f04c","name":"232f1278-69c8-4504-9f7e-4c192ac2f04c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"c4118479-ad65-4797-9dc7-4bd95085c46f","name":"c4118479-ad65-4797-9dc7-4bd95085c46f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"232f1278-69c8-4504-9f7e-4c192ac2f04c","name":"232f1278-69c8-4504-9f7e-4c192ac2f04c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -69,12 +69,8 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"c4118479-ad65-4797-9dc7-4bd95085c46f","path":"sprites/spr_bionics_eye/spr_bionics_eye.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"4595b332-c57a-4482-a884-d1a6ad5806bf","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"232f1278-69c8-4504-9f7e-4c192ac2f04c","path":"sprites/spr_bionics_eye/spr_bionics_eye.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"e8ba3139-eb69-4a04-9836-dc377c2636e9","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"c4118479-ad65-4797-9dc7-4bd95085c46f","path":"sprites/spr_bionics_eye/spr_bionics_eye.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"4595b332-c57a-4482-a884-d1a6ad5806bf","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"232f1278-69c8-4504-9f7e-4c192ac2f04c","path":"sprites/spr_bionics_eye/spr_bionics_eye.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"e8ba3139-eb69-4a04-9836-dc377c2636e9","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_bionics_hand/spr_bionics_hand.yy b/sprites/spr_bionics_hand/spr_bionics_hand.yy index 1c02cba130..13d8a91eff 100644 --- a/sprites/spr_bionics_hand/spr_bionics_hand.yy +++ b/sprites/spr_bionics_hand/spr_bionics_hand.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_bionics_hand", "bboxMode":0, "bbox_bottom":125, @@ -12,10 +12,10 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"13bc6f12-bba8-46c4-ab50-4dd56958c339","name":"13bc6f12-bba8-46c4-ab50-4dd56958c339","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"524c80bc-1e15-469e-9b11-4bd1d380f832","name":"524c80bc-1e15-469e-9b11-4bd1d380f832","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"3251dc9b-140d-4210-81f0-08269c9ee883","name":"3251dc9b-140d-4210-81f0-08269c9ee883","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"c09d4ac8-a76f-4774-9dbf-8875bf53357c","name":"c09d4ac8-a76f-4774-9dbf-8875bf53357c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"13bc6f12-bba8-46c4-ab50-4dd56958c339","name":"13bc6f12-bba8-46c4-ab50-4dd56958c339","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"524c80bc-1e15-469e-9b11-4bd1d380f832","name":"524c80bc-1e15-469e-9b11-4bd1d380f832","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"3251dc9b-140d-4210-81f0-08269c9ee883","name":"3251dc9b-140d-4210-81f0-08269c9ee883","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"c09d4ac8-a76f-4774-9dbf-8875bf53357c","name":"c09d4ac8-a76f-4774-9dbf-8875bf53357c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -71,18 +71,10 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"13bc6f12-bba8-46c4-ab50-4dd56958c339","path":"sprites/spr_bionics_hand/spr_bionics_hand.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"b5fb66c1-2f70-48d8-900b-b6b549811246","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"524c80bc-1e15-469e-9b11-4bd1d380f832","path":"sprites/spr_bionics_hand/spr_bionics_hand.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"6f3ca57d-c1de-4060-aeb4-275750b6a67a","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"3251dc9b-140d-4210-81f0-08269c9ee883","path":"sprites/spr_bionics_hand/spr_bionics_hand.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"cdb2fb2c-def4-4dd8-8e26-1e9bf1cbe534","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"c09d4ac8-a76f-4774-9dbf-8875bf53357c","path":"sprites/spr_bionics_hand/spr_bionics_hand.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"a9a492e7-f52c-494d-b84c-492208d0a6de","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"13bc6f12-bba8-46c4-ab50-4dd56958c339","path":"sprites/spr_bionics_hand/spr_bionics_hand.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"b5fb66c1-2f70-48d8-900b-b6b549811246","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"524c80bc-1e15-469e-9b11-4bd1d380f832","path":"sprites/spr_bionics_hand/spr_bionics_hand.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"6f3ca57d-c1de-4060-aeb4-275750b6a67a","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"3251dc9b-140d-4210-81f0-08269c9ee883","path":"sprites/spr_bionics_hand/spr_bionics_hand.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"cdb2fb2c-def4-4dd8-8e26-1e9bf1cbe534","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"c09d4ac8-a76f-4774-9dbf-8875bf53357c","path":"sprites/spr_bionics_hand/spr_bionics_hand.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"a9a492e7-f52c-494d-b84c-492208d0a6de","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_bionics_leg/spr_bionics_leg.yy b/sprites/spr_bionics_leg/spr_bionics_leg.yy index 4a186a9614..ec9566884b 100644 --- a/sprites/spr_bionics_leg/spr_bionics_leg.yy +++ b/sprites/spr_bionics_leg/spr_bionics_leg.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_bionics_leg", "bboxMode":0, "bbox_bottom":220, @@ -12,10 +12,10 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"2b6a12b6-8f7f-4f99-93ca-e45b7b7d9f87","name":"2b6a12b6-8f7f-4f99-93ca-e45b7b7d9f87","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"037b7aa6-3db4-46e2-9268-9dd87fd7170f","name":"037b7aa6-3db4-46e2-9268-9dd87fd7170f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"fcf2c4da-a1bf-4ed3-97ec-3c104e8d26e8","name":"fcf2c4da-a1bf-4ed3-97ec-3c104e8d26e8","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"05cfd13f-fb2b-476c-aaaf-198e5b14a328","name":"05cfd13f-fb2b-476c-aaaf-198e5b14a328","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"2b6a12b6-8f7f-4f99-93ca-e45b7b7d9f87","name":"2b6a12b6-8f7f-4f99-93ca-e45b7b7d9f87","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"037b7aa6-3db4-46e2-9268-9dd87fd7170f","name":"037b7aa6-3db4-46e2-9268-9dd87fd7170f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"fcf2c4da-a1bf-4ed3-97ec-3c104e8d26e8","name":"fcf2c4da-a1bf-4ed3-97ec-3c104e8d26e8","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"05cfd13f-fb2b-476c-aaaf-198e5b14a328","name":"05cfd13f-fb2b-476c-aaaf-198e5b14a328","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -71,18 +71,10 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"2b6a12b6-8f7f-4f99-93ca-e45b7b7d9f87","path":"sprites/spr_bionics_leg/spr_bionics_leg.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"0ab1a0e3-0e69-498b-b0c2-7a6f01a212cf","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"037b7aa6-3db4-46e2-9268-9dd87fd7170f","path":"sprites/spr_bionics_leg/spr_bionics_leg.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"b7625488-b76b-470f-849d-aea986f91ce5","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"fcf2c4da-a1bf-4ed3-97ec-3c104e8d26e8","path":"sprites/spr_bionics_leg/spr_bionics_leg.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"76192087-4067-4351-a0e7-5c820764bff6","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"05cfd13f-fb2b-476c-aaaf-198e5b14a328","path":"sprites/spr_bionics_leg/spr_bionics_leg.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"0c28eae0-67f3-4379-847c-4fdaf6168b58","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"2b6a12b6-8f7f-4f99-93ca-e45b7b7d9f87","path":"sprites/spr_bionics_leg/spr_bionics_leg.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"0ab1a0e3-0e69-498b-b0c2-7a6f01a212cf","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"037b7aa6-3db4-46e2-9268-9dd87fd7170f","path":"sprites/spr_bionics_leg/spr_bionics_leg.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"b7625488-b76b-470f-849d-aea986f91ce5","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"fcf2c4da-a1bf-4ed3-97ec-3c104e8d26e8","path":"sprites/spr_bionics_leg/spr_bionics_leg.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"76192087-4067-4351-a0e7-5c820764bff6","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"05cfd13f-fb2b-476c-aaaf-198e5b14a328","path":"sprites/spr_bionics_leg/spr_bionics_leg.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"0c28eae0-67f3-4379-847c-4fdaf6168b58","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_bionics_leg_2/spr_bionics_leg_2.yy b/sprites/spr_bionics_leg_2/spr_bionics_leg_2.yy index 93b21d99cc..e7c3294ac6 100644 --- a/sprites/spr_bionics_leg_2/spr_bionics_leg_2.yy +++ b/sprites/spr_bionics_leg_2/spr_bionics_leg_2.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_bionics_leg_2", "bboxMode":0, "bbox_bottom":212, @@ -12,10 +12,10 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"60344010-666c-4587-8df7-3a7b00650211","name":"60344010-666c-4587-8df7-3a7b00650211","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"3eda6fcd-5322-48bd-a288-7a10c092106d","name":"3eda6fcd-5322-48bd-a288-7a10c092106d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"2c017214-77b0-4045-82a3-7f4f38b750dc","name":"2c017214-77b0-4045-82a3-7f4f38b750dc","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"e8bce95c-eb80-4f7b-90e4-fb0ca15fdf45","name":"e8bce95c-eb80-4f7b-90e4-fb0ca15fdf45","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"60344010-666c-4587-8df7-3a7b00650211","name":"60344010-666c-4587-8df7-3a7b00650211","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"3eda6fcd-5322-48bd-a288-7a10c092106d","name":"3eda6fcd-5322-48bd-a288-7a10c092106d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"2c017214-77b0-4045-82a3-7f4f38b750dc","name":"2c017214-77b0-4045-82a3-7f4f38b750dc","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"e8bce95c-eb80-4f7b-90e4-fb0ca15fdf45","name":"e8bce95c-eb80-4f7b-90e4-fb0ca15fdf45","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -71,18 +71,10 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"60344010-666c-4587-8df7-3a7b00650211","path":"sprites/spr_bionics_leg_2/spr_bionics_leg_2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"1f7862ff-d90c-486b-a1ea-580889f2e702","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"3eda6fcd-5322-48bd-a288-7a10c092106d","path":"sprites/spr_bionics_leg_2/spr_bionics_leg_2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"59645d06-f0ba-4d6a-bd64-c870a41a5ed9","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"2c017214-77b0-4045-82a3-7f4f38b750dc","path":"sprites/spr_bionics_leg_2/spr_bionics_leg_2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"6f67e883-b80f-45b5-88f9-efa0ba50734c","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"e8bce95c-eb80-4f7b-90e4-fb0ca15fdf45","path":"sprites/spr_bionics_leg_2/spr_bionics_leg_2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"df5f15df-c503-4f47-a424-f2230c7190bf","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"60344010-666c-4587-8df7-3a7b00650211","path":"sprites/spr_bionics_leg_2/spr_bionics_leg_2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"1f7862ff-d90c-486b-a1ea-580889f2e702","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"3eda6fcd-5322-48bd-a288-7a10c092106d","path":"sprites/spr_bionics_leg_2/spr_bionics_leg_2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"59645d06-f0ba-4d6a-bd64-c870a41a5ed9","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"2c017214-77b0-4045-82a3-7f4f38b750dc","path":"sprites/spr_bionics_leg_2/spr_bionics_leg_2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"6f67e883-b80f-45b5-88f9-efa0ba50734c","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"e8bce95c-eb80-4f7b-90e4-fb0ca15fdf45","path":"sprites/spr_bionics_leg_2/spr_bionics_leg_2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"df5f15df-c503-4f47-a424-f2230c7190bf","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_bionics_leg_3/spr_bionics_leg_3.yy b/sprites/spr_bionics_leg_3/spr_bionics_leg_3.yy index 72549cc9cb..94b80688fa 100644 --- a/sprites/spr_bionics_leg_3/spr_bionics_leg_3.yy +++ b/sprites/spr_bionics_leg_3/spr_bionics_leg_3.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_bionics_leg_3", "bboxMode":0, "bbox_bottom":220, @@ -12,10 +12,10 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"c4c6abe2-0da6-47f8-ac18-5323c3571f34","name":"c4c6abe2-0da6-47f8-ac18-5323c3571f34","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"bb567c2d-04fc-42a7-bb87-f6e8146da773","name":"bb567c2d-04fc-42a7-bb87-f6e8146da773","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"890e2fc7-04e5-4e3d-97ac-186f06befa10","name":"890e2fc7-04e5-4e3d-97ac-186f06befa10","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"d997f30c-b766-4e52-864e-db00fa825f91","name":"d997f30c-b766-4e52-864e-db00fa825f91","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"c4c6abe2-0da6-47f8-ac18-5323c3571f34","name":"c4c6abe2-0da6-47f8-ac18-5323c3571f34","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"bb567c2d-04fc-42a7-bb87-f6e8146da773","name":"bb567c2d-04fc-42a7-bb87-f6e8146da773","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"890e2fc7-04e5-4e3d-97ac-186f06befa10","name":"890e2fc7-04e5-4e3d-97ac-186f06befa10","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"d997f30c-b766-4e52-864e-db00fa825f91","name":"d997f30c-b766-4e52-864e-db00fa825f91","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -71,18 +71,10 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"c4c6abe2-0da6-47f8-ac18-5323c3571f34","path":"sprites/spr_bionics_leg_3/spr_bionics_leg_3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"c7b887ab-6c36-4a5a-9cc4-6fdc73de936d","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"bb567c2d-04fc-42a7-bb87-f6e8146da773","path":"sprites/spr_bionics_leg_3/spr_bionics_leg_3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"0b074909-58d0-49b2-8d3b-3d8acb2ef00d","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"890e2fc7-04e5-4e3d-97ac-186f06befa10","path":"sprites/spr_bionics_leg_3/spr_bionics_leg_3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"e6711864-48f4-4b55-8517-81694b5cb9c5","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"d997f30c-b766-4e52-864e-db00fa825f91","path":"sprites/spr_bionics_leg_3/spr_bionics_leg_3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"74663002-2056-4f5e-bb5d-27715081c24d","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"c4c6abe2-0da6-47f8-ac18-5323c3571f34","path":"sprites/spr_bionics_leg_3/spr_bionics_leg_3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"c7b887ab-6c36-4a5a-9cc4-6fdc73de936d","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"bb567c2d-04fc-42a7-bb87-f6e8146da773","path":"sprites/spr_bionics_leg_3/spr_bionics_leg_3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"0b074909-58d0-49b2-8d3b-3d8acb2ef00d","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"890e2fc7-04e5-4e3d-97ac-186f06befa10","path":"sprites/spr_bionics_leg_3/spr_bionics_leg_3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"e6711864-48f4-4b55-8517-81694b5cb9c5","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"d997f30c-b766-4e52-864e-db00fa825f91","path":"sprites/spr_bionics_leg_3/spr_bionics_leg_3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"74663002-2056-4f5e-bb5d-27715081c24d","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_blog/spr_blog.yy b/sprites/spr_blog/spr_blog.yy index 78ac8d53f3..3551bd7584 100644 --- a/sprites/spr_blog/spr_blog.yy +++ b/sprites/spr_blog/spr_blog.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_blog", "bboxMode":0, "bbox_bottom":30, @@ -12,12 +12,12 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"c21a34a6-d266-489b-b6a0-0c679cf27c53","name":"c21a34a6-d266-489b-b6a0-0c679cf27c53","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"535cb6f7-000e-4721-b110-366ed91586fd","name":"535cb6f7-000e-4721-b110-366ed91586fd","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"1737e307-e897-4a65-b4ff-3850b60e5c0f","name":"1737e307-e897-4a65-b4ff-3850b60e5c0f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"5c1dd916-65c6-44a6-8216-c61a794efc5f","name":"5c1dd916-65c6-44a6-8216-c61a794efc5f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"af7d273a-ba8d-42e2-83aa-5765bdc967cd","name":"af7d273a-ba8d-42e2-83aa-5765bdc967cd","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"e75f6379-f9ab-4772-8498-c4af5688e3f3","name":"e75f6379-f9ab-4772-8498-c4af5688e3f3","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"c21a34a6-d266-489b-b6a0-0c679cf27c53","name":"c21a34a6-d266-489b-b6a0-0c679cf27c53","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"535cb6f7-000e-4721-b110-366ed91586fd","name":"535cb6f7-000e-4721-b110-366ed91586fd","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"1737e307-e897-4a65-b4ff-3850b60e5c0f","name":"1737e307-e897-4a65-b4ff-3850b60e5c0f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"5c1dd916-65c6-44a6-8216-c61a794efc5f","name":"5c1dd916-65c6-44a6-8216-c61a794efc5f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"af7d273a-ba8d-42e2-83aa-5765bdc967cd","name":"af7d273a-ba8d-42e2-83aa-5765bdc967cd","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"e75f6379-f9ab-4772-8498-c4af5688e3f3","name":"e75f6379-f9ab-4772-8498-c4af5688e3f3","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -73,24 +73,12 @@ "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_bolt/spr_bolt.yy b/sprites/spr_bolt/spr_bolt.yy index e6fc210f27..ce1992edda 100644 --- a/sprites/spr_bolt/spr_bolt.yy +++ b/sprites/spr_bolt/spr_bolt.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_bolt", "bboxMode":0, "bbox_bottom":2, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"8c00fc9d-fed0-48e6-a2d5-417aea46f55c","name":"8c00fc9d-fed0-48e6-a2d5-417aea46f55c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"8c00fc9d-fed0-48e6-a2d5-417aea46f55c","name":"8c00fc9d-fed0-48e6-a2d5-417aea46f55c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -70,9 +70,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"8c00fc9d-fed0-48e6-a2d5-417aea46f55c","path":"sprites/spr_bolt/spr_bolt.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"ea9cdec0-668a-4734-bc7f-753703846553","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"8c00fc9d-fed0-48e6-a2d5-417aea46f55c","path":"sprites/spr_bolt/spr_bolt.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"ea9cdec0-668a-4734-bc7f-753703846553","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_bonding_studs_left/spr_bonding_studs_left.yy b/sprites/spr_bonding_studs_left/spr_bonding_studs_left.yy index 87480ad35a..73db77ccf8 100644 --- a/sprites/spr_bonding_studs_left/spr_bonding_studs_left.yy +++ b/sprites/spr_bonding_studs_left/spr_bonding_studs_left.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_bonding_studs_left", "bboxMode":0, "bbox_bottom":75, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"48f72680-cb96-4361-9276-5e8d8552ae9f","name":"48f72680-cb96-4361-9276-5e8d8552ae9f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"48f72680-cb96-4361-9276-5e8d8552ae9f","name":"48f72680-cb96-4361-9276-5e8d8552ae9f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"48f72680-cb96-4361-9276-5e8d8552ae9f","path":"sprites/spr_bonding_studs_left/spr_bonding_studs_left.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"34a5702d-932b-4320-bbce-57b6f082d8a3","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"48f72680-cb96-4361-9276-5e8d8552ae9f","path":"sprites/spr_bonding_studs_left/spr_bonding_studs_left.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"34a5702d-932b-4320-bbce-57b6f082d8a3","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_bonding_studs_right/spr_bonding_studs_right.yy b/sprites/spr_bonding_studs_right/spr_bonding_studs_right.yy index 6b808a95a5..dc911f05c4 100644 --- a/sprites/spr_bonding_studs_right/spr_bonding_studs_right.yy +++ b/sprites/spr_bonding_studs_right/spr_bonding_studs_right.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_bonding_studs_right", "bboxMode":0, "bbox_bottom":75, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"48f72680-cb96-4361-9276-5e8d8552ae9f","name":"48f72680-cb96-4361-9276-5e8d8552ae9f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"48f72680-cb96-4361-9276-5e8d8552ae9f","name":"48f72680-cb96-4361-9276-5e8d8552ae9f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"48f72680-cb96-4361-9276-5e8d8552ae9f","path":"sprites/spr_bonding_studs_right/spr_bonding_studs_right.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"44c9fff8-d58f-4c90-8b67-a07f3503bcbc","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"48f72680-cb96-4361-9276-5e8d8552ae9f","path":"sprites/spr_bonding_studs_right/spr_bonding_studs_right.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"44c9fff8-d58f-4c90-8b67-a07f3503bcbc","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_build_tiny/spr_build_tiny.yy b/sprites/spr_build_tiny/spr_build_tiny.yy index 4b0188c8b3..3e89d9e539 100644 --- a/sprites/spr_build_tiny/spr_build_tiny.yy +++ b/sprites/spr_build_tiny/spr_build_tiny.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_build_tiny", "bboxMode":0, "bbox_bottom":11, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"f686ba29-c495-47b6-96c4-6b5468d59af7","name":"f686ba29-c495-47b6-96c4-6b5468d59af7","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"f686ba29-c495-47b6-96c4-6b5468d59af7","name":"f686ba29-c495-47b6-96c4-6b5468d59af7","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"f686ba29-c495-47b6-96c4-6b5468d59af7","path":"sprites/spr_build_tiny/spr_build_tiny.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"aac88065-ea52-440a-b15d-0d3ef7afe71d","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"f686ba29-c495-47b6-96c4-6b5468d59af7","path":"sprites/spr_build_tiny/spr_build_tiny.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"aac88065-ea52-440a-b15d-0d3ef7afe71d","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":{ diff --git a/sprites/spr_build_tiny2/spr_build_tiny2.yy b/sprites/spr_build_tiny2/spr_build_tiny2.yy index 970a51d785..0e47262850 100644 --- a/sprites/spr_build_tiny2/spr_build_tiny2.yy +++ b/sprites/spr_build_tiny2/spr_build_tiny2.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_build_tiny2", "bboxMode":0, "bbox_bottom":8, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"9d1a8d8b-70be-47f6-837a-efd47e9c2ec6","name":"9d1a8d8b-70be-47f6-837a-efd47e9c2ec6","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"9d1a8d8b-70be-47f6-837a-efd47e9c2ec6","name":"9d1a8d8b-70be-47f6-837a-efd47e9c2ec6","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"9d1a8d8b-70be-47f6-837a-efd47e9c2ec6","path":"sprites/spr_build_tiny2/spr_build_tiny2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"410d66a0-8e76-417d-9ea2-f2fe32992cd3","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"9d1a8d8b-70be-47f6-837a-efd47e9c2ec6","path":"sprites/spr_build_tiny2/spr_build_tiny2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"410d66a0-8e76-417d-9ea2-f2fe32992cd3","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_bullet/spr_bullet.yy b/sprites/spr_bullet/spr_bullet.yy index 1191ea3fbe..42497f9c7e 100644 --- a/sprites/spr_bullet/spr_bullet.yy +++ b/sprites/spr_bullet/spr_bullet.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_bullet", "bboxMode":0, "bbox_bottom":2, @@ -12,9 +12,9 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"fe27e772-3e3f-4bd9-be7a-3a79d13d2b5d","name":"fe27e772-3e3f-4bd9-be7a-3a79d13d2b5d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"6de1eedf-abcf-424b-93fe-14592661e895","name":"6de1eedf-abcf-424b-93fe-14592661e895","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"eff37c53-b20a-4fcb-aad0-818a35b97ba6","name":"eff37c53-b20a-4fcb-aad0-818a35b97ba6","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"fe27e772-3e3f-4bd9-be7a-3a79d13d2b5d","name":"fe27e772-3e3f-4bd9-be7a-3a79d13d2b5d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"6de1eedf-abcf-424b-93fe-14592661e895","name":"6de1eedf-abcf-424b-93fe-14592661e895","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"eff37c53-b20a-4fcb-aad0-818a35b97ba6","name":"eff37c53-b20a-4fcb-aad0-818a35b97ba6","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -70,15 +70,9 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"fe27e772-3e3f-4bd9-be7a-3a79d13d2b5d","path":"sprites/spr_bullet/spr_bullet.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"45638394-e5b8-4100-b8c3-1634e9bc5c81","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"6de1eedf-abcf-424b-93fe-14592661e895","path":"sprites/spr_bullet/spr_bullet.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"a649a5af-7279-4169-b998-8fb3c780fd6d","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"eff37c53-b20a-4fcb-aad0-818a35b97ba6","path":"sprites/spr_bullet/spr_bullet.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"a20e31ba-472e-430d-9792-a2c545e10bbc","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"fe27e772-3e3f-4bd9-be7a-3a79d13d2b5d","path":"sprites/spr_bullet/spr_bullet.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"45638394-e5b8-4100-b8c3-1634e9bc5c81","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"6de1eedf-abcf-424b-93fe-14592661e895","path":"sprites/spr_bullet/spr_bullet.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"a649a5af-7279-4169-b998-8fb3c780fd6d","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"eff37c53-b20a-4fcb-aad0-818a35b97ba6","path":"sprites/spr_bullet/spr_bullet.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"a20e31ba-472e-430d-9792-a2c545e10bbc","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":{ diff --git a/sprites/spr_cancel_small/spr_cancel_small.yy b/sprites/spr_cancel_small/spr_cancel_small.yy index 9dc9d44db6..9a8a06aa5f 100644 --- a/sprites/spr_cancel_small/spr_cancel_small.yy +++ b/sprites/spr_cancel_small/spr_cancel_small.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_cancel_small", "bboxMode":0, "bbox_bottom":13, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"84a93b9a-ecde-4873-9a50-4138e49231ca","name":"84a93b9a-ecde-4873-9a50-4138e49231ca","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"84a93b9a-ecde-4873-9a50-4138e49231ca","name":"84a93b9a-ecde-4873-9a50-4138e49231ca","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"84a93b9a-ecde-4873-9a50-4138e49231ca","path":"sprites/spr_cancel_small/spr_cancel_small.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"7d1749b9-d177-422d-9166-d1a804565eff","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"84a93b9a-ecde-4873-9a50-4138e49231ca","path":"sprites/spr_cancel_small/spr_cancel_small.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"7d1749b9-d177-422d-9166-d1a804565eff","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":{ diff --git a/sprites/spr_cannon/spr_cannon.yy b/sprites/spr_cannon/spr_cannon.yy index 0310106cd0..bd808ff3a3 100644 --- a/sprites/spr_cannon/spr_cannon.yy +++ b/sprites/spr_cannon/spr_cannon.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_cannon", "bboxMode":0, "bbox_bottom":13, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"7b7fcd5f-3ad7-487a-a68b-e4b1052ff451","name":"7b7fcd5f-3ad7-487a-a68b-e4b1052ff451","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"7b7fcd5f-3ad7-487a-a68b-e4b1052ff451","name":"7b7fcd5f-3ad7-487a-a68b-e4b1052ff451","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"7b7fcd5f-3ad7-487a-a68b-e4b1052ff451","path":"sprites/spr_cannon/spr_cannon.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"c4311aff-cbe8-42e9-ac4c-135ec61e9da0","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"7b7fcd5f-3ad7-487a-a68b-e4b1052ff451","path":"sprites/spr_cannon/spr_cannon.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"c4311aff-cbe8-42e9-ac4c-135ec61e9da0","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":{ diff --git a/sprites/spr_carrion_breath/spr_carrion_breath.yy b/sprites/spr_carrion_breath/spr_carrion_breath.yy index b57ad3630a..cf693cf2aa 100644 --- a/sprites/spr_carrion_breath/spr_carrion_breath.yy +++ b/sprites/spr_carrion_breath/spr_carrion_breath.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_carrion_breath", "bboxMode":2, "bbox_bottom":29, @@ -12,14 +12,14 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"6750780f-1054-460d-8534-ef05f39652a5","name":"6750780f-1054-460d-8534-ef05f39652a5","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"d5d93c6e-321c-4b45-8c74-27062a51f937","name":"d5d93c6e-321c-4b45-8c74-27062a51f937","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"edb5de84-7769-44fc-a7a2-b69ace679703","name":"edb5de84-7769-44fc-a7a2-b69ace679703","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"23bb4ffb-9c50-4874-af96-0db2f84173f0","name":"23bb4ffb-9c50-4874-af96-0db2f84173f0","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"a480e5a9-b2d4-4187-bdba-78339048d27d","name":"a480e5a9-b2d4-4187-bdba-78339048d27d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"6fbe2862-9270-452c-af95-3885be5369b3","name":"6fbe2862-9270-452c-af95-3885be5369b3","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"6bac9509-a9b3-4b5f-9358-51155c2ec9ef","name":"6bac9509-a9b3-4b5f-9358-51155c2ec9ef","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"b5f9d8cd-db5e-48be-8b21-f93f34c7181b","name":"b5f9d8cd-db5e-48be-8b21-f93f34c7181b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"6750780f-1054-460d-8534-ef05f39652a5","name":"6750780f-1054-460d-8534-ef05f39652a5","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"d5d93c6e-321c-4b45-8c74-27062a51f937","name":"d5d93c6e-321c-4b45-8c74-27062a51f937","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"edb5de84-7769-44fc-a7a2-b69ace679703","name":"edb5de84-7769-44fc-a7a2-b69ace679703","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"23bb4ffb-9c50-4874-af96-0db2f84173f0","name":"23bb4ffb-9c50-4874-af96-0db2f84173f0","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"a480e5a9-b2d4-4187-bdba-78339048d27d","name":"a480e5a9-b2d4-4187-bdba-78339048d27d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"6fbe2862-9270-452c-af95-3885be5369b3","name":"6fbe2862-9270-452c-af95-3885be5369b3","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"6bac9509-a9b3-4b5f-9358-51155c2ec9ef","name":"6bac9509-a9b3-4b5f-9358-51155c2ec9ef","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"b5f9d8cd-db5e-48be-8b21-f93f34c7181b","name":"b5f9d8cd-db5e-48be-8b21-f93f34c7181b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -77,30 +77,14 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"6750780f-1054-460d-8534-ef05f39652a5","path":"sprites/spr_carrion_breath/spr_carrion_breath.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"97ea9318-53ef-49e0-89c5-c2ea9e886dc8","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"d5d93c6e-321c-4b45-8c74-27062a51f937","path":"sprites/spr_carrion_breath/spr_carrion_breath.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"345f2606-0535-4182-8706-2014078efd82","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"edb5de84-7769-44fc-a7a2-b69ace679703","path":"sprites/spr_carrion_breath/spr_carrion_breath.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"2906b15e-3441-47bc-9ead-01a0de054fa7","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"23bb4ffb-9c50-4874-af96-0db2f84173f0","path":"sprites/spr_carrion_breath/spr_carrion_breath.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"27171884-cf39-4f0f-9a51-96155167b8b3","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"a480e5a9-b2d4-4187-bdba-78339048d27d","path":"sprites/spr_carrion_breath/spr_carrion_breath.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"8d57c8a1-baa7-4e00-95c0-6e4c17d377b3","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"6fbe2862-9270-452c-af95-3885be5369b3","path":"sprites/spr_carrion_breath/spr_carrion_breath.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"d591bf65-f35d-48b5-b870-798b67ff028a","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"6bac9509-a9b3-4b5f-9358-51155c2ec9ef","path":"sprites/spr_carrion_breath/spr_carrion_breath.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"7d29850b-8b6a-45c1-9a4b-7e31c63c4c9e","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"b5f9d8cd-db5e-48be-8b21-f93f34c7181b","path":"sprites/spr_carrion_breath/spr_carrion_breath.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"7486d265-51e5-4c9d-a0f7-51c056f4dec3","IsCreationKey":false,"Key":7.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"6750780f-1054-460d-8534-ef05f39652a5","path":"sprites/spr_carrion_breath/spr_carrion_breath.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"97ea9318-53ef-49e0-89c5-c2ea9e886dc8","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"d5d93c6e-321c-4b45-8c74-27062a51f937","path":"sprites/spr_carrion_breath/spr_carrion_breath.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"345f2606-0535-4182-8706-2014078efd82","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"edb5de84-7769-44fc-a7a2-b69ace679703","path":"sprites/spr_carrion_breath/spr_carrion_breath.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"2906b15e-3441-47bc-9ead-01a0de054fa7","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"23bb4ffb-9c50-4874-af96-0db2f84173f0","path":"sprites/spr_carrion_breath/spr_carrion_breath.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"27171884-cf39-4f0f-9a51-96155167b8b3","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"a480e5a9-b2d4-4187-bdba-78339048d27d","path":"sprites/spr_carrion_breath/spr_carrion_breath.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"8d57c8a1-baa7-4e00-95c0-6e4c17d377b3","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"6fbe2862-9270-452c-af95-3885be5369b3","path":"sprites/spr_carrion_breath/spr_carrion_breath.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"d591bf65-f35d-48b5-b870-798b67ff028a","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"6bac9509-a9b3-4b5f-9358-51155c2ec9ef","path":"sprites/spr_carrion_breath/spr_carrion_breath.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"7d29850b-8b6a-45c1-9a4b-7e31c63c4c9e","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"b5f9d8cd-db5e-48be-8b21-f93f34c7181b","path":"sprites/spr_carrion_breath/spr_carrion_breath.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"7486d265-51e5-4c9d-a0f7-51c056f4dec3","IsCreationKey":false,"Key":7.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_chain_mail_tabbard/spr_chain_mail_tabbard.yy b/sprites/spr_chain_mail_tabbard/spr_chain_mail_tabbard.yy index d25b8f4ed6..3a0f8aa071 100644 --- a/sprites/spr_chain_mail_tabbard/spr_chain_mail_tabbard.yy +++ b/sprites/spr_chain_mail_tabbard/spr_chain_mail_tabbard.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_chain_mail_tabbard", "bboxMode":0, "bbox_bottom":162, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"e4a11296-f2eb-4f90-9581-bbca8ab08d78","name":"e4a11296-f2eb-4f90-9581-bbca8ab08d78","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"e4a11296-f2eb-4f90-9581-bbca8ab08d78","name":"e4a11296-f2eb-4f90-9581-bbca8ab08d78","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -70,9 +70,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"e4a11296-f2eb-4f90-9581-bbca8ab08d78","path":"sprites/spr_chain_mail_tabbard/spr_chain_mail_tabbard.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"5d0ab5f8-6b38-401e-ab12-57064b78101a","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"e4a11296-f2eb-4f90-9581-bbca8ab08d78","path":"sprites/spr_chain_mail_tabbard/spr_chain_mail_tabbard.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"5d0ab5f8-6b38-401e-ab12-57064b78101a","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_chap_area_pad/spr_chap_area_pad.yy b/sprites/spr_chap_area_pad/spr_chap_area_pad.yy index 1025c38ac0..dd340a9e5d 100644 --- a/sprites/spr_chap_area_pad/spr_chap_area_pad.yy +++ b/sprites/spr_chap_area_pad/spr_chap_area_pad.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_chap_area_pad", "bboxMode":0, "bbox_bottom":157, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"fb3c5253-6479-490f-ba64-9bcf144ab6fb","name":"fb3c5253-6479-490f-ba64-9bcf144ab6fb","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"fb3c5253-6479-490f-ba64-9bcf144ab6fb","name":"fb3c5253-6479-490f-ba64-9bcf144ab6fb","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"fb3c5253-6479-490f-ba64-9bcf144ab6fb","path":"sprites/spr_chap_area_pad/spr_chap_area_pad.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"0c38c46a-1684-4748-b935-42318fc441bf","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"fb3c5253-6479-490f-ba64-9bcf144ab6fb","path":"sprites/spr_chap_area_pad/spr_chap_area_pad.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"0c38c46a-1684-4748-b935-42318fc441bf","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_chap_trim_left/spr_chap_trim_left.yy b/sprites/spr_chap_trim_left/spr_chap_trim_left.yy index 9487c28502..f045189e15 100644 --- a/sprites/spr_chap_trim_left/spr_chap_trim_left.yy +++ b/sprites/spr_chap_trim_left/spr_chap_trim_left.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_chap_trim_left", "bboxMode":0, "bbox_bottom":81, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"a9ab7201-7070-45ca-8574-83152cfd6f3c","name":"a9ab7201-7070-45ca-8574-83152cfd6f3c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"a9ab7201-7070-45ca-8574-83152cfd6f3c","name":"a9ab7201-7070-45ca-8574-83152cfd6f3c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -70,9 +70,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"a9ab7201-7070-45ca-8574-83152cfd6f3c","path":"sprites/spr_chap_trim_left/spr_chap_trim_left.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"36e4efa0-90a0-493b-8711-c38b72c203e1","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"a9ab7201-7070-45ca-8574-83152cfd6f3c","path":"sprites/spr_chap_trim_left/spr_chap_trim_left.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"36e4efa0-90a0-493b-8711-c38b72c203e1","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_chap_trim_right/spr_chap_trim_right.yy b/sprites/spr_chap_trim_right/spr_chap_trim_right.yy index a95be39464..a2452224a5 100644 --- a/sprites/spr_chap_trim_right/spr_chap_trim_right.yy +++ b/sprites/spr_chap_trim_right/spr_chap_trim_right.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_chap_trim_right", "bboxMode":0, "bbox_bottom":81, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"a9ab7201-7070-45ca-8574-83152cfd6f3c","name":"a9ab7201-7070-45ca-8574-83152cfd6f3c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"a9ab7201-7070-45ca-8574-83152cfd6f3c","name":"a9ab7201-7070-45ca-8574-83152cfd6f3c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -70,9 +70,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"a9ab7201-7070-45ca-8574-83152cfd6f3c","path":"sprites/spr_chap_trim_right/spr_chap_trim_right.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"36e4efa0-90a0-493b-8711-c38b72c203e1","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"a9ab7201-7070-45ca-8574-83152cfd6f3c","path":"sprites/spr_chap_trim_right/spr_chap_trim_right.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"36e4efa0-90a0-493b-8711-c38b72c203e1","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_chaplain_helm/spr_chaplain_helm.yy b/sprites/spr_chaplain_helm/spr_chaplain_helm.yy index 29cf66f657..de26cbbaff 100644 --- a/sprites/spr_chaplain_helm/spr_chaplain_helm.yy +++ b/sprites/spr_chaplain_helm/spr_chaplain_helm.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_chaplain_helm", "bboxMode":0, "bbox_bottom":44, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"570e9798-a363-4113-a62f-3329e557f4cf","name":"570e9798-a363-4113-a62f-3329e557f4cf","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"570e9798-a363-4113-a62f-3329e557f4cf","name":"570e9798-a363-4113-a62f-3329e557f4cf","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"570e9798-a363-4113-a62f-3329e557f4cf","path":"sprites/spr_chaplain_helm/spr_chaplain_helm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"bddf969b-685c-491b-bfd5-97af3bc35d94","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"570e9798-a363-4113-a62f-3329e557f4cf","path":"sprites/spr_chaplain_helm/spr_chaplain_helm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"bddf969b-685c-491b-bfd5-97af3bc35d94","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_chaplain_term_helm/spr_chaplain_term_helm.yy b/sprites/spr_chaplain_term_helm/spr_chaplain_term_helm.yy index 67f9fdc13c..ed9d7c0e47 100644 --- a/sprites/spr_chaplain_term_helm/spr_chaplain_term_helm.yy +++ b/sprites/spr_chaplain_term_helm/spr_chaplain_term_helm.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_chaplain_term_helm", "bboxMode":0, "bbox_bottom":43, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"86934807-ea9a-4216-8308-41baa548c8fa","name":"86934807-ea9a-4216-8308-41baa548c8fa","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"86934807-ea9a-4216-8308-41baa548c8fa","name":"86934807-ea9a-4216-8308-41baa548c8fa","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"86934807-ea9a-4216-8308-41baa548c8fa","path":"sprites/spr_chaplain_term_helm/spr_chaplain_term_helm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"11bace7a-9f35-49e0-8162-88bc61d6e2f5","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"86934807-ea9a-4216-8308-41baa548c8fa","path":"sprites/spr_chaplain_term_helm/spr_chaplain_term_helm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"11bace7a-9f35-49e0-8162-88bc61d6e2f5","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_chaplain_wolf_helm/spr_chaplain_wolf_helm.yy b/sprites/spr_chaplain_wolf_helm/spr_chaplain_wolf_helm.yy index 75e57ec16f..04079072d6 100644 --- a/sprites/spr_chaplain_wolf_helm/spr_chaplain_wolf_helm.yy +++ b/sprites/spr_chaplain_wolf_helm/spr_chaplain_wolf_helm.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_chaplain_wolf_helm", "bboxMode":0, "bbox_bottom":48, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"f2f04903-70d2-4526-bee9-08bfa83c5f9b","name":"f2f04903-70d2-4526-bee9-08bfa83c5f9b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"f2f04903-70d2-4526-bee9-08bfa83c5f9b","name":"f2f04903-70d2-4526-bee9-08bfa83c5f9b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"f2f04903-70d2-4526-bee9-08bfa83c5f9b","path":"sprites/spr_chaplain_wolf_helm/spr_chaplain_wolf_helm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"75c80c2d-38d0-4554-92d8-e2e94a2ad19e","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"f2f04903-70d2-4526-bee9-08bfa83c5f9b","path":"sprites/spr_chaplain_wolf_helm/spr_chaplain_wolf_helm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"75c80c2d-38d0-4554-92d8-e2e94a2ad19e","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_chaplain_wolfterm_helm/spr_chaplain_wolfterm_helm.yy b/sprites/spr_chaplain_wolfterm_helm/spr_chaplain_wolfterm_helm.yy index 5b6e364e68..14404fe4b0 100644 --- a/sprites/spr_chaplain_wolfterm_helm/spr_chaplain_wolfterm_helm.yy +++ b/sprites/spr_chaplain_wolfterm_helm/spr_chaplain_wolfterm_helm.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_chaplain_wolfterm_helm", "bboxMode":0, "bbox_bottom":44, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"f2f04903-70d2-4526-bee9-08bfa83c5f9b","name":"f2f04903-70d2-4526-bee9-08bfa83c5f9b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"f2f04903-70d2-4526-bee9-08bfa83c5f9b","name":"f2f04903-70d2-4526-bee9-08bfa83c5f9b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"f2f04903-70d2-4526-bee9-08bfa83c5f9b","path":"sprites/spr_chaplain_wolfterm_helm/spr_chaplain_wolfterm_helm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"eb7d7ec9-98d3-495d-9bdc-175c698dd371","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"f2f04903-70d2-4526-bee9-08bfa83c5f9b","path":"sprites/spr_chaplain_wolfterm_helm/spr_chaplain_wolfterm_helm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"eb7d7ec9-98d3-495d-9bdc-175c698dd371","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_charisma_icon/spr_charisma_icon.yy b/sprites/spr_charisma_icon/spr_charisma_icon.yy index c7b143ab1e..920914801a 100644 --- a/sprites/spr_charisma_icon/spr_charisma_icon.yy +++ b/sprites/spr_charisma_icon/spr_charisma_icon.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_charisma_icon", "bboxMode":0, "bbox_bottom":56, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"4e272a50-68af-439b-86d3-167d72d6a28b","name":"4e272a50-68af-439b-86d3-167d72d6a28b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"4e272a50-68af-439b-86d3-167d72d6a28b","name":"4e272a50-68af-439b-86d3-167d72d6a28b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"4e272a50-68af-439b-86d3-167d72d6a28b","path":"sprites/spr_charisma_icon/spr_charisma_icon.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"244ffbba-ba6f-4417-9adc-cb55077bbbf4","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"4e272a50-68af-439b-86d3-167d72d6a28b","path":"sprites/spr_charisma_icon/spr_charisma_icon.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"244ffbba-ba6f-4417-9adc-cb55077bbbf4","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_checker_texture/spr_checker_texture.yy b/sprites/spr_checker_texture/spr_checker_texture.yy index 58da2000eb..e0d8251c4f 100644 --- a/sprites/spr_checker_texture/spr_checker_texture.yy +++ b/sprites/spr_checker_texture/spr_checker_texture.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_checker_texture", "bboxMode":0, "bbox_bottom":179, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":true, "frames":[ - {"$GMSpriteFrame":"","%Name":"58ee1e71-509f-4b0e-ab39-17c8da2a0687","name":"58ee1e71-509f-4b0e-ab39-17c8da2a0687","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"58ee1e71-509f-4b0e-ab39-17c8da2a0687","name":"58ee1e71-509f-4b0e-ab39-17c8da2a0687","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -33,13 +33,7 @@ "resourceType":"GMNineSliceData", "resourceVersion":"2.0", "right":0, - "tileMode":[ - 0, - 0, - 0, - 0, - 0, - ], + "tileMode":[0,0,0,0,0,], "top":0, }, "origin":0, @@ -87,9 +81,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"58ee1e71-509f-4b0e-ab39-17c8da2a0687","path":"sprites/spr_checker_texture/spr_checker_texture.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"1e6e1650-2926-4786-b31b-bbc04b9c7746","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"58ee1e71-509f-4b0e-ab39-17c8da2a0687","path":"sprites/spr_checker_texture/spr_checker_texture.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"1e6e1650-2926-4786-b31b-bbc04b9c7746","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_cloak_cloth/spr_cloak_cloth.yy b/sprites/spr_cloak_cloth/spr_cloak_cloth.yy index abbfaf3025..fdff1a38c9 100644 --- a/sprites/spr_cloak_cloth/spr_cloak_cloth.yy +++ b/sprites/spr_cloak_cloth/spr_cloak_cloth.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_cloak_cloth", "bboxMode":0, "bbox_bottom":212, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"b6ba8600-fb6b-4fa9-abc7-bdc2311eb79e","name":"b6ba8600-fb6b-4fa9-abc7-bdc2311eb79e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"b6ba8600-fb6b-4fa9-abc7-bdc2311eb79e","name":"b6ba8600-fb6b-4fa9-abc7-bdc2311eb79e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "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_cloak_cloth/spr_cloak_cloth.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"9facd769-5509-4fb6-8e77-cadc247917bb","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_cloak_cloth/spr_cloak_cloth.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"9facd769-5509-4fb6-8e77-cadc247917bb","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_cloak_fur/spr_cloak_fur.yy b/sprites/spr_cloak_fur/spr_cloak_fur.yy index bfba41d1a2..79f1cd197d 100644 --- a/sprites/spr_cloak_fur/spr_cloak_fur.yy +++ b/sprites/spr_cloak_fur/spr_cloak_fur.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_cloak_fur", "bboxMode":0, "bbox_bottom":216, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"b6ba8600-fb6b-4fa9-abc7-bdc2311eb79e","name":"b6ba8600-fb6b-4fa9-abc7-bdc2311eb79e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"b6ba8600-fb6b-4fa9-abc7-bdc2311eb79e","name":"b6ba8600-fb6b-4fa9-abc7-bdc2311eb79e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "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_cloak_fur/spr_cloak_fur.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"1c0b8831-0ab4-46ac-944f-5c99c40dbe5b","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_cloak_fur/spr_cloak_fur.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"1c0b8831-0ab4-46ac-944f-5c99c40dbe5b","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_cloak_image_0/spr_cloak_image_0.yy b/sprites/spr_cloak_image_0/spr_cloak_image_0.yy index 19ef9445b2..a7ae8826a7 100644 --- a/sprites/spr_cloak_image_0/spr_cloak_image_0.yy +++ b/sprites/spr_cloak_image_0/spr_cloak_image_0.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_cloak_image_0", "bboxMode":0, "bbox_bottom":213, @@ -12,11 +12,11 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"c72801d7-56dd-43d1-b640-7693f208ed61","name":"c72801d7-56dd-43d1-b640-7693f208ed61","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"213d39c2-a47f-41a9-9d8c-91f0d170c2ca","name":"213d39c2-a47f-41a9-9d8c-91f0d170c2ca","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"ee7bc50b-e97a-4f13-9212-715ceeb5628f","name":"ee7bc50b-e97a-4f13-9212-715ceeb5628f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"82e364e5-8083-4ceb-b0e3-26fa3dacab4d","name":"82e364e5-8083-4ceb-b0e3-26fa3dacab4d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"004e9cd8-7bda-477f-a4bf-51afa86eacde","name":"004e9cd8-7bda-477f-a4bf-51afa86eacde","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"c72801d7-56dd-43d1-b640-7693f208ed61","name":"c72801d7-56dd-43d1-b640-7693f208ed61","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"213d39c2-a47f-41a9-9d8c-91f0d170c2ca","name":"213d39c2-a47f-41a9-9d8c-91f0d170c2ca","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"ee7bc50b-e97a-4f13-9212-715ceeb5628f","name":"ee7bc50b-e97a-4f13-9212-715ceeb5628f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"82e364e5-8083-4ceb-b0e3-26fa3dacab4d","name":"82e364e5-8083-4ceb-b0e3-26fa3dacab4d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"004e9cd8-7bda-477f-a4bf-51afa86eacde","name":"004e9cd8-7bda-477f-a4bf-51afa86eacde","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -72,21 +72,11 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"c72801d7-56dd-43d1-b640-7693f208ed61","path":"sprites/spr_cloak_image_0/spr_cloak_image_0.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"a9e16542-ea41-470d-8d85-ec4af04648aa","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"213d39c2-a47f-41a9-9d8c-91f0d170c2ca","path":"sprites/spr_cloak_image_0/spr_cloak_image_0.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"41456926-78d1-4b71-9ecf-24beb63ed9d6","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"ee7bc50b-e97a-4f13-9212-715ceeb5628f","path":"sprites/spr_cloak_image_0/spr_cloak_image_0.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"7d3cf5ee-ba23-4311-af2e-588e1972e447","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"82e364e5-8083-4ceb-b0e3-26fa3dacab4d","path":"sprites/spr_cloak_image_0/spr_cloak_image_0.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"897d121f-764b-4f0f-9d2a-5d8e558a373e","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"004e9cd8-7bda-477f-a4bf-51afa86eacde","path":"sprites/spr_cloak_image_0/spr_cloak_image_0.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"07b0b8b6-ea9e-4a9b-badf-51f3f9c76286","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"c72801d7-56dd-43d1-b640-7693f208ed61","path":"sprites/spr_cloak_image_0/spr_cloak_image_0.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"a9e16542-ea41-470d-8d85-ec4af04648aa","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"213d39c2-a47f-41a9-9d8c-91f0d170c2ca","path":"sprites/spr_cloak_image_0/spr_cloak_image_0.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"41456926-78d1-4b71-9ecf-24beb63ed9d6","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"ee7bc50b-e97a-4f13-9212-715ceeb5628f","path":"sprites/spr_cloak_image_0/spr_cloak_image_0.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"7d3cf5ee-ba23-4311-af2e-588e1972e447","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"82e364e5-8083-4ceb-b0e3-26fa3dacab4d","path":"sprites/spr_cloak_image_0/spr_cloak_image_0.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"897d121f-764b-4f0f-9d2a-5d8e558a373e","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"004e9cd8-7bda-477f-a4bf-51afa86eacde","path":"sprites/spr_cloak_image_0/spr_cloak_image_0.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"07b0b8b6-ea9e-4a9b-badf-51f3f9c76286","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_cloak_image_1/spr_cloak_image_1.yy b/sprites/spr_cloak_image_1/spr_cloak_image_1.yy index 3134e9982f..90a1f8eb24 100644 --- a/sprites/spr_cloak_image_1/spr_cloak_image_1.yy +++ b/sprites/spr_cloak_image_1/spr_cloak_image_1.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_cloak_image_1", "bboxMode":0, "bbox_bottom":194, @@ -12,9 +12,9 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"86655c3b-40c5-4949-ad48-c902d6771b28","name":"86655c3b-40c5-4949-ad48-c902d6771b28","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"d6e5b376-dfdd-447d-8e4c-6275371cf2f3","name":"d6e5b376-dfdd-447d-8e4c-6275371cf2f3","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"383ca815-1d27-4a01-b20c-0c72c2beab37","name":"383ca815-1d27-4a01-b20c-0c72c2beab37","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"86655c3b-40c5-4949-ad48-c902d6771b28","name":"86655c3b-40c5-4949-ad48-c902d6771b28","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"d6e5b376-dfdd-447d-8e4c-6275371cf2f3","name":"d6e5b376-dfdd-447d-8e4c-6275371cf2f3","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"383ca815-1d27-4a01-b20c-0c72c2beab37","name":"383ca815-1d27-4a01-b20c-0c72c2beab37","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -70,15 +70,9 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"86655c3b-40c5-4949-ad48-c902d6771b28","path":"sprites/spr_cloak_image_1/spr_cloak_image_1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"53deed36-8fc2-4957-aa50-c5a14669fa21","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"d6e5b376-dfdd-447d-8e4c-6275371cf2f3","path":"sprites/spr_cloak_image_1/spr_cloak_image_1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"05edf084-44f9-43af-8927-dc2cce5941a3","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"383ca815-1d27-4a01-b20c-0c72c2beab37","path":"sprites/spr_cloak_image_1/spr_cloak_image_1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"8fd4e74c-80c9-49f1-92ad-c6977e052f9b","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"86655c3b-40c5-4949-ad48-c902d6771b28","path":"sprites/spr_cloak_image_1/spr_cloak_image_1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"53deed36-8fc2-4957-aa50-c5a14669fa21","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"d6e5b376-dfdd-447d-8e4c-6275371cf2f3","path":"sprites/spr_cloak_image_1/spr_cloak_image_1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"05edf084-44f9-43af-8927-dc2cce5941a3","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"383ca815-1d27-4a01-b20c-0c72c2beab37","path":"sprites/spr_cloak_image_1/spr_cloak_image_1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"8fd4e74c-80c9-49f1-92ad-c6977e052f9b","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_cloak_scale/spr_cloak_scale.yy b/sprites/spr_cloak_scale/spr_cloak_scale.yy index bf8d28bc7a..9c6072e0fc 100644 --- a/sprites/spr_cloak_scale/spr_cloak_scale.yy +++ b/sprites/spr_cloak_scale/spr_cloak_scale.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_cloak_scale", "bboxMode":0, "bbox_bottom":212, @@ -12,8 +12,8 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"b6ba8600-fb6b-4fa9-abc7-bdc2311eb79e","name":"b6ba8600-fb6b-4fa9-abc7-bdc2311eb79e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"a25ab997-78d1-493d-8c42-60f772947082","name":"a25ab997-78d1-493d-8c42-60f772947082","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"b6ba8600-fb6b-4fa9-abc7-bdc2311eb79e","name":"b6ba8600-fb6b-4fa9-abc7-bdc2311eb79e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"a25ab997-78d1-493d-8c42-60f772947082","name":"a25ab997-78d1-493d-8c42-60f772947082","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -69,12 +69,8 @@ "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_cloak_scale/spr_cloak_scale.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"44d03fd0-264d-4713-9b5e-2a0894c5b4dd","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"a25ab997-78d1-493d-8c42-60f772947082","path":"sprites/spr_cloak_scale/spr_cloak_scale.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"993b3549-1db6-49f3-ab15-bca44e2ab03a","IsCreationKey":false,"Key":1.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_cloak_scale/spr_cloak_scale.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"44d03fd0-264d-4713-9b5e-2a0894c5b4dd","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"a25ab997-78d1-493d-8c42-60f772947082","path":"sprites/spr_cloak_scale/spr_cloak_scale.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"993b3549-1db6-49f3-ab15-bca44e2ab03a","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_cloth_tabbard/spr_cloth_tabbard.yy b/sprites/spr_cloth_tabbard/spr_cloth_tabbard.yy index 7cb028bf21..9c2ac9ea49 100644 --- a/sprites/spr_cloth_tabbard/spr_cloth_tabbard.yy +++ b/sprites/spr_cloth_tabbard/spr_cloth_tabbard.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_cloth_tabbard", "bboxMode":0, "bbox_bottom":230, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"a4969c4d-bb32-4b93-8aed-93bd969a4101","name":"a4969c4d-bb32-4b93-8aed-93bd969a4101","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"a4969c4d-bb32-4b93-8aed-93bd969a4101","name":"a4969c4d-bb32-4b93-8aed-93bd969a4101","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "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_clothing_colors/spr_clothing_colors.yy b/sprites/spr_clothing_colors/spr_clothing_colors.yy index 0032082988..9ff70c13ef 100644 --- a/sprites/spr_clothing_colors/spr_clothing_colors.yy +++ b/sprites/spr_clothing_colors/spr_clothing_colors.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_clothing_colors", "bboxMode":0, "bbox_bottom":224, @@ -12,12 +12,12 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"6c1ac744-e669-4c51-96ac-bbe8eea6bfae","name":"6c1ac744-e669-4c51-96ac-bbe8eea6bfae","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"d158eb91-f130-4e16-af39-30aac05cb488","name":"d158eb91-f130-4e16-af39-30aac05cb488","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"342e62ff-f04a-428e-a2d9-8233602655b8","name":"342e62ff-f04a-428e-a2d9-8233602655b8","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"e8e914c6-8ce3-4abc-93ca-2420808bf57e","name":"e8e914c6-8ce3-4abc-93ca-2420808bf57e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"28a52a45-1899-4218-b532-41887f1818c7","name":"28a52a45-1899-4218-b532-41887f1818c7","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"772e8755-978f-4592-8a42-f82683e16608","name":"772e8755-978f-4592-8a42-f82683e16608","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"6c1ac744-e669-4c51-96ac-bbe8eea6bfae","name":"6c1ac744-e669-4c51-96ac-bbe8eea6bfae","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"d158eb91-f130-4e16-af39-30aac05cb488","name":"d158eb91-f130-4e16-af39-30aac05cb488","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"342e62ff-f04a-428e-a2d9-8233602655b8","name":"342e62ff-f04a-428e-a2d9-8233602655b8","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"e8e914c6-8ce3-4abc-93ca-2420808bf57e","name":"e8e914c6-8ce3-4abc-93ca-2420808bf57e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"28a52a45-1899-4218-b532-41887f1818c7","name":"28a52a45-1899-4218-b532-41887f1818c7","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"772e8755-978f-4592-8a42-f82683e16608","name":"772e8755-978f-4592-8a42-f82683e16608","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -73,24 +73,12 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"6c1ac744-e669-4c51-96ac-bbe8eea6bfae","path":"sprites/spr_clothing_colors/spr_clothing_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"e07b4d3e-0669-4928-a562-47c40ba77db5","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"d158eb91-f130-4e16-af39-30aac05cb488","path":"sprites/spr_clothing_colors/spr_clothing_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"bddf3682-9e00-425e-8774-4ea49b9c8ab3","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"342e62ff-f04a-428e-a2d9-8233602655b8","path":"sprites/spr_clothing_colors/spr_clothing_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"6b0a6723-f6e6-4e94-959c-05577505a332","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"e8e914c6-8ce3-4abc-93ca-2420808bf57e","path":"sprites/spr_clothing_colors/spr_clothing_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"edf7c680-8f06-4e1f-afdc-983d063e1ac7","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"28a52a45-1899-4218-b532-41887f1818c7","path":"sprites/spr_clothing_colors/spr_clothing_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"d828a12b-e196-4f3b-bbfa-4920c47c97cc","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"772e8755-978f-4592-8a42-f82683e16608","path":"sprites/spr_clothing_colors/spr_clothing_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"7b46c4c7-8187-4341-b1df-384a0c33c2b5","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"6c1ac744-e669-4c51-96ac-bbe8eea6bfae","path":"sprites/spr_clothing_colors/spr_clothing_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"e07b4d3e-0669-4928-a562-47c40ba77db5","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"d158eb91-f130-4e16-af39-30aac05cb488","path":"sprites/spr_clothing_colors/spr_clothing_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"bddf3682-9e00-425e-8774-4ea49b9c8ab3","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"342e62ff-f04a-428e-a2d9-8233602655b8","path":"sprites/spr_clothing_colors/spr_clothing_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"6b0a6723-f6e6-4e94-959c-05577505a332","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"e8e914c6-8ce3-4abc-93ca-2420808bf57e","path":"sprites/spr_clothing_colors/spr_clothing_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"edf7c680-8f06-4e1f-afdc-983d063e1ac7","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"28a52a45-1899-4218-b532-41887f1818c7","path":"sprites/spr_clothing_colors/spr_clothing_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"d828a12b-e196-4f3b-bbfa-4920c47c97cc","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"772e8755-978f-4592-8a42-f82683e16608","path":"sprites/spr_clothing_colors/spr_clothing_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"7b46c4c7-8187-4341-b1df-384a0c33c2b5","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_cm_specialty/spr_cm_specialty.yy b/sprites/spr_cm_specialty/spr_cm_specialty.yy index e48463382e..364bf12cad 100644 --- a/sprites/spr_cm_specialty/spr_cm_specialty.yy +++ b/sprites/spr_cm_specialty/spr_cm_specialty.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_cm_specialty", "bboxMode":0, "bbox_bottom":0, diff --git a/sprites/spr_cog_pinion/spr_cog_pinion.yy b/sprites/spr_cog_pinion/spr_cog_pinion.yy index 28990eaf2d..f744442557 100644 --- a/sprites/spr_cog_pinion/spr_cog_pinion.yy +++ b/sprites/spr_cog_pinion/spr_cog_pinion.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_cog_pinion", "bboxMode":0, "bbox_bottom":60, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"dbf9f8bc-8396-410a-a23d-6e209fe61c76","name":"dbf9f8bc-8396-410a-a23d-6e209fe61c76","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"dbf9f8bc-8396-410a-a23d-6e209fe61c76","name":"dbf9f8bc-8396-410a-a23d-6e209fe61c76","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"dbf9f8bc-8396-410a-a23d-6e209fe61c76","path":"sprites/spr_cog_pinion/spr_cog_pinion.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"b66f1b8b-ed80-487e-a66d-21dcb51e53e2","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"dbf9f8bc-8396-410a-a23d-6e209fe61c76","path":"sprites/spr_cog_pinion/spr_cog_pinion.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"b66f1b8b-ed80-487e-a66d-21dcb51e53e2","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_company_title/spr_company_title.yy b/sprites/spr_company_title/spr_company_title.yy index b9f24f95c9..18e967eaff 100644 --- a/sprites/spr_company_title/spr_company_title.yy +++ b/sprites/spr_company_title/spr_company_title.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_company_title", "bboxMode":0, "bbox_bottom":3, @@ -12,11 +12,11 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"96f4818d-2abf-4dbb-9091-dda8c16f8d91","name":"96f4818d-2abf-4dbb-9091-dda8c16f8d91","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"78cdfbff-e2ab-4284-a510-7bd46996352c","name":"78cdfbff-e2ab-4284-a510-7bd46996352c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"0c92f00f-18d5-4e3e-95a5-d2e445da36ff","name":"0c92f00f-18d5-4e3e-95a5-d2e445da36ff","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"bb1570f7-dfce-415e-a264-421464e1321a","name":"bb1570f7-dfce-415e-a264-421464e1321a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"40f0521b-75e7-4e26-b6c8-de7784fefbbc","name":"40f0521b-75e7-4e26-b6c8-de7784fefbbc","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"96f4818d-2abf-4dbb-9091-dda8c16f8d91","name":"96f4818d-2abf-4dbb-9091-dda8c16f8d91","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"78cdfbff-e2ab-4284-a510-7bd46996352c","name":"78cdfbff-e2ab-4284-a510-7bd46996352c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"0c92f00f-18d5-4e3e-95a5-d2e445da36ff","name":"0c92f00f-18d5-4e3e-95a5-d2e445da36ff","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"bb1570f7-dfce-415e-a264-421464e1321a","name":"bb1570f7-dfce-415e-a264-421464e1321a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"40f0521b-75e7-4e26-b6c8-de7784fefbbc","name":"40f0521b-75e7-4e26-b6c8-de7784fefbbc","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -72,21 +72,11 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"96f4818d-2abf-4dbb-9091-dda8c16f8d91","path":"sprites/spr_company_title/spr_company_title.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"348ed9fe-7199-4bdd-b0ae-c09c62700796","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"78cdfbff-e2ab-4284-a510-7bd46996352c","path":"sprites/spr_company_title/spr_company_title.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"3de06e82-26f1-4b66-bcf9-3b1743d5a100","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"0c92f00f-18d5-4e3e-95a5-d2e445da36ff","path":"sprites/spr_company_title/spr_company_title.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"80742708-10df-4876-99f2-c603ebc8b4f3","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"bb1570f7-dfce-415e-a264-421464e1321a","path":"sprites/spr_company_title/spr_company_title.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"dcfe9a46-7af9-443f-898b-0a1cadf8d2ea","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"40f0521b-75e7-4e26-b6c8-de7784fefbbc","path":"sprites/spr_company_title/spr_company_title.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"344993fa-4ffe-4352-851f-29ca1116afaf","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"96f4818d-2abf-4dbb-9091-dda8c16f8d91","path":"sprites/spr_company_title/spr_company_title.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"348ed9fe-7199-4bdd-b0ae-c09c62700796","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"78cdfbff-e2ab-4284-a510-7bd46996352c","path":"sprites/spr_company_title/spr_company_title.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"3de06e82-26f1-4b66-bcf9-3b1743d5a100","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"0c92f00f-18d5-4e3e-95a5-d2e445da36ff","path":"sprites/spr_company_title/spr_company_title.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"80742708-10df-4876-99f2-c603ebc8b4f3","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"bb1570f7-dfce-415e-a264-421464e1321a","path":"sprites/spr_company_title/spr_company_title.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"dcfe9a46-7af9-443f-898b-0a1cadf8d2ea","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"40f0521b-75e7-4e26-b6c8-de7784fefbbc","path":"sprites/spr_company_title/spr_company_title.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"344993fa-4ffe-4352-851f-29ca1116afaf","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_constitution_icon/spr_constitution_icon.yy b/sprites/spr_constitution_icon/spr_constitution_icon.yy index ee704700f7..a0c67818de 100644 --- a/sprites/spr_constitution_icon/spr_constitution_icon.yy +++ b/sprites/spr_constitution_icon/spr_constitution_icon.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_constitution_icon", "bboxMode":0, "bbox_bottom":56, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"2ede6373-6324-4bbd-80e1-d93621f9e4fa","name":"2ede6373-6324-4bbd-80e1-d93621f9e4fa","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"2ede6373-6324-4bbd-80e1-d93621f9e4fa","name":"2ede6373-6324-4bbd-80e1-d93621f9e4fa","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"2ede6373-6324-4bbd-80e1-d93621f9e4fa","path":"sprites/spr_constitution_icon/spr_constitution_icon.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"1193a06e-7496-4d5b-a172-a3b16075b9a3","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"2ede6373-6324-4bbd-80e1-d93621f9e4fa","path":"sprites/spr_constitution_icon/spr_constitution_icon.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"1193a06e-7496-4d5b-a172-a3b16075b9a3","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_craftworld/spr_craftworld.yy b/sprites/spr_craftworld/spr_craftworld.yy index 9b36786628..01c5f46600 100644 --- a/sprites/spr_craftworld/spr_craftworld.yy +++ b/sprites/spr_craftworld/spr_craftworld.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_craftworld", "bboxMode":0, "bbox_bottom":26, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"83cd9b31-9641-44c6-b4cb-497f9df594f3","name":"83cd9b31-9641-44c6-b4cb-497f9df594f3","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"83cd9b31-9641-44c6-b4cb-497f9df594f3","name":"83cd9b31-9641-44c6-b4cb-497f9df594f3","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"83cd9b31-9641-44c6-b4cb-497f9df594f3","path":"sprites/spr_craftworld/spr_craftworld.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"9944b635-d444-4e75-8014-13b87418629f","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"83cd9b31-9641-44c6-b4cb-497f9df594f3","path":"sprites/spr_craftworld/spr_craftworld.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"9944b635-d444-4e75-8014-13b87418629f","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_arrow/spr_creation_arrow.yy b/sprites/spr_creation_arrow/spr_creation_arrow.yy index 28bdb853c6..0b73d14549 100644 --- a/sprites/spr_creation_arrow/spr_creation_arrow.yy +++ b/sprites/spr_creation_arrow/spr_creation_arrow.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_creation_arrow", "bboxMode":0, "bbox_bottom":63, @@ -12,11 +12,11 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"a9ecbaa2-edb3-4c4d-ba86-a8e3e96db360","name":"a9ecbaa2-edb3-4c4d-ba86-a8e3e96db360","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"1bd104b8-0ce5-4184-8054-9e99c49d194c","name":"1bd104b8-0ce5-4184-8054-9e99c49d194c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"42c6f263-877a-4591-beb7-d81925f4e4ed","name":"42c6f263-877a-4591-beb7-d81925f4e4ed","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"8ebf4f8f-adac-4ef3-ad25-9775343b2245","name":"8ebf4f8f-adac-4ef3-ad25-9775343b2245","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"39637d47-757f-4595-84d8-5beaa78f7c74","name":"39637d47-757f-4595-84d8-5beaa78f7c74","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"a9ecbaa2-edb3-4c4d-ba86-a8e3e96db360","name":"a9ecbaa2-edb3-4c4d-ba86-a8e3e96db360","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"1bd104b8-0ce5-4184-8054-9e99c49d194c","name":"1bd104b8-0ce5-4184-8054-9e99c49d194c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"42c6f263-877a-4591-beb7-d81925f4e4ed","name":"42c6f263-877a-4591-beb7-d81925f4e4ed","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"8ebf4f8f-adac-4ef3-ad25-9775343b2245","name":"8ebf4f8f-adac-4ef3-ad25-9775343b2245","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"39637d47-757f-4595-84d8-5beaa78f7c74","name":"39637d47-757f-4595-84d8-5beaa78f7c74","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -72,21 +72,11 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"a9ecbaa2-edb3-4c4d-ba86-a8e3e96db360","path":"sprites/spr_creation_arrow/spr_creation_arrow.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"aff50e4e-5c01-4754-8871-c150741bb49a","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"1bd104b8-0ce5-4184-8054-9e99c49d194c","path":"sprites/spr_creation_arrow/spr_creation_arrow.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"23464b9c-d1f0-454d-84da-d8e4cd32faf6","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"42c6f263-877a-4591-beb7-d81925f4e4ed","path":"sprites/spr_creation_arrow/spr_creation_arrow.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"58c19629-922a-40bf-a3f8-3d971641ebc3","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"8ebf4f8f-adac-4ef3-ad25-9775343b2245","path":"sprites/spr_creation_arrow/spr_creation_arrow.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"7eaa6082-50a0-4252-9d17-3267ce434f68","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"39637d47-757f-4595-84d8-5beaa78f7c74","path":"sprites/spr_creation_arrow/spr_creation_arrow.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"f0044680-b4da-481c-af80-7eeb1010fe14","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"a9ecbaa2-edb3-4c4d-ba86-a8e3e96db360","path":"sprites/spr_creation_arrow/spr_creation_arrow.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"aff50e4e-5c01-4754-8871-c150741bb49a","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"1bd104b8-0ce5-4184-8054-9e99c49d194c","path":"sprites/spr_creation_arrow/spr_creation_arrow.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"23464b9c-d1f0-454d-84da-d8e4cd32faf6","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"42c6f263-877a-4591-beb7-d81925f4e4ed","path":"sprites/spr_creation_arrow/spr_creation_arrow.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"58c19629-922a-40bf-a3f8-3d971641ebc3","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"8ebf4f8f-adac-4ef3-ad25-9775343b2245","path":"sprites/spr_creation_arrow/spr_creation_arrow.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"7eaa6082-50a0-4252-9d17-3267ce434f68","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"39637d47-757f-4595-84d8-5beaa78f7c74","path":"sprites/spr_creation_arrow/spr_creation_arrow.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"f0044680-b4da-481c-af80-7eeb1010fe14","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":{ diff --git a/sprites/spr_creation_check/spr_creation_check.yy b/sprites/spr_creation_check/spr_creation_check.yy index afdd034a24..2440c8b801 100644 --- a/sprites/spr_creation_check/spr_creation_check.yy +++ b/sprites/spr_creation_check/spr_creation_check.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_creation_check", "bboxMode":0, "bbox_bottom":27, @@ -12,10 +12,10 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"9d98e5fc-a42f-46f5-b533-fdf7b0b23a28","name":"9d98e5fc-a42f-46f5-b533-fdf7b0b23a28","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"2c23faa1-9d33-420c-abee-14a54a948dbf","name":"2c23faa1-9d33-420c-abee-14a54a948dbf","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"ca7f8ca0-feb4-496b-8a91-057f2a1bfc90","name":"ca7f8ca0-feb4-496b-8a91-057f2a1bfc90","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"254f0303-cebd-476e-b05b-d23837a0eb42","name":"254f0303-cebd-476e-b05b-d23837a0eb42","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"9d98e5fc-a42f-46f5-b533-fdf7b0b23a28","name":"9d98e5fc-a42f-46f5-b533-fdf7b0b23a28","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"2c23faa1-9d33-420c-abee-14a54a948dbf","name":"2c23faa1-9d33-420c-abee-14a54a948dbf","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"ca7f8ca0-feb4-496b-8a91-057f2a1bfc90","name":"ca7f8ca0-feb4-496b-8a91-057f2a1bfc90","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"254f0303-cebd-476e-b05b-d23837a0eb42","name":"254f0303-cebd-476e-b05b-d23837a0eb42","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -71,18 +71,10 @@ "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 4a609c8c64..46c72559b7 100644 --- a/sprites/spr_creation_existing/spr_creation_existing.yy +++ b/sprites/spr_creation_existing/spr_creation_existing.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_creation_existing", "bboxMode":0, "bbox_bottom":0, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"a4702d8d-c480-4c59-a45d-afd7fa7a086d","name":"a4702d8d-c480-4c59-a45d-afd7fa7a086d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"a4702d8d-c480-4c59-a45d-afd7fa7a086d","name":"a4702d8d-c480-4c59-a45d-afd7fa7a086d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "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 fb8bb756dd..40e9498613 100644 --- a/sprites/spr_creation_founding/spr_creation_founding.yy +++ b/sprites/spr_creation_founding/spr_creation_founding.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_creation_founding", "bboxMode":0, "bbox_bottom":0, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"469027c1-a05e-49c8-975f-f88b2b836a4c","name":"469027c1-a05e-49c8-975f-f88b2b836a4c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"469027c1-a05e-49c8-975f-f88b2b836a4c","name":"469027c1-a05e-49c8-975f-f88b2b836a4c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "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_icon/spr_creation_icon.yy b/sprites/spr_creation_icon/spr_creation_icon.yy index 2596154da5..f7427da1c3 100644 --- a/sprites/spr_creation_icon/spr_creation_icon.yy +++ b/sprites/spr_creation_icon/spr_creation_icon.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_creation_icon", "bboxMode":0, "bbox_bottom":47, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"9585cc92-d70a-45fd-bc25-8c9a240671d4","name":"9585cc92-d70a-45fd-bc25-8c9a240671d4","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"9585cc92-d70a-45fd-bc25-8c9a240671d4","name":"9585cc92-d70a-45fd-bc25-8c9a240671d4","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -70,9 +70,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"9585cc92-d70a-45fd-bc25-8c9a240671d4","path":"sprites/spr_creation_icon/spr_creation_icon.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"2e242762-9b45-4c27-89d9-881110ad528e","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"9585cc92-d70a-45fd-bc25-8c9a240671d4","path":"sprites/spr_creation_icon/spr_creation_icon.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"2e242762-9b45-4c27-89d9-881110ad528e","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_nosplash/spr_creation_nosplash.yy b/sprites/spr_creation_nosplash/spr_creation_nosplash.yy index 353cc1a331..55025f904f 100644 --- a/sprites/spr_creation_nosplash/spr_creation_nosplash.yy +++ b/sprites/spr_creation_nosplash/spr_creation_nosplash.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_creation_nosplash", "bboxMode":0, "bbox_bottom":0, diff --git a/sprites/spr_creation_other/spr_creation_other.yy b/sprites/spr_creation_other/spr_creation_other.yy index 20ca4c2e9b..209bbc7828 100644 --- a/sprites/spr_creation_other/spr_creation_other.yy +++ b/sprites/spr_creation_other/spr_creation_other.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_creation_other", "bboxMode":0, "bbox_bottom":0, diff --git a/sprites/spr_creation_slate/spr_creation_slate.yy b/sprites/spr_creation_slate/spr_creation_slate.yy index 3abb41bb38..1de0a3fe68 100644 --- a/sprites/spr_creation_slate/spr_creation_slate.yy +++ b/sprites/spr_creation_slate/spr_creation_slate.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_creation_slate", "bboxMode":0, "bbox_bottom":0, diff --git a/sprites/spr_credits_bg/spr_credits_bg.yy b/sprites/spr_credits_bg/spr_credits_bg.yy index dcab269967..bc9f0baea7 100644 --- a/sprites/spr_credits_bg/spr_credits_bg.yy +++ b/sprites/spr_credits_bg/spr_credits_bg.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_credits_bg", "bboxMode":0, "bbox_bottom":643, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"bcc7bf7f-47a7-4f62-90a0-a1941b3838da","name":"bcc7bf7f-47a7-4f62-90a0-a1941b3838da","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"bcc7bf7f-47a7-4f62-90a0-a1941b3838da","name":"bcc7bf7f-47a7-4f62-90a0-a1941b3838da","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"bcc7bf7f-47a7-4f62-90a0-a1941b3838da","path":"sprites/spr_credits_bg/spr_credits_bg.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"61b3a396-5457-4d32-9cd2-2909f55558cf","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"bcc7bf7f-47a7-4f62-90a0-a1941b3838da","path":"sprites/spr_credits_bg/spr_credits_bg.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"61b3a396-5457-4d32-9cd2-2909f55558cf","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_crusader/spr_crusader.yy b/sprites/spr_crusader/spr_crusader.yy index 889a668ca3..59fb6c58e9 100644 --- a/sprites/spr_crusader/spr_crusader.yy +++ b/sprites/spr_crusader/spr_crusader.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_crusader", "bboxMode":0, "bbox_bottom":231, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"4aa0655a-ad7e-41fb-acc5-995c3f821926","name":"4aa0655a-ad7e-41fb-acc5-995c3f821926","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"4aa0655a-ad7e-41fb-acc5-995c3f821926","name":"4aa0655a-ad7e-41fb-acc5-995c3f821926","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -70,9 +70,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"4aa0655a-ad7e-41fb-acc5-995c3f821926","path":"sprites/spr_crusader/spr_crusader.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"5f31e49a-6006-4538-8379-bb4041c1a227","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"4aa0655a-ad7e-41fb-acc5-995c3f821926","path":"sprites/spr_crusader/spr_crusader.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"5f31e49a-6006-4538-8379-bb4041c1a227","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_crux_on_chain/spr_crux_on_chain.yy b/sprites/spr_crux_on_chain/spr_crux_on_chain.yy index 66d4d2b3d8..04bd976d95 100644 --- a/sprites/spr_crux_on_chain/spr_crux_on_chain.yy +++ b/sprites/spr_crux_on_chain/spr_crux_on_chain.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_crux_on_chain", "bboxMode":0, "bbox_bottom":35, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"db6935ae-cfa8-4c74-b21c-6a3fc6b9ec5d","name":"db6935ae-cfa8-4c74-b21c-6a3fc6b9ec5d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"db6935ae-cfa8-4c74-b21c-6a3fc6b9ec5d","name":"db6935ae-cfa8-4c74-b21c-6a3fc6b9ec5d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"db6935ae-cfa8-4c74-b21c-6a3fc6b9ec5d","path":"sprites/spr_crux_on_chain/spr_crux_on_chain.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"eca151ad-2626-4748-b179-608856db3925","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"db6935ae-cfa8-4c74-b21c-6a3fc6b9ec5d","path":"sprites/spr_crux_on_chain/spr_crux_on_chain.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"eca151ad-2626-4748-b179-608856db3925","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_cthonian_tabbard/spr_cthonian_tabbard.yy b/sprites/spr_cthonian_tabbard/spr_cthonian_tabbard.yy index d7840ee2df..827bcebff8 100644 --- a/sprites/spr_cthonian_tabbard/spr_cthonian_tabbard.yy +++ b/sprites/spr_cthonian_tabbard/spr_cthonian_tabbard.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_cthonian_tabbard", "bboxMode":0, "bbox_bottom":169, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"e4a11296-f2eb-4f90-9581-bbca8ab08d78","name":"e4a11296-f2eb-4f90-9581-bbca8ab08d78","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"e4a11296-f2eb-4f90-9581-bbca8ab08d78","name":"e4a11296-f2eb-4f90-9581-bbca8ab08d78","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -70,9 +70,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"e4a11296-f2eb-4f90-9581-bbca8ab08d78","path":"sprites/spr_cthonian_tabbard/spr_cthonian_tabbard.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"5d0ab5f8-6b38-401e-ab12-57064b78101a","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"e4a11296-f2eb-4f90-9581-bbca8ab08d78","path":"sprites/spr_cthonian_tabbard/spr_cthonian_tabbard.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"5d0ab5f8-6b38-401e-ab12-57064b78101a","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_cursor/spr_cursor.yy b/sprites/spr_cursor/spr_cursor.yy index ab459a78e6..5f3581a3ca 100644 --- a/sprites/spr_cursor/spr_cursor.yy +++ b/sprites/spr_cursor/spr_cursor.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_cursor", "bboxMode":0, "bbox_bottom":31, @@ -12,11 +12,11 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"93ff084c-a13e-45b0-95ec-cc841cc02089","name":"93ff084c-a13e-45b0-95ec-cc841cc02089","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"f02125fa-0440-4c76-bafb-a3e04a5d13e7","name":"f02125fa-0440-4c76-bafb-a3e04a5d13e7","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"d4c07a38-bb56-4dd9-8b02-741295614559","name":"d4c07a38-bb56-4dd9-8b02-741295614559","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"25b1bbac-cb87-44b3-9e9a-cf087f58b5fb","name":"25b1bbac-cb87-44b3-9e9a-cf087f58b5fb","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"437349a9-fdd1-438f-bfe1-5c0b7137503f","name":"437349a9-fdd1-438f-bfe1-5c0b7137503f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"93ff084c-a13e-45b0-95ec-cc841cc02089","name":"93ff084c-a13e-45b0-95ec-cc841cc02089","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"f02125fa-0440-4c76-bafb-a3e04a5d13e7","name":"f02125fa-0440-4c76-bafb-a3e04a5d13e7","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"d4c07a38-bb56-4dd9-8b02-741295614559","name":"d4c07a38-bb56-4dd9-8b02-741295614559","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"25b1bbac-cb87-44b3-9e9a-cf087f58b5fb","name":"25b1bbac-cb87-44b3-9e9a-cf087f58b5fb","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"437349a9-fdd1-438f-bfe1-5c0b7137503f","name":"437349a9-fdd1-438f-bfe1-5c0b7137503f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -72,21 +72,11 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"93ff084c-a13e-45b0-95ec-cc841cc02089","path":"sprites/spr_cursor/spr_cursor.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"15172d76-de0a-4ef8-9857-204bcfd3b55c","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"f02125fa-0440-4c76-bafb-a3e04a5d13e7","path":"sprites/spr_cursor/spr_cursor.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"1f57a812-e42e-40e1-a370-4a5fccb5c0e9","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"d4c07a38-bb56-4dd9-8b02-741295614559","path":"sprites/spr_cursor/spr_cursor.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"e9f897f8-70c3-4c81-807d-2f8a3ee5f62b","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"25b1bbac-cb87-44b3-9e9a-cf087f58b5fb","path":"sprites/spr_cursor/spr_cursor.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"64b047e5-e4ab-4543-a571-c654df47458a","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"437349a9-fdd1-438f-bfe1-5c0b7137503f","path":"sprites/spr_cursor/spr_cursor.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"df5149c8-7378-4ea3-b967-b84d714be29d","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"93ff084c-a13e-45b0-95ec-cc841cc02089","path":"sprites/spr_cursor/spr_cursor.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"15172d76-de0a-4ef8-9857-204bcfd3b55c","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"f02125fa-0440-4c76-bafb-a3e04a5d13e7","path":"sprites/spr_cursor/spr_cursor.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"1f57a812-e42e-40e1-a370-4a5fccb5c0e9","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"d4c07a38-bb56-4dd9-8b02-741295614559","path":"sprites/spr_cursor/spr_cursor.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"e9f897f8-70c3-4c81-807d-2f8a3ee5f62b","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"25b1bbac-cb87-44b3-9e9a-cf087f58b5fb","path":"sprites/spr_cursor/spr_cursor.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"64b047e5-e4ab-4543-a571-c654df47458a","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"437349a9-fdd1-438f-bfe1-5c0b7137503f","path":"sprites/spr_cursor/spr_cursor.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"df5149c8-7378-4ea3-b967-b84d714be29d","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":{ diff --git a/sprites/spr_da_backpack/spr_da_backpack.yy b/sprites/spr_da_backpack/spr_da_backpack.yy index c513b34731..603b2003dd 100644 --- a/sprites/spr_da_backpack/spr_da_backpack.yy +++ b/sprites/spr_da_backpack/spr_da_backpack.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_da_backpack", "bboxMode":0, "bbox_bottom":131, @@ -12,8 +12,8 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"69575369-6061-47a6-b608-894dae3a1efd","name":"69575369-6061-47a6-b608-894dae3a1efd","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"66d4ebbb-311f-4ed4-9ab0-84b9e5a937ec","name":"66d4ebbb-311f-4ed4-9ab0-84b9e5a937ec","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"69575369-6061-47a6-b608-894dae3a1efd","name":"69575369-6061-47a6-b608-894dae3a1efd","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"66d4ebbb-311f-4ed4-9ab0-84b9e5a937ec","name":"66d4ebbb-311f-4ed4-9ab0-84b9e5a937ec","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -71,12 +71,8 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"69575369-6061-47a6-b608-894dae3a1efd","path":"sprites/spr_da_backpack/spr_da_backpack.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"f0c1f3a8-3480-46bb-990e-e40fbdd3727f","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"66d4ebbb-311f-4ed4-9ab0-84b9e5a937ec","path":"sprites/spr_da_backpack/spr_da_backpack.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"a68ed315-401e-4e7a-9d2a-bd3f16cb1f5b","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"69575369-6061-47a6-b608-894dae3a1efd","path":"sprites/spr_da_backpack/spr_da_backpack.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"f0c1f3a8-3480-46bb-990e-e40fbdd3727f","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"66d4ebbb-311f-4ed4-9ab0-84b9e5a937ec","path":"sprites/spr_da_backpack/spr_da_backpack.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"a68ed315-401e-4e7a-9d2a-bd3f16cb1f5b","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_da_chaplain/spr_da_chaplain.yy b/sprites/spr_da_chaplain/spr_da_chaplain.yy index 5986824bc5..2641ff734a 100644 --- a/sprites/spr_da_chaplain/spr_da_chaplain.yy +++ b/sprites/spr_da_chaplain/spr_da_chaplain.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_da_chaplain", "bboxMode":0, "bbox_bottom":271, @@ -12,8 +12,8 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"0449b92b-f3fb-4a20-b797-758f6f8aaa47","name":"0449b92b-f3fb-4a20-b797-758f6f8aaa47","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"e272da8e-cbd6-4de2-b426-7882050bc848","name":"e272da8e-cbd6-4de2-b426-7882050bc848","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"0449b92b-f3fb-4a20-b797-758f6f8aaa47","name":"0449b92b-f3fb-4a20-b797-758f6f8aaa47","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"e272da8e-cbd6-4de2-b426-7882050bc848","name":"e272da8e-cbd6-4de2-b426-7882050bc848","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -69,12 +69,8 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"0449b92b-f3fb-4a20-b797-758f6f8aaa47","path":"sprites/spr_da_chaplain/spr_da_chaplain.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"4d688a83-8bf0-4015-b759-75440d2fbe17","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"e272da8e-cbd6-4de2-b426-7882050bc848","path":"sprites/spr_da_chaplain/spr_da_chaplain.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"d37791a9-d620-476c-b2b9-21b4fe0725c2","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"0449b92b-f3fb-4a20-b797-758f6f8aaa47","path":"sprites/spr_da_chaplain/spr_da_chaplain.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"4d688a83-8bf0-4015-b759-75440d2fbe17","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"e272da8e-cbd6-4de2-b426-7882050bc848","path":"sprites/spr_da_chaplain/spr_da_chaplain.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"d37791a9-d620-476c-b2b9-21b4fe0725c2","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_da_mk3/spr_da_mk3.yy b/sprites/spr_da_mk3/spr_da_mk3.yy index 0b673521a2..5e6cdab340 100644 --- a/sprites/spr_da_mk3/spr_da_mk3.yy +++ b/sprites/spr_da_mk3/spr_da_mk3.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_da_mk3", "bboxMode":0, "bbox_bottom":271, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"a5ee9f18-d254-483d-a4b5-87d779418f8f","name":"a5ee9f18-d254-483d-a4b5-87d779418f8f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"a5ee9f18-d254-483d-a4b5-87d779418f8f","name":"a5ee9f18-d254-483d-a4b5-87d779418f8f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -70,9 +70,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"a5ee9f18-d254-483d-a4b5-87d779418f8f","path":"sprites/spr_da_mk3/spr_da_mk3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"258893f5-a03a-409e-a6d0-db68c35ccba3","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"a5ee9f18-d254-483d-a4b5-87d779418f8f","path":"sprites/spr_da_mk3/spr_da_mk3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"258893f5-a03a-409e-a6d0-db68c35ccba3","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_da_mk4/spr_da_mk4.yy b/sprites/spr_da_mk4/spr_da_mk4.yy index 80a5d4af12..efbbe4e690 100644 --- a/sprites/spr_da_mk4/spr_da_mk4.yy +++ b/sprites/spr_da_mk4/spr_da_mk4.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_da_mk4", "bboxMode":0, "bbox_bottom":271, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"aaf65e00-98e5-4655-b105-2c4a6c74b695","name":"aaf65e00-98e5-4655-b105-2c4a6c74b695","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"aaf65e00-98e5-4655-b105-2c4a6c74b695","name":"aaf65e00-98e5-4655-b105-2c4a6c74b695","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -70,9 +70,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"aaf65e00-98e5-4655-b105-2c4a6c74b695","path":"sprites/spr_da_mk4/spr_da_mk4.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"b603de2e-b512-4261-b663-ca5d8450e16a","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"aaf65e00-98e5-4655-b105-2c4a6c74b695","path":"sprites/spr_da_mk4/spr_da_mk4.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"b603de2e-b512-4261-b663-ca5d8450e16a","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_da_mk5/spr_da_mk5.yy b/sprites/spr_da_mk5/spr_da_mk5.yy index 0a3cb6ea7e..57f6ee9ef3 100644 --- a/sprites/spr_da_mk5/spr_da_mk5.yy +++ b/sprites/spr_da_mk5/spr_da_mk5.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_da_mk5", "bboxMode":0, "bbox_bottom":271, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"d50f61ee-1ed4-4329-a0d3-20176ffc6a71","name":"d50f61ee-1ed4-4329-a0d3-20176ffc6a71","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"d50f61ee-1ed4-4329-a0d3-20176ffc6a71","name":"d50f61ee-1ed4-4329-a0d3-20176ffc6a71","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -70,9 +70,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"d50f61ee-1ed4-4329-a0d3-20176ffc6a71","path":"sprites/spr_da_mk5/spr_da_mk5.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"9f4649d7-b028-4d37-90e3-df01c9857d86","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"d50f61ee-1ed4-4329-a0d3-20176ffc6a71","path":"sprites/spr_da_mk5/spr_da_mk5.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"9f4649d7-b028-4d37-90e3-df01c9857d86","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_da_mk5_helm_crests/spr_da_mk5_helm_crests.yy b/sprites/spr_da_mk5_helm_crests/spr_da_mk5_helm_crests.yy index 49d26993fc..b3e2143524 100644 --- a/sprites/spr_da_mk5_helm_crests/spr_da_mk5_helm_crests.yy +++ b/sprites/spr_da_mk5_helm_crests/spr_da_mk5_helm_crests.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_da_mk5_helm_crests", "bboxMode":0, "bbox_bottom":68, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"bab500e1-62e8-42cc-afd7-17f69a8aebe4","name":"bab500e1-62e8-42cc-afd7-17f69a8aebe4","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"bab500e1-62e8-42cc-afd7-17f69a8aebe4","name":"bab500e1-62e8-42cc-afd7-17f69a8aebe4","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"bab500e1-62e8-42cc-afd7-17f69a8aebe4","path":"sprites/spr_da_mk5_helm_crests/spr_da_mk5_helm_crests.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"3edacb19-eeca-4612-ae77-05723e4d3649","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"bab500e1-62e8-42cc-afd7-17f69a8aebe4","path":"sprites/spr_da_mk5_helm_crests/spr_da_mk5_helm_crests.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"3edacb19-eeca-4612-ae77-05723e4d3649","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_da_mk6/spr_da_mk6.yy b/sprites/spr_da_mk6/spr_da_mk6.yy index 1cb1b13137..2f56cd3e0c 100644 --- a/sprites/spr_da_mk6/spr_da_mk6.yy +++ b/sprites/spr_da_mk6/spr_da_mk6.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_da_mk6", "bboxMode":0, "bbox_bottom":271, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"22ea0f2e-ee1c-4fe9-9761-120ae1e9021c","name":"22ea0f2e-ee1c-4fe9-9761-120ae1e9021c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"22ea0f2e-ee1c-4fe9-9761-120ae1e9021c","name":"22ea0f2e-ee1c-4fe9-9761-120ae1e9021c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -70,9 +70,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"22ea0f2e-ee1c-4fe9-9761-120ae1e9021c","path":"sprites/spr_da_mk6/spr_da_mk6.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"779c61ca-aaa6-4a5a-9127-3972d4dfdcc4","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"22ea0f2e-ee1c-4fe9-9761-120ae1e9021c","path":"sprites/spr_da_mk6/spr_da_mk6.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"779c61ca-aaa6-4a5a-9127-3972d4dfdcc4","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_da_mk6_helm_crests/spr_da_mk6_helm_crests.yy b/sprites/spr_da_mk6_helm_crests/spr_da_mk6_helm_crests.yy index a82744707e..f87bef02a6 100644 --- a/sprites/spr_da_mk6_helm_crests/spr_da_mk6_helm_crests.yy +++ b/sprites/spr_da_mk6_helm_crests/spr_da_mk6_helm_crests.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_da_mk6_helm_crests", "bboxMode":0, "bbox_bottom":69, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"dcf40f5c-7b10-4fc2-b3e9-b5a4e0e1ed2c","name":"dcf40f5c-7b10-4fc2-b3e9-b5a4e0e1ed2c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"dcf40f5c-7b10-4fc2-b3e9-b5a4e0e1ed2c","name":"dcf40f5c-7b10-4fc2-b3e9-b5a4e0e1ed2c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"dcf40f5c-7b10-4fc2-b3e9-b5a4e0e1ed2c","path":"sprites/spr_da_mk6_helm_crests/spr_da_mk6_helm_crests.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"33ab751e-df92-4816-adb3-fdc6e3711add","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"dcf40f5c-7b10-4fc2-b3e9-b5a4e0e1ed2c","path":"sprites/spr_da_mk6_helm_crests/spr_da_mk6_helm_crests.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"33ab751e-df92-4816-adb3-fdc6e3711add","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_da_mk7/spr_da_mk7.yy b/sprites/spr_da_mk7/spr_da_mk7.yy index 6227af8ae1..08d7a6f381 100644 --- a/sprites/spr_da_mk7/spr_da_mk7.yy +++ b/sprites/spr_da_mk7/spr_da_mk7.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_da_mk7", "bboxMode":0, "bbox_bottom":271, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"0449b92b-f3fb-4a20-b797-758f6f8aaa47","name":"0449b92b-f3fb-4a20-b797-758f6f8aaa47","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"0449b92b-f3fb-4a20-b797-758f6f8aaa47","name":"0449b92b-f3fb-4a20-b797-758f6f8aaa47","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -70,9 +70,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"0449b92b-f3fb-4a20-b797-758f6f8aaa47","path":"sprites/spr_da_mk7/spr_da_mk7.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"4d688a83-8bf0-4015-b759-75440d2fbe17","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"0449b92b-f3fb-4a20-b797-758f6f8aaa47","path":"sprites/spr_da_mk7/spr_da_mk7.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"4d688a83-8bf0-4015-b759-75440d2fbe17","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_da_mk7_helm_crests/spr_da_mk7_helm_crests.yy b/sprites/spr_da_mk7_helm_crests/spr_da_mk7_helm_crests.yy index 2e10747a52..e4c36bbabb 100644 --- a/sprites/spr_da_mk7_helm_crests/spr_da_mk7_helm_crests.yy +++ b/sprites/spr_da_mk7_helm_crests/spr_da_mk7_helm_crests.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_da_mk7_helm_crests", "bboxMode":0, "bbox_bottom":68, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"cda0631b-4b73-4260-b34b-8633c9c58cd7","name":"cda0631b-4b73-4260-b34b-8633c9c58cd7","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"cda0631b-4b73-4260-b34b-8633c9c58cd7","name":"cda0631b-4b73-4260-b34b-8633c9c58cd7","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"cda0631b-4b73-4260-b34b-8633c9c58cd7","path":"sprites/spr_da_mk7_helm_crests/spr_da_mk7_helm_crests.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"8f7805ed-f659-46c4-a40b-416e685b204a","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"cda0631b-4b73-4260-b34b-8633c9c58cd7","path":"sprites/spr_da_mk7_helm_crests/spr_da_mk7_helm_crests.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"8f7805ed-f659-46c4-a40b-416e685b204a","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_da_mk8/spr_da_mk8.yy b/sprites/spr_da_mk8/spr_da_mk8.yy index 2f03a1bb17..426cd47da6 100644 --- a/sprites/spr_da_mk8/spr_da_mk8.yy +++ b/sprites/spr_da_mk8/spr_da_mk8.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_da_mk8", "bboxMode":0, "bbox_bottom":271, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"e438d604-8c59-4821-832d-754219b528c5","name":"e438d604-8c59-4821-832d-754219b528c5","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"e438d604-8c59-4821-832d-754219b528c5","name":"e438d604-8c59-4821-832d-754219b528c5","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -70,9 +70,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"e438d604-8c59-4821-832d-754219b528c5","path":"sprites/spr_da_mk8/spr_da_mk8.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"174c4894-2487-4c8d-b39a-a2eab3b34e5a","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"e438d604-8c59-4821-832d-754219b528c5","path":"sprites/spr_da_mk8/spr_da_mk8.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"174c4894-2487-4c8d-b39a-a2eab3b34e5a","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_da_standard/spr_da_standard.yy b/sprites/spr_da_standard/spr_da_standard.yy index 770b8fc90f..ca42e17d23 100644 --- a/sprites/spr_da_standard/spr_da_standard.yy +++ b/sprites/spr_da_standard/spr_da_standard.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_da_standard", "bboxMode":0, "bbox_bottom":271, @@ -12,10 +12,10 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"5141ac0b-5807-4383-83b9-fc6d775c3aa0","name":"5141ac0b-5807-4383-83b9-fc6d775c3aa0","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"47247ed9-3260-4acb-b4c1-288195f3c451","name":"47247ed9-3260-4acb-b4c1-288195f3c451","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"15710c01-0df5-4aec-b31b-d7d0ac595350","name":"15710c01-0df5-4aec-b31b-d7d0ac595350","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"b9d4fc97-14aa-4e28-b0fb-161752a43977","name":"b9d4fc97-14aa-4e28-b0fb-161752a43977","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"5141ac0b-5807-4383-83b9-fc6d775c3aa0","name":"5141ac0b-5807-4383-83b9-fc6d775c3aa0","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"47247ed9-3260-4acb-b4c1-288195f3c451","name":"47247ed9-3260-4acb-b4c1-288195f3c451","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"15710c01-0df5-4aec-b31b-d7d0ac595350","name":"15710c01-0df5-4aec-b31b-d7d0ac595350","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"b9d4fc97-14aa-4e28-b0fb-161752a43977","name":"b9d4fc97-14aa-4e28-b0fb-161752a43977","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -71,18 +71,10 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"5141ac0b-5807-4383-83b9-fc6d775c3aa0","path":"sprites/spr_da_standard/spr_da_standard.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"fd91b4b6-5224-4a2b-8cb6-037c6f3868b0","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"47247ed9-3260-4acb-b4c1-288195f3c451","path":"sprites/spr_da_standard/spr_da_standard.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"87309639-7313-4526-a3f9-b2946a96e39f","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"15710c01-0df5-4aec-b31b-d7d0ac595350","path":"sprites/spr_da_standard/spr_da_standard.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"513f09b2-ebc0-4278-98c1-3e954efc6dcb","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"b9d4fc97-14aa-4e28-b0fb-161752a43977","path":"sprites/spr_da_standard/spr_da_standard.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"6b5b123e-21a9-4aee-aae7-ea64260270e7","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"5141ac0b-5807-4383-83b9-fc6d775c3aa0","path":"sprites/spr_da_standard/spr_da_standard.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"fd91b4b6-5224-4a2b-8cb6-037c6f3868b0","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"47247ed9-3260-4acb-b4c1-288195f3c451","path":"sprites/spr_da_standard/spr_da_standard.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"87309639-7313-4526-a3f9-b2946a96e39f","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"15710c01-0df5-4aec-b31b-d7d0ac595350","path":"sprites/spr_da_standard/spr_da_standard.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"513f09b2-ebc0-4278-98c1-3e954efc6dcb","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"b9d4fc97-14aa-4e28-b0fb-161752a43977","path":"sprites/spr_da_standard/spr_da_standard.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"6b5b123e-21a9-4aee-aae7-ea64260270e7","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_da_term_honor/spr_da_term_honor.yy b/sprites/spr_da_term_honor/spr_da_term_honor.yy index e5fcc33aad..08b9e9a28c 100644 --- a/sprites/spr_da_term_honor/spr_da_term_honor.yy +++ b/sprites/spr_da_term_honor/spr_da_term_honor.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_da_term_honor", "bboxMode":0, "bbox_bottom":259, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"25fdb7ca-9d7a-4b69-9b1f-7fccbe707fef","name":"25fdb7ca-9d7a-4b69-9b1f-7fccbe707fef","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"25fdb7ca-9d7a-4b69-9b1f-7fccbe707fef","name":"25fdb7ca-9d7a-4b69-9b1f-7fccbe707fef","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -70,9 +70,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"25fdb7ca-9d7a-4b69-9b1f-7fccbe707fef","path":"sprites/spr_da_term_honor/spr_da_term_honor.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"b7e699cf-9a38-4551-a237-e45bd89b7588","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"25fdb7ca-9d7a-4b69-9b1f-7fccbe707fef","path":"sprites/spr_da_term_honor/spr_da_term_honor.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"b7e699cf-9a38-4551-a237-e45bd89b7588","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_dante/spr_dante.yy b/sprites/spr_dante/spr_dante.yy index 3dce631a4f..b383a52e1d 100644 --- a/sprites/spr_dante/spr_dante.yy +++ b/sprites/spr_dante/spr_dante.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_dante", "bboxMode":0, "bbox_bottom":271, @@ -12,8 +12,8 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"0024397e-7810-4cfc-ba22-e2e1fb13fd23","name":"0024397e-7810-4cfc-ba22-e2e1fb13fd23","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"754d992e-880a-48ed-a32f-479e3a508eb4","name":"754d992e-880a-48ed-a32f-479e3a508eb4","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"0024397e-7810-4cfc-ba22-e2e1fb13fd23","name":"0024397e-7810-4cfc-ba22-e2e1fb13fd23","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"754d992e-880a-48ed-a32f-479e3a508eb4","name":"754d992e-880a-48ed-a32f-479e3a508eb4","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -71,12 +71,8 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"0024397e-7810-4cfc-ba22-e2e1fb13fd23","path":"sprites/spr_dante/spr_dante.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"18010e8a-678b-42a7-bfcf-f2e3d9ce1f5e","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"754d992e-880a-48ed-a32f-479e3a508eb4","path":"sprites/spr_dante/spr_dante.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"735be12e-4a1f-4be0-8e8a-72d55dfb055a","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"0024397e-7810-4cfc-ba22-e2e1fb13fd23","path":"sprites/spr_dante/spr_dante.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"18010e8a-678b-42a7-bfcf-f2e3d9ce1f5e","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"754d992e-880a-48ed-a32f-479e3a508eb4","path":"sprites/spr_dante/spr_dante.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"735be12e-4a1f-4be0-8e8a-72d55dfb055a","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_darkstar/spr_darkstar.yy b/sprites/spr_darkstar/spr_darkstar.yy index 87490de944..d368628be8 100644 --- a/sprites/spr_darkstar/spr_darkstar.yy +++ b/sprites/spr_darkstar/spr_darkstar.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_darkstar", "bboxMode":0, "bbox_bottom":23, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"b43d577f-22aa-4ea5-ae5a-10ce05aca294","name":"b43d577f-22aa-4ea5-ae5a-10ce05aca294","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"b43d577f-22aa-4ea5-ae5a-10ce05aca294","name":"b43d577f-22aa-4ea5-ae5a-10ce05aca294","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"b43d577f-22aa-4ea5-ae5a-10ce05aca294","path":"sprites/spr_darkstar/spr_darkstar.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"8421169a-a485-4ec6-8eac-6922bce9d1c4","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"b43d577f-22aa-4ea5-ae5a-10ce05aca294","path":"sprites/spr_darkstar/spr_darkstar.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"8421169a-a485-4ec6-8eac-6922bce9d1c4","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":{ diff --git a/sprites/spr_data_slate/spr_data_slate.yy b/sprites/spr_data_slate/spr_data_slate.yy index e256f5e5f7..88b0c699d7 100644 --- a/sprites/spr_data_slate/spr_data_slate.yy +++ b/sprites/spr_data_slate/spr_data_slate.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_data_slate", "bboxMode":0, "bbox_bottom":859, @@ -12,8 +12,8 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"f80bbb04-8bfb-4be3-b6f4-2914d55a9273","name":"f80bbb04-8bfb-4be3-b6f4-2914d55a9273","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"bd12575d-6936-47ed-b150-8734d5c98140","name":"bd12575d-6936-47ed-b150-8734d5c98140","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"f80bbb04-8bfb-4be3-b6f4-2914d55a9273","name":"f80bbb04-8bfb-4be3-b6f4-2914d55a9273","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"bd12575d-6936-47ed-b150-8734d5c98140","name":"bd12575d-6936-47ed-b150-8734d5c98140","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -69,12 +69,8 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"f80bbb04-8bfb-4be3-b6f4-2914d55a9273","path":"sprites/spr_data_slate/spr_data_slate.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"e0535903-fd8e-4ce5-a8b1-44582bfc84b2","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"bd12575d-6936-47ed-b150-8734d5c98140","path":"sprites/spr_data_slate/spr_data_slate.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"777e253c-d627-4024-b69e-8a0be5b877cf","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"f80bbb04-8bfb-4be3-b6f4-2914d55a9273","path":"sprites/spr_data_slate/spr_data_slate.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"e0535903-fd8e-4ce5-a8b1-44582bfc84b2","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"bd12575d-6936-47ed-b150-8734d5c98140","path":"sprites/spr_data_slate/spr_data_slate.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"777e253c-d627-4024-b69e-8a0be5b877cf","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_data_slate_back/spr_data_slate_back.yy b/sprites/spr_data_slate_back/spr_data_slate_back.yy index 6c66bb7c87..77b93c212a 100644 --- a/sprites/spr_data_slate_back/spr_data_slate_back.yy +++ b/sprites/spr_data_slate_back/spr_data_slate_back.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_data_slate_back", "bboxMode":0, "bbox_bottom":828, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"2e9c4567-f36d-4e75-b4e7-bb07392211bb","name":"2e9c4567-f36d-4e75-b4e7-bb07392211bb","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"2e9c4567-f36d-4e75-b4e7-bb07392211bb","name":"2e9c4567-f36d-4e75-b4e7-bb07392211bb","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"2e9c4567-f36d-4e75-b4e7-bb07392211bb","path":"sprites/spr_data_slate_back/spr_data_slate_back.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"61ca2dde-8655-4e62-b665-c297b142ca5a","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"2e9c4567-f36d-4e75-b4e7-bb07392211bb","path":"sprites/spr_data_slate_back/spr_data_slate_back.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"61ca2dde-8655-4e62-b665-c297b142ca5a","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_data_slate_border/spr_data_slate_border.yy b/sprites/spr_data_slate_border/spr_data_slate_border.yy index 4555e9ecfc..7c7257dbef 100644 --- a/sprites/spr_data_slate_border/spr_data_slate_border.yy +++ b/sprites/spr_data_slate_border/spr_data_slate_border.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_data_slate_border", "bboxMode":0, "bbox_bottom":377, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"88d208ab-efc3-4c8a-a23a-ac1685249362","name":"88d208ab-efc3-4c8a-a23a-ac1685249362","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"88d208ab-efc3-4c8a-a23a-ac1685249362","name":"88d208ab-efc3-4c8a-a23a-ac1685249362","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"88d208ab-efc3-4c8a-a23a-ac1685249362","path":"sprites/spr_data_slate_border/spr_data_slate_border.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"04c63da1-0ff3-4f5f-96b4-c76aef79bd9a","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"88d208ab-efc3-4c8a-a23a-ac1685249362","path":"sprites/spr_data_slate_border/spr_data_slate_border.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"04c63da1-0ff3-4f5f-96b4-c76aef79bd9a","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_death_watch_pauldron/spr_death_watch_pauldron.yy b/sprites/spr_death_watch_pauldron/spr_death_watch_pauldron.yy index bfdb7ee8ac..8b5782b525 100644 --- a/sprites/spr_death_watch_pauldron/spr_death_watch_pauldron.yy +++ b/sprites/spr_death_watch_pauldron/spr_death_watch_pauldron.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_death_watch_pauldron", "bboxMode":0, "bbox_bottom":81, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"8604f68b-a9c9-477e-b0f3-18963a9cc31b","name":"8604f68b-a9c9-477e-b0f3-18963a9cc31b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"8604f68b-a9c9-477e-b0f3-18963a9cc31b","name":"8604f68b-a9c9-477e-b0f3-18963a9cc31b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -70,9 +70,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"8604f68b-a9c9-477e-b0f3-18963a9cc31b","path":"sprites/spr_death_watch_pauldron/spr_death_watch_pauldron.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"c53b218d-2649-41ad-9510-ce18d3e5a066","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"8604f68b-a9c9-477e-b0f3-18963a9cc31b","path":"sprites/spr_death_watch_pauldron/spr_death_watch_pauldron.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"c53b218d-2649-41ad-9510-ce18d3e5a066","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_def_fortress/spr_def_fortress.yy b/sprites/spr_def_fortress/spr_def_fortress.yy index 48e7c7dcc6..b9b4f4e64c 100644 --- a/sprites/spr_def_fortress/spr_def_fortress.yy +++ b/sprites/spr_def_fortress/spr_def_fortress.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_def_fortress", "bboxMode":0, "bbox_bottom":197, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"23245670-12d5-4564-b1cd-3e211f4759ee","name":"23245670-12d5-4564-b1cd-3e211f4759ee","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"23245670-12d5-4564-b1cd-3e211f4759ee","name":"23245670-12d5-4564-b1cd-3e211f4759ee","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -70,9 +70,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"23245670-12d5-4564-b1cd-3e211f4759ee","path":"sprites/spr_def_fortress/spr_def_fortress.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"539bfc66-9e13-47a9-bc6b-04eb863d414c","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"23245670-12d5-4564-b1cd-3e211f4759ee","path":"sprites/spr_def_fortress/spr_def_fortress.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"539bfc66-9e13-47a9-bc6b-04eb863d414c","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_def_mine/spr_def_mine.yy b/sprites/spr_def_mine/spr_def_mine.yy index bad7b25aad..ba09c26879 100644 --- a/sprites/spr_def_mine/spr_def_mine.yy +++ b/sprites/spr_def_mine/spr_def_mine.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_def_mine", "bboxMode":0, "bbox_bottom":25, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"eaf1e60e-46d5-463d-a018-b4e125ff4ea6","name":"eaf1e60e-46d5-463d-a018-b4e125ff4ea6","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"eaf1e60e-46d5-463d-a018-b4e125ff4ea6","name":"eaf1e60e-46d5-463d-a018-b4e125ff4ea6","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"eaf1e60e-46d5-463d-a018-b4e125ff4ea6","path":"sprites/spr_def_mine/spr_def_mine.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"c159f5b5-8ad3-4668-b912-034b5e40ad50","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"eaf1e60e-46d5-463d-a018-b4e125ff4ea6","path":"sprites/spr_def_mine/spr_def_mine.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"c159f5b5-8ad3-4668-b912-034b5e40ad50","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":{ diff --git a/sprites/spr_def_platform/spr_def_platform.yy b/sprites/spr_def_platform/spr_def_platform.yy index f8a78b268f..3c1c6dccbf 100644 --- a/sprites/spr_def_platform/spr_def_platform.yy +++ b/sprites/spr_def_platform/spr_def_platform.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_def_platform", "bboxMode":0, "bbox_bottom":91, @@ -12,8 +12,8 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"bd12ab43-022b-4eab-981d-4a8b8c39c45b","name":"bd12ab43-022b-4eab-981d-4a8b8c39c45b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"14e79ae3-9c81-49ff-a724-5e42de204bcc","name":"14e79ae3-9c81-49ff-a724-5e42de204bcc","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"bd12ab43-022b-4eab-981d-4a8b8c39c45b","name":"bd12ab43-022b-4eab-981d-4a8b8c39c45b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"14e79ae3-9c81-49ff-a724-5e42de204bcc","name":"14e79ae3-9c81-49ff-a724-5e42de204bcc","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -69,12 +69,8 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"bd12ab43-022b-4eab-981d-4a8b8c39c45b","path":"sprites/spr_def_platform/spr_def_platform.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"2dc1bad0-3e40-4590-9fd4-1d94ce34fdbe","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"14e79ae3-9c81-49ff-a724-5e42de204bcc","path":"sprites/spr_def_platform/spr_def_platform.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"f275dea5-fa7f-42a5-9fec-73f2afc1fb5f","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"bd12ab43-022b-4eab-981d-4a8b8c39c45b","path":"sprites/spr_def_platform/spr_def_platform.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"2dc1bad0-3e40-4590-9fd4-1d94ce34fdbe","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"14e79ae3-9c81-49ff-a724-5e42de204bcc","path":"sprites/spr_def_platform/spr_def_platform.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"f275dea5-fa7f-42a5-9fec-73f2afc1fb5f","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":{ diff --git a/sprites/spr_def_silo/spr_def_silo.yy b/sprites/spr_def_silo/spr_def_silo.yy index 2549042c60..bbafa79d6d 100644 --- a/sprites/spr_def_silo/spr_def_silo.yy +++ b/sprites/spr_def_silo/spr_def_silo.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_def_silo", "bboxMode":0, "bbox_bottom":58, @@ -12,8 +12,8 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"7f111d4c-3265-4ac5-a3a9-e3d88ef3e186","name":"7f111d4c-3265-4ac5-a3a9-e3d88ef3e186","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"de1096fe-c23d-43f0-9807-62742c84084b","name":"de1096fe-c23d-43f0-9807-62742c84084b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"7f111d4c-3265-4ac5-a3a9-e3d88ef3e186","name":"7f111d4c-3265-4ac5-a3a9-e3d88ef3e186","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"de1096fe-c23d-43f0-9807-62742c84084b","name":"de1096fe-c23d-43f0-9807-62742c84084b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -69,12 +69,8 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"7f111d4c-3265-4ac5-a3a9-e3d88ef3e186","path":"sprites/spr_def_silo/spr_def_silo.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"f4dfb3ef-0876-40fa-8404-b9ecc154bfea","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"de1096fe-c23d-43f0-9807-62742c84084b","path":"sprites/spr_def_silo/spr_def_silo.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"7a32dcc3-df90-41f1-8031-e6461e6dcb78","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"7f111d4c-3265-4ac5-a3a9-e3d88ef3e186","path":"sprites/spr_def_silo/spr_def_silo.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"f4dfb3ef-0876-40fa-8404-b9ecc154bfea","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"de1096fe-c23d-43f0-9807-62742c84084b","path":"sprites/spr_def_silo/spr_def_silo.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"7a32dcc3-df90-41f1-8031-e6461e6dcb78","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":{ diff --git a/sprites/spr_def_station/spr_def_station.yy b/sprites/spr_def_station/spr_def_station.yy index 073afc8d2e..fef3136c86 100644 --- a/sprites/spr_def_station/spr_def_station.yy +++ b/sprites/spr_def_station/spr_def_station.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_def_station", "bboxMode":0, "bbox_bottom":256, @@ -12,8 +12,8 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"1880d60f-1274-4df4-9de7-dc3d9065b580","name":"1880d60f-1274-4df4-9de7-dc3d9065b580","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"c5c8cdca-ef37-46fc-beed-8f70ac8916c0","name":"c5c8cdca-ef37-46fc-beed-8f70ac8916c0","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"1880d60f-1274-4df4-9de7-dc3d9065b580","name":"1880d60f-1274-4df4-9de7-dc3d9065b580","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"c5c8cdca-ef37-46fc-beed-8f70ac8916c0","name":"c5c8cdca-ef37-46fc-beed-8f70ac8916c0","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -69,12 +69,8 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"1880d60f-1274-4df4-9de7-dc3d9065b580","path":"sprites/spr_def_station/spr_def_station.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"c925c395-3a2a-43b0-829c-8aa0a3297397","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"c5c8cdca-ef37-46fc-beed-8f70ac8916c0","path":"sprites/spr_def_station/spr_def_station.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"8c708788-308a-43bb-bfc6-993ff62d3837","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"1880d60f-1274-4df4-9de7-dc3d9065b580","path":"sprites/spr_def_station/spr_def_station.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"c925c395-3a2a-43b0-829c-8aa0a3297397","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"c5c8cdca-ef37-46fc-beed-8f70ac8916c0","path":"sprites/spr_def_station/spr_def_station.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"8c708788-308a-43bb-bfc6-993ff62d3837","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":{ diff --git a/sprites/spr_defeat/spr_defeat.yy b/sprites/spr_defeat/spr_defeat.yy index 97bea62156..6f09eb5ff5 100644 --- a/sprites/spr_defeat/spr_defeat.yy +++ b/sprites/spr_defeat/spr_defeat.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_defeat", "bboxMode":0, "bbox_bottom":0, diff --git a/sprites/spr_dev_pack_complex/spr_dev_pack_complex.yy b/sprites/spr_dev_pack_complex/spr_dev_pack_complex.yy index 55db1cae2c..6f47f68594 100644 --- a/sprites/spr_dev_pack_complex/spr_dev_pack_complex.yy +++ b/sprites/spr_dev_pack_complex/spr_dev_pack_complex.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_dev_pack_complex", "bboxMode":0, "bbox_bottom":37, @@ -12,8 +12,8 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"e5637504-add9-474b-ae10-1e954d497810","name":"e5637504-add9-474b-ae10-1e954d497810","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"ee39ecff-a565-42aa-99f0-f549f95bc5a0","name":"ee39ecff-a565-42aa-99f0-f549f95bc5a0","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"e5637504-add9-474b-ae10-1e954d497810","name":"e5637504-add9-474b-ae10-1e954d497810","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"ee39ecff-a565-42aa-99f0-f549f95bc5a0","name":"ee39ecff-a565-42aa-99f0-f549f95bc5a0","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -69,12 +69,8 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"e5637504-add9-474b-ae10-1e954d497810","path":"sprites/spr_dev_pack_complex/spr_dev_pack_complex.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"36fcc4b6-c054-4c76-9a1c-67bc678fa11d","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"ee39ecff-a565-42aa-99f0-f549f95bc5a0","path":"sprites/spr_dev_pack_complex/spr_dev_pack_complex.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"c77ca9f7-3220-4d01-a6cc-c19084c25a7c","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"e5637504-add9-474b-ae10-1e954d497810","path":"sprites/spr_dev_pack_complex/spr_dev_pack_complex.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"36fcc4b6-c054-4c76-9a1c-67bc678fa11d","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"ee39ecff-a565-42aa-99f0-f549f95bc5a0","path":"sprites/spr_dev_pack_complex/spr_dev_pack_complex.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"c77ca9f7-3220-4d01-a6cc-c19084c25a7c","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_dexterity_icon/spr_dexterity_icon.yy b/sprites/spr_dexterity_icon/spr_dexterity_icon.yy index 0fb4d36fd1..3ee45dacc8 100644 --- a/sprites/spr_dexterity_icon/spr_dexterity_icon.yy +++ b/sprites/spr_dexterity_icon/spr_dexterity_icon.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_dexterity_icon", "bboxMode":0, "bbox_bottom":56, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"72380957-5d55-49f3-b4e3-508d5dbb6d00","name":"72380957-5d55-49f3-b4e3-508d5dbb6d00","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"72380957-5d55-49f3-b4e3-508d5dbb6d00","name":"72380957-5d55-49f3-b4e3-508d5dbb6d00","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"72380957-5d55-49f3-b4e3-508d5dbb6d00","path":"sprites/spr_dexterity_icon/spr_dexterity_icon.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"da010a98-a2f9-458b-a116-8597036ab0da","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"72380957-5d55-49f3-b4e3-508d5dbb6d00","path":"sprites/spr_dexterity_icon/spr_dexterity_icon.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"da010a98-a2f9-458b-a116-8597036ab0da","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_diplo_symbols/spr_diplo_symbols.yy b/sprites/spr_diplo_symbols/spr_diplo_symbols.yy index b0f2fc6326..784b881581 100644 --- a/sprites/spr_diplo_symbols/spr_diplo_symbols.yy +++ b/sprites/spr_diplo_symbols/spr_diplo_symbols.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_diplo_symbols", "bboxMode":0, "bbox_bottom":0, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"fda16fa0-8879-4880-89c9-291a29fb0c52","name":"fda16fa0-8879-4880-89c9-291a29fb0c52","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"fda16fa0-8879-4880-89c9-291a29fb0c52","name":"fda16fa0-8879-4880-89c9-291a29fb0c52","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"fda16fa0-8879-4880-89c9-291a29fb0c52","path":"sprites/spr_diplo_symbols/spr_diplo_symbols.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"72ff1aef-2dc9-47ed-9330-e4c9b0a19f25","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"fda16fa0-8879-4880-89c9-291a29fb0c52","path":"sprites/spr_diplo_symbols/spr_diplo_symbols.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"72ff1aef-2dc9-47ed-9330-e4c9b0a19f25","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_diplomacy/spr_diplomacy.yy b/sprites/spr_diplomacy/spr_diplomacy.yy index 139b3cd2d2..734d9b6b9a 100644 --- a/sprites/spr_diplomacy/spr_diplomacy.yy +++ b/sprites/spr_diplomacy/spr_diplomacy.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_diplomacy", "bboxMode":0, "bbox_bottom":0, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"fb3a0c1a-def3-42b3-a47d-3ec190e1fe26","name":"fb3a0c1a-def3-42b3-a47d-3ec190e1fe26","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"fb3a0c1a-def3-42b3-a47d-3ec190e1fe26","name":"fb3a0c1a-def3-42b3-a47d-3ec190e1fe26","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"fb3a0c1a-def3-42b3-a47d-3ec190e1fe26","path":"sprites/spr_diplomacy/spr_diplomacy.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"4bef5314-fc44-4b55-a31e-ee6aa92644d7","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"fb3a0c1a-def3-42b3-a47d-3ec190e1fe26","path":"sprites/spr_diplomacy/spr_diplomacy.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"4bef5314-fc44-4b55-a31e-ee6aa92644d7","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":{ diff --git a/sprites/spr_diplomacy_dae/spr_diplomacy_dae.yy b/sprites/spr_diplomacy_dae/spr_diplomacy_dae.yy index 7f7e84d2f6..b312415227 100644 --- a/sprites/spr_diplomacy_dae/spr_diplomacy_dae.yy +++ b/sprites/spr_diplomacy_dae/spr_diplomacy_dae.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_diplomacy_dae", "bboxMode":0, "bbox_bottom":0, diff --git a/sprites/spr_diplomacy_defeated/spr_diplomacy_defeated.yy b/sprites/spr_diplomacy_defeated/spr_diplomacy_defeated.yy index 3c13c8f19f..1182b310ed 100644 --- a/sprites/spr_diplomacy_defeated/spr_diplomacy_defeated.yy +++ b/sprites/spr_diplomacy_defeated/spr_diplomacy_defeated.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_diplomacy_defeated", "bboxMode":0, "bbox_bottom":134, @@ -12,8 +12,8 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"39a16db0-92fa-4a76-a4fc-8cefdae29f99","name":"39a16db0-92fa-4a76-a4fc-8cefdae29f99","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"f990f8b1-15d2-4cb2-85e5-e703056ed314","name":"f990f8b1-15d2-4cb2-85e5-e703056ed314","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"39a16db0-92fa-4a76-a4fc-8cefdae29f99","name":"39a16db0-92fa-4a76-a4fc-8cefdae29f99","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"f990f8b1-15d2-4cb2-85e5-e703056ed314","name":"f990f8b1-15d2-4cb2-85e5-e703056ed314","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -69,12 +69,8 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"39a16db0-92fa-4a76-a4fc-8cefdae29f99","path":"sprites/spr_diplomacy_defeated/spr_diplomacy_defeated.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"113de565-3347-4ba9-a429-944ab523401a","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"f990f8b1-15d2-4cb2-85e5-e703056ed314","path":"sprites/spr_diplomacy_defeated/spr_diplomacy_defeated.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"a9c5ad43-458c-4b6e-b249-fe27b121fe77","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"39a16db0-92fa-4a76-a4fc-8cefdae29f99","path":"sprites/spr_diplomacy_defeated/spr_diplomacy_defeated.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"113de565-3347-4ba9-a429-944ab523401a","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"f990f8b1-15d2-4cb2-85e5-e703056ed314","path":"sprites/spr_diplomacy_defeated/spr_diplomacy_defeated.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"a9c5ad43-458c-4b6e-b249-fe27b121fe77","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":{ diff --git a/sprites/spr_diplomacy_med/spr_diplomacy_med.yy b/sprites/spr_diplomacy_med/spr_diplomacy_med.yy index fb684ed344..48178eb7ff 100644 --- a/sprites/spr_diplomacy_med/spr_diplomacy_med.yy +++ b/sprites/spr_diplomacy_med/spr_diplomacy_med.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_diplomacy_med", "bboxMode":0, "bbox_bottom":0, diff --git a/sprites/spr_diplomacy_small/spr_diplomacy_small.yy b/sprites/spr_diplomacy_small/spr_diplomacy_small.yy index 8379c53be8..b40fe04f1c 100644 --- a/sprites/spr_diplomacy_small/spr_diplomacy_small.yy +++ b/sprites/spr_diplomacy_small/spr_diplomacy_small.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_diplomacy_small", "bboxMode":0, "bbox_bottom":91, @@ -12,32 +12,32 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"9940dbb9-37e6-49ff-9486-8bdc6f1fa18b","name":"9940dbb9-37e6-49ff-9486-8bdc6f1fa18b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"f4bf2c5a-953e-4a35-a7ff-6104340d515b","name":"f4bf2c5a-953e-4a35-a7ff-6104340d515b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"ecb01531-30bd-40bb-a7cc-bd92c96be4a8","name":"ecb01531-30bd-40bb-a7cc-bd92c96be4a8","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"ff99cdcc-d64f-427c-a83b-275e40048c32","name":"ff99cdcc-d64f-427c-a83b-275e40048c32","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"84bfc2f3-7265-467d-8e3f-7851f1b68610","name":"84bfc2f3-7265-467d-8e3f-7851f1b68610","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"24a6d32e-ccbd-4397-a172-d278dcefba9f","name":"24a6d32e-ccbd-4397-a172-d278dcefba9f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"9b720ae6-a874-4f15-8f10-08bc8977565d","name":"9b720ae6-a874-4f15-8f10-08bc8977565d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"8768affd-210f-4599-a66f-d92b2d96b1ed","name":"8768affd-210f-4599-a66f-d92b2d96b1ed","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"b778d70b-d15c-4a9e-8c5f-be6246171dcd","name":"b778d70b-d15c-4a9e-8c5f-be6246171dcd","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"1796e494-fbdb-4cba-a597-0c8321551ddb","name":"1796e494-fbdb-4cba-a597-0c8321551ddb","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"bd45751d-0894-4683-80f5-d9de3c061267","name":"bd45751d-0894-4683-80f5-d9de3c061267","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"18bc22b2-400a-420f-b5f9-b9fe6f650b92","name":"18bc22b2-400a-420f-b5f9-b9fe6f650b92","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"842debcc-6e09-4044-9702-e7854d66c082","name":"842debcc-6e09-4044-9702-e7854d66c082","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"ba87bb7f-c0e7-46fb-bc7f-588289056d8b","name":"ba87bb7f-c0e7-46fb-bc7f-588289056d8b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"a02b2199-d741-4f8d-94a3-8993f7243413","name":"a02b2199-d741-4f8d-94a3-8993f7243413","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"cfa97e36-6750-492e-9513-0d6dc63f65e6","name":"cfa97e36-6750-492e-9513-0d6dc63f65e6","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"4f60734f-d864-4d70-9671-9347730d4968","name":"4f60734f-d864-4d70-9671-9347730d4968","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"7bbafba5-9e46-4f42-86ec-f99e5e9cf94f","name":"7bbafba5-9e46-4f42-86ec-f99e5e9cf94f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"bb0b728d-f7dd-4865-9b71-0e0a0e78f8bf","name":"bb0b728d-f7dd-4865-9b71-0e0a0e78f8bf","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"6b18a4c0-1fec-438e-be84-b3a071fe534d","name":"6b18a4c0-1fec-438e-be84-b3a071fe534d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"6ff69f07-5621-4b1b-b866-9f7a17e9f866","name":"6ff69f07-5621-4b1b-b866-9f7a17e9f866","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"41523fae-8d00-45f7-91c0-098ba44809ad","name":"41523fae-8d00-45f7-91c0-098ba44809ad","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"987e13a6-8503-4772-be19-fbd2e8c933e8","name":"987e13a6-8503-4772-be19-fbd2e8c933e8","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"76b35d93-850c-46b2-a59c-7d0826fca4de","name":"76b35d93-850c-46b2-a59c-7d0826fca4de","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"143ba5a6-39ab-4bb0-8072-de20032a63b8","name":"143ba5a6-39ab-4bb0-8072-de20032a63b8","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"26be20f7-13d1-40af-bf88-335cb829fbd7","name":"26be20f7-13d1-40af-bf88-335cb829fbd7","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"9940dbb9-37e6-49ff-9486-8bdc6f1fa18b","name":"9940dbb9-37e6-49ff-9486-8bdc6f1fa18b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"f4bf2c5a-953e-4a35-a7ff-6104340d515b","name":"f4bf2c5a-953e-4a35-a7ff-6104340d515b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"ecb01531-30bd-40bb-a7cc-bd92c96be4a8","name":"ecb01531-30bd-40bb-a7cc-bd92c96be4a8","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"ff99cdcc-d64f-427c-a83b-275e40048c32","name":"ff99cdcc-d64f-427c-a83b-275e40048c32","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"84bfc2f3-7265-467d-8e3f-7851f1b68610","name":"84bfc2f3-7265-467d-8e3f-7851f1b68610","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"24a6d32e-ccbd-4397-a172-d278dcefba9f","name":"24a6d32e-ccbd-4397-a172-d278dcefba9f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"9b720ae6-a874-4f15-8f10-08bc8977565d","name":"9b720ae6-a874-4f15-8f10-08bc8977565d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"8768affd-210f-4599-a66f-d92b2d96b1ed","name":"8768affd-210f-4599-a66f-d92b2d96b1ed","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"b778d70b-d15c-4a9e-8c5f-be6246171dcd","name":"b778d70b-d15c-4a9e-8c5f-be6246171dcd","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"1796e494-fbdb-4cba-a597-0c8321551ddb","name":"1796e494-fbdb-4cba-a597-0c8321551ddb","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"bd45751d-0894-4683-80f5-d9de3c061267","name":"bd45751d-0894-4683-80f5-d9de3c061267","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"18bc22b2-400a-420f-b5f9-b9fe6f650b92","name":"18bc22b2-400a-420f-b5f9-b9fe6f650b92","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"842debcc-6e09-4044-9702-e7854d66c082","name":"842debcc-6e09-4044-9702-e7854d66c082","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"ba87bb7f-c0e7-46fb-bc7f-588289056d8b","name":"ba87bb7f-c0e7-46fb-bc7f-588289056d8b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"a02b2199-d741-4f8d-94a3-8993f7243413","name":"a02b2199-d741-4f8d-94a3-8993f7243413","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"cfa97e36-6750-492e-9513-0d6dc63f65e6","name":"cfa97e36-6750-492e-9513-0d6dc63f65e6","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"4f60734f-d864-4d70-9671-9347730d4968","name":"4f60734f-d864-4d70-9671-9347730d4968","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"7bbafba5-9e46-4f42-86ec-f99e5e9cf94f","name":"7bbafba5-9e46-4f42-86ec-f99e5e9cf94f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"bb0b728d-f7dd-4865-9b71-0e0a0e78f8bf","name":"bb0b728d-f7dd-4865-9b71-0e0a0e78f8bf","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"6b18a4c0-1fec-438e-be84-b3a071fe534d","name":"6b18a4c0-1fec-438e-be84-b3a071fe534d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"6ff69f07-5621-4b1b-b866-9f7a17e9f866","name":"6ff69f07-5621-4b1b-b866-9f7a17e9f866","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"41523fae-8d00-45f7-91c0-098ba44809ad","name":"41523fae-8d00-45f7-91c0-098ba44809ad","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"987e13a6-8503-4772-be19-fbd2e8c933e8","name":"987e13a6-8503-4772-be19-fbd2e8c933e8","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"76b35d93-850c-46b2-a59c-7d0826fca4de","name":"76b35d93-850c-46b2-a59c-7d0826fca4de","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"143ba5a6-39ab-4bb0-8072-de20032a63b8","name":"143ba5a6-39ab-4bb0-8072-de20032a63b8","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"26be20f7-13d1-40af-bf88-335cb829fbd7","name":"26be20f7-13d1-40af-bf88-335cb829fbd7","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -93,84 +93,32 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"9940dbb9-37e6-49ff-9486-8bdc6f1fa18b","path":"sprites/spr_diplomacy_small/spr_diplomacy_small.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"f75b63e8-6408-4fd8-935a-8c241d9cfb86","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"f4bf2c5a-953e-4a35-a7ff-6104340d515b","path":"sprites/spr_diplomacy_small/spr_diplomacy_small.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"c7cc5333-a527-4a1e-a25c-57e43253aff8","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"ecb01531-30bd-40bb-a7cc-bd92c96be4a8","path":"sprites/spr_diplomacy_small/spr_diplomacy_small.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"851c9c45-b2ad-4ef0-901b-715805824ec0","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"ff99cdcc-d64f-427c-a83b-275e40048c32","path":"sprites/spr_diplomacy_small/spr_diplomacy_small.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"a086ae35-fed0-4713-9839-c9ce03938eda","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"84bfc2f3-7265-467d-8e3f-7851f1b68610","path":"sprites/spr_diplomacy_small/spr_diplomacy_small.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"6f31f467-f107-430c-a284-25206dfdb48a","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"24a6d32e-ccbd-4397-a172-d278dcefba9f","path":"sprites/spr_diplomacy_small/spr_diplomacy_small.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"30f57c31-14f4-4fd9-b084-1c10d1821403","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"9b720ae6-a874-4f15-8f10-08bc8977565d","path":"sprites/spr_diplomacy_small/spr_diplomacy_small.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"ad9451d1-a16d-40bf-8623-1ef350d24a82","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"8768affd-210f-4599-a66f-d92b2d96b1ed","path":"sprites/spr_diplomacy_small/spr_diplomacy_small.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"ba7ce834-e7b8-4877-9670-c10dc7a069cd","IsCreationKey":false,"Key":7.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"b778d70b-d15c-4a9e-8c5f-be6246171dcd","path":"sprites/spr_diplomacy_small/spr_diplomacy_small.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"eaf67672-272f-4c9f-9802-6f9a8bb258a2","IsCreationKey":false,"Key":8.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"1796e494-fbdb-4cba-a597-0c8321551ddb","path":"sprites/spr_diplomacy_small/spr_diplomacy_small.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"5a4d9aca-5bc7-4bf8-8e7d-761728455c6c","IsCreationKey":false,"Key":9.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"bd45751d-0894-4683-80f5-d9de3c061267","path":"sprites/spr_diplomacy_small/spr_diplomacy_small.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"762af360-72e5-4b4a-b319-5ef94e05b9d6","IsCreationKey":false,"Key":10.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"18bc22b2-400a-420f-b5f9-b9fe6f650b92","path":"sprites/spr_diplomacy_small/spr_diplomacy_small.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"ab1b985c-383c-45ed-a4e9-ff77b56bf092","IsCreationKey":false,"Key":11.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"842debcc-6e09-4044-9702-e7854d66c082","path":"sprites/spr_diplomacy_small/spr_diplomacy_small.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"0ff5618f-d818-4bd1-a55e-2ab577d95325","IsCreationKey":false,"Key":12.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"ba87bb7f-c0e7-46fb-bc7f-588289056d8b","path":"sprites/spr_diplomacy_small/spr_diplomacy_small.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"bcd4bcf4-3cd9-4ad6-9deb-e13abd133c99","IsCreationKey":false,"Key":13.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"a02b2199-d741-4f8d-94a3-8993f7243413","path":"sprites/spr_diplomacy_small/spr_diplomacy_small.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"54c0028c-5eb6-44ed-87ad-a7eaad4450fe","IsCreationKey":false,"Key":14.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"cfa97e36-6750-492e-9513-0d6dc63f65e6","path":"sprites/spr_diplomacy_small/spr_diplomacy_small.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"7bd5ab63-0977-4c73-a597-228dd904be45","IsCreationKey":false,"Key":15.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"4f60734f-d864-4d70-9671-9347730d4968","path":"sprites/spr_diplomacy_small/spr_diplomacy_small.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"b920a0ec-5d65-499d-ab2f-b1a3f239a393","IsCreationKey":false,"Key":16.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"7bbafba5-9e46-4f42-86ec-f99e5e9cf94f","path":"sprites/spr_diplomacy_small/spr_diplomacy_small.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"5d77a80a-ae0f-43a7-a33f-673cd0c0185c","IsCreationKey":false,"Key":17.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"bb0b728d-f7dd-4865-9b71-0e0a0e78f8bf","path":"sprites/spr_diplomacy_small/spr_diplomacy_small.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"094f851c-afcf-4a18-be9d-d0dea044cc1c","IsCreationKey":false,"Key":18.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"6b18a4c0-1fec-438e-be84-b3a071fe534d","path":"sprites/spr_diplomacy_small/spr_diplomacy_small.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"ce4bb606-a9f3-43e9-b8dc-61542e324508","IsCreationKey":false,"Key":19.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"6ff69f07-5621-4b1b-b866-9f7a17e9f866","path":"sprites/spr_diplomacy_small/spr_diplomacy_small.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"515cfdb5-5fdb-4aa9-b8af-39aea30d2a6d","IsCreationKey":false,"Key":20.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"41523fae-8d00-45f7-91c0-098ba44809ad","path":"sprites/spr_diplomacy_small/spr_diplomacy_small.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"df5073fb-39ad-4afc-b52e-e63f17d720c2","IsCreationKey":false,"Key":21.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"987e13a6-8503-4772-be19-fbd2e8c933e8","path":"sprites/spr_diplomacy_small/spr_diplomacy_small.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"5c700c0d-b5c5-46fb-9b04-1372b4a696fd","IsCreationKey":false,"Key":22.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"76b35d93-850c-46b2-a59c-7d0826fca4de","path":"sprites/spr_diplomacy_small/spr_diplomacy_small.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"ec7285bb-1d51-4d01-b78b-41a351480650","IsCreationKey":false,"Key":23.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"143ba5a6-39ab-4bb0-8072-de20032a63b8","path":"sprites/spr_diplomacy_small/spr_diplomacy_small.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"f2283803-f7b3-40a4-bb08-84279bc535f0","IsCreationKey":false,"Key":24.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"26be20f7-13d1-40af-bf88-335cb829fbd7","path":"sprites/spr_diplomacy_small/spr_diplomacy_small.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"37834455-fe8c-4f23-a23f-cdbbc6b747cd","IsCreationKey":false,"Key":25.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"9940dbb9-37e6-49ff-9486-8bdc6f1fa18b","path":"sprites/spr_diplomacy_small/spr_diplomacy_small.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"f75b63e8-6408-4fd8-935a-8c241d9cfb86","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"f4bf2c5a-953e-4a35-a7ff-6104340d515b","path":"sprites/spr_diplomacy_small/spr_diplomacy_small.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"c7cc5333-a527-4a1e-a25c-57e43253aff8","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"ecb01531-30bd-40bb-a7cc-bd92c96be4a8","path":"sprites/spr_diplomacy_small/spr_diplomacy_small.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"851c9c45-b2ad-4ef0-901b-715805824ec0","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"ff99cdcc-d64f-427c-a83b-275e40048c32","path":"sprites/spr_diplomacy_small/spr_diplomacy_small.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"a086ae35-fed0-4713-9839-c9ce03938eda","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"84bfc2f3-7265-467d-8e3f-7851f1b68610","path":"sprites/spr_diplomacy_small/spr_diplomacy_small.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"6f31f467-f107-430c-a284-25206dfdb48a","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"24a6d32e-ccbd-4397-a172-d278dcefba9f","path":"sprites/spr_diplomacy_small/spr_diplomacy_small.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"30f57c31-14f4-4fd9-b084-1c10d1821403","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"9b720ae6-a874-4f15-8f10-08bc8977565d","path":"sprites/spr_diplomacy_small/spr_diplomacy_small.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"ad9451d1-a16d-40bf-8623-1ef350d24a82","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"8768affd-210f-4599-a66f-d92b2d96b1ed","path":"sprites/spr_diplomacy_small/spr_diplomacy_small.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"ba7ce834-e7b8-4877-9670-c10dc7a069cd","IsCreationKey":false,"Key":7.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"b778d70b-d15c-4a9e-8c5f-be6246171dcd","path":"sprites/spr_diplomacy_small/spr_diplomacy_small.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"eaf67672-272f-4c9f-9802-6f9a8bb258a2","IsCreationKey":false,"Key":8.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"1796e494-fbdb-4cba-a597-0c8321551ddb","path":"sprites/spr_diplomacy_small/spr_diplomacy_small.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"5a4d9aca-5bc7-4bf8-8e7d-761728455c6c","IsCreationKey":false,"Key":9.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"bd45751d-0894-4683-80f5-d9de3c061267","path":"sprites/spr_diplomacy_small/spr_diplomacy_small.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"762af360-72e5-4b4a-b319-5ef94e05b9d6","IsCreationKey":false,"Key":10.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"18bc22b2-400a-420f-b5f9-b9fe6f650b92","path":"sprites/spr_diplomacy_small/spr_diplomacy_small.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"ab1b985c-383c-45ed-a4e9-ff77b56bf092","IsCreationKey":false,"Key":11.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"842debcc-6e09-4044-9702-e7854d66c082","path":"sprites/spr_diplomacy_small/spr_diplomacy_small.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"0ff5618f-d818-4bd1-a55e-2ab577d95325","IsCreationKey":false,"Key":12.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"ba87bb7f-c0e7-46fb-bc7f-588289056d8b","path":"sprites/spr_diplomacy_small/spr_diplomacy_small.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"bcd4bcf4-3cd9-4ad6-9deb-e13abd133c99","IsCreationKey":false,"Key":13.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"a02b2199-d741-4f8d-94a3-8993f7243413","path":"sprites/spr_diplomacy_small/spr_diplomacy_small.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"54c0028c-5eb6-44ed-87ad-a7eaad4450fe","IsCreationKey":false,"Key":14.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"cfa97e36-6750-492e-9513-0d6dc63f65e6","path":"sprites/spr_diplomacy_small/spr_diplomacy_small.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"7bd5ab63-0977-4c73-a597-228dd904be45","IsCreationKey":false,"Key":15.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"4f60734f-d864-4d70-9671-9347730d4968","path":"sprites/spr_diplomacy_small/spr_diplomacy_small.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"b920a0ec-5d65-499d-ab2f-b1a3f239a393","IsCreationKey":false,"Key":16.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"7bbafba5-9e46-4f42-86ec-f99e5e9cf94f","path":"sprites/spr_diplomacy_small/spr_diplomacy_small.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"5d77a80a-ae0f-43a7-a33f-673cd0c0185c","IsCreationKey":false,"Key":17.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"bb0b728d-f7dd-4865-9b71-0e0a0e78f8bf","path":"sprites/spr_diplomacy_small/spr_diplomacy_small.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"094f851c-afcf-4a18-be9d-d0dea044cc1c","IsCreationKey":false,"Key":18.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"6b18a4c0-1fec-438e-be84-b3a071fe534d","path":"sprites/spr_diplomacy_small/spr_diplomacy_small.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"ce4bb606-a9f3-43e9-b8dc-61542e324508","IsCreationKey":false,"Key":19.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"6ff69f07-5621-4b1b-b866-9f7a17e9f866","path":"sprites/spr_diplomacy_small/spr_diplomacy_small.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"515cfdb5-5fdb-4aa9-b8af-39aea30d2a6d","IsCreationKey":false,"Key":20.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"41523fae-8d00-45f7-91c0-098ba44809ad","path":"sprites/spr_diplomacy_small/spr_diplomacy_small.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"df5073fb-39ad-4afc-b52e-e63f17d720c2","IsCreationKey":false,"Key":21.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"987e13a6-8503-4772-be19-fbd2e8c933e8","path":"sprites/spr_diplomacy_small/spr_diplomacy_small.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"5c700c0d-b5c5-46fb-9b04-1372b4a696fd","IsCreationKey":false,"Key":22.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"76b35d93-850c-46b2-a59c-7d0826fca4de","path":"sprites/spr_diplomacy_small/spr_diplomacy_small.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"ec7285bb-1d51-4d01-b78b-41a351480650","IsCreationKey":false,"Key":23.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"143ba5a6-39ab-4bb0-8072-de20032a63b8","path":"sprites/spr_diplomacy_small/spr_diplomacy_small.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"f2283803-f7b3-40a4-bb08-84279bc535f0","IsCreationKey":false,"Key":24.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"26be20f7-13d1-40af-bf88-335cb829fbd7","path":"sprites/spr_diplomacy_small/spr_diplomacy_small.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"37834455-fe8c-4f23-a23f-cdbbc6b747cd","IsCreationKey":false,"Key":25.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":{ diff --git a/sprites/spr_disposition/spr_disposition.yy b/sprites/spr_disposition/spr_disposition.yy index 4fa1e7d56a..3e46eedd86 100644 --- a/sprites/spr_disposition/spr_disposition.yy +++ b/sprites/spr_disposition/spr_disposition.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_disposition", "bboxMode":0, "bbox_bottom":8, @@ -12,28 +12,28 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"98e30133-46fe-47e3-b840-29fad38e4046","name":"98e30133-46fe-47e3-b840-29fad38e4046","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"4a1bae03-d0b8-4e97-9e1f-06a28b19863b","name":"4a1bae03-d0b8-4e97-9e1f-06a28b19863b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"89e72e63-9c6f-4ced-a4e9-7eafbf05906b","name":"89e72e63-9c6f-4ced-a4e9-7eafbf05906b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"23692a93-9284-430d-baf2-97ce30befd3c","name":"23692a93-9284-430d-baf2-97ce30befd3c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"6457a2b0-b232-42f6-b269-41b793c88c29","name":"6457a2b0-b232-42f6-b269-41b793c88c29","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"4e98f601-9348-46e0-8c2d-3cf992a07b36","name":"4e98f601-9348-46e0-8c2d-3cf992a07b36","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"7f1cf2b7-204b-468e-8ddd-d7a8a421d90a","name":"7f1cf2b7-204b-468e-8ddd-d7a8a421d90a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"b62884fe-9fd0-4d99-a1ea-d78f8b30131d","name":"b62884fe-9fd0-4d99-a1ea-d78f8b30131d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"c456454b-266f-4845-92b3-fe78a77b5f11","name":"c456454b-266f-4845-92b3-fe78a77b5f11","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"50a520f2-ab62-4d44-8e98-bc1b66d6ce48","name":"50a520f2-ab62-4d44-8e98-bc1b66d6ce48","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"fe61e55e-ff7b-4888-b7d8-18f1db9b016d","name":"fe61e55e-ff7b-4888-b7d8-18f1db9b016d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"6cec14b6-7d08-417c-9754-89bd1feef423","name":"6cec14b6-7d08-417c-9754-89bd1feef423","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"b3ca1561-0b50-4df6-b5a4-a161f39c6127","name":"b3ca1561-0b50-4df6-b5a4-a161f39c6127","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"2032628d-1554-485a-9851-79380ea8c0af","name":"2032628d-1554-485a-9851-79380ea8c0af","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"2bba48ba-b958-4d17-881b-f4119f16ff48","name":"2bba48ba-b958-4d17-881b-f4119f16ff48","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"57ddaffd-0411-40df-8a37-ce60e94719ce","name":"57ddaffd-0411-40df-8a37-ce60e94719ce","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"3a759712-7df3-4cfb-b0f7-ddebefc241fa","name":"3a759712-7df3-4cfb-b0f7-ddebefc241fa","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"46c88fea-7ccd-4eef-8de8-dc26b47c9109","name":"46c88fea-7ccd-4eef-8de8-dc26b47c9109","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"edb2a834-38c3-4d86-85e6-8daa4ef49dcf","name":"edb2a834-38c3-4d86-85e6-8daa4ef49dcf","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"9b8c364d-c27e-4300-9c45-4fb611dd516c","name":"9b8c364d-c27e-4300-9c45-4fb611dd516c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"3ad1394d-0162-448a-a3de-4d57b18384f6","name":"3ad1394d-0162-448a-a3de-4d57b18384f6","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"0bf7710b-469f-4222-8082-d46c95bcc888","name":"0bf7710b-469f-4222-8082-d46c95bcc888","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"98e30133-46fe-47e3-b840-29fad38e4046","name":"98e30133-46fe-47e3-b840-29fad38e4046","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"4a1bae03-d0b8-4e97-9e1f-06a28b19863b","name":"4a1bae03-d0b8-4e97-9e1f-06a28b19863b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"89e72e63-9c6f-4ced-a4e9-7eafbf05906b","name":"89e72e63-9c6f-4ced-a4e9-7eafbf05906b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"23692a93-9284-430d-baf2-97ce30befd3c","name":"23692a93-9284-430d-baf2-97ce30befd3c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"6457a2b0-b232-42f6-b269-41b793c88c29","name":"6457a2b0-b232-42f6-b269-41b793c88c29","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"4e98f601-9348-46e0-8c2d-3cf992a07b36","name":"4e98f601-9348-46e0-8c2d-3cf992a07b36","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"7f1cf2b7-204b-468e-8ddd-d7a8a421d90a","name":"7f1cf2b7-204b-468e-8ddd-d7a8a421d90a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"b62884fe-9fd0-4d99-a1ea-d78f8b30131d","name":"b62884fe-9fd0-4d99-a1ea-d78f8b30131d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"c456454b-266f-4845-92b3-fe78a77b5f11","name":"c456454b-266f-4845-92b3-fe78a77b5f11","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"50a520f2-ab62-4d44-8e98-bc1b66d6ce48","name":"50a520f2-ab62-4d44-8e98-bc1b66d6ce48","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"fe61e55e-ff7b-4888-b7d8-18f1db9b016d","name":"fe61e55e-ff7b-4888-b7d8-18f1db9b016d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"6cec14b6-7d08-417c-9754-89bd1feef423","name":"6cec14b6-7d08-417c-9754-89bd1feef423","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"b3ca1561-0b50-4df6-b5a4-a161f39c6127","name":"b3ca1561-0b50-4df6-b5a4-a161f39c6127","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"2032628d-1554-485a-9851-79380ea8c0af","name":"2032628d-1554-485a-9851-79380ea8c0af","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"2bba48ba-b958-4d17-881b-f4119f16ff48","name":"2bba48ba-b958-4d17-881b-f4119f16ff48","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"57ddaffd-0411-40df-8a37-ce60e94719ce","name":"57ddaffd-0411-40df-8a37-ce60e94719ce","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"3a759712-7df3-4cfb-b0f7-ddebefc241fa","name":"3a759712-7df3-4cfb-b0f7-ddebefc241fa","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"46c88fea-7ccd-4eef-8de8-dc26b47c9109","name":"46c88fea-7ccd-4eef-8de8-dc26b47c9109","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"edb2a834-38c3-4d86-85e6-8daa4ef49dcf","name":"edb2a834-38c3-4d86-85e6-8daa4ef49dcf","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"9b8c364d-c27e-4300-9c45-4fb611dd516c","name":"9b8c364d-c27e-4300-9c45-4fb611dd516c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"3ad1394d-0162-448a-a3de-4d57b18384f6","name":"3ad1394d-0162-448a-a3de-4d57b18384f6","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"0bf7710b-469f-4222-8082-d46c95bcc888","name":"0bf7710b-469f-4222-8082-d46c95bcc888","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -89,72 +89,28 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"98e30133-46fe-47e3-b840-29fad38e4046","path":"sprites/spr_disposition/spr_disposition.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"77fd7703-68b9-4b17-b87c-9a217e1f2d98","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"4a1bae03-d0b8-4e97-9e1f-06a28b19863b","path":"sprites/spr_disposition/spr_disposition.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"008ad391-f7d8-4511-8376-7de988cd4316","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"89e72e63-9c6f-4ced-a4e9-7eafbf05906b","path":"sprites/spr_disposition/spr_disposition.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"5b92a002-0fb0-4dce-9519-02f34929fa34","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"23692a93-9284-430d-baf2-97ce30befd3c","path":"sprites/spr_disposition/spr_disposition.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"9215cf60-abf3-42f5-86a6-669aecc3e5f0","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"6457a2b0-b232-42f6-b269-41b793c88c29","path":"sprites/spr_disposition/spr_disposition.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"a9a1902d-ddaa-4465-b49d-564439690bbe","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"4e98f601-9348-46e0-8c2d-3cf992a07b36","path":"sprites/spr_disposition/spr_disposition.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"8c85bf11-f619-47c7-ab3a-dbd3fa760bb0","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"7f1cf2b7-204b-468e-8ddd-d7a8a421d90a","path":"sprites/spr_disposition/spr_disposition.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"119dc5f6-6819-4377-950e-e5663e9e9faf","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"b62884fe-9fd0-4d99-a1ea-d78f8b30131d","path":"sprites/spr_disposition/spr_disposition.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"b38a6d72-8cdc-4847-942a-6be7f90c4e45","IsCreationKey":false,"Key":7.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"c456454b-266f-4845-92b3-fe78a77b5f11","path":"sprites/spr_disposition/spr_disposition.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"52ff60ab-3cae-494a-9534-fdd3ed0c4c5e","IsCreationKey":false,"Key":8.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"50a520f2-ab62-4d44-8e98-bc1b66d6ce48","path":"sprites/spr_disposition/spr_disposition.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"07258c63-32b7-4f34-ae51-71bbc786a856","IsCreationKey":false,"Key":9.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"fe61e55e-ff7b-4888-b7d8-18f1db9b016d","path":"sprites/spr_disposition/spr_disposition.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"c443e957-0cb5-4580-822f-ff6c8e32d32c","IsCreationKey":false,"Key":10.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"6cec14b6-7d08-417c-9754-89bd1feef423","path":"sprites/spr_disposition/spr_disposition.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"f5058280-aa43-4444-803b-a7621d50ec00","IsCreationKey":false,"Key":11.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"b3ca1561-0b50-4df6-b5a4-a161f39c6127","path":"sprites/spr_disposition/spr_disposition.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"3221a8f6-7bba-4b56-aefc-826443490000","IsCreationKey":false,"Key":12.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"2032628d-1554-485a-9851-79380ea8c0af","path":"sprites/spr_disposition/spr_disposition.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"dba8ee29-3953-4f6a-85d7-e54c29a680ad","IsCreationKey":false,"Key":13.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"2bba48ba-b958-4d17-881b-f4119f16ff48","path":"sprites/spr_disposition/spr_disposition.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"cbc6114f-fbdb-4422-b7c5-867f2c3906a1","IsCreationKey":false,"Key":14.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"57ddaffd-0411-40df-8a37-ce60e94719ce","path":"sprites/spr_disposition/spr_disposition.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"bd607404-6ab6-4e77-8746-644f2ec07f47","IsCreationKey":false,"Key":15.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"3a759712-7df3-4cfb-b0f7-ddebefc241fa","path":"sprites/spr_disposition/spr_disposition.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"a8f7fb3a-4f32-441d-9963-e1f6ac0deb18","IsCreationKey":false,"Key":16.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"46c88fea-7ccd-4eef-8de8-dc26b47c9109","path":"sprites/spr_disposition/spr_disposition.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"83bdd252-06da-4f80-b7c5-d87247746b99","IsCreationKey":false,"Key":17.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"edb2a834-38c3-4d86-85e6-8daa4ef49dcf","path":"sprites/spr_disposition/spr_disposition.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"a658f724-5748-44e3-b708-ccfffd354e31","IsCreationKey":false,"Key":18.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"9b8c364d-c27e-4300-9c45-4fb611dd516c","path":"sprites/spr_disposition/spr_disposition.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"90fc49f7-308d-49b1-8326-6f61b5b679b5","IsCreationKey":false,"Key":19.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"3ad1394d-0162-448a-a3de-4d57b18384f6","path":"sprites/spr_disposition/spr_disposition.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"49487973-214c-4270-ab8e-f02320ce50c1","IsCreationKey":false,"Key":20.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"0bf7710b-469f-4222-8082-d46c95bcc888","path":"sprites/spr_disposition/spr_disposition.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"25be9ac4-d1a8-469c-8efa-71bf890408a4","IsCreationKey":false,"Key":21.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"98e30133-46fe-47e3-b840-29fad38e4046","path":"sprites/spr_disposition/spr_disposition.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"77fd7703-68b9-4b17-b87c-9a217e1f2d98","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"4a1bae03-d0b8-4e97-9e1f-06a28b19863b","path":"sprites/spr_disposition/spr_disposition.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"008ad391-f7d8-4511-8376-7de988cd4316","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"89e72e63-9c6f-4ced-a4e9-7eafbf05906b","path":"sprites/spr_disposition/spr_disposition.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"5b92a002-0fb0-4dce-9519-02f34929fa34","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"23692a93-9284-430d-baf2-97ce30befd3c","path":"sprites/spr_disposition/spr_disposition.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"9215cf60-abf3-42f5-86a6-669aecc3e5f0","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"6457a2b0-b232-42f6-b269-41b793c88c29","path":"sprites/spr_disposition/spr_disposition.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"a9a1902d-ddaa-4465-b49d-564439690bbe","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"4e98f601-9348-46e0-8c2d-3cf992a07b36","path":"sprites/spr_disposition/spr_disposition.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"8c85bf11-f619-47c7-ab3a-dbd3fa760bb0","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"7f1cf2b7-204b-468e-8ddd-d7a8a421d90a","path":"sprites/spr_disposition/spr_disposition.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"119dc5f6-6819-4377-950e-e5663e9e9faf","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"b62884fe-9fd0-4d99-a1ea-d78f8b30131d","path":"sprites/spr_disposition/spr_disposition.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"b38a6d72-8cdc-4847-942a-6be7f90c4e45","IsCreationKey":false,"Key":7.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"c456454b-266f-4845-92b3-fe78a77b5f11","path":"sprites/spr_disposition/spr_disposition.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"52ff60ab-3cae-494a-9534-fdd3ed0c4c5e","IsCreationKey":false,"Key":8.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"50a520f2-ab62-4d44-8e98-bc1b66d6ce48","path":"sprites/spr_disposition/spr_disposition.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"07258c63-32b7-4f34-ae51-71bbc786a856","IsCreationKey":false,"Key":9.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"fe61e55e-ff7b-4888-b7d8-18f1db9b016d","path":"sprites/spr_disposition/spr_disposition.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"c443e957-0cb5-4580-822f-ff6c8e32d32c","IsCreationKey":false,"Key":10.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"6cec14b6-7d08-417c-9754-89bd1feef423","path":"sprites/spr_disposition/spr_disposition.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"f5058280-aa43-4444-803b-a7621d50ec00","IsCreationKey":false,"Key":11.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"b3ca1561-0b50-4df6-b5a4-a161f39c6127","path":"sprites/spr_disposition/spr_disposition.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"3221a8f6-7bba-4b56-aefc-826443490000","IsCreationKey":false,"Key":12.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"2032628d-1554-485a-9851-79380ea8c0af","path":"sprites/spr_disposition/spr_disposition.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"dba8ee29-3953-4f6a-85d7-e54c29a680ad","IsCreationKey":false,"Key":13.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"2bba48ba-b958-4d17-881b-f4119f16ff48","path":"sprites/spr_disposition/spr_disposition.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"cbc6114f-fbdb-4422-b7c5-867f2c3906a1","IsCreationKey":false,"Key":14.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"57ddaffd-0411-40df-8a37-ce60e94719ce","path":"sprites/spr_disposition/spr_disposition.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"bd607404-6ab6-4e77-8746-644f2ec07f47","IsCreationKey":false,"Key":15.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"3a759712-7df3-4cfb-b0f7-ddebefc241fa","path":"sprites/spr_disposition/spr_disposition.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"a8f7fb3a-4f32-441d-9963-e1f6ac0deb18","IsCreationKey":false,"Key":16.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"46c88fea-7ccd-4eef-8de8-dc26b47c9109","path":"sprites/spr_disposition/spr_disposition.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"83bdd252-06da-4f80-b7c5-d87247746b99","IsCreationKey":false,"Key":17.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"edb2a834-38c3-4d86-85e6-8daa4ef49dcf","path":"sprites/spr_disposition/spr_disposition.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"a658f724-5748-44e3-b708-ccfffd354e31","IsCreationKey":false,"Key":18.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"9b8c364d-c27e-4300-9c45-4fb611dd516c","path":"sprites/spr_disposition/spr_disposition.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"90fc49f7-308d-49b1-8326-6f61b5b679b5","IsCreationKey":false,"Key":19.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"3ad1394d-0162-448a-a3de-4d57b18384f6","path":"sprites/spr_disposition/spr_disposition.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"49487973-214c-4270-ab8e-f02320ce50c1","IsCreationKey":false,"Key":20.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"0bf7710b-469f-4222-8082-d46c95bcc888","path":"sprites/spr_disposition/spr_disposition.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"25be9ac4-d1a8-469c-8efa-71bf890408a4","IsCreationKey":false,"Key":21.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":{ diff --git a/sprites/spr_disposition_small/spr_disposition_small.yy b/sprites/spr_disposition_small/spr_disposition_small.yy index a503dd38b4..ece05031eb 100644 --- a/sprites/spr_disposition_small/spr_disposition_small.yy +++ b/sprites/spr_disposition_small/spr_disposition_small.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_disposition_small", "bboxMode":0, "bbox_bottom":8, @@ -12,26 +12,26 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"265ceb15-4b8f-4dc9-a884-5dcda1fe699c","name":"265ceb15-4b8f-4dc9-a884-5dcda1fe699c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"2a2f2dcc-2dc9-4455-a25a-f8101ce83a5d","name":"2a2f2dcc-2dc9-4455-a25a-f8101ce83a5d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"da8c652b-5cd4-4a77-82fb-c4e5ddf12bcb","name":"da8c652b-5cd4-4a77-82fb-c4e5ddf12bcb","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"14e2bb36-0557-44c7-adc4-29fd8416ae52","name":"14e2bb36-0557-44c7-adc4-29fd8416ae52","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"bb0286e5-715d-48cd-ae8d-55cc23aa8338","name":"bb0286e5-715d-48cd-ae8d-55cc23aa8338","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"94e48fa1-3322-45ba-92cf-f110f2459f0c","name":"94e48fa1-3322-45ba-92cf-f110f2459f0c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"0c040a23-c32e-44fa-9fcd-d9d73c08aae1","name":"0c040a23-c32e-44fa-9fcd-d9d73c08aae1","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"b28fff07-5ae9-4bd1-83ec-d132ebe19539","name":"b28fff07-5ae9-4bd1-83ec-d132ebe19539","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"ccd4090d-a362-4e5a-ae92-93f64fd8f6eb","name":"ccd4090d-a362-4e5a-ae92-93f64fd8f6eb","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"6afb8843-a801-4150-bc19-748f64616e10","name":"6afb8843-a801-4150-bc19-748f64616e10","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"e008a202-76e4-4962-a956-7a8b9821ad70","name":"e008a202-76e4-4962-a956-7a8b9821ad70","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"d85dac91-f7e9-4bd7-b6fd-785c29834763","name":"d85dac91-f7e9-4bd7-b6fd-785c29834763","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"ca49fe1f-56fa-4fc1-afc2-e9800609be80","name":"ca49fe1f-56fa-4fc1-afc2-e9800609be80","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"3f2bfa1c-4599-4db1-b938-6b2ef778ad28","name":"3f2bfa1c-4599-4db1-b938-6b2ef778ad28","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"abc1f8ae-d1a3-4d6c-8ee3-5bd5f8787746","name":"abc1f8ae-d1a3-4d6c-8ee3-5bd5f8787746","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"088f95db-0409-472a-97f2-bc8310ee706f","name":"088f95db-0409-472a-97f2-bc8310ee706f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"202f3a87-4a57-4f10-a8cb-da641e276729","name":"202f3a87-4a57-4f10-a8cb-da641e276729","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"c9e74c28-ba7e-48b8-b057-aa75cf9c695d","name":"c9e74c28-ba7e-48b8-b057-aa75cf9c695d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"bfe18a47-5559-4a67-9b4a-bcbe2f79dee6","name":"bfe18a47-5559-4a67-9b4a-bcbe2f79dee6","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"d713f514-9693-4f7f-b0c0-f6019b536321","name":"d713f514-9693-4f7f-b0c0-f6019b536321","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"265ceb15-4b8f-4dc9-a884-5dcda1fe699c","name":"265ceb15-4b8f-4dc9-a884-5dcda1fe699c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"2a2f2dcc-2dc9-4455-a25a-f8101ce83a5d","name":"2a2f2dcc-2dc9-4455-a25a-f8101ce83a5d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"da8c652b-5cd4-4a77-82fb-c4e5ddf12bcb","name":"da8c652b-5cd4-4a77-82fb-c4e5ddf12bcb","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"14e2bb36-0557-44c7-adc4-29fd8416ae52","name":"14e2bb36-0557-44c7-adc4-29fd8416ae52","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"bb0286e5-715d-48cd-ae8d-55cc23aa8338","name":"bb0286e5-715d-48cd-ae8d-55cc23aa8338","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"94e48fa1-3322-45ba-92cf-f110f2459f0c","name":"94e48fa1-3322-45ba-92cf-f110f2459f0c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"0c040a23-c32e-44fa-9fcd-d9d73c08aae1","name":"0c040a23-c32e-44fa-9fcd-d9d73c08aae1","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"b28fff07-5ae9-4bd1-83ec-d132ebe19539","name":"b28fff07-5ae9-4bd1-83ec-d132ebe19539","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"ccd4090d-a362-4e5a-ae92-93f64fd8f6eb","name":"ccd4090d-a362-4e5a-ae92-93f64fd8f6eb","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"6afb8843-a801-4150-bc19-748f64616e10","name":"6afb8843-a801-4150-bc19-748f64616e10","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"e008a202-76e4-4962-a956-7a8b9821ad70","name":"e008a202-76e4-4962-a956-7a8b9821ad70","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"d85dac91-f7e9-4bd7-b6fd-785c29834763","name":"d85dac91-f7e9-4bd7-b6fd-785c29834763","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"ca49fe1f-56fa-4fc1-afc2-e9800609be80","name":"ca49fe1f-56fa-4fc1-afc2-e9800609be80","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"3f2bfa1c-4599-4db1-b938-6b2ef778ad28","name":"3f2bfa1c-4599-4db1-b938-6b2ef778ad28","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"abc1f8ae-d1a3-4d6c-8ee3-5bd5f8787746","name":"abc1f8ae-d1a3-4d6c-8ee3-5bd5f8787746","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"088f95db-0409-472a-97f2-bc8310ee706f","name":"088f95db-0409-472a-97f2-bc8310ee706f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"202f3a87-4a57-4f10-a8cb-da641e276729","name":"202f3a87-4a57-4f10-a8cb-da641e276729","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"c9e74c28-ba7e-48b8-b057-aa75cf9c695d","name":"c9e74c28-ba7e-48b8-b057-aa75cf9c695d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"bfe18a47-5559-4a67-9b4a-bcbe2f79dee6","name":"bfe18a47-5559-4a67-9b4a-bcbe2f79dee6","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"d713f514-9693-4f7f-b0c0-f6019b536321","name":"d713f514-9693-4f7f-b0c0-f6019b536321","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -87,66 +87,26 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"265ceb15-4b8f-4dc9-a884-5dcda1fe699c","path":"sprites/spr_disposition_small/spr_disposition_small.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"8e307151-41a5-41b6-b862-4438a5c7e325","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"2a2f2dcc-2dc9-4455-a25a-f8101ce83a5d","path":"sprites/spr_disposition_small/spr_disposition_small.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"df11f753-ac31-414a-be21-2408615ab6ef","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"da8c652b-5cd4-4a77-82fb-c4e5ddf12bcb","path":"sprites/spr_disposition_small/spr_disposition_small.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"26d46a87-74b7-47e4-be7a-f40c00f59ded","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"14e2bb36-0557-44c7-adc4-29fd8416ae52","path":"sprites/spr_disposition_small/spr_disposition_small.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"034fe571-6a88-44e9-86e2-2f1fbabd8bae","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"bb0286e5-715d-48cd-ae8d-55cc23aa8338","path":"sprites/spr_disposition_small/spr_disposition_small.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"5d2099ab-553c-41bf-85f9-d53de7c07705","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"94e48fa1-3322-45ba-92cf-f110f2459f0c","path":"sprites/spr_disposition_small/spr_disposition_small.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"98b1c16e-3a59-41f0-bff7-9dce3191cf08","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"0c040a23-c32e-44fa-9fcd-d9d73c08aae1","path":"sprites/spr_disposition_small/spr_disposition_small.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"c761ef3d-888c-4e34-b1a7-ca0e49826e0d","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"b28fff07-5ae9-4bd1-83ec-d132ebe19539","path":"sprites/spr_disposition_small/spr_disposition_small.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"bf5050c4-b78b-4cc5-895c-11b56e379d37","IsCreationKey":false,"Key":7.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"ccd4090d-a362-4e5a-ae92-93f64fd8f6eb","path":"sprites/spr_disposition_small/spr_disposition_small.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"0871f803-6f6a-4da9-b743-2bc6371e9901","IsCreationKey":false,"Key":8.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"6afb8843-a801-4150-bc19-748f64616e10","path":"sprites/spr_disposition_small/spr_disposition_small.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"3515c2e0-ed2e-4b09-9f8b-5ad40ee7b27e","IsCreationKey":false,"Key":9.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"e008a202-76e4-4962-a956-7a8b9821ad70","path":"sprites/spr_disposition_small/spr_disposition_small.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"4c2701ed-b5ac-430c-8e0d-237d677ad22e","IsCreationKey":false,"Key":10.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"d85dac91-f7e9-4bd7-b6fd-785c29834763","path":"sprites/spr_disposition_small/spr_disposition_small.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"a2679063-8d43-4cdb-aa80-e81608c9e268","IsCreationKey":false,"Key":11.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"ca49fe1f-56fa-4fc1-afc2-e9800609be80","path":"sprites/spr_disposition_small/spr_disposition_small.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"44ecbdf1-4beb-4b25-b137-5488f3afde8c","IsCreationKey":false,"Key":12.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"3f2bfa1c-4599-4db1-b938-6b2ef778ad28","path":"sprites/spr_disposition_small/spr_disposition_small.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"f6627939-2067-44e2-a27e-b929a9c7df9f","IsCreationKey":false,"Key":13.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"abc1f8ae-d1a3-4d6c-8ee3-5bd5f8787746","path":"sprites/spr_disposition_small/spr_disposition_small.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"ef18068d-97ab-4f38-a98a-26e303a5fa09","IsCreationKey":false,"Key":14.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"088f95db-0409-472a-97f2-bc8310ee706f","path":"sprites/spr_disposition_small/spr_disposition_small.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"82aee3c2-3e31-4660-8fbb-bbe314340aa9","IsCreationKey":false,"Key":15.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"202f3a87-4a57-4f10-a8cb-da641e276729","path":"sprites/spr_disposition_small/spr_disposition_small.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"3444a467-5735-4b89-b4f9-86a3bbbf2ce4","IsCreationKey":false,"Key":16.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"c9e74c28-ba7e-48b8-b057-aa75cf9c695d","path":"sprites/spr_disposition_small/spr_disposition_small.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"e77b6427-c350-4160-b06a-346aaf89d2fb","IsCreationKey":false,"Key":17.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"bfe18a47-5559-4a67-9b4a-bcbe2f79dee6","path":"sprites/spr_disposition_small/spr_disposition_small.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"3f713e9d-6c7e-423d-be83-7e2036f7a12f","IsCreationKey":false,"Key":18.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"d713f514-9693-4f7f-b0c0-f6019b536321","path":"sprites/spr_disposition_small/spr_disposition_small.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"b8e98a57-b0f0-4f37-ba00-4a66bb6db318","IsCreationKey":false,"Key":19.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"265ceb15-4b8f-4dc9-a884-5dcda1fe699c","path":"sprites/spr_disposition_small/spr_disposition_small.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"8e307151-41a5-41b6-b862-4438a5c7e325","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"2a2f2dcc-2dc9-4455-a25a-f8101ce83a5d","path":"sprites/spr_disposition_small/spr_disposition_small.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"df11f753-ac31-414a-be21-2408615ab6ef","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"da8c652b-5cd4-4a77-82fb-c4e5ddf12bcb","path":"sprites/spr_disposition_small/spr_disposition_small.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"26d46a87-74b7-47e4-be7a-f40c00f59ded","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"14e2bb36-0557-44c7-adc4-29fd8416ae52","path":"sprites/spr_disposition_small/spr_disposition_small.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"034fe571-6a88-44e9-86e2-2f1fbabd8bae","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"bb0286e5-715d-48cd-ae8d-55cc23aa8338","path":"sprites/spr_disposition_small/spr_disposition_small.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"5d2099ab-553c-41bf-85f9-d53de7c07705","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"94e48fa1-3322-45ba-92cf-f110f2459f0c","path":"sprites/spr_disposition_small/spr_disposition_small.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"98b1c16e-3a59-41f0-bff7-9dce3191cf08","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"0c040a23-c32e-44fa-9fcd-d9d73c08aae1","path":"sprites/spr_disposition_small/spr_disposition_small.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"c761ef3d-888c-4e34-b1a7-ca0e49826e0d","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"b28fff07-5ae9-4bd1-83ec-d132ebe19539","path":"sprites/spr_disposition_small/spr_disposition_small.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"bf5050c4-b78b-4cc5-895c-11b56e379d37","IsCreationKey":false,"Key":7.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"ccd4090d-a362-4e5a-ae92-93f64fd8f6eb","path":"sprites/spr_disposition_small/spr_disposition_small.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"0871f803-6f6a-4da9-b743-2bc6371e9901","IsCreationKey":false,"Key":8.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"6afb8843-a801-4150-bc19-748f64616e10","path":"sprites/spr_disposition_small/spr_disposition_small.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"3515c2e0-ed2e-4b09-9f8b-5ad40ee7b27e","IsCreationKey":false,"Key":9.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"e008a202-76e4-4962-a956-7a8b9821ad70","path":"sprites/spr_disposition_small/spr_disposition_small.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"4c2701ed-b5ac-430c-8e0d-237d677ad22e","IsCreationKey":false,"Key":10.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"d85dac91-f7e9-4bd7-b6fd-785c29834763","path":"sprites/spr_disposition_small/spr_disposition_small.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"a2679063-8d43-4cdb-aa80-e81608c9e268","IsCreationKey":false,"Key":11.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"ca49fe1f-56fa-4fc1-afc2-e9800609be80","path":"sprites/spr_disposition_small/spr_disposition_small.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"44ecbdf1-4beb-4b25-b137-5488f3afde8c","IsCreationKey":false,"Key":12.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"3f2bfa1c-4599-4db1-b938-6b2ef778ad28","path":"sprites/spr_disposition_small/spr_disposition_small.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"f6627939-2067-44e2-a27e-b929a9c7df9f","IsCreationKey":false,"Key":13.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"abc1f8ae-d1a3-4d6c-8ee3-5bd5f8787746","path":"sprites/spr_disposition_small/spr_disposition_small.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"ef18068d-97ab-4f38-a98a-26e303a5fa09","IsCreationKey":false,"Key":14.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"088f95db-0409-472a-97f2-bc8310ee706f","path":"sprites/spr_disposition_small/spr_disposition_small.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"82aee3c2-3e31-4660-8fbb-bbe314340aa9","IsCreationKey":false,"Key":15.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"202f3a87-4a57-4f10-a8cb-da641e276729","path":"sprites/spr_disposition_small/spr_disposition_small.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"3444a467-5735-4b89-b4f9-86a3bbbf2ce4","IsCreationKey":false,"Key":16.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"c9e74c28-ba7e-48b8-b057-aa75cf9c695d","path":"sprites/spr_disposition_small/spr_disposition_small.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"e77b6427-c350-4160-b06a-346aaf89d2fb","IsCreationKey":false,"Key":17.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"bfe18a47-5559-4a67-9b4a-bcbe2f79dee6","path":"sprites/spr_disposition_small/spr_disposition_small.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"3f713e9d-6c7e-423d-be83-7e2036f7a12f","IsCreationKey":false,"Key":18.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"d713f514-9693-4f7f-b0c0-f6019b536321","path":"sprites/spr_disposition_small/spr_disposition_small.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"b8e98a57-b0f0-4f37-ba00-4a66bb6db318","IsCreationKey":false,"Key":19.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":{ diff --git a/sprites/spr_dread_assault_cannon/spr_dread_assault_cannon.yy b/sprites/spr_dread_assault_cannon/spr_dread_assault_cannon.yy index 76a03f50df..075658e397 100644 --- a/sprites/spr_dread_assault_cannon/spr_dread_assault_cannon.yy +++ b/sprites/spr_dread_assault_cannon/spr_dread_assault_cannon.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_dread_assault_cannon", "bboxMode":0, "bbox_bottom":147, @@ -12,10 +12,10 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"c84e228f-f302-4ca0-ac09-90b28770fca7","name":"c84e228f-f302-4ca0-ac09-90b28770fca7","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"dd7d5c23-a6af-4857-8741-b07293907895","name":"dd7d5c23-a6af-4857-8741-b07293907895","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"ca9af1f8-d9c1-4f87-b306-8aaff6acf541","name":"ca9af1f8-d9c1-4f87-b306-8aaff6acf541","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"3ad2a58f-8454-4fc8-9d66-a796634adeca","name":"3ad2a58f-8454-4fc8-9d66-a796634adeca","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"c84e228f-f302-4ca0-ac09-90b28770fca7","name":"c84e228f-f302-4ca0-ac09-90b28770fca7","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"dd7d5c23-a6af-4857-8741-b07293907895","name":"dd7d5c23-a6af-4857-8741-b07293907895","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"ca9af1f8-d9c1-4f87-b306-8aaff6acf541","name":"ca9af1f8-d9c1-4f87-b306-8aaff6acf541","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"3ad2a58f-8454-4fc8-9d66-a796634adeca","name":"3ad2a58f-8454-4fc8-9d66-a796634adeca","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -72,18 +72,10 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"c84e228f-f302-4ca0-ac09-90b28770fca7","path":"sprites/spr_dread_assault_cannon/spr_dread_assault_cannon.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"67b44acf-1538-46ea-b63a-b708f7af59df","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"dd7d5c23-a6af-4857-8741-b07293907895","path":"sprites/spr_dread_assault_cannon/spr_dread_assault_cannon.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"f524085d-2d17-489f-8e0d-f55c64069e77","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"ca9af1f8-d9c1-4f87-b306-8aaff6acf541","path":"sprites/spr_dread_assault_cannon/spr_dread_assault_cannon.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"59917853-4104-45d6-a027-7f36bdb206d7","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"3ad2a58f-8454-4fc8-9d66-a796634adeca","path":"sprites/spr_dread_assault_cannon/spr_dread_assault_cannon.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"2d3ba6aa-ccf9-4708-858a-ec292b2c1b52","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"c84e228f-f302-4ca0-ac09-90b28770fca7","path":"sprites/spr_dread_assault_cannon/spr_dread_assault_cannon.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"67b44acf-1538-46ea-b63a-b708f7af59df","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"dd7d5c23-a6af-4857-8741-b07293907895","path":"sprites/spr_dread_assault_cannon/spr_dread_assault_cannon.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"f524085d-2d17-489f-8e0d-f55c64069e77","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"ca9af1f8-d9c1-4f87-b306-8aaff6acf541","path":"sprites/spr_dread_assault_cannon/spr_dread_assault_cannon.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"59917853-4104-45d6-a027-7f36bdb206d7","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"3ad2a58f-8454-4fc8-9d66-a796634adeca","path":"sprites/spr_dread_assault_cannon/spr_dread_assault_cannon.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"2d3ba6aa-ccf9-4708-858a-ec292b2c1b52","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_autocannon/spr_dread_autocannon.yy b/sprites/spr_dread_autocannon/spr_dread_autocannon.yy index 898adf19c6..42e419b959 100644 --- a/sprites/spr_dread_autocannon/spr_dread_autocannon.yy +++ b/sprites/spr_dread_autocannon/spr_dread_autocannon.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_dread_autocannon", "bboxMode":0, "bbox_bottom":135, @@ -12,10 +12,10 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"745b9ec2-90a6-4381-a7d8-db8fb386297b","name":"745b9ec2-90a6-4381-a7d8-db8fb386297b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"430ba383-8c34-4c5c-a443-2005ddb354ff","name":"430ba383-8c34-4c5c-a443-2005ddb354ff","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"6692383a-0d7e-4194-998f-fc3bf2067f77","name":"6692383a-0d7e-4194-998f-fc3bf2067f77","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"2567bd58-d13d-4cd9-9979-937b4d54e288","name":"2567bd58-d13d-4cd9-9979-937b4d54e288","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"745b9ec2-90a6-4381-a7d8-db8fb386297b","name":"745b9ec2-90a6-4381-a7d8-db8fb386297b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"430ba383-8c34-4c5c-a443-2005ddb354ff","name":"430ba383-8c34-4c5c-a443-2005ddb354ff","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"6692383a-0d7e-4194-998f-fc3bf2067f77","name":"6692383a-0d7e-4194-998f-fc3bf2067f77","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"2567bd58-d13d-4cd9-9979-937b4d54e288","name":"2567bd58-d13d-4cd9-9979-937b4d54e288","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -71,18 +71,10 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"745b9ec2-90a6-4381-a7d8-db8fb386297b","path":"sprites/spr_dread_autocannon/spr_dread_autocannon.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"7320a661-0b33-46b9-b0be-0961bc655444","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"430ba383-8c34-4c5c-a443-2005ddb354ff","path":"sprites/spr_dread_autocannon/spr_dread_autocannon.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"bce7996c-812d-45ff-9c6e-22f2033544fa","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"6692383a-0d7e-4194-998f-fc3bf2067f77","path":"sprites/spr_dread_autocannon/spr_dread_autocannon.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"b3edbe84-c124-4a89-a211-f745d8629411","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"2567bd58-d13d-4cd9-9979-937b4d54e288","path":"sprites/spr_dread_autocannon/spr_dread_autocannon.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"a239dd57-a41e-4c43-b5f5-aad2886cf134","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"745b9ec2-90a6-4381-a7d8-db8fb386297b","path":"sprites/spr_dread_autocannon/spr_dread_autocannon.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"7320a661-0b33-46b9-b0be-0961bc655444","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"430ba383-8c34-4c5c-a443-2005ddb354ff","path":"sprites/spr_dread_autocannon/spr_dread_autocannon.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"bce7996c-812d-45ff-9c6e-22f2033544fa","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"6692383a-0d7e-4194-998f-fc3bf2067f77","path":"sprites/spr_dread_autocannon/spr_dread_autocannon.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"b3edbe84-c124-4a89-a211-f745d8629411","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"2567bd58-d13d-4cd9-9979-937b4d54e288","path":"sprites/spr_dread_autocannon/spr_dread_autocannon.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"a239dd57-a41e-4c43-b5f5-aad2886cf134","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_claw/spr_dread_claw.yy b/sprites/spr_dread_claw/spr_dread_claw.yy index 400750c5c9..a959601858 100644 --- a/sprites/spr_dread_claw/spr_dread_claw.yy +++ b/sprites/spr_dread_claw/spr_dread_claw.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_dread_claw", "bboxMode":0, "bbox_bottom":149, @@ -12,10 +12,10 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"6a74ce9f-a9b4-4216-a14f-8b9414602232","name":"6a74ce9f-a9b4-4216-a14f-8b9414602232","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"c66f97c4-ce8b-427b-8ab0-baac7d95dda9","name":"c66f97c4-ce8b-427b-8ab0-baac7d95dda9","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"edc36065-c8cc-48b7-b999-6a9a9665befa","name":"edc36065-c8cc-48b7-b999-6a9a9665befa","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"57ec1b81-3fc4-4e51-a911-7dce140119ae","name":"57ec1b81-3fc4-4e51-a911-7dce140119ae","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"6a74ce9f-a9b4-4216-a14f-8b9414602232","name":"6a74ce9f-a9b4-4216-a14f-8b9414602232","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"c66f97c4-ce8b-427b-8ab0-baac7d95dda9","name":"c66f97c4-ce8b-427b-8ab0-baac7d95dda9","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"edc36065-c8cc-48b7-b999-6a9a9665befa","name":"edc36065-c8cc-48b7-b999-6a9a9665befa","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"57ec1b81-3fc4-4e51-a911-7dce140119ae","name":"57ec1b81-3fc4-4e51-a911-7dce140119ae","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -71,18 +71,10 @@ "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_colors/spr_dread_colors.yy b/sprites/spr_dread_colors/spr_dread_colors.yy index 1e4dfe3d22..69345b196f 100644 --- a/sprites/spr_dread_colors/spr_dread_colors.yy +++ b/sprites/spr_dread_colors/spr_dread_colors.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_dread_colors", "bboxMode":0, "bbox_bottom":188, @@ -12,12 +12,12 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"361fe342-cd6d-494f-8a77-1f154dcaeba8","name":"361fe342-cd6d-494f-8a77-1f154dcaeba8","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"708b2730-d6a6-47d6-bff4-80924a61a262","name":"708b2730-d6a6-47d6-bff4-80924a61a262","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"d165c00f-8a0b-4d33-80a1-9d57b2540446","name":"d165c00f-8a0b-4d33-80a1-9d57b2540446","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"4cca7a25-d5e6-4e39-8323-49026e09fcaf","name":"4cca7a25-d5e6-4e39-8323-49026e09fcaf","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"2bad7f29-a2ae-422e-b6a3-8448166aeab1","name":"2bad7f29-a2ae-422e-b6a3-8448166aeab1","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"d955ed23-b03e-46e7-91c2-8fb8d923f972","name":"d955ed23-b03e-46e7-91c2-8fb8d923f972","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"361fe342-cd6d-494f-8a77-1f154dcaeba8","name":"361fe342-cd6d-494f-8a77-1f154dcaeba8","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"708b2730-d6a6-47d6-bff4-80924a61a262","name":"708b2730-d6a6-47d6-bff4-80924a61a262","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"d165c00f-8a0b-4d33-80a1-9d57b2540446","name":"d165c00f-8a0b-4d33-80a1-9d57b2540446","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"4cca7a25-d5e6-4e39-8323-49026e09fcaf","name":"4cca7a25-d5e6-4e39-8323-49026e09fcaf","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"2bad7f29-a2ae-422e-b6a3-8448166aeab1","name":"2bad7f29-a2ae-422e-b6a3-8448166aeab1","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"d955ed23-b03e-46e7-91c2-8fb8d923f972","name":"d955ed23-b03e-46e7-91c2-8fb8d923f972","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -73,24 +73,12 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"361fe342-cd6d-494f-8a77-1f154dcaeba8","path":"sprites/spr_dread_colors/spr_dread_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"f942abc3-6b58-4c8f-a9d3-1d0117658510","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"708b2730-d6a6-47d6-bff4-80924a61a262","path":"sprites/spr_dread_colors/spr_dread_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"633b449f-a51c-493a-80e5-354707b65443","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"d165c00f-8a0b-4d33-80a1-9d57b2540446","path":"sprites/spr_dread_colors/spr_dread_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"70848c74-dde7-4d5e-bc82-e5af29cb121d","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"4cca7a25-d5e6-4e39-8323-49026e09fcaf","path":"sprites/spr_dread_colors/spr_dread_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"cf3cc946-ed66-4919-816d-eee08c339e11","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"2bad7f29-a2ae-422e-b6a3-8448166aeab1","path":"sprites/spr_dread_colors/spr_dread_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"d29c0bec-ce6b-4407-bdce-02cf253ac864","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"d955ed23-b03e-46e7-91c2-8fb8d923f972","path":"sprites/spr_dread_colors/spr_dread_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"0e763d81-9898-48c2-aca9-36d0533365e4","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"361fe342-cd6d-494f-8a77-1f154dcaeba8","path":"sprites/spr_dread_colors/spr_dread_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"f942abc3-6b58-4c8f-a9d3-1d0117658510","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"708b2730-d6a6-47d6-bff4-80924a61a262","path":"sprites/spr_dread_colors/spr_dread_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"633b449f-a51c-493a-80e5-354707b65443","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"d165c00f-8a0b-4d33-80a1-9d57b2540446","path":"sprites/spr_dread_colors/spr_dread_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"70848c74-dde7-4d5e-bc82-e5af29cb121d","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"4cca7a25-d5e6-4e39-8323-49026e09fcaf","path":"sprites/spr_dread_colors/spr_dread_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"cf3cc946-ed66-4919-816d-eee08c339e11","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"2bad7f29-a2ae-422e-b6a3-8448166aeab1","path":"sprites/spr_dread_colors/spr_dread_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"d29c0bec-ce6b-4407-bdce-02cf253ac864","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"d955ed23-b03e-46e7-91c2-8fb8d923f972","path":"sprites/spr_dread_colors/spr_dread_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"0e763d81-9898-48c2-aca9-36d0533365e4","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_dread_heavy_bolter/spr_dread_heavy_bolter.yy b/sprites/spr_dread_heavy_bolter/spr_dread_heavy_bolter.yy index a22073c890..3d28dbcc67 100644 --- a/sprites/spr_dread_heavy_bolter/spr_dread_heavy_bolter.yy +++ b/sprites/spr_dread_heavy_bolter/spr_dread_heavy_bolter.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_dread_heavy_bolter", "bboxMode":0, "bbox_bottom":161, @@ -12,10 +12,10 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"0e84c437-f0a8-4de3-a069-030fbbde3c3a","name":"0e84c437-f0a8-4de3-a069-030fbbde3c3a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"9fa15ed7-cd79-4acd-83d9-95ecf0be332f","name":"9fa15ed7-cd79-4acd-83d9-95ecf0be332f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"b9dd1c82-3f7f-4a18-864f-e78a4b0ed9d6","name":"b9dd1c82-3f7f-4a18-864f-e78a4b0ed9d6","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"d244aeeb-dbac-49cb-ba6a-cc8c95d420f4","name":"d244aeeb-dbac-49cb-ba6a-cc8c95d420f4","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"0e84c437-f0a8-4de3-a069-030fbbde3c3a","name":"0e84c437-f0a8-4de3-a069-030fbbde3c3a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"9fa15ed7-cd79-4acd-83d9-95ecf0be332f","name":"9fa15ed7-cd79-4acd-83d9-95ecf0be332f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"b9dd1c82-3f7f-4a18-864f-e78a4b0ed9d6","name":"b9dd1c82-3f7f-4a18-864f-e78a4b0ed9d6","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"d244aeeb-dbac-49cb-ba6a-cc8c95d420f4","name":"d244aeeb-dbac-49cb-ba6a-cc8c95d420f4","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -71,18 +71,10 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"0e84c437-f0a8-4de3-a069-030fbbde3c3a","path":"sprites/spr_dread_heavy_bolter/spr_dread_heavy_bolter.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"8cfd5cb7-7f48-45c5-a00f-8787ce85d23c","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"9fa15ed7-cd79-4acd-83d9-95ecf0be332f","path":"sprites/spr_dread_heavy_bolter/spr_dread_heavy_bolter.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"908060ba-7006-42e9-940d-3639378698fe","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"b9dd1c82-3f7f-4a18-864f-e78a4b0ed9d6","path":"sprites/spr_dread_heavy_bolter/spr_dread_heavy_bolter.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"6d2fa763-d40a-4434-8aa5-af95172f89f6","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"d244aeeb-dbac-49cb-ba6a-cc8c95d420f4","path":"sprites/spr_dread_heavy_bolter/spr_dread_heavy_bolter.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"54b9f603-c68d-4b23-8069-73471fba2d1c","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"0e84c437-f0a8-4de3-a069-030fbbde3c3a","path":"sprites/spr_dread_heavy_bolter/spr_dread_heavy_bolter.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"8cfd5cb7-7f48-45c5-a00f-8787ce85d23c","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"9fa15ed7-cd79-4acd-83d9-95ecf0be332f","path":"sprites/spr_dread_heavy_bolter/spr_dread_heavy_bolter.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"908060ba-7006-42e9-940d-3639378698fe","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"b9dd1c82-3f7f-4a18-864f-e78a4b0ed9d6","path":"sprites/spr_dread_heavy_bolter/spr_dread_heavy_bolter.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"6d2fa763-d40a-4434-8aa5-af95172f89f6","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"d244aeeb-dbac-49cb-ba6a-cc8c95d420f4","path":"sprites/spr_dread_heavy_bolter/spr_dread_heavy_bolter.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"54b9f603-c68d-4b23-8069-73471fba2d1c","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 1ee90b23ef..193f8faabf 100644 --- a/sprites/spr_dread_iron_clad/spr_dread_iron_clad.yy +++ b/sprites/spr_dread_iron_clad/spr_dread_iron_clad.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_dread_iron_clad", "bboxMode":0, "bbox_bottom":126, @@ -12,10 +12,10 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"659ee02b-897e-4104-b145-c359f7650d83","name":"659ee02b-897e-4104-b145-c359f7650d83","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"f5bd9088-45e5-4695-a241-41e7835f44fd","name":"f5bd9088-45e5-4695-a241-41e7835f44fd","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"eb254b9d-bb2c-41f8-9e62-ad9069c99560","name":"eb254b9d-bb2c-41f8-9e62-ad9069c99560","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"5e9f2a9c-b557-4f1c-96d7-58994bd08c54","name":"5e9f2a9c-b557-4f1c-96d7-58994bd08c54","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"659ee02b-897e-4104-b145-c359f7650d83","name":"659ee02b-897e-4104-b145-c359f7650d83","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"f5bd9088-45e5-4695-a241-41e7835f44fd","name":"f5bd9088-45e5-4695-a241-41e7835f44fd","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"eb254b9d-bb2c-41f8-9e62-ad9069c99560","name":"eb254b9d-bb2c-41f8-9e62-ad9069c99560","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"5e9f2a9c-b557-4f1c-96d7-58994bd08c54","name":"5e9f2a9c-b557-4f1c-96d7-58994bd08c54","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -72,18 +72,10 @@ "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_dread_lascannon/spr_dread_lascannon.yy b/sprites/spr_dread_lascannon/spr_dread_lascannon.yy index fc10174dc1..f070a4d9a2 100644 --- a/sprites/spr_dread_lascannon/spr_dread_lascannon.yy +++ b/sprites/spr_dread_lascannon/spr_dread_lascannon.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_dread_lascannon", "bboxMode":0, "bbox_bottom":147, @@ -12,10 +12,10 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"7a4dd223-f227-41f5-b68a-f206094e2789","name":"7a4dd223-f227-41f5-b68a-f206094e2789","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"48994d0c-01f0-441c-9383-c0eafe9cae39","name":"48994d0c-01f0-441c-9383-c0eafe9cae39","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"fc539d0b-b559-4265-95a9-df8bac65ea2b","name":"fc539d0b-b559-4265-95a9-df8bac65ea2b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"243e4946-be2b-4339-b336-5253d6514685","name":"243e4946-be2b-4339-b336-5253d6514685","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"7a4dd223-f227-41f5-b68a-f206094e2789","name":"7a4dd223-f227-41f5-b68a-f206094e2789","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"48994d0c-01f0-441c-9383-c0eafe9cae39","name":"48994d0c-01f0-441c-9383-c0eafe9cae39","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"fc539d0b-b559-4265-95a9-df8bac65ea2b","name":"fc539d0b-b559-4265-95a9-df8bac65ea2b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"243e4946-be2b-4339-b336-5253d6514685","name":"243e4946-be2b-4339-b336-5253d6514685","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -72,18 +72,10 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"7a4dd223-f227-41f5-b68a-f206094e2789","path":"sprites/spr_dread_lascannon/spr_dread_lascannon.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"4c67a973-13fd-4cc5-9173-7d7899f31e93","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"48994d0c-01f0-441c-9383-c0eafe9cae39","path":"sprites/spr_dread_lascannon/spr_dread_lascannon.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"07736577-6138-4e0a-8b8c-d34946402720","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"fc539d0b-b559-4265-95a9-df8bac65ea2b","path":"sprites/spr_dread_lascannon/spr_dread_lascannon.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"c4264f38-ca9a-4c52-a7c2-46e73fb40e5d","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"243e4946-be2b-4339-b336-5253d6514685","path":"sprites/spr_dread_lascannon/spr_dread_lascannon.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"79b47047-c38c-4291-9d1d-bcd6d2aa31ac","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"7a4dd223-f227-41f5-b68a-f206094e2789","path":"sprites/spr_dread_lascannon/spr_dread_lascannon.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"4c67a973-13fd-4cc5-9173-7d7899f31e93","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"48994d0c-01f0-441c-9383-c0eafe9cae39","path":"sprites/spr_dread_lascannon/spr_dread_lascannon.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"07736577-6138-4e0a-8b8c-d34946402720","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"fc539d0b-b559-4265-95a9-df8bac65ea2b","path":"sprites/spr_dread_lascannon/spr_dread_lascannon.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"c4264f38-ca9a-4c52-a7c2-46e73fb40e5d","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"243e4946-be2b-4339-b336-5253d6514685","path":"sprites/spr_dread_lascannon/spr_dread_lascannon.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"79b47047-c38c-4291-9d1d-bcd6d2aa31ac","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_missile/spr_dread_missile.yy b/sprites/spr_dread_missile/spr_dread_missile.yy index 95f234ff3a..c3560a211f 100644 --- a/sprites/spr_dread_missile/spr_dread_missile.yy +++ b/sprites/spr_dread_missile/spr_dread_missile.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_dread_missile", "bboxMode":0, "bbox_bottom":128, @@ -12,10 +12,10 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"737d52a6-df9c-4e48-8622-c0b852027c2f","name":"737d52a6-df9c-4e48-8622-c0b852027c2f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"7fa6bc12-162e-4538-92df-3bc73caec0ee","name":"7fa6bc12-162e-4538-92df-3bc73caec0ee","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"098fd89a-d321-4251-b0f3-70132fea3997","name":"098fd89a-d321-4251-b0f3-70132fea3997","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"b88af3eb-d9a5-46d6-aae2-0ca08fd69c1c","name":"b88af3eb-d9a5-46d6-aae2-0ca08fd69c1c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"737d52a6-df9c-4e48-8622-c0b852027c2f","name":"737d52a6-df9c-4e48-8622-c0b852027c2f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"7fa6bc12-162e-4538-92df-3bc73caec0ee","name":"7fa6bc12-162e-4538-92df-3bc73caec0ee","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"098fd89a-d321-4251-b0f3-70132fea3997","name":"098fd89a-d321-4251-b0f3-70132fea3997","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"b88af3eb-d9a5-46d6-aae2-0ca08fd69c1c","name":"b88af3eb-d9a5-46d6-aae2-0ca08fd69c1c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -72,18 +72,10 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"737d52a6-df9c-4e48-8622-c0b852027c2f","path":"sprites/spr_dread_missile/spr_dread_missile.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"91868ede-eed2-47ff-a436-f5de3e22a7b1","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"7fa6bc12-162e-4538-92df-3bc73caec0ee","path":"sprites/spr_dread_missile/spr_dread_missile.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"c1b75f6f-5c00-4e75-9ad1-3dd22e2756af","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"098fd89a-d321-4251-b0f3-70132fea3997","path":"sprites/spr_dread_missile/spr_dread_missile.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"41ff1a87-5f14-4f20-bf2a-9faa2e5e734e","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"b88af3eb-d9a5-46d6-aae2-0ca08fd69c1c","path":"sprites/spr_dread_missile/spr_dread_missile.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"76bea7ed-ee53-46d6-a834-7d3967e4c4ce","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"737d52a6-df9c-4e48-8622-c0b852027c2f","path":"sprites/spr_dread_missile/spr_dread_missile.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"91868ede-eed2-47ff-a436-f5de3e22a7b1","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"7fa6bc12-162e-4538-92df-3bc73caec0ee","path":"sprites/spr_dread_missile/spr_dread_missile.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"c1b75f6f-5c00-4e75-9ad1-3dd22e2756af","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"098fd89a-d321-4251-b0f3-70132fea3997","path":"sprites/spr_dread_missile/spr_dread_missile.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"41ff1a87-5f14-4f20-bf2a-9faa2e5e734e","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"b88af3eb-d9a5-46d6-aae2-0ca08fd69c1c","path":"sprites/spr_dread_missile/spr_dread_missile.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"76bea7ed-ee53-46d6-a834-7d3967e4c4ce","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_plasma_cannon/spr_dread_plasma_cannon.yy b/sprites/spr_dread_plasma_cannon/spr_dread_plasma_cannon.yy index d66ffdb671..f77187eb07 100644 --- a/sprites/spr_dread_plasma_cannon/spr_dread_plasma_cannon.yy +++ b/sprites/spr_dread_plasma_cannon/spr_dread_plasma_cannon.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_dread_plasma_cannon", "bboxMode":0, "bbox_bottom":147, @@ -12,10 +12,10 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"6b155309-549e-4057-b0c0-b879145278ee","name":"6b155309-549e-4057-b0c0-b879145278ee","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"e1bf2ef8-95a8-4a6c-8464-f7b44f6675a3","name":"e1bf2ef8-95a8-4a6c-8464-f7b44f6675a3","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"76458a7c-df41-4efe-ac58-2273c4d3e898","name":"76458a7c-df41-4efe-ac58-2273c4d3e898","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"3df31b55-fa5a-4b05-995b-1cfbf07f3692","name":"3df31b55-fa5a-4b05-995b-1cfbf07f3692","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"6b155309-549e-4057-b0c0-b879145278ee","name":"6b155309-549e-4057-b0c0-b879145278ee","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"e1bf2ef8-95a8-4a6c-8464-f7b44f6675a3","name":"e1bf2ef8-95a8-4a6c-8464-f7b44f6675a3","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"76458a7c-df41-4efe-ac58-2273c4d3e898","name":"76458a7c-df41-4efe-ac58-2273c4d3e898","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"3df31b55-fa5a-4b05-995b-1cfbf07f3692","name":"3df31b55-fa5a-4b05-995b-1cfbf07f3692","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -72,18 +72,10 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"6b155309-549e-4057-b0c0-b879145278ee","path":"sprites/spr_dread_plasma_cannon/spr_dread_plasma_cannon.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"9e899125-e7fc-420b-992c-b1a32e23760d","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"e1bf2ef8-95a8-4a6c-8464-f7b44f6675a3","path":"sprites/spr_dread_plasma_cannon/spr_dread_plasma_cannon.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"0979e353-07ec-4650-8616-9e9829617ba8","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"76458a7c-df41-4efe-ac58-2273c4d3e898","path":"sprites/spr_dread_plasma_cannon/spr_dread_plasma_cannon.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"fc68c8a5-de96-40f2-94eb-1182554da373","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"3df31b55-fa5a-4b05-995b-1cfbf07f3692","path":"sprites/spr_dread_plasma_cannon/spr_dread_plasma_cannon.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"6d2733b9-23ec-4b2e-8af3-44b12da58cf6","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"6b155309-549e-4057-b0c0-b879145278ee","path":"sprites/spr_dread_plasma_cannon/spr_dread_plasma_cannon.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"9e899125-e7fc-420b-992c-b1a32e23760d","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"e1bf2ef8-95a8-4a6c-8464-f7b44f6675a3","path":"sprites/spr_dread_plasma_cannon/spr_dread_plasma_cannon.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"0979e353-07ec-4650-8616-9e9829617ba8","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"76458a7c-df41-4efe-ac58-2273c4d3e898","path":"sprites/spr_dread_plasma_cannon/spr_dread_plasma_cannon.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"fc68c8a5-de96-40f2-94eb-1182554da373","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"3df31b55-fa5a-4b05-995b-1cfbf07f3692","path":"sprites/spr_dread_plasma_cannon/spr_dread_plasma_cannon.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"6d2733b9-23ec-4b2e-8af3-44b12da58cf6","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 b8bcd22279..b70a168864 100644 --- a/sprites/spr_dreadnought_chasis_colors/spr_dreadnought_chasis_colors.yy +++ b/sprites/spr_dreadnought_chasis_colors/spr_dreadnought_chasis_colors.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_dreadnought_chasis_colors", "bboxMode":0, "bbox_bottom":207, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"643bbde4-1fea-4393-8d81-fd6c3ced5272","name":"643bbde4-1fea-4393-8d81-fd6c3ced5272","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"643bbde4-1fea-4393-8d81-fd6c3ced5272","name":"643bbde4-1fea-4393-8d81-fd6c3ced5272","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -69,9 +69,7 @@ "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_complex/spr_dreadnought_complex.yy b/sprites/spr_dreadnought_complex/spr_dreadnought_complex.yy index db4048c15e..fed4ab70d6 100644 --- a/sprites/spr_dreadnought_complex/spr_dreadnought_complex.yy +++ b/sprites/spr_dreadnought_complex/spr_dreadnought_complex.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_dreadnought_complex", "bboxMode":0, "bbox_bottom":207, @@ -12,9 +12,9 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"aabebdae-4337-4746-b7cf-292919a40ce4","name":"aabebdae-4337-4746-b7cf-292919a40ce4","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"113b3a46-7ce2-45a1-87a5-79b52a0f3314","name":"113b3a46-7ce2-45a1-87a5-79b52a0f3314","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"643bbde4-1fea-4393-8d81-fd6c3ced5272","name":"643bbde4-1fea-4393-8d81-fd6c3ced5272","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"aabebdae-4337-4746-b7cf-292919a40ce4","name":"aabebdae-4337-4746-b7cf-292919a40ce4","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"113b3a46-7ce2-45a1-87a5-79b52a0f3314","name":"113b3a46-7ce2-45a1-87a5-79b52a0f3314","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"643bbde4-1fea-4393-8d81-fd6c3ced5272","name":"643bbde4-1fea-4393-8d81-fd6c3ced5272","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -71,15 +71,9 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"aabebdae-4337-4746-b7cf-292919a40ce4","path":"sprites/spr_dreadnought_complex/spr_dreadnought_complex.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"65bae6f8-d3e2-4194-bb96-1b9a164e1363","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"113b3a46-7ce2-45a1-87a5-79b52a0f3314","path":"sprites/spr_dreadnought_complex/spr_dreadnought_complex.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"6dd38061-8f30-4017-9c12-2a438b531089","IsCreationKey":false,"Key":1.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_complex/spr_dreadnought_complex.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"af61cb93-84de-4fd7-8b9f-571f6d621427","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"aabebdae-4337-4746-b7cf-292919a40ce4","path":"sprites/spr_dreadnought_complex/spr_dreadnought_complex.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"65bae6f8-d3e2-4194-bb96-1b9a164e1363","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"113b3a46-7ce2-45a1-87a5-79b52a0f3314","path":"sprites/spr_dreadnought_complex/spr_dreadnought_complex.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"6dd38061-8f30-4017-9c12-2a438b531089","IsCreationKey":false,"Key":1.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_complex/spr_dreadnought_complex.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"af61cb93-84de-4fd7-8b9f-571f6d621427","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_dreadnought_decorations/spr_dreadnought_decorations.yy b/sprites/spr_dreadnought_decorations/spr_dreadnought_decorations.yy index cf7d17e80e..85357e3a03 100644 --- a/sprites/spr_dreadnought_decorations/spr_dreadnought_decorations.yy +++ b/sprites/spr_dreadnought_decorations/spr_dreadnought_decorations.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_dreadnought_decorations", "bboxMode":0, "bbox_bottom":98, @@ -12,9 +12,9 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"69e1b091-39fa-466c-90b9-3f95c7e9c166","name":"69e1b091-39fa-466c-90b9-3f95c7e9c166","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"8033e364-cf92-46f9-ab1d-5c89b6ac7bd4","name":"8033e364-cf92-46f9-ab1d-5c89b6ac7bd4","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"b4ca3de8-8303-4af4-9873-ba8290935271","name":"b4ca3de8-8303-4af4-9873-ba8290935271","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"69e1b091-39fa-466c-90b9-3f95c7e9c166","name":"69e1b091-39fa-466c-90b9-3f95c7e9c166","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"8033e364-cf92-46f9-ab1d-5c89b6ac7bd4","name":"8033e364-cf92-46f9-ab1d-5c89b6ac7bd4","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"b4ca3de8-8303-4af4-9873-ba8290935271","name":"b4ca3de8-8303-4af4-9873-ba8290935271","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -70,15 +70,9 @@ "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_eldar_hire/spr_eldar_hire.yy b/sprites/spr_eldar_hire/spr_eldar_hire.yy index 4b188788c5..9cd2d8e462 100644 --- a/sprites/spr_eldar_hire/spr_eldar_hire.yy +++ b/sprites/spr_eldar_hire/spr_eldar_hire.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_eldar_hire", "bboxMode":0, "bbox_bottom":231, @@ -12,8 +12,8 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"fcce8b7b-d159-475d-aeba-afbc8d91bd88","name":"fcce8b7b-d159-475d-aeba-afbc8d91bd88","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"cfdb2e30-1c91-4238-8b6f-4b1e16f1ff9f","name":"cfdb2e30-1c91-4238-8b6f-4b1e16f1ff9f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"fcce8b7b-d159-475d-aeba-afbc8d91bd88","name":"fcce8b7b-d159-475d-aeba-afbc8d91bd88","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"cfdb2e30-1c91-4238-8b6f-4b1e16f1ff9f","name":"cfdb2e30-1c91-4238-8b6f-4b1e16f1ff9f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -71,12 +71,8 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"fcce8b7b-d159-475d-aeba-afbc8d91bd88","path":"sprites/spr_eldar_hire/spr_eldar_hire.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"726d2a74-104c-4f7b-9aa9-94384a3016da","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"cfdb2e30-1c91-4238-8b6f-4b1e16f1ff9f","path":"sprites/spr_eldar_hire/spr_eldar_hire.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"c601feea-f73e-4b85-9b2e-6dff6fbdc36a","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"fcce8b7b-d159-475d-aeba-afbc8d91bd88","path":"sprites/spr_eldar_hire/spr_eldar_hire.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"726d2a74-104c-4f7b-9aa9-94384a3016da","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"cfdb2e30-1c91-4238-8b6f-4b1e16f1ff9f","path":"sprites/spr_eldar_hire/spr_eldar_hire.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"c601feea-f73e-4b85-9b2e-6dff6fbdc36a","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_errant_colors/spr_errant_colors.yy b/sprites/spr_errant_colors/spr_errant_colors.yy index a3d10eb2ce..dbb1c44ec9 100644 --- a/sprites/spr_errant_colors/spr_errant_colors.yy +++ b/sprites/spr_errant_colors/spr_errant_colors.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_errant_colors", "bboxMode":0, "bbox_bottom":220, @@ -12,20 +12,20 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"9544e4ca-8deb-4023-9e28-01c84f22df16","name":"9544e4ca-8deb-4023-9e28-01c84f22df16","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"a10b8352-7ebd-4760-a267-f798c056d29b","name":"a10b8352-7ebd-4760-a267-f798c056d29b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"a13b51ac-8465-4bd9-aa02-a3b1ca560d5a","name":"a13b51ac-8465-4bd9-aa02-a3b1ca560d5a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"fb6be082-0971-43b9-adc2-1e913811792c","name":"fb6be082-0971-43b9-adc2-1e913811792c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"d9e37e7d-57f0-4303-beb4-89e0af9b3c98","name":"d9e37e7d-57f0-4303-beb4-89e0af9b3c98","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"c3e99394-9ba0-49af-b3f2-ef587fe31d2e","name":"c3e99394-9ba0-49af-b3f2-ef587fe31d2e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"fa550e91-d624-4e98-9f5c-b27a5ab79b7e","name":"fa550e91-d624-4e98-9f5c-b27a5ab79b7e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"81780b9c-0152-4ef1-b48c-9d32528bfbce","name":"81780b9c-0152-4ef1-b48c-9d32528bfbce","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"46302f6a-d029-4696-be8d-80565fe68ad6","name":"46302f6a-d029-4696-be8d-80565fe68ad6","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"5804db76-68ed-45cb-a1b6-6e69f28a82de","name":"5804db76-68ed-45cb-a1b6-6e69f28a82de","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"29cafcd6-1452-4dc1-ae23-e39fc4da0a04","name":"29cafcd6-1452-4dc1-ae23-e39fc4da0a04","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"1f2e4413-c5e8-4d53-b8a6-7af03ccb43fb","name":"1f2e4413-c5e8-4d53-b8a6-7af03ccb43fb","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"eaf461bb-883a-4c3e-b1ab-da51ab9cebba","name":"eaf461bb-883a-4c3e-b1ab-da51ab9cebba","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"5e134dab-8a69-4cf9-8b68-08b8e35d4e0b","name":"5e134dab-8a69-4cf9-8b68-08b8e35d4e0b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"9544e4ca-8deb-4023-9e28-01c84f22df16","name":"9544e4ca-8deb-4023-9e28-01c84f22df16","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"a10b8352-7ebd-4760-a267-f798c056d29b","name":"a10b8352-7ebd-4760-a267-f798c056d29b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"a13b51ac-8465-4bd9-aa02-a3b1ca560d5a","name":"a13b51ac-8465-4bd9-aa02-a3b1ca560d5a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"fb6be082-0971-43b9-adc2-1e913811792c","name":"fb6be082-0971-43b9-adc2-1e913811792c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"d9e37e7d-57f0-4303-beb4-89e0af9b3c98","name":"d9e37e7d-57f0-4303-beb4-89e0af9b3c98","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"c3e99394-9ba0-49af-b3f2-ef587fe31d2e","name":"c3e99394-9ba0-49af-b3f2-ef587fe31d2e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"fa550e91-d624-4e98-9f5c-b27a5ab79b7e","name":"fa550e91-d624-4e98-9f5c-b27a5ab79b7e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"81780b9c-0152-4ef1-b48c-9d32528bfbce","name":"81780b9c-0152-4ef1-b48c-9d32528bfbce","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"46302f6a-d029-4696-be8d-80565fe68ad6","name":"46302f6a-d029-4696-be8d-80565fe68ad6","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"5804db76-68ed-45cb-a1b6-6e69f28a82de","name":"5804db76-68ed-45cb-a1b6-6e69f28a82de","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"29cafcd6-1452-4dc1-ae23-e39fc4da0a04","name":"29cafcd6-1452-4dc1-ae23-e39fc4da0a04","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"1f2e4413-c5e8-4d53-b8a6-7af03ccb43fb","name":"1f2e4413-c5e8-4d53-b8a6-7af03ccb43fb","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"eaf461bb-883a-4c3e-b1ab-da51ab9cebba","name":"eaf461bb-883a-4c3e-b1ab-da51ab9cebba","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"5e134dab-8a69-4cf9-8b68-08b8e35d4e0b","name":"5e134dab-8a69-4cf9-8b68-08b8e35d4e0b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -81,48 +81,20 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"9544e4ca-8deb-4023-9e28-01c84f22df16","path":"sprites/spr_errant_colors/spr_errant_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"386c1cd2-14c2-4486-b4b8-8bf0c2eef1e7","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"a10b8352-7ebd-4760-a267-f798c056d29b","path":"sprites/spr_errant_colors/spr_errant_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"a708a2b1-f744-4e46-b7c0-527418a862aa","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"a13b51ac-8465-4bd9-aa02-a3b1ca560d5a","path":"sprites/spr_errant_colors/spr_errant_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"b25944be-5eba-494a-b10a-2809827e3a27","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"fb6be082-0971-43b9-adc2-1e913811792c","path":"sprites/spr_errant_colors/spr_errant_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"2967068b-c211-47ce-bc52-8fdaa30a3cd2","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"d9e37e7d-57f0-4303-beb4-89e0af9b3c98","path":"sprites/spr_errant_colors/spr_errant_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"be148d13-3b3f-4248-bd42-e6363882155f","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"c3e99394-9ba0-49af-b3f2-ef587fe31d2e","path":"sprites/spr_errant_colors/spr_errant_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"4fe5d94c-5588-45d5-8ad1-110fb67d26ec","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"fa550e91-d624-4e98-9f5c-b27a5ab79b7e","path":"sprites/spr_errant_colors/spr_errant_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"0888e933-4c29-4190-b7fd-a30231124397","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"81780b9c-0152-4ef1-b48c-9d32528bfbce","path":"sprites/spr_errant_colors/spr_errant_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"539c145b-3fd4-4b1e-8292-e3cff3c2f037","IsCreationKey":false,"Key":7.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"46302f6a-d029-4696-be8d-80565fe68ad6","path":"sprites/spr_errant_colors/spr_errant_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"4b754efb-eeb3-4086-8b5d-22878e235bea","IsCreationKey":false,"Key":8.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"5804db76-68ed-45cb-a1b6-6e69f28a82de","path":"sprites/spr_errant_colors/spr_errant_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"67744f2d-aa0e-42d6-bef0-0259800b2442","IsCreationKey":false,"Key":9.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"29cafcd6-1452-4dc1-ae23-e39fc4da0a04","path":"sprites/spr_errant_colors/spr_errant_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"94da88c6-5ce0-4357-ba9a-8b10c81594b3","IsCreationKey":false,"Key":10.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"1f2e4413-c5e8-4d53-b8a6-7af03ccb43fb","path":"sprites/spr_errant_colors/spr_errant_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"afddc36c-cbe5-4855-9ad8-1d0b1b349b3a","IsCreationKey":false,"Key":11.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"eaf461bb-883a-4c3e-b1ab-da51ab9cebba","path":"sprites/spr_errant_colors/spr_errant_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"ed65ebcd-beaf-4643-b94d-1ad4638917d3","IsCreationKey":false,"Key":12.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"5e134dab-8a69-4cf9-8b68-08b8e35d4e0b","path":"sprites/spr_errant_colors/spr_errant_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"45a581ba-1236-44d3-8e79-b8ad3c1b25bb","IsCreationKey":false,"Key":13.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"9544e4ca-8deb-4023-9e28-01c84f22df16","path":"sprites/spr_errant_colors/spr_errant_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"386c1cd2-14c2-4486-b4b8-8bf0c2eef1e7","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"a10b8352-7ebd-4760-a267-f798c056d29b","path":"sprites/spr_errant_colors/spr_errant_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"a708a2b1-f744-4e46-b7c0-527418a862aa","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"a13b51ac-8465-4bd9-aa02-a3b1ca560d5a","path":"sprites/spr_errant_colors/spr_errant_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"b25944be-5eba-494a-b10a-2809827e3a27","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"fb6be082-0971-43b9-adc2-1e913811792c","path":"sprites/spr_errant_colors/spr_errant_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"2967068b-c211-47ce-bc52-8fdaa30a3cd2","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"d9e37e7d-57f0-4303-beb4-89e0af9b3c98","path":"sprites/spr_errant_colors/spr_errant_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"be148d13-3b3f-4248-bd42-e6363882155f","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"c3e99394-9ba0-49af-b3f2-ef587fe31d2e","path":"sprites/spr_errant_colors/spr_errant_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"4fe5d94c-5588-45d5-8ad1-110fb67d26ec","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"fa550e91-d624-4e98-9f5c-b27a5ab79b7e","path":"sprites/spr_errant_colors/spr_errant_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"0888e933-4c29-4190-b7fd-a30231124397","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"81780b9c-0152-4ef1-b48c-9d32528bfbce","path":"sprites/spr_errant_colors/spr_errant_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"539c145b-3fd4-4b1e-8292-e3cff3c2f037","IsCreationKey":false,"Key":7.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"46302f6a-d029-4696-be8d-80565fe68ad6","path":"sprites/spr_errant_colors/spr_errant_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"4b754efb-eeb3-4086-8b5d-22878e235bea","IsCreationKey":false,"Key":8.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"5804db76-68ed-45cb-a1b6-6e69f28a82de","path":"sprites/spr_errant_colors/spr_errant_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"67744f2d-aa0e-42d6-bef0-0259800b2442","IsCreationKey":false,"Key":9.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"29cafcd6-1452-4dc1-ae23-e39fc4da0a04","path":"sprites/spr_errant_colors/spr_errant_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"94da88c6-5ce0-4357-ba9a-8b10c81594b3","IsCreationKey":false,"Key":10.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"1f2e4413-c5e8-4d53-b8a6-7af03ccb43fb","path":"sprites/spr_errant_colors/spr_errant_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"afddc36c-cbe5-4855-9ad8-1d0b1b349b3a","IsCreationKey":false,"Key":11.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"eaf461bb-883a-4c3e-b1ab-da51ab9cebba","path":"sprites/spr_errant_colors/spr_errant_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"ed65ebcd-beaf-4643-b94d-1ad4638917d3","IsCreationKey":false,"Key":12.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"5e134dab-8a69-4cf9-8b68-08b8e35d4e0b","path":"sprites/spr_errant_colors/spr_errant_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"45a581ba-1236-44d3-8e79-b8ad3c1b25bb","IsCreationKey":false,"Key":13.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_explosion/spr_explosion.yy b/sprites/spr_explosion/spr_explosion.yy index 5a06964558..df2e8e7255 100644 --- a/sprites/spr_explosion/spr_explosion.yy +++ b/sprites/spr_explosion/spr_explosion.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_explosion", "bboxMode":0, "bbox_bottom":63, @@ -12,13 +12,13 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"887be1d2-b4d1-4eb4-8873-be5a4a077ddd","name":"887be1d2-b4d1-4eb4-8873-be5a4a077ddd","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"52116bac-6671-4450-a26f-440a7edd7c27","name":"52116bac-6671-4450-a26f-440a7edd7c27","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"921a2f53-1d9c-40c8-ba85-1c445565f64f","name":"921a2f53-1d9c-40c8-ba85-1c445565f64f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"5d404122-5c02-46b9-b517-35a17f961896","name":"5d404122-5c02-46b9-b517-35a17f961896","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"31e4d6de-a635-4c43-9e1e-e4607138a682","name":"31e4d6de-a635-4c43-9e1e-e4607138a682","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"e6aec035-57d4-4eb2-be16-cf484e396e35","name":"e6aec035-57d4-4eb2-be16-cf484e396e35","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"dc87f3f2-ac65-4454-8e89-30f2d18e5b5a","name":"dc87f3f2-ac65-4454-8e89-30f2d18e5b5a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"887be1d2-b4d1-4eb4-8873-be5a4a077ddd","name":"887be1d2-b4d1-4eb4-8873-be5a4a077ddd","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"52116bac-6671-4450-a26f-440a7edd7c27","name":"52116bac-6671-4450-a26f-440a7edd7c27","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"921a2f53-1d9c-40c8-ba85-1c445565f64f","name":"921a2f53-1d9c-40c8-ba85-1c445565f64f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"5d404122-5c02-46b9-b517-35a17f961896","name":"5d404122-5c02-46b9-b517-35a17f961896","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"31e4d6de-a635-4c43-9e1e-e4607138a682","name":"31e4d6de-a635-4c43-9e1e-e4607138a682","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"e6aec035-57d4-4eb2-be16-cf484e396e35","name":"e6aec035-57d4-4eb2-be16-cf484e396e35","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"dc87f3f2-ac65-4454-8e89-30f2d18e5b5a","name":"dc87f3f2-ac65-4454-8e89-30f2d18e5b5a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -74,27 +74,13 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"887be1d2-b4d1-4eb4-8873-be5a4a077ddd","path":"sprites/spr_explosion/spr_explosion.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"2d343002-ffe7-4204-9371-9333e1ad1463","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"52116bac-6671-4450-a26f-440a7edd7c27","path":"sprites/spr_explosion/spr_explosion.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"c6e32fb8-aafa-4330-a230-eb6d6ebf6d18","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"921a2f53-1d9c-40c8-ba85-1c445565f64f","path":"sprites/spr_explosion/spr_explosion.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"f9c9185f-adc9-4b49-a5c7-cb6048c7c149","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"5d404122-5c02-46b9-b517-35a17f961896","path":"sprites/spr_explosion/spr_explosion.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"cc47f108-00a0-401d-ad1a-4ca916d1d003","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"31e4d6de-a635-4c43-9e1e-e4607138a682","path":"sprites/spr_explosion/spr_explosion.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"ee749173-6e75-41f7-b09b-6a307e207eb9","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"e6aec035-57d4-4eb2-be16-cf484e396e35","path":"sprites/spr_explosion/spr_explosion.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"45d0bfc3-134e-4498-bcf0-f52e7f60b493","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"dc87f3f2-ac65-4454-8e89-30f2d18e5b5a","path":"sprites/spr_explosion/spr_explosion.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"e3586009-fe9f-4ffd-ae6b-5306a1bbaa08","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"887be1d2-b4d1-4eb4-8873-be5a4a077ddd","path":"sprites/spr_explosion/spr_explosion.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"2d343002-ffe7-4204-9371-9333e1ad1463","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"52116bac-6671-4450-a26f-440a7edd7c27","path":"sprites/spr_explosion/spr_explosion.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"c6e32fb8-aafa-4330-a230-eb6d6ebf6d18","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"921a2f53-1d9c-40c8-ba85-1c445565f64f","path":"sprites/spr_explosion/spr_explosion.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"f9c9185f-adc9-4b49-a5c7-cb6048c7c149","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"5d404122-5c02-46b9-b517-35a17f961896","path":"sprites/spr_explosion/spr_explosion.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"cc47f108-00a0-401d-ad1a-4ca916d1d003","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"31e4d6de-a635-4c43-9e1e-e4607138a682","path":"sprites/spr_explosion/spr_explosion.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"ee749173-6e75-41f7-b09b-6a307e207eb9","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"e6aec035-57d4-4eb2-be16-cf484e396e35","path":"sprites/spr_explosion/spr_explosion.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"45d0bfc3-134e-4498-bcf0-f52e7f60b493","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"dc87f3f2-ac65-4454-8e89-30f2d18e5b5a","path":"sprites/spr_explosion/spr_explosion.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"e3586009-fe9f-4ffd-ae6b-5306a1bbaa08","IsCreationKey":false,"Key":6.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":{ diff --git a/sprites/spr_explosion2/spr_explosion2.yy b/sprites/spr_explosion2/spr_explosion2.yy index 571661e618..a8272afb7c 100644 --- a/sprites/spr_explosion2/spr_explosion2.yy +++ b/sprites/spr_explosion2/spr_explosion2.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_explosion2", "bboxMode":0, "bbox_bottom":58, @@ -12,20 +12,20 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"43b12e48-9dfa-4fd8-9ddd-d75cff1a2ebc","name":"43b12e48-9dfa-4fd8-9ddd-d75cff1a2ebc","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"8fbfaa3b-f551-49b7-bfb5-7e6695535cca","name":"8fbfaa3b-f551-49b7-bfb5-7e6695535cca","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"53813458-5892-4cba-add6-692b75a62bfd","name":"53813458-5892-4cba-add6-692b75a62bfd","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"f03fe6a2-62ce-4b45-865d-f36a459f9006","name":"f03fe6a2-62ce-4b45-865d-f36a459f9006","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"a020d709-a27c-4940-94b7-3db43987f480","name":"a020d709-a27c-4940-94b7-3db43987f480","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"8be1ae36-7446-4a8c-8fdb-e81d26896657","name":"8be1ae36-7446-4a8c-8fdb-e81d26896657","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"d9dbd6c5-a512-441b-93a2-e7367660ba60","name":"d9dbd6c5-a512-441b-93a2-e7367660ba60","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"ea86ef52-23c7-48c9-bae4-11b9edf4e0ee","name":"ea86ef52-23c7-48c9-bae4-11b9edf4e0ee","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"dae59a24-ed41-46c2-9f66-c11a2476034d","name":"dae59a24-ed41-46c2-9f66-c11a2476034d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"3f0c1a50-0a4e-4569-827a-c126660a5e09","name":"3f0c1a50-0a4e-4569-827a-c126660a5e09","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"e4a4ee6e-2696-47ca-8535-7319ab09575c","name":"e4a4ee6e-2696-47ca-8535-7319ab09575c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"f40d66fc-aca3-45de-819a-57f86935a083","name":"f40d66fc-aca3-45de-819a-57f86935a083","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"3823df8b-b54d-42bc-8208-8403c945b4d7","name":"3823df8b-b54d-42bc-8208-8403c945b4d7","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"e45b252c-a2f1-4447-a61b-29b3c77e1f8b","name":"e45b252c-a2f1-4447-a61b-29b3c77e1f8b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"43b12e48-9dfa-4fd8-9ddd-d75cff1a2ebc","name":"43b12e48-9dfa-4fd8-9ddd-d75cff1a2ebc","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"8fbfaa3b-f551-49b7-bfb5-7e6695535cca","name":"8fbfaa3b-f551-49b7-bfb5-7e6695535cca","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"53813458-5892-4cba-add6-692b75a62bfd","name":"53813458-5892-4cba-add6-692b75a62bfd","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"f03fe6a2-62ce-4b45-865d-f36a459f9006","name":"f03fe6a2-62ce-4b45-865d-f36a459f9006","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"a020d709-a27c-4940-94b7-3db43987f480","name":"a020d709-a27c-4940-94b7-3db43987f480","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"8be1ae36-7446-4a8c-8fdb-e81d26896657","name":"8be1ae36-7446-4a8c-8fdb-e81d26896657","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"d9dbd6c5-a512-441b-93a2-e7367660ba60","name":"d9dbd6c5-a512-441b-93a2-e7367660ba60","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"ea86ef52-23c7-48c9-bae4-11b9edf4e0ee","name":"ea86ef52-23c7-48c9-bae4-11b9edf4e0ee","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"dae59a24-ed41-46c2-9f66-c11a2476034d","name":"dae59a24-ed41-46c2-9f66-c11a2476034d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"3f0c1a50-0a4e-4569-827a-c126660a5e09","name":"3f0c1a50-0a4e-4569-827a-c126660a5e09","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"e4a4ee6e-2696-47ca-8535-7319ab09575c","name":"e4a4ee6e-2696-47ca-8535-7319ab09575c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"f40d66fc-aca3-45de-819a-57f86935a083","name":"f40d66fc-aca3-45de-819a-57f86935a083","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"3823df8b-b54d-42bc-8208-8403c945b4d7","name":"3823df8b-b54d-42bc-8208-8403c945b4d7","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"e45b252c-a2f1-4447-a61b-29b3c77e1f8b","name":"e45b252c-a2f1-4447-a61b-29b3c77e1f8b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -81,48 +81,20 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"43b12e48-9dfa-4fd8-9ddd-d75cff1a2ebc","path":"sprites/spr_explosion2/spr_explosion2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"8c810941-adf2-44d7-b828-12e25ba61f1f","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"8fbfaa3b-f551-49b7-bfb5-7e6695535cca","path":"sprites/spr_explosion2/spr_explosion2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"ff1bf792-86f8-46d9-971f-6ac7a81a4667","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"53813458-5892-4cba-add6-692b75a62bfd","path":"sprites/spr_explosion2/spr_explosion2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"097c430e-5373-4508-9bc5-c70457884bfa","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"f03fe6a2-62ce-4b45-865d-f36a459f9006","path":"sprites/spr_explosion2/spr_explosion2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"89224419-71a8-41fb-9e1d-be020176082e","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"a020d709-a27c-4940-94b7-3db43987f480","path":"sprites/spr_explosion2/spr_explosion2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"b760c522-b6ec-4a8d-b44f-3a586e9ec463","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"8be1ae36-7446-4a8c-8fdb-e81d26896657","path":"sprites/spr_explosion2/spr_explosion2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"10c2c640-a3ba-403b-911f-b91bd70d9f39","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"d9dbd6c5-a512-441b-93a2-e7367660ba60","path":"sprites/spr_explosion2/spr_explosion2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"f2574f08-e44e-4e87-a54a-5ef93553c660","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"ea86ef52-23c7-48c9-bae4-11b9edf4e0ee","path":"sprites/spr_explosion2/spr_explosion2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"5f65995c-2bc8-47bb-a944-0ece5f4ca61a","IsCreationKey":false,"Key":7.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"dae59a24-ed41-46c2-9f66-c11a2476034d","path":"sprites/spr_explosion2/spr_explosion2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"20b715b7-bbe7-45bf-a13b-61f9b5ddd203","IsCreationKey":false,"Key":8.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"3f0c1a50-0a4e-4569-827a-c126660a5e09","path":"sprites/spr_explosion2/spr_explosion2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"88279162-524b-4420-950d-25d8c41ad2d5","IsCreationKey":false,"Key":9.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"e4a4ee6e-2696-47ca-8535-7319ab09575c","path":"sprites/spr_explosion2/spr_explosion2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"b2de496d-cd1a-49a4-a738-3c158e6957b2","IsCreationKey":false,"Key":10.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"f40d66fc-aca3-45de-819a-57f86935a083","path":"sprites/spr_explosion2/spr_explosion2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"21c8508e-3350-402a-8c86-6e16f0b2c05c","IsCreationKey":false,"Key":11.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"3823df8b-b54d-42bc-8208-8403c945b4d7","path":"sprites/spr_explosion2/spr_explosion2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"80954673-ffc9-4083-b687-7dc6ce0848ed","IsCreationKey":false,"Key":12.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"e45b252c-a2f1-4447-a61b-29b3c77e1f8b","path":"sprites/spr_explosion2/spr_explosion2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"6a8df266-eb69-44d0-a7dc-ac3177820f19","IsCreationKey":false,"Key":13.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"43b12e48-9dfa-4fd8-9ddd-d75cff1a2ebc","path":"sprites/spr_explosion2/spr_explosion2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"8c810941-adf2-44d7-b828-12e25ba61f1f","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"8fbfaa3b-f551-49b7-bfb5-7e6695535cca","path":"sprites/spr_explosion2/spr_explosion2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"ff1bf792-86f8-46d9-971f-6ac7a81a4667","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"53813458-5892-4cba-add6-692b75a62bfd","path":"sprites/spr_explosion2/spr_explosion2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"097c430e-5373-4508-9bc5-c70457884bfa","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"f03fe6a2-62ce-4b45-865d-f36a459f9006","path":"sprites/spr_explosion2/spr_explosion2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"89224419-71a8-41fb-9e1d-be020176082e","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"a020d709-a27c-4940-94b7-3db43987f480","path":"sprites/spr_explosion2/spr_explosion2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"b760c522-b6ec-4a8d-b44f-3a586e9ec463","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"8be1ae36-7446-4a8c-8fdb-e81d26896657","path":"sprites/spr_explosion2/spr_explosion2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"10c2c640-a3ba-403b-911f-b91bd70d9f39","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"d9dbd6c5-a512-441b-93a2-e7367660ba60","path":"sprites/spr_explosion2/spr_explosion2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"f2574f08-e44e-4e87-a54a-5ef93553c660","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"ea86ef52-23c7-48c9-bae4-11b9edf4e0ee","path":"sprites/spr_explosion2/spr_explosion2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"5f65995c-2bc8-47bb-a944-0ece5f4ca61a","IsCreationKey":false,"Key":7.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"dae59a24-ed41-46c2-9f66-c11a2476034d","path":"sprites/spr_explosion2/spr_explosion2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"20b715b7-bbe7-45bf-a13b-61f9b5ddd203","IsCreationKey":false,"Key":8.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"3f0c1a50-0a4e-4569-827a-c126660a5e09","path":"sprites/spr_explosion2/spr_explosion2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"88279162-524b-4420-950d-25d8c41ad2d5","IsCreationKey":false,"Key":9.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"e4a4ee6e-2696-47ca-8535-7319ab09575c","path":"sprites/spr_explosion2/spr_explosion2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"b2de496d-cd1a-49a4-a738-3c158e6957b2","IsCreationKey":false,"Key":10.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"f40d66fc-aca3-45de-819a-57f86935a083","path":"sprites/spr_explosion2/spr_explosion2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"21c8508e-3350-402a-8c86-6e16f0b2c05c","IsCreationKey":false,"Key":11.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"3823df8b-b54d-42bc-8208-8403c945b4d7","path":"sprites/spr_explosion2/spr_explosion2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"80954673-ffc9-4083-b687-7dc6ce0848ed","IsCreationKey":false,"Key":12.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"e45b252c-a2f1-4447-a61b-29b3c77e1f8b","path":"sprites/spr_explosion2/spr_explosion2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"6a8df266-eb69-44d0-a7dc-ac3177820f19","IsCreationKey":false,"Key":13.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":{ diff --git a/sprites/spr_explosion3/spr_explosion3.yy b/sprites/spr_explosion3/spr_explosion3.yy index 66f4ed915b..01e7ba1419 100644 --- a/sprites/spr_explosion3/spr_explosion3.yy +++ b/sprites/spr_explosion3/spr_explosion3.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_explosion3", "bboxMode":0, "bbox_bottom":61, @@ -12,30 +12,30 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"cdb9009b-964f-4f86-97a6-ef04dfa531f3","name":"cdb9009b-964f-4f86-97a6-ef04dfa531f3","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"28f82647-071a-4f36-ae13-d60316fe3e33","name":"28f82647-071a-4f36-ae13-d60316fe3e33","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"69434878-27a3-43c9-a142-030800af28a0","name":"69434878-27a3-43c9-a142-030800af28a0","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"e0e27773-82e9-4037-92ee-618cf73c2ab5","name":"e0e27773-82e9-4037-92ee-618cf73c2ab5","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"86b3f9bb-4c89-45f3-a214-af8bd09062cc","name":"86b3f9bb-4c89-45f3-a214-af8bd09062cc","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"68ffd8e7-768a-4a82-9232-b73b91a84636","name":"68ffd8e7-768a-4a82-9232-b73b91a84636","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"d48b1389-5756-4855-ab12-c1241aa6f60f","name":"d48b1389-5756-4855-ab12-c1241aa6f60f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"a9126f5e-1a48-4e77-beca-704e7f9601d2","name":"a9126f5e-1a48-4e77-beca-704e7f9601d2","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"bd6e2025-c9c7-4cf3-a338-698e297625c8","name":"bd6e2025-c9c7-4cf3-a338-698e297625c8","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"d12afd48-f2f8-48ca-8da9-3e1801b163a2","name":"d12afd48-f2f8-48ca-8da9-3e1801b163a2","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"8c54c27c-5496-4211-9a7b-73d135706816","name":"8c54c27c-5496-4211-9a7b-73d135706816","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"fec35f73-7d3f-4c9d-98c4-344fe943acce","name":"fec35f73-7d3f-4c9d-98c4-344fe943acce","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"01e32b7e-586e-4248-8217-3e73ed7473e4","name":"01e32b7e-586e-4248-8217-3e73ed7473e4","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"20d20aef-1e77-458b-92ac-29ccf3b6e98c","name":"20d20aef-1e77-458b-92ac-29ccf3b6e98c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"5e227fe6-8e4e-4c7c-a7df-1e86182dd9ca","name":"5e227fe6-8e4e-4c7c-a7df-1e86182dd9ca","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"e9bc688a-fc0f-469c-b5e2-918cf4cf3aa9","name":"e9bc688a-fc0f-469c-b5e2-918cf4cf3aa9","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"fa807211-ee0a-4630-a1f3-f0f72baa5218","name":"fa807211-ee0a-4630-a1f3-f0f72baa5218","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"f9e664c7-cd78-4c20-9311-cd3eaf57941e","name":"f9e664c7-cd78-4c20-9311-cd3eaf57941e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"6607dda3-f79a-402a-9e7d-f703a294a940","name":"6607dda3-f79a-402a-9e7d-f703a294a940","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"83638e2b-500f-4aac-9ac7-70d4c605d40d","name":"83638e2b-500f-4aac-9ac7-70d4c605d40d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"b18e7bab-cc4a-4ed7-b00b-1ed5d704253d","name":"b18e7bab-cc4a-4ed7-b00b-1ed5d704253d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"7b870110-a292-4c4f-a99c-defb8c5854a9","name":"7b870110-a292-4c4f-a99c-defb8c5854a9","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"eb596ac8-aaaf-4d76-9c62-0496de1da788","name":"eb596ac8-aaaf-4d76-9c62-0496de1da788","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"4927e668-61af-4c28-9c28-857835e7f1c2","name":"4927e668-61af-4c28-9c28-857835e7f1c2","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"cdb9009b-964f-4f86-97a6-ef04dfa531f3","name":"cdb9009b-964f-4f86-97a6-ef04dfa531f3","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"28f82647-071a-4f36-ae13-d60316fe3e33","name":"28f82647-071a-4f36-ae13-d60316fe3e33","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"69434878-27a3-43c9-a142-030800af28a0","name":"69434878-27a3-43c9-a142-030800af28a0","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"e0e27773-82e9-4037-92ee-618cf73c2ab5","name":"e0e27773-82e9-4037-92ee-618cf73c2ab5","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"86b3f9bb-4c89-45f3-a214-af8bd09062cc","name":"86b3f9bb-4c89-45f3-a214-af8bd09062cc","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"68ffd8e7-768a-4a82-9232-b73b91a84636","name":"68ffd8e7-768a-4a82-9232-b73b91a84636","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"d48b1389-5756-4855-ab12-c1241aa6f60f","name":"d48b1389-5756-4855-ab12-c1241aa6f60f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"a9126f5e-1a48-4e77-beca-704e7f9601d2","name":"a9126f5e-1a48-4e77-beca-704e7f9601d2","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"bd6e2025-c9c7-4cf3-a338-698e297625c8","name":"bd6e2025-c9c7-4cf3-a338-698e297625c8","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"d12afd48-f2f8-48ca-8da9-3e1801b163a2","name":"d12afd48-f2f8-48ca-8da9-3e1801b163a2","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"8c54c27c-5496-4211-9a7b-73d135706816","name":"8c54c27c-5496-4211-9a7b-73d135706816","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"fec35f73-7d3f-4c9d-98c4-344fe943acce","name":"fec35f73-7d3f-4c9d-98c4-344fe943acce","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"01e32b7e-586e-4248-8217-3e73ed7473e4","name":"01e32b7e-586e-4248-8217-3e73ed7473e4","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"20d20aef-1e77-458b-92ac-29ccf3b6e98c","name":"20d20aef-1e77-458b-92ac-29ccf3b6e98c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"5e227fe6-8e4e-4c7c-a7df-1e86182dd9ca","name":"5e227fe6-8e4e-4c7c-a7df-1e86182dd9ca","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"e9bc688a-fc0f-469c-b5e2-918cf4cf3aa9","name":"e9bc688a-fc0f-469c-b5e2-918cf4cf3aa9","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"fa807211-ee0a-4630-a1f3-f0f72baa5218","name":"fa807211-ee0a-4630-a1f3-f0f72baa5218","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"f9e664c7-cd78-4c20-9311-cd3eaf57941e","name":"f9e664c7-cd78-4c20-9311-cd3eaf57941e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"6607dda3-f79a-402a-9e7d-f703a294a940","name":"6607dda3-f79a-402a-9e7d-f703a294a940","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"83638e2b-500f-4aac-9ac7-70d4c605d40d","name":"83638e2b-500f-4aac-9ac7-70d4c605d40d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"b18e7bab-cc4a-4ed7-b00b-1ed5d704253d","name":"b18e7bab-cc4a-4ed7-b00b-1ed5d704253d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"7b870110-a292-4c4f-a99c-defb8c5854a9","name":"7b870110-a292-4c4f-a99c-defb8c5854a9","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"eb596ac8-aaaf-4d76-9c62-0496de1da788","name":"eb596ac8-aaaf-4d76-9c62-0496de1da788","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"4927e668-61af-4c28-9c28-857835e7f1c2","name":"4927e668-61af-4c28-9c28-857835e7f1c2","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -91,78 +91,30 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"cdb9009b-964f-4f86-97a6-ef04dfa531f3","path":"sprites/spr_explosion3/spr_explosion3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"f03ffb87-14fc-4f87-85cf-a6d051f7812d","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"28f82647-071a-4f36-ae13-d60316fe3e33","path":"sprites/spr_explosion3/spr_explosion3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"24d5fce8-7a8a-4e11-bc6d-d3eaa0b68410","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"69434878-27a3-43c9-a142-030800af28a0","path":"sprites/spr_explosion3/spr_explosion3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"8082a40f-310e-4d18-bfc7-d8dea00b48d4","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"e0e27773-82e9-4037-92ee-618cf73c2ab5","path":"sprites/spr_explosion3/spr_explosion3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"d9445442-5b49-46c9-b812-4c1b446e05b2","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"86b3f9bb-4c89-45f3-a214-af8bd09062cc","path":"sprites/spr_explosion3/spr_explosion3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"5b3f59c0-8a0d-4f2e-ab81-c18dd6d7e186","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"68ffd8e7-768a-4a82-9232-b73b91a84636","path":"sprites/spr_explosion3/spr_explosion3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"56c993d9-9b07-4059-ade7-062c11c5c9cb","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"d48b1389-5756-4855-ab12-c1241aa6f60f","path":"sprites/spr_explosion3/spr_explosion3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"c08d36ad-d315-4755-9a00-73e0c73cd90b","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"a9126f5e-1a48-4e77-beca-704e7f9601d2","path":"sprites/spr_explosion3/spr_explosion3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"b93ae72c-c88e-477e-9902-cf0806092381","IsCreationKey":false,"Key":7.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"bd6e2025-c9c7-4cf3-a338-698e297625c8","path":"sprites/spr_explosion3/spr_explosion3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"a0309e7a-14a7-48d1-8611-cc44719abc08","IsCreationKey":false,"Key":8.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"d12afd48-f2f8-48ca-8da9-3e1801b163a2","path":"sprites/spr_explosion3/spr_explosion3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"05c8cdac-c9c0-4c04-bb34-3890bde38674","IsCreationKey":false,"Key":9.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"8c54c27c-5496-4211-9a7b-73d135706816","path":"sprites/spr_explosion3/spr_explosion3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"649915e4-7305-4034-a7de-6ca77c662585","IsCreationKey":false,"Key":10.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"fec35f73-7d3f-4c9d-98c4-344fe943acce","path":"sprites/spr_explosion3/spr_explosion3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"bf8de3a4-34ed-4d16-b9b7-213eba118837","IsCreationKey":false,"Key":11.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"01e32b7e-586e-4248-8217-3e73ed7473e4","path":"sprites/spr_explosion3/spr_explosion3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"bb4de27d-a01b-451a-9011-1e5e9187525d","IsCreationKey":false,"Key":12.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"20d20aef-1e77-458b-92ac-29ccf3b6e98c","path":"sprites/spr_explosion3/spr_explosion3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"3b42c446-cab6-4af5-8876-1cef1e78351a","IsCreationKey":false,"Key":13.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"5e227fe6-8e4e-4c7c-a7df-1e86182dd9ca","path":"sprites/spr_explosion3/spr_explosion3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"dec73924-4b9e-41b7-81f3-cc442bc95a3b","IsCreationKey":false,"Key":14.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"e9bc688a-fc0f-469c-b5e2-918cf4cf3aa9","path":"sprites/spr_explosion3/spr_explosion3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"f41c7b93-28e5-40a2-91cc-cc113447d5bd","IsCreationKey":false,"Key":15.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"fa807211-ee0a-4630-a1f3-f0f72baa5218","path":"sprites/spr_explosion3/spr_explosion3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"2d81c94c-397c-46a4-a1b3-f3c989a15d0f","IsCreationKey":false,"Key":16.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"f9e664c7-cd78-4c20-9311-cd3eaf57941e","path":"sprites/spr_explosion3/spr_explosion3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"f396343f-a798-4da4-8330-11b7631b54b8","IsCreationKey":false,"Key":17.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"6607dda3-f79a-402a-9e7d-f703a294a940","path":"sprites/spr_explosion3/spr_explosion3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"add2276b-8895-48a1-9bb7-4b4863899549","IsCreationKey":false,"Key":18.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"83638e2b-500f-4aac-9ac7-70d4c605d40d","path":"sprites/spr_explosion3/spr_explosion3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"a65238b6-c1d4-4151-9d9f-3fcd36df9635","IsCreationKey":false,"Key":19.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"b18e7bab-cc4a-4ed7-b00b-1ed5d704253d","path":"sprites/spr_explosion3/spr_explosion3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"a0703b80-f85b-4ce5-a71b-497f5d433421","IsCreationKey":false,"Key":20.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"7b870110-a292-4c4f-a99c-defb8c5854a9","path":"sprites/spr_explosion3/spr_explosion3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"02ccfd46-b64f-48d9-8bc7-e9776e097890","IsCreationKey":false,"Key":21.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"eb596ac8-aaaf-4d76-9c62-0496de1da788","path":"sprites/spr_explosion3/spr_explosion3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"7c509de9-78bf-4741-98c4-3edd92af9d06","IsCreationKey":false,"Key":22.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"4927e668-61af-4c28-9c28-857835e7f1c2","path":"sprites/spr_explosion3/spr_explosion3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"b45e1ad1-5605-4f37-9ba1-0739e0a8a14c","IsCreationKey":false,"Key":23.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"cdb9009b-964f-4f86-97a6-ef04dfa531f3","path":"sprites/spr_explosion3/spr_explosion3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"f03ffb87-14fc-4f87-85cf-a6d051f7812d","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"28f82647-071a-4f36-ae13-d60316fe3e33","path":"sprites/spr_explosion3/spr_explosion3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"24d5fce8-7a8a-4e11-bc6d-d3eaa0b68410","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"69434878-27a3-43c9-a142-030800af28a0","path":"sprites/spr_explosion3/spr_explosion3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"8082a40f-310e-4d18-bfc7-d8dea00b48d4","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"e0e27773-82e9-4037-92ee-618cf73c2ab5","path":"sprites/spr_explosion3/spr_explosion3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"d9445442-5b49-46c9-b812-4c1b446e05b2","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"86b3f9bb-4c89-45f3-a214-af8bd09062cc","path":"sprites/spr_explosion3/spr_explosion3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"5b3f59c0-8a0d-4f2e-ab81-c18dd6d7e186","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"68ffd8e7-768a-4a82-9232-b73b91a84636","path":"sprites/spr_explosion3/spr_explosion3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"56c993d9-9b07-4059-ade7-062c11c5c9cb","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"d48b1389-5756-4855-ab12-c1241aa6f60f","path":"sprites/spr_explosion3/spr_explosion3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"c08d36ad-d315-4755-9a00-73e0c73cd90b","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"a9126f5e-1a48-4e77-beca-704e7f9601d2","path":"sprites/spr_explosion3/spr_explosion3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"b93ae72c-c88e-477e-9902-cf0806092381","IsCreationKey":false,"Key":7.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"bd6e2025-c9c7-4cf3-a338-698e297625c8","path":"sprites/spr_explosion3/spr_explosion3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"a0309e7a-14a7-48d1-8611-cc44719abc08","IsCreationKey":false,"Key":8.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"d12afd48-f2f8-48ca-8da9-3e1801b163a2","path":"sprites/spr_explosion3/spr_explosion3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"05c8cdac-c9c0-4c04-bb34-3890bde38674","IsCreationKey":false,"Key":9.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"8c54c27c-5496-4211-9a7b-73d135706816","path":"sprites/spr_explosion3/spr_explosion3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"649915e4-7305-4034-a7de-6ca77c662585","IsCreationKey":false,"Key":10.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"fec35f73-7d3f-4c9d-98c4-344fe943acce","path":"sprites/spr_explosion3/spr_explosion3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"bf8de3a4-34ed-4d16-b9b7-213eba118837","IsCreationKey":false,"Key":11.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"01e32b7e-586e-4248-8217-3e73ed7473e4","path":"sprites/spr_explosion3/spr_explosion3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"bb4de27d-a01b-451a-9011-1e5e9187525d","IsCreationKey":false,"Key":12.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"20d20aef-1e77-458b-92ac-29ccf3b6e98c","path":"sprites/spr_explosion3/spr_explosion3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"3b42c446-cab6-4af5-8876-1cef1e78351a","IsCreationKey":false,"Key":13.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"5e227fe6-8e4e-4c7c-a7df-1e86182dd9ca","path":"sprites/spr_explosion3/spr_explosion3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"dec73924-4b9e-41b7-81f3-cc442bc95a3b","IsCreationKey":false,"Key":14.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"e9bc688a-fc0f-469c-b5e2-918cf4cf3aa9","path":"sprites/spr_explosion3/spr_explosion3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"f41c7b93-28e5-40a2-91cc-cc113447d5bd","IsCreationKey":false,"Key":15.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"fa807211-ee0a-4630-a1f3-f0f72baa5218","path":"sprites/spr_explosion3/spr_explosion3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"2d81c94c-397c-46a4-a1b3-f3c989a15d0f","IsCreationKey":false,"Key":16.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"f9e664c7-cd78-4c20-9311-cd3eaf57941e","path":"sprites/spr_explosion3/spr_explosion3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"f396343f-a798-4da4-8330-11b7631b54b8","IsCreationKey":false,"Key":17.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"6607dda3-f79a-402a-9e7d-f703a294a940","path":"sprites/spr_explosion3/spr_explosion3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"add2276b-8895-48a1-9bb7-4b4863899549","IsCreationKey":false,"Key":18.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"83638e2b-500f-4aac-9ac7-70d4c605d40d","path":"sprites/spr_explosion3/spr_explosion3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"a65238b6-c1d4-4151-9d9f-3fcd36df9635","IsCreationKey":false,"Key":19.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"b18e7bab-cc4a-4ed7-b00b-1ed5d704253d","path":"sprites/spr_explosion3/spr_explosion3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"a0703b80-f85b-4ce5-a71b-497f5d433421","IsCreationKey":false,"Key":20.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"7b870110-a292-4c4f-a99c-defb8c5854a9","path":"sprites/spr_explosion3/spr_explosion3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"02ccfd46-b64f-48d9-8bc7-e9776e097890","IsCreationKey":false,"Key":21.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"eb596ac8-aaaf-4d76-9c62-0496de1da788","path":"sprites/spr_explosion3/spr_explosion3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"7c509de9-78bf-4741-98c4-3edd92af9d06","IsCreationKey":false,"Key":22.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"4927e668-61af-4c28-9c28-857835e7f1c2","path":"sprites/spr_explosion3/spr_explosion3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"b45e1ad1-5605-4f37-9ba1-0739e0a8a14c","IsCreationKey":false,"Key":23.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":{ diff --git a/sprites/spr_explosion_plas/spr_explosion_plas.yy b/sprites/spr_explosion_plas/spr_explosion_plas.yy index 9937ac694f..746a35bfbe 100644 --- a/sprites/spr_explosion_plas/spr_explosion_plas.yy +++ b/sprites/spr_explosion_plas/spr_explosion_plas.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_explosion_plas", "bboxMode":0, "bbox_bottom":63, @@ -12,13 +12,13 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"9af5cc74-0bb8-4194-b438-d88f8009f92c","name":"9af5cc74-0bb8-4194-b438-d88f8009f92c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"8f187ecd-65dd-43d4-aa8b-f7a07d7fde6b","name":"8f187ecd-65dd-43d4-aa8b-f7a07d7fde6b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"7cb41b4a-624f-48ca-9fd5-1d46f869948a","name":"7cb41b4a-624f-48ca-9fd5-1d46f869948a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"89de85bd-5a7e-481e-bff7-b7855cfc1526","name":"89de85bd-5a7e-481e-bff7-b7855cfc1526","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"3edf782d-d066-403d-b693-9dd1ebd579d9","name":"3edf782d-d066-403d-b693-9dd1ebd579d9","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"49b89a69-6b56-48c5-9311-b42f3fdbb2de","name":"49b89a69-6b56-48c5-9311-b42f3fdbb2de","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"9f249bfd-e297-460c-9f3e-42e085e4218e","name":"9f249bfd-e297-460c-9f3e-42e085e4218e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"9af5cc74-0bb8-4194-b438-d88f8009f92c","name":"9af5cc74-0bb8-4194-b438-d88f8009f92c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"8f187ecd-65dd-43d4-aa8b-f7a07d7fde6b","name":"8f187ecd-65dd-43d4-aa8b-f7a07d7fde6b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"7cb41b4a-624f-48ca-9fd5-1d46f869948a","name":"7cb41b4a-624f-48ca-9fd5-1d46f869948a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"89de85bd-5a7e-481e-bff7-b7855cfc1526","name":"89de85bd-5a7e-481e-bff7-b7855cfc1526","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"3edf782d-d066-403d-b693-9dd1ebd579d9","name":"3edf782d-d066-403d-b693-9dd1ebd579d9","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"49b89a69-6b56-48c5-9311-b42f3fdbb2de","name":"49b89a69-6b56-48c5-9311-b42f3fdbb2de","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"9f249bfd-e297-460c-9f3e-42e085e4218e","name":"9f249bfd-e297-460c-9f3e-42e085e4218e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -74,27 +74,13 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"9af5cc74-0bb8-4194-b438-d88f8009f92c","path":"sprites/spr_explosion_plas/spr_explosion_plas.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"ff02a50d-6084-408c-9078-187ce0b830fc","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"8f187ecd-65dd-43d4-aa8b-f7a07d7fde6b","path":"sprites/spr_explosion_plas/spr_explosion_plas.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"ba260f64-12d5-4a3a-92d5-4c9b126f6084","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"7cb41b4a-624f-48ca-9fd5-1d46f869948a","path":"sprites/spr_explosion_plas/spr_explosion_plas.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"c56f37df-cce4-4716-9c34-4a8b4e1ae6a3","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"89de85bd-5a7e-481e-bff7-b7855cfc1526","path":"sprites/spr_explosion_plas/spr_explosion_plas.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"e5800a07-8496-49bd-8ff8-1a69e21ecf11","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"3edf782d-d066-403d-b693-9dd1ebd579d9","path":"sprites/spr_explosion_plas/spr_explosion_plas.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"d5afa515-8687-43a8-8f04-39e9b27fb0fa","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"49b89a69-6b56-48c5-9311-b42f3fdbb2de","path":"sprites/spr_explosion_plas/spr_explosion_plas.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"4b6f5ae4-9b9d-4012-9d6a-387ab7e0bd01","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"9f249bfd-e297-460c-9f3e-42e085e4218e","path":"sprites/spr_explosion_plas/spr_explosion_plas.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"a319f899-f3d0-4b64-9869-6965563b4843","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"9af5cc74-0bb8-4194-b438-d88f8009f92c","path":"sprites/spr_explosion_plas/spr_explosion_plas.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"ff02a50d-6084-408c-9078-187ce0b830fc","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"8f187ecd-65dd-43d4-aa8b-f7a07d7fde6b","path":"sprites/spr_explosion_plas/spr_explosion_plas.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"ba260f64-12d5-4a3a-92d5-4c9b126f6084","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"7cb41b4a-624f-48ca-9fd5-1d46f869948a","path":"sprites/spr_explosion_plas/spr_explosion_plas.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"c56f37df-cce4-4716-9c34-4a8b4e1ae6a3","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"89de85bd-5a7e-481e-bff7-b7855cfc1526","path":"sprites/spr_explosion_plas/spr_explosion_plas.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"e5800a07-8496-49bd-8ff8-1a69e21ecf11","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"3edf782d-d066-403d-b693-9dd1ebd579d9","path":"sprites/spr_explosion_plas/spr_explosion_plas.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"d5afa515-8687-43a8-8f04-39e9b27fb0fa","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"49b89a69-6b56-48c5-9311-b42f3fdbb2de","path":"sprites/spr_explosion_plas/spr_explosion_plas.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"4b6f5ae4-9b9d-4012-9d6a-387ab7e0bd01","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"9f249bfd-e297-460c-9f3e-42e085e4218e","path":"sprites/spr_explosion_plas/spr_explosion_plas.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"a319f899-f3d0-4b64-9869-6965563b4843","IsCreationKey":false,"Key":6.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":{ diff --git a/sprites/spr_facial_colors/spr_facial_colors.yy b/sprites/spr_facial_colors/spr_facial_colors.yy index 6a55b9fa92..fe7f7fcdda 100644 --- a/sprites/spr_facial_colors/spr_facial_colors.yy +++ b/sprites/spr_facial_colors/spr_facial_colors.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_facial_colors", "bboxMode":0, "bbox_bottom":70, @@ -12,12 +12,12 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"64f02c8a-c899-45df-b03c-b6a1394a32bc","name":"64f02c8a-c899-45df-b03c-b6a1394a32bc","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"b2fd1690-ad2e-4dea-913f-7440f3207956","name":"b2fd1690-ad2e-4dea-913f-7440f3207956","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"d1a80c47-aa27-4b86-b39a-6bf091f60626","name":"d1a80c47-aa27-4b86-b39a-6bf091f60626","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"e07c49c2-0bb4-43a5-b9f4-9f6d929f2848","name":"e07c49c2-0bb4-43a5-b9f4-9f6d929f2848","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"27ff1bb9-a65a-4ae2-a37c-613c0ccc07d2","name":"27ff1bb9-a65a-4ae2-a37c-613c0ccc07d2","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"7a0af901-a520-42bd-b1ac-947b53d45c39","name":"7a0af901-a520-42bd-b1ac-947b53d45c39","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"64f02c8a-c899-45df-b03c-b6a1394a32bc","name":"64f02c8a-c899-45df-b03c-b6a1394a32bc","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"b2fd1690-ad2e-4dea-913f-7440f3207956","name":"b2fd1690-ad2e-4dea-913f-7440f3207956","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"d1a80c47-aa27-4b86-b39a-6bf091f60626","name":"d1a80c47-aa27-4b86-b39a-6bf091f60626","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"e07c49c2-0bb4-43a5-b9f4-9f6d929f2848","name":"e07c49c2-0bb4-43a5-b9f4-9f6d929f2848","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"27ff1bb9-a65a-4ae2-a37c-613c0ccc07d2","name":"27ff1bb9-a65a-4ae2-a37c-613c0ccc07d2","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"7a0af901-a520-42bd-b1ac-947b53d45c39","name":"7a0af901-a520-42bd-b1ac-947b53d45c39","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -73,24 +73,12 @@ "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_faction_icons/spr_faction_icons.yy b/sprites/spr_faction_icons/spr_faction_icons.yy index 5191466385..f0fd9ed434 100644 --- a/sprites/spr_faction_icons/spr_faction_icons.yy +++ b/sprites/spr_faction_icons/spr_faction_icons.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_faction_icons", "bboxMode":0, "bbox_bottom":57, @@ -12,22 +12,22 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"e31ef791-2dcc-4e57-bb94-85e8d0f6684c","name":"e31ef791-2dcc-4e57-bb94-85e8d0f6684c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"da1147b4-25e5-43ff-9cb6-1b9630a91188","name":"da1147b4-25e5-43ff-9cb6-1b9630a91188","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"4a5a2538-7f5a-4ef5-809d-3efb68056895","name":"4a5a2538-7f5a-4ef5-809d-3efb68056895","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"fbd273df-a4ac-45f0-9567-d25b0554cae3","name":"fbd273df-a4ac-45f0-9567-d25b0554cae3","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"641ce88d-47a2-4ef5-a453-26c175c3fa47","name":"641ce88d-47a2-4ef5-a453-26c175c3fa47","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"458ae16e-c6e8-45b5-b056-9c021caa006d","name":"458ae16e-c6e8-45b5-b056-9c021caa006d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"8ee41cc1-6d74-46f1-a5b1-c464997a8b9c","name":"8ee41cc1-6d74-46f1-a5b1-c464997a8b9c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"f13a3c9b-197b-483a-bf2b-7e73d0652796","name":"f13a3c9b-197b-483a-bf2b-7e73d0652796","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"a18ea534-1e88-4162-bc9a-ff5a1fc5dae9","name":"a18ea534-1e88-4162-bc9a-ff5a1fc5dae9","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"1811e86f-6b19-46af-bbac-ae5e34b7ac4a","name":"1811e86f-6b19-46af-bbac-ae5e34b7ac4a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"42355dbb-212b-40b0-bebd-21530e2fa783","name":"42355dbb-212b-40b0-bebd-21530e2fa783","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"4d55163e-830f-4b75-8aa6-a7cc7f3f4d58","name":"4d55163e-830f-4b75-8aa6-a7cc7f3f4d58","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"835c1eb9-c457-41aa-a6f7-5be0ddf0a2fd","name":"835c1eb9-c457-41aa-a6f7-5be0ddf0a2fd","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"5c5ddf71-da02-4c9f-80cb-601ae5fb04aa","name":"5c5ddf71-da02-4c9f-80cb-601ae5fb04aa","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"0a6c7016-0ed2-48ab-b4d5-d6ed24c11c13","name":"0a6c7016-0ed2-48ab-b4d5-d6ed24c11c13","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"1e240158-bc5c-4162-85c8-a39ec678cea5","name":"1e240158-bc5c-4162-85c8-a39ec678cea5","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"e31ef791-2dcc-4e57-bb94-85e8d0f6684c","name":"e31ef791-2dcc-4e57-bb94-85e8d0f6684c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"da1147b4-25e5-43ff-9cb6-1b9630a91188","name":"da1147b4-25e5-43ff-9cb6-1b9630a91188","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"4a5a2538-7f5a-4ef5-809d-3efb68056895","name":"4a5a2538-7f5a-4ef5-809d-3efb68056895","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"fbd273df-a4ac-45f0-9567-d25b0554cae3","name":"fbd273df-a4ac-45f0-9567-d25b0554cae3","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"641ce88d-47a2-4ef5-a453-26c175c3fa47","name":"641ce88d-47a2-4ef5-a453-26c175c3fa47","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"458ae16e-c6e8-45b5-b056-9c021caa006d","name":"458ae16e-c6e8-45b5-b056-9c021caa006d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"8ee41cc1-6d74-46f1-a5b1-c464997a8b9c","name":"8ee41cc1-6d74-46f1-a5b1-c464997a8b9c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"f13a3c9b-197b-483a-bf2b-7e73d0652796","name":"f13a3c9b-197b-483a-bf2b-7e73d0652796","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"a18ea534-1e88-4162-bc9a-ff5a1fc5dae9","name":"a18ea534-1e88-4162-bc9a-ff5a1fc5dae9","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"1811e86f-6b19-46af-bbac-ae5e34b7ac4a","name":"1811e86f-6b19-46af-bbac-ae5e34b7ac4a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"42355dbb-212b-40b0-bebd-21530e2fa783","name":"42355dbb-212b-40b0-bebd-21530e2fa783","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"4d55163e-830f-4b75-8aa6-a7cc7f3f4d58","name":"4d55163e-830f-4b75-8aa6-a7cc7f3f4d58","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"835c1eb9-c457-41aa-a6f7-5be0ddf0a2fd","name":"835c1eb9-c457-41aa-a6f7-5be0ddf0a2fd","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"5c5ddf71-da02-4c9f-80cb-601ae5fb04aa","name":"5c5ddf71-da02-4c9f-80cb-601ae5fb04aa","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"0a6c7016-0ed2-48ab-b4d5-d6ed24c11c13","name":"0a6c7016-0ed2-48ab-b4d5-d6ed24c11c13","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"1e240158-bc5c-4162-85c8-a39ec678cea5","name":"1e240158-bc5c-4162-85c8-a39ec678cea5","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -85,54 +85,22 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"e31ef791-2dcc-4e57-bb94-85e8d0f6684c","path":"sprites/spr_faction_icons/spr_faction_icons.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"d70ecb5d-690b-460c-8ca5-89d5cfba7807","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"da1147b4-25e5-43ff-9cb6-1b9630a91188","path":"sprites/spr_faction_icons/spr_faction_icons.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"44cd17a1-e6c0-4ede-9f27-59cd285845e7","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"4a5a2538-7f5a-4ef5-809d-3efb68056895","path":"sprites/spr_faction_icons/spr_faction_icons.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"2de99ab3-2c6e-4ff1-92a0-84baaab0a45f","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"fbd273df-a4ac-45f0-9567-d25b0554cae3","path":"sprites/spr_faction_icons/spr_faction_icons.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"2b0c9adc-db88-4f02-8ca9-61a9f1bdbde7","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"641ce88d-47a2-4ef5-a453-26c175c3fa47","path":"sprites/spr_faction_icons/spr_faction_icons.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"3601bbbe-f76d-4c96-a08a-26c7d2ef5caa","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"458ae16e-c6e8-45b5-b056-9c021caa006d","path":"sprites/spr_faction_icons/spr_faction_icons.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"b392962f-07ba-432b-abfa-1dec5bd977a7","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"8ee41cc1-6d74-46f1-a5b1-c464997a8b9c","path":"sprites/spr_faction_icons/spr_faction_icons.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"c4d8139e-197d-4160-a6b5-347132c816f9","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"f13a3c9b-197b-483a-bf2b-7e73d0652796","path":"sprites/spr_faction_icons/spr_faction_icons.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"a98c5de5-4d16-4f57-b456-ef1225e54944","IsCreationKey":false,"Key":7.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"a18ea534-1e88-4162-bc9a-ff5a1fc5dae9","path":"sprites/spr_faction_icons/spr_faction_icons.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"5d43e6fe-7e95-486f-8263-a8289c543acd","IsCreationKey":false,"Key":8.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"1811e86f-6b19-46af-bbac-ae5e34b7ac4a","path":"sprites/spr_faction_icons/spr_faction_icons.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"69aeaeeb-f959-4064-a75b-c0bae2a8a8ab","IsCreationKey":false,"Key":9.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"42355dbb-212b-40b0-bebd-21530e2fa783","path":"sprites/spr_faction_icons/spr_faction_icons.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"90297261-4eaa-4d25-a826-308e4e5e31f8","IsCreationKey":false,"Key":10.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"4d55163e-830f-4b75-8aa6-a7cc7f3f4d58","path":"sprites/spr_faction_icons/spr_faction_icons.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"f2b25933-4999-4026-826e-25784a625769","IsCreationKey":false,"Key":11.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"835c1eb9-c457-41aa-a6f7-5be0ddf0a2fd","path":"sprites/spr_faction_icons/spr_faction_icons.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"6ba1e06a-ef6e-46c3-ab25-b4a119bd66ce","IsCreationKey":false,"Key":12.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"5c5ddf71-da02-4c9f-80cb-601ae5fb04aa","path":"sprites/spr_faction_icons/spr_faction_icons.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"ff58b031-e3a5-4d1c-913f-930259b4bada","IsCreationKey":false,"Key":13.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"0a6c7016-0ed2-48ab-b4d5-d6ed24c11c13","path":"sprites/spr_faction_icons/spr_faction_icons.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"82df5ccb-69b1-4fe1-8a7b-a9df60a5bd39","IsCreationKey":false,"Key":14.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"1e240158-bc5c-4162-85c8-a39ec678cea5","path":"sprites/spr_faction_icons/spr_faction_icons.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"04a8b061-b249-427b-bf65-b350329c1cbb","IsCreationKey":false,"Key":15.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"e31ef791-2dcc-4e57-bb94-85e8d0f6684c","path":"sprites/spr_faction_icons/spr_faction_icons.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"d70ecb5d-690b-460c-8ca5-89d5cfba7807","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"da1147b4-25e5-43ff-9cb6-1b9630a91188","path":"sprites/spr_faction_icons/spr_faction_icons.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"44cd17a1-e6c0-4ede-9f27-59cd285845e7","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"4a5a2538-7f5a-4ef5-809d-3efb68056895","path":"sprites/spr_faction_icons/spr_faction_icons.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"2de99ab3-2c6e-4ff1-92a0-84baaab0a45f","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"fbd273df-a4ac-45f0-9567-d25b0554cae3","path":"sprites/spr_faction_icons/spr_faction_icons.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"2b0c9adc-db88-4f02-8ca9-61a9f1bdbde7","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"641ce88d-47a2-4ef5-a453-26c175c3fa47","path":"sprites/spr_faction_icons/spr_faction_icons.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"3601bbbe-f76d-4c96-a08a-26c7d2ef5caa","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"458ae16e-c6e8-45b5-b056-9c021caa006d","path":"sprites/spr_faction_icons/spr_faction_icons.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"b392962f-07ba-432b-abfa-1dec5bd977a7","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"8ee41cc1-6d74-46f1-a5b1-c464997a8b9c","path":"sprites/spr_faction_icons/spr_faction_icons.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"c4d8139e-197d-4160-a6b5-347132c816f9","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"f13a3c9b-197b-483a-bf2b-7e73d0652796","path":"sprites/spr_faction_icons/spr_faction_icons.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"a98c5de5-4d16-4f57-b456-ef1225e54944","IsCreationKey":false,"Key":7.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"a18ea534-1e88-4162-bc9a-ff5a1fc5dae9","path":"sprites/spr_faction_icons/spr_faction_icons.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"5d43e6fe-7e95-486f-8263-a8289c543acd","IsCreationKey":false,"Key":8.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"1811e86f-6b19-46af-bbac-ae5e34b7ac4a","path":"sprites/spr_faction_icons/spr_faction_icons.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"69aeaeeb-f959-4064-a75b-c0bae2a8a8ab","IsCreationKey":false,"Key":9.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"42355dbb-212b-40b0-bebd-21530e2fa783","path":"sprites/spr_faction_icons/spr_faction_icons.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"90297261-4eaa-4d25-a826-308e4e5e31f8","IsCreationKey":false,"Key":10.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"4d55163e-830f-4b75-8aa6-a7cc7f3f4d58","path":"sprites/spr_faction_icons/spr_faction_icons.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"f2b25933-4999-4026-826e-25784a625769","IsCreationKey":false,"Key":11.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"835c1eb9-c457-41aa-a6f7-5be0ddf0a2fd","path":"sprites/spr_faction_icons/spr_faction_icons.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"6ba1e06a-ef6e-46c3-ab25-b4a119bd66ce","IsCreationKey":false,"Key":12.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"5c5ddf71-da02-4c9f-80cb-601ae5fb04aa","path":"sprites/spr_faction_icons/spr_faction_icons.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"ff58b031-e3a5-4d1c-913f-930259b4bada","IsCreationKey":false,"Key":13.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"0a6c7016-0ed2-48ab-b4d5-d6ed24c11c13","path":"sprites/spr_faction_icons/spr_faction_icons.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"82df5ccb-69b1-4fe1-8a7b-a9df60a5bd39","IsCreationKey":false,"Key":14.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"1e240158-bc5c-4162-85c8-a39ec678cea5","path":"sprites/spr_faction_icons/spr_faction_icons.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"04a8b061-b249-427b-bf65-b350329c1cbb","IsCreationKey":false,"Key":15.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_faith_icon/spr_faith_icon.yy b/sprites/spr_faith_icon/spr_faith_icon.yy index 987a7f439b..623283f47f 100644 --- a/sprites/spr_faith_icon/spr_faith_icon.yy +++ b/sprites/spr_faith_icon/spr_faith_icon.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_faith_icon", "bboxMode":0, "bbox_bottom":56, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"342d5d1f-0155-42cd-9e08-666c4dfea64d","name":"342d5d1f-0155-42cd-9e08-666c4dfea64d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"342d5d1f-0155-42cd-9e08-666c4dfea64d","name":"342d5d1f-0155-42cd-9e08-666c4dfea64d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"342d5d1f-0155-42cd-9e08-666c4dfea64d","path":"sprites/spr_faith_icon/spr_faith_icon.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"4f0876cf-f608-41c0-bf42-e8b8d393ae12","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"342d5d1f-0155-42cd-9e08-666c4dfea64d","path":"sprites/spr_faith_icon/spr_faith_icon.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"4f0876cf-f608-41c0-bf42-e8b8d393ae12","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_fast_forward/spr_fast_forward.yy b/sprites/spr_fast_forward/spr_fast_forward.yy index 56627276c6..4ac20167ff 100644 --- a/sprites/spr_fast_forward/spr_fast_forward.yy +++ b/sprites/spr_fast_forward/spr_fast_forward.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_fast_forward", "bboxMode":0, "bbox_bottom":31, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"9bb0dfea-9450-4c2a-9c48-dd711892de4d","name":"9bb0dfea-9450-4c2a-9c48-dd711892de4d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"9bb0dfea-9450-4c2a-9c48-dd711892de4d","name":"9bb0dfea-9450-4c2a-9c48-dd711892de4d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"9bb0dfea-9450-4c2a-9c48-dd711892de4d","path":"sprites/spr_fast_forward/spr_fast_forward.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"463e807f-9e8d-43a8-90e0-01654427ed84","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"9bb0dfea-9450-4c2a-9c48-dd711892de4d","path":"sprites/spr_fast_forward/spr_fast_forward.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"463e807f-9e8d-43a8-90e0-01654427ed84","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":{ diff --git a/sprites/spr_fighta/spr_fighta.yy b/sprites/spr_fighta/spr_fighta.yy index 1ce514d420..7d03e55433 100644 --- a/sprites/spr_fighta/spr_fighta.yy +++ b/sprites/spr_fighta/spr_fighta.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_fighta", "bboxMode":0, "bbox_bottom":20, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"8c4e5f6e-c044-43b9-84a2-20412778de5a","name":"8c4e5f6e-c044-43b9-84a2-20412778de5a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"8c4e5f6e-c044-43b9-84a2-20412778de5a","name":"8c4e5f6e-c044-43b9-84a2-20412778de5a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"8c4e5f6e-c044-43b9-84a2-20412778de5a","path":"sprites/spr_fighta/spr_fighta.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"1fa7cfcf-9b37-4a7d-ae1b-3fbb0aa84cff","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"8c4e5f6e-c044-43b9-84a2-20412778de5a","path":"sprites/spr_fighta/spr_fighta.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"1fa7cfcf-9b37-4a7d-ae1b-3fbb0aa84cff","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":{ diff --git a/sprites/spr_flame/spr_flame.yy b/sprites/spr_flame/spr_flame.yy index 751be7fa2b..741063e030 100644 --- a/sprites/spr_flame/spr_flame.yy +++ b/sprites/spr_flame/spr_flame.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_flame", "bboxMode":2, "bbox_bottom":29, @@ -12,14 +12,14 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"3ccdc751-66fc-446f-aabe-8d34a8ed10bb","name":"3ccdc751-66fc-446f-aabe-8d34a8ed10bb","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"14afd175-9af1-4620-b14e-66b195d01ab9","name":"14afd175-9af1-4620-b14e-66b195d01ab9","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"e56ffdd9-a9de-45f7-8b8c-afd2bc69d8b8","name":"e56ffdd9-a9de-45f7-8b8c-afd2bc69d8b8","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"86db4960-a6df-46e6-a9fe-01c0a03bcb2c","name":"86db4960-a6df-46e6-a9fe-01c0a03bcb2c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"e3ea2f2d-e1d0-4cad-8dab-ab313e276e81","name":"e3ea2f2d-e1d0-4cad-8dab-ab313e276e81","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"6ecf0913-2c5b-43a3-9070-1303d915e40e","name":"6ecf0913-2c5b-43a3-9070-1303d915e40e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"c43b5d2a-6aef-4155-9414-f5945d0f9dda","name":"c43b5d2a-6aef-4155-9414-f5945d0f9dda","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"a6f97135-aed8-409d-a36f-e432c5ad62f8","name":"a6f97135-aed8-409d-a36f-e432c5ad62f8","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"3ccdc751-66fc-446f-aabe-8d34a8ed10bb","name":"3ccdc751-66fc-446f-aabe-8d34a8ed10bb","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"14afd175-9af1-4620-b14e-66b195d01ab9","name":"14afd175-9af1-4620-b14e-66b195d01ab9","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"e56ffdd9-a9de-45f7-8b8c-afd2bc69d8b8","name":"e56ffdd9-a9de-45f7-8b8c-afd2bc69d8b8","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"86db4960-a6df-46e6-a9fe-01c0a03bcb2c","name":"86db4960-a6df-46e6-a9fe-01c0a03bcb2c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"e3ea2f2d-e1d0-4cad-8dab-ab313e276e81","name":"e3ea2f2d-e1d0-4cad-8dab-ab313e276e81","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"6ecf0913-2c5b-43a3-9070-1303d915e40e","name":"6ecf0913-2c5b-43a3-9070-1303d915e40e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"c43b5d2a-6aef-4155-9414-f5945d0f9dda","name":"c43b5d2a-6aef-4155-9414-f5945d0f9dda","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"a6f97135-aed8-409d-a36f-e432c5ad62f8","name":"a6f97135-aed8-409d-a36f-e432c5ad62f8","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -77,30 +77,14 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"3ccdc751-66fc-446f-aabe-8d34a8ed10bb","path":"sprites/spr_flame/spr_flame.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"4c31b035-9dd2-4571-8e92-3abdb0dcecb2","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"14afd175-9af1-4620-b14e-66b195d01ab9","path":"sprites/spr_flame/spr_flame.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"6b3432aa-c967-4f4c-9bee-ac65e5e10262","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"e56ffdd9-a9de-45f7-8b8c-afd2bc69d8b8","path":"sprites/spr_flame/spr_flame.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"f73ff78e-f298-404c-a03a-257e6e0e6c56","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"86db4960-a6df-46e6-a9fe-01c0a03bcb2c","path":"sprites/spr_flame/spr_flame.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"f84d6149-6b95-4fe0-aeb4-b9b19b53dcd2","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"e3ea2f2d-e1d0-4cad-8dab-ab313e276e81","path":"sprites/spr_flame/spr_flame.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"197060ec-b1f9-44ac-8f1b-3533517607be","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"6ecf0913-2c5b-43a3-9070-1303d915e40e","path":"sprites/spr_flame/spr_flame.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"ff1de936-a8ea-489a-af27-1b9f944b9195","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"c43b5d2a-6aef-4155-9414-f5945d0f9dda","path":"sprites/spr_flame/spr_flame.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"f535a69d-b886-4e19-94cd-6d09228e4d7e","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"a6f97135-aed8-409d-a36f-e432c5ad62f8","path":"sprites/spr_flame/spr_flame.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"bb641164-0c29-47cd-98e1-d3c1c812868d","IsCreationKey":false,"Key":7.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"3ccdc751-66fc-446f-aabe-8d34a8ed10bb","path":"sprites/spr_flame/spr_flame.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"4c31b035-9dd2-4571-8e92-3abdb0dcecb2","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"14afd175-9af1-4620-b14e-66b195d01ab9","path":"sprites/spr_flame/spr_flame.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"6b3432aa-c967-4f4c-9bee-ac65e5e10262","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"e56ffdd9-a9de-45f7-8b8c-afd2bc69d8b8","path":"sprites/spr_flame/spr_flame.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"f73ff78e-f298-404c-a03a-257e6e0e6c56","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"86db4960-a6df-46e6-a9fe-01c0a03bcb2c","path":"sprites/spr_flame/spr_flame.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"f84d6149-6b95-4fe0-aeb4-b9b19b53dcd2","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"e3ea2f2d-e1d0-4cad-8dab-ab313e276e81","path":"sprites/spr_flame/spr_flame.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"197060ec-b1f9-44ac-8f1b-3533517607be","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"6ecf0913-2c5b-43a3-9070-1303d915e40e","path":"sprites/spr_flame/spr_flame.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"ff1de936-a8ea-489a-af27-1b9f944b9195","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"c43b5d2a-6aef-4155-9414-f5945d0f9dda","path":"sprites/spr_flame/spr_flame.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"f535a69d-b886-4e19-94cd-6d09228e4d7e","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"a6f97135-aed8-409d-a36f-e432c5ad62f8","path":"sprites/spr_flame/spr_flame.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"bb641164-0c29-47cd-98e1-d3c1c812868d","IsCreationKey":false,"Key":7.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_flame2/spr_flame2.yy b/sprites/spr_flame2/spr_flame2.yy index 8ef57a4cb0..808d94a5b4 100644 --- a/sprites/spr_flame2/spr_flame2.yy +++ b/sprites/spr_flame2/spr_flame2.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_flame2", "bboxMode":2, "bbox_bottom":29, @@ -12,14 +12,14 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"1b984331-f6d8-4bc2-b9f7-deda0e06e17e","name":"1b984331-f6d8-4bc2-b9f7-deda0e06e17e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"3c7d9b2d-8aa3-43b1-bf72-4754457ccf85","name":"3c7d9b2d-8aa3-43b1-bf72-4754457ccf85","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"c119acae-8e5a-49ea-bd61-a3ab4e20ad45","name":"c119acae-8e5a-49ea-bd61-a3ab4e20ad45","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"af333edf-6007-47d6-95c3-007dfa1df6f1","name":"af333edf-6007-47d6-95c3-007dfa1df6f1","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"77aa35ef-3558-42f5-8eb2-8c6919d12615","name":"77aa35ef-3558-42f5-8eb2-8c6919d12615","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"3ed78f26-9a75-4840-a210-528819aaa311","name":"3ed78f26-9a75-4840-a210-528819aaa311","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"8bf2cf3d-c570-43f9-b54b-8033b3e65a2b","name":"8bf2cf3d-c570-43f9-b54b-8033b3e65a2b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"dd4c7ac3-d6af-4766-af34-de65311b5e00","name":"dd4c7ac3-d6af-4766-af34-de65311b5e00","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"1b984331-f6d8-4bc2-b9f7-deda0e06e17e","name":"1b984331-f6d8-4bc2-b9f7-deda0e06e17e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"3c7d9b2d-8aa3-43b1-bf72-4754457ccf85","name":"3c7d9b2d-8aa3-43b1-bf72-4754457ccf85","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"c119acae-8e5a-49ea-bd61-a3ab4e20ad45","name":"c119acae-8e5a-49ea-bd61-a3ab4e20ad45","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"af333edf-6007-47d6-95c3-007dfa1df6f1","name":"af333edf-6007-47d6-95c3-007dfa1df6f1","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"77aa35ef-3558-42f5-8eb2-8c6919d12615","name":"77aa35ef-3558-42f5-8eb2-8c6919d12615","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"3ed78f26-9a75-4840-a210-528819aaa311","name":"3ed78f26-9a75-4840-a210-528819aaa311","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"8bf2cf3d-c570-43f9-b54b-8033b3e65a2b","name":"8bf2cf3d-c570-43f9-b54b-8033b3e65a2b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"dd4c7ac3-d6af-4766-af34-de65311b5e00","name":"dd4c7ac3-d6af-4766-af34-de65311b5e00","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -77,30 +77,14 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"1b984331-f6d8-4bc2-b9f7-deda0e06e17e","path":"sprites/spr_flame2/spr_flame2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"d3b33f81-54f2-43f9-b23c-fa822d0e83d4","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"3c7d9b2d-8aa3-43b1-bf72-4754457ccf85","path":"sprites/spr_flame2/spr_flame2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"3c3a04a7-ff72-40b9-8c55-cc9a1a4d22f3","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"c119acae-8e5a-49ea-bd61-a3ab4e20ad45","path":"sprites/spr_flame2/spr_flame2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"ae67ab58-4666-4c9e-9f41-aa05391d5398","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"af333edf-6007-47d6-95c3-007dfa1df6f1","path":"sprites/spr_flame2/spr_flame2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"c2e034a5-03dd-488f-b460-f6f96fd22eb2","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"77aa35ef-3558-42f5-8eb2-8c6919d12615","path":"sprites/spr_flame2/spr_flame2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"05a3ebe7-7bee-41cb-8d55-33eec1f714f3","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"3ed78f26-9a75-4840-a210-528819aaa311","path":"sprites/spr_flame2/spr_flame2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"c6c09481-c282-4c9a-b834-35c505049808","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"8bf2cf3d-c570-43f9-b54b-8033b3e65a2b","path":"sprites/spr_flame2/spr_flame2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"dbedd24f-98b9-4a11-99fe-69d2066f15fd","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"dd4c7ac3-d6af-4766-af34-de65311b5e00","path":"sprites/spr_flame2/spr_flame2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"96fa7221-c449-4ef0-8ce2-c7567bd3e44e","IsCreationKey":false,"Key":7.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"1b984331-f6d8-4bc2-b9f7-deda0e06e17e","path":"sprites/spr_flame2/spr_flame2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"d3b33f81-54f2-43f9-b23c-fa822d0e83d4","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"3c7d9b2d-8aa3-43b1-bf72-4754457ccf85","path":"sprites/spr_flame2/spr_flame2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"3c3a04a7-ff72-40b9-8c55-cc9a1a4d22f3","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"c119acae-8e5a-49ea-bd61-a3ab4e20ad45","path":"sprites/spr_flame2/spr_flame2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"ae67ab58-4666-4c9e-9f41-aa05391d5398","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"af333edf-6007-47d6-95c3-007dfa1df6f1","path":"sprites/spr_flame2/spr_flame2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"c2e034a5-03dd-488f-b460-f6f96fd22eb2","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"77aa35ef-3558-42f5-8eb2-8c6919d12615","path":"sprites/spr_flame2/spr_flame2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"05a3ebe7-7bee-41cb-8d55-33eec1f714f3","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"3ed78f26-9a75-4840-a210-528819aaa311","path":"sprites/spr_flame2/spr_flame2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"c6c09481-c282-4c9a-b834-35c505049808","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"8bf2cf3d-c570-43f9-b54b-8033b3e65a2b","path":"sprites/spr_flame2/spr_flame2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"dbedd24f-98b9-4a11-99fe-69d2066f15fd","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"dd4c7ac3-d6af-4766-af34-de65311b5e00","path":"sprites/spr_flame2/spr_flame2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"96fa7221-c449-4ef0-8ce2-c7567bd3e44e","IsCreationKey":false,"Key":7.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_flamer_new/spr_flamer_new.yy b/sprites/spr_flamer_new/spr_flamer_new.yy index 09faf1047b..de677568b7 100644 --- a/sprites/spr_flamer_new/spr_flamer_new.yy +++ b/sprites/spr_flamer_new/spr_flamer_new.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_flamer_new", "bboxMode":0, "bbox_bottom":113, @@ -12,27 +12,27 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"3be5fc3c-f934-416b-9fba-e8a6a78a5f2c","name":"3be5fc3c-f934-416b-9fba-e8a6a78a5f2c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"900c5d6c-a9a6-4d64-9d7d-6db2beff72d6","name":"900c5d6c-a9a6-4d64-9d7d-6db2beff72d6","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"761eefee-a078-4b95-aeb7-cbe4004c0025","name":"761eefee-a078-4b95-aeb7-cbe4004c0025","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"30d37538-6ee7-40b1-b686-40375b62edcf","name":"30d37538-6ee7-40b1-b686-40375b62edcf","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"14c810b2-4cfc-4037-80f5-ea54a35dfc1c","name":"14c810b2-4cfc-4037-80f5-ea54a35dfc1c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"a72f2ddc-8a6b-45ac-8be0-83d713adea6e","name":"a72f2ddc-8a6b-45ac-8be0-83d713adea6e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"e18f82cd-e032-469f-8dee-fe82f06a40ee","name":"e18f82cd-e032-469f-8dee-fe82f06a40ee","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"4b8d0af8-713a-49b7-aa9a-72b17ed67f50","name":"4b8d0af8-713a-49b7-aa9a-72b17ed67f50","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"33c4768e-5707-456d-b1a7-7d304b79d8f5","name":"33c4768e-5707-456d-b1a7-7d304b79d8f5","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"527762a2-ae2f-42c5-bbe1-7e8e15799959","name":"527762a2-ae2f-42c5-bbe1-7e8e15799959","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"2b203eec-68cd-4703-a483-5cdce413011e","name":"2b203eec-68cd-4703-a483-5cdce413011e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"1208e1d4-789d-4473-8c10-1c8003e04ee5","name":"1208e1d4-789d-4473-8c10-1c8003e04ee5","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"b6370bbd-af61-4b6c-b08a-afe89cb64d88","name":"b6370bbd-af61-4b6c-b08a-afe89cb64d88","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"3b704a9f-b4ab-40c9-a3f3-243c0e9a73f1","name":"3b704a9f-b4ab-40c9-a3f3-243c0e9a73f1","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"d7508a11-afe6-4d42-9021-77b8885dd408","name":"d7508a11-afe6-4d42-9021-77b8885dd408","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"70abc107-ab83-4789-86d8-51113339f174","name":"70abc107-ab83-4789-86d8-51113339f174","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"9fd61129-92d1-4072-8e6d-a946b36afcfc","name":"9fd61129-92d1-4072-8e6d-a946b36afcfc","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"6c6d034d-9d21-49b0-b93c-f4a6b3def45e","name":"6c6d034d-9d21-49b0-b93c-f4a6b3def45e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"01751f85-11b9-4c41-9460-0374d62bd7ae","name":"01751f85-11b9-4c41-9460-0374d62bd7ae","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"b6a80603-94ff-4a9a-b473-1b2df3b6b8c1","name":"b6a80603-94ff-4a9a-b473-1b2df3b6b8c1","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"28bcce15-60d9-4378-a728-9c720c2ffaa1","name":"28bcce15-60d9-4378-a728-9c720c2ffaa1","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"3be5fc3c-f934-416b-9fba-e8a6a78a5f2c","name":"3be5fc3c-f934-416b-9fba-e8a6a78a5f2c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"900c5d6c-a9a6-4d64-9d7d-6db2beff72d6","name":"900c5d6c-a9a6-4d64-9d7d-6db2beff72d6","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"761eefee-a078-4b95-aeb7-cbe4004c0025","name":"761eefee-a078-4b95-aeb7-cbe4004c0025","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"30d37538-6ee7-40b1-b686-40375b62edcf","name":"30d37538-6ee7-40b1-b686-40375b62edcf","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"14c810b2-4cfc-4037-80f5-ea54a35dfc1c","name":"14c810b2-4cfc-4037-80f5-ea54a35dfc1c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"a72f2ddc-8a6b-45ac-8be0-83d713adea6e","name":"a72f2ddc-8a6b-45ac-8be0-83d713adea6e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"e18f82cd-e032-469f-8dee-fe82f06a40ee","name":"e18f82cd-e032-469f-8dee-fe82f06a40ee","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"4b8d0af8-713a-49b7-aa9a-72b17ed67f50","name":"4b8d0af8-713a-49b7-aa9a-72b17ed67f50","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"33c4768e-5707-456d-b1a7-7d304b79d8f5","name":"33c4768e-5707-456d-b1a7-7d304b79d8f5","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"527762a2-ae2f-42c5-bbe1-7e8e15799959","name":"527762a2-ae2f-42c5-bbe1-7e8e15799959","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"2b203eec-68cd-4703-a483-5cdce413011e","name":"2b203eec-68cd-4703-a483-5cdce413011e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"1208e1d4-789d-4473-8c10-1c8003e04ee5","name":"1208e1d4-789d-4473-8c10-1c8003e04ee5","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"b6370bbd-af61-4b6c-b08a-afe89cb64d88","name":"b6370bbd-af61-4b6c-b08a-afe89cb64d88","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"3b704a9f-b4ab-40c9-a3f3-243c0e9a73f1","name":"3b704a9f-b4ab-40c9-a3f3-243c0e9a73f1","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"d7508a11-afe6-4d42-9021-77b8885dd408","name":"d7508a11-afe6-4d42-9021-77b8885dd408","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"70abc107-ab83-4789-86d8-51113339f174","name":"70abc107-ab83-4789-86d8-51113339f174","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"9fd61129-92d1-4072-8e6d-a946b36afcfc","name":"9fd61129-92d1-4072-8e6d-a946b36afcfc","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"6c6d034d-9d21-49b0-b93c-f4a6b3def45e","name":"6c6d034d-9d21-49b0-b93c-f4a6b3def45e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"01751f85-11b9-4c41-9460-0374d62bd7ae","name":"01751f85-11b9-4c41-9460-0374d62bd7ae","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"b6a80603-94ff-4a9a-b473-1b2df3b6b8c1","name":"b6a80603-94ff-4a9a-b473-1b2df3b6b8c1","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"28bcce15-60d9-4378-a728-9c720c2ffaa1","name":"28bcce15-60d9-4378-a728-9c720c2ffaa1","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -90,69 +90,27 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"3be5fc3c-f934-416b-9fba-e8a6a78a5f2c","path":"sprites/spr_flamer_new/spr_flamer_new.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"0ef1a9d3-3154-4e88-88c0-3a2673985ba8","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"900c5d6c-a9a6-4d64-9d7d-6db2beff72d6","path":"sprites/spr_flamer_new/spr_flamer_new.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"5d3a007a-6992-43c4-adab-80302d987450","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"761eefee-a078-4b95-aeb7-cbe4004c0025","path":"sprites/spr_flamer_new/spr_flamer_new.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"8f517dfd-7dc8-4c61-8e83-1cd65b2751d7","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"30d37538-6ee7-40b1-b686-40375b62edcf","path":"sprites/spr_flamer_new/spr_flamer_new.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"8c8016ec-c767-40e1-bd9c-8561c21ae50e","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"14c810b2-4cfc-4037-80f5-ea54a35dfc1c","path":"sprites/spr_flamer_new/spr_flamer_new.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"f90cd282-b3dc-47aa-8643-8e6436075eca","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"a72f2ddc-8a6b-45ac-8be0-83d713adea6e","path":"sprites/spr_flamer_new/spr_flamer_new.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"760db19f-5863-4118-b636-76df78b253b7","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"e18f82cd-e032-469f-8dee-fe82f06a40ee","path":"sprites/spr_flamer_new/spr_flamer_new.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"010bc769-578c-46aa-bee2-0570802b712c","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"4b8d0af8-713a-49b7-aa9a-72b17ed67f50","path":"sprites/spr_flamer_new/spr_flamer_new.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"4833e8bc-594b-4306-b2d1-d89b8de18b10","IsCreationKey":false,"Key":7.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"33c4768e-5707-456d-b1a7-7d304b79d8f5","path":"sprites/spr_flamer_new/spr_flamer_new.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"f14d596d-e04d-4edc-90b2-5c86dfe1e529","IsCreationKey":false,"Key":8.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"527762a2-ae2f-42c5-bbe1-7e8e15799959","path":"sprites/spr_flamer_new/spr_flamer_new.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"dc4bf285-6aea-4e6a-ad13-45e4808cfc66","IsCreationKey":false,"Key":9.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"2b203eec-68cd-4703-a483-5cdce413011e","path":"sprites/spr_flamer_new/spr_flamer_new.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"199fc9e1-df58-417a-9789-47db90f740d4","IsCreationKey":false,"Key":10.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"1208e1d4-789d-4473-8c10-1c8003e04ee5","path":"sprites/spr_flamer_new/spr_flamer_new.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"9ccd1782-80ad-4c30-8c54-616e26de9228","IsCreationKey":false,"Key":11.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"b6370bbd-af61-4b6c-b08a-afe89cb64d88","path":"sprites/spr_flamer_new/spr_flamer_new.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"e9c6c2b0-f920-40f3-8ab3-d7573d2dda8a","IsCreationKey":false,"Key":12.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"3b704a9f-b4ab-40c9-a3f3-243c0e9a73f1","path":"sprites/spr_flamer_new/spr_flamer_new.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"0ff30df4-e685-47a7-9606-51ca71ce9cda","IsCreationKey":false,"Key":13.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"d7508a11-afe6-4d42-9021-77b8885dd408","path":"sprites/spr_flamer_new/spr_flamer_new.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"0f44de32-3a46-4236-883f-3d122c424869","IsCreationKey":false,"Key":14.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"70abc107-ab83-4789-86d8-51113339f174","path":"sprites/spr_flamer_new/spr_flamer_new.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"00f57f51-bf79-429c-8f73-fc072656da5e","IsCreationKey":false,"Key":15.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"9fd61129-92d1-4072-8e6d-a946b36afcfc","path":"sprites/spr_flamer_new/spr_flamer_new.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"2aea8f53-12be-450b-a342-57473f71cd92","IsCreationKey":false,"Key":16.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"6c6d034d-9d21-49b0-b93c-f4a6b3def45e","path":"sprites/spr_flamer_new/spr_flamer_new.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"b16ded8a-a9c5-4ae0-adbd-5bce33f26e43","IsCreationKey":false,"Key":17.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"01751f85-11b9-4c41-9460-0374d62bd7ae","path":"sprites/spr_flamer_new/spr_flamer_new.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"5b21669d-1950-4afd-9a97-93a07b2c3c7f","IsCreationKey":false,"Key":18.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"b6a80603-94ff-4a9a-b473-1b2df3b6b8c1","path":"sprites/spr_flamer_new/spr_flamer_new.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"38e1cf94-596e-4c67-9834-606e358858c3","IsCreationKey":false,"Key":19.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"28bcce15-60d9-4378-a728-9c720c2ffaa1","path":"sprites/spr_flamer_new/spr_flamer_new.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"e70953da-f7e6-4c0e-bd0c-a1821a4a4d21","IsCreationKey":false,"Key":20.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"3be5fc3c-f934-416b-9fba-e8a6a78a5f2c","path":"sprites/spr_flamer_new/spr_flamer_new.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"0ef1a9d3-3154-4e88-88c0-3a2673985ba8","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"900c5d6c-a9a6-4d64-9d7d-6db2beff72d6","path":"sprites/spr_flamer_new/spr_flamer_new.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"5d3a007a-6992-43c4-adab-80302d987450","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"761eefee-a078-4b95-aeb7-cbe4004c0025","path":"sprites/spr_flamer_new/spr_flamer_new.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"8f517dfd-7dc8-4c61-8e83-1cd65b2751d7","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"30d37538-6ee7-40b1-b686-40375b62edcf","path":"sprites/spr_flamer_new/spr_flamer_new.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"8c8016ec-c767-40e1-bd9c-8561c21ae50e","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"14c810b2-4cfc-4037-80f5-ea54a35dfc1c","path":"sprites/spr_flamer_new/spr_flamer_new.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"f90cd282-b3dc-47aa-8643-8e6436075eca","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"a72f2ddc-8a6b-45ac-8be0-83d713adea6e","path":"sprites/spr_flamer_new/spr_flamer_new.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"760db19f-5863-4118-b636-76df78b253b7","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"e18f82cd-e032-469f-8dee-fe82f06a40ee","path":"sprites/spr_flamer_new/spr_flamer_new.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"010bc769-578c-46aa-bee2-0570802b712c","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"4b8d0af8-713a-49b7-aa9a-72b17ed67f50","path":"sprites/spr_flamer_new/spr_flamer_new.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"4833e8bc-594b-4306-b2d1-d89b8de18b10","IsCreationKey":false,"Key":7.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"33c4768e-5707-456d-b1a7-7d304b79d8f5","path":"sprites/spr_flamer_new/spr_flamer_new.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"f14d596d-e04d-4edc-90b2-5c86dfe1e529","IsCreationKey":false,"Key":8.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"527762a2-ae2f-42c5-bbe1-7e8e15799959","path":"sprites/spr_flamer_new/spr_flamer_new.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"dc4bf285-6aea-4e6a-ad13-45e4808cfc66","IsCreationKey":false,"Key":9.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"2b203eec-68cd-4703-a483-5cdce413011e","path":"sprites/spr_flamer_new/spr_flamer_new.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"199fc9e1-df58-417a-9789-47db90f740d4","IsCreationKey":false,"Key":10.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"1208e1d4-789d-4473-8c10-1c8003e04ee5","path":"sprites/spr_flamer_new/spr_flamer_new.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"9ccd1782-80ad-4c30-8c54-616e26de9228","IsCreationKey":false,"Key":11.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"b6370bbd-af61-4b6c-b08a-afe89cb64d88","path":"sprites/spr_flamer_new/spr_flamer_new.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"e9c6c2b0-f920-40f3-8ab3-d7573d2dda8a","IsCreationKey":false,"Key":12.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"3b704a9f-b4ab-40c9-a3f3-243c0e9a73f1","path":"sprites/spr_flamer_new/spr_flamer_new.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"0ff30df4-e685-47a7-9606-51ca71ce9cda","IsCreationKey":false,"Key":13.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"d7508a11-afe6-4d42-9021-77b8885dd408","path":"sprites/spr_flamer_new/spr_flamer_new.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"0f44de32-3a46-4236-883f-3d122c424869","IsCreationKey":false,"Key":14.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"70abc107-ab83-4789-86d8-51113339f174","path":"sprites/spr_flamer_new/spr_flamer_new.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"00f57f51-bf79-429c-8f73-fc072656da5e","IsCreationKey":false,"Key":15.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"9fd61129-92d1-4072-8e6d-a946b36afcfc","path":"sprites/spr_flamer_new/spr_flamer_new.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"2aea8f53-12be-450b-a342-57473f71cd92","IsCreationKey":false,"Key":16.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"6c6d034d-9d21-49b0-b93c-f4a6b3def45e","path":"sprites/spr_flamer_new/spr_flamer_new.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"b16ded8a-a9c5-4ae0-adbd-5bce33f26e43","IsCreationKey":false,"Key":17.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"01751f85-11b9-4c41-9460-0374d62bd7ae","path":"sprites/spr_flamer_new/spr_flamer_new.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"5b21669d-1950-4afd-9a97-93a07b2c3c7f","IsCreationKey":false,"Key":18.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"b6a80603-94ff-4a9a-b473-1b2df3b6b8c1","path":"sprites/spr_flamer_new/spr_flamer_new.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"38e1cf94-596e-4c67-9834-606e358858c3","IsCreationKey":false,"Key":19.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"28bcce15-60d9-4378-a728-9c720c2ffaa1","path":"sprites/spr_flamer_new/spr_flamer_new.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"e70953da-f7e6-4c0e-bd0c-a1821a4a4d21","IsCreationKey":false,"Key":20.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_fleet_alert/spr_fleet_alert.yy b/sprites/spr_fleet_alert/spr_fleet_alert.yy index a63b853bb5..2becca5d33 100644 --- a/sprites/spr_fleet_alert/spr_fleet_alert.yy +++ b/sprites/spr_fleet_alert/spr_fleet_alert.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_fleet_alert", "bboxMode":0, "bbox_bottom":65, @@ -12,34 +12,34 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"3509c403-4a42-4dbf-92f7-560c8127d7a4","name":"3509c403-4a42-4dbf-92f7-560c8127d7a4","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"40b6fe6f-15f9-432c-8c3f-ff992acc31d0","name":"40b6fe6f-15f9-432c-8c3f-ff992acc31d0","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"95bc9f54-030d-4fe5-b022-ed084c5bde29","name":"95bc9f54-030d-4fe5-b022-ed084c5bde29","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"d1b868bf-e07e-4504-9be4-050c777e2959","name":"d1b868bf-e07e-4504-9be4-050c777e2959","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"99d73fc9-3d98-4ff9-b8ac-c0c643b60fff","name":"99d73fc9-3d98-4ff9-b8ac-c0c643b60fff","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"8cd2dcc8-c818-467b-8b55-a1aa784707fc","name":"8cd2dcc8-c818-467b-8b55-a1aa784707fc","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"7f18ca31-d1b6-41b4-98c8-14e2ee900f8f","name":"7f18ca31-d1b6-41b4-98c8-14e2ee900f8f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"16841a42-f578-4d0f-bc53-345e26a4309d","name":"16841a42-f578-4d0f-bc53-345e26a4309d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"bfdf43a6-c842-49fb-b161-ba27246384f4","name":"bfdf43a6-c842-49fb-b161-ba27246384f4","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"d55e1739-d36d-4487-a702-b89fa087184e","name":"d55e1739-d36d-4487-a702-b89fa087184e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"44b7382e-2196-405b-bee8-29c85e8f23ed","name":"44b7382e-2196-405b-bee8-29c85e8f23ed","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"3db612ae-e3aa-4aef-9e4e-8e2a362855b1","name":"3db612ae-e3aa-4aef-9e4e-8e2a362855b1","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"0abe3892-4dff-4baa-b14c-eb85368af891","name":"0abe3892-4dff-4baa-b14c-eb85368af891","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"7b193357-84c6-4399-a900-b24b88446930","name":"7b193357-84c6-4399-a900-b24b88446930","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"ae2db314-7ff4-460f-b597-1f330bfee00a","name":"ae2db314-7ff4-460f-b597-1f330bfee00a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"fdebd2ad-cdc0-4305-8152-dd34dd2638f2","name":"fdebd2ad-cdc0-4305-8152-dd34dd2638f2","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"380032a1-f564-49dd-bbf9-04391109226e","name":"380032a1-f564-49dd-bbf9-04391109226e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"af9f51dd-77c9-4714-9cc9-f69c4b41221a","name":"af9f51dd-77c9-4714-9cc9-f69c4b41221a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"0d869733-1346-401e-90c3-26ce45631ab2","name":"0d869733-1346-401e-90c3-26ce45631ab2","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"3bed14ed-d8ef-4e2f-9d71-6eb1ce5ddb34","name":"3bed14ed-d8ef-4e2f-9d71-6eb1ce5ddb34","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"54ed6dd8-3b46-458d-9ef9-ddb84f9b5a53","name":"54ed6dd8-3b46-458d-9ef9-ddb84f9b5a53","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"f6b57a76-8e15-4e08-95a1-00acfc2ed262","name":"f6b57a76-8e15-4e08-95a1-00acfc2ed262","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"7897ba67-28c3-4c9c-bd97-6211f4a079d0","name":"7897ba67-28c3-4c9c-bd97-6211f4a079d0","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"43ab2ecd-3983-4f57-9fc8-1ccaea47fc2c","name":"43ab2ecd-3983-4f57-9fc8-1ccaea47fc2c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"78291903-2783-4041-82d8-cc072217aca3","name":"78291903-2783-4041-82d8-cc072217aca3","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"eb46993b-2b1d-4fc6-8811-78656a1d129c","name":"eb46993b-2b1d-4fc6-8811-78656a1d129c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"a8642eb0-3023-4113-b13b-ff8a8c11386f","name":"a8642eb0-3023-4113-b13b-ff8a8c11386f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"455ba3a1-1a6c-4908-866d-4dd8b3104bfb","name":"455ba3a1-1a6c-4908-866d-4dd8b3104bfb","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"3509c403-4a42-4dbf-92f7-560c8127d7a4","name":"3509c403-4a42-4dbf-92f7-560c8127d7a4","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"40b6fe6f-15f9-432c-8c3f-ff992acc31d0","name":"40b6fe6f-15f9-432c-8c3f-ff992acc31d0","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"95bc9f54-030d-4fe5-b022-ed084c5bde29","name":"95bc9f54-030d-4fe5-b022-ed084c5bde29","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"d1b868bf-e07e-4504-9be4-050c777e2959","name":"d1b868bf-e07e-4504-9be4-050c777e2959","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"99d73fc9-3d98-4ff9-b8ac-c0c643b60fff","name":"99d73fc9-3d98-4ff9-b8ac-c0c643b60fff","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"8cd2dcc8-c818-467b-8b55-a1aa784707fc","name":"8cd2dcc8-c818-467b-8b55-a1aa784707fc","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"7f18ca31-d1b6-41b4-98c8-14e2ee900f8f","name":"7f18ca31-d1b6-41b4-98c8-14e2ee900f8f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"16841a42-f578-4d0f-bc53-345e26a4309d","name":"16841a42-f578-4d0f-bc53-345e26a4309d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"bfdf43a6-c842-49fb-b161-ba27246384f4","name":"bfdf43a6-c842-49fb-b161-ba27246384f4","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"d55e1739-d36d-4487-a702-b89fa087184e","name":"d55e1739-d36d-4487-a702-b89fa087184e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"44b7382e-2196-405b-bee8-29c85e8f23ed","name":"44b7382e-2196-405b-bee8-29c85e8f23ed","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"3db612ae-e3aa-4aef-9e4e-8e2a362855b1","name":"3db612ae-e3aa-4aef-9e4e-8e2a362855b1","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"0abe3892-4dff-4baa-b14c-eb85368af891","name":"0abe3892-4dff-4baa-b14c-eb85368af891","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"7b193357-84c6-4399-a900-b24b88446930","name":"7b193357-84c6-4399-a900-b24b88446930","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"ae2db314-7ff4-460f-b597-1f330bfee00a","name":"ae2db314-7ff4-460f-b597-1f330bfee00a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"fdebd2ad-cdc0-4305-8152-dd34dd2638f2","name":"fdebd2ad-cdc0-4305-8152-dd34dd2638f2","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"380032a1-f564-49dd-bbf9-04391109226e","name":"380032a1-f564-49dd-bbf9-04391109226e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"af9f51dd-77c9-4714-9cc9-f69c4b41221a","name":"af9f51dd-77c9-4714-9cc9-f69c4b41221a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"0d869733-1346-401e-90c3-26ce45631ab2","name":"0d869733-1346-401e-90c3-26ce45631ab2","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"3bed14ed-d8ef-4e2f-9d71-6eb1ce5ddb34","name":"3bed14ed-d8ef-4e2f-9d71-6eb1ce5ddb34","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"54ed6dd8-3b46-458d-9ef9-ddb84f9b5a53","name":"54ed6dd8-3b46-458d-9ef9-ddb84f9b5a53","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"f6b57a76-8e15-4e08-95a1-00acfc2ed262","name":"f6b57a76-8e15-4e08-95a1-00acfc2ed262","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"7897ba67-28c3-4c9c-bd97-6211f4a079d0","name":"7897ba67-28c3-4c9c-bd97-6211f4a079d0","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"43ab2ecd-3983-4f57-9fc8-1ccaea47fc2c","name":"43ab2ecd-3983-4f57-9fc8-1ccaea47fc2c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"78291903-2783-4041-82d8-cc072217aca3","name":"78291903-2783-4041-82d8-cc072217aca3","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"eb46993b-2b1d-4fc6-8811-78656a1d129c","name":"eb46993b-2b1d-4fc6-8811-78656a1d129c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"a8642eb0-3023-4113-b13b-ff8a8c11386f","name":"a8642eb0-3023-4113-b13b-ff8a8c11386f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"455ba3a1-1a6c-4908-866d-4dd8b3104bfb","name":"455ba3a1-1a6c-4908-866d-4dd8b3104bfb","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -95,90 +95,34 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"3509c403-4a42-4dbf-92f7-560c8127d7a4","path":"sprites/spr_fleet_alert/spr_fleet_alert.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"f0737c21-c8fc-4c51-babe-20c7f6301068","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"40b6fe6f-15f9-432c-8c3f-ff992acc31d0","path":"sprites/spr_fleet_alert/spr_fleet_alert.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"106eb3e4-1b1b-46ba-8ad5-7ffef628f808","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"95bc9f54-030d-4fe5-b022-ed084c5bde29","path":"sprites/spr_fleet_alert/spr_fleet_alert.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"e4baa6bd-fad7-44c9-8f44-2f639e7672df","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"d1b868bf-e07e-4504-9be4-050c777e2959","path":"sprites/spr_fleet_alert/spr_fleet_alert.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"16345a42-4a6d-469c-bc2b-068c367f3e84","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"99d73fc9-3d98-4ff9-b8ac-c0c643b60fff","path":"sprites/spr_fleet_alert/spr_fleet_alert.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"2b5d675a-5366-4c96-b59d-7bbd3e337f6e","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"8cd2dcc8-c818-467b-8b55-a1aa784707fc","path":"sprites/spr_fleet_alert/spr_fleet_alert.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"bcdd4262-9976-40ae-b742-018b5456d2b2","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"7f18ca31-d1b6-41b4-98c8-14e2ee900f8f","path":"sprites/spr_fleet_alert/spr_fleet_alert.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"f43d1ca9-dcd0-4f92-9164-3f83f26fceb1","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"16841a42-f578-4d0f-bc53-345e26a4309d","path":"sprites/spr_fleet_alert/spr_fleet_alert.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"fd73b924-43bf-41d9-8271-12542380d00d","IsCreationKey":false,"Key":7.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"bfdf43a6-c842-49fb-b161-ba27246384f4","path":"sprites/spr_fleet_alert/spr_fleet_alert.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"ea6a1361-f0b5-4c2a-b600-50b96b43d815","IsCreationKey":false,"Key":8.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"d55e1739-d36d-4487-a702-b89fa087184e","path":"sprites/spr_fleet_alert/spr_fleet_alert.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"a1583cf2-655a-4eed-beda-a527948cbcf2","IsCreationKey":false,"Key":9.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"44b7382e-2196-405b-bee8-29c85e8f23ed","path":"sprites/spr_fleet_alert/spr_fleet_alert.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"8d7f9166-2daf-46d0-8160-71fe9d34b349","IsCreationKey":false,"Key":10.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"3db612ae-e3aa-4aef-9e4e-8e2a362855b1","path":"sprites/spr_fleet_alert/spr_fleet_alert.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"b73b1e4a-ddc4-43e6-8264-d7e596a94a2c","IsCreationKey":false,"Key":11.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"0abe3892-4dff-4baa-b14c-eb85368af891","path":"sprites/spr_fleet_alert/spr_fleet_alert.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"c69ae899-b335-453b-a60c-77619c337695","IsCreationKey":false,"Key":12.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"7b193357-84c6-4399-a900-b24b88446930","path":"sprites/spr_fleet_alert/spr_fleet_alert.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"ed9f679c-0740-4403-8633-8d1e1b1b248a","IsCreationKey":false,"Key":13.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"ae2db314-7ff4-460f-b597-1f330bfee00a","path":"sprites/spr_fleet_alert/spr_fleet_alert.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"0b7520c4-53d0-4480-b6bc-988a15adf5b2","IsCreationKey":false,"Key":14.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"fdebd2ad-cdc0-4305-8152-dd34dd2638f2","path":"sprites/spr_fleet_alert/spr_fleet_alert.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"e713a8a3-fb54-46a7-9848-4acf88a1a942","IsCreationKey":false,"Key":15.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"380032a1-f564-49dd-bbf9-04391109226e","path":"sprites/spr_fleet_alert/spr_fleet_alert.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"85b99d1f-cbb3-48ec-9bdb-1c0c8f2d161f","IsCreationKey":false,"Key":16.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"af9f51dd-77c9-4714-9cc9-f69c4b41221a","path":"sprites/spr_fleet_alert/spr_fleet_alert.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"2a05aa8d-8b2b-453b-b618-b3751e52eae7","IsCreationKey":false,"Key":17.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"0d869733-1346-401e-90c3-26ce45631ab2","path":"sprites/spr_fleet_alert/spr_fleet_alert.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"52e4c85c-97cb-4ab5-9dc2-1997aa6af9ae","IsCreationKey":false,"Key":18.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"3bed14ed-d8ef-4e2f-9d71-6eb1ce5ddb34","path":"sprites/spr_fleet_alert/spr_fleet_alert.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"cff2981f-56c2-4d04-b56d-e3be09a68c89","IsCreationKey":false,"Key":19.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"54ed6dd8-3b46-458d-9ef9-ddb84f9b5a53","path":"sprites/spr_fleet_alert/spr_fleet_alert.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"16ae9ca2-b3ac-4381-8412-f62fe7f210ed","IsCreationKey":false,"Key":20.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"f6b57a76-8e15-4e08-95a1-00acfc2ed262","path":"sprites/spr_fleet_alert/spr_fleet_alert.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"164a8aed-d9a1-4517-973b-a5ef5c079aff","IsCreationKey":false,"Key":21.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"7897ba67-28c3-4c9c-bd97-6211f4a079d0","path":"sprites/spr_fleet_alert/spr_fleet_alert.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"c25a0fdd-5401-4665-a190-406d7fc58efe","IsCreationKey":false,"Key":22.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"43ab2ecd-3983-4f57-9fc8-1ccaea47fc2c","path":"sprites/spr_fleet_alert/spr_fleet_alert.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"990fb6a9-5f10-4b9e-915c-c8b6e0364438","IsCreationKey":false,"Key":23.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"78291903-2783-4041-82d8-cc072217aca3","path":"sprites/spr_fleet_alert/spr_fleet_alert.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"038df30f-7867-44fb-b37a-036a567daf58","IsCreationKey":false,"Key":24.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"eb46993b-2b1d-4fc6-8811-78656a1d129c","path":"sprites/spr_fleet_alert/spr_fleet_alert.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"180be3f9-5423-4b36-82a2-253919c7b724","IsCreationKey":false,"Key":25.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"a8642eb0-3023-4113-b13b-ff8a8c11386f","path":"sprites/spr_fleet_alert/spr_fleet_alert.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"e2b9f7b3-5c75-4e9c-90d7-c22ba4be3d6b","IsCreationKey":false,"Key":26.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"455ba3a1-1a6c-4908-866d-4dd8b3104bfb","path":"sprites/spr_fleet_alert/spr_fleet_alert.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"2f2d209b-fa65-4288-a103-8204e39673c2","IsCreationKey":false,"Key":27.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"3509c403-4a42-4dbf-92f7-560c8127d7a4","path":"sprites/spr_fleet_alert/spr_fleet_alert.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"f0737c21-c8fc-4c51-babe-20c7f6301068","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"40b6fe6f-15f9-432c-8c3f-ff992acc31d0","path":"sprites/spr_fleet_alert/spr_fleet_alert.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"106eb3e4-1b1b-46ba-8ad5-7ffef628f808","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"95bc9f54-030d-4fe5-b022-ed084c5bde29","path":"sprites/spr_fleet_alert/spr_fleet_alert.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"e4baa6bd-fad7-44c9-8f44-2f639e7672df","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"d1b868bf-e07e-4504-9be4-050c777e2959","path":"sprites/spr_fleet_alert/spr_fleet_alert.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"16345a42-4a6d-469c-bc2b-068c367f3e84","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"99d73fc9-3d98-4ff9-b8ac-c0c643b60fff","path":"sprites/spr_fleet_alert/spr_fleet_alert.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"2b5d675a-5366-4c96-b59d-7bbd3e337f6e","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"8cd2dcc8-c818-467b-8b55-a1aa784707fc","path":"sprites/spr_fleet_alert/spr_fleet_alert.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"bcdd4262-9976-40ae-b742-018b5456d2b2","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"7f18ca31-d1b6-41b4-98c8-14e2ee900f8f","path":"sprites/spr_fleet_alert/spr_fleet_alert.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"f43d1ca9-dcd0-4f92-9164-3f83f26fceb1","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"16841a42-f578-4d0f-bc53-345e26a4309d","path":"sprites/spr_fleet_alert/spr_fleet_alert.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"fd73b924-43bf-41d9-8271-12542380d00d","IsCreationKey":false,"Key":7.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"bfdf43a6-c842-49fb-b161-ba27246384f4","path":"sprites/spr_fleet_alert/spr_fleet_alert.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"ea6a1361-f0b5-4c2a-b600-50b96b43d815","IsCreationKey":false,"Key":8.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"d55e1739-d36d-4487-a702-b89fa087184e","path":"sprites/spr_fleet_alert/spr_fleet_alert.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"a1583cf2-655a-4eed-beda-a527948cbcf2","IsCreationKey":false,"Key":9.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"44b7382e-2196-405b-bee8-29c85e8f23ed","path":"sprites/spr_fleet_alert/spr_fleet_alert.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"8d7f9166-2daf-46d0-8160-71fe9d34b349","IsCreationKey":false,"Key":10.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"3db612ae-e3aa-4aef-9e4e-8e2a362855b1","path":"sprites/spr_fleet_alert/spr_fleet_alert.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"b73b1e4a-ddc4-43e6-8264-d7e596a94a2c","IsCreationKey":false,"Key":11.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"0abe3892-4dff-4baa-b14c-eb85368af891","path":"sprites/spr_fleet_alert/spr_fleet_alert.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"c69ae899-b335-453b-a60c-77619c337695","IsCreationKey":false,"Key":12.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"7b193357-84c6-4399-a900-b24b88446930","path":"sprites/spr_fleet_alert/spr_fleet_alert.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"ed9f679c-0740-4403-8633-8d1e1b1b248a","IsCreationKey":false,"Key":13.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"ae2db314-7ff4-460f-b597-1f330bfee00a","path":"sprites/spr_fleet_alert/spr_fleet_alert.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"0b7520c4-53d0-4480-b6bc-988a15adf5b2","IsCreationKey":false,"Key":14.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"fdebd2ad-cdc0-4305-8152-dd34dd2638f2","path":"sprites/spr_fleet_alert/spr_fleet_alert.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"e713a8a3-fb54-46a7-9848-4acf88a1a942","IsCreationKey":false,"Key":15.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"380032a1-f564-49dd-bbf9-04391109226e","path":"sprites/spr_fleet_alert/spr_fleet_alert.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"85b99d1f-cbb3-48ec-9bdb-1c0c8f2d161f","IsCreationKey":false,"Key":16.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"af9f51dd-77c9-4714-9cc9-f69c4b41221a","path":"sprites/spr_fleet_alert/spr_fleet_alert.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"2a05aa8d-8b2b-453b-b618-b3751e52eae7","IsCreationKey":false,"Key":17.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"0d869733-1346-401e-90c3-26ce45631ab2","path":"sprites/spr_fleet_alert/spr_fleet_alert.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"52e4c85c-97cb-4ab5-9dc2-1997aa6af9ae","IsCreationKey":false,"Key":18.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"3bed14ed-d8ef-4e2f-9d71-6eb1ce5ddb34","path":"sprites/spr_fleet_alert/spr_fleet_alert.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"cff2981f-56c2-4d04-b56d-e3be09a68c89","IsCreationKey":false,"Key":19.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"54ed6dd8-3b46-458d-9ef9-ddb84f9b5a53","path":"sprites/spr_fleet_alert/spr_fleet_alert.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"16ae9ca2-b3ac-4381-8412-f62fe7f210ed","IsCreationKey":false,"Key":20.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"f6b57a76-8e15-4e08-95a1-00acfc2ed262","path":"sprites/spr_fleet_alert/spr_fleet_alert.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"164a8aed-d9a1-4517-973b-a5ef5c079aff","IsCreationKey":false,"Key":21.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"7897ba67-28c3-4c9c-bd97-6211f4a079d0","path":"sprites/spr_fleet_alert/spr_fleet_alert.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"c25a0fdd-5401-4665-a190-406d7fc58efe","IsCreationKey":false,"Key":22.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"43ab2ecd-3983-4f57-9fc8-1ccaea47fc2c","path":"sprites/spr_fleet_alert/spr_fleet_alert.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"990fb6a9-5f10-4b9e-915c-c8b6e0364438","IsCreationKey":false,"Key":23.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"78291903-2783-4041-82d8-cc072217aca3","path":"sprites/spr_fleet_alert/spr_fleet_alert.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"038df30f-7867-44fb-b37a-036a567daf58","IsCreationKey":false,"Key":24.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"eb46993b-2b1d-4fc6-8811-78656a1d129c","path":"sprites/spr_fleet_alert/spr_fleet_alert.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"180be3f9-5423-4b36-82a2-253919c7b724","IsCreationKey":false,"Key":25.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"a8642eb0-3023-4113-b13b-ff8a8c11386f","path":"sprites/spr_fleet_alert/spr_fleet_alert.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"e2b9f7b3-5c75-4e9c-90d7-c22ba4be3d6b","IsCreationKey":false,"Key":26.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"455ba3a1-1a6c-4908-866d-4dd8b3104bfb","path":"sprites/spr_fleet_alert/spr_fleet_alert.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"2f2d209b-fa65-4288-a103-8204e39673c2","IsCreationKey":false,"Key":27.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":{ diff --git a/sprites/spr_fleet_chaos/spr_fleet_chaos.yy b/sprites/spr_fleet_chaos/spr_fleet_chaos.yy index 16ce6be63c..730a9ecb79 100644 --- a/sprites/spr_fleet_chaos/spr_fleet_chaos.yy +++ b/sprites/spr_fleet_chaos/spr_fleet_chaos.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_fleet_chaos", "bboxMode":0, "bbox_bottom":20, @@ -12,16 +12,16 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"987862b2-cdf5-4a57-9a06-c84b97e7ed9d","name":"987862b2-cdf5-4a57-9a06-c84b97e7ed9d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"61da2e01-6bda-4afb-b52b-6b1cd2d2980e","name":"61da2e01-6bda-4afb-b52b-6b1cd2d2980e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"e266532a-e48d-4033-9198-983dc9aeaa12","name":"e266532a-e48d-4033-9198-983dc9aeaa12","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"3265f69d-3464-4951-996a-68f67b9c2d1b","name":"3265f69d-3464-4951-996a-68f67b9c2d1b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"8892a8a6-b1db-4b3e-a469-4ff8f0833fa0","name":"8892a8a6-b1db-4b3e-a469-4ff8f0833fa0","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"33ca7b9f-9c5f-42ae-b5c9-3b8487406633","name":"33ca7b9f-9c5f-42ae-b5c9-3b8487406633","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"80628aac-30ac-47a2-9a43-54358b1e409f","name":"80628aac-30ac-47a2-9a43-54358b1e409f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"f5d632fe-d51e-4d4d-b8f7-eb2bdba1e6db","name":"f5d632fe-d51e-4d4d-b8f7-eb2bdba1e6db","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"c4d8fbbf-e0fd-41e2-834d-65d35bec13e8","name":"c4d8fbbf-e0fd-41e2-834d-65d35bec13e8","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"2bf519a7-2b69-4937-a724-57ee1bee2b6e","name":"2bf519a7-2b69-4937-a724-57ee1bee2b6e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"987862b2-cdf5-4a57-9a06-c84b97e7ed9d","name":"987862b2-cdf5-4a57-9a06-c84b97e7ed9d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"61da2e01-6bda-4afb-b52b-6b1cd2d2980e","name":"61da2e01-6bda-4afb-b52b-6b1cd2d2980e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"e266532a-e48d-4033-9198-983dc9aeaa12","name":"e266532a-e48d-4033-9198-983dc9aeaa12","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"3265f69d-3464-4951-996a-68f67b9c2d1b","name":"3265f69d-3464-4951-996a-68f67b9c2d1b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"8892a8a6-b1db-4b3e-a469-4ff8f0833fa0","name":"8892a8a6-b1db-4b3e-a469-4ff8f0833fa0","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"33ca7b9f-9c5f-42ae-b5c9-3b8487406633","name":"33ca7b9f-9c5f-42ae-b5c9-3b8487406633","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"80628aac-30ac-47a2-9a43-54358b1e409f","name":"80628aac-30ac-47a2-9a43-54358b1e409f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"f5d632fe-d51e-4d4d-b8f7-eb2bdba1e6db","name":"f5d632fe-d51e-4d4d-b8f7-eb2bdba1e6db","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"c4d8fbbf-e0fd-41e2-834d-65d35bec13e8","name":"c4d8fbbf-e0fd-41e2-834d-65d35bec13e8","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"2bf519a7-2b69-4937-a724-57ee1bee2b6e","name":"2bf519a7-2b69-4937-a724-57ee1bee2b6e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -77,36 +77,16 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"987862b2-cdf5-4a57-9a06-c84b97e7ed9d","path":"sprites/spr_fleet_chaos/spr_fleet_chaos.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"46f28293-2d79-4fe6-b237-4ed40fde54c3","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"61da2e01-6bda-4afb-b52b-6b1cd2d2980e","path":"sprites/spr_fleet_chaos/spr_fleet_chaos.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"81d93c89-67ae-4cf0-9ad1-d86e5c05bcaf","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"e266532a-e48d-4033-9198-983dc9aeaa12","path":"sprites/spr_fleet_chaos/spr_fleet_chaos.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"373f910c-a495-411f-8ada-1eb09f64c89d","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"3265f69d-3464-4951-996a-68f67b9c2d1b","path":"sprites/spr_fleet_chaos/spr_fleet_chaos.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"e8d984fe-634e-4902-83bc-bd164b7f00fb","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"8892a8a6-b1db-4b3e-a469-4ff8f0833fa0","path":"sprites/spr_fleet_chaos/spr_fleet_chaos.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"738f4e69-702b-48d6-8c35-14324d057bba","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"33ca7b9f-9c5f-42ae-b5c9-3b8487406633","path":"sprites/spr_fleet_chaos/spr_fleet_chaos.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"c47715b4-c38b-45f3-8145-9cc384fca54d","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"80628aac-30ac-47a2-9a43-54358b1e409f","path":"sprites/spr_fleet_chaos/spr_fleet_chaos.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"f0c8f245-188c-4a06-bb04-f588e568bfa0","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"f5d632fe-d51e-4d4d-b8f7-eb2bdba1e6db","path":"sprites/spr_fleet_chaos/spr_fleet_chaos.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"856878f8-b182-4126-8ded-d2c9a415b2f3","IsCreationKey":false,"Key":7.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"c4d8fbbf-e0fd-41e2-834d-65d35bec13e8","path":"sprites/spr_fleet_chaos/spr_fleet_chaos.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"e495674e-7f72-4e9e-9cd6-f2e58f050dd2","IsCreationKey":false,"Key":8.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"2bf519a7-2b69-4937-a724-57ee1bee2b6e","path":"sprites/spr_fleet_chaos/spr_fleet_chaos.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"d334534b-9968-4419-b7c0-f093f5407545","IsCreationKey":false,"Key":9.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"987862b2-cdf5-4a57-9a06-c84b97e7ed9d","path":"sprites/spr_fleet_chaos/spr_fleet_chaos.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"46f28293-2d79-4fe6-b237-4ed40fde54c3","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"61da2e01-6bda-4afb-b52b-6b1cd2d2980e","path":"sprites/spr_fleet_chaos/spr_fleet_chaos.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"81d93c89-67ae-4cf0-9ad1-d86e5c05bcaf","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"e266532a-e48d-4033-9198-983dc9aeaa12","path":"sprites/spr_fleet_chaos/spr_fleet_chaos.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"373f910c-a495-411f-8ada-1eb09f64c89d","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"3265f69d-3464-4951-996a-68f67b9c2d1b","path":"sprites/spr_fleet_chaos/spr_fleet_chaos.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"e8d984fe-634e-4902-83bc-bd164b7f00fb","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"8892a8a6-b1db-4b3e-a469-4ff8f0833fa0","path":"sprites/spr_fleet_chaos/spr_fleet_chaos.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"738f4e69-702b-48d6-8c35-14324d057bba","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"33ca7b9f-9c5f-42ae-b5c9-3b8487406633","path":"sprites/spr_fleet_chaos/spr_fleet_chaos.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"c47715b4-c38b-45f3-8145-9cc384fca54d","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"80628aac-30ac-47a2-9a43-54358b1e409f","path":"sprites/spr_fleet_chaos/spr_fleet_chaos.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"f0c8f245-188c-4a06-bb04-f588e568bfa0","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"f5d632fe-d51e-4d4d-b8f7-eb2bdba1e6db","path":"sprites/spr_fleet_chaos/spr_fleet_chaos.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"856878f8-b182-4126-8ded-d2c9a415b2f3","IsCreationKey":false,"Key":7.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"c4d8fbbf-e0fd-41e2-834d-65d35bec13e8","path":"sprites/spr_fleet_chaos/spr_fleet_chaos.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"e495674e-7f72-4e9e-9cd6-f2e58f050dd2","IsCreationKey":false,"Key":8.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"2bf519a7-2b69-4937-a724-57ee1bee2b6e","path":"sprites/spr_fleet_chaos/spr_fleet_chaos.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"d334534b-9968-4419-b7c0-f093f5407545","IsCreationKey":false,"Key":9.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":{ diff --git a/sprites/spr_fleet_civilian/spr_fleet_civilian.yy b/sprites/spr_fleet_civilian/spr_fleet_civilian.yy index b02151edd3..c7f8276266 100644 --- a/sprites/spr_fleet_civilian/spr_fleet_civilian.yy +++ b/sprites/spr_fleet_civilian/spr_fleet_civilian.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_fleet_civilian", "bboxMode":0, "bbox_bottom":20, @@ -12,10 +12,10 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"6cc7413b-e997-41a1-80ea-9bf1d94bc27a","name":"6cc7413b-e997-41a1-80ea-9bf1d94bc27a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"b251f968-ec3e-41e2-a361-0447e500b762","name":"b251f968-ec3e-41e2-a361-0447e500b762","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"d18d46d9-9bfe-473d-8774-cd2182e4c895","name":"d18d46d9-9bfe-473d-8774-cd2182e4c895","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"e9189a05-67fd-4840-8a70-f8b7c19748b0","name":"e9189a05-67fd-4840-8a70-f8b7c19748b0","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"6cc7413b-e997-41a1-80ea-9bf1d94bc27a","name":"6cc7413b-e997-41a1-80ea-9bf1d94bc27a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"b251f968-ec3e-41e2-a361-0447e500b762","name":"b251f968-ec3e-41e2-a361-0447e500b762","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"d18d46d9-9bfe-473d-8774-cd2182e4c895","name":"d18d46d9-9bfe-473d-8774-cd2182e4c895","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"e9189a05-67fd-4840-8a70-f8b7c19748b0","name":"e9189a05-67fd-4840-8a70-f8b7c19748b0","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -71,18 +71,10 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"6cc7413b-e997-41a1-80ea-9bf1d94bc27a","path":"sprites/spr_fleet_civilian/spr_fleet_civilian.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"8bc6e585-d6ed-418b-9fbb-6cc8e6d4132d","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"b251f968-ec3e-41e2-a361-0447e500b762","path":"sprites/spr_fleet_civilian/spr_fleet_civilian.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"16bf733e-060b-4c84-810f-43f99f54487d","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"d18d46d9-9bfe-473d-8774-cd2182e4c895","path":"sprites/spr_fleet_civilian/spr_fleet_civilian.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"9238b428-2d61-45a2-9fb1-5bbffbb1fec7","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"e9189a05-67fd-4840-8a70-f8b7c19748b0","path":"sprites/spr_fleet_civilian/spr_fleet_civilian.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"9c62ff3a-b746-4928-ab52-9f9787ba8f77","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"6cc7413b-e997-41a1-80ea-9bf1d94bc27a","path":"sprites/spr_fleet_civilian/spr_fleet_civilian.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"8bc6e585-d6ed-418b-9fbb-6cc8e6d4132d","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"b251f968-ec3e-41e2-a361-0447e500b762","path":"sprites/spr_fleet_civilian/spr_fleet_civilian.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"16bf733e-060b-4c84-810f-43f99f54487d","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"d18d46d9-9bfe-473d-8774-cd2182e4c895","path":"sprites/spr_fleet_civilian/spr_fleet_civilian.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"9238b428-2d61-45a2-9fb1-5bbffbb1fec7","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"e9189a05-67fd-4840-8a70-f8b7c19748b0","path":"sprites/spr_fleet_civilian/spr_fleet_civilian.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"9c62ff3a-b746-4928-ab52-9f9787ba8f77","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":{ diff --git a/sprites/spr_fleet_eldar/spr_fleet_eldar.yy b/sprites/spr_fleet_eldar/spr_fleet_eldar.yy index d32aea41c8..433357957d 100644 --- a/sprites/spr_fleet_eldar/spr_fleet_eldar.yy +++ b/sprites/spr_fleet_eldar/spr_fleet_eldar.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_fleet_eldar", "bboxMode":0, "bbox_bottom":19, @@ -12,12 +12,12 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"368992a1-ac68-4259-81ba-06e750f8b4db","name":"368992a1-ac68-4259-81ba-06e750f8b4db","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"5763d425-3fc4-42f6-a71e-92566cf717dc","name":"5763d425-3fc4-42f6-a71e-92566cf717dc","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"11bb694a-8030-4caf-9546-1b54d0afebde","name":"11bb694a-8030-4caf-9546-1b54d0afebde","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"a4f48654-f67c-47a8-a423-98d3df6ebc68","name":"a4f48654-f67c-47a8-a423-98d3df6ebc68","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"19ab2b18-39f1-4b70-9c10-b72bd726ce5b","name":"19ab2b18-39f1-4b70-9c10-b72bd726ce5b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"beacacea-0909-441b-ac0c-db594bb0be14","name":"beacacea-0909-441b-ac0c-db594bb0be14","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"368992a1-ac68-4259-81ba-06e750f8b4db","name":"368992a1-ac68-4259-81ba-06e750f8b4db","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"5763d425-3fc4-42f6-a71e-92566cf717dc","name":"5763d425-3fc4-42f6-a71e-92566cf717dc","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"11bb694a-8030-4caf-9546-1b54d0afebde","name":"11bb694a-8030-4caf-9546-1b54d0afebde","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"a4f48654-f67c-47a8-a423-98d3df6ebc68","name":"a4f48654-f67c-47a8-a423-98d3df6ebc68","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"19ab2b18-39f1-4b70-9c10-b72bd726ce5b","name":"19ab2b18-39f1-4b70-9c10-b72bd726ce5b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"beacacea-0909-441b-ac0c-db594bb0be14","name":"beacacea-0909-441b-ac0c-db594bb0be14","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -73,24 +73,12 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"368992a1-ac68-4259-81ba-06e750f8b4db","path":"sprites/spr_fleet_eldar/spr_fleet_eldar.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"10a985b8-002c-4bf6-b9b2-b0e898422970","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"5763d425-3fc4-42f6-a71e-92566cf717dc","path":"sprites/spr_fleet_eldar/spr_fleet_eldar.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"21f1d001-d744-4a6b-95a7-2ded391437e0","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"11bb694a-8030-4caf-9546-1b54d0afebde","path":"sprites/spr_fleet_eldar/spr_fleet_eldar.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"759a4d6a-a3a6-46a8-b605-f17aec42061a","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"a4f48654-f67c-47a8-a423-98d3df6ebc68","path":"sprites/spr_fleet_eldar/spr_fleet_eldar.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"fff703a1-f607-4b81-85f0-b21a6749daa0","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"19ab2b18-39f1-4b70-9c10-b72bd726ce5b","path":"sprites/spr_fleet_eldar/spr_fleet_eldar.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"f072f03b-0c53-4533-81fe-c72602a84056","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"beacacea-0909-441b-ac0c-db594bb0be14","path":"sprites/spr_fleet_eldar/spr_fleet_eldar.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"1a3e376f-c503-4786-b5ff-7e30e266fdef","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"368992a1-ac68-4259-81ba-06e750f8b4db","path":"sprites/spr_fleet_eldar/spr_fleet_eldar.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"10a985b8-002c-4bf6-b9b2-b0e898422970","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"5763d425-3fc4-42f6-a71e-92566cf717dc","path":"sprites/spr_fleet_eldar/spr_fleet_eldar.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"21f1d001-d744-4a6b-95a7-2ded391437e0","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"11bb694a-8030-4caf-9546-1b54d0afebde","path":"sprites/spr_fleet_eldar/spr_fleet_eldar.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"759a4d6a-a3a6-46a8-b605-f17aec42061a","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"a4f48654-f67c-47a8-a423-98d3df6ebc68","path":"sprites/spr_fleet_eldar/spr_fleet_eldar.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"fff703a1-f607-4b81-85f0-b21a6749daa0","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"19ab2b18-39f1-4b70-9c10-b72bd726ce5b","path":"sprites/spr_fleet_eldar/spr_fleet_eldar.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"f072f03b-0c53-4533-81fe-c72602a84056","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"beacacea-0909-441b-ac0c-db594bb0be14","path":"sprites/spr_fleet_eldar/spr_fleet_eldar.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"1a3e376f-c503-4786-b5ff-7e30e266fdef","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":{ diff --git a/sprites/spr_fleet_imperial/spr_fleet_imperial.yy b/sprites/spr_fleet_imperial/spr_fleet_imperial.yy index 4a0ff9c371..bd2735723c 100644 --- a/sprites/spr_fleet_imperial/spr_fleet_imperial.yy +++ b/sprites/spr_fleet_imperial/spr_fleet_imperial.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_fleet_imperial", "bboxMode":0, "bbox_bottom":20, @@ -12,16 +12,16 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"7ed3ac9a-c1a3-4966-8c07-799101e9fca6","name":"7ed3ac9a-c1a3-4966-8c07-799101e9fca6","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"cdb72c37-035a-45e6-9261-6bb7235b36d0","name":"cdb72c37-035a-45e6-9261-6bb7235b36d0","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"b70d4f7d-d6e5-4417-a451-df64b6cc0dfc","name":"b70d4f7d-d6e5-4417-a451-df64b6cc0dfc","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"7c517f52-18b0-4ce3-907a-266b27998f5e","name":"7c517f52-18b0-4ce3-907a-266b27998f5e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"7e369ca2-e39c-4f3a-95cf-1f7ece113915","name":"7e369ca2-e39c-4f3a-95cf-1f7ece113915","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"83e2105e-06f4-433a-b155-899860422247","name":"83e2105e-06f4-433a-b155-899860422247","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"7b33f482-c952-4a96-ae8e-fc3c743bb25f","name":"7b33f482-c952-4a96-ae8e-fc3c743bb25f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"948a2eb0-29bf-4b0d-8710-2641375e304c","name":"948a2eb0-29bf-4b0d-8710-2641375e304c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"c527feba-1ebf-430b-bcce-57c3998dd2ba","name":"c527feba-1ebf-430b-bcce-57c3998dd2ba","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"3a21b19b-398c-43ca-98e1-b7cbeafd021a","name":"3a21b19b-398c-43ca-98e1-b7cbeafd021a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"7ed3ac9a-c1a3-4966-8c07-799101e9fca6","name":"7ed3ac9a-c1a3-4966-8c07-799101e9fca6","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"cdb72c37-035a-45e6-9261-6bb7235b36d0","name":"cdb72c37-035a-45e6-9261-6bb7235b36d0","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"b70d4f7d-d6e5-4417-a451-df64b6cc0dfc","name":"b70d4f7d-d6e5-4417-a451-df64b6cc0dfc","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"7c517f52-18b0-4ce3-907a-266b27998f5e","name":"7c517f52-18b0-4ce3-907a-266b27998f5e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"7e369ca2-e39c-4f3a-95cf-1f7ece113915","name":"7e369ca2-e39c-4f3a-95cf-1f7ece113915","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"83e2105e-06f4-433a-b155-899860422247","name":"83e2105e-06f4-433a-b155-899860422247","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"7b33f482-c952-4a96-ae8e-fc3c743bb25f","name":"7b33f482-c952-4a96-ae8e-fc3c743bb25f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"948a2eb0-29bf-4b0d-8710-2641375e304c","name":"948a2eb0-29bf-4b0d-8710-2641375e304c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"c527feba-1ebf-430b-bcce-57c3998dd2ba","name":"c527feba-1ebf-430b-bcce-57c3998dd2ba","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"3a21b19b-398c-43ca-98e1-b7cbeafd021a","name":"3a21b19b-398c-43ca-98e1-b7cbeafd021a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -77,36 +77,16 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"7ed3ac9a-c1a3-4966-8c07-799101e9fca6","path":"sprites/spr_fleet_imperial/spr_fleet_imperial.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"f2227933-b8bc-4bf6-9d8e-524410250dc7","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"cdb72c37-035a-45e6-9261-6bb7235b36d0","path":"sprites/spr_fleet_imperial/spr_fleet_imperial.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"1746812c-c63b-415d-b459-f12dc9208349","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"b70d4f7d-d6e5-4417-a451-df64b6cc0dfc","path":"sprites/spr_fleet_imperial/spr_fleet_imperial.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"edc14729-eece-4ed2-8dfc-a5f8c7dfe38b","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"7c517f52-18b0-4ce3-907a-266b27998f5e","path":"sprites/spr_fleet_imperial/spr_fleet_imperial.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"da9e9585-4af5-4c8f-bf1e-b0865913f48c","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"7e369ca2-e39c-4f3a-95cf-1f7ece113915","path":"sprites/spr_fleet_imperial/spr_fleet_imperial.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"e924ab6f-120a-498b-80ba-78f1ec0f34fe","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"83e2105e-06f4-433a-b155-899860422247","path":"sprites/spr_fleet_imperial/spr_fleet_imperial.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"6e7f9699-c511-43fb-b4aa-f01b6cb66560","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"7b33f482-c952-4a96-ae8e-fc3c743bb25f","path":"sprites/spr_fleet_imperial/spr_fleet_imperial.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"8cfe88df-f523-462d-bcf6-20f2367cf625","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"948a2eb0-29bf-4b0d-8710-2641375e304c","path":"sprites/spr_fleet_imperial/spr_fleet_imperial.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"e41b6128-03e4-490c-be0e-4c177c1dcfaa","IsCreationKey":false,"Key":7.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"c527feba-1ebf-430b-bcce-57c3998dd2ba","path":"sprites/spr_fleet_imperial/spr_fleet_imperial.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"38bd26a6-a925-4d86-8cc1-91d1fa137e25","IsCreationKey":false,"Key":8.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"3a21b19b-398c-43ca-98e1-b7cbeafd021a","path":"sprites/spr_fleet_imperial/spr_fleet_imperial.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"212d7172-82b2-47e9-95c1-fb55d943413e","IsCreationKey":false,"Key":9.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"7ed3ac9a-c1a3-4966-8c07-799101e9fca6","path":"sprites/spr_fleet_imperial/spr_fleet_imperial.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"f2227933-b8bc-4bf6-9d8e-524410250dc7","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"cdb72c37-035a-45e6-9261-6bb7235b36d0","path":"sprites/spr_fleet_imperial/spr_fleet_imperial.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"1746812c-c63b-415d-b459-f12dc9208349","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"b70d4f7d-d6e5-4417-a451-df64b6cc0dfc","path":"sprites/spr_fleet_imperial/spr_fleet_imperial.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"edc14729-eece-4ed2-8dfc-a5f8c7dfe38b","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"7c517f52-18b0-4ce3-907a-266b27998f5e","path":"sprites/spr_fleet_imperial/spr_fleet_imperial.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"da9e9585-4af5-4c8f-bf1e-b0865913f48c","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"7e369ca2-e39c-4f3a-95cf-1f7ece113915","path":"sprites/spr_fleet_imperial/spr_fleet_imperial.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"e924ab6f-120a-498b-80ba-78f1ec0f34fe","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"83e2105e-06f4-433a-b155-899860422247","path":"sprites/spr_fleet_imperial/spr_fleet_imperial.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"6e7f9699-c511-43fb-b4aa-f01b6cb66560","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"7b33f482-c952-4a96-ae8e-fc3c743bb25f","path":"sprites/spr_fleet_imperial/spr_fleet_imperial.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"8cfe88df-f523-462d-bcf6-20f2367cf625","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"948a2eb0-29bf-4b0d-8710-2641375e304c","path":"sprites/spr_fleet_imperial/spr_fleet_imperial.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"e41b6128-03e4-490c-be0e-4c177c1dcfaa","IsCreationKey":false,"Key":7.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"c527feba-1ebf-430b-bcce-57c3998dd2ba","path":"sprites/spr_fleet_imperial/spr_fleet_imperial.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"38bd26a6-a925-4d86-8cc1-91d1fa137e25","IsCreationKey":false,"Key":8.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"3a21b19b-398c-43ca-98e1-b7cbeafd021a","path":"sprites/spr_fleet_imperial/spr_fleet_imperial.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"212d7172-82b2-47e9-95c1-fb55d943413e","IsCreationKey":false,"Key":9.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":{ diff --git a/sprites/spr_fleet_inquisition/spr_fleet_inquisition.yy b/sprites/spr_fleet_inquisition/spr_fleet_inquisition.yy index f77c68a02d..1982cd9ff2 100644 --- a/sprites/spr_fleet_inquisition/spr_fleet_inquisition.yy +++ b/sprites/spr_fleet_inquisition/spr_fleet_inquisition.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_fleet_inquisition", "bboxMode":0, "bbox_bottom":14, @@ -12,9 +12,9 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"92019af0-cd11-4fd1-a771-9349389afadf","name":"92019af0-cd11-4fd1-a771-9349389afadf","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"49595a43-1634-487e-b0b0-fce6c652401d","name":"49595a43-1634-487e-b0b0-fce6c652401d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"d7e6cf88-0f06-4f6f-a8b1-03d510627901","name":"d7e6cf88-0f06-4f6f-a8b1-03d510627901","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"92019af0-cd11-4fd1-a771-9349389afadf","name":"92019af0-cd11-4fd1-a771-9349389afadf","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"49595a43-1634-487e-b0b0-fce6c652401d","name":"49595a43-1634-487e-b0b0-fce6c652401d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"d7e6cf88-0f06-4f6f-a8b1-03d510627901","name":"d7e6cf88-0f06-4f6f-a8b1-03d510627901","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -70,15 +70,9 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"92019af0-cd11-4fd1-a771-9349389afadf","path":"sprites/spr_fleet_inquisition/spr_fleet_inquisition.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"d1a6ee6e-e331-44c5-85e3-374e6df5a48f","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"49595a43-1634-487e-b0b0-fce6c652401d","path":"sprites/spr_fleet_inquisition/spr_fleet_inquisition.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"1b8571ff-c45f-4144-95b8-bd2e724dcb52","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"d7e6cf88-0f06-4f6f-a8b1-03d510627901","path":"sprites/spr_fleet_inquisition/spr_fleet_inquisition.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"7dcabe8c-e56b-40a7-a72c-ed6b3c6099d2","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"92019af0-cd11-4fd1-a771-9349389afadf","path":"sprites/spr_fleet_inquisition/spr_fleet_inquisition.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"d1a6ee6e-e331-44c5-85e3-374e6df5a48f","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"49595a43-1634-487e-b0b0-fce6c652401d","path":"sprites/spr_fleet_inquisition/spr_fleet_inquisition.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"1b8571ff-c45f-4144-95b8-bd2e724dcb52","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"d7e6cf88-0f06-4f6f-a8b1-03d510627901","path":"sprites/spr_fleet_inquisition/spr_fleet_inquisition.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"7dcabe8c-e56b-40a7-a72c-ed6b3c6099d2","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":{ diff --git a/sprites/spr_fleet_mechanicus/spr_fleet_mechanicus.yy b/sprites/spr_fleet_mechanicus/spr_fleet_mechanicus.yy index ecd7b874c2..4d232c696e 100644 --- a/sprites/spr_fleet_mechanicus/spr_fleet_mechanicus.yy +++ b/sprites/spr_fleet_mechanicus/spr_fleet_mechanicus.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_fleet_mechanicus", "bboxMode":0, "bbox_bottom":15, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"ec075b4d-97b8-47b8-8a7f-5b2ec142ac61","name":"ec075b4d-97b8-47b8-8a7f-5b2ec142ac61","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"ec075b4d-97b8-47b8-8a7f-5b2ec142ac61","name":"ec075b4d-97b8-47b8-8a7f-5b2ec142ac61","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"ec075b4d-97b8-47b8-8a7f-5b2ec142ac61","path":"sprites/spr_fleet_mechanicus/spr_fleet_mechanicus.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"758c2ed2-dbe8-403f-85bc-60e54b5cd9dc","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"ec075b4d-97b8-47b8-8a7f-5b2ec142ac61","path":"sprites/spr_fleet_mechanicus/spr_fleet_mechanicus.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"758c2ed2-dbe8-403f-85bc-60e54b5cd9dc","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":{ diff --git a/sprites/spr_fleet_necron/spr_fleet_necron.yy b/sprites/spr_fleet_necron/spr_fleet_necron.yy index e599309694..b6147162a9 100644 --- a/sprites/spr_fleet_necron/spr_fleet_necron.yy +++ b/sprites/spr_fleet_necron/spr_fleet_necron.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_fleet_necron", "bboxMode":0, "bbox_bottom":21, @@ -12,15 +12,15 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"7bca54aa-9126-4cb1-bfaf-fb4dc27c20f7","name":"7bca54aa-9126-4cb1-bfaf-fb4dc27c20f7","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"c1fefcfe-ffe3-4ab7-8983-726bcbfe49f8","name":"c1fefcfe-ffe3-4ab7-8983-726bcbfe49f8","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"55123e8c-8dc3-4e03-835c-cecdd19910a1","name":"55123e8c-8dc3-4e03-835c-cecdd19910a1","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"12d78257-948b-4e4e-a3c5-3274e1470a06","name":"12d78257-948b-4e4e-a3c5-3274e1470a06","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"e04f6290-1b5d-4e6b-bc7f-1df53e022f99","name":"e04f6290-1b5d-4e6b-bc7f-1df53e022f99","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"a3875805-121c-458b-8790-8b3798976a94","name":"a3875805-121c-458b-8790-8b3798976a94","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"981f81fe-69dc-4d16-b298-7e604b67d975","name":"981f81fe-69dc-4d16-b298-7e604b67d975","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"27ab43a2-1742-40b7-85bb-00ea316f8853","name":"27ab43a2-1742-40b7-85bb-00ea316f8853","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"fae4629c-6732-4029-8e33-8f8ade262473","name":"fae4629c-6732-4029-8e33-8f8ade262473","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"7bca54aa-9126-4cb1-bfaf-fb4dc27c20f7","name":"7bca54aa-9126-4cb1-bfaf-fb4dc27c20f7","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"c1fefcfe-ffe3-4ab7-8983-726bcbfe49f8","name":"c1fefcfe-ffe3-4ab7-8983-726bcbfe49f8","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"55123e8c-8dc3-4e03-835c-cecdd19910a1","name":"55123e8c-8dc3-4e03-835c-cecdd19910a1","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"12d78257-948b-4e4e-a3c5-3274e1470a06","name":"12d78257-948b-4e4e-a3c5-3274e1470a06","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"e04f6290-1b5d-4e6b-bc7f-1df53e022f99","name":"e04f6290-1b5d-4e6b-bc7f-1df53e022f99","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"a3875805-121c-458b-8790-8b3798976a94","name":"a3875805-121c-458b-8790-8b3798976a94","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"981f81fe-69dc-4d16-b298-7e604b67d975","name":"981f81fe-69dc-4d16-b298-7e604b67d975","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"27ab43a2-1742-40b7-85bb-00ea316f8853","name":"27ab43a2-1742-40b7-85bb-00ea316f8853","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"fae4629c-6732-4029-8e33-8f8ade262473","name":"fae4629c-6732-4029-8e33-8f8ade262473","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -76,33 +76,15 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"7bca54aa-9126-4cb1-bfaf-fb4dc27c20f7","path":"sprites/spr_fleet_necron/spr_fleet_necron.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"c53a9c8b-e405-4375-a26d-333ff1ee9885","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"c1fefcfe-ffe3-4ab7-8983-726bcbfe49f8","path":"sprites/spr_fleet_necron/spr_fleet_necron.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"fc446df6-18f0-4424-b0c4-bc121b3912d1","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"55123e8c-8dc3-4e03-835c-cecdd19910a1","path":"sprites/spr_fleet_necron/spr_fleet_necron.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"1e41c2b1-3401-4355-899a-799f973fc94c","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"12d78257-948b-4e4e-a3c5-3274e1470a06","path":"sprites/spr_fleet_necron/spr_fleet_necron.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"b8738c31-dff4-479e-a621-cc9b6b92ab5f","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"e04f6290-1b5d-4e6b-bc7f-1df53e022f99","path":"sprites/spr_fleet_necron/spr_fleet_necron.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"80bc09f8-1b80-4d45-80f1-d9c696519868","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"a3875805-121c-458b-8790-8b3798976a94","path":"sprites/spr_fleet_necron/spr_fleet_necron.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"fc5705e1-b55f-4a26-b422-688b5da3abd2","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"981f81fe-69dc-4d16-b298-7e604b67d975","path":"sprites/spr_fleet_necron/spr_fleet_necron.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"64e8bc4e-10cf-4213-838c-cec6dc7b981d","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"27ab43a2-1742-40b7-85bb-00ea316f8853","path":"sprites/spr_fleet_necron/spr_fleet_necron.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"29b29106-6a2b-4e17-84d7-0dc589e0dcc9","IsCreationKey":false,"Key":7.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"fae4629c-6732-4029-8e33-8f8ade262473","path":"sprites/spr_fleet_necron/spr_fleet_necron.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"e57f3f58-288a-45e4-bc21-d612ca745ad2","IsCreationKey":false,"Key":8.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"7bca54aa-9126-4cb1-bfaf-fb4dc27c20f7","path":"sprites/spr_fleet_necron/spr_fleet_necron.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"c53a9c8b-e405-4375-a26d-333ff1ee9885","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"c1fefcfe-ffe3-4ab7-8983-726bcbfe49f8","path":"sprites/spr_fleet_necron/spr_fleet_necron.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"fc446df6-18f0-4424-b0c4-bc121b3912d1","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"55123e8c-8dc3-4e03-835c-cecdd19910a1","path":"sprites/spr_fleet_necron/spr_fleet_necron.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"1e41c2b1-3401-4355-899a-799f973fc94c","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"12d78257-948b-4e4e-a3c5-3274e1470a06","path":"sprites/spr_fleet_necron/spr_fleet_necron.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"b8738c31-dff4-479e-a621-cc9b6b92ab5f","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"e04f6290-1b5d-4e6b-bc7f-1df53e022f99","path":"sprites/spr_fleet_necron/spr_fleet_necron.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"80bc09f8-1b80-4d45-80f1-d9c696519868","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"a3875805-121c-458b-8790-8b3798976a94","path":"sprites/spr_fleet_necron/spr_fleet_necron.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"fc5705e1-b55f-4a26-b422-688b5da3abd2","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"981f81fe-69dc-4d16-b298-7e604b67d975","path":"sprites/spr_fleet_necron/spr_fleet_necron.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"64e8bc4e-10cf-4213-838c-cec6dc7b981d","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"27ab43a2-1742-40b7-85bb-00ea316f8853","path":"sprites/spr_fleet_necron/spr_fleet_necron.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"29b29106-6a2b-4e17-84d7-0dc589e0dcc9","IsCreationKey":false,"Key":7.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"fae4629c-6732-4029-8e33-8f8ade262473","path":"sprites/spr_fleet_necron/spr_fleet_necron.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"e57f3f58-288a-45e4-bc21-d612ca745ad2","IsCreationKey":false,"Key":8.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":{ diff --git a/sprites/spr_fleet_ork/spr_fleet_ork.yy b/sprites/spr_fleet_ork/spr_fleet_ork.yy index 0873800d21..5468bdfa52 100644 --- a/sprites/spr_fleet_ork/spr_fleet_ork.yy +++ b/sprites/spr_fleet_ork/spr_fleet_ork.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_fleet_ork", "bboxMode":0, "bbox_bottom":20, @@ -12,16 +12,16 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"af934098-f3c2-43d2-b187-dcee782ee97b","name":"af934098-f3c2-43d2-b187-dcee782ee97b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"112f84af-ae95-42da-8d8d-18dd3cbc4bdf","name":"112f84af-ae95-42da-8d8d-18dd3cbc4bdf","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"97738318-6ef9-490c-a02b-9f3e648a040b","name":"97738318-6ef9-490c-a02b-9f3e648a040b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"9f26a607-2436-4e52-8936-c3ce08fc99fe","name":"9f26a607-2436-4e52-8936-c3ce08fc99fe","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"4da142fb-6fb9-4f50-af1c-587e29d4c36e","name":"4da142fb-6fb9-4f50-af1c-587e29d4c36e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"71d171c6-0460-4116-aba3-ad3b6f5f0a59","name":"71d171c6-0460-4116-aba3-ad3b6f5f0a59","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"4051f9b1-936d-48f8-9d56-c671e4c0d580","name":"4051f9b1-936d-48f8-9d56-c671e4c0d580","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"fb64ba76-19d3-442b-9adc-d7f37139edb4","name":"fb64ba76-19d3-442b-9adc-d7f37139edb4","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"6ab9ddac-8e42-4f5c-b217-99251e829722","name":"6ab9ddac-8e42-4f5c-b217-99251e829722","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"f0614b9b-e1eb-47c5-a481-31c2439271a6","name":"f0614b9b-e1eb-47c5-a481-31c2439271a6","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"af934098-f3c2-43d2-b187-dcee782ee97b","name":"af934098-f3c2-43d2-b187-dcee782ee97b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"112f84af-ae95-42da-8d8d-18dd3cbc4bdf","name":"112f84af-ae95-42da-8d8d-18dd3cbc4bdf","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"97738318-6ef9-490c-a02b-9f3e648a040b","name":"97738318-6ef9-490c-a02b-9f3e648a040b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"9f26a607-2436-4e52-8936-c3ce08fc99fe","name":"9f26a607-2436-4e52-8936-c3ce08fc99fe","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"4da142fb-6fb9-4f50-af1c-587e29d4c36e","name":"4da142fb-6fb9-4f50-af1c-587e29d4c36e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"71d171c6-0460-4116-aba3-ad3b6f5f0a59","name":"71d171c6-0460-4116-aba3-ad3b6f5f0a59","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"4051f9b1-936d-48f8-9d56-c671e4c0d580","name":"4051f9b1-936d-48f8-9d56-c671e4c0d580","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"fb64ba76-19d3-442b-9adc-d7f37139edb4","name":"fb64ba76-19d3-442b-9adc-d7f37139edb4","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"6ab9ddac-8e42-4f5c-b217-99251e829722","name":"6ab9ddac-8e42-4f5c-b217-99251e829722","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"f0614b9b-e1eb-47c5-a481-31c2439271a6","name":"f0614b9b-e1eb-47c5-a481-31c2439271a6","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -79,36 +79,16 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"af934098-f3c2-43d2-b187-dcee782ee97b","path":"sprites/spr_fleet_ork/spr_fleet_ork.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"67c20234-9707-42df-beac-ff0dda5b9c90","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"112f84af-ae95-42da-8d8d-18dd3cbc4bdf","path":"sprites/spr_fleet_ork/spr_fleet_ork.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"859afc2d-3b8a-4c92-99b5-a9e260b4afa9","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"97738318-6ef9-490c-a02b-9f3e648a040b","path":"sprites/spr_fleet_ork/spr_fleet_ork.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"a7a9efd0-a71e-4a03-94a4-30b508ce83c3","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"9f26a607-2436-4e52-8936-c3ce08fc99fe","path":"sprites/spr_fleet_ork/spr_fleet_ork.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"b16536ea-9fda-4393-adfa-41cf01e30dff","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"4da142fb-6fb9-4f50-af1c-587e29d4c36e","path":"sprites/spr_fleet_ork/spr_fleet_ork.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"0ecd3505-f84e-4413-848c-be7fe976be6b","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"71d171c6-0460-4116-aba3-ad3b6f5f0a59","path":"sprites/spr_fleet_ork/spr_fleet_ork.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"ed56594a-e030-488f-bec5-a202dae99407","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"4051f9b1-936d-48f8-9d56-c671e4c0d580","path":"sprites/spr_fleet_ork/spr_fleet_ork.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"f69f7e34-5ec6-42bb-a21a-64a5f37514e8","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"fb64ba76-19d3-442b-9adc-d7f37139edb4","path":"sprites/spr_fleet_ork/spr_fleet_ork.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"d361abfb-cafd-405c-9b79-c66655dbe7ed","IsCreationKey":false,"Key":7.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"6ab9ddac-8e42-4f5c-b217-99251e829722","path":"sprites/spr_fleet_ork/spr_fleet_ork.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"4ec537ed-9141-47b4-bd1c-8c11bafadcac","IsCreationKey":false,"Key":8.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"f0614b9b-e1eb-47c5-a481-31c2439271a6","path":"sprites/spr_fleet_ork/spr_fleet_ork.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"90531e4a-e9cc-4501-9a48-f0b3a50ad878","IsCreationKey":false,"Key":9.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"af934098-f3c2-43d2-b187-dcee782ee97b","path":"sprites/spr_fleet_ork/spr_fleet_ork.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"67c20234-9707-42df-beac-ff0dda5b9c90","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"112f84af-ae95-42da-8d8d-18dd3cbc4bdf","path":"sprites/spr_fleet_ork/spr_fleet_ork.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"859afc2d-3b8a-4c92-99b5-a9e260b4afa9","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"97738318-6ef9-490c-a02b-9f3e648a040b","path":"sprites/spr_fleet_ork/spr_fleet_ork.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"a7a9efd0-a71e-4a03-94a4-30b508ce83c3","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"9f26a607-2436-4e52-8936-c3ce08fc99fe","path":"sprites/spr_fleet_ork/spr_fleet_ork.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"b16536ea-9fda-4393-adfa-41cf01e30dff","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"4da142fb-6fb9-4f50-af1c-587e29d4c36e","path":"sprites/spr_fleet_ork/spr_fleet_ork.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"0ecd3505-f84e-4413-848c-be7fe976be6b","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"71d171c6-0460-4116-aba3-ad3b6f5f0a59","path":"sprites/spr_fleet_ork/spr_fleet_ork.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"ed56594a-e030-488f-bec5-a202dae99407","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"4051f9b1-936d-48f8-9d56-c671e4c0d580","path":"sprites/spr_fleet_ork/spr_fleet_ork.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"f69f7e34-5ec6-42bb-a21a-64a5f37514e8","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"fb64ba76-19d3-442b-9adc-d7f37139edb4","path":"sprites/spr_fleet_ork/spr_fleet_ork.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"d361abfb-cafd-405c-9b79-c66655dbe7ed","IsCreationKey":false,"Key":7.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"6ab9ddac-8e42-4f5c-b217-99251e829722","path":"sprites/spr_fleet_ork/spr_fleet_ork.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"4ec537ed-9141-47b4-bd1c-8c11bafadcac","IsCreationKey":false,"Key":8.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"f0614b9b-e1eb-47c5-a481-31c2439271a6","path":"sprites/spr_fleet_ork/spr_fleet_ork.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"90531e4a-e9cc-4501-9a48-f0b3a50ad878","IsCreationKey":false,"Key":9.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_fleet_tau/spr_fleet_tau.yy b/sprites/spr_fleet_tau/spr_fleet_tau.yy index a8c2d1d4f7..3e3b10899a 100644 --- a/sprites/spr_fleet_tau/spr_fleet_tau.yy +++ b/sprites/spr_fleet_tau/spr_fleet_tau.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_fleet_tau", "bboxMode":0, "bbox_bottom":20, @@ -12,17 +12,17 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"cdd4c365-a564-4c95-85ab-bda104c5d5e1","name":"cdd4c365-a564-4c95-85ab-bda104c5d5e1","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"95d93dc5-c7db-4369-b68a-31026d5959fc","name":"95d93dc5-c7db-4369-b68a-31026d5959fc","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"617ee12d-133c-4e96-ba8d-93535804252d","name":"617ee12d-133c-4e96-ba8d-93535804252d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"06e6544f-caed-4f40-8705-c7108e508215","name":"06e6544f-caed-4f40-8705-c7108e508215","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"3e69a52d-25e9-4c9b-89b5-80990b84fd94","name":"3e69a52d-25e9-4c9b-89b5-80990b84fd94","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"1a9a662c-67fe-4cdf-bdbf-c87e0070a330","name":"1a9a662c-67fe-4cdf-bdbf-c87e0070a330","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"bb9a18cc-c332-4f49-86d2-1dd6b6a501ca","name":"bb9a18cc-c332-4f49-86d2-1dd6b6a501ca","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"a28eb7be-b330-4c6f-a971-0412e89f9546","name":"a28eb7be-b330-4c6f-a971-0412e89f9546","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"6faa2ba4-5a83-4f02-8506-0aed83da2623","name":"6faa2ba4-5a83-4f02-8506-0aed83da2623","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"93464d16-aa98-4c7b-83a4-f5f56f3bf632","name":"93464d16-aa98-4c7b-83a4-f5f56f3bf632","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"4f6782bd-e559-446b-9cfb-76c842cac2e6","name":"4f6782bd-e559-446b-9cfb-76c842cac2e6","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"cdd4c365-a564-4c95-85ab-bda104c5d5e1","name":"cdd4c365-a564-4c95-85ab-bda104c5d5e1","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"95d93dc5-c7db-4369-b68a-31026d5959fc","name":"95d93dc5-c7db-4369-b68a-31026d5959fc","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"617ee12d-133c-4e96-ba8d-93535804252d","name":"617ee12d-133c-4e96-ba8d-93535804252d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"06e6544f-caed-4f40-8705-c7108e508215","name":"06e6544f-caed-4f40-8705-c7108e508215","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"3e69a52d-25e9-4c9b-89b5-80990b84fd94","name":"3e69a52d-25e9-4c9b-89b5-80990b84fd94","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"1a9a662c-67fe-4cdf-bdbf-c87e0070a330","name":"1a9a662c-67fe-4cdf-bdbf-c87e0070a330","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"bb9a18cc-c332-4f49-86d2-1dd6b6a501ca","name":"bb9a18cc-c332-4f49-86d2-1dd6b6a501ca","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"a28eb7be-b330-4c6f-a971-0412e89f9546","name":"a28eb7be-b330-4c6f-a971-0412e89f9546","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"6faa2ba4-5a83-4f02-8506-0aed83da2623","name":"6faa2ba4-5a83-4f02-8506-0aed83da2623","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"93464d16-aa98-4c7b-83a4-f5f56f3bf632","name":"93464d16-aa98-4c7b-83a4-f5f56f3bf632","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"4f6782bd-e559-446b-9cfb-76c842cac2e6","name":"4f6782bd-e559-446b-9cfb-76c842cac2e6","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -78,39 +78,17 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"cdd4c365-a564-4c95-85ab-bda104c5d5e1","path":"sprites/spr_fleet_tau/spr_fleet_tau.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"1641c7b0-ba32-46a1-bdef-7751da95e1c5","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"95d93dc5-c7db-4369-b68a-31026d5959fc","path":"sprites/spr_fleet_tau/spr_fleet_tau.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"b1f176e9-a3cc-4a3b-94bf-ade7ddc106a3","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"617ee12d-133c-4e96-ba8d-93535804252d","path":"sprites/spr_fleet_tau/spr_fleet_tau.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"1051b8c3-13b3-4b12-909d-886c3a09de27","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"06e6544f-caed-4f40-8705-c7108e508215","path":"sprites/spr_fleet_tau/spr_fleet_tau.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"195aff74-b345-485c-8c41-640d808b3d87","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"3e69a52d-25e9-4c9b-89b5-80990b84fd94","path":"sprites/spr_fleet_tau/spr_fleet_tau.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"a06bc4eb-65c2-4824-b12e-4b2594e8cdc6","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"1a9a662c-67fe-4cdf-bdbf-c87e0070a330","path":"sprites/spr_fleet_tau/spr_fleet_tau.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"a5c0c0a4-63b3-43bc-8743-90cbd113bcb7","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"bb9a18cc-c332-4f49-86d2-1dd6b6a501ca","path":"sprites/spr_fleet_tau/spr_fleet_tau.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"4c0c4440-a668-4464-9e1c-647382b2af86","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"a28eb7be-b330-4c6f-a971-0412e89f9546","path":"sprites/spr_fleet_tau/spr_fleet_tau.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"21ad7732-67d7-4445-a580-dc99939fd767","IsCreationKey":false,"Key":7.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"6faa2ba4-5a83-4f02-8506-0aed83da2623","path":"sprites/spr_fleet_tau/spr_fleet_tau.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"8c836550-2c0b-4ff6-bdf5-db3f343e1f8c","IsCreationKey":false,"Key":8.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"93464d16-aa98-4c7b-83a4-f5f56f3bf632","path":"sprites/spr_fleet_tau/spr_fleet_tau.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"621a69a7-bcaa-4299-821f-7014d3b98d91","IsCreationKey":false,"Key":9.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"4f6782bd-e559-446b-9cfb-76c842cac2e6","path":"sprites/spr_fleet_tau/spr_fleet_tau.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"ed6f8cbd-bba9-4119-b444-6aa8e37e6443","IsCreationKey":false,"Key":10.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"cdd4c365-a564-4c95-85ab-bda104c5d5e1","path":"sprites/spr_fleet_tau/spr_fleet_tau.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"1641c7b0-ba32-46a1-bdef-7751da95e1c5","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"95d93dc5-c7db-4369-b68a-31026d5959fc","path":"sprites/spr_fleet_tau/spr_fleet_tau.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"b1f176e9-a3cc-4a3b-94bf-ade7ddc106a3","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"617ee12d-133c-4e96-ba8d-93535804252d","path":"sprites/spr_fleet_tau/spr_fleet_tau.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"1051b8c3-13b3-4b12-909d-886c3a09de27","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"06e6544f-caed-4f40-8705-c7108e508215","path":"sprites/spr_fleet_tau/spr_fleet_tau.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"195aff74-b345-485c-8c41-640d808b3d87","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"3e69a52d-25e9-4c9b-89b5-80990b84fd94","path":"sprites/spr_fleet_tau/spr_fleet_tau.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"a06bc4eb-65c2-4824-b12e-4b2594e8cdc6","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"1a9a662c-67fe-4cdf-bdbf-c87e0070a330","path":"sprites/spr_fleet_tau/spr_fleet_tau.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"a5c0c0a4-63b3-43bc-8743-90cbd113bcb7","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"bb9a18cc-c332-4f49-86d2-1dd6b6a501ca","path":"sprites/spr_fleet_tau/spr_fleet_tau.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"4c0c4440-a668-4464-9e1c-647382b2af86","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"a28eb7be-b330-4c6f-a971-0412e89f9546","path":"sprites/spr_fleet_tau/spr_fleet_tau.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"21ad7732-67d7-4445-a580-dc99939fd767","IsCreationKey":false,"Key":7.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"6faa2ba4-5a83-4f02-8506-0aed83da2623","path":"sprites/spr_fleet_tau/spr_fleet_tau.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"8c836550-2c0b-4ff6-bdf5-db3f343e1f8c","IsCreationKey":false,"Key":8.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"93464d16-aa98-4c7b-83a4-f5f56f3bf632","path":"sprites/spr_fleet_tau/spr_fleet_tau.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"621a69a7-bcaa-4299-821f-7014d3b98d91","IsCreationKey":false,"Key":9.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"4f6782bd-e559-446b-9cfb-76c842cac2e6","path":"sprites/spr_fleet_tau/spr_fleet_tau.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"ed6f8cbd-bba9-4119-b444-6aa8e37e6443","IsCreationKey":false,"Key":10.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":{ diff --git a/sprites/spr_fleet_tiny/spr_fleet_tiny.yy b/sprites/spr_fleet_tiny/spr_fleet_tiny.yy index 0b8da40d4a..c7bcd1901c 100644 --- a/sprites/spr_fleet_tiny/spr_fleet_tiny.yy +++ b/sprites/spr_fleet_tiny/spr_fleet_tiny.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_fleet_tiny", "bboxMode":0, "bbox_bottom":20, @@ -12,16 +12,16 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"ca47a226-eb26-4a65-9e02-ec2499acf0a4","name":"ca47a226-eb26-4a65-9e02-ec2499acf0a4","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"d1533e9b-e4ff-4fa1-877a-9aa8b3a604e7","name":"d1533e9b-e4ff-4fa1-877a-9aa8b3a604e7","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"67399250-1d29-4aa9-8a9d-8a9d3d5793bf","name":"67399250-1d29-4aa9-8a9d-8a9d3d5793bf","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"1f2e5df5-4dc8-4b5b-86fc-3ef6cb6dea9b","name":"1f2e5df5-4dc8-4b5b-86fc-3ef6cb6dea9b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"c12986ff-6b4c-4ae7-be4b-89c627ff6fb7","name":"c12986ff-6b4c-4ae7-be4b-89c627ff6fb7","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"8599d8c9-369b-4fe8-82e6-de49d01b80ab","name":"8599d8c9-369b-4fe8-82e6-de49d01b80ab","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"fd1bfde9-fe9a-44a8-a2fd-1451e2d8f0da","name":"fd1bfde9-fe9a-44a8-a2fd-1451e2d8f0da","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"d5c8cebb-5835-41d9-b6f2-16acde9af4a2","name":"d5c8cebb-5835-41d9-b6f2-16acde9af4a2","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"4b7d3f6d-4d9b-474b-9257-9f43b214f43c","name":"4b7d3f6d-4d9b-474b-9257-9f43b214f43c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"4ae26632-9db0-4a9b-9a2c-aeae2b38e12d","name":"4ae26632-9db0-4a9b-9a2c-aeae2b38e12d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"ca47a226-eb26-4a65-9e02-ec2499acf0a4","name":"ca47a226-eb26-4a65-9e02-ec2499acf0a4","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"d1533e9b-e4ff-4fa1-877a-9aa8b3a604e7","name":"d1533e9b-e4ff-4fa1-877a-9aa8b3a604e7","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"67399250-1d29-4aa9-8a9d-8a9d3d5793bf","name":"67399250-1d29-4aa9-8a9d-8a9d3d5793bf","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"1f2e5df5-4dc8-4b5b-86fc-3ef6cb6dea9b","name":"1f2e5df5-4dc8-4b5b-86fc-3ef6cb6dea9b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"c12986ff-6b4c-4ae7-be4b-89c627ff6fb7","name":"c12986ff-6b4c-4ae7-be4b-89c627ff6fb7","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"8599d8c9-369b-4fe8-82e6-de49d01b80ab","name":"8599d8c9-369b-4fe8-82e6-de49d01b80ab","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"fd1bfde9-fe9a-44a8-a2fd-1451e2d8f0da","name":"fd1bfde9-fe9a-44a8-a2fd-1451e2d8f0da","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"d5c8cebb-5835-41d9-b6f2-16acde9af4a2","name":"d5c8cebb-5835-41d9-b6f2-16acde9af4a2","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"4b7d3f6d-4d9b-474b-9257-9f43b214f43c","name":"4b7d3f6d-4d9b-474b-9257-9f43b214f43c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"4ae26632-9db0-4a9b-9a2c-aeae2b38e12d","name":"4ae26632-9db0-4a9b-9a2c-aeae2b38e12d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -77,36 +77,16 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"ca47a226-eb26-4a65-9e02-ec2499acf0a4","path":"sprites/spr_fleet_tiny/spr_fleet_tiny.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"93ba9a2b-7ce0-4dae-9969-8dd31f9d5e05","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"d1533e9b-e4ff-4fa1-877a-9aa8b3a604e7","path":"sprites/spr_fleet_tiny/spr_fleet_tiny.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"d6614b32-3ca4-4ad2-b473-59949e9d523e","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"67399250-1d29-4aa9-8a9d-8a9d3d5793bf","path":"sprites/spr_fleet_tiny/spr_fleet_tiny.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"ce8b2924-62d4-49f3-8e69-ce8cd6aa06f9","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"1f2e5df5-4dc8-4b5b-86fc-3ef6cb6dea9b","path":"sprites/spr_fleet_tiny/spr_fleet_tiny.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"c02526b5-5955-44af-a6f6-2c8e50041795","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"c12986ff-6b4c-4ae7-be4b-89c627ff6fb7","path":"sprites/spr_fleet_tiny/spr_fleet_tiny.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"bed764f6-9eb2-4f9c-af36-1106addfda28","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"8599d8c9-369b-4fe8-82e6-de49d01b80ab","path":"sprites/spr_fleet_tiny/spr_fleet_tiny.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"dfd5197f-4613-4ede-abe2-2402da165f6c","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"fd1bfde9-fe9a-44a8-a2fd-1451e2d8f0da","path":"sprites/spr_fleet_tiny/spr_fleet_tiny.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"f83fdcd3-b144-4bd7-9bbd-cdb4b4dbe7f7","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"d5c8cebb-5835-41d9-b6f2-16acde9af4a2","path":"sprites/spr_fleet_tiny/spr_fleet_tiny.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"9cc2ee1b-d945-4a46-9985-e3051251ee4a","IsCreationKey":false,"Key":7.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"4b7d3f6d-4d9b-474b-9257-9f43b214f43c","path":"sprites/spr_fleet_tiny/spr_fleet_tiny.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"daded6b1-47b8-4749-854d-58c7121cabd4","IsCreationKey":false,"Key":8.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"4ae26632-9db0-4a9b-9a2c-aeae2b38e12d","path":"sprites/spr_fleet_tiny/spr_fleet_tiny.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"19b18c63-60ec-46ff-8577-f2d094f1bad5","IsCreationKey":false,"Key":9.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"ca47a226-eb26-4a65-9e02-ec2499acf0a4","path":"sprites/spr_fleet_tiny/spr_fleet_tiny.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"93ba9a2b-7ce0-4dae-9969-8dd31f9d5e05","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"d1533e9b-e4ff-4fa1-877a-9aa8b3a604e7","path":"sprites/spr_fleet_tiny/spr_fleet_tiny.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"d6614b32-3ca4-4ad2-b473-59949e9d523e","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"67399250-1d29-4aa9-8a9d-8a9d3d5793bf","path":"sprites/spr_fleet_tiny/spr_fleet_tiny.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"ce8b2924-62d4-49f3-8e69-ce8cd6aa06f9","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"1f2e5df5-4dc8-4b5b-86fc-3ef6cb6dea9b","path":"sprites/spr_fleet_tiny/spr_fleet_tiny.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"c02526b5-5955-44af-a6f6-2c8e50041795","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"c12986ff-6b4c-4ae7-be4b-89c627ff6fb7","path":"sprites/spr_fleet_tiny/spr_fleet_tiny.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"bed764f6-9eb2-4f9c-af36-1106addfda28","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"8599d8c9-369b-4fe8-82e6-de49d01b80ab","path":"sprites/spr_fleet_tiny/spr_fleet_tiny.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"dfd5197f-4613-4ede-abe2-2402da165f6c","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"fd1bfde9-fe9a-44a8-a2fd-1451e2d8f0da","path":"sprites/spr_fleet_tiny/spr_fleet_tiny.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"f83fdcd3-b144-4bd7-9bbd-cdb4b4dbe7f7","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"d5c8cebb-5835-41d9-b6f2-16acde9af4a2","path":"sprites/spr_fleet_tiny/spr_fleet_tiny.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"9cc2ee1b-d945-4a46-9985-e3051251ee4a","IsCreationKey":false,"Key":7.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"4b7d3f6d-4d9b-474b-9257-9f43b214f43c","path":"sprites/spr_fleet_tiny/spr_fleet_tiny.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"daded6b1-47b8-4749-854d-58c7121cabd4","IsCreationKey":false,"Key":8.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"4ae26632-9db0-4a9b-9a2c-aeae2b38e12d","path":"sprites/spr_fleet_tiny/spr_fleet_tiny.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"19b18c63-60ec-46ff-8577-f2d094f1bad5","IsCreationKey":false,"Key":9.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":{ diff --git a/sprites/spr_fleet_tyranid/spr_fleet_tyranid.yy b/sprites/spr_fleet_tyranid/spr_fleet_tyranid.yy index bfec48951e..f62368c872 100644 --- a/sprites/spr_fleet_tyranid/spr_fleet_tyranid.yy +++ b/sprites/spr_fleet_tyranid/spr_fleet_tyranid.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_fleet_tyranid", "bboxMode":0, "bbox_bottom":27, @@ -12,18 +12,18 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"31d6f8b8-04c6-4717-bf25-4d12c7fb5f58","name":"31d6f8b8-04c6-4717-bf25-4d12c7fb5f58","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"d23b4c1b-7753-4847-8b6b-16f9db71838f","name":"d23b4c1b-7753-4847-8b6b-16f9db71838f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"916d18ce-ca97-471d-84d1-2af450e12185","name":"916d18ce-ca97-471d-84d1-2af450e12185","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"c64c8440-3c79-42b3-8e16-6c29e783c55b","name":"c64c8440-3c79-42b3-8e16-6c29e783c55b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"4dd63d4c-7628-49a7-b6e4-2f2fb22df3f2","name":"4dd63d4c-7628-49a7-b6e4-2f2fb22df3f2","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"0874c050-be5e-4a23-ba02-bb54f0d816b8","name":"0874c050-be5e-4a23-ba02-bb54f0d816b8","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"1d674843-0690-4734-ae8e-d4c2a5f511fe","name":"1d674843-0690-4734-ae8e-d4c2a5f511fe","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"19de30ad-6b92-473a-9659-253e0181372b","name":"19de30ad-6b92-473a-9659-253e0181372b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"87695c92-60dc-46b1-a7f1-d9a00dff5615","name":"87695c92-60dc-46b1-a7f1-d9a00dff5615","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"fd6648f1-6f79-4074-acdc-013d536fde6b","name":"fd6648f1-6f79-4074-acdc-013d536fde6b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"129a0a8c-c896-455c-8808-ddc6a9f011e9","name":"129a0a8c-c896-455c-8808-ddc6a9f011e9","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"26cce3c8-bd6b-4863-84da-05b93a669ad7","name":"26cce3c8-bd6b-4863-84da-05b93a669ad7","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"31d6f8b8-04c6-4717-bf25-4d12c7fb5f58","name":"31d6f8b8-04c6-4717-bf25-4d12c7fb5f58","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"d23b4c1b-7753-4847-8b6b-16f9db71838f","name":"d23b4c1b-7753-4847-8b6b-16f9db71838f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"916d18ce-ca97-471d-84d1-2af450e12185","name":"916d18ce-ca97-471d-84d1-2af450e12185","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"c64c8440-3c79-42b3-8e16-6c29e783c55b","name":"c64c8440-3c79-42b3-8e16-6c29e783c55b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"4dd63d4c-7628-49a7-b6e4-2f2fb22df3f2","name":"4dd63d4c-7628-49a7-b6e4-2f2fb22df3f2","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"0874c050-be5e-4a23-ba02-bb54f0d816b8","name":"0874c050-be5e-4a23-ba02-bb54f0d816b8","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"1d674843-0690-4734-ae8e-d4c2a5f511fe","name":"1d674843-0690-4734-ae8e-d4c2a5f511fe","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"19de30ad-6b92-473a-9659-253e0181372b","name":"19de30ad-6b92-473a-9659-253e0181372b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"87695c92-60dc-46b1-a7f1-d9a00dff5615","name":"87695c92-60dc-46b1-a7f1-d9a00dff5615","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"fd6648f1-6f79-4074-acdc-013d536fde6b","name":"fd6648f1-6f79-4074-acdc-013d536fde6b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"129a0a8c-c896-455c-8808-ddc6a9f011e9","name":"129a0a8c-c896-455c-8808-ddc6a9f011e9","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"26cce3c8-bd6b-4863-84da-05b93a669ad7","name":"26cce3c8-bd6b-4863-84da-05b93a669ad7","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -79,42 +79,18 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"31d6f8b8-04c6-4717-bf25-4d12c7fb5f58","path":"sprites/spr_fleet_tyranid/spr_fleet_tyranid.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"d7cd6d2f-e931-473e-9738-5e4c11076117","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"d23b4c1b-7753-4847-8b6b-16f9db71838f","path":"sprites/spr_fleet_tyranid/spr_fleet_tyranid.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"a4384c81-b200-4292-9216-b89244245ec6","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"916d18ce-ca97-471d-84d1-2af450e12185","path":"sprites/spr_fleet_tyranid/spr_fleet_tyranid.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"55965e6f-4c55-4ed7-8de5-988f48ca077c","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"c64c8440-3c79-42b3-8e16-6c29e783c55b","path":"sprites/spr_fleet_tyranid/spr_fleet_tyranid.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"16226b11-0e2a-45e1-b4b2-cf28f3ae789e","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"4dd63d4c-7628-49a7-b6e4-2f2fb22df3f2","path":"sprites/spr_fleet_tyranid/spr_fleet_tyranid.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"bb705fa2-b739-499c-a2dc-6923ab82ba3d","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"0874c050-be5e-4a23-ba02-bb54f0d816b8","path":"sprites/spr_fleet_tyranid/spr_fleet_tyranid.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"401e7c8a-01b5-4698-b591-1de4591b2086","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"1d674843-0690-4734-ae8e-d4c2a5f511fe","path":"sprites/spr_fleet_tyranid/spr_fleet_tyranid.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"299de8b7-0481-4a93-8893-c4364d2f6d90","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"19de30ad-6b92-473a-9659-253e0181372b","path":"sprites/spr_fleet_tyranid/spr_fleet_tyranid.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"938fa86e-7dac-42c6-8e61-ceb64ab8de3f","IsCreationKey":false,"Key":7.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"87695c92-60dc-46b1-a7f1-d9a00dff5615","path":"sprites/spr_fleet_tyranid/spr_fleet_tyranid.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"f8a6db97-f5a2-4626-82cd-a82f38c1fed4","IsCreationKey":false,"Key":8.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"fd6648f1-6f79-4074-acdc-013d536fde6b","path":"sprites/spr_fleet_tyranid/spr_fleet_tyranid.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"f91a41f7-d96c-4db3-99ca-d18b241dbb81","IsCreationKey":false,"Key":9.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"129a0a8c-c896-455c-8808-ddc6a9f011e9","path":"sprites/spr_fleet_tyranid/spr_fleet_tyranid.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"b698cfa6-6825-4815-aa71-09ae4d6ca041","IsCreationKey":false,"Key":10.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"26cce3c8-bd6b-4863-84da-05b93a669ad7","path":"sprites/spr_fleet_tyranid/spr_fleet_tyranid.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"ba17c42b-edf8-4b31-b958-ac28bf2f31e8","IsCreationKey":false,"Key":11.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"31d6f8b8-04c6-4717-bf25-4d12c7fb5f58","path":"sprites/spr_fleet_tyranid/spr_fleet_tyranid.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"d7cd6d2f-e931-473e-9738-5e4c11076117","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"d23b4c1b-7753-4847-8b6b-16f9db71838f","path":"sprites/spr_fleet_tyranid/spr_fleet_tyranid.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"a4384c81-b200-4292-9216-b89244245ec6","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"916d18ce-ca97-471d-84d1-2af450e12185","path":"sprites/spr_fleet_tyranid/spr_fleet_tyranid.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"55965e6f-4c55-4ed7-8de5-988f48ca077c","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"c64c8440-3c79-42b3-8e16-6c29e783c55b","path":"sprites/spr_fleet_tyranid/spr_fleet_tyranid.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"16226b11-0e2a-45e1-b4b2-cf28f3ae789e","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"4dd63d4c-7628-49a7-b6e4-2f2fb22df3f2","path":"sprites/spr_fleet_tyranid/spr_fleet_tyranid.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"bb705fa2-b739-499c-a2dc-6923ab82ba3d","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"0874c050-be5e-4a23-ba02-bb54f0d816b8","path":"sprites/spr_fleet_tyranid/spr_fleet_tyranid.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"401e7c8a-01b5-4698-b591-1de4591b2086","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"1d674843-0690-4734-ae8e-d4c2a5f511fe","path":"sprites/spr_fleet_tyranid/spr_fleet_tyranid.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"299de8b7-0481-4a93-8893-c4364d2f6d90","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"19de30ad-6b92-473a-9659-253e0181372b","path":"sprites/spr_fleet_tyranid/spr_fleet_tyranid.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"938fa86e-7dac-42c6-8e61-ceb64ab8de3f","IsCreationKey":false,"Key":7.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"87695c92-60dc-46b1-a7f1-d9a00dff5615","path":"sprites/spr_fleet_tyranid/spr_fleet_tyranid.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"f8a6db97-f5a2-4626-82cd-a82f38c1fed4","IsCreationKey":false,"Key":8.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"fd6648f1-6f79-4074-acdc-013d536fde6b","path":"sprites/spr_fleet_tyranid/spr_fleet_tyranid.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"f91a41f7-d96c-4db3-99ca-d18b241dbb81","IsCreationKey":false,"Key":9.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"129a0a8c-c896-455c-8808-ddc6a9f011e9","path":"sprites/spr_fleet_tyranid/spr_fleet_tyranid.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"b698cfa6-6825-4815-aa71-09ae4d6ca041","IsCreationKey":false,"Key":10.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"26cce3c8-bd6b-4863-84da-05b93a669ad7","path":"sprites/spr_fleet_tyranid/spr_fleet_tyranid.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"ba17c42b-edf8-4b31-b958-ac28bf2f31e8","IsCreationKey":false,"Key":11.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_flora_camo_texture/spr_flora_camo_texture.yy b/sprites/spr_flora_camo_texture/spr_flora_camo_texture.yy index c5085c1515..71e1d0c786 100644 --- a/sprites/spr_flora_camo_texture/spr_flora_camo_texture.yy +++ b/sprites/spr_flora_camo_texture/spr_flora_camo_texture.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_flora_camo_texture", "bboxMode":0, "bbox_bottom":72, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":true, "frames":[ - {"$GMSpriteFrame":"","%Name":"9fbe55de-2658-4efe-a910-fa61f675f9e0","name":"9fbe55de-2658-4efe-a910-fa61f675f9e0","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"9fbe55de-2658-4efe-a910-fa61f675f9e0","name":"9fbe55de-2658-4efe-a910-fa61f675f9e0","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -33,13 +33,7 @@ "resourceType":"GMNineSliceData", "resourceVersion":"2.0", "right":0, - "tileMode":[ - 0, - 0, - 0, - 0, - 0, - ], + "tileMode":[0,0,0,0,0,], "top":0, }, "origin":0, @@ -87,9 +81,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"9fbe55de-2658-4efe-a910-fa61f675f9e0","path":"sprites/spr_flora_camo_texture/spr_flora_camo_texture.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"09362bea-4c68-4013-b477-2be6d3bb1fa9","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"9fbe55de-2658-4efe-a910-fa61f675f9e0","path":"sprites/spr_flora_camo_texture/spr_flora_camo_texture.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"09362bea-4c68-4013-b477-2be6d3bb1fa9","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_force_icon/spr_force_icon.yy b/sprites/spr_force_icon/spr_force_icon.yy index 93ac804119..84d75bc02d 100644 --- a/sprites/spr_force_icon/spr_force_icon.yy +++ b/sprites/spr_force_icon/spr_force_icon.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_force_icon", "bboxMode":0, "bbox_bottom":0, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"04d91957-6099-4cfb-8bba-07dd8b7ff130","name":"04d91957-6099-4cfb-8bba-07dd8b7ff130","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"04d91957-6099-4cfb-8bba-07dd8b7ff130","name":"04d91957-6099-4cfb-8bba-07dd8b7ff130","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"04d91957-6099-4cfb-8bba-07dd8b7ff130","path":"sprites/spr_force_icon/spr_force_icon.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"0cec9664-dc38-4564-ac6c-edd412b644c8","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"04d91957-6099-4cfb-8bba-07dd8b7ff130","path":"sprites/spr_force_icon/spr_force_icon.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"0cec9664-dc38-4564-ac6c-edd412b644c8","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":{ diff --git a/sprites/spr_forge_holo/spr_forge_holo.yy b/sprites/spr_forge_holo/spr_forge_holo.yy index a1c5bc96a7..78c33c16bf 100644 --- a/sprites/spr_forge_holo/spr_forge_holo.yy +++ b/sprites/spr_forge_holo/spr_forge_holo.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_forge_holo", "bboxMode":0, "bbox_bottom":138, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"f41be05e-734f-47ef-9186-d8292a3f7b91","name":"f41be05e-734f-47ef-9186-d8292a3f7b91","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"f41be05e-734f-47ef-9186-d8292a3f7b91","name":"f41be05e-734f-47ef-9186-d8292a3f7b91","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"f41be05e-734f-47ef-9186-d8292a3f7b91","path":"sprites/spr_forge_holo/spr_forge_holo.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"be63aa50-0d74-4281-81ab-928c1b946504","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"f41be05e-734f-47ef-9186-d8292a3f7b91","path":"sprites/spr_forge_holo/spr_forge_holo.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"be63aa50-0d74-4281-81ab-928c1b946504","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_forge_points_icon/spr_forge_points_icon.yy b/sprites/spr_forge_points_icon/spr_forge_points_icon.yy index 15c79b7e0a..2d20357965 100644 --- a/sprites/spr_forge_points_icon/spr_forge_points_icon.yy +++ b/sprites/spr_forge_points_icon/spr_forge_points_icon.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_forge_points_icon", "bboxMode":0, "bbox_bottom":59, @@ -12,8 +12,8 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"648354ec-7fc8-45f4-b6d3-bbaae98f0fa5","name":"648354ec-7fc8-45f4-b6d3-bbaae98f0fa5","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"980f6eb9-4992-4562-bbae-c140a4104ce9","name":"980f6eb9-4992-4562-bbae-c140a4104ce9","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"648354ec-7fc8-45f4-b6d3-bbaae98f0fa5","name":"648354ec-7fc8-45f4-b6d3-bbaae98f0fa5","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"980f6eb9-4992-4562-bbae-c140a4104ce9","name":"980f6eb9-4992-4562-bbae-c140a4104ce9","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -69,12 +69,8 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"648354ec-7fc8-45f4-b6d3-bbaae98f0fa5","path":"sprites/spr_forge_points_icon/spr_forge_points_icon.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"fb46afc0-357e-44b3-8759-e74618551361","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"980f6eb9-4992-4562-bbae-c140a4104ce9","path":"sprites/spr_forge_points_icon/spr_forge_points_icon.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"0f1e5cc4-df0f-4733-928b-ae386f337e97","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"648354ec-7fc8-45f4-b6d3-bbaae98f0fa5","path":"sprites/spr_forge_points_icon/spr_forge_points_icon.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"fb46afc0-357e-44b3-8759-e74618551361","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"980f6eb9-4992-4562-bbae-c140a4104ce9","path":"sprites/spr_forge_points_icon/spr_forge_points_icon.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"0f1e5cc4-df0f-4733-928b-ae386f337e97","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_formation_arrow/spr_formation_arrow.yy b/sprites/spr_formation_arrow/spr_formation_arrow.yy index a11b0d0d6a..35eb75796e 100644 --- a/sprites/spr_formation_arrow/spr_formation_arrow.yy +++ b/sprites/spr_formation_arrow/spr_formation_arrow.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_formation_arrow", "bboxMode":0, "bbox_bottom":119, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"d35c0b9f-0bb3-4062-bde0-3c1b51d6879f","name":"d35c0b9f-0bb3-4062-bde0-3c1b51d6879f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"d35c0b9f-0bb3-4062-bde0-3c1b51d6879f","name":"d35c0b9f-0bb3-4062-bde0-3c1b51d6879f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"d35c0b9f-0bb3-4062-bde0-3c1b51d6879f","path":"sprites/spr_formation_arrow/spr_formation_arrow.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"e6532af6-8c0d-47b6-bf0d-1d66a37d4715","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"d35c0b9f-0bb3-4062-bde0-3c1b51d6879f","path":"sprites/spr_formation_arrow/spr_formation_arrow.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"e6532af6-8c0d-47b6-bf0d-1d66a37d4715","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_formation_bars/spr_formation_bars.yy b/sprites/spr_formation_bars/spr_formation_bars.yy index d8708e56dc..10ac1700fe 100644 --- a/sprites/spr_formation_bars/spr_formation_bars.yy +++ b/sprites/spr_formation_bars/spr_formation_bars.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_formation_bars", "bboxMode":0, "bbox_bottom":281, @@ -12,21 +12,21 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"9b56c9a5-91a7-49b2-b255-baa5a867c8db","name":"9b56c9a5-91a7-49b2-b255-baa5a867c8db","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"9227f803-4d80-4548-9ac7-e132ba5cebdd","name":"9227f803-4d80-4548-9ac7-e132ba5cebdd","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"7d5d96f2-551a-4624-a0b3-497691a89cb8","name":"7d5d96f2-551a-4624-a0b3-497691a89cb8","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"7cc61e40-6ba8-4ff6-87bf-d6ce7bf97c11","name":"7cc61e40-6ba8-4ff6-87bf-d6ce7bf97c11","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"c0ae5e15-f9ad-4697-b76e-f01675de6102","name":"c0ae5e15-f9ad-4697-b76e-f01675de6102","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"b0ac10b9-1415-4150-bf81-f0978bef4874","name":"b0ac10b9-1415-4150-bf81-f0978bef4874","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"00aae7a4-5f57-4320-9a94-cfcd6d216924","name":"00aae7a4-5f57-4320-9a94-cfcd6d216924","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"309ea92c-752f-4ff3-a70d-b2d96a061998","name":"309ea92c-752f-4ff3-a70d-b2d96a061998","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"e1c971b3-a48d-42f9-9f5a-134c5d47bc7a","name":"e1c971b3-a48d-42f9-9f5a-134c5d47bc7a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"f98b9d36-a40b-43c3-9ef3-7a48cbf46b57","name":"f98b9d36-a40b-43c3-9ef3-7a48cbf46b57","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"b1e38e08-9068-4e0b-9707-6ad15b033f59","name":"b1e38e08-9068-4e0b-9707-6ad15b033f59","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"17888442-c2b9-48de-bd24-a2be76f28fbc","name":"17888442-c2b9-48de-bd24-a2be76f28fbc","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"46692e1c-c2a7-4828-ae89-a6af9d8bbf0f","name":"46692e1c-c2a7-4828-ae89-a6af9d8bbf0f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"41192582-b37e-4da7-b4a2-1f46c1d159fc","name":"41192582-b37e-4da7-b4a2-1f46c1d159fc","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"c6ae1886-a082-4bd0-9ff5-a4d4c496e479","name":"c6ae1886-a082-4bd0-9ff5-a4d4c496e479","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"9b56c9a5-91a7-49b2-b255-baa5a867c8db","name":"9b56c9a5-91a7-49b2-b255-baa5a867c8db","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"9227f803-4d80-4548-9ac7-e132ba5cebdd","name":"9227f803-4d80-4548-9ac7-e132ba5cebdd","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"7d5d96f2-551a-4624-a0b3-497691a89cb8","name":"7d5d96f2-551a-4624-a0b3-497691a89cb8","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"7cc61e40-6ba8-4ff6-87bf-d6ce7bf97c11","name":"7cc61e40-6ba8-4ff6-87bf-d6ce7bf97c11","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"c0ae5e15-f9ad-4697-b76e-f01675de6102","name":"c0ae5e15-f9ad-4697-b76e-f01675de6102","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"b0ac10b9-1415-4150-bf81-f0978bef4874","name":"b0ac10b9-1415-4150-bf81-f0978bef4874","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"00aae7a4-5f57-4320-9a94-cfcd6d216924","name":"00aae7a4-5f57-4320-9a94-cfcd6d216924","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"309ea92c-752f-4ff3-a70d-b2d96a061998","name":"309ea92c-752f-4ff3-a70d-b2d96a061998","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"e1c971b3-a48d-42f9-9f5a-134c5d47bc7a","name":"e1c971b3-a48d-42f9-9f5a-134c5d47bc7a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"f98b9d36-a40b-43c3-9ef3-7a48cbf46b57","name":"f98b9d36-a40b-43c3-9ef3-7a48cbf46b57","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"b1e38e08-9068-4e0b-9707-6ad15b033f59","name":"b1e38e08-9068-4e0b-9707-6ad15b033f59","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"17888442-c2b9-48de-bd24-a2be76f28fbc","name":"17888442-c2b9-48de-bd24-a2be76f28fbc","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"46692e1c-c2a7-4828-ae89-a6af9d8bbf0f","name":"46692e1c-c2a7-4828-ae89-a6af9d8bbf0f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"41192582-b37e-4da7-b4a2-1f46c1d159fc","name":"41192582-b37e-4da7-b4a2-1f46c1d159fc","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"c6ae1886-a082-4bd0-9ff5-a4d4c496e479","name":"c6ae1886-a082-4bd0-9ff5-a4d4c496e479","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -82,51 +82,21 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"9b56c9a5-91a7-49b2-b255-baa5a867c8db","path":"sprites/spr_formation_bars/spr_formation_bars.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"46e13a28-e112-4933-8add-8b73f7768419","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"9227f803-4d80-4548-9ac7-e132ba5cebdd","path":"sprites/spr_formation_bars/spr_formation_bars.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"9970ea10-0897-4059-a7b2-3d8e0103fa9a","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"7d5d96f2-551a-4624-a0b3-497691a89cb8","path":"sprites/spr_formation_bars/spr_formation_bars.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"23c79e86-bdb6-4ce2-b417-396aeab1ca29","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"7cc61e40-6ba8-4ff6-87bf-d6ce7bf97c11","path":"sprites/spr_formation_bars/spr_formation_bars.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"548deb30-5b96-45c3-b1c4-6c498fc763f7","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"c0ae5e15-f9ad-4697-b76e-f01675de6102","path":"sprites/spr_formation_bars/spr_formation_bars.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"e4db157e-0e70-4fa4-ba33-d83926ebd4dc","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"b0ac10b9-1415-4150-bf81-f0978bef4874","path":"sprites/spr_formation_bars/spr_formation_bars.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"9857969a-65b3-4d67-a576-ff2f0b569960","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"00aae7a4-5f57-4320-9a94-cfcd6d216924","path":"sprites/spr_formation_bars/spr_formation_bars.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"57a402b1-da6a-4bc9-b7af-293979d8f87f","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"309ea92c-752f-4ff3-a70d-b2d96a061998","path":"sprites/spr_formation_bars/spr_formation_bars.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"e637be31-c60e-4d2c-b0f0-a3e597f1ca93","IsCreationKey":false,"Key":7.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"e1c971b3-a48d-42f9-9f5a-134c5d47bc7a","path":"sprites/spr_formation_bars/spr_formation_bars.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"aa4230a7-4ca4-4805-aeda-4b4f30031465","IsCreationKey":false,"Key":8.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"f98b9d36-a40b-43c3-9ef3-7a48cbf46b57","path":"sprites/spr_formation_bars/spr_formation_bars.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"ba040332-864d-43ee-a260-80f1b59bfe4d","IsCreationKey":false,"Key":9.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"b1e38e08-9068-4e0b-9707-6ad15b033f59","path":"sprites/spr_formation_bars/spr_formation_bars.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"a94d6dae-c243-498f-829a-58d8668118e5","IsCreationKey":false,"Key":10.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"17888442-c2b9-48de-bd24-a2be76f28fbc","path":"sprites/spr_formation_bars/spr_formation_bars.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"4025e7ee-dccf-4f10-9f84-610d5b1de2cd","IsCreationKey":false,"Key":11.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"46692e1c-c2a7-4828-ae89-a6af9d8bbf0f","path":"sprites/spr_formation_bars/spr_formation_bars.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"5c1b9ce4-040d-491a-93de-e00a1eca65e1","IsCreationKey":false,"Key":12.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"41192582-b37e-4da7-b4a2-1f46c1d159fc","path":"sprites/spr_formation_bars/spr_formation_bars.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"492d1a9e-d4b6-4971-9559-a3b1c17313fa","IsCreationKey":false,"Key":13.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"c6ae1886-a082-4bd0-9ff5-a4d4c496e479","path":"sprites/spr_formation_bars/spr_formation_bars.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"c710c3c4-0e5d-4e70-b1f6-77b78619af6a","IsCreationKey":false,"Key":14.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"9b56c9a5-91a7-49b2-b255-baa5a867c8db","path":"sprites/spr_formation_bars/spr_formation_bars.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"46e13a28-e112-4933-8add-8b73f7768419","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"9227f803-4d80-4548-9ac7-e132ba5cebdd","path":"sprites/spr_formation_bars/spr_formation_bars.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"9970ea10-0897-4059-a7b2-3d8e0103fa9a","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"7d5d96f2-551a-4624-a0b3-497691a89cb8","path":"sprites/spr_formation_bars/spr_formation_bars.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"23c79e86-bdb6-4ce2-b417-396aeab1ca29","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"7cc61e40-6ba8-4ff6-87bf-d6ce7bf97c11","path":"sprites/spr_formation_bars/spr_formation_bars.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"548deb30-5b96-45c3-b1c4-6c498fc763f7","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"c0ae5e15-f9ad-4697-b76e-f01675de6102","path":"sprites/spr_formation_bars/spr_formation_bars.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"e4db157e-0e70-4fa4-ba33-d83926ebd4dc","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"b0ac10b9-1415-4150-bf81-f0978bef4874","path":"sprites/spr_formation_bars/spr_formation_bars.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"9857969a-65b3-4d67-a576-ff2f0b569960","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"00aae7a4-5f57-4320-9a94-cfcd6d216924","path":"sprites/spr_formation_bars/spr_formation_bars.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"57a402b1-da6a-4bc9-b7af-293979d8f87f","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"309ea92c-752f-4ff3-a70d-b2d96a061998","path":"sprites/spr_formation_bars/spr_formation_bars.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"e637be31-c60e-4d2c-b0f0-a3e597f1ca93","IsCreationKey":false,"Key":7.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"e1c971b3-a48d-42f9-9f5a-134c5d47bc7a","path":"sprites/spr_formation_bars/spr_formation_bars.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"aa4230a7-4ca4-4805-aeda-4b4f30031465","IsCreationKey":false,"Key":8.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"f98b9d36-a40b-43c3-9ef3-7a48cbf46b57","path":"sprites/spr_formation_bars/spr_formation_bars.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"ba040332-864d-43ee-a260-80f1b59bfe4d","IsCreationKey":false,"Key":9.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"b1e38e08-9068-4e0b-9707-6ad15b033f59","path":"sprites/spr_formation_bars/spr_formation_bars.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"a94d6dae-c243-498f-829a-58d8668118e5","IsCreationKey":false,"Key":10.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"17888442-c2b9-48de-bd24-a2be76f28fbc","path":"sprites/spr_formation_bars/spr_formation_bars.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"4025e7ee-dccf-4f10-9f84-610d5b1de2cd","IsCreationKey":false,"Key":11.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"46692e1c-c2a7-4828-ae89-a6af9d8bbf0f","path":"sprites/spr_formation_bars/spr_formation_bars.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"5c1b9ce4-040d-491a-93de-e00a1eca65e1","IsCreationKey":false,"Key":12.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"41192582-b37e-4da7-b4a2-1f46c1d159fc","path":"sprites/spr_formation_bars/spr_formation_bars.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"492d1a9e-d4b6-4971-9559-a3b1c17313fa","IsCreationKey":false,"Key":13.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"c6ae1886-a082-4bd0-9ff5-a4d4c496e479","path":"sprites/spr_formation_bars/spr_formation_bars.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"c710c3c4-0e5d-4e70-b1f6-77b78619af6a","IsCreationKey":false,"Key":14.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_formation_splash/spr_formation_splash.yy b/sprites/spr_formation_splash/spr_formation_splash.yy index 7240461f95..1671d331bb 100644 --- a/sprites/spr_formation_splash/spr_formation_splash.yy +++ b/sprites/spr_formation_splash/spr_formation_splash.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_formation_splash", "bboxMode":0, "bbox_bottom":0, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"dfe1df56-5cb7-4f21-8b3c-5f2546c5bd79","name":"dfe1df56-5cb7-4f21-8b3c-5f2546c5bd79","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"dfe1df56-5cb7-4f21-8b3c-5f2546c5bd79","name":"dfe1df56-5cb7-4f21-8b3c-5f2546c5bd79","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"dfe1df56-5cb7-4f21-8b3c-5f2546c5bd79","path":"sprites/spr_formation_splash/spr_formation_splash.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"fe3908e1-758d-486a-9f5d-307c11617dd5","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"dfe1df56-5cb7-4f21-8b3c-5f2546c5bd79","path":"sprites/spr_formation_splash/spr_formation_splash.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"fe3908e1-758d-486a-9f5d-307c11617dd5","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_fur_tabbard/spr_fur_tabbard.yy b/sprites/spr_fur_tabbard/spr_fur_tabbard.yy index 15c2fe08fd..2421a63efe 100644 --- a/sprites/spr_fur_tabbard/spr_fur_tabbard.yy +++ b/sprites/spr_fur_tabbard/spr_fur_tabbard.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_fur_tabbard", "bboxMode":0, "bbox_bottom":198, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"b16cbfdf-6975-4b61-a593-9fd9b73e8a9a","name":"b16cbfdf-6975-4b61-a593-9fd9b73e8a9a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"b16cbfdf-6975-4b61-a593-9fd9b73e8a9a","name":"b16cbfdf-6975-4b61-a593-9fd9b73e8a9a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"b16cbfdf-6975-4b61-a593-9fd9b73e8a9a","path":"sprites/spr_fur_tabbard/spr_fur_tabbard.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"90a6bf62-015f-4b4a-b64b-dc368cae7708","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"b16cbfdf-6975-4b61-a593-9fd9b73e8a9a","path":"sprites/spr_fur_tabbard/spr_fur_tabbard.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"90a6bf62-015f-4b4a-b64b-dc368cae7708","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_fur_tail_topknot/spr_fur_tail_topknot.yy b/sprites/spr_fur_tail_topknot/spr_fur_tail_topknot.yy index 0ea79e04d8..f3a4363cb4 100644 --- a/sprites/spr_fur_tail_topknot/spr_fur_tail_topknot.yy +++ b/sprites/spr_fur_tail_topknot/spr_fur_tail_topknot.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_fur_tail_topknot", "bboxMode":0, "bbox_bottom":64, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"778eed9c-61df-4cb3-b13d-b1945275af2a","name":"778eed9c-61df-4cb3-b13d-b1945275af2a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"778eed9c-61df-4cb3-b13d-b1945275af2a","name":"778eed9c-61df-4cb3-b13d-b1945275af2a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"778eed9c-61df-4cb3-b13d-b1945275af2a","path":"sprites/spr_fur_tail_topknot/spr_fur_tail_topknot.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"5190dfd2-b856-4886-b584-f0be72285950","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"778eed9c-61df-4cb3-b13d-b1945275af2a","path":"sprites/spr_fur_tail_topknot/spr_fur_tail_topknot.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"5190dfd2-b856-4886-b584-f0be72285950","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/spr_gear_apoth.yy b/sprites/spr_gear_apoth/spr_gear_apoth.yy index 21d8214252..1e9544c73d 100644 --- a/sprites/spr_gear_apoth/spr_gear_apoth.yy +++ b/sprites/spr_gear_apoth/spr_gear_apoth.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_gear_apoth", "bboxMode":0, "bbox_bottom":44, @@ -12,8 +12,8 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"fbe2c10c-ddf0-458e-99ee-c3b5fba778d6","name":"fbe2c10c-ddf0-458e-99ee-c3b5fba778d6","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"3ef63e36-9f97-4c93-a6b9-d09b80fd1fbe","name":"3ef63e36-9f97-4c93-a6b9-d09b80fd1fbe","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$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, @@ -69,12 +69,8 @@ "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,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"3ef63e36-9f97-4c93-a6b9-d09b80fd1fbe","path":"sprites/spr_gear_apoth/spr_gear_apoth.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"0c69fd9c-422a-4d42-863d-68657eb7a00a","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_gear_chap/spr_gear_chap.yy b/sprites/spr_gear_chap/spr_gear_chap.yy index d6e2b900ff..3d25dbfc95 100644 --- a/sprites/spr_gear_chap/spr_gear_chap.yy +++ b/sprites/spr_gear_chap/spr_gear_chap.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_gear_chap", "bboxMode":0, "bbox_bottom":52, @@ -12,10 +12,10 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"3ba98c10-77a8-4509-9736-86dc8724af44","name":"3ba98c10-77a8-4509-9736-86dc8724af44","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"7df15531-3e45-4a1a-b9c6-7c22dd26e063","name":"7df15531-3e45-4a1a-b9c6-7c22dd26e063","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"f2cca646-5608-4f41-b755-792cce5db843","name":"f2cca646-5608-4f41-b755-792cce5db843","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"0f550793-95a9-4d27-912e-f2f416090144","name":"0f550793-95a9-4d27-912e-f2f416090144","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"3ba98c10-77a8-4509-9736-86dc8724af44","name":"3ba98c10-77a8-4509-9736-86dc8724af44","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"7df15531-3e45-4a1a-b9c6-7c22dd26e063","name":"7df15531-3e45-4a1a-b9c6-7c22dd26e063","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"f2cca646-5608-4f41-b755-792cce5db843","name":"f2cca646-5608-4f41-b755-792cce5db843","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"0f550793-95a9-4d27-912e-f2f416090144","name":"0f550793-95a9-4d27-912e-f2f416090144","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -71,18 +71,10 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"3ba98c10-77a8-4509-9736-86dc8724af44","path":"sprites/spr_gear_chap/spr_gear_chap.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"55ab5775-15c5-4857-82b8-ce4eb3b56137","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"7df15531-3e45-4a1a-b9c6-7c22dd26e063","path":"sprites/spr_gear_chap/spr_gear_chap.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"c04ded57-a614-480d-b6fe-cb01f7cbc567","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"f2cca646-5608-4f41-b755-792cce5db843","path":"sprites/spr_gear_chap/spr_gear_chap.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"71bed354-bfe8-499f-b239-0d52d9fcc7b9","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"0f550793-95a9-4d27-912e-f2f416090144","path":"sprites/spr_gear_chap/spr_gear_chap.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"05190b39-b803-4f5b-9dda-2cfe5d75069d","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"3ba98c10-77a8-4509-9736-86dc8724af44","path":"sprites/spr_gear_chap/spr_gear_chap.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"55ab5775-15c5-4857-82b8-ce4eb3b56137","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"7df15531-3e45-4a1a-b9c6-7c22dd26e063","path":"sprites/spr_gear_chap/spr_gear_chap.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"c04ded57-a614-480d-b6fe-cb01f7cbc567","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"f2cca646-5608-4f41-b755-792cce5db843","path":"sprites/spr_gear_chap/spr_gear_chap.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"71bed354-bfe8-499f-b239-0d52d9fcc7b9","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"0f550793-95a9-4d27-912e-f2f416090144","path":"sprites/spr_gear_chap/spr_gear_chap.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"05190b39-b803-4f5b-9dda-2cfe5d75069d","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_combat_shield/spr_gear_combat_shield.yy b/sprites/spr_gear_combat_shield/spr_gear_combat_shield.yy index 9dd88bb4ea..b2cb38250e 100644 --- a/sprites/spr_gear_combat_shield/spr_gear_combat_shield.yy +++ b/sprites/spr_gear_combat_shield/spr_gear_combat_shield.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_gear_combat_shield", "bboxMode":0, "bbox_bottom":231, @@ -12,8 +12,8 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"350bde68-1664-48e8-97c4-7cff3c59b4ae","name":"350bde68-1664-48e8-97c4-7cff3c59b4ae","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"587d63a4-32c8-4617-9c28-59a8a099c2c1","name":"587d63a4-32c8-4617-9c28-59a8a099c2c1","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"350bde68-1664-48e8-97c4-7cff3c59b4ae","name":"350bde68-1664-48e8-97c4-7cff3c59b4ae","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, @@ -69,12 +69,8 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"350bde68-1664-48e8-97c4-7cff3c59b4ae","path":"sprites/spr_gear_combat_shield/spr_gear_combat_shield.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"fdba72c1-79cb-494b-9323-35263132441a","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"587d63a4-32c8-4617-9c28-59a8a099c2c1","path":"sprites/spr_gear_combat_shield/spr_gear_combat_shield.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"75d1f4bf-959e-4143-bae9-859b4f9af86d","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"350bde68-1664-48e8-97c4-7cff3c59b4ae","path":"sprites/spr_gear_combat_shield/spr_gear_combat_shield.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"fdba72c1-79cb-494b-9323-35263132441a","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"587d63a4-32c8-4617-9c28-59a8a099c2c1","path":"sprites/spr_gear_combat_shield/spr_gear_combat_shield.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"75d1f4bf-959e-4143-bae9-859b4f9af86d","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_gear_halo/spr_gear_halo.yy b/sprites/spr_gear_halo/spr_gear_halo.yy index 1bece29be7..8818006a8d 100644 --- a/sprites/spr_gear_halo/spr_gear_halo.yy +++ b/sprites/spr_gear_halo/spr_gear_halo.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_gear_halo", "bboxMode":0, "bbox_bottom":79, @@ -12,10 +12,10 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"ec7f27b6-14d0-4152-8f63-a4b2a02f46e3","name":"ec7f27b6-14d0-4152-8f63-a4b2a02f46e3","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"6f8705cc-25c0-45f8-b522-813a85727411","name":"6f8705cc-25c0-45f8-b522-813a85727411","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"72cb9da8-1d01-444f-8f96-d79921e95bb7","name":"72cb9da8-1d01-444f-8f96-d79921e95bb7","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"33022205-50ff-4396-96a1-1f77edceb66f","name":"33022205-50ff-4396-96a1-1f77edceb66f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"ec7f27b6-14d0-4152-8f63-a4b2a02f46e3","name":"ec7f27b6-14d0-4152-8f63-a4b2a02f46e3","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"6f8705cc-25c0-45f8-b522-813a85727411","name":"6f8705cc-25c0-45f8-b522-813a85727411","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"72cb9da8-1d01-444f-8f96-d79921e95bb7","name":"72cb9da8-1d01-444f-8f96-d79921e95bb7","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"33022205-50ff-4396-96a1-1f77edceb66f","name":"33022205-50ff-4396-96a1-1f77edceb66f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -71,18 +71,10 @@ "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_hood1/spr_gear_hood1.yy b/sprites/spr_gear_hood1/spr_gear_hood1.yy index 2da3fe6c6e..c2a3541062 100644 --- a/sprites/spr_gear_hood1/spr_gear_hood1.yy +++ b/sprites/spr_gear_hood1/spr_gear_hood1.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_gear_hood1", "bboxMode":0, "bbox_bottom":205, @@ -12,18 +12,18 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"2ea12e25-957f-42bb-9ee5-db2b5154edfe","name":"2ea12e25-957f-42bb-9ee5-db2b5154edfe","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"f15a50a7-d3f9-4703-abd1-943834a03ee6","name":"f15a50a7-d3f9-4703-abd1-943834a03ee6","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"3685e3ab-54b0-4cd2-b7d5-5782dbc4e702","name":"3685e3ab-54b0-4cd2-b7d5-5782dbc4e702","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"d075042d-241e-45ec-b149-27f1e9c791f1","name":"d075042d-241e-45ec-b149-27f1e9c791f1","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"0dd99c6e-f383-4ae0-9e7e-f86f0f730aea","name":"0dd99c6e-f383-4ae0-9e7e-f86f0f730aea","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"ec10ad9e-31db-4707-888c-2b59e46d7ce4","name":"ec10ad9e-31db-4707-888c-2b59e46d7ce4","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"614e4978-3c1a-4a2b-8754-be5fcd28166c","name":"614e4978-3c1a-4a2b-8754-be5fcd28166c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"d8e03add-e965-4a6e-a6db-0ef5cd9a0b49","name":"d8e03add-e965-4a6e-a6db-0ef5cd9a0b49","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"3ac2fe32-40b4-49ec-bda4-35080c01f8f7","name":"3ac2fe32-40b4-49ec-bda4-35080c01f8f7","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"cd270acb-7372-43f8-b94a-0e463be5c2a0","name":"cd270acb-7372-43f8-b94a-0e463be5c2a0","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"82a51724-0c4e-4d0e-b911-2748b2195c11","name":"82a51724-0c4e-4d0e-b911-2748b2195c11","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"3a8051d6-87a9-4dd0-8c6c-8ef0697b0083","name":"3a8051d6-87a9-4dd0-8c6c-8ef0697b0083","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"2ea12e25-957f-42bb-9ee5-db2b5154edfe","name":"2ea12e25-957f-42bb-9ee5-db2b5154edfe","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"f15a50a7-d3f9-4703-abd1-943834a03ee6","name":"f15a50a7-d3f9-4703-abd1-943834a03ee6","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"3685e3ab-54b0-4cd2-b7d5-5782dbc4e702","name":"3685e3ab-54b0-4cd2-b7d5-5782dbc4e702","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"d075042d-241e-45ec-b149-27f1e9c791f1","name":"d075042d-241e-45ec-b149-27f1e9c791f1","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"0dd99c6e-f383-4ae0-9e7e-f86f0f730aea","name":"0dd99c6e-f383-4ae0-9e7e-f86f0f730aea","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"ec10ad9e-31db-4707-888c-2b59e46d7ce4","name":"ec10ad9e-31db-4707-888c-2b59e46d7ce4","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"614e4978-3c1a-4a2b-8754-be5fcd28166c","name":"614e4978-3c1a-4a2b-8754-be5fcd28166c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"d8e03add-e965-4a6e-a6db-0ef5cd9a0b49","name":"d8e03add-e965-4a6e-a6db-0ef5cd9a0b49","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"3ac2fe32-40b4-49ec-bda4-35080c01f8f7","name":"3ac2fe32-40b4-49ec-bda4-35080c01f8f7","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"cd270acb-7372-43f8-b94a-0e463be5c2a0","name":"cd270acb-7372-43f8-b94a-0e463be5c2a0","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"82a51724-0c4e-4d0e-b911-2748b2195c11","name":"82a51724-0c4e-4d0e-b911-2748b2195c11","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"3a8051d6-87a9-4dd0-8c6c-8ef0697b0083","name":"3a8051d6-87a9-4dd0-8c6c-8ef0697b0083","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -81,42 +81,18 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"2ea12e25-957f-42bb-9ee5-db2b5154edfe","path":"sprites/spr_gear_hood1/spr_gear_hood1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"d7e638c1-3263-4848-a7d4-38720fec02fa","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"f15a50a7-d3f9-4703-abd1-943834a03ee6","path":"sprites/spr_gear_hood1/spr_gear_hood1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"f8239526-bc0c-4d66-a314-912e4cecdc5c","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"3685e3ab-54b0-4cd2-b7d5-5782dbc4e702","path":"sprites/spr_gear_hood1/spr_gear_hood1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"0af985c0-34a6-41d1-afc5-ed65eb09cab3","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"d075042d-241e-45ec-b149-27f1e9c791f1","path":"sprites/spr_gear_hood1/spr_gear_hood1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"d59c58f0-01a2-47d6-b2f6-ba6603028e41","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"0dd99c6e-f383-4ae0-9e7e-f86f0f730aea","path":"sprites/spr_gear_hood1/spr_gear_hood1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"8ce178ea-6dca-4a19-86f7-16e8c1a5a0fa","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"ec10ad9e-31db-4707-888c-2b59e46d7ce4","path":"sprites/spr_gear_hood1/spr_gear_hood1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"63dde102-1279-4c04-a829-c8dd453d3e92","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"614e4978-3c1a-4a2b-8754-be5fcd28166c","path":"sprites/spr_gear_hood1/spr_gear_hood1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"9dc83925-f071-463c-841a-5829c30e3d68","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"d8e03add-e965-4a6e-a6db-0ef5cd9a0b49","path":"sprites/spr_gear_hood1/spr_gear_hood1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"05075f29-cf4e-4f43-9a83-f2af6be00517","IsCreationKey":false,"Key":7.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"3ac2fe32-40b4-49ec-bda4-35080c01f8f7","path":"sprites/spr_gear_hood1/spr_gear_hood1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"57a7a392-e649-4414-9c21-2af904a4673b","IsCreationKey":false,"Key":8.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"cd270acb-7372-43f8-b94a-0e463be5c2a0","path":"sprites/spr_gear_hood1/spr_gear_hood1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"4c47dc30-17eb-48c0-ba8f-26390675c8b1","IsCreationKey":false,"Key":9.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"82a51724-0c4e-4d0e-b911-2748b2195c11","path":"sprites/spr_gear_hood1/spr_gear_hood1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"b8aae6c0-9584-4fb4-af75-82fbee8bf42c","IsCreationKey":false,"Key":10.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"3a8051d6-87a9-4dd0-8c6c-8ef0697b0083","path":"sprites/spr_gear_hood1/spr_gear_hood1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"0c6b6a99-647e-4bd1-96ab-f313a64b8e19","IsCreationKey":false,"Key":11.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"2ea12e25-957f-42bb-9ee5-db2b5154edfe","path":"sprites/spr_gear_hood1/spr_gear_hood1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"d7e638c1-3263-4848-a7d4-38720fec02fa","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"f15a50a7-d3f9-4703-abd1-943834a03ee6","path":"sprites/spr_gear_hood1/spr_gear_hood1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"f8239526-bc0c-4d66-a314-912e4cecdc5c","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"3685e3ab-54b0-4cd2-b7d5-5782dbc4e702","path":"sprites/spr_gear_hood1/spr_gear_hood1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"0af985c0-34a6-41d1-afc5-ed65eb09cab3","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"d075042d-241e-45ec-b149-27f1e9c791f1","path":"sprites/spr_gear_hood1/spr_gear_hood1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"d59c58f0-01a2-47d6-b2f6-ba6603028e41","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"0dd99c6e-f383-4ae0-9e7e-f86f0f730aea","path":"sprites/spr_gear_hood1/spr_gear_hood1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"8ce178ea-6dca-4a19-86f7-16e8c1a5a0fa","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"ec10ad9e-31db-4707-888c-2b59e46d7ce4","path":"sprites/spr_gear_hood1/spr_gear_hood1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"63dde102-1279-4c04-a829-c8dd453d3e92","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"614e4978-3c1a-4a2b-8754-be5fcd28166c","path":"sprites/spr_gear_hood1/spr_gear_hood1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"9dc83925-f071-463c-841a-5829c30e3d68","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"d8e03add-e965-4a6e-a6db-0ef5cd9a0b49","path":"sprites/spr_gear_hood1/spr_gear_hood1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"05075f29-cf4e-4f43-9a83-f2af6be00517","IsCreationKey":false,"Key":7.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"3ac2fe32-40b4-49ec-bda4-35080c01f8f7","path":"sprites/spr_gear_hood1/spr_gear_hood1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"57a7a392-e649-4414-9c21-2af904a4673b","IsCreationKey":false,"Key":8.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"cd270acb-7372-43f8-b94a-0e463be5c2a0","path":"sprites/spr_gear_hood1/spr_gear_hood1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"4c47dc30-17eb-48c0-ba8f-26390675c8b1","IsCreationKey":false,"Key":9.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"82a51724-0c4e-4d0e-b911-2748b2195c11","path":"sprites/spr_gear_hood1/spr_gear_hood1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"b8aae6c0-9584-4fb4-af75-82fbee8bf42c","IsCreationKey":false,"Key":10.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"3a8051d6-87a9-4dd0-8c6c-8ef0697b0083","path":"sprites/spr_gear_hood1/spr_gear_hood1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"0c6b6a99-647e-4bd1-96ab-f313a64b8e19","IsCreationKey":false,"Key":11.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_hood2/spr_gear_hood2.yy b/sprites/spr_gear_hood2/spr_gear_hood2.yy index 0b05d5be79..87c73ba533 100644 --- a/sprites/spr_gear_hood2/spr_gear_hood2.yy +++ b/sprites/spr_gear_hood2/spr_gear_hood2.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_gear_hood2", "bboxMode":0, "bbox_bottom":49, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"98625b1b-c315-421f-942a-61723f81b005","name":"98625b1b-c315-421f-942a-61723f81b005","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"98625b1b-c315-421f-942a-61723f81b005","name":"98625b1b-c315-421f-942a-61723f81b005","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "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_gear_hood2/spr_gear_hood2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"50ebdc76-7691-4e67-ab14-f9533598ea2f","IsCreationKey":false,"Key":0.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_gear_hood2/spr_gear_hood2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"50ebdc76-7691-4e67-ab14-f9533598ea2f","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_hood3/spr_gear_hood3.yy b/sprites/spr_gear_hood3/spr_gear_hood3.yy index af04159b73..97aab2603b 100644 --- a/sprites/spr_gear_hood3/spr_gear_hood3.yy +++ b/sprites/spr_gear_hood3/spr_gear_hood3.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_gear_hood3", "bboxMode":0, "bbox_bottom":204, @@ -12,16 +12,16 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"e91b6dc2-e1cb-421d-8924-bd78a1d566e0","name":"e91b6dc2-e1cb-421d-8924-bd78a1d566e0","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"ba011eb4-2602-4258-922e-22163b5795a3","name":"ba011eb4-2602-4258-922e-22163b5795a3","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"0528e4b3-353d-478c-a12c-f800434d667a","name":"0528e4b3-353d-478c-a12c-f800434d667a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"c26273f9-5689-449b-9f3f-31af9c1d16be","name":"c26273f9-5689-449b-9f3f-31af9c1d16be","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"a2e8a472-302d-42a0-a191-6e8189f9d053","name":"a2e8a472-302d-42a0-a191-6e8189f9d053","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"1489bf2a-920f-4be2-a5c2-dfe4932e7e9a","name":"1489bf2a-920f-4be2-a5c2-dfe4932e7e9a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"d904ff69-d790-42e1-968d-d98335c4ba1e","name":"d904ff69-d790-42e1-968d-d98335c4ba1e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"8d0a0885-0e0c-4ce3-856a-d77b59bf5693","name":"8d0a0885-0e0c-4ce3-856a-d77b59bf5693","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"c94c5444-9b90-42ce-b3d1-0b7ae8fff856","name":"c94c5444-9b90-42ce-b3d1-0b7ae8fff856","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"afd814e6-1e6e-432e-b3e1-b890ed2fbebd","name":"afd814e6-1e6e-432e-b3e1-b890ed2fbebd","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"e91b6dc2-e1cb-421d-8924-bd78a1d566e0","name":"e91b6dc2-e1cb-421d-8924-bd78a1d566e0","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"ba011eb4-2602-4258-922e-22163b5795a3","name":"ba011eb4-2602-4258-922e-22163b5795a3","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"0528e4b3-353d-478c-a12c-f800434d667a","name":"0528e4b3-353d-478c-a12c-f800434d667a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"c26273f9-5689-449b-9f3f-31af9c1d16be","name":"c26273f9-5689-449b-9f3f-31af9c1d16be","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"a2e8a472-302d-42a0-a191-6e8189f9d053","name":"a2e8a472-302d-42a0-a191-6e8189f9d053","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"1489bf2a-920f-4be2-a5c2-dfe4932e7e9a","name":"1489bf2a-920f-4be2-a5c2-dfe4932e7e9a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"d904ff69-d790-42e1-968d-d98335c4ba1e","name":"d904ff69-d790-42e1-968d-d98335c4ba1e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"8d0a0885-0e0c-4ce3-856a-d77b59bf5693","name":"8d0a0885-0e0c-4ce3-856a-d77b59bf5693","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"c94c5444-9b90-42ce-b3d1-0b7ae8fff856","name":"c94c5444-9b90-42ce-b3d1-0b7ae8fff856","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"afd814e6-1e6e-432e-b3e1-b890ed2fbebd","name":"afd814e6-1e6e-432e-b3e1-b890ed2fbebd","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -79,36 +79,16 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"e91b6dc2-e1cb-421d-8924-bd78a1d566e0","path":"sprites/spr_gear_hood3/spr_gear_hood3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"f654497a-61ba-4e49-a98d-cb9a20cd50d8","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"ba011eb4-2602-4258-922e-22163b5795a3","path":"sprites/spr_gear_hood3/spr_gear_hood3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"8f9849ba-5797-4abd-98e0-345ac5e46957","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"0528e4b3-353d-478c-a12c-f800434d667a","path":"sprites/spr_gear_hood3/spr_gear_hood3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"87edcd92-5d55-4c60-aa8b-b0c674592211","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"c26273f9-5689-449b-9f3f-31af9c1d16be","path":"sprites/spr_gear_hood3/spr_gear_hood3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"946368d6-ba73-4b0c-8325-2cd22cf1f5a2","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"a2e8a472-302d-42a0-a191-6e8189f9d053","path":"sprites/spr_gear_hood3/spr_gear_hood3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"120c2802-b902-4f6f-9fc6-e9dc234c36e7","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"1489bf2a-920f-4be2-a5c2-dfe4932e7e9a","path":"sprites/spr_gear_hood3/spr_gear_hood3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"2d1d2263-a1ca-4228-81dc-d3cad2cb4103","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"d904ff69-d790-42e1-968d-d98335c4ba1e","path":"sprites/spr_gear_hood3/spr_gear_hood3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"6175a05c-8d48-4db1-97a3-f66939c811e6","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"8d0a0885-0e0c-4ce3-856a-d77b59bf5693","path":"sprites/spr_gear_hood3/spr_gear_hood3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"27a5cb26-478e-4331-85a9-a2c45373712a","IsCreationKey":false,"Key":7.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"c94c5444-9b90-42ce-b3d1-0b7ae8fff856","path":"sprites/spr_gear_hood3/spr_gear_hood3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"a045cd17-94fb-4bb7-84a6-93ce47448460","IsCreationKey":false,"Key":8.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"afd814e6-1e6e-432e-b3e1-b890ed2fbebd","path":"sprites/spr_gear_hood3/spr_gear_hood3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"5dfaef21-c07e-4e46-8877-113627f722ef","IsCreationKey":false,"Key":9.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"e91b6dc2-e1cb-421d-8924-bd78a1d566e0","path":"sprites/spr_gear_hood3/spr_gear_hood3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"f654497a-61ba-4e49-a98d-cb9a20cd50d8","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"ba011eb4-2602-4258-922e-22163b5795a3","path":"sprites/spr_gear_hood3/spr_gear_hood3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"8f9849ba-5797-4abd-98e0-345ac5e46957","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"0528e4b3-353d-478c-a12c-f800434d667a","path":"sprites/spr_gear_hood3/spr_gear_hood3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"87edcd92-5d55-4c60-aa8b-b0c674592211","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"c26273f9-5689-449b-9f3f-31af9c1d16be","path":"sprites/spr_gear_hood3/spr_gear_hood3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"946368d6-ba73-4b0c-8325-2cd22cf1f5a2","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"a2e8a472-302d-42a0-a191-6e8189f9d053","path":"sprites/spr_gear_hood3/spr_gear_hood3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"120c2802-b902-4f6f-9fc6-e9dc234c36e7","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"1489bf2a-920f-4be2-a5c2-dfe4932e7e9a","path":"sprites/spr_gear_hood3/spr_gear_hood3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"2d1d2263-a1ca-4228-81dc-d3cad2cb4103","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"d904ff69-d790-42e1-968d-d98335c4ba1e","path":"sprites/spr_gear_hood3/spr_gear_hood3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"6175a05c-8d48-4db1-97a3-f66939c811e6","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"8d0a0885-0e0c-4ce3-856a-d77b59bf5693","path":"sprites/spr_gear_hood3/spr_gear_hood3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"27a5cb26-478e-4331-85a9-a2c45373712a","IsCreationKey":false,"Key":7.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"c94c5444-9b90-42ce-b3d1-0b7ae8fff856","path":"sprites/spr_gear_hood3/spr_gear_hood3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"a045cd17-94fb-4bb7-84a6-93ce47448460","IsCreationKey":false,"Key":8.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"afd814e6-1e6e-432e-b3e1-b890ed2fbebd","path":"sprites/spr_gear_hood3/spr_gear_hood3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"5dfaef21-c07e-4e46-8877-113627f722ef","IsCreationKey":false,"Key":9.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 56227bed6f..f0bc7a6f3f 100644 --- a/sprites/spr_gear_librarian/spr_gear_librarian.yy +++ b/sprites/spr_gear_librarian/spr_gear_librarian.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_gear_librarian", "bboxMode":0, "bbox_bottom":67, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"c686bbde-e480-472c-bb08-d523ecc16fd7","name":"c686bbde-e480-472c-bb08-d523ecc16fd7","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"c686bbde-e480-472c-bb08-d523ecc16fd7","name":"c686bbde-e480-472c-bb08-d523ecc16fd7","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "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 e232d04be8..51742ec2db 100644 --- a/sprites/spr_gear_librarian_term/spr_gear_librarian_term.yy +++ b/sprites/spr_gear_librarian_term/spr_gear_librarian_term.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_gear_librarian_term", "bboxMode":0, "bbox_bottom":68, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"c686bbde-e480-472c-bb08-d523ecc16fd7","name":"c686bbde-e480-472c-bb08-d523ecc16fd7","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"c686bbde-e480-472c-bb08-d523ecc16fd7","name":"c686bbde-e480-472c-bb08-d523ecc16fd7","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "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 a17db13c56..5e8d4140cd 100644 --- a/sprites/spr_gear_techa/spr_gear_techa.yy +++ b/sprites/spr_gear_techa/spr_gear_techa.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_gear_techa", "bboxMode":0, "bbox_bottom":45, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"c686bbde-e480-472c-bb08-d523ecc16fd7","name":"c686bbde-e480-472c-bb08-d523ecc16fd7","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"c686bbde-e480-472c-bb08-d523ecc16fd7","name":"c686bbde-e480-472c-bb08-d523ecc16fd7","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "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_generic_honor_guard/spr_generic_honor_guard.yy b/sprites/spr_generic_honor_guard/spr_generic_honor_guard.yy index 08745c2691..8db0a8e2df 100644 --- a/sprites/spr_generic_honor_guard/spr_generic_honor_guard.yy +++ b/sprites/spr_generic_honor_guard/spr_generic_honor_guard.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_generic_honor_guard", "bboxMode":0, "bbox_bottom":220, @@ -12,12 +12,12 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"d1ffcc4e-d302-4897-b7f2-6f29a2cd019c","name":"d1ffcc4e-d302-4897-b7f2-6f29a2cd019c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"36357777-96a0-45ba-9211-32f9f0c807f9","name":"36357777-96a0-45ba-9211-32f9f0c807f9","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"66b749b5-748d-4f6b-b3ee-de1acf85499c","name":"66b749b5-748d-4f6b-b3ee-de1acf85499c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"c43cfd5a-416a-4ba7-be6d-94492a1488a9","name":"c43cfd5a-416a-4ba7-be6d-94492a1488a9","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"47cc3181-8c92-4cdd-bc8d-add01497c0ea","name":"47cc3181-8c92-4cdd-bc8d-add01497c0ea","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"32642e56-6593-4c11-b48b-a780b48d9332","name":"32642e56-6593-4c11-b48b-a780b48d9332","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"d1ffcc4e-d302-4897-b7f2-6f29a2cd019c","name":"d1ffcc4e-d302-4897-b7f2-6f29a2cd019c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"36357777-96a0-45ba-9211-32f9f0c807f9","name":"36357777-96a0-45ba-9211-32f9f0c807f9","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"66b749b5-748d-4f6b-b3ee-de1acf85499c","name":"66b749b5-748d-4f6b-b3ee-de1acf85499c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"c43cfd5a-416a-4ba7-be6d-94492a1488a9","name":"c43cfd5a-416a-4ba7-be6d-94492a1488a9","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"47cc3181-8c92-4cdd-bc8d-add01497c0ea","name":"47cc3181-8c92-4cdd-bc8d-add01497c0ea","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"32642e56-6593-4c11-b48b-a780b48d9332","name":"32642e56-6593-4c11-b48b-a780b48d9332","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -73,24 +73,12 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"d1ffcc4e-d302-4897-b7f2-6f29a2cd019c","path":"sprites/spr_generic_honor_guard/spr_generic_honor_guard.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"c66cce41-4b23-4476-82b8-6046bf8be6aa","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"36357777-96a0-45ba-9211-32f9f0c807f9","path":"sprites/spr_generic_honor_guard/spr_generic_honor_guard.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"7581b692-35d0-4dad-91d1-ac5b40020afc","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"66b749b5-748d-4f6b-b3ee-de1acf85499c","path":"sprites/spr_generic_honor_guard/spr_generic_honor_guard.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"497b6308-557a-4877-8fe6-4a0ea6442f0b","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"c43cfd5a-416a-4ba7-be6d-94492a1488a9","path":"sprites/spr_generic_honor_guard/spr_generic_honor_guard.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"dd2d972b-1bff-4558-a244-a0de713ea441","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"47cc3181-8c92-4cdd-bc8d-add01497c0ea","path":"sprites/spr_generic_honor_guard/spr_generic_honor_guard.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"af180f89-ae18-4ab3-973a-12d8556cf866","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"32642e56-6593-4c11-b48b-a780b48d9332","path":"sprites/spr_generic_honor_guard/spr_generic_honor_guard.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"ed017c0c-0f4f-4fd1-90d3-ae09be762548","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"d1ffcc4e-d302-4897-b7f2-6f29a2cd019c","path":"sprites/spr_generic_honor_guard/spr_generic_honor_guard.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"c66cce41-4b23-4476-82b8-6046bf8be6aa","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"36357777-96a0-45ba-9211-32f9f0c807f9","path":"sprites/spr_generic_honor_guard/spr_generic_honor_guard.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"7581b692-35d0-4dad-91d1-ac5b40020afc","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"66b749b5-748d-4f6b-b3ee-de1acf85499c","path":"sprites/spr_generic_honor_guard/spr_generic_honor_guard.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"497b6308-557a-4877-8fe6-4a0ea6442f0b","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"c43cfd5a-416a-4ba7-be6d-94492a1488a9","path":"sprites/spr_generic_honor_guard/spr_generic_honor_guard.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"dd2d972b-1bff-4558-a244-a0de713ea441","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"47cc3181-8c92-4cdd-bc8d-add01497c0ea","path":"sprites/spr_generic_honor_guard/spr_generic_honor_guard.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"af180f89-ae18-4ab3-973a-12d8556cf866","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"32642e56-6593-4c11-b48b-a780b48d9332","path":"sprites/spr_generic_honor_guard/spr_generic_honor_guard.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"ed017c0c-0f4f-4fd1-90d3-ae09be762548","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_generic_sgt_mk3/spr_generic_sgt_mk3.yy b/sprites/spr_generic_sgt_mk3/spr_generic_sgt_mk3.yy index c39da9ff02..6bab660fe1 100644 --- a/sprites/spr_generic_sgt_mk3/spr_generic_sgt_mk3.yy +++ b/sprites/spr_generic_sgt_mk3/spr_generic_sgt_mk3.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_generic_sgt_mk3", "bboxMode":0, "bbox_bottom":52, @@ -12,10 +12,10 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"453548fa-1925-4ac4-90d9-0c74608db18c","name":"453548fa-1925-4ac4-90d9-0c74608db18c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"f9679102-ac16-49be-81c7-a76859c91828","name":"f9679102-ac16-49be-81c7-a76859c91828","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"f7944d23-8f13-4749-a313-106c17d901c2","name":"f7944d23-8f13-4749-a313-106c17d901c2","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"f16d60e8-3436-42e4-8ada-e41323378a0d","name":"f16d60e8-3436-42e4-8ada-e41323378a0d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"453548fa-1925-4ac4-90d9-0c74608db18c","name":"453548fa-1925-4ac4-90d9-0c74608db18c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"f9679102-ac16-49be-81c7-a76859c91828","name":"f9679102-ac16-49be-81c7-a76859c91828","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"f7944d23-8f13-4749-a313-106c17d901c2","name":"f7944d23-8f13-4749-a313-106c17d901c2","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"f16d60e8-3436-42e4-8ada-e41323378a0d","name":"f16d60e8-3436-42e4-8ada-e41323378a0d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -72,18 +72,10 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"453548fa-1925-4ac4-90d9-0c74608db18c","path":"sprites/spr_generic_sgt_mk3/spr_generic_sgt_mk3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"f18dc78f-1df7-4a87-9c60-07a21e6cd3ff","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"f9679102-ac16-49be-81c7-a76859c91828","path":"sprites/spr_generic_sgt_mk3/spr_generic_sgt_mk3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"5ea9148c-d1c5-485c-a7df-c8cc7b6a94cd","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"f7944d23-8f13-4749-a313-106c17d901c2","path":"sprites/spr_generic_sgt_mk3/spr_generic_sgt_mk3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"f6a04fe9-de4e-4858-a54d-192e9865f75b","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"f16d60e8-3436-42e4-8ada-e41323378a0d","path":"sprites/spr_generic_sgt_mk3/spr_generic_sgt_mk3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"f21a607d-23de-4ee9-a963-1d5670934960","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"453548fa-1925-4ac4-90d9-0c74608db18c","path":"sprites/spr_generic_sgt_mk3/spr_generic_sgt_mk3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"f18dc78f-1df7-4a87-9c60-07a21e6cd3ff","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"f9679102-ac16-49be-81c7-a76859c91828","path":"sprites/spr_generic_sgt_mk3/spr_generic_sgt_mk3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"5ea9148c-d1c5-485c-a7df-c8cc7b6a94cd","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"f7944d23-8f13-4749-a313-106c17d901c2","path":"sprites/spr_generic_sgt_mk3/spr_generic_sgt_mk3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"f6a04fe9-de4e-4858-a54d-192e9865f75b","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"f16d60e8-3436-42e4-8ada-e41323378a0d","path":"sprites/spr_generic_sgt_mk3/spr_generic_sgt_mk3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"f21a607d-23de-4ee9-a963-1d5670934960","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_generic_sgt_mk4/spr_generic_sgt_mk4.yy b/sprites/spr_generic_sgt_mk4/spr_generic_sgt_mk4.yy index d4908f2dde..154b1c56e0 100644 --- a/sprites/spr_generic_sgt_mk4/spr_generic_sgt_mk4.yy +++ b/sprites/spr_generic_sgt_mk4/spr_generic_sgt_mk4.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_generic_sgt_mk4", "bboxMode":0, "bbox_bottom":45, @@ -12,11 +12,11 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"b6c40433-b796-4087-8033-516468284ec7","name":"b6c40433-b796-4087-8033-516468284ec7","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"bc2837e3-fa50-4484-8af1-55fc959611a1","name":"bc2837e3-fa50-4484-8af1-55fc959611a1","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"9444dcec-d8e1-4a40-b6bc-0055bf6708f9","name":"9444dcec-d8e1-4a40-b6bc-0055bf6708f9","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"900ad528-7741-42ae-9cf8-d3e761688379","name":"900ad528-7741-42ae-9cf8-d3e761688379","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"35f65277-0206-4cb4-b73b-a3f9a2db5145","name":"35f65277-0206-4cb4-b73b-a3f9a2db5145","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"b6c40433-b796-4087-8033-516468284ec7","name":"b6c40433-b796-4087-8033-516468284ec7","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"bc2837e3-fa50-4484-8af1-55fc959611a1","name":"bc2837e3-fa50-4484-8af1-55fc959611a1","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"9444dcec-d8e1-4a40-b6bc-0055bf6708f9","name":"9444dcec-d8e1-4a40-b6bc-0055bf6708f9","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"900ad528-7741-42ae-9cf8-d3e761688379","name":"900ad528-7741-42ae-9cf8-d3e761688379","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"35f65277-0206-4cb4-b73b-a3f9a2db5145","name":"35f65277-0206-4cb4-b73b-a3f9a2db5145","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -72,21 +72,11 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"b6c40433-b796-4087-8033-516468284ec7","path":"sprites/spr_generic_sgt_mk4/spr_generic_sgt_mk4.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"02c37a45-2f0e-437d-b364-6d736cc0a01f","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"bc2837e3-fa50-4484-8af1-55fc959611a1","path":"sprites/spr_generic_sgt_mk4/spr_generic_sgt_mk4.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"492dbd86-e50a-454b-a40f-73a2da04c7a8","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"9444dcec-d8e1-4a40-b6bc-0055bf6708f9","path":"sprites/spr_generic_sgt_mk4/spr_generic_sgt_mk4.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"37048c1b-0257-4c88-b79e-5a6c77932e58","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"900ad528-7741-42ae-9cf8-d3e761688379","path":"sprites/spr_generic_sgt_mk4/spr_generic_sgt_mk4.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"caf6c31f-886a-4064-9066-8b4ff4595fbb","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"35f65277-0206-4cb4-b73b-a3f9a2db5145","path":"sprites/spr_generic_sgt_mk4/spr_generic_sgt_mk4.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"e4cbb5f2-c487-41f6-b212-5c0cb15007d8","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"b6c40433-b796-4087-8033-516468284ec7","path":"sprites/spr_generic_sgt_mk4/spr_generic_sgt_mk4.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"02c37a45-2f0e-437d-b364-6d736cc0a01f","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"bc2837e3-fa50-4484-8af1-55fc959611a1","path":"sprites/spr_generic_sgt_mk4/spr_generic_sgt_mk4.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"492dbd86-e50a-454b-a40f-73a2da04c7a8","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"9444dcec-d8e1-4a40-b6bc-0055bf6708f9","path":"sprites/spr_generic_sgt_mk4/spr_generic_sgt_mk4.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"37048c1b-0257-4c88-b79e-5a6c77932e58","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"900ad528-7741-42ae-9cf8-d3e761688379","path":"sprites/spr_generic_sgt_mk4/spr_generic_sgt_mk4.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"caf6c31f-886a-4064-9066-8b4ff4595fbb","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"35f65277-0206-4cb4-b73b-a3f9a2db5145","path":"sprites/spr_generic_sgt_mk4/spr_generic_sgt_mk4.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"e4cbb5f2-c487-41f6-b212-5c0cb15007d8","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_generic_sgt_mk5/spr_generic_sgt_mk5.yy b/sprites/spr_generic_sgt_mk5/spr_generic_sgt_mk5.yy index fb2c47b161..b93562cccf 100644 --- a/sprites/spr_generic_sgt_mk5/spr_generic_sgt_mk5.yy +++ b/sprites/spr_generic_sgt_mk5/spr_generic_sgt_mk5.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_generic_sgt_mk5", "bboxMode":0, "bbox_bottom":43, @@ -12,10 +12,10 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"5ef518ec-b0b8-48cb-982b-127b74bf1a93","name":"5ef518ec-b0b8-48cb-982b-127b74bf1a93","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"151d8a45-d25d-4d91-96e9-95d98fc851ef","name":"151d8a45-d25d-4d91-96e9-95d98fc851ef","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"b55fc1d3-fc95-4f04-8546-bd65825c4c79","name":"b55fc1d3-fc95-4f04-8546-bd65825c4c79","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"b192b936-3c58-43e2-b011-0f34b8e33c5b","name":"b192b936-3c58-43e2-b011-0f34b8e33c5b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"5ef518ec-b0b8-48cb-982b-127b74bf1a93","name":"5ef518ec-b0b8-48cb-982b-127b74bf1a93","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"151d8a45-d25d-4d91-96e9-95d98fc851ef","name":"151d8a45-d25d-4d91-96e9-95d98fc851ef","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"b55fc1d3-fc95-4f04-8546-bd65825c4c79","name":"b55fc1d3-fc95-4f04-8546-bd65825c4c79","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"b192b936-3c58-43e2-b011-0f34b8e33c5b","name":"b192b936-3c58-43e2-b011-0f34b8e33c5b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -71,18 +71,10 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"5ef518ec-b0b8-48cb-982b-127b74bf1a93","path":"sprites/spr_generic_sgt_mk5/spr_generic_sgt_mk5.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"e1a21855-a9d4-4358-8ebd-1048afb81d7d","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"151d8a45-d25d-4d91-96e9-95d98fc851ef","path":"sprites/spr_generic_sgt_mk5/spr_generic_sgt_mk5.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"381c6466-48f6-4b57-be56-0cdd64b73a3b","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"b55fc1d3-fc95-4f04-8546-bd65825c4c79","path":"sprites/spr_generic_sgt_mk5/spr_generic_sgt_mk5.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"1251b2d8-d6bc-4335-98dd-69d1d7cf2190","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"b192b936-3c58-43e2-b011-0f34b8e33c5b","path":"sprites/spr_generic_sgt_mk5/spr_generic_sgt_mk5.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"35bb15b6-d4bd-4c6b-899e-6f3123a0af00","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"5ef518ec-b0b8-48cb-982b-127b74bf1a93","path":"sprites/spr_generic_sgt_mk5/spr_generic_sgt_mk5.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"e1a21855-a9d4-4358-8ebd-1048afb81d7d","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"151d8a45-d25d-4d91-96e9-95d98fc851ef","path":"sprites/spr_generic_sgt_mk5/spr_generic_sgt_mk5.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"381c6466-48f6-4b57-be56-0cdd64b73a3b","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"b55fc1d3-fc95-4f04-8546-bd65825c4c79","path":"sprites/spr_generic_sgt_mk5/spr_generic_sgt_mk5.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"1251b2d8-d6bc-4335-98dd-69d1d7cf2190","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"b192b936-3c58-43e2-b011-0f34b8e33c5b","path":"sprites/spr_generic_sgt_mk5/spr_generic_sgt_mk5.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"35bb15b6-d4bd-4c6b-899e-6f3123a0af00","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_generic_sgt_mk6/spr_generic_sgt_mk6.yy b/sprites/spr_generic_sgt_mk6/spr_generic_sgt_mk6.yy index 41766d177b..5efaa2287e 100644 --- a/sprites/spr_generic_sgt_mk6/spr_generic_sgt_mk6.yy +++ b/sprites/spr_generic_sgt_mk6/spr_generic_sgt_mk6.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_generic_sgt_mk6", "bboxMode":0, "bbox_bottom":47, @@ -12,10 +12,10 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"d31acec8-4976-4be8-9b8b-dd77c486f2b5","name":"d31acec8-4976-4be8-9b8b-dd77c486f2b5","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"b049956f-a206-4f0e-89b0-a8989e560f2c","name":"b049956f-a206-4f0e-89b0-a8989e560f2c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"719f6e69-22d8-4a3a-ab4f-cdd616174b3d","name":"719f6e69-22d8-4a3a-ab4f-cdd616174b3d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"fb3b2bd0-2811-49bd-9c2d-124ff68c3635","name":"fb3b2bd0-2811-49bd-9c2d-124ff68c3635","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"d31acec8-4976-4be8-9b8b-dd77c486f2b5","name":"d31acec8-4976-4be8-9b8b-dd77c486f2b5","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"b049956f-a206-4f0e-89b0-a8989e560f2c","name":"b049956f-a206-4f0e-89b0-a8989e560f2c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"719f6e69-22d8-4a3a-ab4f-cdd616174b3d","name":"719f6e69-22d8-4a3a-ab4f-cdd616174b3d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"fb3b2bd0-2811-49bd-9c2d-124ff68c3635","name":"fb3b2bd0-2811-49bd-9c2d-124ff68c3635","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -71,18 +71,10 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"d31acec8-4976-4be8-9b8b-dd77c486f2b5","path":"sprites/spr_generic_sgt_mk6/spr_generic_sgt_mk6.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"282fff07-a56c-4045-8ba9-50ba49007c35","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"b049956f-a206-4f0e-89b0-a8989e560f2c","path":"sprites/spr_generic_sgt_mk6/spr_generic_sgt_mk6.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"4a5c4b8f-5f6a-4840-82fe-ae6c470cbe6e","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"719f6e69-22d8-4a3a-ab4f-cdd616174b3d","path":"sprites/spr_generic_sgt_mk6/spr_generic_sgt_mk6.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"9e83fe56-93a9-472c-a9e1-1535a32175bf","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"fb3b2bd0-2811-49bd-9c2d-124ff68c3635","path":"sprites/spr_generic_sgt_mk6/spr_generic_sgt_mk6.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"2d0dfab9-7210-42a2-9f17-299cfd354675","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"d31acec8-4976-4be8-9b8b-dd77c486f2b5","path":"sprites/spr_generic_sgt_mk6/spr_generic_sgt_mk6.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"282fff07-a56c-4045-8ba9-50ba49007c35","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"b049956f-a206-4f0e-89b0-a8989e560f2c","path":"sprites/spr_generic_sgt_mk6/spr_generic_sgt_mk6.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"4a5c4b8f-5f6a-4840-82fe-ae6c470cbe6e","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"719f6e69-22d8-4a3a-ab4f-cdd616174b3d","path":"sprites/spr_generic_sgt_mk6/spr_generic_sgt_mk6.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"9e83fe56-93a9-472c-a9e1-1535a32175bf","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"fb3b2bd0-2811-49bd-9c2d-124ff68c3635","path":"sprites/spr_generic_sgt_mk6/spr_generic_sgt_mk6.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"2d0dfab9-7210-42a2-9f17-299cfd354675","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_generic_sgt_mk7/spr_generic_sgt_mk7.yy b/sprites/spr_generic_sgt_mk7/spr_generic_sgt_mk7.yy index a6375c6522..849bc33ab3 100644 --- a/sprites/spr_generic_sgt_mk7/spr_generic_sgt_mk7.yy +++ b/sprites/spr_generic_sgt_mk7/spr_generic_sgt_mk7.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_generic_sgt_mk7", "bboxMode":0, "bbox_bottom":44, @@ -12,10 +12,10 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"c0587aa8-6da1-4dec-bfc5-f60450d6f8b3","name":"c0587aa8-6da1-4dec-bfc5-f60450d6f8b3","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"253a151e-70ab-45ce-ad6f-6b7dbd4afea8","name":"253a151e-70ab-45ce-ad6f-6b7dbd4afea8","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"338f26c9-72be-4747-9d28-04bd5aa14d34","name":"338f26c9-72be-4747-9d28-04bd5aa14d34","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"8ee8ae6f-96a8-4fda-ab6a-51e2591df77a","name":"8ee8ae6f-96a8-4fda-ab6a-51e2591df77a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"c0587aa8-6da1-4dec-bfc5-f60450d6f8b3","name":"c0587aa8-6da1-4dec-bfc5-f60450d6f8b3","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"253a151e-70ab-45ce-ad6f-6b7dbd4afea8","name":"253a151e-70ab-45ce-ad6f-6b7dbd4afea8","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"338f26c9-72be-4747-9d28-04bd5aa14d34","name":"338f26c9-72be-4747-9d28-04bd5aa14d34","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"8ee8ae6f-96a8-4fda-ab6a-51e2591df77a","name":"8ee8ae6f-96a8-4fda-ab6a-51e2591df77a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -71,18 +71,10 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"c0587aa8-6da1-4dec-bfc5-f60450d6f8b3","path":"sprites/spr_generic_sgt_mk7/spr_generic_sgt_mk7.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"0c3b67ba-1b77-4057-8c08-116efd008557","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"253a151e-70ab-45ce-ad6f-6b7dbd4afea8","path":"sprites/spr_generic_sgt_mk7/spr_generic_sgt_mk7.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"10a73f48-bf94-4d68-a6ba-796328bc9468","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"338f26c9-72be-4747-9d28-04bd5aa14d34","path":"sprites/spr_generic_sgt_mk7/spr_generic_sgt_mk7.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"15f3b232-4e61-44bd-81bc-8db8deeaf9c7","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"8ee8ae6f-96a8-4fda-ab6a-51e2591df77a","path":"sprites/spr_generic_sgt_mk7/spr_generic_sgt_mk7.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"95fce0de-01d0-427d-b459-9896ef7ca6a8","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"c0587aa8-6da1-4dec-bfc5-f60450d6f8b3","path":"sprites/spr_generic_sgt_mk7/spr_generic_sgt_mk7.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"0c3b67ba-1b77-4057-8c08-116efd008557","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"253a151e-70ab-45ce-ad6f-6b7dbd4afea8","path":"sprites/spr_generic_sgt_mk7/spr_generic_sgt_mk7.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"10a73f48-bf94-4d68-a6ba-796328bc9468","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"338f26c9-72be-4747-9d28-04bd5aa14d34","path":"sprites/spr_generic_sgt_mk7/spr_generic_sgt_mk7.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"15f3b232-4e61-44bd-81bc-8db8deeaf9c7","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"8ee8ae6f-96a8-4fda-ab6a-51e2591df77a","path":"sprites/spr_generic_sgt_mk7/spr_generic_sgt_mk7.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"95fce0de-01d0-427d-b459-9896ef7ca6a8","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_generic_sgt_mk8/spr_generic_sgt_mk8.yy b/sprites/spr_generic_sgt_mk8/spr_generic_sgt_mk8.yy index fe93a50a38..5f0fb069ac 100644 --- a/sprites/spr_generic_sgt_mk8/spr_generic_sgt_mk8.yy +++ b/sprites/spr_generic_sgt_mk8/spr_generic_sgt_mk8.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_generic_sgt_mk8", "bboxMode":0, "bbox_bottom":38, @@ -12,10 +12,10 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"c0587aa8-6da1-4dec-bfc5-f60450d6f8b3","name":"c0587aa8-6da1-4dec-bfc5-f60450d6f8b3","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"253a151e-70ab-45ce-ad6f-6b7dbd4afea8","name":"253a151e-70ab-45ce-ad6f-6b7dbd4afea8","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"338f26c9-72be-4747-9d28-04bd5aa14d34","name":"338f26c9-72be-4747-9d28-04bd5aa14d34","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"8ee8ae6f-96a8-4fda-ab6a-51e2591df77a","name":"8ee8ae6f-96a8-4fda-ab6a-51e2591df77a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"c0587aa8-6da1-4dec-bfc5-f60450d6f8b3","name":"c0587aa8-6da1-4dec-bfc5-f60450d6f8b3","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"253a151e-70ab-45ce-ad6f-6b7dbd4afea8","name":"253a151e-70ab-45ce-ad6f-6b7dbd4afea8","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"338f26c9-72be-4747-9d28-04bd5aa14d34","name":"338f26c9-72be-4747-9d28-04bd5aa14d34","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"8ee8ae6f-96a8-4fda-ab6a-51e2591df77a","name":"8ee8ae6f-96a8-4fda-ab6a-51e2591df77a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -71,18 +71,10 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"c0587aa8-6da1-4dec-bfc5-f60450d6f8b3","path":"sprites/spr_generic_sgt_mk8/spr_generic_sgt_mk8.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"afed0983-ac24-4636-8ae7-bd6b7a5dd3eb","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"253a151e-70ab-45ce-ad6f-6b7dbd4afea8","path":"sprites/spr_generic_sgt_mk8/spr_generic_sgt_mk8.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"b1bcb94b-074f-4058-b0a0-8a9821d76426","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"338f26c9-72be-4747-9d28-04bd5aa14d34","path":"sprites/spr_generic_sgt_mk8/spr_generic_sgt_mk8.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"f9d9b87b-7b58-4264-bede-ec8af0948dcb","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"8ee8ae6f-96a8-4fda-ab6a-51e2591df77a","path":"sprites/spr_generic_sgt_mk8/spr_generic_sgt_mk8.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"9a1f0377-1634-4668-8cbf-80e38851a8c1","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"c0587aa8-6da1-4dec-bfc5-f60450d6f8b3","path":"sprites/spr_generic_sgt_mk8/spr_generic_sgt_mk8.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"afed0983-ac24-4636-8ae7-bd6b7a5dd3eb","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"253a151e-70ab-45ce-ad6f-6b7dbd4afea8","path":"sprites/spr_generic_sgt_mk8/spr_generic_sgt_mk8.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"b1bcb94b-074f-4058-b0a0-8a9821d76426","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"338f26c9-72be-4747-9d28-04bd5aa14d34","path":"sprites/spr_generic_sgt_mk8/spr_generic_sgt_mk8.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"f9d9b87b-7b58-4264-bede-ec8af0948dcb","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"8ee8ae6f-96a8-4fda-ab6a-51e2591df77a","path":"sprites/spr_generic_sgt_mk8/spr_generic_sgt_mk8.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"9a1f0377-1634-4668-8cbf-80e38851a8c1","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_generic_terminator_sgt/spr_generic_terminator_sgt.yy b/sprites/spr_generic_terminator_sgt/spr_generic_terminator_sgt.yy index 26a1d7935e..720feb2b4c 100644 --- a/sprites/spr_generic_terminator_sgt/spr_generic_terminator_sgt.yy +++ b/sprites/spr_generic_terminator_sgt/spr_generic_terminator_sgt.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_generic_terminator_sgt", "bboxMode":0, "bbox_bottom":88, @@ -12,10 +12,10 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"f0b4faaf-5213-4148-9d9c-f6da2bed200e","name":"f0b4faaf-5213-4148-9d9c-f6da2bed200e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"9f2c3af3-6b8d-444a-8c69-497f48dcfe83","name":"9f2c3af3-6b8d-444a-8c69-497f48dcfe83","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"e3617c3e-e674-42da-8f90-9aec47330e26","name":"e3617c3e-e674-42da-8f90-9aec47330e26","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"5cba2713-473a-411e-a40b-a7df58ed2a51","name":"5cba2713-473a-411e-a40b-a7df58ed2a51","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"f0b4faaf-5213-4148-9d9c-f6da2bed200e","name":"f0b4faaf-5213-4148-9d9c-f6da2bed200e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"9f2c3af3-6b8d-444a-8c69-497f48dcfe83","name":"9f2c3af3-6b8d-444a-8c69-497f48dcfe83","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"e3617c3e-e674-42da-8f90-9aec47330e26","name":"e3617c3e-e674-42da-8f90-9aec47330e26","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"5cba2713-473a-411e-a40b-a7df58ed2a51","name":"5cba2713-473a-411e-a40b-a7df58ed2a51","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -71,18 +71,10 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"f0b4faaf-5213-4148-9d9c-f6da2bed200e","path":"sprites/spr_generic_terminator_sgt/spr_generic_terminator_sgt.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"205ae050-2827-43b3-83f8-260a37cf51ec","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"9f2c3af3-6b8d-444a-8c69-497f48dcfe83","path":"sprites/spr_generic_terminator_sgt/spr_generic_terminator_sgt.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"6a03d1e4-27c9-4ac7-a6c8-c9c473a7909f","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"e3617c3e-e674-42da-8f90-9aec47330e26","path":"sprites/spr_generic_terminator_sgt/spr_generic_terminator_sgt.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"1bccdd95-8e5b-4499-ab2d-6e379b86f0a4","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"5cba2713-473a-411e-a40b-a7df58ed2a51","path":"sprites/spr_generic_terminator_sgt/spr_generic_terminator_sgt.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"5c7eb130-195d-4ae5-815d-826040a80aa9","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"f0b4faaf-5213-4148-9d9c-f6da2bed200e","path":"sprites/spr_generic_terminator_sgt/spr_generic_terminator_sgt.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"205ae050-2827-43b3-83f8-260a37cf51ec","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"9f2c3af3-6b8d-444a-8c69-497f48dcfe83","path":"sprites/spr_generic_terminator_sgt/spr_generic_terminator_sgt.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"6a03d1e4-27c9-4ac7-a6c8-c9c473a7909f","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"e3617c3e-e674-42da-8f90-9aec47330e26","path":"sprites/spr_generic_terminator_sgt/spr_generic_terminator_sgt.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"1bccdd95-8e5b-4499-ab2d-6e379b86f0a4","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"5cba2713-473a-411e-a40b-a7df58ed2a51","path":"sprites/spr_generic_terminator_sgt/spr_generic_terminator_sgt.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"5c7eb130-195d-4ae5-815d-826040a80aa9","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_gladiator_crest/spr_gladiator_crest.yy b/sprites/spr_gladiator_crest/spr_gladiator_crest.yy index 3e16f75b9e..801c83c38f 100644 --- a/sprites/spr_gladiator_crest/spr_gladiator_crest.yy +++ b/sprites/spr_gladiator_crest/spr_gladiator_crest.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_gladiator_crest", "bboxMode":0, "bbox_bottom":70, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"ff8c3aa8-dc36-45e8-b043-45038d329396","name":"ff8c3aa8-dc36-45e8-b043-45038d329396","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"ff8c3aa8-dc36-45e8-b043-45038d329396","name":"ff8c3aa8-dc36-45e8-b043-45038d329396","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"ff8c3aa8-dc36-45e8-b043-45038d329396","path":"sprites/spr_gladiator_crest/spr_gladiator_crest.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"9b14dec7-6f59-49b0-8561-5319c7501f32","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"ff8c3aa8-dc36-45e8-b043-45038d329396","path":"sprites/spr_gladiator_crest/spr_gladiator_crest.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"9b14dec7-6f59-49b0-8561-5319c7501f32","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_glob/spr_glob.yy b/sprites/spr_glob/spr_glob.yy index dd2b112d92..30b8a12225 100644 --- a/sprites/spr_glob/spr_glob.yy +++ b/sprites/spr_glob/spr_glob.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_glob", "bboxMode":0, "bbox_bottom":6, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"94125f36-c928-402d-a8e7-3cbca709e174","name":"94125f36-c928-402d-a8e7-3cbca709e174","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"94125f36-c928-402d-a8e7-3cbca709e174","name":"94125f36-c928-402d-a8e7-3cbca709e174","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"94125f36-c928-402d-a8e7-3cbca709e174","path":"sprites/spr_glob/spr_glob.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"80196786-2c38-4868-9fe7-eb855f01c0f8","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"94125f36-c928-402d-a8e7-3cbca709e174","path":"sprites/spr_glob/spr_glob.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"80196786-2c38-4868-9fe7-eb855f01c0f8","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":{ diff --git a/sprites/spr_gothic_numbers_right_pauldron/spr_gothic_numbers_right_pauldron.yy b/sprites/spr_gothic_numbers_right_pauldron/spr_gothic_numbers_right_pauldron.yy index 69a0e0924a..afacf47b11 100644 --- a/sprites/spr_gothic_numbers_right_pauldron/spr_gothic_numbers_right_pauldron.yy +++ b/sprites/spr_gothic_numbers_right_pauldron/spr_gothic_numbers_right_pauldron.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_gothic_numbers_right_pauldron", "bboxMode":0, "bbox_bottom":65, @@ -12,17 +12,17 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"6d7d679d-aab5-41ff-8fe1-9e09cc803a4b","name":"6d7d679d-aab5-41ff-8fe1-9e09cc803a4b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"87e5fd39-f168-48c2-a276-31cf1b797199","name":"87e5fd39-f168-48c2-a276-31cf1b797199","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"154a4f6a-289b-47cb-8019-3f84d8764a8a","name":"154a4f6a-289b-47cb-8019-3f84d8764a8a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"f791d4dd-cc2d-41b7-affd-23a72b4771f0","name":"f791d4dd-cc2d-41b7-affd-23a72b4771f0","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"5033b836-0568-4d4c-b81a-99fe09e568a2","name":"5033b836-0568-4d4c-b81a-99fe09e568a2","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"21bf7334-e7e2-4144-a2a6-612ffdd217c0","name":"21bf7334-e7e2-4144-a2a6-612ffdd217c0","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"ad45a4b8-613b-40d8-bae5-3f5ab7644996","name":"ad45a4b8-613b-40d8-bae5-3f5ab7644996","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"70c94ec1-c0c7-4165-a387-8bce0f626fd9","name":"70c94ec1-c0c7-4165-a387-8bce0f626fd9","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"cab768a9-5d1c-4f18-8f20-53214419c9f8","name":"cab768a9-5d1c-4f18-8f20-53214419c9f8","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"da9a8b66-05d9-4947-9787-cae8b9015321","name":"da9a8b66-05d9-4947-9787-cae8b9015321","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"666fe5ca-6935-4698-a369-b7b96ff5e47d","name":"666fe5ca-6935-4698-a369-b7b96ff5e47d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"6d7d679d-aab5-41ff-8fe1-9e09cc803a4b","name":"6d7d679d-aab5-41ff-8fe1-9e09cc803a4b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"87e5fd39-f168-48c2-a276-31cf1b797199","name":"87e5fd39-f168-48c2-a276-31cf1b797199","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"154a4f6a-289b-47cb-8019-3f84d8764a8a","name":"154a4f6a-289b-47cb-8019-3f84d8764a8a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"f791d4dd-cc2d-41b7-affd-23a72b4771f0","name":"f791d4dd-cc2d-41b7-affd-23a72b4771f0","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"5033b836-0568-4d4c-b81a-99fe09e568a2","name":"5033b836-0568-4d4c-b81a-99fe09e568a2","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"21bf7334-e7e2-4144-a2a6-612ffdd217c0","name":"21bf7334-e7e2-4144-a2a6-612ffdd217c0","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"ad45a4b8-613b-40d8-bae5-3f5ab7644996","name":"ad45a4b8-613b-40d8-bae5-3f5ab7644996","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"70c94ec1-c0c7-4165-a387-8bce0f626fd9","name":"70c94ec1-c0c7-4165-a387-8bce0f626fd9","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"cab768a9-5d1c-4f18-8f20-53214419c9f8","name":"cab768a9-5d1c-4f18-8f20-53214419c9f8","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"da9a8b66-05d9-4947-9787-cae8b9015321","name":"da9a8b66-05d9-4947-9787-cae8b9015321","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"666fe5ca-6935-4698-a369-b7b96ff5e47d","name":"666fe5ca-6935-4698-a369-b7b96ff5e47d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -78,39 +78,17 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"6d7d679d-aab5-41ff-8fe1-9e09cc803a4b","path":"sprites/spr_gothic_numbers_right_pauldron/spr_gothic_numbers_right_pauldron.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"0e8f2da6-4c4a-4e13-821d-699b0e5f5e6d","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"87e5fd39-f168-48c2-a276-31cf1b797199","path":"sprites/spr_gothic_numbers_right_pauldron/spr_gothic_numbers_right_pauldron.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"6aac9d83-a704-44dd-acc9-c66ceb93e2c2","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"154a4f6a-289b-47cb-8019-3f84d8764a8a","path":"sprites/spr_gothic_numbers_right_pauldron/spr_gothic_numbers_right_pauldron.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"d41ebca2-1e7a-4bfb-9ce1-0b68abced744","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"f791d4dd-cc2d-41b7-affd-23a72b4771f0","path":"sprites/spr_gothic_numbers_right_pauldron/spr_gothic_numbers_right_pauldron.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"b14dbd68-c1b6-4987-8559-ea45895073a6","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"5033b836-0568-4d4c-b81a-99fe09e568a2","path":"sprites/spr_gothic_numbers_right_pauldron/spr_gothic_numbers_right_pauldron.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"d75f6766-3b0f-4a70-a35a-c9a7c72e1896","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"21bf7334-e7e2-4144-a2a6-612ffdd217c0","path":"sprites/spr_gothic_numbers_right_pauldron/spr_gothic_numbers_right_pauldron.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"eec4d90e-c9c8-4bca-97ae-b61579e5d9ed","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"ad45a4b8-613b-40d8-bae5-3f5ab7644996","path":"sprites/spr_gothic_numbers_right_pauldron/spr_gothic_numbers_right_pauldron.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"bc1805dc-a620-4133-b267-e9fb9480a8d7","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"70c94ec1-c0c7-4165-a387-8bce0f626fd9","path":"sprites/spr_gothic_numbers_right_pauldron/spr_gothic_numbers_right_pauldron.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"86664de9-14af-4223-aa04-76d40612f5fb","IsCreationKey":false,"Key":7.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"cab768a9-5d1c-4f18-8f20-53214419c9f8","path":"sprites/spr_gothic_numbers_right_pauldron/spr_gothic_numbers_right_pauldron.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"de02452f-ee8f-49c4-8a45-db6793a11b9a","IsCreationKey":false,"Key":8.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"da9a8b66-05d9-4947-9787-cae8b9015321","path":"sprites/spr_gothic_numbers_right_pauldron/spr_gothic_numbers_right_pauldron.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"94b419a4-05ae-413a-a175-9a6cdd69232b","IsCreationKey":false,"Key":9.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"666fe5ca-6935-4698-a369-b7b96ff5e47d","path":"sprites/spr_gothic_numbers_right_pauldron/spr_gothic_numbers_right_pauldron.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"97cf6ab4-2cb9-4a8e-9831-3ad6b5e8dfa8","IsCreationKey":false,"Key":10.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"6d7d679d-aab5-41ff-8fe1-9e09cc803a4b","path":"sprites/spr_gothic_numbers_right_pauldron/spr_gothic_numbers_right_pauldron.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"0e8f2da6-4c4a-4e13-821d-699b0e5f5e6d","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"87e5fd39-f168-48c2-a276-31cf1b797199","path":"sprites/spr_gothic_numbers_right_pauldron/spr_gothic_numbers_right_pauldron.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"6aac9d83-a704-44dd-acc9-c66ceb93e2c2","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"154a4f6a-289b-47cb-8019-3f84d8764a8a","path":"sprites/spr_gothic_numbers_right_pauldron/spr_gothic_numbers_right_pauldron.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"d41ebca2-1e7a-4bfb-9ce1-0b68abced744","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"f791d4dd-cc2d-41b7-affd-23a72b4771f0","path":"sprites/spr_gothic_numbers_right_pauldron/spr_gothic_numbers_right_pauldron.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"b14dbd68-c1b6-4987-8559-ea45895073a6","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"5033b836-0568-4d4c-b81a-99fe09e568a2","path":"sprites/spr_gothic_numbers_right_pauldron/spr_gothic_numbers_right_pauldron.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"d75f6766-3b0f-4a70-a35a-c9a7c72e1896","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"21bf7334-e7e2-4144-a2a6-612ffdd217c0","path":"sprites/spr_gothic_numbers_right_pauldron/spr_gothic_numbers_right_pauldron.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"eec4d90e-c9c8-4bca-97ae-b61579e5d9ed","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"ad45a4b8-613b-40d8-bae5-3f5ab7644996","path":"sprites/spr_gothic_numbers_right_pauldron/spr_gothic_numbers_right_pauldron.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"bc1805dc-a620-4133-b267-e9fb9480a8d7","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"70c94ec1-c0c7-4165-a387-8bce0f626fd9","path":"sprites/spr_gothic_numbers_right_pauldron/spr_gothic_numbers_right_pauldron.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"86664de9-14af-4223-aa04-76d40612f5fb","IsCreationKey":false,"Key":7.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"cab768a9-5d1c-4f18-8f20-53214419c9f8","path":"sprites/spr_gothic_numbers_right_pauldron/spr_gothic_numbers_right_pauldron.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"de02452f-ee8f-49c4-8a45-db6793a11b9a","IsCreationKey":false,"Key":8.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"da9a8b66-05d9-4947-9787-cae8b9015321","path":"sprites/spr_gothic_numbers_right_pauldron/spr_gothic_numbers_right_pauldron.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"94b419a4-05ae-413a-a175-9a6cdd69232b","IsCreationKey":false,"Key":9.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"666fe5ca-6935-4698-a369-b7b96ff5e47d","path":"sprites/spr_gothic_numbers_right_pauldron/spr_gothic_numbers_right_pauldron.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"97cf6ab4-2cb9-4a8e-9831-3ad6b5e8dfa8","IsCreationKey":false,"Key":10.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_green_las/spr_green_las.yy b/sprites/spr_green_las/spr_green_las.yy index 0f813ace20..7c98e3a1ed 100644 --- a/sprites/spr_green_las/spr_green_las.yy +++ b/sprites/spr_green_las/spr_green_las.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_green_las", "bboxMode":0, "bbox_bottom":1, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"229a045c-fa9a-4530-ba19-5266f3d1ebac","name":"229a045c-fa9a-4530-ba19-5266f3d1ebac","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"229a045c-fa9a-4530-ba19-5266f3d1ebac","name":"229a045c-fa9a-4530-ba19-5266f3d1ebac","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"229a045c-fa9a-4530-ba19-5266f3d1ebac","path":"sprites/spr_green_las/spr_green_las.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"5b611c7a-0b17-4060-94b2-33aaf44deca6","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"229a045c-fa9a-4530-ba19-5266f3d1ebac","path":"sprites/spr_green_las/spr_green_las.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"5b611c7a-0b17-4060-94b2-33aaf44deca6","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":{ diff --git a/sprites/spr_ground_conv/spr_ground_conv.yy b/sprites/spr_ground_conv/spr_ground_conv.yy index b72e0d7601..a83983405c 100644 --- a/sprites/spr_ground_conv/spr_ground_conv.yy +++ b/sprites/spr_ground_conv/spr_ground_conv.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_ground_conv", "bboxMode":0, "bbox_bottom":2, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"8bfd4089-9d50-4d68-9407-3a9333e6a77c","name":"8bfd4089-9d50-4d68-9407-3a9333e6a77c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"8bfd4089-9d50-4d68-9407-3a9333e6a77c","name":"8bfd4089-9d50-4d68-9407-3a9333e6a77c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"8bfd4089-9d50-4d68-9407-3a9333e6a77c","path":"sprites/spr_ground_conv/spr_ground_conv.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"ea315c54-c59c-4101-82ca-8cc522b67181","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"8bfd4089-9d50-4d68-9407-3a9333e6a77c","path":"sprites/spr_ground_conv/spr_ground_conv.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"ea315c54-c59c-4101-82ca-8cc522b67181","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":{ diff --git a/sprites/spr_ground_las/spr_ground_las.yy b/sprites/spr_ground_las/spr_ground_las.yy index 33bded8a6f..7533cf3ba3 100644 --- a/sprites/spr_ground_las/spr_ground_las.yy +++ b/sprites/spr_ground_las/spr_ground_las.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_ground_las", "bboxMode":0, "bbox_bottom":1, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"00caeb86-8fdb-40c5-913b-2403cc17e78e","name":"00caeb86-8fdb-40c5-913b-2403cc17e78e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"00caeb86-8fdb-40c5-913b-2403cc17e78e","name":"00caeb86-8fdb-40c5-913b-2403cc17e78e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"00caeb86-8fdb-40c5-913b-2403cc17e78e","path":"sprites/spr_ground_las/spr_ground_las.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"63b90f58-443f-48cf-a161-19699769319a","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"00caeb86-8fdb-40c5-913b-2403cc17e78e","path":"sprites/spr_ground_las/spr_ground_las.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"63b90f58-443f-48cf-a161-19699769319a","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":{ diff --git a/sprites/spr_ground_plasma/spr_ground_plasma.yy b/sprites/spr_ground_plasma/spr_ground_plasma.yy index f314a224e8..05126e1263 100644 --- a/sprites/spr_ground_plasma/spr_ground_plasma.yy +++ b/sprites/spr_ground_plasma/spr_ground_plasma.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_ground_plasma", "bboxMode":0, "bbox_bottom":4, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"f2e82585-0d36-4633-a1eb-8f7346d137fb","name":"f2e82585-0d36-4633-a1eb-8f7346d137fb","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"f2e82585-0d36-4633-a1eb-8f7346d137fb","name":"f2e82585-0d36-4633-a1eb-8f7346d137fb","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"f2e82585-0d36-4633-a1eb-8f7346d137fb","path":"sprites/spr_ground_plasma/spr_ground_plasma.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"09513bc0-464f-4962-83e5-0b1bcca916ef","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"f2e82585-0d36-4633-a1eb-8f7346d137fb","path":"sprites/spr_ground_plasma/spr_ground_plasma.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"09513bc0-464f-4962-83e5-0b1bcca916ef","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":{ diff --git a/sprites/spr_happenings_blue/spr_happenings_blue.yy b/sprites/spr_happenings_blue/spr_happenings_blue.yy index cd2130b81c..fb0cdf17bc 100644 --- a/sprites/spr_happenings_blue/spr_happenings_blue.yy +++ b/sprites/spr_happenings_blue/spr_happenings_blue.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_happenings_blue", "bboxMode":0, "bbox_bottom":26, @@ -12,32 +12,32 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"11016106-3e26-4d00-8fbe-bc2dc3c9ac6b","name":"11016106-3e26-4d00-8fbe-bc2dc3c9ac6b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"6df35a32-cf5a-4810-89ae-6ef93614d26b","name":"6df35a32-cf5a-4810-89ae-6ef93614d26b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"e4334ed3-47d0-444b-887e-5cd19ab651c6","name":"e4334ed3-47d0-444b-887e-5cd19ab651c6","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"398323a5-85ff-465f-8aeb-f070a17fcf79","name":"398323a5-85ff-465f-8aeb-f070a17fcf79","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"12c01e65-b298-4648-a16f-47fb4e9072e9","name":"12c01e65-b298-4648-a16f-47fb4e9072e9","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"873b5ead-4f37-40c8-b996-1ffa989d9193","name":"873b5ead-4f37-40c8-b996-1ffa989d9193","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"d285d9fc-0157-4ebe-ad26-c057de3b0a5f","name":"d285d9fc-0157-4ebe-ad26-c057de3b0a5f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"be15ad6b-c337-4cb2-88e3-8dfb5183b43b","name":"be15ad6b-c337-4cb2-88e3-8dfb5183b43b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"e7d6b571-b227-4ee2-9b4d-d766264df92f","name":"e7d6b571-b227-4ee2-9b4d-d766264df92f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"c5e02804-71c1-4bae-a691-298c956dce73","name":"c5e02804-71c1-4bae-a691-298c956dce73","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"7f2c7a8f-f1b1-46ac-8192-695dbc176ca7","name":"7f2c7a8f-f1b1-46ac-8192-695dbc176ca7","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"4b3af7e1-e51e-4287-a286-27e2b4d143ac","name":"4b3af7e1-e51e-4287-a286-27e2b4d143ac","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"337ce7db-005f-4394-bd10-38ae46363ea5","name":"337ce7db-005f-4394-bd10-38ae46363ea5","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"e3940c17-adb9-42c5-84c9-24de4c8b3248","name":"e3940c17-adb9-42c5-84c9-24de4c8b3248","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"425b0eea-3478-4049-8d47-836d531fa61e","name":"425b0eea-3478-4049-8d47-836d531fa61e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"2a6992be-ba21-4b46-a8cb-a3624afa6c15","name":"2a6992be-ba21-4b46-a8cb-a3624afa6c15","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"b742df01-f74f-47fd-adee-ca128d96d708","name":"b742df01-f74f-47fd-adee-ca128d96d708","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"cd7b33c0-cca2-41e6-9b57-4f44e210e3c3","name":"cd7b33c0-cca2-41e6-9b57-4f44e210e3c3","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"143a040c-c4ff-4bf9-9fd8-b84ae31d7e60","name":"143a040c-c4ff-4bf9-9fd8-b84ae31d7e60","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"06ce9b5b-bae9-45d5-a804-922b0946ef99","name":"06ce9b5b-bae9-45d5-a804-922b0946ef99","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"f03de3cc-bbba-4621-9b1b-f317c7c3b7f6","name":"f03de3cc-bbba-4621-9b1b-f317c7c3b7f6","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"79399347-d2ec-4a18-b332-b3f521b3e350","name":"79399347-d2ec-4a18-b332-b3f521b3e350","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"67fa920f-1a24-4316-80ad-e80e670533e6","name":"67fa920f-1a24-4316-80ad-e80e670533e6","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"f2b7eb36-0918-4bdb-acae-31ffcdf54301","name":"f2b7eb36-0918-4bdb-acae-31ffcdf54301","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"5bb5e8c1-0b8a-4946-a411-0dd47f27b265","name":"5bb5e8c1-0b8a-4946-a411-0dd47f27b265","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"156546e5-1266-4235-97b9-320f5e6c04f7","name":"156546e5-1266-4235-97b9-320f5e6c04f7","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"11016106-3e26-4d00-8fbe-bc2dc3c9ac6b","name":"11016106-3e26-4d00-8fbe-bc2dc3c9ac6b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"6df35a32-cf5a-4810-89ae-6ef93614d26b","name":"6df35a32-cf5a-4810-89ae-6ef93614d26b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"e4334ed3-47d0-444b-887e-5cd19ab651c6","name":"e4334ed3-47d0-444b-887e-5cd19ab651c6","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"398323a5-85ff-465f-8aeb-f070a17fcf79","name":"398323a5-85ff-465f-8aeb-f070a17fcf79","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"12c01e65-b298-4648-a16f-47fb4e9072e9","name":"12c01e65-b298-4648-a16f-47fb4e9072e9","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"873b5ead-4f37-40c8-b996-1ffa989d9193","name":"873b5ead-4f37-40c8-b996-1ffa989d9193","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"d285d9fc-0157-4ebe-ad26-c057de3b0a5f","name":"d285d9fc-0157-4ebe-ad26-c057de3b0a5f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"be15ad6b-c337-4cb2-88e3-8dfb5183b43b","name":"be15ad6b-c337-4cb2-88e3-8dfb5183b43b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"e7d6b571-b227-4ee2-9b4d-d766264df92f","name":"e7d6b571-b227-4ee2-9b4d-d766264df92f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"c5e02804-71c1-4bae-a691-298c956dce73","name":"c5e02804-71c1-4bae-a691-298c956dce73","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"7f2c7a8f-f1b1-46ac-8192-695dbc176ca7","name":"7f2c7a8f-f1b1-46ac-8192-695dbc176ca7","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"4b3af7e1-e51e-4287-a286-27e2b4d143ac","name":"4b3af7e1-e51e-4287-a286-27e2b4d143ac","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"337ce7db-005f-4394-bd10-38ae46363ea5","name":"337ce7db-005f-4394-bd10-38ae46363ea5","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"e3940c17-adb9-42c5-84c9-24de4c8b3248","name":"e3940c17-adb9-42c5-84c9-24de4c8b3248","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"425b0eea-3478-4049-8d47-836d531fa61e","name":"425b0eea-3478-4049-8d47-836d531fa61e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"2a6992be-ba21-4b46-a8cb-a3624afa6c15","name":"2a6992be-ba21-4b46-a8cb-a3624afa6c15","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"b742df01-f74f-47fd-adee-ca128d96d708","name":"b742df01-f74f-47fd-adee-ca128d96d708","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"cd7b33c0-cca2-41e6-9b57-4f44e210e3c3","name":"cd7b33c0-cca2-41e6-9b57-4f44e210e3c3","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"143a040c-c4ff-4bf9-9fd8-b84ae31d7e60","name":"143a040c-c4ff-4bf9-9fd8-b84ae31d7e60","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"06ce9b5b-bae9-45d5-a804-922b0946ef99","name":"06ce9b5b-bae9-45d5-a804-922b0946ef99","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"f03de3cc-bbba-4621-9b1b-f317c7c3b7f6","name":"f03de3cc-bbba-4621-9b1b-f317c7c3b7f6","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"79399347-d2ec-4a18-b332-b3f521b3e350","name":"79399347-d2ec-4a18-b332-b3f521b3e350","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"67fa920f-1a24-4316-80ad-e80e670533e6","name":"67fa920f-1a24-4316-80ad-e80e670533e6","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"f2b7eb36-0918-4bdb-acae-31ffcdf54301","name":"f2b7eb36-0918-4bdb-acae-31ffcdf54301","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"5bb5e8c1-0b8a-4946-a411-0dd47f27b265","name":"5bb5e8c1-0b8a-4946-a411-0dd47f27b265","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"156546e5-1266-4235-97b9-320f5e6c04f7","name":"156546e5-1266-4235-97b9-320f5e6c04f7","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -93,84 +93,32 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"11016106-3e26-4d00-8fbe-bc2dc3c9ac6b","path":"sprites/spr_happenings_blue/spr_happenings_blue.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"8630044a-2c21-4a9e-a95f-1613546d93cc","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"6df35a32-cf5a-4810-89ae-6ef93614d26b","path":"sprites/spr_happenings_blue/spr_happenings_blue.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"3ecc01ce-e9dc-430c-8376-3735a9d69ff3","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"e4334ed3-47d0-444b-887e-5cd19ab651c6","path":"sprites/spr_happenings_blue/spr_happenings_blue.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"b3680579-0a21-439f-b143-13defbc8b5a5","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"398323a5-85ff-465f-8aeb-f070a17fcf79","path":"sprites/spr_happenings_blue/spr_happenings_blue.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"54d24c23-94d9-4b6e-a0f8-9258e797b2bc","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"12c01e65-b298-4648-a16f-47fb4e9072e9","path":"sprites/spr_happenings_blue/spr_happenings_blue.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"786fb1c2-ee0d-4b9f-810e-ccd2154aa8ea","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"873b5ead-4f37-40c8-b996-1ffa989d9193","path":"sprites/spr_happenings_blue/spr_happenings_blue.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"51d3ef1a-4578-4542-8abb-758d1eceac9b","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"d285d9fc-0157-4ebe-ad26-c057de3b0a5f","path":"sprites/spr_happenings_blue/spr_happenings_blue.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"db1f4c2a-b2bf-4cbc-a59a-689167d7cad9","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"be15ad6b-c337-4cb2-88e3-8dfb5183b43b","path":"sprites/spr_happenings_blue/spr_happenings_blue.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"c91c1690-a0c8-4fa6-a36c-e6ea3fccae2d","IsCreationKey":false,"Key":7.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"e7d6b571-b227-4ee2-9b4d-d766264df92f","path":"sprites/spr_happenings_blue/spr_happenings_blue.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"bcbd78fa-2746-4204-ac4a-4e607838beff","IsCreationKey":false,"Key":8.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"c5e02804-71c1-4bae-a691-298c956dce73","path":"sprites/spr_happenings_blue/spr_happenings_blue.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"5d24ec6f-1fa8-4ee3-96e8-d7586529bfa0","IsCreationKey":false,"Key":9.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"7f2c7a8f-f1b1-46ac-8192-695dbc176ca7","path":"sprites/spr_happenings_blue/spr_happenings_blue.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"5effc3bf-d1bc-4ba0-9c17-b30c871b8119","IsCreationKey":false,"Key":10.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"4b3af7e1-e51e-4287-a286-27e2b4d143ac","path":"sprites/spr_happenings_blue/spr_happenings_blue.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"2ccfb57a-950d-4e38-96ed-5a25116a2836","IsCreationKey":false,"Key":11.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"337ce7db-005f-4394-bd10-38ae46363ea5","path":"sprites/spr_happenings_blue/spr_happenings_blue.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"bf3031aa-f6ca-4d6b-b74a-229a5dbde8e8","IsCreationKey":false,"Key":12.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"e3940c17-adb9-42c5-84c9-24de4c8b3248","path":"sprites/spr_happenings_blue/spr_happenings_blue.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"34f983fd-1955-4b75-bbbd-f8216219604c","IsCreationKey":false,"Key":13.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"425b0eea-3478-4049-8d47-836d531fa61e","path":"sprites/spr_happenings_blue/spr_happenings_blue.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"7bbd7dbf-40af-4314-b773-32fe095410d1","IsCreationKey":false,"Key":14.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"2a6992be-ba21-4b46-a8cb-a3624afa6c15","path":"sprites/spr_happenings_blue/spr_happenings_blue.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"7ce0072a-f108-4df4-8ef8-a7bd4d103d69","IsCreationKey":false,"Key":15.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"b742df01-f74f-47fd-adee-ca128d96d708","path":"sprites/spr_happenings_blue/spr_happenings_blue.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"3a275856-0da3-4069-8446-b50868f374dd","IsCreationKey":false,"Key":16.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"cd7b33c0-cca2-41e6-9b57-4f44e210e3c3","path":"sprites/spr_happenings_blue/spr_happenings_blue.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"74b4c830-cc03-4088-8136-b698c868304c","IsCreationKey":false,"Key":17.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"143a040c-c4ff-4bf9-9fd8-b84ae31d7e60","path":"sprites/spr_happenings_blue/spr_happenings_blue.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"04d4884f-23e6-4034-a002-66c2c1e13b25","IsCreationKey":false,"Key":18.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"06ce9b5b-bae9-45d5-a804-922b0946ef99","path":"sprites/spr_happenings_blue/spr_happenings_blue.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"24c45266-51df-4a6e-8394-77882acc7542","IsCreationKey":false,"Key":19.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"f03de3cc-bbba-4621-9b1b-f317c7c3b7f6","path":"sprites/spr_happenings_blue/spr_happenings_blue.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"c9e32754-8d11-438e-a48e-f6fc4dc94818","IsCreationKey":false,"Key":20.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"79399347-d2ec-4a18-b332-b3f521b3e350","path":"sprites/spr_happenings_blue/spr_happenings_blue.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"bf8d3d45-e7b0-41ff-bdf5-bc3d6c82c834","IsCreationKey":false,"Key":21.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"67fa920f-1a24-4316-80ad-e80e670533e6","path":"sprites/spr_happenings_blue/spr_happenings_blue.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"5876f540-45f1-4f85-a52b-d022b55d42db","IsCreationKey":false,"Key":22.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"f2b7eb36-0918-4bdb-acae-31ffcdf54301","path":"sprites/spr_happenings_blue/spr_happenings_blue.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"1125a58a-0ab6-484c-b8c7-75a1044fdd9d","IsCreationKey":false,"Key":23.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"5bb5e8c1-0b8a-4946-a411-0dd47f27b265","path":"sprites/spr_happenings_blue/spr_happenings_blue.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"b03965fd-f705-4b11-ac8d-05787e0e8454","IsCreationKey":false,"Key":24.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"156546e5-1266-4235-97b9-320f5e6c04f7","path":"sprites/spr_happenings_blue/spr_happenings_blue.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"585d085b-6a95-4d15-88a6-4dda3d20cbf2","IsCreationKey":false,"Key":25.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"11016106-3e26-4d00-8fbe-bc2dc3c9ac6b","path":"sprites/spr_happenings_blue/spr_happenings_blue.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"8630044a-2c21-4a9e-a95f-1613546d93cc","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"6df35a32-cf5a-4810-89ae-6ef93614d26b","path":"sprites/spr_happenings_blue/spr_happenings_blue.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"3ecc01ce-e9dc-430c-8376-3735a9d69ff3","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"e4334ed3-47d0-444b-887e-5cd19ab651c6","path":"sprites/spr_happenings_blue/spr_happenings_blue.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"b3680579-0a21-439f-b143-13defbc8b5a5","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"398323a5-85ff-465f-8aeb-f070a17fcf79","path":"sprites/spr_happenings_blue/spr_happenings_blue.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"54d24c23-94d9-4b6e-a0f8-9258e797b2bc","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"12c01e65-b298-4648-a16f-47fb4e9072e9","path":"sprites/spr_happenings_blue/spr_happenings_blue.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"786fb1c2-ee0d-4b9f-810e-ccd2154aa8ea","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"873b5ead-4f37-40c8-b996-1ffa989d9193","path":"sprites/spr_happenings_blue/spr_happenings_blue.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"51d3ef1a-4578-4542-8abb-758d1eceac9b","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"d285d9fc-0157-4ebe-ad26-c057de3b0a5f","path":"sprites/spr_happenings_blue/spr_happenings_blue.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"db1f4c2a-b2bf-4cbc-a59a-689167d7cad9","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"be15ad6b-c337-4cb2-88e3-8dfb5183b43b","path":"sprites/spr_happenings_blue/spr_happenings_blue.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"c91c1690-a0c8-4fa6-a36c-e6ea3fccae2d","IsCreationKey":false,"Key":7.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"e7d6b571-b227-4ee2-9b4d-d766264df92f","path":"sprites/spr_happenings_blue/spr_happenings_blue.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"bcbd78fa-2746-4204-ac4a-4e607838beff","IsCreationKey":false,"Key":8.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"c5e02804-71c1-4bae-a691-298c956dce73","path":"sprites/spr_happenings_blue/spr_happenings_blue.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"5d24ec6f-1fa8-4ee3-96e8-d7586529bfa0","IsCreationKey":false,"Key":9.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"7f2c7a8f-f1b1-46ac-8192-695dbc176ca7","path":"sprites/spr_happenings_blue/spr_happenings_blue.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"5effc3bf-d1bc-4ba0-9c17-b30c871b8119","IsCreationKey":false,"Key":10.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"4b3af7e1-e51e-4287-a286-27e2b4d143ac","path":"sprites/spr_happenings_blue/spr_happenings_blue.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"2ccfb57a-950d-4e38-96ed-5a25116a2836","IsCreationKey":false,"Key":11.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"337ce7db-005f-4394-bd10-38ae46363ea5","path":"sprites/spr_happenings_blue/spr_happenings_blue.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"bf3031aa-f6ca-4d6b-b74a-229a5dbde8e8","IsCreationKey":false,"Key":12.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"e3940c17-adb9-42c5-84c9-24de4c8b3248","path":"sprites/spr_happenings_blue/spr_happenings_blue.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"34f983fd-1955-4b75-bbbd-f8216219604c","IsCreationKey":false,"Key":13.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"425b0eea-3478-4049-8d47-836d531fa61e","path":"sprites/spr_happenings_blue/spr_happenings_blue.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"7bbd7dbf-40af-4314-b773-32fe095410d1","IsCreationKey":false,"Key":14.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"2a6992be-ba21-4b46-a8cb-a3624afa6c15","path":"sprites/spr_happenings_blue/spr_happenings_blue.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"7ce0072a-f108-4df4-8ef8-a7bd4d103d69","IsCreationKey":false,"Key":15.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"b742df01-f74f-47fd-adee-ca128d96d708","path":"sprites/spr_happenings_blue/spr_happenings_blue.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"3a275856-0da3-4069-8446-b50868f374dd","IsCreationKey":false,"Key":16.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"cd7b33c0-cca2-41e6-9b57-4f44e210e3c3","path":"sprites/spr_happenings_blue/spr_happenings_blue.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"74b4c830-cc03-4088-8136-b698c868304c","IsCreationKey":false,"Key":17.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"143a040c-c4ff-4bf9-9fd8-b84ae31d7e60","path":"sprites/spr_happenings_blue/spr_happenings_blue.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"04d4884f-23e6-4034-a002-66c2c1e13b25","IsCreationKey":false,"Key":18.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"06ce9b5b-bae9-45d5-a804-922b0946ef99","path":"sprites/spr_happenings_blue/spr_happenings_blue.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"24c45266-51df-4a6e-8394-77882acc7542","IsCreationKey":false,"Key":19.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"f03de3cc-bbba-4621-9b1b-f317c7c3b7f6","path":"sprites/spr_happenings_blue/spr_happenings_blue.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"c9e32754-8d11-438e-a48e-f6fc4dc94818","IsCreationKey":false,"Key":20.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"79399347-d2ec-4a18-b332-b3f521b3e350","path":"sprites/spr_happenings_blue/spr_happenings_blue.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"bf8d3d45-e7b0-41ff-bdf5-bc3d6c82c834","IsCreationKey":false,"Key":21.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"67fa920f-1a24-4316-80ad-e80e670533e6","path":"sprites/spr_happenings_blue/spr_happenings_blue.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"5876f540-45f1-4f85-a52b-d022b55d42db","IsCreationKey":false,"Key":22.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"f2b7eb36-0918-4bdb-acae-31ffcdf54301","path":"sprites/spr_happenings_blue/spr_happenings_blue.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"1125a58a-0ab6-484c-b8c7-75a1044fdd9d","IsCreationKey":false,"Key":23.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"5bb5e8c1-0b8a-4946-a411-0dd47f27b265","path":"sprites/spr_happenings_blue/spr_happenings_blue.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"b03965fd-f705-4b11-ac8d-05787e0e8454","IsCreationKey":false,"Key":24.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"156546e5-1266-4235-97b9-320f5e6c04f7","path":"sprites/spr_happenings_blue/spr_happenings_blue.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"585d085b-6a95-4d15-88a6-4dda3d20cbf2","IsCreationKey":false,"Key":25.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":{ diff --git a/sprites/spr_happenings_green/spr_happenings_green.yy b/sprites/spr_happenings_green/spr_happenings_green.yy index 0f839e7fcb..0068510186 100644 --- a/sprites/spr_happenings_green/spr_happenings_green.yy +++ b/sprites/spr_happenings_green/spr_happenings_green.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_happenings_green", "bboxMode":0, "bbox_bottom":26, @@ -12,32 +12,32 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"f7eee6f9-a600-4fe7-8ea2-42705c1addc1","name":"f7eee6f9-a600-4fe7-8ea2-42705c1addc1","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"e838345a-58e0-4c27-8ac5-e0293dc62516","name":"e838345a-58e0-4c27-8ac5-e0293dc62516","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"31948616-30f8-49af-aac8-36578e149f6d","name":"31948616-30f8-49af-aac8-36578e149f6d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"93a8b121-857c-436d-80f4-190f9e822d48","name":"93a8b121-857c-436d-80f4-190f9e822d48","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"b18b7461-af7c-46f9-bb4b-908dbf23ee4b","name":"b18b7461-af7c-46f9-bb4b-908dbf23ee4b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"f4eb7e8d-2608-4b34-ab31-05efaf6636fe","name":"f4eb7e8d-2608-4b34-ab31-05efaf6636fe","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"3b34a906-9e51-4d50-890e-c0464cf186c1","name":"3b34a906-9e51-4d50-890e-c0464cf186c1","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"be48cb9e-c609-45fd-84ff-262941825380","name":"be48cb9e-c609-45fd-84ff-262941825380","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"f0523cc9-8bde-42af-ae6d-dfb0486170b1","name":"f0523cc9-8bde-42af-ae6d-dfb0486170b1","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"8df70f45-6df1-4469-8cac-6c18c853c909","name":"8df70f45-6df1-4469-8cac-6c18c853c909","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"b2de682d-52d8-44fa-a041-5b24e23b00c6","name":"b2de682d-52d8-44fa-a041-5b24e23b00c6","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"56e9abd5-a55b-4417-98e1-8ddb4e497854","name":"56e9abd5-a55b-4417-98e1-8ddb4e497854","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"a483d3b7-7327-43ce-bbc0-5782b9e1fc32","name":"a483d3b7-7327-43ce-bbc0-5782b9e1fc32","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"b4d9e078-40b2-468a-8d88-2e7fecf08af4","name":"b4d9e078-40b2-468a-8d88-2e7fecf08af4","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"e48b811b-5351-4a05-9ff3-e22a8a1bf68a","name":"e48b811b-5351-4a05-9ff3-e22a8a1bf68a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"3b0d4742-fe04-4728-a0e6-c25b3972b9de","name":"3b0d4742-fe04-4728-a0e6-c25b3972b9de","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"9d66e71a-806a-4c69-8f85-c61673e764ec","name":"9d66e71a-806a-4c69-8f85-c61673e764ec","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"36f3175c-b588-4d53-9be9-777ea6b2af5f","name":"36f3175c-b588-4d53-9be9-777ea6b2af5f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"d1e4cd4e-c2af-49fe-95a3-0ecdc1958337","name":"d1e4cd4e-c2af-49fe-95a3-0ecdc1958337","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"7d2ada39-7bde-45e5-9bf4-2049b332fbcf","name":"7d2ada39-7bde-45e5-9bf4-2049b332fbcf","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"80e007d2-f590-4e0d-a322-e3a724ad18c3","name":"80e007d2-f590-4e0d-a322-e3a724ad18c3","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"6759d1a5-9c36-4fa0-b87f-0bcba8445559","name":"6759d1a5-9c36-4fa0-b87f-0bcba8445559","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"951b1418-c23f-4741-8e06-4e4fc942ac4b","name":"951b1418-c23f-4741-8e06-4e4fc942ac4b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"93799c01-29ea-4d9e-8f9b-a5a828787de9","name":"93799c01-29ea-4d9e-8f9b-a5a828787de9","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"9faabb4d-ab74-4e3b-ae9a-98c0658601ed","name":"9faabb4d-ab74-4e3b-ae9a-98c0658601ed","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"8062dd9f-e092-4cb0-89d2-01d6c20dff51","name":"8062dd9f-e092-4cb0-89d2-01d6c20dff51","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"f7eee6f9-a600-4fe7-8ea2-42705c1addc1","name":"f7eee6f9-a600-4fe7-8ea2-42705c1addc1","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"e838345a-58e0-4c27-8ac5-e0293dc62516","name":"e838345a-58e0-4c27-8ac5-e0293dc62516","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"31948616-30f8-49af-aac8-36578e149f6d","name":"31948616-30f8-49af-aac8-36578e149f6d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"93a8b121-857c-436d-80f4-190f9e822d48","name":"93a8b121-857c-436d-80f4-190f9e822d48","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"b18b7461-af7c-46f9-bb4b-908dbf23ee4b","name":"b18b7461-af7c-46f9-bb4b-908dbf23ee4b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"f4eb7e8d-2608-4b34-ab31-05efaf6636fe","name":"f4eb7e8d-2608-4b34-ab31-05efaf6636fe","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"3b34a906-9e51-4d50-890e-c0464cf186c1","name":"3b34a906-9e51-4d50-890e-c0464cf186c1","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"be48cb9e-c609-45fd-84ff-262941825380","name":"be48cb9e-c609-45fd-84ff-262941825380","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"f0523cc9-8bde-42af-ae6d-dfb0486170b1","name":"f0523cc9-8bde-42af-ae6d-dfb0486170b1","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"8df70f45-6df1-4469-8cac-6c18c853c909","name":"8df70f45-6df1-4469-8cac-6c18c853c909","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"b2de682d-52d8-44fa-a041-5b24e23b00c6","name":"b2de682d-52d8-44fa-a041-5b24e23b00c6","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"56e9abd5-a55b-4417-98e1-8ddb4e497854","name":"56e9abd5-a55b-4417-98e1-8ddb4e497854","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"a483d3b7-7327-43ce-bbc0-5782b9e1fc32","name":"a483d3b7-7327-43ce-bbc0-5782b9e1fc32","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"b4d9e078-40b2-468a-8d88-2e7fecf08af4","name":"b4d9e078-40b2-468a-8d88-2e7fecf08af4","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"e48b811b-5351-4a05-9ff3-e22a8a1bf68a","name":"e48b811b-5351-4a05-9ff3-e22a8a1bf68a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"3b0d4742-fe04-4728-a0e6-c25b3972b9de","name":"3b0d4742-fe04-4728-a0e6-c25b3972b9de","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"9d66e71a-806a-4c69-8f85-c61673e764ec","name":"9d66e71a-806a-4c69-8f85-c61673e764ec","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"36f3175c-b588-4d53-9be9-777ea6b2af5f","name":"36f3175c-b588-4d53-9be9-777ea6b2af5f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"d1e4cd4e-c2af-49fe-95a3-0ecdc1958337","name":"d1e4cd4e-c2af-49fe-95a3-0ecdc1958337","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"7d2ada39-7bde-45e5-9bf4-2049b332fbcf","name":"7d2ada39-7bde-45e5-9bf4-2049b332fbcf","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"80e007d2-f590-4e0d-a322-e3a724ad18c3","name":"80e007d2-f590-4e0d-a322-e3a724ad18c3","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"6759d1a5-9c36-4fa0-b87f-0bcba8445559","name":"6759d1a5-9c36-4fa0-b87f-0bcba8445559","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"951b1418-c23f-4741-8e06-4e4fc942ac4b","name":"951b1418-c23f-4741-8e06-4e4fc942ac4b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"93799c01-29ea-4d9e-8f9b-a5a828787de9","name":"93799c01-29ea-4d9e-8f9b-a5a828787de9","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"9faabb4d-ab74-4e3b-ae9a-98c0658601ed","name":"9faabb4d-ab74-4e3b-ae9a-98c0658601ed","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"8062dd9f-e092-4cb0-89d2-01d6c20dff51","name":"8062dd9f-e092-4cb0-89d2-01d6c20dff51","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -93,84 +93,32 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"f7eee6f9-a600-4fe7-8ea2-42705c1addc1","path":"sprites/spr_happenings_green/spr_happenings_green.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"745c819e-96d8-4c95-8b47-89ff41c247c4","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"e838345a-58e0-4c27-8ac5-e0293dc62516","path":"sprites/spr_happenings_green/spr_happenings_green.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"6ce1a5f9-812b-441a-a891-60860d9cf989","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"31948616-30f8-49af-aac8-36578e149f6d","path":"sprites/spr_happenings_green/spr_happenings_green.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"950fa642-1358-4e91-9b3a-13ecf677c112","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"93a8b121-857c-436d-80f4-190f9e822d48","path":"sprites/spr_happenings_green/spr_happenings_green.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"55800409-f864-4c40-8ece-15d95fe2b7f0","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"b18b7461-af7c-46f9-bb4b-908dbf23ee4b","path":"sprites/spr_happenings_green/spr_happenings_green.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"35b2b72f-a58f-46ae-8e6a-197c5a52dd2e","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"f4eb7e8d-2608-4b34-ab31-05efaf6636fe","path":"sprites/spr_happenings_green/spr_happenings_green.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"638848fb-2f6c-4926-b759-4c43d0107f62","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"3b34a906-9e51-4d50-890e-c0464cf186c1","path":"sprites/spr_happenings_green/spr_happenings_green.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"728bd650-abfe-415c-aa44-542f4871435c","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"be48cb9e-c609-45fd-84ff-262941825380","path":"sprites/spr_happenings_green/spr_happenings_green.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"b084b89f-9863-4b53-836d-541d30ebdc52","IsCreationKey":false,"Key":7.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"f0523cc9-8bde-42af-ae6d-dfb0486170b1","path":"sprites/spr_happenings_green/spr_happenings_green.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"1a90b8bb-d548-4a36-bb7c-22b8c72f389d","IsCreationKey":false,"Key":8.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"8df70f45-6df1-4469-8cac-6c18c853c909","path":"sprites/spr_happenings_green/spr_happenings_green.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"964f61ad-8913-4277-beaa-b1fb46e30794","IsCreationKey":false,"Key":9.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"b2de682d-52d8-44fa-a041-5b24e23b00c6","path":"sprites/spr_happenings_green/spr_happenings_green.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"5b5ae6b0-ecbd-464b-9098-6cba869713cc","IsCreationKey":false,"Key":10.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"56e9abd5-a55b-4417-98e1-8ddb4e497854","path":"sprites/spr_happenings_green/spr_happenings_green.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"be0cbcbd-3f06-4fbb-9186-97abc63b9765","IsCreationKey":false,"Key":11.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"a483d3b7-7327-43ce-bbc0-5782b9e1fc32","path":"sprites/spr_happenings_green/spr_happenings_green.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"6a39bba5-201e-4fa1-903e-c7e99bf6009a","IsCreationKey":false,"Key":12.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"b4d9e078-40b2-468a-8d88-2e7fecf08af4","path":"sprites/spr_happenings_green/spr_happenings_green.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"76ddaa53-58cd-49a0-9fa4-6f61ae15d272","IsCreationKey":false,"Key":13.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"e48b811b-5351-4a05-9ff3-e22a8a1bf68a","path":"sprites/spr_happenings_green/spr_happenings_green.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"a467f7e2-ccae-4747-90fc-73374b7159bf","IsCreationKey":false,"Key":14.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"3b0d4742-fe04-4728-a0e6-c25b3972b9de","path":"sprites/spr_happenings_green/spr_happenings_green.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"427351d0-5d22-40b7-ba8b-f59e9f53a436","IsCreationKey":false,"Key":15.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"9d66e71a-806a-4c69-8f85-c61673e764ec","path":"sprites/spr_happenings_green/spr_happenings_green.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"d054efea-45a0-4dc8-8f13-a322cf8f72b8","IsCreationKey":false,"Key":16.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"36f3175c-b588-4d53-9be9-777ea6b2af5f","path":"sprites/spr_happenings_green/spr_happenings_green.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"a811970b-129e-4008-92dd-6302786efe29","IsCreationKey":false,"Key":17.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"d1e4cd4e-c2af-49fe-95a3-0ecdc1958337","path":"sprites/spr_happenings_green/spr_happenings_green.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"0fb84d53-7b08-48b9-a504-7065fc374de4","IsCreationKey":false,"Key":18.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"7d2ada39-7bde-45e5-9bf4-2049b332fbcf","path":"sprites/spr_happenings_green/spr_happenings_green.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"5ee9e33d-a006-4891-9cf5-a55783e3d01b","IsCreationKey":false,"Key":19.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"80e007d2-f590-4e0d-a322-e3a724ad18c3","path":"sprites/spr_happenings_green/spr_happenings_green.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"19ce3321-9253-46f0-b4c0-d25848d837d9","IsCreationKey":false,"Key":20.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"6759d1a5-9c36-4fa0-b87f-0bcba8445559","path":"sprites/spr_happenings_green/spr_happenings_green.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"d757e25b-b666-41be-854c-f7ba9dad9992","IsCreationKey":false,"Key":21.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"951b1418-c23f-4741-8e06-4e4fc942ac4b","path":"sprites/spr_happenings_green/spr_happenings_green.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"15f3cb7e-0910-4c68-b1b7-cfe0b05b485b","IsCreationKey":false,"Key":22.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"93799c01-29ea-4d9e-8f9b-a5a828787de9","path":"sprites/spr_happenings_green/spr_happenings_green.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"7af914d7-8869-4b94-9f92-0352412527d3","IsCreationKey":false,"Key":23.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"9faabb4d-ab74-4e3b-ae9a-98c0658601ed","path":"sprites/spr_happenings_green/spr_happenings_green.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"1c949337-3477-45c9-9edb-ce35f327e368","IsCreationKey":false,"Key":24.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"8062dd9f-e092-4cb0-89d2-01d6c20dff51","path":"sprites/spr_happenings_green/spr_happenings_green.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"15d6f074-c5d6-4261-b0b8-947b5447cce0","IsCreationKey":false,"Key":25.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"f7eee6f9-a600-4fe7-8ea2-42705c1addc1","path":"sprites/spr_happenings_green/spr_happenings_green.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"745c819e-96d8-4c95-8b47-89ff41c247c4","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"e838345a-58e0-4c27-8ac5-e0293dc62516","path":"sprites/spr_happenings_green/spr_happenings_green.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"6ce1a5f9-812b-441a-a891-60860d9cf989","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"31948616-30f8-49af-aac8-36578e149f6d","path":"sprites/spr_happenings_green/spr_happenings_green.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"950fa642-1358-4e91-9b3a-13ecf677c112","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"93a8b121-857c-436d-80f4-190f9e822d48","path":"sprites/spr_happenings_green/spr_happenings_green.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"55800409-f864-4c40-8ece-15d95fe2b7f0","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"b18b7461-af7c-46f9-bb4b-908dbf23ee4b","path":"sprites/spr_happenings_green/spr_happenings_green.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"35b2b72f-a58f-46ae-8e6a-197c5a52dd2e","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"f4eb7e8d-2608-4b34-ab31-05efaf6636fe","path":"sprites/spr_happenings_green/spr_happenings_green.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"638848fb-2f6c-4926-b759-4c43d0107f62","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"3b34a906-9e51-4d50-890e-c0464cf186c1","path":"sprites/spr_happenings_green/spr_happenings_green.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"728bd650-abfe-415c-aa44-542f4871435c","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"be48cb9e-c609-45fd-84ff-262941825380","path":"sprites/spr_happenings_green/spr_happenings_green.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"b084b89f-9863-4b53-836d-541d30ebdc52","IsCreationKey":false,"Key":7.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"f0523cc9-8bde-42af-ae6d-dfb0486170b1","path":"sprites/spr_happenings_green/spr_happenings_green.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"1a90b8bb-d548-4a36-bb7c-22b8c72f389d","IsCreationKey":false,"Key":8.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"8df70f45-6df1-4469-8cac-6c18c853c909","path":"sprites/spr_happenings_green/spr_happenings_green.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"964f61ad-8913-4277-beaa-b1fb46e30794","IsCreationKey":false,"Key":9.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"b2de682d-52d8-44fa-a041-5b24e23b00c6","path":"sprites/spr_happenings_green/spr_happenings_green.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"5b5ae6b0-ecbd-464b-9098-6cba869713cc","IsCreationKey":false,"Key":10.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"56e9abd5-a55b-4417-98e1-8ddb4e497854","path":"sprites/spr_happenings_green/spr_happenings_green.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"be0cbcbd-3f06-4fbb-9186-97abc63b9765","IsCreationKey":false,"Key":11.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"a483d3b7-7327-43ce-bbc0-5782b9e1fc32","path":"sprites/spr_happenings_green/spr_happenings_green.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"6a39bba5-201e-4fa1-903e-c7e99bf6009a","IsCreationKey":false,"Key":12.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"b4d9e078-40b2-468a-8d88-2e7fecf08af4","path":"sprites/spr_happenings_green/spr_happenings_green.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"76ddaa53-58cd-49a0-9fa4-6f61ae15d272","IsCreationKey":false,"Key":13.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"e48b811b-5351-4a05-9ff3-e22a8a1bf68a","path":"sprites/spr_happenings_green/spr_happenings_green.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"a467f7e2-ccae-4747-90fc-73374b7159bf","IsCreationKey":false,"Key":14.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"3b0d4742-fe04-4728-a0e6-c25b3972b9de","path":"sprites/spr_happenings_green/spr_happenings_green.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"427351d0-5d22-40b7-ba8b-f59e9f53a436","IsCreationKey":false,"Key":15.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"9d66e71a-806a-4c69-8f85-c61673e764ec","path":"sprites/spr_happenings_green/spr_happenings_green.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"d054efea-45a0-4dc8-8f13-a322cf8f72b8","IsCreationKey":false,"Key":16.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"36f3175c-b588-4d53-9be9-777ea6b2af5f","path":"sprites/spr_happenings_green/spr_happenings_green.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"a811970b-129e-4008-92dd-6302786efe29","IsCreationKey":false,"Key":17.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"d1e4cd4e-c2af-49fe-95a3-0ecdc1958337","path":"sprites/spr_happenings_green/spr_happenings_green.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"0fb84d53-7b08-48b9-a504-7065fc374de4","IsCreationKey":false,"Key":18.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"7d2ada39-7bde-45e5-9bf4-2049b332fbcf","path":"sprites/spr_happenings_green/spr_happenings_green.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"5ee9e33d-a006-4891-9cf5-a55783e3d01b","IsCreationKey":false,"Key":19.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"80e007d2-f590-4e0d-a322-e3a724ad18c3","path":"sprites/spr_happenings_green/spr_happenings_green.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"19ce3321-9253-46f0-b4c0-d25848d837d9","IsCreationKey":false,"Key":20.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"6759d1a5-9c36-4fa0-b87f-0bcba8445559","path":"sprites/spr_happenings_green/spr_happenings_green.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"d757e25b-b666-41be-854c-f7ba9dad9992","IsCreationKey":false,"Key":21.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"951b1418-c23f-4741-8e06-4e4fc942ac4b","path":"sprites/spr_happenings_green/spr_happenings_green.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"15f3cb7e-0910-4c68-b1b7-cfe0b05b485b","IsCreationKey":false,"Key":22.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"93799c01-29ea-4d9e-8f9b-a5a828787de9","path":"sprites/spr_happenings_green/spr_happenings_green.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"7af914d7-8869-4b94-9f92-0352412527d3","IsCreationKey":false,"Key":23.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"9faabb4d-ab74-4e3b-ae9a-98c0658601ed","path":"sprites/spr_happenings_green/spr_happenings_green.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"1c949337-3477-45c9-9edb-ce35f327e368","IsCreationKey":false,"Key":24.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"8062dd9f-e092-4cb0-89d2-01d6c20dff51","path":"sprites/spr_happenings_green/spr_happenings_green.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"15d6f074-c5d6-4261-b0b8-947b5447cce0","IsCreationKey":false,"Key":25.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_happenings_purple/spr_happenings_purple.yy b/sprites/spr_happenings_purple/spr_happenings_purple.yy index dbf4174427..4aa0565da9 100644 --- a/sprites/spr_happenings_purple/spr_happenings_purple.yy +++ b/sprites/spr_happenings_purple/spr_happenings_purple.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_happenings_purple", "bboxMode":0, "bbox_bottom":26, @@ -12,32 +12,32 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"0e251917-274a-4022-aebe-7f1ef84f4d18","name":"0e251917-274a-4022-aebe-7f1ef84f4d18","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"e8b1eadc-36d8-4f8d-8347-009726750698","name":"e8b1eadc-36d8-4f8d-8347-009726750698","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"3118c3b6-10ff-49be-8a49-b3e61cd2b9e7","name":"3118c3b6-10ff-49be-8a49-b3e61cd2b9e7","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"ee9c762e-6200-48cb-a9df-a8e01d7bc6c6","name":"ee9c762e-6200-48cb-a9df-a8e01d7bc6c6","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"07c922be-6bc2-4f94-9727-696e167415e9","name":"07c922be-6bc2-4f94-9727-696e167415e9","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"025eea85-f9d3-4fc2-a87f-a2b3581a4486","name":"025eea85-f9d3-4fc2-a87f-a2b3581a4486","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"5b2c54e4-3a1a-43e1-a5ea-0daf6ef79771","name":"5b2c54e4-3a1a-43e1-a5ea-0daf6ef79771","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"c03f8ef8-9491-4560-86ed-3c0453a648b4","name":"c03f8ef8-9491-4560-86ed-3c0453a648b4","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"787b9142-d318-460e-962e-ee9cd7be3812","name":"787b9142-d318-460e-962e-ee9cd7be3812","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"b1a8ad05-e868-4d21-93b5-8c06ba2d886c","name":"b1a8ad05-e868-4d21-93b5-8c06ba2d886c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"b7e13b91-fb39-4d22-b608-1034b2f8c0b6","name":"b7e13b91-fb39-4d22-b608-1034b2f8c0b6","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"007fc063-17cd-4e57-b579-c55acada2c3a","name":"007fc063-17cd-4e57-b579-c55acada2c3a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"ab63f795-03df-4b56-9112-2edb1303ade0","name":"ab63f795-03df-4b56-9112-2edb1303ade0","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"35d92330-0437-48a3-afbd-6bd0df1dd08c","name":"35d92330-0437-48a3-afbd-6bd0df1dd08c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"0bf10494-4d52-4155-a810-c7beeaad6556","name":"0bf10494-4d52-4155-a810-c7beeaad6556","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"dcd74bf5-5b29-4430-abac-0dc4532ee836","name":"dcd74bf5-5b29-4430-abac-0dc4532ee836","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"7a2765e3-69c4-462c-bb1b-ae8bf52c58ea","name":"7a2765e3-69c4-462c-bb1b-ae8bf52c58ea","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"b07c48e3-7247-4d41-917e-25b96960603f","name":"b07c48e3-7247-4d41-917e-25b96960603f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"14b440f8-abee-438e-b5b0-d7740be4d023","name":"14b440f8-abee-438e-b5b0-d7740be4d023","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"d1be2ebf-14c2-44c3-8198-02012b07b454","name":"d1be2ebf-14c2-44c3-8198-02012b07b454","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"e36f654d-3a6d-4620-9eb5-2c3cdbfdcf7f","name":"e36f654d-3a6d-4620-9eb5-2c3cdbfdcf7f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"3183bac8-7d63-4455-92df-f84c41a528e4","name":"3183bac8-7d63-4455-92df-f84c41a528e4","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"4a996b1d-29d6-4539-b44e-dc8596e6e3a7","name":"4a996b1d-29d6-4539-b44e-dc8596e6e3a7","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"4895ac9f-18ba-4938-b37f-334b6e1f666b","name":"4895ac9f-18ba-4938-b37f-334b6e1f666b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"2c480d20-19d5-447d-8450-cdc6374c3ed1","name":"2c480d20-19d5-447d-8450-cdc6374c3ed1","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"74c20a03-082a-44b1-a7c0-a90ec20df6a4","name":"74c20a03-082a-44b1-a7c0-a90ec20df6a4","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"0e251917-274a-4022-aebe-7f1ef84f4d18","name":"0e251917-274a-4022-aebe-7f1ef84f4d18","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"e8b1eadc-36d8-4f8d-8347-009726750698","name":"e8b1eadc-36d8-4f8d-8347-009726750698","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"3118c3b6-10ff-49be-8a49-b3e61cd2b9e7","name":"3118c3b6-10ff-49be-8a49-b3e61cd2b9e7","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"ee9c762e-6200-48cb-a9df-a8e01d7bc6c6","name":"ee9c762e-6200-48cb-a9df-a8e01d7bc6c6","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"07c922be-6bc2-4f94-9727-696e167415e9","name":"07c922be-6bc2-4f94-9727-696e167415e9","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"025eea85-f9d3-4fc2-a87f-a2b3581a4486","name":"025eea85-f9d3-4fc2-a87f-a2b3581a4486","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"5b2c54e4-3a1a-43e1-a5ea-0daf6ef79771","name":"5b2c54e4-3a1a-43e1-a5ea-0daf6ef79771","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"c03f8ef8-9491-4560-86ed-3c0453a648b4","name":"c03f8ef8-9491-4560-86ed-3c0453a648b4","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"787b9142-d318-460e-962e-ee9cd7be3812","name":"787b9142-d318-460e-962e-ee9cd7be3812","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"b1a8ad05-e868-4d21-93b5-8c06ba2d886c","name":"b1a8ad05-e868-4d21-93b5-8c06ba2d886c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"b7e13b91-fb39-4d22-b608-1034b2f8c0b6","name":"b7e13b91-fb39-4d22-b608-1034b2f8c0b6","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"007fc063-17cd-4e57-b579-c55acada2c3a","name":"007fc063-17cd-4e57-b579-c55acada2c3a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"ab63f795-03df-4b56-9112-2edb1303ade0","name":"ab63f795-03df-4b56-9112-2edb1303ade0","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"35d92330-0437-48a3-afbd-6bd0df1dd08c","name":"35d92330-0437-48a3-afbd-6bd0df1dd08c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"0bf10494-4d52-4155-a810-c7beeaad6556","name":"0bf10494-4d52-4155-a810-c7beeaad6556","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"dcd74bf5-5b29-4430-abac-0dc4532ee836","name":"dcd74bf5-5b29-4430-abac-0dc4532ee836","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"7a2765e3-69c4-462c-bb1b-ae8bf52c58ea","name":"7a2765e3-69c4-462c-bb1b-ae8bf52c58ea","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"b07c48e3-7247-4d41-917e-25b96960603f","name":"b07c48e3-7247-4d41-917e-25b96960603f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"14b440f8-abee-438e-b5b0-d7740be4d023","name":"14b440f8-abee-438e-b5b0-d7740be4d023","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"d1be2ebf-14c2-44c3-8198-02012b07b454","name":"d1be2ebf-14c2-44c3-8198-02012b07b454","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"e36f654d-3a6d-4620-9eb5-2c3cdbfdcf7f","name":"e36f654d-3a6d-4620-9eb5-2c3cdbfdcf7f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"3183bac8-7d63-4455-92df-f84c41a528e4","name":"3183bac8-7d63-4455-92df-f84c41a528e4","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"4a996b1d-29d6-4539-b44e-dc8596e6e3a7","name":"4a996b1d-29d6-4539-b44e-dc8596e6e3a7","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"4895ac9f-18ba-4938-b37f-334b6e1f666b","name":"4895ac9f-18ba-4938-b37f-334b6e1f666b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"2c480d20-19d5-447d-8450-cdc6374c3ed1","name":"2c480d20-19d5-447d-8450-cdc6374c3ed1","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"74c20a03-082a-44b1-a7c0-a90ec20df6a4","name":"74c20a03-082a-44b1-a7c0-a90ec20df6a4","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -93,84 +93,32 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"0e251917-274a-4022-aebe-7f1ef84f4d18","path":"sprites/spr_happenings_purple/spr_happenings_purple.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"99e28c59-beaf-400b-8431-9914197ed53f","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"e8b1eadc-36d8-4f8d-8347-009726750698","path":"sprites/spr_happenings_purple/spr_happenings_purple.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"49a48d30-cfc2-4b5b-9d89-a7a7bd3192a4","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"3118c3b6-10ff-49be-8a49-b3e61cd2b9e7","path":"sprites/spr_happenings_purple/spr_happenings_purple.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"803e093b-ea1e-44cf-ab17-556e227c97e7","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"ee9c762e-6200-48cb-a9df-a8e01d7bc6c6","path":"sprites/spr_happenings_purple/spr_happenings_purple.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"2f1ebd62-e696-4644-b6e4-0677a7062937","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"07c922be-6bc2-4f94-9727-696e167415e9","path":"sprites/spr_happenings_purple/spr_happenings_purple.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"216fa637-5887-438e-bc8d-7d8365ccc14c","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"025eea85-f9d3-4fc2-a87f-a2b3581a4486","path":"sprites/spr_happenings_purple/spr_happenings_purple.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"8fb83f23-e74d-4fe0-adf1-6d3e5f61da5d","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"5b2c54e4-3a1a-43e1-a5ea-0daf6ef79771","path":"sprites/spr_happenings_purple/spr_happenings_purple.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"2041d30a-4bac-42f2-88d8-a4ee5ba766f5","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"c03f8ef8-9491-4560-86ed-3c0453a648b4","path":"sprites/spr_happenings_purple/spr_happenings_purple.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"222a9927-7e69-4a21-b86f-79dedd00b175","IsCreationKey":false,"Key":7.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"787b9142-d318-460e-962e-ee9cd7be3812","path":"sprites/spr_happenings_purple/spr_happenings_purple.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"e650480b-fc10-418b-94eb-555e2d95c1d6","IsCreationKey":false,"Key":8.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"b1a8ad05-e868-4d21-93b5-8c06ba2d886c","path":"sprites/spr_happenings_purple/spr_happenings_purple.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"3f049630-1fbe-4931-a67e-2790e6ca19bb","IsCreationKey":false,"Key":9.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"b7e13b91-fb39-4d22-b608-1034b2f8c0b6","path":"sprites/spr_happenings_purple/spr_happenings_purple.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"3928b504-cf3f-4d64-8abb-d52cfa9ad8ac","IsCreationKey":false,"Key":10.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"007fc063-17cd-4e57-b579-c55acada2c3a","path":"sprites/spr_happenings_purple/spr_happenings_purple.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"8257ae86-ed7d-4c6c-b42b-623fd22d6cb3","IsCreationKey":false,"Key":11.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"ab63f795-03df-4b56-9112-2edb1303ade0","path":"sprites/spr_happenings_purple/spr_happenings_purple.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"a853e2bd-258c-4792-81f0-0c2dd1fec278","IsCreationKey":false,"Key":12.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"35d92330-0437-48a3-afbd-6bd0df1dd08c","path":"sprites/spr_happenings_purple/spr_happenings_purple.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"adac555f-9e31-45dc-b15e-d17f482548d2","IsCreationKey":false,"Key":13.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"0bf10494-4d52-4155-a810-c7beeaad6556","path":"sprites/spr_happenings_purple/spr_happenings_purple.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"0385d9ab-58d6-4617-9b29-dc1ccc2e6d4c","IsCreationKey":false,"Key":14.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"dcd74bf5-5b29-4430-abac-0dc4532ee836","path":"sprites/spr_happenings_purple/spr_happenings_purple.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"c89f3524-bf42-4eb9-809a-50843abe2909","IsCreationKey":false,"Key":15.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"7a2765e3-69c4-462c-bb1b-ae8bf52c58ea","path":"sprites/spr_happenings_purple/spr_happenings_purple.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"9623fc7a-9d63-4fd2-825d-11fe1b9abba5","IsCreationKey":false,"Key":16.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"b07c48e3-7247-4d41-917e-25b96960603f","path":"sprites/spr_happenings_purple/spr_happenings_purple.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"f2b7a1dc-63d3-429b-92df-7668d84472b3","IsCreationKey":false,"Key":17.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"14b440f8-abee-438e-b5b0-d7740be4d023","path":"sprites/spr_happenings_purple/spr_happenings_purple.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"0f5726aa-d67c-4b40-ba42-c252d41af20a","IsCreationKey":false,"Key":18.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"d1be2ebf-14c2-44c3-8198-02012b07b454","path":"sprites/spr_happenings_purple/spr_happenings_purple.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"0e6be25f-0897-420e-9f3e-b2c8fd213e00","IsCreationKey":false,"Key":19.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"e36f654d-3a6d-4620-9eb5-2c3cdbfdcf7f","path":"sprites/spr_happenings_purple/spr_happenings_purple.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"f1f49eaf-e95b-43ce-9729-dfc34380fed9","IsCreationKey":false,"Key":20.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"3183bac8-7d63-4455-92df-f84c41a528e4","path":"sprites/spr_happenings_purple/spr_happenings_purple.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"692aecbc-cacc-48fc-a477-be9a83c215c2","IsCreationKey":false,"Key":21.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"4a996b1d-29d6-4539-b44e-dc8596e6e3a7","path":"sprites/spr_happenings_purple/spr_happenings_purple.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"cea7b002-c69b-4de4-995e-ff8f43fb02d5","IsCreationKey":false,"Key":22.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"4895ac9f-18ba-4938-b37f-334b6e1f666b","path":"sprites/spr_happenings_purple/spr_happenings_purple.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"5e5169dd-744c-4965-bbfd-0b681a9cee55","IsCreationKey":false,"Key":23.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"2c480d20-19d5-447d-8450-cdc6374c3ed1","path":"sprites/spr_happenings_purple/spr_happenings_purple.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"953c6f1d-faca-4f58-a533-a79734d78256","IsCreationKey":false,"Key":24.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"74c20a03-082a-44b1-a7c0-a90ec20df6a4","path":"sprites/spr_happenings_purple/spr_happenings_purple.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"43a591f8-5ad0-4222-bf9a-f71878d35e58","IsCreationKey":false,"Key":25.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"0e251917-274a-4022-aebe-7f1ef84f4d18","path":"sprites/spr_happenings_purple/spr_happenings_purple.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"99e28c59-beaf-400b-8431-9914197ed53f","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"e8b1eadc-36d8-4f8d-8347-009726750698","path":"sprites/spr_happenings_purple/spr_happenings_purple.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"49a48d30-cfc2-4b5b-9d89-a7a7bd3192a4","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"3118c3b6-10ff-49be-8a49-b3e61cd2b9e7","path":"sprites/spr_happenings_purple/spr_happenings_purple.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"803e093b-ea1e-44cf-ab17-556e227c97e7","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"ee9c762e-6200-48cb-a9df-a8e01d7bc6c6","path":"sprites/spr_happenings_purple/spr_happenings_purple.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"2f1ebd62-e696-4644-b6e4-0677a7062937","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"07c922be-6bc2-4f94-9727-696e167415e9","path":"sprites/spr_happenings_purple/spr_happenings_purple.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"216fa637-5887-438e-bc8d-7d8365ccc14c","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"025eea85-f9d3-4fc2-a87f-a2b3581a4486","path":"sprites/spr_happenings_purple/spr_happenings_purple.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"8fb83f23-e74d-4fe0-adf1-6d3e5f61da5d","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"5b2c54e4-3a1a-43e1-a5ea-0daf6ef79771","path":"sprites/spr_happenings_purple/spr_happenings_purple.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"2041d30a-4bac-42f2-88d8-a4ee5ba766f5","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"c03f8ef8-9491-4560-86ed-3c0453a648b4","path":"sprites/spr_happenings_purple/spr_happenings_purple.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"222a9927-7e69-4a21-b86f-79dedd00b175","IsCreationKey":false,"Key":7.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"787b9142-d318-460e-962e-ee9cd7be3812","path":"sprites/spr_happenings_purple/spr_happenings_purple.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"e650480b-fc10-418b-94eb-555e2d95c1d6","IsCreationKey":false,"Key":8.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"b1a8ad05-e868-4d21-93b5-8c06ba2d886c","path":"sprites/spr_happenings_purple/spr_happenings_purple.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"3f049630-1fbe-4931-a67e-2790e6ca19bb","IsCreationKey":false,"Key":9.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"b7e13b91-fb39-4d22-b608-1034b2f8c0b6","path":"sprites/spr_happenings_purple/spr_happenings_purple.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"3928b504-cf3f-4d64-8abb-d52cfa9ad8ac","IsCreationKey":false,"Key":10.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"007fc063-17cd-4e57-b579-c55acada2c3a","path":"sprites/spr_happenings_purple/spr_happenings_purple.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"8257ae86-ed7d-4c6c-b42b-623fd22d6cb3","IsCreationKey":false,"Key":11.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"ab63f795-03df-4b56-9112-2edb1303ade0","path":"sprites/spr_happenings_purple/spr_happenings_purple.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"a853e2bd-258c-4792-81f0-0c2dd1fec278","IsCreationKey":false,"Key":12.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"35d92330-0437-48a3-afbd-6bd0df1dd08c","path":"sprites/spr_happenings_purple/spr_happenings_purple.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"adac555f-9e31-45dc-b15e-d17f482548d2","IsCreationKey":false,"Key":13.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"0bf10494-4d52-4155-a810-c7beeaad6556","path":"sprites/spr_happenings_purple/spr_happenings_purple.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"0385d9ab-58d6-4617-9b29-dc1ccc2e6d4c","IsCreationKey":false,"Key":14.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"dcd74bf5-5b29-4430-abac-0dc4532ee836","path":"sprites/spr_happenings_purple/spr_happenings_purple.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"c89f3524-bf42-4eb9-809a-50843abe2909","IsCreationKey":false,"Key":15.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"7a2765e3-69c4-462c-bb1b-ae8bf52c58ea","path":"sprites/spr_happenings_purple/spr_happenings_purple.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"9623fc7a-9d63-4fd2-825d-11fe1b9abba5","IsCreationKey":false,"Key":16.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"b07c48e3-7247-4d41-917e-25b96960603f","path":"sprites/spr_happenings_purple/spr_happenings_purple.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"f2b7a1dc-63d3-429b-92df-7668d84472b3","IsCreationKey":false,"Key":17.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"14b440f8-abee-438e-b5b0-d7740be4d023","path":"sprites/spr_happenings_purple/spr_happenings_purple.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"0f5726aa-d67c-4b40-ba42-c252d41af20a","IsCreationKey":false,"Key":18.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"d1be2ebf-14c2-44c3-8198-02012b07b454","path":"sprites/spr_happenings_purple/spr_happenings_purple.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"0e6be25f-0897-420e-9f3e-b2c8fd213e00","IsCreationKey":false,"Key":19.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"e36f654d-3a6d-4620-9eb5-2c3cdbfdcf7f","path":"sprites/spr_happenings_purple/spr_happenings_purple.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"f1f49eaf-e95b-43ce-9729-dfc34380fed9","IsCreationKey":false,"Key":20.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"3183bac8-7d63-4455-92df-f84c41a528e4","path":"sprites/spr_happenings_purple/spr_happenings_purple.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"692aecbc-cacc-48fc-a477-be9a83c215c2","IsCreationKey":false,"Key":21.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"4a996b1d-29d6-4539-b44e-dc8596e6e3a7","path":"sprites/spr_happenings_purple/spr_happenings_purple.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"cea7b002-c69b-4de4-995e-ff8f43fb02d5","IsCreationKey":false,"Key":22.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"4895ac9f-18ba-4938-b37f-334b6e1f666b","path":"sprites/spr_happenings_purple/spr_happenings_purple.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"5e5169dd-744c-4965-bbfd-0b681a9cee55","IsCreationKey":false,"Key":23.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"2c480d20-19d5-447d-8450-cdc6374c3ed1","path":"sprites/spr_happenings_purple/spr_happenings_purple.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"953c6f1d-faca-4f58-a533-a79734d78256","IsCreationKey":false,"Key":24.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"74c20a03-082a-44b1-a7c0-a90ec20df6a4","path":"sprites/spr_happenings_purple/spr_happenings_purple.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"43a591f8-5ad0-4222-bf9a-f71878d35e58","IsCreationKey":false,"Key":25.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":{ diff --git a/sprites/spr_happenings_red/spr_happenings_red.yy b/sprites/spr_happenings_red/spr_happenings_red.yy index 55e4506ab4..a4ef72e0df 100644 --- a/sprites/spr_happenings_red/spr_happenings_red.yy +++ b/sprites/spr_happenings_red/spr_happenings_red.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_happenings_red", "bboxMode":0, "bbox_bottom":26, @@ -12,32 +12,32 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"875e4422-5ff1-429f-b010-07dcd9a0e0dd","name":"875e4422-5ff1-429f-b010-07dcd9a0e0dd","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"0776aab0-4b83-421d-b34e-a0a8e547af6f","name":"0776aab0-4b83-421d-b34e-a0a8e547af6f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"104f8e4e-ab5e-4090-a0b0-09c49401079c","name":"104f8e4e-ab5e-4090-a0b0-09c49401079c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"1f4ebf29-9c43-427c-b41a-4febf1346d2e","name":"1f4ebf29-9c43-427c-b41a-4febf1346d2e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"ed375340-eb85-4e35-8853-8e2aee6158f7","name":"ed375340-eb85-4e35-8853-8e2aee6158f7","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"7467dd9b-dc2f-4ba2-a8f3-866de70789c0","name":"7467dd9b-dc2f-4ba2-a8f3-866de70789c0","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"8ca89c50-74ea-439e-8523-e29bbee491be","name":"8ca89c50-74ea-439e-8523-e29bbee491be","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"6599305c-49fe-4081-9df0-062c0bbc4ab3","name":"6599305c-49fe-4081-9df0-062c0bbc4ab3","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"ce7c933c-d33d-4731-812f-ba20aa79c455","name":"ce7c933c-d33d-4731-812f-ba20aa79c455","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"759e6bd7-3124-4ecd-80b2-24c5f141deac","name":"759e6bd7-3124-4ecd-80b2-24c5f141deac","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"a1520983-f5b1-48fc-9005-eb156b6d23f2","name":"a1520983-f5b1-48fc-9005-eb156b6d23f2","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"986fe1b6-a5f3-4f25-b2f3-e22d72d878fe","name":"986fe1b6-a5f3-4f25-b2f3-e22d72d878fe","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"fc58c4d0-0336-4946-9c6a-37233859677e","name":"fc58c4d0-0336-4946-9c6a-37233859677e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"57293e1e-1ebe-465a-86e2-f399d62ec36a","name":"57293e1e-1ebe-465a-86e2-f399d62ec36a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"7f30fa43-f771-4473-ae7f-8842fd842305","name":"7f30fa43-f771-4473-ae7f-8842fd842305","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"0a0c875f-5446-4d13-b3dd-c95e9faa65db","name":"0a0c875f-5446-4d13-b3dd-c95e9faa65db","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"52f1e27b-7cb6-4fbf-adcf-8e41ff82389b","name":"52f1e27b-7cb6-4fbf-adcf-8e41ff82389b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"b956abf4-e68c-4dd8-b5a6-23e43628b07d","name":"b956abf4-e68c-4dd8-b5a6-23e43628b07d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"ebb6819b-602f-4389-8bb5-4fd04def2f6d","name":"ebb6819b-602f-4389-8bb5-4fd04def2f6d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"9f1692f1-087f-4c1f-947b-4f20e9b18ee1","name":"9f1692f1-087f-4c1f-947b-4f20e9b18ee1","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"75defacc-6f38-4352-aef7-fc555ee4287b","name":"75defacc-6f38-4352-aef7-fc555ee4287b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"591c2f2a-35a8-47ee-a88d-2b2c05c9689e","name":"591c2f2a-35a8-47ee-a88d-2b2c05c9689e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"c684fa07-3dac-4eba-bfef-0fe387085f3c","name":"c684fa07-3dac-4eba-bfef-0fe387085f3c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"2d9bc79a-9105-4a68-9ab8-0dbb18f54bc5","name":"2d9bc79a-9105-4a68-9ab8-0dbb18f54bc5","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"d38e55da-771c-4f5d-9066-e2e293ca559f","name":"d38e55da-771c-4f5d-9066-e2e293ca559f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"87a8e843-7d8f-40ed-91ca-bf83a5b9fe8f","name":"87a8e843-7d8f-40ed-91ca-bf83a5b9fe8f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"875e4422-5ff1-429f-b010-07dcd9a0e0dd","name":"875e4422-5ff1-429f-b010-07dcd9a0e0dd","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"0776aab0-4b83-421d-b34e-a0a8e547af6f","name":"0776aab0-4b83-421d-b34e-a0a8e547af6f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"104f8e4e-ab5e-4090-a0b0-09c49401079c","name":"104f8e4e-ab5e-4090-a0b0-09c49401079c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"1f4ebf29-9c43-427c-b41a-4febf1346d2e","name":"1f4ebf29-9c43-427c-b41a-4febf1346d2e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"ed375340-eb85-4e35-8853-8e2aee6158f7","name":"ed375340-eb85-4e35-8853-8e2aee6158f7","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"7467dd9b-dc2f-4ba2-a8f3-866de70789c0","name":"7467dd9b-dc2f-4ba2-a8f3-866de70789c0","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"8ca89c50-74ea-439e-8523-e29bbee491be","name":"8ca89c50-74ea-439e-8523-e29bbee491be","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"6599305c-49fe-4081-9df0-062c0bbc4ab3","name":"6599305c-49fe-4081-9df0-062c0bbc4ab3","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"ce7c933c-d33d-4731-812f-ba20aa79c455","name":"ce7c933c-d33d-4731-812f-ba20aa79c455","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"759e6bd7-3124-4ecd-80b2-24c5f141deac","name":"759e6bd7-3124-4ecd-80b2-24c5f141deac","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"a1520983-f5b1-48fc-9005-eb156b6d23f2","name":"a1520983-f5b1-48fc-9005-eb156b6d23f2","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"986fe1b6-a5f3-4f25-b2f3-e22d72d878fe","name":"986fe1b6-a5f3-4f25-b2f3-e22d72d878fe","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"fc58c4d0-0336-4946-9c6a-37233859677e","name":"fc58c4d0-0336-4946-9c6a-37233859677e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"57293e1e-1ebe-465a-86e2-f399d62ec36a","name":"57293e1e-1ebe-465a-86e2-f399d62ec36a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"7f30fa43-f771-4473-ae7f-8842fd842305","name":"7f30fa43-f771-4473-ae7f-8842fd842305","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"0a0c875f-5446-4d13-b3dd-c95e9faa65db","name":"0a0c875f-5446-4d13-b3dd-c95e9faa65db","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"52f1e27b-7cb6-4fbf-adcf-8e41ff82389b","name":"52f1e27b-7cb6-4fbf-adcf-8e41ff82389b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"b956abf4-e68c-4dd8-b5a6-23e43628b07d","name":"b956abf4-e68c-4dd8-b5a6-23e43628b07d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"ebb6819b-602f-4389-8bb5-4fd04def2f6d","name":"ebb6819b-602f-4389-8bb5-4fd04def2f6d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"9f1692f1-087f-4c1f-947b-4f20e9b18ee1","name":"9f1692f1-087f-4c1f-947b-4f20e9b18ee1","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"75defacc-6f38-4352-aef7-fc555ee4287b","name":"75defacc-6f38-4352-aef7-fc555ee4287b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"591c2f2a-35a8-47ee-a88d-2b2c05c9689e","name":"591c2f2a-35a8-47ee-a88d-2b2c05c9689e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"c684fa07-3dac-4eba-bfef-0fe387085f3c","name":"c684fa07-3dac-4eba-bfef-0fe387085f3c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"2d9bc79a-9105-4a68-9ab8-0dbb18f54bc5","name":"2d9bc79a-9105-4a68-9ab8-0dbb18f54bc5","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"d38e55da-771c-4f5d-9066-e2e293ca559f","name":"d38e55da-771c-4f5d-9066-e2e293ca559f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"87a8e843-7d8f-40ed-91ca-bf83a5b9fe8f","name":"87a8e843-7d8f-40ed-91ca-bf83a5b9fe8f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -93,84 +93,32 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"875e4422-5ff1-429f-b010-07dcd9a0e0dd","path":"sprites/spr_happenings_red/spr_happenings_red.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"a609cf76-7e31-401e-9f69-864eeed79125","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"0776aab0-4b83-421d-b34e-a0a8e547af6f","path":"sprites/spr_happenings_red/spr_happenings_red.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"3f94f71d-4218-4c65-8562-932bc9aab55e","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"104f8e4e-ab5e-4090-a0b0-09c49401079c","path":"sprites/spr_happenings_red/spr_happenings_red.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"336b123b-c603-4911-a5ac-a943e4ab1cde","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"1f4ebf29-9c43-427c-b41a-4febf1346d2e","path":"sprites/spr_happenings_red/spr_happenings_red.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"ad31793a-0d2b-45df-8b1a-8111fa131e4a","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"ed375340-eb85-4e35-8853-8e2aee6158f7","path":"sprites/spr_happenings_red/spr_happenings_red.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"6f299a66-ecd2-437c-8a59-b6f1723872c9","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"7467dd9b-dc2f-4ba2-a8f3-866de70789c0","path":"sprites/spr_happenings_red/spr_happenings_red.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"48fa8cfc-885a-4522-bc2e-d06185e88936","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"8ca89c50-74ea-439e-8523-e29bbee491be","path":"sprites/spr_happenings_red/spr_happenings_red.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"342fcc76-339b-4687-a07d-c180450f3c16","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"6599305c-49fe-4081-9df0-062c0bbc4ab3","path":"sprites/spr_happenings_red/spr_happenings_red.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"b94f4dd1-b70c-4c68-b654-f81d679070ea","IsCreationKey":false,"Key":7.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"ce7c933c-d33d-4731-812f-ba20aa79c455","path":"sprites/spr_happenings_red/spr_happenings_red.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"4e7ed7e3-9268-4b60-a425-08216d48ab45","IsCreationKey":false,"Key":8.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"759e6bd7-3124-4ecd-80b2-24c5f141deac","path":"sprites/spr_happenings_red/spr_happenings_red.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"b4401e08-0451-4eb1-82a2-49f251e73782","IsCreationKey":false,"Key":9.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"a1520983-f5b1-48fc-9005-eb156b6d23f2","path":"sprites/spr_happenings_red/spr_happenings_red.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"28edf77c-81e6-41dc-aea5-ddbd45eedb24","IsCreationKey":false,"Key":10.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"986fe1b6-a5f3-4f25-b2f3-e22d72d878fe","path":"sprites/spr_happenings_red/spr_happenings_red.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"7afe7900-0c18-412f-a0b9-99b09b4fc907","IsCreationKey":false,"Key":11.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"fc58c4d0-0336-4946-9c6a-37233859677e","path":"sprites/spr_happenings_red/spr_happenings_red.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"b0559484-0dcc-4929-be8b-030fda2cd9f4","IsCreationKey":false,"Key":12.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"57293e1e-1ebe-465a-86e2-f399d62ec36a","path":"sprites/spr_happenings_red/spr_happenings_red.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"f08c81b4-d642-465a-9bcc-ff978084d5e6","IsCreationKey":false,"Key":13.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"7f30fa43-f771-4473-ae7f-8842fd842305","path":"sprites/spr_happenings_red/spr_happenings_red.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"b576b8c2-7730-49ba-b3af-8f041e6a7004","IsCreationKey":false,"Key":14.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"0a0c875f-5446-4d13-b3dd-c95e9faa65db","path":"sprites/spr_happenings_red/spr_happenings_red.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"44a1cae7-a20d-4769-b9d1-ff846d701be0","IsCreationKey":false,"Key":15.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"52f1e27b-7cb6-4fbf-adcf-8e41ff82389b","path":"sprites/spr_happenings_red/spr_happenings_red.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"c9977911-186b-4bb2-b96d-1335acd7ca1a","IsCreationKey":false,"Key":16.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"b956abf4-e68c-4dd8-b5a6-23e43628b07d","path":"sprites/spr_happenings_red/spr_happenings_red.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"6334c8b2-d4ee-4d7e-9f68-b05ffa179c00","IsCreationKey":false,"Key":17.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"ebb6819b-602f-4389-8bb5-4fd04def2f6d","path":"sprites/spr_happenings_red/spr_happenings_red.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"da60249f-07d2-49f5-a278-a58f76072e9e","IsCreationKey":false,"Key":18.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"9f1692f1-087f-4c1f-947b-4f20e9b18ee1","path":"sprites/spr_happenings_red/spr_happenings_red.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"c2245027-c0c6-462a-999c-70f5cd819845","IsCreationKey":false,"Key":19.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"75defacc-6f38-4352-aef7-fc555ee4287b","path":"sprites/spr_happenings_red/spr_happenings_red.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"94169a22-41e2-4c11-84d6-e84a40d73fa1","IsCreationKey":false,"Key":20.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"591c2f2a-35a8-47ee-a88d-2b2c05c9689e","path":"sprites/spr_happenings_red/spr_happenings_red.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"69343e54-7967-430b-ac91-3f2947665045","IsCreationKey":false,"Key":21.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"c684fa07-3dac-4eba-bfef-0fe387085f3c","path":"sprites/spr_happenings_red/spr_happenings_red.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"6c32821f-2eb0-47bd-b28c-ec5ef91289af","IsCreationKey":false,"Key":22.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"2d9bc79a-9105-4a68-9ab8-0dbb18f54bc5","path":"sprites/spr_happenings_red/spr_happenings_red.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"8def33c1-48c4-49ce-87b9-9b48767a4629","IsCreationKey":false,"Key":23.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"d38e55da-771c-4f5d-9066-e2e293ca559f","path":"sprites/spr_happenings_red/spr_happenings_red.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"30aeda48-f1b7-45e2-96ac-07343b38b05e","IsCreationKey":false,"Key":24.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"87a8e843-7d8f-40ed-91ca-bf83a5b9fe8f","path":"sprites/spr_happenings_red/spr_happenings_red.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"2a970055-ff2f-4335-a20b-baa03e7a902e","IsCreationKey":false,"Key":25.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"875e4422-5ff1-429f-b010-07dcd9a0e0dd","path":"sprites/spr_happenings_red/spr_happenings_red.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"a609cf76-7e31-401e-9f69-864eeed79125","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"0776aab0-4b83-421d-b34e-a0a8e547af6f","path":"sprites/spr_happenings_red/spr_happenings_red.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"3f94f71d-4218-4c65-8562-932bc9aab55e","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"104f8e4e-ab5e-4090-a0b0-09c49401079c","path":"sprites/spr_happenings_red/spr_happenings_red.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"336b123b-c603-4911-a5ac-a943e4ab1cde","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"1f4ebf29-9c43-427c-b41a-4febf1346d2e","path":"sprites/spr_happenings_red/spr_happenings_red.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"ad31793a-0d2b-45df-8b1a-8111fa131e4a","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"ed375340-eb85-4e35-8853-8e2aee6158f7","path":"sprites/spr_happenings_red/spr_happenings_red.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"6f299a66-ecd2-437c-8a59-b6f1723872c9","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"7467dd9b-dc2f-4ba2-a8f3-866de70789c0","path":"sprites/spr_happenings_red/spr_happenings_red.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"48fa8cfc-885a-4522-bc2e-d06185e88936","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"8ca89c50-74ea-439e-8523-e29bbee491be","path":"sprites/spr_happenings_red/spr_happenings_red.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"342fcc76-339b-4687-a07d-c180450f3c16","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"6599305c-49fe-4081-9df0-062c0bbc4ab3","path":"sprites/spr_happenings_red/spr_happenings_red.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"b94f4dd1-b70c-4c68-b654-f81d679070ea","IsCreationKey":false,"Key":7.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"ce7c933c-d33d-4731-812f-ba20aa79c455","path":"sprites/spr_happenings_red/spr_happenings_red.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"4e7ed7e3-9268-4b60-a425-08216d48ab45","IsCreationKey":false,"Key":8.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"759e6bd7-3124-4ecd-80b2-24c5f141deac","path":"sprites/spr_happenings_red/spr_happenings_red.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"b4401e08-0451-4eb1-82a2-49f251e73782","IsCreationKey":false,"Key":9.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"a1520983-f5b1-48fc-9005-eb156b6d23f2","path":"sprites/spr_happenings_red/spr_happenings_red.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"28edf77c-81e6-41dc-aea5-ddbd45eedb24","IsCreationKey":false,"Key":10.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"986fe1b6-a5f3-4f25-b2f3-e22d72d878fe","path":"sprites/spr_happenings_red/spr_happenings_red.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"7afe7900-0c18-412f-a0b9-99b09b4fc907","IsCreationKey":false,"Key":11.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"fc58c4d0-0336-4946-9c6a-37233859677e","path":"sprites/spr_happenings_red/spr_happenings_red.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"b0559484-0dcc-4929-be8b-030fda2cd9f4","IsCreationKey":false,"Key":12.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"57293e1e-1ebe-465a-86e2-f399d62ec36a","path":"sprites/spr_happenings_red/spr_happenings_red.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"f08c81b4-d642-465a-9bcc-ff978084d5e6","IsCreationKey":false,"Key":13.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"7f30fa43-f771-4473-ae7f-8842fd842305","path":"sprites/spr_happenings_red/spr_happenings_red.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"b576b8c2-7730-49ba-b3af-8f041e6a7004","IsCreationKey":false,"Key":14.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"0a0c875f-5446-4d13-b3dd-c95e9faa65db","path":"sprites/spr_happenings_red/spr_happenings_red.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"44a1cae7-a20d-4769-b9d1-ff846d701be0","IsCreationKey":false,"Key":15.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"52f1e27b-7cb6-4fbf-adcf-8e41ff82389b","path":"sprites/spr_happenings_red/spr_happenings_red.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"c9977911-186b-4bb2-b96d-1335acd7ca1a","IsCreationKey":false,"Key":16.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"b956abf4-e68c-4dd8-b5a6-23e43628b07d","path":"sprites/spr_happenings_red/spr_happenings_red.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"6334c8b2-d4ee-4d7e-9f68-b05ffa179c00","IsCreationKey":false,"Key":17.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"ebb6819b-602f-4389-8bb5-4fd04def2f6d","path":"sprites/spr_happenings_red/spr_happenings_red.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"da60249f-07d2-49f5-a278-a58f76072e9e","IsCreationKey":false,"Key":18.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"9f1692f1-087f-4c1f-947b-4f20e9b18ee1","path":"sprites/spr_happenings_red/spr_happenings_red.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"c2245027-c0c6-462a-999c-70f5cd819845","IsCreationKey":false,"Key":19.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"75defacc-6f38-4352-aef7-fc555ee4287b","path":"sprites/spr_happenings_red/spr_happenings_red.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"94169a22-41e2-4c11-84d6-e84a40d73fa1","IsCreationKey":false,"Key":20.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"591c2f2a-35a8-47ee-a88d-2b2c05c9689e","path":"sprites/spr_happenings_red/spr_happenings_red.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"69343e54-7967-430b-ac91-3f2947665045","IsCreationKey":false,"Key":21.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"c684fa07-3dac-4eba-bfef-0fe387085f3c","path":"sprites/spr_happenings_red/spr_happenings_red.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"6c32821f-2eb0-47bd-b28c-ec5ef91289af","IsCreationKey":false,"Key":22.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"2d9bc79a-9105-4a68-9ab8-0dbb18f54bc5","path":"sprites/spr_happenings_red/spr_happenings_red.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"8def33c1-48c4-49ce-87b9-9b48767a4629","IsCreationKey":false,"Key":23.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"d38e55da-771c-4f5d-9066-e2e293ca559f","path":"sprites/spr_happenings_red/spr_happenings_red.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"30aeda48-f1b7-45e2-96ac-07343b38b05e","IsCreationKey":false,"Key":24.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"87a8e843-7d8f-40ed-91ca-bf83a5b9fe8f","path":"sprites/spr_happenings_red/spr_happenings_red.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"2a970055-ff2f-4335-a20b-baa03e7a902e","IsCreationKey":false,"Key":25.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":{ diff --git a/sprites/spr_happenings_white/spr_happenings_white.yy b/sprites/spr_happenings_white/spr_happenings_white.yy index 6eef554e3b..036e52f07e 100644 --- a/sprites/spr_happenings_white/spr_happenings_white.yy +++ b/sprites/spr_happenings_white/spr_happenings_white.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_happenings_white", "bboxMode":0, "bbox_bottom":26, @@ -12,32 +12,32 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"db366810-b7ef-4b06-a650-0ad031ea4030","name":"db366810-b7ef-4b06-a650-0ad031ea4030","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"bec5a8da-29d8-44ff-ab66-9a732260e0b7","name":"bec5a8da-29d8-44ff-ab66-9a732260e0b7","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"b147563a-a642-4b95-88ec-8b5c5fcd8c2a","name":"b147563a-a642-4b95-88ec-8b5c5fcd8c2a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"8771864d-ef78-4813-a122-52bdb867d7ac","name":"8771864d-ef78-4813-a122-52bdb867d7ac","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"25f82305-5ae9-4cf2-a0f7-83004a916244","name":"25f82305-5ae9-4cf2-a0f7-83004a916244","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"d34cfff3-6ff3-4190-b558-f948b52f7b9b","name":"d34cfff3-6ff3-4190-b558-f948b52f7b9b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"84bfc8ab-1d3e-4ef4-9feb-21f68e48657d","name":"84bfc8ab-1d3e-4ef4-9feb-21f68e48657d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"789318a1-bc9d-4d8d-9a61-9be44c0a316f","name":"789318a1-bc9d-4d8d-9a61-9be44c0a316f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"21f7e28a-eed5-4140-aecf-f05c28299a69","name":"21f7e28a-eed5-4140-aecf-f05c28299a69","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"9f6abc50-4135-4fe4-a51b-ca18c1f83cf6","name":"9f6abc50-4135-4fe4-a51b-ca18c1f83cf6","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"272cff7c-eb42-43a2-96f9-b4fc9dfb9cb3","name":"272cff7c-eb42-43a2-96f9-b4fc9dfb9cb3","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"df268304-3c52-4b1b-90b2-ada0aa9cb36c","name":"df268304-3c52-4b1b-90b2-ada0aa9cb36c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"74930daf-c3d9-40f6-a282-3f1d4eb13255","name":"74930daf-c3d9-40f6-a282-3f1d4eb13255","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"acc01f13-b505-469e-aade-3c7f016f5de6","name":"acc01f13-b505-469e-aade-3c7f016f5de6","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"df172a79-3eb7-4e71-abf0-298ac745e4c8","name":"df172a79-3eb7-4e71-abf0-298ac745e4c8","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"f3479f38-6d78-42c6-9775-655d05bbf083","name":"f3479f38-6d78-42c6-9775-655d05bbf083","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"f3303b30-741b-4fa7-952e-523e5e783594","name":"f3303b30-741b-4fa7-952e-523e5e783594","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"331973c7-e242-4724-bb8e-496be15657a5","name":"331973c7-e242-4724-bb8e-496be15657a5","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"28c90c11-c3c8-48d0-b230-c527837c2ed9","name":"28c90c11-c3c8-48d0-b230-c527837c2ed9","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"91e65543-2959-472c-b83a-1a4fd488da97","name":"91e65543-2959-472c-b83a-1a4fd488da97","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"d8be2f75-eb75-411c-a410-b1198688b5ed","name":"d8be2f75-eb75-411c-a410-b1198688b5ed","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"3a3cda4e-3a07-4424-993c-184058b527f4","name":"3a3cda4e-3a07-4424-993c-184058b527f4","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"3b42945c-b1d7-45fc-a1f7-6194f24b9bca","name":"3b42945c-b1d7-45fc-a1f7-6194f24b9bca","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"0ffa34ec-3ef0-4e8a-8ffb-e0b1fa45c1e9","name":"0ffa34ec-3ef0-4e8a-8ffb-e0b1fa45c1e9","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"7cd8bd1d-4d4b-4072-b23b-cd5d0203448a","name":"7cd8bd1d-4d4b-4072-b23b-cd5d0203448a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"4f01dbe5-fdd5-4643-8206-e365ccb951ae","name":"4f01dbe5-fdd5-4643-8206-e365ccb951ae","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"db366810-b7ef-4b06-a650-0ad031ea4030","name":"db366810-b7ef-4b06-a650-0ad031ea4030","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"bec5a8da-29d8-44ff-ab66-9a732260e0b7","name":"bec5a8da-29d8-44ff-ab66-9a732260e0b7","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"b147563a-a642-4b95-88ec-8b5c5fcd8c2a","name":"b147563a-a642-4b95-88ec-8b5c5fcd8c2a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"8771864d-ef78-4813-a122-52bdb867d7ac","name":"8771864d-ef78-4813-a122-52bdb867d7ac","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"25f82305-5ae9-4cf2-a0f7-83004a916244","name":"25f82305-5ae9-4cf2-a0f7-83004a916244","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"d34cfff3-6ff3-4190-b558-f948b52f7b9b","name":"d34cfff3-6ff3-4190-b558-f948b52f7b9b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"84bfc8ab-1d3e-4ef4-9feb-21f68e48657d","name":"84bfc8ab-1d3e-4ef4-9feb-21f68e48657d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"789318a1-bc9d-4d8d-9a61-9be44c0a316f","name":"789318a1-bc9d-4d8d-9a61-9be44c0a316f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"21f7e28a-eed5-4140-aecf-f05c28299a69","name":"21f7e28a-eed5-4140-aecf-f05c28299a69","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"9f6abc50-4135-4fe4-a51b-ca18c1f83cf6","name":"9f6abc50-4135-4fe4-a51b-ca18c1f83cf6","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"272cff7c-eb42-43a2-96f9-b4fc9dfb9cb3","name":"272cff7c-eb42-43a2-96f9-b4fc9dfb9cb3","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"df268304-3c52-4b1b-90b2-ada0aa9cb36c","name":"df268304-3c52-4b1b-90b2-ada0aa9cb36c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"74930daf-c3d9-40f6-a282-3f1d4eb13255","name":"74930daf-c3d9-40f6-a282-3f1d4eb13255","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"acc01f13-b505-469e-aade-3c7f016f5de6","name":"acc01f13-b505-469e-aade-3c7f016f5de6","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"df172a79-3eb7-4e71-abf0-298ac745e4c8","name":"df172a79-3eb7-4e71-abf0-298ac745e4c8","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"f3479f38-6d78-42c6-9775-655d05bbf083","name":"f3479f38-6d78-42c6-9775-655d05bbf083","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"f3303b30-741b-4fa7-952e-523e5e783594","name":"f3303b30-741b-4fa7-952e-523e5e783594","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"331973c7-e242-4724-bb8e-496be15657a5","name":"331973c7-e242-4724-bb8e-496be15657a5","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"28c90c11-c3c8-48d0-b230-c527837c2ed9","name":"28c90c11-c3c8-48d0-b230-c527837c2ed9","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"91e65543-2959-472c-b83a-1a4fd488da97","name":"91e65543-2959-472c-b83a-1a4fd488da97","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"d8be2f75-eb75-411c-a410-b1198688b5ed","name":"d8be2f75-eb75-411c-a410-b1198688b5ed","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"3a3cda4e-3a07-4424-993c-184058b527f4","name":"3a3cda4e-3a07-4424-993c-184058b527f4","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"3b42945c-b1d7-45fc-a1f7-6194f24b9bca","name":"3b42945c-b1d7-45fc-a1f7-6194f24b9bca","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"0ffa34ec-3ef0-4e8a-8ffb-e0b1fa45c1e9","name":"0ffa34ec-3ef0-4e8a-8ffb-e0b1fa45c1e9","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"7cd8bd1d-4d4b-4072-b23b-cd5d0203448a","name":"7cd8bd1d-4d4b-4072-b23b-cd5d0203448a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"4f01dbe5-fdd5-4643-8206-e365ccb951ae","name":"4f01dbe5-fdd5-4643-8206-e365ccb951ae","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -93,84 +93,32 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"db366810-b7ef-4b06-a650-0ad031ea4030","path":"sprites/spr_happenings_white/spr_happenings_white.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"9cbeabb6-aaed-49a4-b008-a6ba9d93b0fc","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"bec5a8da-29d8-44ff-ab66-9a732260e0b7","path":"sprites/spr_happenings_white/spr_happenings_white.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"5ca8f550-2f9c-4ffe-a890-cff8f343a6ff","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"b147563a-a642-4b95-88ec-8b5c5fcd8c2a","path":"sprites/spr_happenings_white/spr_happenings_white.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"4ca19cbb-adb7-416c-921e-de5fcf67e097","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"8771864d-ef78-4813-a122-52bdb867d7ac","path":"sprites/spr_happenings_white/spr_happenings_white.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"4b1d1f6a-2654-4d3d-9cb4-2175b67be6cb","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"25f82305-5ae9-4cf2-a0f7-83004a916244","path":"sprites/spr_happenings_white/spr_happenings_white.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"24513b92-e2f4-406c-92a3-52623989e130","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"d34cfff3-6ff3-4190-b558-f948b52f7b9b","path":"sprites/spr_happenings_white/spr_happenings_white.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"91eab546-b11c-4839-a684-cfb240728268","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"84bfc8ab-1d3e-4ef4-9feb-21f68e48657d","path":"sprites/spr_happenings_white/spr_happenings_white.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"da8c2012-fa1a-47e0-98e8-39fbbcc4666b","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"789318a1-bc9d-4d8d-9a61-9be44c0a316f","path":"sprites/spr_happenings_white/spr_happenings_white.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"294b2f0b-cc43-48da-94b1-95dabb64ec4b","IsCreationKey":false,"Key":7.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"21f7e28a-eed5-4140-aecf-f05c28299a69","path":"sprites/spr_happenings_white/spr_happenings_white.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"5e053276-a55a-4ec7-84ab-3f03c59eb876","IsCreationKey":false,"Key":8.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"9f6abc50-4135-4fe4-a51b-ca18c1f83cf6","path":"sprites/spr_happenings_white/spr_happenings_white.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"2ac04e0b-0322-4ce5-8479-aa2b9f2298c1","IsCreationKey":false,"Key":9.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"272cff7c-eb42-43a2-96f9-b4fc9dfb9cb3","path":"sprites/spr_happenings_white/spr_happenings_white.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"7dc53e61-8cd1-42f9-bcd7-d8ff4a4b2664","IsCreationKey":false,"Key":10.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"df268304-3c52-4b1b-90b2-ada0aa9cb36c","path":"sprites/spr_happenings_white/spr_happenings_white.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"04ba7220-c090-48f1-b218-bc570efd422f","IsCreationKey":false,"Key":11.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"74930daf-c3d9-40f6-a282-3f1d4eb13255","path":"sprites/spr_happenings_white/spr_happenings_white.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"02350b0d-6f36-426e-a0b7-227bc38ed5f7","IsCreationKey":false,"Key":12.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"acc01f13-b505-469e-aade-3c7f016f5de6","path":"sprites/spr_happenings_white/spr_happenings_white.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"6450e76b-1b9d-42ca-b486-fb40dbe96b6e","IsCreationKey":false,"Key":13.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"df172a79-3eb7-4e71-abf0-298ac745e4c8","path":"sprites/spr_happenings_white/spr_happenings_white.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"c5eb6695-00a5-41f8-99b0-09e4e6691c36","IsCreationKey":false,"Key":14.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"f3479f38-6d78-42c6-9775-655d05bbf083","path":"sprites/spr_happenings_white/spr_happenings_white.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"c6ecc1b0-f532-4c2e-9686-348aee0c3eab","IsCreationKey":false,"Key":15.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"f3303b30-741b-4fa7-952e-523e5e783594","path":"sprites/spr_happenings_white/spr_happenings_white.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"a986ca6c-7ef4-4a1a-af74-c690f91294eb","IsCreationKey":false,"Key":16.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"331973c7-e242-4724-bb8e-496be15657a5","path":"sprites/spr_happenings_white/spr_happenings_white.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"5780f91e-608a-418f-951c-9b15d119cf10","IsCreationKey":false,"Key":17.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"28c90c11-c3c8-48d0-b230-c527837c2ed9","path":"sprites/spr_happenings_white/spr_happenings_white.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"af3fcc7e-3102-4cdb-92a6-111103806493","IsCreationKey":false,"Key":18.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"91e65543-2959-472c-b83a-1a4fd488da97","path":"sprites/spr_happenings_white/spr_happenings_white.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"8f2cba20-6809-4814-a71a-863fc204969e","IsCreationKey":false,"Key":19.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"d8be2f75-eb75-411c-a410-b1198688b5ed","path":"sprites/spr_happenings_white/spr_happenings_white.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"08a26015-f688-4ef0-ae06-d5ecf8f7229d","IsCreationKey":false,"Key":20.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"3a3cda4e-3a07-4424-993c-184058b527f4","path":"sprites/spr_happenings_white/spr_happenings_white.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"6a5a0bad-2ac5-42f2-8a58-b3b3e1198fda","IsCreationKey":false,"Key":21.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"3b42945c-b1d7-45fc-a1f7-6194f24b9bca","path":"sprites/spr_happenings_white/spr_happenings_white.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"6a4cae83-48f2-4369-84bb-86f419daed59","IsCreationKey":false,"Key":22.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"0ffa34ec-3ef0-4e8a-8ffb-e0b1fa45c1e9","path":"sprites/spr_happenings_white/spr_happenings_white.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"cf2fdd01-afe2-42fb-91cb-106d177a3348","IsCreationKey":false,"Key":23.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"7cd8bd1d-4d4b-4072-b23b-cd5d0203448a","path":"sprites/spr_happenings_white/spr_happenings_white.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"59fc8afd-1c93-4a1f-b5cf-77fa8a5cb735","IsCreationKey":false,"Key":24.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"4f01dbe5-fdd5-4643-8206-e365ccb951ae","path":"sprites/spr_happenings_white/spr_happenings_white.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"e71a3f77-80c6-46fa-947b-e77c44d1942f","IsCreationKey":false,"Key":25.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"db366810-b7ef-4b06-a650-0ad031ea4030","path":"sprites/spr_happenings_white/spr_happenings_white.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"9cbeabb6-aaed-49a4-b008-a6ba9d93b0fc","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"bec5a8da-29d8-44ff-ab66-9a732260e0b7","path":"sprites/spr_happenings_white/spr_happenings_white.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"5ca8f550-2f9c-4ffe-a890-cff8f343a6ff","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"b147563a-a642-4b95-88ec-8b5c5fcd8c2a","path":"sprites/spr_happenings_white/spr_happenings_white.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"4ca19cbb-adb7-416c-921e-de5fcf67e097","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"8771864d-ef78-4813-a122-52bdb867d7ac","path":"sprites/spr_happenings_white/spr_happenings_white.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"4b1d1f6a-2654-4d3d-9cb4-2175b67be6cb","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"25f82305-5ae9-4cf2-a0f7-83004a916244","path":"sprites/spr_happenings_white/spr_happenings_white.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"24513b92-e2f4-406c-92a3-52623989e130","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"d34cfff3-6ff3-4190-b558-f948b52f7b9b","path":"sprites/spr_happenings_white/spr_happenings_white.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"91eab546-b11c-4839-a684-cfb240728268","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"84bfc8ab-1d3e-4ef4-9feb-21f68e48657d","path":"sprites/spr_happenings_white/spr_happenings_white.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"da8c2012-fa1a-47e0-98e8-39fbbcc4666b","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"789318a1-bc9d-4d8d-9a61-9be44c0a316f","path":"sprites/spr_happenings_white/spr_happenings_white.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"294b2f0b-cc43-48da-94b1-95dabb64ec4b","IsCreationKey":false,"Key":7.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"21f7e28a-eed5-4140-aecf-f05c28299a69","path":"sprites/spr_happenings_white/spr_happenings_white.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"5e053276-a55a-4ec7-84ab-3f03c59eb876","IsCreationKey":false,"Key":8.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"9f6abc50-4135-4fe4-a51b-ca18c1f83cf6","path":"sprites/spr_happenings_white/spr_happenings_white.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"2ac04e0b-0322-4ce5-8479-aa2b9f2298c1","IsCreationKey":false,"Key":9.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"272cff7c-eb42-43a2-96f9-b4fc9dfb9cb3","path":"sprites/spr_happenings_white/spr_happenings_white.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"7dc53e61-8cd1-42f9-bcd7-d8ff4a4b2664","IsCreationKey":false,"Key":10.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"df268304-3c52-4b1b-90b2-ada0aa9cb36c","path":"sprites/spr_happenings_white/spr_happenings_white.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"04ba7220-c090-48f1-b218-bc570efd422f","IsCreationKey":false,"Key":11.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"74930daf-c3d9-40f6-a282-3f1d4eb13255","path":"sprites/spr_happenings_white/spr_happenings_white.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"02350b0d-6f36-426e-a0b7-227bc38ed5f7","IsCreationKey":false,"Key":12.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"acc01f13-b505-469e-aade-3c7f016f5de6","path":"sprites/spr_happenings_white/spr_happenings_white.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"6450e76b-1b9d-42ca-b486-fb40dbe96b6e","IsCreationKey":false,"Key":13.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"df172a79-3eb7-4e71-abf0-298ac745e4c8","path":"sprites/spr_happenings_white/spr_happenings_white.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"c5eb6695-00a5-41f8-99b0-09e4e6691c36","IsCreationKey":false,"Key":14.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"f3479f38-6d78-42c6-9775-655d05bbf083","path":"sprites/spr_happenings_white/spr_happenings_white.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"c6ecc1b0-f532-4c2e-9686-348aee0c3eab","IsCreationKey":false,"Key":15.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"f3303b30-741b-4fa7-952e-523e5e783594","path":"sprites/spr_happenings_white/spr_happenings_white.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"a986ca6c-7ef4-4a1a-af74-c690f91294eb","IsCreationKey":false,"Key":16.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"331973c7-e242-4724-bb8e-496be15657a5","path":"sprites/spr_happenings_white/spr_happenings_white.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"5780f91e-608a-418f-951c-9b15d119cf10","IsCreationKey":false,"Key":17.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"28c90c11-c3c8-48d0-b230-c527837c2ed9","path":"sprites/spr_happenings_white/spr_happenings_white.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"af3fcc7e-3102-4cdb-92a6-111103806493","IsCreationKey":false,"Key":18.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"91e65543-2959-472c-b83a-1a4fd488da97","path":"sprites/spr_happenings_white/spr_happenings_white.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"8f2cba20-6809-4814-a71a-863fc204969e","IsCreationKey":false,"Key":19.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"d8be2f75-eb75-411c-a410-b1198688b5ed","path":"sprites/spr_happenings_white/spr_happenings_white.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"08a26015-f688-4ef0-ae06-d5ecf8f7229d","IsCreationKey":false,"Key":20.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"3a3cda4e-3a07-4424-993c-184058b527f4","path":"sprites/spr_happenings_white/spr_happenings_white.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"6a5a0bad-2ac5-42f2-8a58-b3b3e1198fda","IsCreationKey":false,"Key":21.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"3b42945c-b1d7-45fc-a1f7-6194f24b9bca","path":"sprites/spr_happenings_white/spr_happenings_white.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"6a4cae83-48f2-4369-84bb-86f419daed59","IsCreationKey":false,"Key":22.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"0ffa34ec-3ef0-4e8a-8ffb-e0b1fa45c1e9","path":"sprites/spr_happenings_white/spr_happenings_white.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"cf2fdd01-afe2-42fb-91cb-106d177a3348","IsCreationKey":false,"Key":23.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"7cd8bd1d-4d4b-4072-b23b-cd5d0203448a","path":"sprites/spr_happenings_white/spr_happenings_white.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"59fc8afd-1c93-4a1f-b5cf-77fa8a5cb735","IsCreationKey":false,"Key":24.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"4f01dbe5-fdd5-4643-8206-e365ccb951ae","path":"sprites/spr_happenings_white/spr_happenings_white.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"e71a3f77-80c6-46fa-947b-e77c44d1942f","IsCreationKey":false,"Key":25.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":{ diff --git a/sprites/spr_hazzard_texture/spr_hazzard_texture.yy b/sprites/spr_hazzard_texture/spr_hazzard_texture.yy index 30d3a06da5..a4d666beef 100644 --- a/sprites/spr_hazzard_texture/spr_hazzard_texture.yy +++ b/sprites/spr_hazzard_texture/spr_hazzard_texture.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_hazzard_texture", "bboxMode":0, "bbox_bottom":179, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":true, "frames":[ - {"$GMSpriteFrame":"","%Name":"58ee1e71-509f-4b0e-ab39-17c8da2a0687","name":"58ee1e71-509f-4b0e-ab39-17c8da2a0687","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"58ee1e71-509f-4b0e-ab39-17c8da2a0687","name":"58ee1e71-509f-4b0e-ab39-17c8da2a0687","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -33,13 +33,7 @@ "resourceType":"GMNineSliceData", "resourceVersion":"2.0", "right":0, - "tileMode":[ - 0, - 0, - 0, - 0, - 0, - ], + "tileMode":[0,0,0,0,0,], "top":0, }, "origin":0, @@ -87,9 +81,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"58ee1e71-509f-4b0e-ab39-17c8da2a0687","path":"sprites/spr_hazzard_texture/spr_hazzard_texture.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"0091329d-a69b-44eb-84c6-f0a31350ebd2","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"58ee1e71-509f-4b0e-ab39-17c8da2a0687","path":"sprites/spr_hazzard_texture/spr_hazzard_texture.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"0091329d-a69b-44eb-84c6-f0a31350ebd2","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_helm_decorations/spr_helm_decorations.yy b/sprites/spr_helm_decorations/spr_helm_decorations.yy index 3000e7f7ba..be5026ea12 100644 --- a/sprites/spr_helm_decorations/spr_helm_decorations.yy +++ b/sprites/spr_helm_decorations/spr_helm_decorations.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_helm_decorations", "bboxMode":0, "bbox_bottom":78, @@ -12,8 +12,8 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"61531cde-cd44-4806-ae39-3c63f51d65de","name":"61531cde-cd44-4806-ae39-3c63f51d65de","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"3dbaa400-5fe2-498d-abd8-9cc4b2bda693","name":"3dbaa400-5fe2-498d-abd8-9cc4b2bda693","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$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, @@ -69,12 +69,8 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"61531cde-cd44-4806-ae39-3c63f51d65de","path":"sprites/spr_helm_decorations/spr_helm_decorations.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"25bce6ef-bdd2-4be3-a82b-d734bbd145b9","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"3dbaa400-5fe2-498d-abd8-9cc4b2bda693","path":"sprites/spr_helm_decorations/spr_helm_decorations.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"3fc23822-665e-44b1-b83d-a76e40600b42","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"61531cde-cd44-4806-ae39-3c63f51d65de","path":"sprites/spr_helm_decorations/spr_helm_decorations.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"25bce6ef-bdd2-4be3-a82b-d734bbd145b9","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"3dbaa400-5fe2-498d-abd8-9cc4b2bda693","path":"sprites/spr_helm_decorations/spr_helm_decorations.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"3fc23822-665e-44b1-b83d-a76e40600b42","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_helm_stripe/spr_helm_stripe.yy b/sprites/spr_helm_stripe/spr_helm_stripe.yy index 7ad442efe7..7bfd4f2a8d 100644 --- a/sprites/spr_helm_stripe/spr_helm_stripe.yy +++ b/sprites/spr_helm_stripe/spr_helm_stripe.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_helm_stripe", "bboxMode":0, "bbox_bottom":231, @@ -12,9 +12,9 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"f4fe527e-74d7-4032-a5e4-f08cd296d221","name":"f4fe527e-74d7-4032-a5e4-f08cd296d221","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"f9679102-ac16-49be-81c7-a76859c91828","name":"f9679102-ac16-49be-81c7-a76859c91828","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"f16d60e8-3436-42e4-8ada-e41323378a0d","name":"f16d60e8-3436-42e4-8ada-e41323378a0d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"f4fe527e-74d7-4032-a5e4-f08cd296d221","name":"f4fe527e-74d7-4032-a5e4-f08cd296d221","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"f9679102-ac16-49be-81c7-a76859c91828","name":"f9679102-ac16-49be-81c7-a76859c91828","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"f16d60e8-3436-42e4-8ada-e41323378a0d","name":"f16d60e8-3436-42e4-8ada-e41323378a0d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -71,15 +71,9 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"f4fe527e-74d7-4032-a5e4-f08cd296d221","path":"sprites/spr_helm_stripe/spr_helm_stripe.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"26f4dee6-051e-44b1-8d1e-45ba7e50c7a4","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"f9679102-ac16-49be-81c7-a76859c91828","path":"sprites/spr_helm_stripe/spr_helm_stripe.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"d4df215c-c404-4a0e-8307-02db1fc14b69","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"f16d60e8-3436-42e4-8ada-e41323378a0d","path":"sprites/spr_helm_stripe/spr_helm_stripe.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"43761bf0-cda0-4e6b-b420-5e4d14aa3afc","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"f4fe527e-74d7-4032-a5e4-f08cd296d221","path":"sprites/spr_helm_stripe/spr_helm_stripe.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"26f4dee6-051e-44b1-8d1e-45ba7e50c7a4","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"f9679102-ac16-49be-81c7-a76859c91828","path":"sprites/spr_helm_stripe/spr_helm_stripe.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"d4df215c-c404-4a0e-8307-02db1fc14b69","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"f16d60e8-3436-42e4-8ada-e41323378a0d","path":"sprites/spr_helm_stripe/spr_helm_stripe.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"43761bf0-cda0-4e6b-b420-5e4d14aa3afc","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_helm_stripe_term/spr_helm_stripe_term.yy b/sprites/spr_helm_stripe_term/spr_helm_stripe_term.yy index ceb7790f38..ae1af94e1a 100644 --- a/sprites/spr_helm_stripe_term/spr_helm_stripe_term.yy +++ b/sprites/spr_helm_stripe_term/spr_helm_stripe_term.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_helm_stripe_term", "bboxMode":0, "bbox_bottom":63, @@ -12,8 +12,8 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"f9679102-ac16-49be-81c7-a76859c91828","name":"f9679102-ac16-49be-81c7-a76859c91828","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"f16d60e8-3436-42e4-8ada-e41323378a0d","name":"f16d60e8-3436-42e4-8ada-e41323378a0d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"f9679102-ac16-49be-81c7-a76859c91828","name":"f9679102-ac16-49be-81c7-a76859c91828","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"f16d60e8-3436-42e4-8ada-e41323378a0d","name":"f16d60e8-3436-42e4-8ada-e41323378a0d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -70,12 +70,8 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"f9679102-ac16-49be-81c7-a76859c91828","path":"sprites/spr_helm_stripe_term/spr_helm_stripe_term.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"d62a43af-319b-4d46-8e60-6ad0bc3bb267","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"f16d60e8-3436-42e4-8ada-e41323378a0d","path":"sprites/spr_helm_stripe_term/spr_helm_stripe_term.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"f7c65181-363a-4a1c-9a7e-30f58343e90f","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"f9679102-ac16-49be-81c7-a76859c91828","path":"sprites/spr_helm_stripe_term/spr_helm_stripe_term.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"d62a43af-319b-4d46-8e60-6ad0bc3bb267","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"f16d60e8-3436-42e4-8ada-e41323378a0d","path":"sprites/spr_helm_stripe_term/spr_helm_stripe_term.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"f7c65181-363a-4a1c-9a7e-30f58343e90f","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_help_exit/spr_help_exit.yy b/sprites/spr_help_exit/spr_help_exit.yy index ac6e2c280b..28fc9cf024 100644 --- a/sprites/spr_help_exit/spr_help_exit.yy +++ b/sprites/spr_help_exit/spr_help_exit.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_help_exit", "bboxMode":0, "bbox_bottom":32, @@ -12,8 +12,8 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"de989a75-8166-4e04-9fc0-52e6a861158c","name":"de989a75-8166-4e04-9fc0-52e6a861158c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"80ce6140-4a2b-4591-9ad1-818bd4ca40cb","name":"80ce6140-4a2b-4591-9ad1-818bd4ca40cb","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"de989a75-8166-4e04-9fc0-52e6a861158c","name":"de989a75-8166-4e04-9fc0-52e6a861158c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"80ce6140-4a2b-4591-9ad1-818bd4ca40cb","name":"80ce6140-4a2b-4591-9ad1-818bd4ca40cb","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -69,12 +69,8 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"de989a75-8166-4e04-9fc0-52e6a861158c","path":"sprites/spr_help_exit/spr_help_exit.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"bc4106cf-31bb-4712-b9dc-24942e618f2f","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"80ce6140-4a2b-4591-9ad1-818bd4ca40cb","path":"sprites/spr_help_exit/spr_help_exit.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"2fc7b99b-32a5-4343-8381-8fd66d7eb02e","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"de989a75-8166-4e04-9fc0-52e6a861158c","path":"sprites/spr_help_exit/spr_help_exit.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"bc4106cf-31bb-4712-b9dc-24942e618f2f","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"80ce6140-4a2b-4591-9ad1-818bd4ca40cb","path":"sprites/spr_help_exit/spr_help_exit.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"2fc7b99b-32a5-4343-8381-8fd66d7eb02e","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":{ diff --git a/sprites/spr_help_panel/spr_help_panel.yy b/sprites/spr_help_panel/spr_help_panel.yy index 6990e48d70..2d870889f9 100644 --- a/sprites/spr_help_panel/spr_help_panel.yy +++ b/sprites/spr_help_panel/spr_help_panel.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_help_panel", "bboxMode":0, "bbox_bottom":833, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"e1055a25-a03c-463a-884a-257874dac353","name":"e1055a25-a03c-463a-884a-257874dac353","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"e1055a25-a03c-463a-884a-257874dac353","name":"e1055a25-a03c-463a-884a-257874dac353","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"e1055a25-a03c-463a-884a-257874dac353","path":"sprites/spr_help_panel/spr_help_panel.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"49bddd04-a0a1-47fa-b516-17ec9434cf54","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"e1055a25-a03c-463a-884a-257874dac353","path":"sprites/spr_help_panel/spr_help_panel.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"49bddd04-a0a1-47fa-b516-17ec9434cf54","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_heresy_colors/spr_heresy_colors.yy b/sprites/spr_heresy_colors/spr_heresy_colors.yy index c83332bdf0..bf84655cd5 100644 --- a/sprites/spr_heresy_colors/spr_heresy_colors.yy +++ b/sprites/spr_heresy_colors/spr_heresy_colors.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_heresy_colors", "bboxMode":0, "bbox_bottom":221, @@ -12,19 +12,19 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"efad9889-e5a3-4dff-b1b5-a71f3d1efe66","name":"efad9889-e5a3-4dff-b1b5-a71f3d1efe66","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"d51f983a-1596-4dfa-a471-604575f8d758","name":"d51f983a-1596-4dfa-a471-604575f8d758","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"78d16c23-bebd-4773-9ae6-0e3b87a4fa74","name":"78d16c23-bebd-4773-9ae6-0e3b87a4fa74","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"2911ab4b-5f10-490e-8d4a-b378f70d4776","name":"2911ab4b-5f10-490e-8d4a-b378f70d4776","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"ca1dc041-04c2-42de-ba8f-367d17ebbaef","name":"ca1dc041-04c2-42de-ba8f-367d17ebbaef","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"493e74a6-0b54-43ee-bba5-a53005b9f601","name":"493e74a6-0b54-43ee-bba5-a53005b9f601","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"b1e887a9-9646-488d-91fa-7f71cbc257d4","name":"b1e887a9-9646-488d-91fa-7f71cbc257d4","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"63ab01ac-d593-43fe-b2f8-3fae21ad8a70","name":"63ab01ac-d593-43fe-b2f8-3fae21ad8a70","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"1947bde9-4bac-457b-b372-06b6b6c3a8b2","name":"1947bde9-4bac-457b-b372-06b6b6c3a8b2","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"d81d991c-217b-466a-817a-a195815277d7","name":"d81d991c-217b-466a-817a-a195815277d7","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"d5fca723-ed0a-493b-abfd-dd39d423f991","name":"d5fca723-ed0a-493b-abfd-dd39d423f991","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"9b0f363d-67cc-474a-83f2-88f783b12bd3","name":"9b0f363d-67cc-474a-83f2-88f783b12bd3","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"961521f2-a3f0-462d-9c13-369f928b5594","name":"961521f2-a3f0-462d-9c13-369f928b5594","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"efad9889-e5a3-4dff-b1b5-a71f3d1efe66","name":"efad9889-e5a3-4dff-b1b5-a71f3d1efe66","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"d51f983a-1596-4dfa-a471-604575f8d758","name":"d51f983a-1596-4dfa-a471-604575f8d758","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"78d16c23-bebd-4773-9ae6-0e3b87a4fa74","name":"78d16c23-bebd-4773-9ae6-0e3b87a4fa74","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"2911ab4b-5f10-490e-8d4a-b378f70d4776","name":"2911ab4b-5f10-490e-8d4a-b378f70d4776","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"ca1dc041-04c2-42de-ba8f-367d17ebbaef","name":"ca1dc041-04c2-42de-ba8f-367d17ebbaef","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"493e74a6-0b54-43ee-bba5-a53005b9f601","name":"493e74a6-0b54-43ee-bba5-a53005b9f601","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"b1e887a9-9646-488d-91fa-7f71cbc257d4","name":"b1e887a9-9646-488d-91fa-7f71cbc257d4","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"63ab01ac-d593-43fe-b2f8-3fae21ad8a70","name":"63ab01ac-d593-43fe-b2f8-3fae21ad8a70","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"1947bde9-4bac-457b-b372-06b6b6c3a8b2","name":"1947bde9-4bac-457b-b372-06b6b6c3a8b2","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"d81d991c-217b-466a-817a-a195815277d7","name":"d81d991c-217b-466a-817a-a195815277d7","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"d5fca723-ed0a-493b-abfd-dd39d423f991","name":"d5fca723-ed0a-493b-abfd-dd39d423f991","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"9b0f363d-67cc-474a-83f2-88f783b12bd3","name":"9b0f363d-67cc-474a-83f2-88f783b12bd3","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"961521f2-a3f0-462d-9c13-369f928b5594","name":"961521f2-a3f0-462d-9c13-369f928b5594","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -80,45 +80,19 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"efad9889-e5a3-4dff-b1b5-a71f3d1efe66","path":"sprites/spr_heresy_colors/spr_heresy_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"8298aad2-b42d-4fac-be2a-e0225796cc6a","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"d51f983a-1596-4dfa-a471-604575f8d758","path":"sprites/spr_heresy_colors/spr_heresy_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"92f17322-5cee-446a-9f52-d795abd1269b","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"78d16c23-bebd-4773-9ae6-0e3b87a4fa74","path":"sprites/spr_heresy_colors/spr_heresy_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"24ee9754-534c-4a1b-a134-0f261e8671e1","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"2911ab4b-5f10-490e-8d4a-b378f70d4776","path":"sprites/spr_heresy_colors/spr_heresy_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"8f5633d0-4c0d-4b89-8384-14ae90b765de","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"ca1dc041-04c2-42de-ba8f-367d17ebbaef","path":"sprites/spr_heresy_colors/spr_heresy_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"cad6a3e4-90b4-4185-be91-04e126c0bc69","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"493e74a6-0b54-43ee-bba5-a53005b9f601","path":"sprites/spr_heresy_colors/spr_heresy_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"442bb12f-fd34-4feb-a3de-72114e1520dd","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"b1e887a9-9646-488d-91fa-7f71cbc257d4","path":"sprites/spr_heresy_colors/spr_heresy_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"4e2969f2-69e9-4b4f-a20c-a6dca07aba49","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"63ab01ac-d593-43fe-b2f8-3fae21ad8a70","path":"sprites/spr_heresy_colors/spr_heresy_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"d9542367-f514-4fef-a384-d649a4b8b12c","IsCreationKey":false,"Key":7.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"1947bde9-4bac-457b-b372-06b6b6c3a8b2","path":"sprites/spr_heresy_colors/spr_heresy_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"5f42b48a-0df1-4671-8ee0-b2d1b3b33f85","IsCreationKey":false,"Key":8.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"d81d991c-217b-466a-817a-a195815277d7","path":"sprites/spr_heresy_colors/spr_heresy_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"948fb262-714f-4969-9b99-c288abed38cc","IsCreationKey":false,"Key":9.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"d5fca723-ed0a-493b-abfd-dd39d423f991","path":"sprites/spr_heresy_colors/spr_heresy_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"86a1471b-a052-465b-817d-27abe3c5e2f4","IsCreationKey":false,"Key":10.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"9b0f363d-67cc-474a-83f2-88f783b12bd3","path":"sprites/spr_heresy_colors/spr_heresy_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"ae72bc80-d47c-4ae1-adcd-318f9598633c","IsCreationKey":false,"Key":11.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"961521f2-a3f0-462d-9c13-369f928b5594","path":"sprites/spr_heresy_colors/spr_heresy_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"d9df8149-3c9e-4887-b45a-8fb96a47f66d","IsCreationKey":false,"Key":12.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"efad9889-e5a3-4dff-b1b5-a71f3d1efe66","path":"sprites/spr_heresy_colors/spr_heresy_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"8298aad2-b42d-4fac-be2a-e0225796cc6a","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"d51f983a-1596-4dfa-a471-604575f8d758","path":"sprites/spr_heresy_colors/spr_heresy_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"92f17322-5cee-446a-9f52-d795abd1269b","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"78d16c23-bebd-4773-9ae6-0e3b87a4fa74","path":"sprites/spr_heresy_colors/spr_heresy_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"24ee9754-534c-4a1b-a134-0f261e8671e1","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"2911ab4b-5f10-490e-8d4a-b378f70d4776","path":"sprites/spr_heresy_colors/spr_heresy_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"8f5633d0-4c0d-4b89-8384-14ae90b765de","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"ca1dc041-04c2-42de-ba8f-367d17ebbaef","path":"sprites/spr_heresy_colors/spr_heresy_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"cad6a3e4-90b4-4185-be91-04e126c0bc69","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"493e74a6-0b54-43ee-bba5-a53005b9f601","path":"sprites/spr_heresy_colors/spr_heresy_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"442bb12f-fd34-4feb-a3de-72114e1520dd","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"b1e887a9-9646-488d-91fa-7f71cbc257d4","path":"sprites/spr_heresy_colors/spr_heresy_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"4e2969f2-69e9-4b4f-a20c-a6dca07aba49","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"63ab01ac-d593-43fe-b2f8-3fae21ad8a70","path":"sprites/spr_heresy_colors/spr_heresy_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"d9542367-f514-4fef-a384-d649a4b8b12c","IsCreationKey":false,"Key":7.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"1947bde9-4bac-457b-b372-06b6b6c3a8b2","path":"sprites/spr_heresy_colors/spr_heresy_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"5f42b48a-0df1-4671-8ee0-b2d1b3b33f85","IsCreationKey":false,"Key":8.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"d81d991c-217b-466a-817a-a195815277d7","path":"sprites/spr_heresy_colors/spr_heresy_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"948fb262-714f-4969-9b99-c288abed38cc","IsCreationKey":false,"Key":9.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"d5fca723-ed0a-493b-abfd-dd39d423f991","path":"sprites/spr_heresy_colors/spr_heresy_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"86a1471b-a052-465b-817d-27abe3c5e2f4","IsCreationKey":false,"Key":10.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"9b0f363d-67cc-474a-83f2-88f783b12bd3","path":"sprites/spr_heresy_colors/spr_heresy_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"ae72bc80-d47c-4ae1-adcd-318f9598633c","IsCreationKey":false,"Key":11.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"961521f2-a3f0-462d-9c13-369f928b5594","path":"sprites/spr_heresy_colors/spr_heresy_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"d9df8149-3c9e-4887-b45a-8fb96a47f66d","IsCreationKey":false,"Key":12.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_hero/spr_hero.yy b/sprites/spr_hero/spr_hero.yy index af7f3fdbcb..171adee5cc 100644 --- a/sprites/spr_hero/spr_hero.yy +++ b/sprites/spr_hero/spr_hero.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_hero", "bboxMode":0, "bbox_bottom":49, @@ -12,22 +12,22 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"9b5e1d94-bfaa-4717-b12c-7706b8d42a5e","name":"9b5e1d94-bfaa-4717-b12c-7706b8d42a5e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"f86f349e-9753-4ec9-b3a7-51f38648f98c","name":"f86f349e-9753-4ec9-b3a7-51f38648f98c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"233a96d2-66b0-4ee9-9f35-4c818ad485a7","name":"233a96d2-66b0-4ee9-9f35-4c818ad485a7","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"e8b1c231-1ad6-4e0d-8ceb-adf2302e8bb4","name":"e8b1c231-1ad6-4e0d-8ceb-adf2302e8bb4","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"e9fc3491-c582-4071-b70b-5e4839b09dc4","name":"e9fc3491-c582-4071-b70b-5e4839b09dc4","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"bfb8fda0-a02a-4869-8600-efb3715721cd","name":"bfb8fda0-a02a-4869-8600-efb3715721cd","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"5d7195bf-80e2-4ec2-ac95-a4557f5cff54","name":"5d7195bf-80e2-4ec2-ac95-a4557f5cff54","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"a6039e82-d38e-4232-9f84-e648009998f7","name":"a6039e82-d38e-4232-9f84-e648009998f7","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"66704094-4abc-4a6e-b4fc-acf5cafc75f0","name":"66704094-4abc-4a6e-b4fc-acf5cafc75f0","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"ef84ad8d-e32a-4e39-acdb-782789771b91","name":"ef84ad8d-e32a-4e39-acdb-782789771b91","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"c7cc2d6d-a356-4678-b8ae-5c8972d464ca","name":"c7cc2d6d-a356-4678-b8ae-5c8972d464ca","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"f3153288-2f26-4f17-89b7-3f0dc6382715","name":"f3153288-2f26-4f17-89b7-3f0dc6382715","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"bcbcfd3b-cbb0-429c-8647-6b25749ed195","name":"bcbcfd3b-cbb0-429c-8647-6b25749ed195","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"84b07b6d-f135-4ac9-9c55-bef3de1c21f1","name":"84b07b6d-f135-4ac9-9c55-bef3de1c21f1","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"de75ca2e-0981-4cc7-8b7a-d3c3d0e806d0","name":"de75ca2e-0981-4cc7-8b7a-d3c3d0e806d0","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"33e39f67-56a2-4e87-8cce-8521f581cef8","name":"33e39f67-56a2-4e87-8cce-8521f581cef8","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"9b5e1d94-bfaa-4717-b12c-7706b8d42a5e","name":"9b5e1d94-bfaa-4717-b12c-7706b8d42a5e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"f86f349e-9753-4ec9-b3a7-51f38648f98c","name":"f86f349e-9753-4ec9-b3a7-51f38648f98c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"233a96d2-66b0-4ee9-9f35-4c818ad485a7","name":"233a96d2-66b0-4ee9-9f35-4c818ad485a7","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"e8b1c231-1ad6-4e0d-8ceb-adf2302e8bb4","name":"e8b1c231-1ad6-4e0d-8ceb-adf2302e8bb4","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"e9fc3491-c582-4071-b70b-5e4839b09dc4","name":"e9fc3491-c582-4071-b70b-5e4839b09dc4","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"bfb8fda0-a02a-4869-8600-efb3715721cd","name":"bfb8fda0-a02a-4869-8600-efb3715721cd","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"5d7195bf-80e2-4ec2-ac95-a4557f5cff54","name":"5d7195bf-80e2-4ec2-ac95-a4557f5cff54","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"a6039e82-d38e-4232-9f84-e648009998f7","name":"a6039e82-d38e-4232-9f84-e648009998f7","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"66704094-4abc-4a6e-b4fc-acf5cafc75f0","name":"66704094-4abc-4a6e-b4fc-acf5cafc75f0","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"ef84ad8d-e32a-4e39-acdb-782789771b91","name":"ef84ad8d-e32a-4e39-acdb-782789771b91","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"c7cc2d6d-a356-4678-b8ae-5c8972d464ca","name":"c7cc2d6d-a356-4678-b8ae-5c8972d464ca","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"f3153288-2f26-4f17-89b7-3f0dc6382715","name":"f3153288-2f26-4f17-89b7-3f0dc6382715","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"bcbcfd3b-cbb0-429c-8647-6b25749ed195","name":"bcbcfd3b-cbb0-429c-8647-6b25749ed195","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"84b07b6d-f135-4ac9-9c55-bef3de1c21f1","name":"84b07b6d-f135-4ac9-9c55-bef3de1c21f1","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"de75ca2e-0981-4cc7-8b7a-d3c3d0e806d0","name":"de75ca2e-0981-4cc7-8b7a-d3c3d0e806d0","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"33e39f67-56a2-4e87-8cce-8521f581cef8","name":"33e39f67-56a2-4e87-8cce-8521f581cef8","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -83,54 +83,22 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"9b5e1d94-bfaa-4717-b12c-7706b8d42a5e","path":"sprites/spr_hero/spr_hero.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"3523907d-d28e-4283-a733-03b5c9194a77","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"f86f349e-9753-4ec9-b3a7-51f38648f98c","path":"sprites/spr_hero/spr_hero.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"c47069de-4072-4c93-9d57-473ef2d6cf59","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"233a96d2-66b0-4ee9-9f35-4c818ad485a7","path":"sprites/spr_hero/spr_hero.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"88cc7d5b-bc75-4d9e-95b8-989f6ebdcc4d","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"e8b1c231-1ad6-4e0d-8ceb-adf2302e8bb4","path":"sprites/spr_hero/spr_hero.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"58d58d17-ae35-490d-9140-c0d2adc14e98","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"e9fc3491-c582-4071-b70b-5e4839b09dc4","path":"sprites/spr_hero/spr_hero.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"9a796042-5827-4be3-be91-1c8e3fb48730","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"bfb8fda0-a02a-4869-8600-efb3715721cd","path":"sprites/spr_hero/spr_hero.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"e0d735f8-345f-4dda-911f-8d9341527762","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"5d7195bf-80e2-4ec2-ac95-a4557f5cff54","path":"sprites/spr_hero/spr_hero.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"76e56d45-5bfa-4650-b87e-71b24d2f68fa","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"a6039e82-d38e-4232-9f84-e648009998f7","path":"sprites/spr_hero/spr_hero.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"173fdc0e-83df-438b-8697-5564514cb110","IsCreationKey":false,"Key":7.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"66704094-4abc-4a6e-b4fc-acf5cafc75f0","path":"sprites/spr_hero/spr_hero.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"d94a64b0-0a02-4d17-b422-9d502a2d8789","IsCreationKey":false,"Key":8.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"ef84ad8d-e32a-4e39-acdb-782789771b91","path":"sprites/spr_hero/spr_hero.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"28b0e95b-3c24-4731-ad5c-b7fb8b8187ab","IsCreationKey":false,"Key":9.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"c7cc2d6d-a356-4678-b8ae-5c8972d464ca","path":"sprites/spr_hero/spr_hero.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"d6a5440d-5323-432f-8f63-3b8b1ec024fb","IsCreationKey":false,"Key":10.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"f3153288-2f26-4f17-89b7-3f0dc6382715","path":"sprites/spr_hero/spr_hero.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"9af01d7b-f7d9-4b10-8b7f-d6aab6fb6973","IsCreationKey":false,"Key":11.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"bcbcfd3b-cbb0-429c-8647-6b25749ed195","path":"sprites/spr_hero/spr_hero.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"68f73d20-60ec-4343-bff2-73f167268cf8","IsCreationKey":false,"Key":12.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"84b07b6d-f135-4ac9-9c55-bef3de1c21f1","path":"sprites/spr_hero/spr_hero.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"daf5720d-40c0-463a-8abb-33c3cd2aa169","IsCreationKey":false,"Key":13.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"de75ca2e-0981-4cc7-8b7a-d3c3d0e806d0","path":"sprites/spr_hero/spr_hero.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"920d1701-2603-47fe-82cc-dee84904a3a9","IsCreationKey":false,"Key":14.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"33e39f67-56a2-4e87-8cce-8521f581cef8","path":"sprites/spr_hero/spr_hero.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"45be5739-0ee5-467b-8704-9dadb4aaf2ec","IsCreationKey":false,"Key":15.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"9b5e1d94-bfaa-4717-b12c-7706b8d42a5e","path":"sprites/spr_hero/spr_hero.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"3523907d-d28e-4283-a733-03b5c9194a77","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"f86f349e-9753-4ec9-b3a7-51f38648f98c","path":"sprites/spr_hero/spr_hero.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"c47069de-4072-4c93-9d57-473ef2d6cf59","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"233a96d2-66b0-4ee9-9f35-4c818ad485a7","path":"sprites/spr_hero/spr_hero.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"88cc7d5b-bc75-4d9e-95b8-989f6ebdcc4d","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"e8b1c231-1ad6-4e0d-8ceb-adf2302e8bb4","path":"sprites/spr_hero/spr_hero.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"58d58d17-ae35-490d-9140-c0d2adc14e98","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"e9fc3491-c582-4071-b70b-5e4839b09dc4","path":"sprites/spr_hero/spr_hero.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"9a796042-5827-4be3-be91-1c8e3fb48730","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"bfb8fda0-a02a-4869-8600-efb3715721cd","path":"sprites/spr_hero/spr_hero.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"e0d735f8-345f-4dda-911f-8d9341527762","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"5d7195bf-80e2-4ec2-ac95-a4557f5cff54","path":"sprites/spr_hero/spr_hero.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"76e56d45-5bfa-4650-b87e-71b24d2f68fa","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"a6039e82-d38e-4232-9f84-e648009998f7","path":"sprites/spr_hero/spr_hero.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"173fdc0e-83df-438b-8697-5564514cb110","IsCreationKey":false,"Key":7.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"66704094-4abc-4a6e-b4fc-acf5cafc75f0","path":"sprites/spr_hero/spr_hero.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"d94a64b0-0a02-4d17-b422-9d502a2d8789","IsCreationKey":false,"Key":8.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"ef84ad8d-e32a-4e39-acdb-782789771b91","path":"sprites/spr_hero/spr_hero.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"28b0e95b-3c24-4731-ad5c-b7fb8b8187ab","IsCreationKey":false,"Key":9.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"c7cc2d6d-a356-4678-b8ae-5c8972d464ca","path":"sprites/spr_hero/spr_hero.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"d6a5440d-5323-432f-8f63-3b8b1ec024fb","IsCreationKey":false,"Key":10.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"f3153288-2f26-4f17-89b7-3f0dc6382715","path":"sprites/spr_hero/spr_hero.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"9af01d7b-f7d9-4b10-8b7f-d6aab6fb6973","IsCreationKey":false,"Key":11.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"bcbcfd3b-cbb0-429c-8647-6b25749ed195","path":"sprites/spr_hero/spr_hero.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"68f73d20-60ec-4343-bff2-73f167268cf8","IsCreationKey":false,"Key":12.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"84b07b6d-f135-4ac9-9c55-bef3de1c21f1","path":"sprites/spr_hero/spr_hero.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"daf5720d-40c0-463a-8abb-33c3cd2aa169","IsCreationKey":false,"Key":13.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"de75ca2e-0981-4cc7-8b7a-d3c3d0e806d0","path":"sprites/spr_hero/spr_hero.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"920d1701-2603-47fe-82cc-dee84904a3a9","IsCreationKey":false,"Key":14.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"33e39f67-56a2-4e87-8cce-8521f581cef8","path":"sprites/spr_hero/spr_hero.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"45be5739-0ee5-467b-8704-9dadb4aaf2ec","IsCreationKey":false,"Key":15.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_hero_skull/spr_hero_skull.yy b/sprites/spr_hero_skull/spr_hero_skull.yy index 171a256c54..53d2aa1eaa 100644 --- a/sprites/spr_hero_skull/spr_hero_skull.yy +++ b/sprites/spr_hero_skull/spr_hero_skull.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_hero_skull", "bboxMode":0, "bbox_bottom":30, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"4028fec9-b72f-46fc-bb33-779f5cc99798","name":"4028fec9-b72f-46fc-bb33-779f5cc99798","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"4028fec9-b72f-46fc-bb33-779f5cc99798","name":"4028fec9-b72f-46fc-bb33-779f5cc99798","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"4028fec9-b72f-46fc-bb33-779f5cc99798","path":"sprites/spr_hero_skull/spr_hero_skull.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"45265b93-e31f-4a46-834d-75c6b65d1994","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"4028fec9-b72f-46fc-bb33-779f5cc99798","path":"sprites/spr_hero_skull/spr_hero_skull.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"45265b93-e31f-4a46-834d-75c6b65d1994","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":{ diff --git a/sprites/spr_honor_helm/spr_honor_helm.yy b/sprites/spr_honor_helm/spr_honor_helm.yy index fb22b5e7d1..b9f60ea1fb 100644 --- a/sprites/spr_honor_helm/spr_honor_helm.yy +++ b/sprites/spr_honor_helm/spr_honor_helm.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_honor_helm", "bboxMode":0, "bbox_bottom":57, @@ -12,11 +12,11 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"2faa2af3-c655-4c48-98c0-b35ce45ac30d","name":"2faa2af3-c655-4c48-98c0-b35ce45ac30d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"7fda6c5c-99be-453f-9f3c-e2b3f414e643","name":"7fda6c5c-99be-453f-9f3c-e2b3f414e643","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"8362ac13-7231-4584-a993-c6d4f51343b0","name":"8362ac13-7231-4584-a993-c6d4f51343b0","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"6d89f537-514e-4956-bd62-3d0e38852475","name":"6d89f537-514e-4956-bd62-3d0e38852475","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"3bb7c5a4-77cb-4634-a0c7-0715b3f5ff2a","name":"3bb7c5a4-77cb-4634-a0c7-0715b3f5ff2a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"2faa2af3-c655-4c48-98c0-b35ce45ac30d","name":"2faa2af3-c655-4c48-98c0-b35ce45ac30d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"7fda6c5c-99be-453f-9f3c-e2b3f414e643","name":"7fda6c5c-99be-453f-9f3c-e2b3f414e643","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"8362ac13-7231-4584-a993-c6d4f51343b0","name":"8362ac13-7231-4584-a993-c6d4f51343b0","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"6d89f537-514e-4956-bd62-3d0e38852475","name":"6d89f537-514e-4956-bd62-3d0e38852475","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"3bb7c5a4-77cb-4634-a0c7-0715b3f5ff2a","name":"3bb7c5a4-77cb-4634-a0c7-0715b3f5ff2a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -72,21 +72,11 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"2faa2af3-c655-4c48-98c0-b35ce45ac30d","path":"sprites/spr_honor_helm/spr_honor_helm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"2ad7497e-3b41-4229-b8b5-b3a878b88839","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"7fda6c5c-99be-453f-9f3c-e2b3f414e643","path":"sprites/spr_honor_helm/spr_honor_helm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"ff207f62-e98a-4f92-b03a-5811e7159312","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"8362ac13-7231-4584-a993-c6d4f51343b0","path":"sprites/spr_honor_helm/spr_honor_helm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"fc1beb56-9e35-4bd4-91d2-5891d9b8febe","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"6d89f537-514e-4956-bd62-3d0e38852475","path":"sprites/spr_honor_helm/spr_honor_helm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"ed57c839-ea9e-4aee-b1eb-ae95029ab662","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"3bb7c5a4-77cb-4634-a0c7-0715b3f5ff2a","path":"sprites/spr_honor_helm/spr_honor_helm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"ce788ad0-56e7-4d23-be0f-ad858299a699","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"2faa2af3-c655-4c48-98c0-b35ce45ac30d","path":"sprites/spr_honor_helm/spr_honor_helm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"2ad7497e-3b41-4229-b8b5-b3a878b88839","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"7fda6c5c-99be-453f-9f3c-e2b3f414e643","path":"sprites/spr_honor_helm/spr_honor_helm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"ff207f62-e98a-4f92-b03a-5811e7159312","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"8362ac13-7231-4584-a993-c6d4f51343b0","path":"sprites/spr_honor_helm/spr_honor_helm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"fc1beb56-9e35-4bd4-91d2-5891d9b8febe","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"6d89f537-514e-4956-bd62-3d0e38852475","path":"sprites/spr_honor_helm/spr_honor_helm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"ed57c839-ea9e-4aee-b1eb-ae95029ab662","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"3bb7c5a4-77cb-4634-a0c7-0715b3f5ff2a","path":"sprites/spr_honor_helm/spr_honor_helm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"ce788ad0-56e7-4d23-be0f-ad858299a699","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_icon_apothecarion/spr_icon_apothecarion.yy b/sprites/spr_icon_apothecarion/spr_icon_apothecarion.yy index dfaba6b634..5be1606b51 100644 --- a/sprites/spr_icon_apothecarion/spr_icon_apothecarion.yy +++ b/sprites/spr_icon_apothecarion/spr_icon_apothecarion.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_icon_apothecarion", "bboxMode":0, "bbox_bottom":127, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"8c420298-afa1-4414-ae6e-dcdf955885f3","name":"8c420298-afa1-4414-ae6e-dcdf955885f3","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"8c420298-afa1-4414-ae6e-dcdf955885f3","name":"8c420298-afa1-4414-ae6e-dcdf955885f3","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"8c420298-afa1-4414-ae6e-dcdf955885f3","path":"sprites/spr_icon_apothecarion/spr_icon_apothecarion.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"2232c4f0-83bb-414e-b240-877fb4da7576","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"8c420298-afa1-4414-ae6e-dcdf955885f3","path":"sprites/spr_icon_apothecarion/spr_icon_apothecarion.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"2232c4f0-83bb-414e-b240-877fb4da7576","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_icon_ballistic_skill/spr_icon_ballistic_skill.yy b/sprites/spr_icon_ballistic_skill/spr_icon_ballistic_skill.yy index 1b56469a46..221a32e636 100644 --- a/sprites/spr_icon_ballistic_skill/spr_icon_ballistic_skill.yy +++ b/sprites/spr_icon_ballistic_skill/spr_icon_ballistic_skill.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_icon_ballistic_skill", "bboxMode":0, "bbox_bottom":127, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"175bd7b9-849b-46ce-8efe-940114991cfe","name":"175bd7b9-849b-46ce-8efe-940114991cfe","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"175bd7b9-849b-46ce-8efe-940114991cfe","name":"175bd7b9-849b-46ce-8efe-940114991cfe","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"175bd7b9-849b-46ce-8efe-940114991cfe","path":"sprites/spr_icon_ballistic_skill/spr_icon_ballistic_skill.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"79b5a674-3dee-46f0-9590-19df26ad27c5","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"175bd7b9-849b-46ce-8efe-940114991cfe","path":"sprites/spr_icon_ballistic_skill/spr_icon_ballistic_skill.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"79b5a674-3dee-46f0-9590-19df26ad27c5","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_icon_bionics/spr_icon_bionics.yy b/sprites/spr_icon_bionics/spr_icon_bionics.yy index 312fd8c018..3206e750a9 100644 --- a/sprites/spr_icon_bionics/spr_icon_bionics.yy +++ b/sprites/spr_icon_bionics/spr_icon_bionics.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_icon_bionics", "bboxMode":0, "bbox_bottom":123, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"4847858a-0725-4a81-831e-e621066a51a0","name":"4847858a-0725-4a81-831e-e621066a51a0","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"4847858a-0725-4a81-831e-e621066a51a0","name":"4847858a-0725-4a81-831e-e621066a51a0","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"4847858a-0725-4a81-831e-e621066a51a0","path":"sprites/spr_icon_bionics/spr_icon_bionics.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"bba9627e-71ba-49db-a8bb-02863d834290","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"4847858a-0725-4a81-831e-e621066a51a0","path":"sprites/spr_icon_bionics/spr_icon_bionics.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"bba9627e-71ba-49db-a8bb-02863d834290","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_icon_change/spr_icon_change.yy b/sprites/spr_icon_change/spr_icon_change.yy index 4455982768..66a47febe1 100644 --- a/sprites/spr_icon_change/spr_icon_change.yy +++ b/sprites/spr_icon_change/spr_icon_change.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_icon_change", "bboxMode":0, "bbox_bottom":77, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"7f321054-1d52-47c4-a451-9447c52b8931","name":"7f321054-1d52-47c4-a451-9447c52b8931","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"7f321054-1d52-47c4-a451-9447c52b8931","name":"7f321054-1d52-47c4-a451-9447c52b8931","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"7f321054-1d52-47c4-a451-9447c52b8931","path":"sprites/spr_icon_change/spr_icon_change.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"c6ec8eee-1414-4a10-82fc-83027463d27d","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"7f321054-1d52-47c4-a451-9447c52b8931","path":"sprites/spr_icon_change/spr_icon_change.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"c6ec8eee-1414-4a10-82fc-83027463d27d","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":{ diff --git a/sprites/spr_icon_health/spr_icon_health.yy b/sprites/spr_icon_health/spr_icon_health.yy index 0b5a7232d6..2129706acd 100644 --- a/sprites/spr_icon_health/spr_icon_health.yy +++ b/sprites/spr_icon_health/spr_icon_health.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_icon_health", "bboxMode":0, "bbox_bottom":121, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"bc87ff96-289a-4158-8d2e-07149fb4a405","name":"bc87ff96-289a-4158-8d2e-07149fb4a405","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"bc87ff96-289a-4158-8d2e-07149fb4a405","name":"bc87ff96-289a-4158-8d2e-07149fb4a405","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"bc87ff96-289a-4158-8d2e-07149fb4a405","path":"sprites/spr_icon_health/spr_icon_health.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"f2bd0248-1537-4bfe-8c66-33384bd00df6","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"bc87ff96-289a-4158-8d2e-07149fb4a405","path":"sprites/spr_icon_health/spr_icon_health.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"f2bd0248-1537-4bfe-8c66-33384bd00df6","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_icon_iron_halo/spr_icon_iron_halo.yy b/sprites/spr_icon_iron_halo/spr_icon_iron_halo.yy index a9a7151dd3..89a2f008cf 100644 --- a/sprites/spr_icon_iron_halo/spr_icon_iron_halo.yy +++ b/sprites/spr_icon_iron_halo/spr_icon_iron_halo.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_icon_iron_halo", "bboxMode":0, "bbox_bottom":127, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"45765e6b-00d8-4316-988d-daca2372308f","name":"45765e6b-00d8-4316-988d-daca2372308f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"45765e6b-00d8-4316-988d-daca2372308f","name":"45765e6b-00d8-4316-988d-daca2372308f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"45765e6b-00d8-4316-988d-daca2372308f","path":"sprites/spr_icon_iron_halo/spr_icon_iron_halo.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"9993fbbb-7bcd-43e9-b367-1c5b57522dab","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"45765e6b-00d8-4316-988d-daca2372308f","path":"sprites/spr_icon_iron_halo/spr_icon_iron_halo.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"9993fbbb-7bcd-43e9-b367-1c5b57522dab","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_icon_iron_hands/spr_icon_iron_hands.yy b/sprites/spr_icon_iron_hands/spr_icon_iron_hands.yy index 5f27faa814..8c87163c27 100644 --- a/sprites/spr_icon_iron_hands/spr_icon_iron_hands.yy +++ b/sprites/spr_icon_iron_hands/spr_icon_iron_hands.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_icon_iron_hands", "bboxMode":0, "bbox_bottom":127, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"87ee8039-2984-40e8-bacb-57ff8740fd19","name":"87ee8039-2984-40e8-bacb-57ff8740fd19","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"87ee8039-2984-40e8-bacb-57ff8740fd19","name":"87ee8039-2984-40e8-bacb-57ff8740fd19","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"87ee8039-2984-40e8-bacb-57ff8740fd19","path":"sprites/spr_icon_iron_hands/spr_icon_iron_hands.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"6c18301a-894e-4feb-942f-4e8cdbc700f4","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"87ee8039-2984-40e8-bacb-57ff8740fd19","path":"sprites/spr_icon_iron_hands/spr_icon_iron_hands.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"6c18301a-894e-4feb-942f-4e8cdbc700f4","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_icon_iron_hands2/spr_icon_iron_hands2.yy b/sprites/spr_icon_iron_hands2/spr_icon_iron_hands2.yy index 363fa8d2b4..c58ae5bf2a 100644 --- a/sprites/spr_icon_iron_hands2/spr_icon_iron_hands2.yy +++ b/sprites/spr_icon_iron_hands2/spr_icon_iron_hands2.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_icon_iron_hands2", "bboxMode":0, "bbox_bottom":127, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"3c24869b-4466-4bfe-9253-6ac5b898f203","name":"3c24869b-4466-4bfe-9253-6ac5b898f203","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"3c24869b-4466-4bfe-9253-6ac5b898f203","name":"3c24869b-4466-4bfe-9253-6ac5b898f203","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"3c24869b-4466-4bfe-9253-6ac5b898f203","path":"sprites/spr_icon_iron_hands2/spr_icon_iron_hands2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"3f40cabf-70e1-4e42-8746-6d9dd7255888","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"3c24869b-4466-4bfe-9253-6ac5b898f203","path":"sprites/spr_icon_iron_hands2/spr_icon_iron_hands2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"3f40cabf-70e1-4e42-8746-6d9dd7255888","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_icon_iron_hands3/spr_icon_iron_hands3.yy b/sprites/spr_icon_iron_hands3/spr_icon_iron_hands3.yy index 1b04e2bc8f..b118f25ac2 100644 --- a/sprites/spr_icon_iron_hands3/spr_icon_iron_hands3.yy +++ b/sprites/spr_icon_iron_hands3/spr_icon_iron_hands3.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_icon_iron_hands3", "bboxMode":0, "bbox_bottom":127, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"372c9370-897b-4991-9628-fd531cc75d05","name":"372c9370-897b-4991-9628-fd531cc75d05","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"372c9370-897b-4991-9628-fd531cc75d05","name":"372c9370-897b-4991-9628-fd531cc75d05","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"372c9370-897b-4991-9628-fd531cc75d05","path":"sprites/spr_icon_iron_hands3/spr_icon_iron_hands3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"39bf6dba-f4a6-490b-ba05-cf47f615a5f5","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"372c9370-897b-4991-9628-fd531cc75d05","path":"sprites/spr_icon_iron_hands3/spr_icon_iron_hands3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"39bf6dba-f4a6-490b-ba05-cf47f615a5f5","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_icon_librarius/spr_icon_librarius.yy b/sprites/spr_icon_librarius/spr_icon_librarius.yy index 5c1d838731..10e3b0c011 100644 --- a/sprites/spr_icon_librarius/spr_icon_librarius.yy +++ b/sprites/spr_icon_librarius/spr_icon_librarius.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_icon_librarius", "bboxMode":0, "bbox_bottom":110, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"ec084bd7-b124-4b5f-b9e2-ba4a50309829","name":"ec084bd7-b124-4b5f-b9e2-ba4a50309829","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"ec084bd7-b124-4b5f-b9e2-ba4a50309829","name":"ec084bd7-b124-4b5f-b9e2-ba4a50309829","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"ec084bd7-b124-4b5f-b9e2-ba4a50309829","path":"sprites/spr_icon_librarius/spr_icon_librarius.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"b274634c-f2d4-4dfc-9370-f0b342c2cd10","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"ec084bd7-b124-4b5f-b9e2-ba4a50309829","path":"sprites/spr_icon_librarius/spr_icon_librarius.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"b274634c-f2d4-4dfc-9370-f0b342c2cd10","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_icon_psyker/spr_icon_psyker.yy b/sprites/spr_icon_psyker/spr_icon_psyker.yy index c8a6b45ede..7bc9cfe4ce 100644 --- a/sprites/spr_icon_psyker/spr_icon_psyker.yy +++ b/sprites/spr_icon_psyker/spr_icon_psyker.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_icon_psyker", "bboxMode":0, "bbox_bottom":124, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"100d817f-b993-4588-bcf6-a6db6c63e96d","name":"100d817f-b993-4588-bcf6-a6db6c63e96d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"100d817f-b993-4588-bcf6-a6db6c63e96d","name":"100d817f-b993-4588-bcf6-a6db6c63e96d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"100d817f-b993-4588-bcf6-a6db6c63e96d","path":"sprites/spr_icon_psyker/spr_icon_psyker.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"8fb3e588-63d7-49a0-ab99-4bd52fdbb678","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"100d817f-b993-4588-bcf6-a6db6c63e96d","path":"sprites/spr_icon_psyker/spr_icon_psyker.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"8fb3e588-63d7-49a0-ab99-4bd52fdbb678","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_icon_shield/spr_icon_shield.yy b/sprites/spr_icon_shield/spr_icon_shield.yy index 3755ee5a2b..ed65d1a1d6 100644 --- a/sprites/spr_icon_shield/spr_icon_shield.yy +++ b/sprites/spr_icon_shield/spr_icon_shield.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_icon_shield", "bboxMode":0, "bbox_bottom":119, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"52d29a79-1164-4e74-a115-73a3753c0552","name":"52d29a79-1164-4e74-a115-73a3753c0552","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"52d29a79-1164-4e74-a115-73a3753c0552","name":"52d29a79-1164-4e74-a115-73a3753c0552","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"52d29a79-1164-4e74-a115-73a3753c0552","path":"sprites/spr_icon_shield/spr_icon_shield.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"0e5f8e2e-b061-4eca-86ba-6f413b5c413d","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"52d29a79-1164-4e74-a115-73a3753c0552","path":"sprites/spr_icon_shield/spr_icon_shield.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"0e5f8e2e-b061-4eca-86ba-6f413b5c413d","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_icon_shield2/spr_icon_shield2.yy b/sprites/spr_icon_shield2/spr_icon_shield2.yy index e493764145..af97d05f44 100644 --- a/sprites/spr_icon_shield2/spr_icon_shield2.yy +++ b/sprites/spr_icon_shield2/spr_icon_shield2.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_icon_shield2", "bboxMode":0, "bbox_bottom":124, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"8369f543-dbf8-4595-af8c-2ed911ca4cc4","name":"8369f543-dbf8-4595-af8c-2ed911ca4cc4","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"8369f543-dbf8-4595-af8c-2ed911ca4cc4","name":"8369f543-dbf8-4595-af8c-2ed911ca4cc4","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"8369f543-dbf8-4595-af8c-2ed911ca4cc4","path":"sprites/spr_icon_shield2/spr_icon_shield2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"07012a80-3fb0-404b-8bad-c1b776cac4ce","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"8369f543-dbf8-4595-af8c-2ed911ca4cc4","path":"sprites/spr_icon_shield2/spr_icon_shield2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"07012a80-3fb0-404b-8bad-c1b776cac4ce","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_icon_telepatica/spr_icon_telepatica.yy b/sprites/spr_icon_telepatica/spr_icon_telepatica.yy index 05025bba3d..2f2ee4a519 100644 --- a/sprites/spr_icon_telepatica/spr_icon_telepatica.yy +++ b/sprites/spr_icon_telepatica/spr_icon_telepatica.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_icon_telepatica", "bboxMode":0, "bbox_bottom":122, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"b216b4d3-4604-4d5e-9507-2a70874b7ffa","name":"b216b4d3-4604-4d5e-9507-2a70874b7ffa","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"b216b4d3-4604-4d5e-9507-2a70874b7ffa","name":"b216b4d3-4604-4d5e-9507-2a70874b7ffa","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"b216b4d3-4604-4d5e-9507-2a70874b7ffa","path":"sprites/spr_icon_telepatica/spr_icon_telepatica.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"19274f90-7f8d-4764-9066-671a72532c31","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"b216b4d3-4604-4d5e-9507-2a70874b7ffa","path":"sprites/spr_icon_telepatica/spr_icon_telepatica.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"19274f90-7f8d-4764-9066-671a72532c31","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_icon_telepatica2/spr_icon_telepatica2.yy b/sprites/spr_icon_telepatica2/spr_icon_telepatica2.yy index e87ab0cf53..ae79d2aae5 100644 --- a/sprites/spr_icon_telepatica2/spr_icon_telepatica2.yy +++ b/sprites/spr_icon_telepatica2/spr_icon_telepatica2.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_icon_telepatica2", "bboxMode":0, "bbox_bottom":126, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"38c9167a-ee5a-4729-8a71-6963ab98a018","name":"38c9167a-ee5a-4729-8a71-6963ab98a018","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"38c9167a-ee5a-4729-8a71-6963ab98a018","name":"38c9167a-ee5a-4729-8a71-6963ab98a018","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"38c9167a-ee5a-4729-8a71-6963ab98a018","path":"sprites/spr_icon_telepatica2/spr_icon_telepatica2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"fdc039bc-8374-4edc-83dd-446e17ebb408","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"38c9167a-ee5a-4729-8a71-6963ab98a018","path":"sprites/spr_icon_telepatica2/spr_icon_telepatica2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"fdc039bc-8374-4edc-83dd-446e17ebb408","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_icon_veteran/spr_icon_veteran.yy b/sprites/spr_icon_veteran/spr_icon_veteran.yy index eec01d2532..c2c4008ad6 100644 --- a/sprites/spr_icon_veteran/spr_icon_veteran.yy +++ b/sprites/spr_icon_veteran/spr_icon_veteran.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_icon_veteran", "bboxMode":0, "bbox_bottom":113, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"6d818433-1ab6-4818-aee1-badbac0b7712","name":"6d818433-1ab6-4818-aee1-badbac0b7712","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"6d818433-1ab6-4818-aee1-badbac0b7712","name":"6d818433-1ab6-4818-aee1-badbac0b7712","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"6d818433-1ab6-4818-aee1-badbac0b7712","path":"sprites/spr_icon_veteran/spr_icon_veteran.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"879e18a1-ac47-4a1f-9231-529f71b21cb0","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"6d818433-1ab6-4818-aee1-badbac0b7712","path":"sprites/spr_icon_veteran/spr_icon_veteran.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"879e18a1-ac47-4a1f-9231-529f71b21cb0","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_icon_weapon_skill/spr_icon_weapon_skill.yy b/sprites/spr_icon_weapon_skill/spr_icon_weapon_skill.yy index 2bee3f4586..61091942e9 100644 --- a/sprites/spr_icon_weapon_skill/spr_icon_weapon_skill.yy +++ b/sprites/spr_icon_weapon_skill/spr_icon_weapon_skill.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_icon_weapon_skill", "bboxMode":0, "bbox_bottom":127, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"5507e490-eb5e-4f75-8ab8-b839bdc67871","name":"5507e490-eb5e-4f75-8ab8-b839bdc67871","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"5507e490-eb5e-4f75-8ab8-b839bdc67871","name":"5507e490-eb5e-4f75-8ab8-b839bdc67871","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"5507e490-eb5e-4f75-8ab8-b839bdc67871","path":"sprites/spr_icon_weapon_skill/spr_icon_weapon_skill.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"fa7e868a-9b98-4831-94a0-d4135318d307","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"5507e490-eb5e-4f75-8ab8-b839bdc67871","path":"sprites/spr_icon_weapon_skill/spr_icon_weapon_skill.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"fa7e868a-9b98-4831-94a0-d4135318d307","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_icon_weight/spr_icon_weight.yy b/sprites/spr_icon_weight/spr_icon_weight.yy index 7aff6fb136..0be996df06 100644 --- a/sprites/spr_icon_weight/spr_icon_weight.yy +++ b/sprites/spr_icon_weight/spr_icon_weight.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_icon_weight", "bboxMode":0, "bbox_bottom":112, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"9221b377-916e-498d-bc28-a2e999f17843","name":"9221b377-916e-498d-bc28-a2e999f17843","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"9221b377-916e-498d-bc28-a2e999f17843","name":"9221b377-916e-498d-bc28-a2e999f17843","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"9221b377-916e-498d-bc28-a2e999f17843","path":"sprites/spr_icon_weight/spr_icon_weight.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"2a57d19e-374a-48c1-8955-53e45e4020ba","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"9221b377-916e-498d-bc28-a2e999f17843","path":"sprites/spr_icon_weight/spr_icon_weight.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"2a57d19e-374a-48c1-8955-53e45e4020ba","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_icon_wounds/spr_icon_wounds.yy b/sprites/spr_icon_wounds/spr_icon_wounds.yy index 96e42abea0..54e1bcb00d 100644 --- a/sprites/spr_icon_wounds/spr_icon_wounds.yy +++ b/sprites/spr_icon_wounds/spr_icon_wounds.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_icon_wounds", "bboxMode":0, "bbox_bottom":112, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"07486fe4-76e6-481f-9ca9-94952463ecb4","name":"07486fe4-76e6-481f-9ca9-94952463ecb4","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"07486fe4-76e6-481f-9ca9-94952463ecb4","name":"07486fe4-76e6-481f-9ca9-94952463ecb4","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"07486fe4-76e6-481f-9ca9-94952463ecb4","path":"sprites/spr_icon_wounds/spr_icon_wounds.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"7833cd98-7681-4fe5-b5bb-8aeab0dba461","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"07486fe4-76e6-481f-9ca9-94952463ecb4","path":"sprites/spr_icon_wounds/spr_icon_wounds.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"7833cd98-7681-4fe5-b5bb-8aeab0dba461","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_if_mk5_helm/spr_if_mk5_helm.yy b/sprites/spr_if_mk5_helm/spr_if_mk5_helm.yy index 879abb2185..72232aea25 100644 --- a/sprites/spr_if_mk5_helm/spr_if_mk5_helm.yy +++ b/sprites/spr_if_mk5_helm/spr_if_mk5_helm.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_if_mk5_helm", "bboxMode":0, "bbox_bottom":43, @@ -12,9 +12,9 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"dec421f3-8236-4461-8ef3-e2b2b0993a2d","name":"dec421f3-8236-4461-8ef3-e2b2b0993a2d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"41b00509-3aa8-491f-ac2e-fd29be3ca4bb","name":"41b00509-3aa8-491f-ac2e-fd29be3ca4bb","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"1d46e43b-37cf-48df-964c-e00c02be3fd5","name":"1d46e43b-37cf-48df-964c-e00c02be3fd5","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"dec421f3-8236-4461-8ef3-e2b2b0993a2d","name":"dec421f3-8236-4461-8ef3-e2b2b0993a2d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"41b00509-3aa8-491f-ac2e-fd29be3ca4bb","name":"41b00509-3aa8-491f-ac2e-fd29be3ca4bb","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"1d46e43b-37cf-48df-964c-e00c02be3fd5","name":"1d46e43b-37cf-48df-964c-e00c02be3fd5","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -70,15 +70,9 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"dec421f3-8236-4461-8ef3-e2b2b0993a2d","path":"sprites/spr_if_mk5_helm/spr_if_mk5_helm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"96d6ba50-844d-4b20-8660-44109a52e875","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"41b00509-3aa8-491f-ac2e-fd29be3ca4bb","path":"sprites/spr_if_mk5_helm/spr_if_mk5_helm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"826222be-8f31-4261-bbc0-e1c6c119be12","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"1d46e43b-37cf-48df-964c-e00c02be3fd5","path":"sprites/spr_if_mk5_helm/spr_if_mk5_helm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"959e4469-ff4a-434e-adcc-44625ee7e511","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"dec421f3-8236-4461-8ef3-e2b2b0993a2d","path":"sprites/spr_if_mk5_helm/spr_if_mk5_helm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"96d6ba50-844d-4b20-8660-44109a52e875","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"41b00509-3aa8-491f-ac2e-fd29be3ca4bb","path":"sprites/spr_if_mk5_helm/spr_if_mk5_helm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"826222be-8f31-4261-bbc0-e1c6c119be12","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"1d46e43b-37cf-48df-964c-e00c02be3fd5","path":"sprites/spr_if_mk5_helm/spr_if_mk5_helm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"959e4469-ff4a-434e-adcc-44625ee7e511","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_if_mk6_helm/spr_if_mk6_helm.yy b/sprites/spr_if_mk6_helm/spr_if_mk6_helm.yy index 4442de907a..06bb2f4d82 100644 --- a/sprites/spr_if_mk6_helm/spr_if_mk6_helm.yy +++ b/sprites/spr_if_mk6_helm/spr_if_mk6_helm.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_if_mk6_helm", "bboxMode":0, "bbox_bottom":47, @@ -12,11 +12,11 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"de518e95-b95f-4cfa-8f9f-ceeec6f87da2","name":"de518e95-b95f-4cfa-8f9f-ceeec6f87da2","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"6691f594-8d96-4874-8c5e-9270b2729038","name":"6691f594-8d96-4874-8c5e-9270b2729038","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"8654944b-42fa-4a32-9a49-f85da15cb64e","name":"8654944b-42fa-4a32-9a49-f85da15cb64e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"006476c9-63e2-4612-a92c-d99440071596","name":"006476c9-63e2-4612-a92c-d99440071596","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"ce48e770-7a4c-4382-a312-495dea5bb37d","name":"ce48e770-7a4c-4382-a312-495dea5bb37d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"de518e95-b95f-4cfa-8f9f-ceeec6f87da2","name":"de518e95-b95f-4cfa-8f9f-ceeec6f87da2","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"6691f594-8d96-4874-8c5e-9270b2729038","name":"6691f594-8d96-4874-8c5e-9270b2729038","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"8654944b-42fa-4a32-9a49-f85da15cb64e","name":"8654944b-42fa-4a32-9a49-f85da15cb64e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"006476c9-63e2-4612-a92c-d99440071596","name":"006476c9-63e2-4612-a92c-d99440071596","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"ce48e770-7a4c-4382-a312-495dea5bb37d","name":"ce48e770-7a4c-4382-a312-495dea5bb37d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -72,21 +72,11 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"de518e95-b95f-4cfa-8f9f-ceeec6f87da2","path":"sprites/spr_if_mk6_helm/spr_if_mk6_helm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"4ef3ccc4-520e-468a-bcaa-7428d87c6681","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"6691f594-8d96-4874-8c5e-9270b2729038","path":"sprites/spr_if_mk6_helm/spr_if_mk6_helm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"de5fdfc9-9f64-4c20-9c32-6d5e9f4f9fce","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"8654944b-42fa-4a32-9a49-f85da15cb64e","path":"sprites/spr_if_mk6_helm/spr_if_mk6_helm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"f7897dfb-d9da-4108-ac0c-040c497b3433","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"006476c9-63e2-4612-a92c-d99440071596","path":"sprites/spr_if_mk6_helm/spr_if_mk6_helm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"f03a9ffe-40ca-4513-8eff-af5d7acf2a4f","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"ce48e770-7a4c-4382-a312-495dea5bb37d","path":"sprites/spr_if_mk6_helm/spr_if_mk6_helm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"8c2331b9-bec3-406a-92f2-206bec4c524f","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"de518e95-b95f-4cfa-8f9f-ceeec6f87da2","path":"sprites/spr_if_mk6_helm/spr_if_mk6_helm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"4ef3ccc4-520e-468a-bcaa-7428d87c6681","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"6691f594-8d96-4874-8c5e-9270b2729038","path":"sprites/spr_if_mk6_helm/spr_if_mk6_helm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"de5fdfc9-9f64-4c20-9c32-6d5e9f4f9fce","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"8654944b-42fa-4a32-9a49-f85da15cb64e","path":"sprites/spr_if_mk6_helm/spr_if_mk6_helm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"f7897dfb-d9da-4108-ac0c-040c497b3433","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"006476c9-63e2-4612-a92c-d99440071596","path":"sprites/spr_if_mk6_helm/spr_if_mk6_helm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"f03a9ffe-40ca-4513-8eff-af5d7acf2a4f","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"ce48e770-7a4c-4382-a312-495dea5bb37d","path":"sprites/spr_if_mk6_helm/spr_if_mk6_helm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"8c2331b9-bec3-406a-92f2-206bec4c524f","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_if_mk7_helm/spr_if_mk7_helm.yy b/sprites/spr_if_mk7_helm/spr_if_mk7_helm.yy index eb81941e30..2699c9d6c3 100644 --- a/sprites/spr_if_mk7_helm/spr_if_mk7_helm.yy +++ b/sprites/spr_if_mk7_helm/spr_if_mk7_helm.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_if_mk7_helm", "bboxMode":0, "bbox_bottom":56, @@ -12,8 +12,8 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"bfb83da2-d3a8-4217-a285-208996d2c8e0","name":"bfb83da2-d3a8-4217-a285-208996d2c8e0","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"aa8e54a0-af39-41d2-8aa5-fdc66fa3fda0","name":"aa8e54a0-af39-41d2-8aa5-fdc66fa3fda0","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"bfb83da2-d3a8-4217-a285-208996d2c8e0","name":"bfb83da2-d3a8-4217-a285-208996d2c8e0","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"aa8e54a0-af39-41d2-8aa5-fdc66fa3fda0","name":"aa8e54a0-af39-41d2-8aa5-fdc66fa3fda0","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -69,12 +69,8 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"bfb83da2-d3a8-4217-a285-208996d2c8e0","path":"sprites/spr_if_mk7_helm/spr_if_mk7_helm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"6e63e934-7709-480e-82cf-c16124eab733","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"aa8e54a0-af39-41d2-8aa5-fdc66fa3fda0","path":"sprites/spr_if_mk7_helm/spr_if_mk7_helm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"ad0d33af-11ca-4a82-b468-8073458f806b","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"bfb83da2-d3a8-4217-a285-208996d2c8e0","path":"sprites/spr_if_mk7_helm/spr_if_mk7_helm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"6e63e934-7709-480e-82cf-c16124eab733","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"aa8e54a0-af39-41d2-8aa5-fdc66fa3fda0","path":"sprites/spr_if_mk7_helm/spr_if_mk7_helm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"ad0d33af-11ca-4a82-b468-8073458f806b","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_ih_mk5_helm/spr_ih_mk5_helm.yy b/sprites/spr_ih_mk5_helm/spr_ih_mk5_helm.yy index 53946f9d81..8b87a16d91 100644 --- a/sprites/spr_ih_mk5_helm/spr_ih_mk5_helm.yy +++ b/sprites/spr_ih_mk5_helm/spr_ih_mk5_helm.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_ih_mk5_helm", "bboxMode":0, "bbox_bottom":43, @@ -12,8 +12,8 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"b642399d-d97e-40d8-adaf-2809088e730f","name":"b642399d-d97e-40d8-adaf-2809088e730f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"1f7e174c-865e-46f8-be78-69317b96de10","name":"1f7e174c-865e-46f8-be78-69317b96de10","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"b642399d-d97e-40d8-adaf-2809088e730f","name":"b642399d-d97e-40d8-adaf-2809088e730f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"1f7e174c-865e-46f8-be78-69317b96de10","name":"1f7e174c-865e-46f8-be78-69317b96de10","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -69,12 +69,8 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"b642399d-d97e-40d8-adaf-2809088e730f","path":"sprites/spr_ih_mk5_helm/spr_ih_mk5_helm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"d78dbd31-89bd-4267-a7f6-77dd4d6454d2","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"1f7e174c-865e-46f8-be78-69317b96de10","path":"sprites/spr_ih_mk5_helm/spr_ih_mk5_helm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"cbabb173-cfe5-490a-bbe2-901751188108","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"b642399d-d97e-40d8-adaf-2809088e730f","path":"sprites/spr_ih_mk5_helm/spr_ih_mk5_helm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"d78dbd31-89bd-4267-a7f6-77dd4d6454d2","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"1f7e174c-865e-46f8-be78-69317b96de10","path":"sprites/spr_ih_mk5_helm/spr_ih_mk5_helm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"cbabb173-cfe5-490a-bbe2-901751188108","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_ih_mk6_helm/spr_ih_mk6_helm.yy b/sprites/spr_ih_mk6_helm/spr_ih_mk6_helm.yy index 4176c0b2bf..1e18b0b424 100644 --- a/sprites/spr_ih_mk6_helm/spr_ih_mk6_helm.yy +++ b/sprites/spr_ih_mk6_helm/spr_ih_mk6_helm.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_ih_mk6_helm", "bboxMode":0, "bbox_bottom":47, @@ -12,8 +12,8 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"db85fc39-20f1-4c33-9214-04c64fea3140","name":"db85fc39-20f1-4c33-9214-04c64fea3140","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"a3c64ba6-26bb-45d4-a9ce-ba5560c69555","name":"a3c64ba6-26bb-45d4-a9ce-ba5560c69555","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"db85fc39-20f1-4c33-9214-04c64fea3140","name":"db85fc39-20f1-4c33-9214-04c64fea3140","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"a3c64ba6-26bb-45d4-a9ce-ba5560c69555","name":"a3c64ba6-26bb-45d4-a9ce-ba5560c69555","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -69,12 +69,8 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"db85fc39-20f1-4c33-9214-04c64fea3140","path":"sprites/spr_ih_mk6_helm/spr_ih_mk6_helm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"7bb79bfe-987b-416b-a03f-4abdb1d8d14e","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"a3c64ba6-26bb-45d4-a9ce-ba5560c69555","path":"sprites/spr_ih_mk6_helm/spr_ih_mk6_helm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"f4b71391-715d-453c-aad9-a6af40cb2390","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"db85fc39-20f1-4c33-9214-04c64fea3140","path":"sprites/spr_ih_mk6_helm/spr_ih_mk6_helm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"7bb79bfe-987b-416b-a03f-4abdb1d8d14e","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"a3c64ba6-26bb-45d4-a9ce-ba5560c69555","path":"sprites/spr_ih_mk6_helm/spr_ih_mk6_helm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"f4b71391-715d-453c-aad9-a6af40cb2390","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_ih_mk7_helm/spr_ih_mk7_helm.yy b/sprites/spr_ih_mk7_helm/spr_ih_mk7_helm.yy index 6aaa16557d..c4297aac28 100644 --- a/sprites/spr_ih_mk7_helm/spr_ih_mk7_helm.yy +++ b/sprites/spr_ih_mk7_helm/spr_ih_mk7_helm.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_ih_mk7_helm", "bboxMode":0, "bbox_bottom":43, @@ -12,8 +12,8 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"d61530e1-48e9-4f47-9420-ce41def4cf25","name":"d61530e1-48e9-4f47-9420-ce41def4cf25","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"56d174a7-0545-41ad-a95a-a85cce3a9cf4","name":"56d174a7-0545-41ad-a95a-a85cce3a9cf4","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"d61530e1-48e9-4f47-9420-ce41def4cf25","name":"d61530e1-48e9-4f47-9420-ce41def4cf25","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"56d174a7-0545-41ad-a95a-a85cce3a9cf4","name":"56d174a7-0545-41ad-a95a-a85cce3a9cf4","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -69,12 +69,8 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"d61530e1-48e9-4f47-9420-ce41def4cf25","path":"sprites/spr_ih_mk7_helm/spr_ih_mk7_helm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"2a7da707-d0b3-4baa-9e51-0798160ef9d9","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"56d174a7-0545-41ad-a95a-a85cce3a9cf4","path":"sprites/spr_ih_mk7_helm/spr_ih_mk7_helm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"0ac8930c-7088-4d26-9666-4add4d91d775","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"d61530e1-48e9-4f47-9420-ce41def4cf25","path":"sprites/spr_ih_mk7_helm/spr_ih_mk7_helm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"2a7da707-d0b3-4baa-9e51-0798160ef9d9","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"56d174a7-0545-41ad-a95a-a85cce3a9cf4","path":"sprites/spr_ih_mk7_helm/spr_ih_mk7_helm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"0ac8930c-7088-4d26-9666-4add4d91d775","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_indomitus_backpack_variants/spr_indomitus_backpack_variants.yy b/sprites/spr_indomitus_backpack_variants/spr_indomitus_backpack_variants.yy index 327f13b0ae..b6975eedf3 100644 --- a/sprites/spr_indomitus_backpack_variants/spr_indomitus_backpack_variants.yy +++ b/sprites/spr_indomitus_backpack_variants/spr_indomitus_backpack_variants.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_indomitus_backpack_variants", "bboxMode":0, "bbox_bottom":47, @@ -12,9 +12,9 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"f263cbc2-c596-4d91-bf6e-98df697e82d6","name":"f263cbc2-c596-4d91-bf6e-98df697e82d6","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"26a48129-bbce-4502-98fa-bb1536100ae8","name":"26a48129-bbce-4502-98fa-bb1536100ae8","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"3c4a6865-1bd0-4736-afba-d1184eb7c9c2","name":"3c4a6865-1bd0-4736-afba-d1184eb7c9c2","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"f263cbc2-c596-4d91-bf6e-98df697e82d6","name":"f263cbc2-c596-4d91-bf6e-98df697e82d6","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"26a48129-bbce-4502-98fa-bb1536100ae8","name":"26a48129-bbce-4502-98fa-bb1536100ae8","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"3c4a6865-1bd0-4736-afba-d1184eb7c9c2","name":"3c4a6865-1bd0-4736-afba-d1184eb7c9c2","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -72,15 +72,9 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"f263cbc2-c596-4d91-bf6e-98df697e82d6","path":"sprites/spr_indomitus_backpack_variants/spr_indomitus_backpack_variants.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"976d99d5-b8ca-4296-bfec-0428f709446a","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"26a48129-bbce-4502-98fa-bb1536100ae8","path":"sprites/spr_indomitus_backpack_variants/spr_indomitus_backpack_variants.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"e490a9e6-100a-4231-83ea-f81f970510d0","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"3c4a6865-1bd0-4736-afba-d1184eb7c9c2","path":"sprites/spr_indomitus_backpack_variants/spr_indomitus_backpack_variants.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"103b9ed3-895b-4aaa-853a-46c40325bda5","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"f263cbc2-c596-4d91-bf6e-98df697e82d6","path":"sprites/spr_indomitus_backpack_variants/spr_indomitus_backpack_variants.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"976d99d5-b8ca-4296-bfec-0428f709446a","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"26a48129-bbce-4502-98fa-bb1536100ae8","path":"sprites/spr_indomitus_backpack_variants/spr_indomitus_backpack_variants.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"e490a9e6-100a-4231-83ea-f81f970510d0","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"3c4a6865-1bd0-4736-afba-d1184eb7c9c2","path":"sprites/spr_indomitus_backpack_variants/spr_indomitus_backpack_variants.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"103b9ed3-895b-4aaa-853a-46c40325bda5","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_indomitus_belt/spr_indomitus_belt.yy b/sprites/spr_indomitus_belt/spr_indomitus_belt.yy index d117101fc6..b5f5831402 100644 --- a/sprites/spr_indomitus_belt/spr_indomitus_belt.yy +++ b/sprites/spr_indomitus_belt/spr_indomitus_belt.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_indomitus_belt", "bboxMode":0, "bbox_bottom":136, @@ -12,9 +12,9 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"7173924c-400c-4ee3-8b3d-0123aa659415","name":"7173924c-400c-4ee3-8b3d-0123aa659415","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"379a95d4-e686-4cd0-bae4-d6538fe00566","name":"379a95d4-e686-4cd0-bae4-d6538fe00566","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"3974ad3d-d41e-4056-8cc6-6e5d870fd56e","name":"3974ad3d-d41e-4056-8cc6-6e5d870fd56e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"7173924c-400c-4ee3-8b3d-0123aa659415","name":"7173924c-400c-4ee3-8b3d-0123aa659415","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"379a95d4-e686-4cd0-bae4-d6538fe00566","name":"379a95d4-e686-4cd0-bae4-d6538fe00566","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"3974ad3d-d41e-4056-8cc6-6e5d870fd56e","name":"3974ad3d-d41e-4056-8cc6-6e5d870fd56e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -70,15 +70,9 @@ "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_indomitus_chest_variants/spr_indomitus_chest_variants.yy b/sprites/spr_indomitus_chest_variants/spr_indomitus_chest_variants.yy index 30a3c35872..70eefdaa19 100644 --- a/sprites/spr_indomitus_chest_variants/spr_indomitus_chest_variants.yy +++ b/sprites/spr_indomitus_chest_variants/spr_indomitus_chest_variants.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_indomitus_chest_variants", "bboxMode":0, "bbox_bottom":111, @@ -12,9 +12,9 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"f0e60637-c555-4a00-8c01-76f1d0b98b07","name":"f0e60637-c555-4a00-8c01-76f1d0b98b07","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"8df37974-a38e-49cb-a1ac-77820eeb1e35","name":"8df37974-a38e-49cb-a1ac-77820eeb1e35","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"1903824a-daf5-4c6b-b252-ca5eb43f6ccc","name":"1903824a-daf5-4c6b-b252-ca5eb43f6ccc","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"f0e60637-c555-4a00-8c01-76f1d0b98b07","name":"f0e60637-c555-4a00-8c01-76f1d0b98b07","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"8df37974-a38e-49cb-a1ac-77820eeb1e35","name":"8df37974-a38e-49cb-a1ac-77820eeb1e35","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"1903824a-daf5-4c6b-b252-ca5eb43f6ccc","name":"1903824a-daf5-4c6b-b252-ca5eb43f6ccc","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -70,15 +70,9 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"f0e60637-c555-4a00-8c01-76f1d0b98b07","path":"sprites/spr_indomitus_chest_variants/spr_indomitus_chest_variants.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"27d4c94a-6c66-4f0c-a0bc-26b973bcf167","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"8df37974-a38e-49cb-a1ac-77820eeb1e35","path":"sprites/spr_indomitus_chest_variants/spr_indomitus_chest_variants.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"d4e60b7e-673d-4732-a579-27be19e0db5f","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"1903824a-daf5-4c6b-b252-ca5eb43f6ccc","path":"sprites/spr_indomitus_chest_variants/spr_indomitus_chest_variants.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"57d77f6f-9937-40c8-b693-bb5f79d81e9f","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"f0e60637-c555-4a00-8c01-76f1d0b98b07","path":"sprites/spr_indomitus_chest_variants/spr_indomitus_chest_variants.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"27d4c94a-6c66-4f0c-a0bc-26b973bcf167","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"8df37974-a38e-49cb-a1ac-77820eeb1e35","path":"sprites/spr_indomitus_chest_variants/spr_indomitus_chest_variants.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"d4e60b7e-673d-4732-a579-27be19e0db5f","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"1903824a-daf5-4c6b-b252-ca5eb43f6ccc","path":"sprites/spr_indomitus_chest_variants/spr_indomitus_chest_variants.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"57d77f6f-9937-40c8-b693-bb5f79d81e9f","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_indomitus_complex/spr_indomitus_complex.yy b/sprites/spr_indomitus_complex/spr_indomitus_complex.yy index a9040d31e2..8cf0958e19 100644 --- a/sprites/spr_indomitus_complex/spr_indomitus_complex.yy +++ b/sprites/spr_indomitus_complex/spr_indomitus_complex.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_indomitus_complex", "bboxMode":0, "bbox_bottom":185, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"7173924c-400c-4ee3-8b3d-0123aa659415","name":"7173924c-400c-4ee3-8b3d-0123aa659415","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"7173924c-400c-4ee3-8b3d-0123aa659415","name":"7173924c-400c-4ee3-8b3d-0123aa659415","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -70,9 +70,7 @@ "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_complex/spr_indomitus_complex.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"6e1fa933-e2c0-4763-b072-75adc49be13b","IsCreationKey":false,"Key":0.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_complex/spr_indomitus_complex.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"6e1fa933-e2c0-4763-b072-75adc49be13b","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_head_variants/spr_indomitus_head_variants.yy b/sprites/spr_indomitus_head_variants/spr_indomitus_head_variants.yy index 42acc9e30a..6acad6e83b 100644 --- a/sprites/spr_indomitus_head_variants/spr_indomitus_head_variants.yy +++ b/sprites/spr_indomitus_head_variants/spr_indomitus_head_variants.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_indomitus_head_variants", "bboxMode":0, "bbox_bottom":88, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"7173924c-400c-4ee3-8b3d-0123aa659415","name":"7173924c-400c-4ee3-8b3d-0123aa659415","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"7173924c-400c-4ee3-8b3d-0123aa659415","name":"7173924c-400c-4ee3-8b3d-0123aa659415","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -70,9 +70,7 @@ "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_head_variants/spr_indomitus_head_variants.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"c4562bd4-7167-4589-a834-2a10a6e5f760","IsCreationKey":false,"Key":0.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_head_variants/spr_indomitus_head_variants.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"c4562bd4-7167-4589-a834-2a10a6e5f760","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_knightly_robe/spr_indomitus_knightly_robe.yy b/sprites/spr_indomitus_knightly_robe/spr_indomitus_knightly_robe.yy index 5e2dfe806d..93cbdfc0b7 100644 --- a/sprites/spr_indomitus_knightly_robe/spr_indomitus_knightly_robe.yy +++ b/sprites/spr_indomitus_knightly_robe/spr_indomitus_knightly_robe.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_indomitus_knightly_robe", "bboxMode":0, "bbox_bottom":238, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"05afe988-9760-4afd-a9a3-082287887f4a","name":"05afe988-9760-4afd-a9a3-082287887f4a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"05afe988-9760-4afd-a9a3-082287887f4a","name":"05afe988-9760-4afd-a9a3-082287887f4a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"05afe988-9760-4afd-a9a3-082287887f4a","path":"sprites/spr_indomitus_knightly_robe/spr_indomitus_knightly_robe.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"2e9b4aa7-44d1-4787-b28e-c7cd47428006","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"05afe988-9760-4afd-a9a3-082287887f4a","path":"sprites/spr_indomitus_knightly_robe/spr_indomitus_knightly_robe.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"2e9b4aa7-44d1-4787-b28e-c7cd47428006","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_left_arm/spr_indomitus_left_arm.yy b/sprites/spr_indomitus_left_arm/spr_indomitus_left_arm.yy index 1020555be3..c0f008b684 100644 --- a/sprites/spr_indomitus_left_arm/spr_indomitus_left_arm.yy +++ b/sprites/spr_indomitus_left_arm/spr_indomitus_left_arm.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_indomitus_left_arm", "bboxMode":0, "bbox_bottom":170, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"8165f8b1-f548-43db-a12f-9fb5d46a8ce1","name":"8165f8b1-f548-43db-a12f-9fb5d46a8ce1","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"8165f8b1-f548-43db-a12f-9fb5d46a8ce1","name":"8165f8b1-f548-43db-a12f-9fb5d46a8ce1","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"8165f8b1-f548-43db-a12f-9fb5d46a8ce1","path":"sprites/spr_indomitus_left_arm/spr_indomitus_left_arm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"fe3823bf-9117-481b-bdf0-d43733cc0e54","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"8165f8b1-f548-43db-a12f-9fb5d46a8ce1","path":"sprites/spr_indomitus_left_arm/spr_indomitus_left_arm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"fe3823bf-9117-481b-bdf0-d43733cc0e54","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_left_arm_bionic/spr_indomitus_left_arm_bionic.yy b/sprites/spr_indomitus_left_arm_bionic/spr_indomitus_left_arm_bionic.yy index d187e1b196..e3c7f27e5a 100644 --- a/sprites/spr_indomitus_left_arm_bionic/spr_indomitus_left_arm_bionic.yy +++ b/sprites/spr_indomitus_left_arm_bionic/spr_indomitus_left_arm_bionic.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_indomitus_left_arm_bionic", "bboxMode":0, "bbox_bottom":183, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"a3ac1d6f-e781-440e-a110-6fad27f8a376","name":"a3ac1d6f-e781-440e-a110-6fad27f8a376","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"a3ac1d6f-e781-440e-a110-6fad27f8a376","name":"a3ac1d6f-e781-440e-a110-6fad27f8a376","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"a3ac1d6f-e781-440e-a110-6fad27f8a376","path":"sprites/spr_indomitus_left_arm_bionic/spr_indomitus_left_arm_bionic.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"a3bc2eae-f410-482e-92ff-a37c8899ad31","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"a3ac1d6f-e781-440e-a110-6fad27f8a376","path":"sprites/spr_indomitus_left_arm_bionic/spr_indomitus_left_arm_bionic.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"a3bc2eae-f410-482e-92ff-a37c8899ad31","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_left_eye_bionic/spr_indomitus_left_eye_bionic.yy b/sprites/spr_indomitus_left_eye_bionic/spr_indomitus_left_eye_bionic.yy index 773e40350c..fa39646b34 100644 --- a/sprites/spr_indomitus_left_eye_bionic/spr_indomitus_left_eye_bionic.yy +++ b/sprites/spr_indomitus_left_eye_bionic/spr_indomitus_left_eye_bionic.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_indomitus_left_eye_bionic", "bboxMode":0, "bbox_bottom":75, @@ -12,10 +12,10 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"31989d85-49ac-4983-b8fb-45efa3e06aa7","name":"31989d85-49ac-4983-b8fb-45efa3e06aa7","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"a8ea05d9-93c5-4939-ab47-bac06fd85282","name":"a8ea05d9-93c5-4939-ab47-bac06fd85282","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"7c88e163-9b76-4a91-a58a-ffd8f4e1066f","name":"7c88e163-9b76-4a91-a58a-ffd8f4e1066f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"b1333d46-5d71-48c7-b81d-909c1f8a2b39","name":"b1333d46-5d71-48c7-b81d-909c1f8a2b39","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"31989d85-49ac-4983-b8fb-45efa3e06aa7","name":"31989d85-49ac-4983-b8fb-45efa3e06aa7","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"a8ea05d9-93c5-4939-ab47-bac06fd85282","name":"a8ea05d9-93c5-4939-ab47-bac06fd85282","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"7c88e163-9b76-4a91-a58a-ffd8f4e1066f","name":"7c88e163-9b76-4a91-a58a-ffd8f4e1066f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"b1333d46-5d71-48c7-b81d-909c1f8a2b39","name":"b1333d46-5d71-48c7-b81d-909c1f8a2b39","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -71,18 +71,10 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"31989d85-49ac-4983-b8fb-45efa3e06aa7","path":"sprites/spr_indomitus_left_eye_bionic/spr_indomitus_left_eye_bionic.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"3e165ea6-1ddf-40bb-a32d-fef77fd9555d","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"a8ea05d9-93c5-4939-ab47-bac06fd85282","path":"sprites/spr_indomitus_left_eye_bionic/spr_indomitus_left_eye_bionic.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"936f44b7-0688-4ef8-ab24-68a532190ed6","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"7c88e163-9b76-4a91-a58a-ffd8f4e1066f","path":"sprites/spr_indomitus_left_eye_bionic/spr_indomitus_left_eye_bionic.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"2091eff0-d98c-4046-bc81-0b1e7f0364d1","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"b1333d46-5d71-48c7-b81d-909c1f8a2b39","path":"sprites/spr_indomitus_left_eye_bionic/spr_indomitus_left_eye_bionic.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"9e450a15-0e35-401c-afff-0b2bc7c79c4f","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"31989d85-49ac-4983-b8fb-45efa3e06aa7","path":"sprites/spr_indomitus_left_eye_bionic/spr_indomitus_left_eye_bionic.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"3e165ea6-1ddf-40bb-a32d-fef77fd9555d","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"a8ea05d9-93c5-4939-ab47-bac06fd85282","path":"sprites/spr_indomitus_left_eye_bionic/spr_indomitus_left_eye_bionic.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"936f44b7-0688-4ef8-ab24-68a532190ed6","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"7c88e163-9b76-4a91-a58a-ffd8f4e1066f","path":"sprites/spr_indomitus_left_eye_bionic/spr_indomitus_left_eye_bionic.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"2091eff0-d98c-4046-bc81-0b1e7f0364d1","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"b1333d46-5d71-48c7-b81d-909c1f8a2b39","path":"sprites/spr_indomitus_left_eye_bionic/spr_indomitus_left_eye_bionic.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"9e450a15-0e35-401c-afff-0b2bc7c79c4f","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_indomitus_left_knee_crux/spr_indomitus_left_knee_crux.yy b/sprites/spr_indomitus_left_knee_crux/spr_indomitus_left_knee_crux.yy index 9b26a50863..9e6cc9cf5f 100644 --- a/sprites/spr_indomitus_left_knee_crux/spr_indomitus_left_knee_crux.yy +++ b/sprites/spr_indomitus_left_knee_crux/spr_indomitus_left_knee_crux.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_indomitus_left_knee_crux", "bboxMode":0, "bbox_bottom":206, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"d086015e-a6f4-4603-8d87-f9dc34671215","name":"d086015e-a6f4-4603-8d87-f9dc34671215","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"d086015e-a6f4-4603-8d87-f9dc34671215","name":"d086015e-a6f4-4603-8d87-f9dc34671215","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -70,9 +70,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"d086015e-a6f4-4603-8d87-f9dc34671215","path":"sprites/spr_indomitus_left_knee_crux/spr_indomitus_left_knee_crux.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"bf738b7d-36e3-4cdb-bf14-0edd5444950b","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"d086015e-a6f4-4603-8d87-f9dc34671215","path":"sprites/spr_indomitus_left_knee_crux/spr_indomitus_left_knee_crux.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"bf738b7d-36e3-4cdb-bf14-0edd5444950b","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_left_leg_bionic/spr_indomitus_left_leg_bionic.yy b/sprites/spr_indomitus_left_leg_bionic/spr_indomitus_left_leg_bionic.yy index bc377646d6..9af0d69d60 100644 --- a/sprites/spr_indomitus_left_leg_bionic/spr_indomitus_left_leg_bionic.yy +++ b/sprites/spr_indomitus_left_leg_bionic/spr_indomitus_left_leg_bionic.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_indomitus_left_leg_bionic", "bboxMode":0, "bbox_bottom":260, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"9050d74b-ae5d-43ad-9ef5-42a5ae426e64","name":"9050d74b-ae5d-43ad-9ef5-42a5ae426e64","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"9050d74b-ae5d-43ad-9ef5-42a5ae426e64","name":"9050d74b-ae5d-43ad-9ef5-42a5ae426e64","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"9050d74b-ae5d-43ad-9ef5-42a5ae426e64","path":"sprites/spr_indomitus_left_leg_bionic/spr_indomitus_left_leg_bionic.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"7eac121b-3931-417e-870e-272025ef2a2e","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"9050d74b-ae5d-43ad-9ef5-42a5ae426e64","path":"sprites/spr_indomitus_left_leg_bionic/spr_indomitus_left_leg_bionic.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"7eac121b-3931-417e-870e-272025ef2a2e","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_left_shin/spr_indomitus_left_shin.yy b/sprites/spr_indomitus_left_shin/spr_indomitus_left_shin.yy index add50a6d22..21ac8b11f6 100644 --- a/sprites/spr_indomitus_left_shin/spr_indomitus_left_shin.yy +++ b/sprites/spr_indomitus_left_shin/spr_indomitus_left_shin.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_indomitus_left_shin", "bboxMode":0, "bbox_bottom":248, @@ -12,9 +12,9 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"e60513c5-fcc3-459c-916e-8b19128ed541","name":"e60513c5-fcc3-459c-916e-8b19128ed541","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"bb2de076-5af9-459a-b130-624bab24de74","name":"bb2de076-5af9-459a-b130-624bab24de74","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"c23a99ed-6ea4-4ba2-8272-35125ec5c9db","name":"c23a99ed-6ea4-4ba2-8272-35125ec5c9db","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"e60513c5-fcc3-459c-916e-8b19128ed541","name":"e60513c5-fcc3-459c-916e-8b19128ed541","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"bb2de076-5af9-459a-b130-624bab24de74","name":"bb2de076-5af9-459a-b130-624bab24de74","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"c23a99ed-6ea4-4ba2-8272-35125ec5c9db","name":"c23a99ed-6ea4-4ba2-8272-35125ec5c9db","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -72,15 +72,9 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"e60513c5-fcc3-459c-916e-8b19128ed541","path":"sprites/spr_indomitus_left_shin/spr_indomitus_left_shin.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"8c9fab82-bd4c-4aaa-8995-50ee32141c65","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"bb2de076-5af9-459a-b130-624bab24de74","path":"sprites/spr_indomitus_left_shin/spr_indomitus_left_shin.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"67c33f4c-ee5a-4a87-99df-324d5f6e3d29","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"c23a99ed-6ea4-4ba2-8272-35125ec5c9db","path":"sprites/spr_indomitus_left_shin/spr_indomitus_left_shin.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"3cfeac81-ef68-4b7a-9463-ea132dcc12df","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"e60513c5-fcc3-459c-916e-8b19128ed541","path":"sprites/spr_indomitus_left_shin/spr_indomitus_left_shin.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"8c9fab82-bd4c-4aaa-8995-50ee32141c65","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"bb2de076-5af9-459a-b130-624bab24de74","path":"sprites/spr_indomitus_left_shin/spr_indomitus_left_shin.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"67c33f4c-ee5a-4a87-99df-324d5f6e3d29","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"c23a99ed-6ea4-4ba2-8272-35125ec5c9db","path":"sprites/spr_indomitus_left_shin/spr_indomitus_left_shin.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"3cfeac81-ef68-4b7a-9463-ea132dcc12df","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_indomitus_leg_variants/spr_indomitus_leg_variants.yy b/sprites/spr_indomitus_leg_variants/spr_indomitus_leg_variants.yy index c555c85b89..744c4e4c69 100644 --- a/sprites/spr_indomitus_leg_variants/spr_indomitus_leg_variants.yy +++ b/sprites/spr_indomitus_leg_variants/spr_indomitus_leg_variants.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_indomitus_leg_variants", "bboxMode":0, "bbox_bottom":259, @@ -12,8 +12,8 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"b1984530-db57-4951-bec4-a09cab003f1a","name":"b1984530-db57-4951-bec4-a09cab003f1a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"220fdf6f-48b5-4de0-9576-27b046131605","name":"220fdf6f-48b5-4de0-9576-27b046131605","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"b1984530-db57-4951-bec4-a09cab003f1a","name":"b1984530-db57-4951-bec4-a09cab003f1a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"220fdf6f-48b5-4de0-9576-27b046131605","name":"220fdf6f-48b5-4de0-9576-27b046131605","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -71,12 +71,8 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"b1984530-db57-4951-bec4-a09cab003f1a","path":"sprites/spr_indomitus_leg_variants/spr_indomitus_leg_variants.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"764ed5f4-cd44-421c-9173-78dc4b5c4698","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"220fdf6f-48b5-4de0-9576-27b046131605","path":"sprites/spr_indomitus_leg_variants/spr_indomitus_leg_variants.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"d185e240-e0cf-4973-93cf-cd6660ec621e","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"b1984530-db57-4951-bec4-a09cab003f1a","path":"sprites/spr_indomitus_leg_variants/spr_indomitus_leg_variants.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"764ed5f4-cd44-421c-9173-78dc4b5c4698","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"220fdf6f-48b5-4de0-9576-27b046131605","path":"sprites/spr_indomitus_leg_variants/spr_indomitus_leg_variants.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"d185e240-e0cf-4973-93cf-cd6660ec621e","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_indomitus_right_arm/spr_indomitus_right_arm.yy b/sprites/spr_indomitus_right_arm/spr_indomitus_right_arm.yy index 3a45cbdf10..ca3cf7ac40 100644 --- a/sprites/spr_indomitus_right_arm/spr_indomitus_right_arm.yy +++ b/sprites/spr_indomitus_right_arm/spr_indomitus_right_arm.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_indomitus_right_arm", "bboxMode":0, "bbox_bottom":170, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"d026e4c1-b8b3-449b-8c2e-5e0ccf1277cc","name":"d026e4c1-b8b3-449b-8c2e-5e0ccf1277cc","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"d026e4c1-b8b3-449b-8c2e-5e0ccf1277cc","name":"d026e4c1-b8b3-449b-8c2e-5e0ccf1277cc","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"d026e4c1-b8b3-449b-8c2e-5e0ccf1277cc","path":"sprites/spr_indomitus_right_arm/spr_indomitus_right_arm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"2172cfc5-5476-46d2-ba16-c7a79aada399","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"d026e4c1-b8b3-449b-8c2e-5e0ccf1277cc","path":"sprites/spr_indomitus_right_arm/spr_indomitus_right_arm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"2172cfc5-5476-46d2-ba16-c7a79aada399","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_right_arm_bionic/spr_indomitus_right_arm_bionic.yy b/sprites/spr_indomitus_right_arm_bionic/spr_indomitus_right_arm_bionic.yy index 19da8fb24e..9474f87e14 100644 --- a/sprites/spr_indomitus_right_arm_bionic/spr_indomitus_right_arm_bionic.yy +++ b/sprites/spr_indomitus_right_arm_bionic/spr_indomitus_right_arm_bionic.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_indomitus_right_arm_bionic", "bboxMode":0, "bbox_bottom":183, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"4bc0c5a9-ad91-4ba4-bcc8-3c39fcaa1d70","name":"4bc0c5a9-ad91-4ba4-bcc8-3c39fcaa1d70","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"4bc0c5a9-ad91-4ba4-bcc8-3c39fcaa1d70","name":"4bc0c5a9-ad91-4ba4-bcc8-3c39fcaa1d70","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"4bc0c5a9-ad91-4ba4-bcc8-3c39fcaa1d70","path":"sprites/spr_indomitus_right_arm_bionic/spr_indomitus_right_arm_bionic.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"e2d22107-2e4d-4737-813b-630e2f5e6019","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"4bc0c5a9-ad91-4ba4-bcc8-3c39fcaa1d70","path":"sprites/spr_indomitus_right_arm_bionic/spr_indomitus_right_arm_bionic.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"e2d22107-2e4d-4737-813b-630e2f5e6019","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_right_eye_bionic/spr_indomitus_right_eye_bionic.yy b/sprites/spr_indomitus_right_eye_bionic/spr_indomitus_right_eye_bionic.yy index da659677d3..d609229bea 100644 --- a/sprites/spr_indomitus_right_eye_bionic/spr_indomitus_right_eye_bionic.yy +++ b/sprites/spr_indomitus_right_eye_bionic/spr_indomitus_right_eye_bionic.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_indomitus_right_eye_bionic", "bboxMode":0, "bbox_bottom":75, @@ -12,10 +12,10 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"31989d85-49ac-4983-b8fb-45efa3e06aa7","name":"31989d85-49ac-4983-b8fb-45efa3e06aa7","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"a8ea05d9-93c5-4939-ab47-bac06fd85282","name":"a8ea05d9-93c5-4939-ab47-bac06fd85282","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"7c88e163-9b76-4a91-a58a-ffd8f4e1066f","name":"7c88e163-9b76-4a91-a58a-ffd8f4e1066f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"b1333d46-5d71-48c7-b81d-909c1f8a2b39","name":"b1333d46-5d71-48c7-b81d-909c1f8a2b39","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"31989d85-49ac-4983-b8fb-45efa3e06aa7","name":"31989d85-49ac-4983-b8fb-45efa3e06aa7","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"a8ea05d9-93c5-4939-ab47-bac06fd85282","name":"a8ea05d9-93c5-4939-ab47-bac06fd85282","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"7c88e163-9b76-4a91-a58a-ffd8f4e1066f","name":"7c88e163-9b76-4a91-a58a-ffd8f4e1066f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"b1333d46-5d71-48c7-b81d-909c1f8a2b39","name":"b1333d46-5d71-48c7-b81d-909c1f8a2b39","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -71,18 +71,10 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"31989d85-49ac-4983-b8fb-45efa3e06aa7","path":"sprites/spr_indomitus_right_eye_bionic/spr_indomitus_right_eye_bionic.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"d35ba92d-862a-4a6b-9d8e-48ca228e92e6","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"a8ea05d9-93c5-4939-ab47-bac06fd85282","path":"sprites/spr_indomitus_right_eye_bionic/spr_indomitus_right_eye_bionic.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"351befce-72d1-4a78-83dd-ce6e61ecbc59","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"7c88e163-9b76-4a91-a58a-ffd8f4e1066f","path":"sprites/spr_indomitus_right_eye_bionic/spr_indomitus_right_eye_bionic.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"963149ce-2d78-4541-a317-b6b7fd2005b9","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"b1333d46-5d71-48c7-b81d-909c1f8a2b39","path":"sprites/spr_indomitus_right_eye_bionic/spr_indomitus_right_eye_bionic.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"d5d8f9c8-7c3a-4820-a284-cb7a62688cb4","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"31989d85-49ac-4983-b8fb-45efa3e06aa7","path":"sprites/spr_indomitus_right_eye_bionic/spr_indomitus_right_eye_bionic.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"d35ba92d-862a-4a6b-9d8e-48ca228e92e6","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"a8ea05d9-93c5-4939-ab47-bac06fd85282","path":"sprites/spr_indomitus_right_eye_bionic/spr_indomitus_right_eye_bionic.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"351befce-72d1-4a78-83dd-ce6e61ecbc59","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"7c88e163-9b76-4a91-a58a-ffd8f4e1066f","path":"sprites/spr_indomitus_right_eye_bionic/spr_indomitus_right_eye_bionic.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"963149ce-2d78-4541-a317-b6b7fd2005b9","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"b1333d46-5d71-48c7-b81d-909c1f8a2b39","path":"sprites/spr_indomitus_right_eye_bionic/spr_indomitus_right_eye_bionic.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"d5d8f9c8-7c3a-4820-a284-cb7a62688cb4","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_indomitus_right_knee_crux/spr_indomitus_right_knee_crux.yy b/sprites/spr_indomitus_right_knee_crux/spr_indomitus_right_knee_crux.yy index 52d75c9847..7712947e5a 100644 --- a/sprites/spr_indomitus_right_knee_crux/spr_indomitus_right_knee_crux.yy +++ b/sprites/spr_indomitus_right_knee_crux/spr_indomitus_right_knee_crux.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_indomitus_right_knee_crux", "bboxMode":0, "bbox_bottom":206, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"597aa984-87e8-4425-8954-56127319e962","name":"597aa984-87e8-4425-8954-56127319e962","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"597aa984-87e8-4425-8954-56127319e962","name":"597aa984-87e8-4425-8954-56127319e962","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -70,9 +70,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"597aa984-87e8-4425-8954-56127319e962","path":"sprites/spr_indomitus_right_knee_crux/spr_indomitus_right_knee_crux.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"64416029-b6e6-4746-b1c7-2acf5e2ea462","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"597aa984-87e8-4425-8954-56127319e962","path":"sprites/spr_indomitus_right_knee_crux/spr_indomitus_right_knee_crux.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"64416029-b6e6-4746-b1c7-2acf5e2ea462","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_right_leg_bionic/spr_indomitus_right_leg_bionic.yy b/sprites/spr_indomitus_right_leg_bionic/spr_indomitus_right_leg_bionic.yy index 700ab2c6a6..644950b276 100644 --- a/sprites/spr_indomitus_right_leg_bionic/spr_indomitus_right_leg_bionic.yy +++ b/sprites/spr_indomitus_right_leg_bionic/spr_indomitus_right_leg_bionic.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_indomitus_right_leg_bionic", "bboxMode":0, "bbox_bottom":260, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"4bc0c5a9-ad91-4ba4-bcc8-3c39fcaa1d70","name":"4bc0c5a9-ad91-4ba4-bcc8-3c39fcaa1d70","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"4bc0c5a9-ad91-4ba4-bcc8-3c39fcaa1d70","name":"4bc0c5a9-ad91-4ba4-bcc8-3c39fcaa1d70","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -70,9 +70,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"4bc0c5a9-ad91-4ba4-bcc8-3c39fcaa1d70","path":"sprites/spr_indomitus_right_leg_bionic/spr_indomitus_right_leg_bionic.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"7b971e5d-63dc-464f-a2a5-601dd3c60196","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"4bc0c5a9-ad91-4ba4-bcc8-3c39fcaa1d70","path":"sprites/spr_indomitus_right_leg_bionic/spr_indomitus_right_leg_bionic.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"7b971e5d-63dc-464f-a2a5-601dd3c60196","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_right_shin/spr_indomitus_right_shin.yy b/sprites/spr_indomitus_right_shin/spr_indomitus_right_shin.yy index 04d57b9504..e7a1a3493a 100644 --- a/sprites/spr_indomitus_right_shin/spr_indomitus_right_shin.yy +++ b/sprites/spr_indomitus_right_shin/spr_indomitus_right_shin.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_indomitus_right_shin", "bboxMode":0, "bbox_bottom":248, @@ -12,9 +12,9 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"b1bed381-dffb-49f9-b787-37a97bc22f95","name":"b1bed381-dffb-49f9-b787-37a97bc22f95","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"c47c8ef5-80d7-495f-aed4-2018547c6479","name":"c47c8ef5-80d7-495f-aed4-2018547c6479","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"aa2b5092-d69b-4dac-8052-e89d83b7a246","name":"aa2b5092-d69b-4dac-8052-e89d83b7a246","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"b1bed381-dffb-49f9-b787-37a97bc22f95","name":"b1bed381-dffb-49f9-b787-37a97bc22f95","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"c47c8ef5-80d7-495f-aed4-2018547c6479","name":"c47c8ef5-80d7-495f-aed4-2018547c6479","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"aa2b5092-d69b-4dac-8052-e89d83b7a246","name":"aa2b5092-d69b-4dac-8052-e89d83b7a246","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -72,15 +72,9 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"b1bed381-dffb-49f9-b787-37a97bc22f95","path":"sprites/spr_indomitus_right_shin/spr_indomitus_right_shin.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"48a05983-ea7b-44c3-a992-de9cc1664717","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"c47c8ef5-80d7-495f-aed4-2018547c6479","path":"sprites/spr_indomitus_right_shin/spr_indomitus_right_shin.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"21dded79-bee1-4a00-b8ed-516dcd97f1e7","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"aa2b5092-d69b-4dac-8052-e89d83b7a246","path":"sprites/spr_indomitus_right_shin/spr_indomitus_right_shin.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"1961e603-5686-438f-aff5-54e527aeb5a6","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"b1bed381-dffb-49f9-b787-37a97bc22f95","path":"sprites/spr_indomitus_right_shin/spr_indomitus_right_shin.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"48a05983-ea7b-44c3-a992-de9cc1664717","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"c47c8ef5-80d7-495f-aed4-2018547c6479","path":"sprites/spr_indomitus_right_shin/spr_indomitus_right_shin.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"21dded79-bee1-4a00-b8ed-516dcd97f1e7","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"aa2b5092-d69b-4dac-8052-e89d83b7a246","path":"sprites/spr_indomitus_right_shin/spr_indomitus_right_shin.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"1961e603-5686-438f-aff5-54e527aeb5a6","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_ingame_menu/spr_ingame_menu.yy b/sprites/spr_ingame_menu/spr_ingame_menu.yy index dc8c531f01..5c4c96064f 100644 --- a/sprites/spr_ingame_menu/spr_ingame_menu.yy +++ b/sprites/spr_ingame_menu/spr_ingame_menu.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_ingame_menu", "bboxMode":0, "bbox_bottom":0, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"b65f6694-b366-414f-9654-e26918f980bb","name":"b65f6694-b366-414f-9654-e26918f980bb","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"b65f6694-b366-414f-9654-e26918f980bb","name":"b65f6694-b366-414f-9654-e26918f980bb","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"b65f6694-b366-414f-9654-e26918f980bb","path":"sprites/spr_ingame_menu/spr_ingame_menu.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"2ba6d12f-8596-48c6-9521-69317197d1f5","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"b65f6694-b366-414f-9654-e26918f980bb","path":"sprites/spr_ingame_menu/spr_ingame_menu.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"2ba6d12f-8596-48c6-9521-69317197d1f5","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_inspect_small/spr_inspect_small.yy b/sprites/spr_inspect_small/spr_inspect_small.yy index 6933cb4f4a..aca5279750 100644 --- a/sprites/spr_inspect_small/spr_inspect_small.yy +++ b/sprites/spr_inspect_small/spr_inspect_small.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_inspect_small", "bboxMode":0, "bbox_bottom":13, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"0090d381-ea2b-4d42-9d2d-e45e1b50b1f9","name":"0090d381-ea2b-4d42-9d2d-e45e1b50b1f9","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"0090d381-ea2b-4d42-9d2d-e45e1b50b1f9","name":"0090d381-ea2b-4d42-9d2d-e45e1b50b1f9","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"0090d381-ea2b-4d42-9d2d-e45e1b50b1f9","path":"sprites/spr_inspect_small/spr_inspect_small.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"25439a65-c8e8-427a-99ad-76bb9aa6510a","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"0090d381-ea2b-4d42-9d2d-e45e1b50b1f9","path":"sprites/spr_inspect_small/spr_inspect_small.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"25439a65-c8e8-427a-99ad-76bb9aa6510a","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":{ diff --git a/sprites/spr_intelligence_icon/spr_intelligence_icon.yy b/sprites/spr_intelligence_icon/spr_intelligence_icon.yy index 71abe2441b..b679c1b635 100644 --- a/sprites/spr_intelligence_icon/spr_intelligence_icon.yy +++ b/sprites/spr_intelligence_icon/spr_intelligence_icon.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_intelligence_icon", "bboxMode":0, "bbox_bottom":56, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"85cf4316-e81b-4313-bd8a-5fb90ac87e4a","name":"85cf4316-e81b-4313-bd8a-5fb90ac87e4a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"85cf4316-e81b-4313-bd8a-5fb90ac87e4a","name":"85cf4316-e81b-4313-bd8a-5fb90ac87e4a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"85cf4316-e81b-4313-bd8a-5fb90ac87e4a","path":"sprites/spr_intelligence_icon/spr_intelligence_icon.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"ee3d470c-76e2-4c4c-9673-2dfeb506bd71","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"85cf4316-e81b-4313-bd8a-5fb90ac87e4a","path":"sprites/spr_intelligence_icon/spr_intelligence_icon.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"ee3d470c-76e2-4c4c-9673-2dfeb506bd71","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_iron2_colors/spr_iron2_colors.yy b/sprites/spr_iron2_colors/spr_iron2_colors.yy index 6c0a193c4b..4d734fb12b 100644 --- a/sprites/spr_iron2_colors/spr_iron2_colors.yy +++ b/sprites/spr_iron2_colors/spr_iron2_colors.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_iron2_colors", "bboxMode":0, "bbox_bottom":226, @@ -12,20 +12,20 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"68983a54-f464-439d-b9c3-e617744dbd38","name":"68983a54-f464-439d-b9c3-e617744dbd38","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"de91054b-d131-4595-ae7a-cd693f216b00","name":"de91054b-d131-4595-ae7a-cd693f216b00","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"670d234d-0594-4987-944b-f6f6a18e90ce","name":"670d234d-0594-4987-944b-f6f6a18e90ce","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"81f4b5d2-f789-47bf-9bb4-07ea5a378987","name":"81f4b5d2-f789-47bf-9bb4-07ea5a378987","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"46188561-ca08-4852-a95c-89306ae2bc12","name":"46188561-ca08-4852-a95c-89306ae2bc12","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"73fa6e7a-cfa8-49c1-a1ed-6084beb9c039","name":"73fa6e7a-cfa8-49c1-a1ed-6084beb9c039","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"9edd79c3-06b0-426d-aebd-e35e0658f7fa","name":"9edd79c3-06b0-426d-aebd-e35e0658f7fa","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"2458e4aa-898d-47f4-814f-bb35887f2116","name":"2458e4aa-898d-47f4-814f-bb35887f2116","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"ba9d4d31-71c1-4b14-8e82-5284f2c801d3","name":"ba9d4d31-71c1-4b14-8e82-5284f2c801d3","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"76f25edc-9000-449f-a06f-4223015d179e","name":"76f25edc-9000-449f-a06f-4223015d179e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"354c4384-43a6-4072-ba17-6b481bdb5f9c","name":"354c4384-43a6-4072-ba17-6b481bdb5f9c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"a7e40c88-2114-4621-b155-7159c72b39be","name":"a7e40c88-2114-4621-b155-7159c72b39be","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"bc5ec13c-417b-43c4-a70d-2bb79f4ffd11","name":"bc5ec13c-417b-43c4-a70d-2bb79f4ffd11","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"70304c3b-0d04-4885-833a-b51390439de9","name":"70304c3b-0d04-4885-833a-b51390439de9","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"68983a54-f464-439d-b9c3-e617744dbd38","name":"68983a54-f464-439d-b9c3-e617744dbd38","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"de91054b-d131-4595-ae7a-cd693f216b00","name":"de91054b-d131-4595-ae7a-cd693f216b00","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"670d234d-0594-4987-944b-f6f6a18e90ce","name":"670d234d-0594-4987-944b-f6f6a18e90ce","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"81f4b5d2-f789-47bf-9bb4-07ea5a378987","name":"81f4b5d2-f789-47bf-9bb4-07ea5a378987","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"46188561-ca08-4852-a95c-89306ae2bc12","name":"46188561-ca08-4852-a95c-89306ae2bc12","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"73fa6e7a-cfa8-49c1-a1ed-6084beb9c039","name":"73fa6e7a-cfa8-49c1-a1ed-6084beb9c039","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"9edd79c3-06b0-426d-aebd-e35e0658f7fa","name":"9edd79c3-06b0-426d-aebd-e35e0658f7fa","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"2458e4aa-898d-47f4-814f-bb35887f2116","name":"2458e4aa-898d-47f4-814f-bb35887f2116","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"ba9d4d31-71c1-4b14-8e82-5284f2c801d3","name":"ba9d4d31-71c1-4b14-8e82-5284f2c801d3","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"76f25edc-9000-449f-a06f-4223015d179e","name":"76f25edc-9000-449f-a06f-4223015d179e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"354c4384-43a6-4072-ba17-6b481bdb5f9c","name":"354c4384-43a6-4072-ba17-6b481bdb5f9c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"a7e40c88-2114-4621-b155-7159c72b39be","name":"a7e40c88-2114-4621-b155-7159c72b39be","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"bc5ec13c-417b-43c4-a70d-2bb79f4ffd11","name":"bc5ec13c-417b-43c4-a70d-2bb79f4ffd11","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"70304c3b-0d04-4885-833a-b51390439de9","name":"70304c3b-0d04-4885-833a-b51390439de9","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -81,48 +81,20 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"68983a54-f464-439d-b9c3-e617744dbd38","path":"sprites/spr_iron2_colors/spr_iron2_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"103bbe7c-1edf-49cf-8311-e341df44c2e1","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"de91054b-d131-4595-ae7a-cd693f216b00","path":"sprites/spr_iron2_colors/spr_iron2_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"28c5461c-ff00-4e26-8433-1b02eef09c7f","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"670d234d-0594-4987-944b-f6f6a18e90ce","path":"sprites/spr_iron2_colors/spr_iron2_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"ea1daba6-87de-458b-8cb9-b74ab92aad25","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"81f4b5d2-f789-47bf-9bb4-07ea5a378987","path":"sprites/spr_iron2_colors/spr_iron2_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"b6b4c153-dc7b-4187-a900-676798338321","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"46188561-ca08-4852-a95c-89306ae2bc12","path":"sprites/spr_iron2_colors/spr_iron2_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"87f26c9f-2bbb-4db8-a6fe-6ad91660582d","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"73fa6e7a-cfa8-49c1-a1ed-6084beb9c039","path":"sprites/spr_iron2_colors/spr_iron2_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"ed57d5ed-21a4-4d56-928c-dbdf31e584b3","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"9edd79c3-06b0-426d-aebd-e35e0658f7fa","path":"sprites/spr_iron2_colors/spr_iron2_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"50993775-fb34-4a82-b68a-40598688813d","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"2458e4aa-898d-47f4-814f-bb35887f2116","path":"sprites/spr_iron2_colors/spr_iron2_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"3f0181e7-c0bf-44ec-949e-c32900e99071","IsCreationKey":false,"Key":7.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"ba9d4d31-71c1-4b14-8e82-5284f2c801d3","path":"sprites/spr_iron2_colors/spr_iron2_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"a220a7b1-219c-475e-ad5f-bc22aceb9088","IsCreationKey":false,"Key":8.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"76f25edc-9000-449f-a06f-4223015d179e","path":"sprites/spr_iron2_colors/spr_iron2_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"ef512294-e3dc-43c8-8ff7-316d2bd69f17","IsCreationKey":false,"Key":9.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"354c4384-43a6-4072-ba17-6b481bdb5f9c","path":"sprites/spr_iron2_colors/spr_iron2_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"7885f74f-4aa2-4a29-8b7d-2be898185fb2","IsCreationKey":false,"Key":10.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"a7e40c88-2114-4621-b155-7159c72b39be","path":"sprites/spr_iron2_colors/spr_iron2_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"33d38726-0482-44de-b32f-e9c07b50f278","IsCreationKey":false,"Key":11.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"bc5ec13c-417b-43c4-a70d-2bb79f4ffd11","path":"sprites/spr_iron2_colors/spr_iron2_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"c4ee1628-f122-48f7-aabd-d275c0365f97","IsCreationKey":false,"Key":12.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"70304c3b-0d04-4885-833a-b51390439de9","path":"sprites/spr_iron2_colors/spr_iron2_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"64c9c53c-fddc-454c-ad27-08d260147a3e","IsCreationKey":false,"Key":13.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"68983a54-f464-439d-b9c3-e617744dbd38","path":"sprites/spr_iron2_colors/spr_iron2_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"103bbe7c-1edf-49cf-8311-e341df44c2e1","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"de91054b-d131-4595-ae7a-cd693f216b00","path":"sprites/spr_iron2_colors/spr_iron2_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"28c5461c-ff00-4e26-8433-1b02eef09c7f","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"670d234d-0594-4987-944b-f6f6a18e90ce","path":"sprites/spr_iron2_colors/spr_iron2_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"ea1daba6-87de-458b-8cb9-b74ab92aad25","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"81f4b5d2-f789-47bf-9bb4-07ea5a378987","path":"sprites/spr_iron2_colors/spr_iron2_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"b6b4c153-dc7b-4187-a900-676798338321","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"46188561-ca08-4852-a95c-89306ae2bc12","path":"sprites/spr_iron2_colors/spr_iron2_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"87f26c9f-2bbb-4db8-a6fe-6ad91660582d","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"73fa6e7a-cfa8-49c1-a1ed-6084beb9c039","path":"sprites/spr_iron2_colors/spr_iron2_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"ed57d5ed-21a4-4d56-928c-dbdf31e584b3","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"9edd79c3-06b0-426d-aebd-e35e0658f7fa","path":"sprites/spr_iron2_colors/spr_iron2_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"50993775-fb34-4a82-b68a-40598688813d","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"2458e4aa-898d-47f4-814f-bb35887f2116","path":"sprites/spr_iron2_colors/spr_iron2_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"3f0181e7-c0bf-44ec-949e-c32900e99071","IsCreationKey":false,"Key":7.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"ba9d4d31-71c1-4b14-8e82-5284f2c801d3","path":"sprites/spr_iron2_colors/spr_iron2_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"a220a7b1-219c-475e-ad5f-bc22aceb9088","IsCreationKey":false,"Key":8.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"76f25edc-9000-449f-a06f-4223015d179e","path":"sprites/spr_iron2_colors/spr_iron2_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"ef512294-e3dc-43c8-8ff7-316d2bd69f17","IsCreationKey":false,"Key":9.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"354c4384-43a6-4072-ba17-6b481bdb5f9c","path":"sprites/spr_iron2_colors/spr_iron2_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"7885f74f-4aa2-4a29-8b7d-2be898185fb2","IsCreationKey":false,"Key":10.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"a7e40c88-2114-4621-b155-7159c72b39be","path":"sprites/spr_iron2_colors/spr_iron2_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"33d38726-0482-44de-b32f-e9c07b50f278","IsCreationKey":false,"Key":11.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"bc5ec13c-417b-43c4-a70d-2bb79f4ffd11","path":"sprites/spr_iron2_colors/spr_iron2_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"c4ee1628-f122-48f7-aabd-d275c0365f97","IsCreationKey":false,"Key":12.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"70304c3b-0d04-4885-833a-b51390439de9","path":"sprites/spr_iron2_colors/spr_iron2_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"64c9c53c-fddc-454c-ad27-08d260147a3e","IsCreationKey":false,"Key":13.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_iron_colors/spr_iron_colors.yy b/sprites/spr_iron_colors/spr_iron_colors.yy index 1af0c53a46..e488e59424 100644 --- a/sprites/spr_iron_colors/spr_iron_colors.yy +++ b/sprites/spr_iron_colors/spr_iron_colors.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_iron_colors", "bboxMode":0, "bbox_bottom":226, @@ -12,20 +12,20 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"8954f497-78cf-4943-a5b8-1ad0d56338ba","name":"8954f497-78cf-4943-a5b8-1ad0d56338ba","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"07ac734c-d38b-4e57-ba7a-0430e3e04fd4","name":"07ac734c-d38b-4e57-ba7a-0430e3e04fd4","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"9b65fe40-4fee-4efb-b9af-518409dbe823","name":"9b65fe40-4fee-4efb-b9af-518409dbe823","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"4066d94a-d66f-4e8f-972b-83ecea6d4cdc","name":"4066d94a-d66f-4e8f-972b-83ecea6d4cdc","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"b5111476-ed12-41e7-9771-0363cd974204","name":"b5111476-ed12-41e7-9771-0363cd974204","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"1fbe4fe0-b7b9-4993-8f67-e08fd83191c2","name":"1fbe4fe0-b7b9-4993-8f67-e08fd83191c2","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"d395d946-9677-487c-9595-19b8c3e6c0a9","name":"d395d946-9677-487c-9595-19b8c3e6c0a9","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"abc7ad93-6a10-4b6f-8586-8f7df3b676dd","name":"abc7ad93-6a10-4b6f-8586-8f7df3b676dd","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"00b5a3ca-7bb3-4150-b449-deff37ed2a99","name":"00b5a3ca-7bb3-4150-b449-deff37ed2a99","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"d3c248e7-3151-4651-89e9-f5ff8942f4dc","name":"d3c248e7-3151-4651-89e9-f5ff8942f4dc","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"f08d183c-3981-4178-8bac-83424529f1fb","name":"f08d183c-3981-4178-8bac-83424529f1fb","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"03ce65a0-467b-4267-a4ce-f89e37b34863","name":"03ce65a0-467b-4267-a4ce-f89e37b34863","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"4a08c6ea-8aa6-4fdf-a111-e3b2a603df17","name":"4a08c6ea-8aa6-4fdf-a111-e3b2a603df17","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"ccd0c0f6-ec74-40c4-9f5a-0b138fd94a5c","name":"ccd0c0f6-ec74-40c4-9f5a-0b138fd94a5c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"8954f497-78cf-4943-a5b8-1ad0d56338ba","name":"8954f497-78cf-4943-a5b8-1ad0d56338ba","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"07ac734c-d38b-4e57-ba7a-0430e3e04fd4","name":"07ac734c-d38b-4e57-ba7a-0430e3e04fd4","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"9b65fe40-4fee-4efb-b9af-518409dbe823","name":"9b65fe40-4fee-4efb-b9af-518409dbe823","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"4066d94a-d66f-4e8f-972b-83ecea6d4cdc","name":"4066d94a-d66f-4e8f-972b-83ecea6d4cdc","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"b5111476-ed12-41e7-9771-0363cd974204","name":"b5111476-ed12-41e7-9771-0363cd974204","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"1fbe4fe0-b7b9-4993-8f67-e08fd83191c2","name":"1fbe4fe0-b7b9-4993-8f67-e08fd83191c2","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"d395d946-9677-487c-9595-19b8c3e6c0a9","name":"d395d946-9677-487c-9595-19b8c3e6c0a9","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"abc7ad93-6a10-4b6f-8586-8f7df3b676dd","name":"abc7ad93-6a10-4b6f-8586-8f7df3b676dd","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"00b5a3ca-7bb3-4150-b449-deff37ed2a99","name":"00b5a3ca-7bb3-4150-b449-deff37ed2a99","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"d3c248e7-3151-4651-89e9-f5ff8942f4dc","name":"d3c248e7-3151-4651-89e9-f5ff8942f4dc","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"f08d183c-3981-4178-8bac-83424529f1fb","name":"f08d183c-3981-4178-8bac-83424529f1fb","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"03ce65a0-467b-4267-a4ce-f89e37b34863","name":"03ce65a0-467b-4267-a4ce-f89e37b34863","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"4a08c6ea-8aa6-4fdf-a111-e3b2a603df17","name":"4a08c6ea-8aa6-4fdf-a111-e3b2a603df17","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"ccd0c0f6-ec74-40c4-9f5a-0b138fd94a5c","name":"ccd0c0f6-ec74-40c4-9f5a-0b138fd94a5c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -81,48 +81,20 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"8954f497-78cf-4943-a5b8-1ad0d56338ba","path":"sprites/spr_iron_colors/spr_iron_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"8dd35abf-58b8-4bee-a73e-b68108f3975a","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"07ac734c-d38b-4e57-ba7a-0430e3e04fd4","path":"sprites/spr_iron_colors/spr_iron_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"9b27058b-7088-4e05-927d-59513c2528c7","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"9b65fe40-4fee-4efb-b9af-518409dbe823","path":"sprites/spr_iron_colors/spr_iron_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"715c9c4d-e729-44c6-bc57-259d7aef64ae","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"4066d94a-d66f-4e8f-972b-83ecea6d4cdc","path":"sprites/spr_iron_colors/spr_iron_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"78d3327a-d1ab-4790-9cb1-c3e61a3625c5","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"b5111476-ed12-41e7-9771-0363cd974204","path":"sprites/spr_iron_colors/spr_iron_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"1c25ac4b-3a8e-4a16-b7ab-77738e68309d","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"1fbe4fe0-b7b9-4993-8f67-e08fd83191c2","path":"sprites/spr_iron_colors/spr_iron_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"0e5be4cf-f072-4bc7-9d27-27c97a7826de","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"d395d946-9677-487c-9595-19b8c3e6c0a9","path":"sprites/spr_iron_colors/spr_iron_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"027b7011-7248-4b34-bf70-55e0061e160d","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"abc7ad93-6a10-4b6f-8586-8f7df3b676dd","path":"sprites/spr_iron_colors/spr_iron_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"252fbac2-7be8-4ab0-ad94-fc757078ca75","IsCreationKey":false,"Key":7.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"00b5a3ca-7bb3-4150-b449-deff37ed2a99","path":"sprites/spr_iron_colors/spr_iron_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"b7c46ff5-11b8-4bf2-aa16-50840e7fba23","IsCreationKey":false,"Key":8.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"d3c248e7-3151-4651-89e9-f5ff8942f4dc","path":"sprites/spr_iron_colors/spr_iron_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"5d5a480e-758f-4382-9d7c-b61b9bc36666","IsCreationKey":false,"Key":9.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"f08d183c-3981-4178-8bac-83424529f1fb","path":"sprites/spr_iron_colors/spr_iron_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"1036be0f-f3ba-422a-b7ff-f5b9e307e0a5","IsCreationKey":false,"Key":10.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"03ce65a0-467b-4267-a4ce-f89e37b34863","path":"sprites/spr_iron_colors/spr_iron_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"776c41b8-f672-4a6d-8fa7-d5af0f3c0b7a","IsCreationKey":false,"Key":11.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"4a08c6ea-8aa6-4fdf-a111-e3b2a603df17","path":"sprites/spr_iron_colors/spr_iron_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"645928a9-b88f-4cc4-acb3-3368a2ce1466","IsCreationKey":false,"Key":12.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"ccd0c0f6-ec74-40c4-9f5a-0b138fd94a5c","path":"sprites/spr_iron_colors/spr_iron_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"4c5ec09e-d333-4c77-a557-d55af9fe73d0","IsCreationKey":false,"Key":13.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"8954f497-78cf-4943-a5b8-1ad0d56338ba","path":"sprites/spr_iron_colors/spr_iron_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"8dd35abf-58b8-4bee-a73e-b68108f3975a","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"07ac734c-d38b-4e57-ba7a-0430e3e04fd4","path":"sprites/spr_iron_colors/spr_iron_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"9b27058b-7088-4e05-927d-59513c2528c7","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"9b65fe40-4fee-4efb-b9af-518409dbe823","path":"sprites/spr_iron_colors/spr_iron_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"715c9c4d-e729-44c6-bc57-259d7aef64ae","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"4066d94a-d66f-4e8f-972b-83ecea6d4cdc","path":"sprites/spr_iron_colors/spr_iron_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"78d3327a-d1ab-4790-9cb1-c3e61a3625c5","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"b5111476-ed12-41e7-9771-0363cd974204","path":"sprites/spr_iron_colors/spr_iron_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"1c25ac4b-3a8e-4a16-b7ab-77738e68309d","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"1fbe4fe0-b7b9-4993-8f67-e08fd83191c2","path":"sprites/spr_iron_colors/spr_iron_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"0e5be4cf-f072-4bc7-9d27-27c97a7826de","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"d395d946-9677-487c-9595-19b8c3e6c0a9","path":"sprites/spr_iron_colors/spr_iron_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"027b7011-7248-4b34-bf70-55e0061e160d","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"abc7ad93-6a10-4b6f-8586-8f7df3b676dd","path":"sprites/spr_iron_colors/spr_iron_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"252fbac2-7be8-4ab0-ad94-fc757078ca75","IsCreationKey":false,"Key":7.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"00b5a3ca-7bb3-4150-b449-deff37ed2a99","path":"sprites/spr_iron_colors/spr_iron_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"b7c46ff5-11b8-4bf2-aa16-50840e7fba23","IsCreationKey":false,"Key":8.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"d3c248e7-3151-4651-89e9-f5ff8942f4dc","path":"sprites/spr_iron_colors/spr_iron_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"5d5a480e-758f-4382-9d7c-b61b9bc36666","IsCreationKey":false,"Key":9.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"f08d183c-3981-4178-8bac-83424529f1fb","path":"sprites/spr_iron_colors/spr_iron_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"1036be0f-f3ba-422a-b7ff-f5b9e307e0a5","IsCreationKey":false,"Key":10.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"03ce65a0-467b-4267-a4ce-f89e37b34863","path":"sprites/spr_iron_colors/spr_iron_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"776c41b8-f672-4a6d-8fa7-d5af0f3c0b7a","IsCreationKey":false,"Key":11.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"4a08c6ea-8aa6-4fdf-a111-e3b2a603df17","path":"sprites/spr_iron_colors/spr_iron_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"645928a9-b88f-4cc4-acb3-3368a2ce1466","IsCreationKey":false,"Key":12.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"ccd0c0f6-ec74-40c4-9f5a-0b138fd94a5c","path":"sprites/spr_iron_colors/spr_iron_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"4c5ec09e-d333-4c77-a557-d55af9fe73d0","IsCreationKey":false,"Key":13.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_jump_pack_complex/spr_jump_pack_complex.yy b/sprites/spr_jump_pack_complex/spr_jump_pack_complex.yy index fb9279641b..76aa8a6fe6 100644 --- a/sprites/spr_jump_pack_complex/spr_jump_pack_complex.yy +++ b/sprites/spr_jump_pack_complex/spr_jump_pack_complex.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_jump_pack_complex", "bboxMode":0, "bbox_bottom":77, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"c5bc43cd-b567-4673-92b9-efede7a0b44f","name":"c5bc43cd-b567-4673-92b9-efede7a0b44f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"c5bc43cd-b567-4673-92b9-efede7a0b44f","name":"c5bc43cd-b567-4673-92b9-efede7a0b44f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "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_jump_pack_complex/spr_jump_pack_complex.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,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"c5bc43cd-b567-4673-92b9-efede7a0b44f","path":"sprites/spr_jump_pack_complex/spr_jump_pack_complex.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, diff --git a/sprites/spr_knightly_belt/spr_knightly_belt.yy b/sprites/spr_knightly_belt/spr_knightly_belt.yy index 5d1add7640..c0e74a352c 100644 --- a/sprites/spr_knightly_belt/spr_knightly_belt.yy +++ b/sprites/spr_knightly_belt/spr_knightly_belt.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_knightly_belt", "bboxMode":0, "bbox_bottom":114, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"b6ba8600-fb6b-4fa9-abc7-bdc2311eb79e","name":"b6ba8600-fb6b-4fa9-abc7-bdc2311eb79e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"b6ba8600-fb6b-4fa9-abc7-bdc2311eb79e","name":"b6ba8600-fb6b-4fa9-abc7-bdc2311eb79e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "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_knightly_belt/spr_knightly_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,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"b6ba8600-fb6b-4fa9-abc7-bdc2311eb79e","path":"sprites/spr_knightly_belt/spr_knightly_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, diff --git a/sprites/spr_knightly_personal_livery/spr_knightly_personal_livery.yy b/sprites/spr_knightly_personal_livery/spr_knightly_personal_livery.yy index 62900585e0..99b64f495a 100644 --- a/sprites/spr_knightly_personal_livery/spr_knightly_personal_livery.yy +++ b/sprites/spr_knightly_personal_livery/spr_knightly_personal_livery.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_knightly_personal_livery", "bboxMode":0, "bbox_bottom":147, @@ -12,11 +12,11 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"aaf65e00-98e5-4655-b105-2c4a6c74b695","name":"aaf65e00-98e5-4655-b105-2c4a6c74b695","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"024f569c-a0dc-465d-a295-994d80ecdc72","name":"024f569c-a0dc-465d-a295-994d80ecdc72","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"2f1a13d5-6930-4af9-8bec-8646b5b779d4","name":"2f1a13d5-6930-4af9-8bec-8646b5b779d4","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"214ebeed-1ce9-49c7-b4b9-0e827b8f1e3c","name":"214ebeed-1ce9-49c7-b4b9-0e827b8f1e3c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"e61c9db0-a400-41d3-8c2d-e44ec1ac97dc","name":"e61c9db0-a400-41d3-8c2d-e44ec1ac97dc","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"aaf65e00-98e5-4655-b105-2c4a6c74b695","name":"aaf65e00-98e5-4655-b105-2c4a6c74b695","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"024f569c-a0dc-465d-a295-994d80ecdc72","name":"024f569c-a0dc-465d-a295-994d80ecdc72","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"2f1a13d5-6930-4af9-8bec-8646b5b779d4","name":"2f1a13d5-6930-4af9-8bec-8646b5b779d4","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"214ebeed-1ce9-49c7-b4b9-0e827b8f1e3c","name":"214ebeed-1ce9-49c7-b4b9-0e827b8f1e3c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"e61c9db0-a400-41d3-8c2d-e44ec1ac97dc","name":"e61c9db0-a400-41d3-8c2d-e44ec1ac97dc","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -72,21 +72,11 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"aaf65e00-98e5-4655-b105-2c4a6c74b695","path":"sprites/spr_knightly_personal_livery/spr_knightly_personal_livery.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"98d44b30-9d1d-49f6-a2d8-9a187c5b55eb","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"024f569c-a0dc-465d-a295-994d80ecdc72","path":"sprites/spr_knightly_personal_livery/spr_knightly_personal_livery.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"e0128610-1f4f-4c1f-8ff4-b347f2d3f35b","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"2f1a13d5-6930-4af9-8bec-8646b5b779d4","path":"sprites/spr_knightly_personal_livery/spr_knightly_personal_livery.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"c39acfe9-3000-43ce-be3a-b1bb15a4f80a","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"214ebeed-1ce9-49c7-b4b9-0e827b8f1e3c","path":"sprites/spr_knightly_personal_livery/spr_knightly_personal_livery.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"43ef9db9-df65-4ceb-9a93-80c7a7f4cd9b","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"e61c9db0-a400-41d3-8c2d-e44ec1ac97dc","path":"sprites/spr_knightly_personal_livery/spr_knightly_personal_livery.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"1474bec5-4278-4ec1-8ff2-9846b8eb8267","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"aaf65e00-98e5-4655-b105-2c4a6c74b695","path":"sprites/spr_knightly_personal_livery/spr_knightly_personal_livery.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"98d44b30-9d1d-49f6-a2d8-9a187c5b55eb","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"024f569c-a0dc-465d-a295-994d80ecdc72","path":"sprites/spr_knightly_personal_livery/spr_knightly_personal_livery.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"e0128610-1f4f-4c1f-8ff4-b347f2d3f35b","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"2f1a13d5-6930-4af9-8bec-8646b5b779d4","path":"sprites/spr_knightly_personal_livery/spr_knightly_personal_livery.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"c39acfe9-3000-43ce-be3a-b1bb15a4f80a","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"214ebeed-1ce9-49c7-b4b9-0e827b8f1e3c","path":"sprites/spr_knightly_personal_livery/spr_knightly_personal_livery.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"43ef9db9-df65-4ceb-9a93-80c7a7f4cd9b","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"e61c9db0-a400-41d3-8c2d-e44ec1ac97dc","path":"sprites/spr_knightly_personal_livery/spr_knightly_personal_livery.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"1474bec5-4278-4ec1-8ff2-9846b8eb8267","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_knightly_robes/spr_knightly_robes.yy b/sprites/spr_knightly_robes/spr_knightly_robes.yy index 0bf232cc4f..25dd2cc1fc 100644 --- a/sprites/spr_knightly_robes/spr_knightly_robes.yy +++ b/sprites/spr_knightly_robes/spr_knightly_robes.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_knightly_robes", "bboxMode":0, "bbox_bottom":200, @@ -12,9 +12,9 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"d50f61ee-1ed4-4329-a0d3-20176ffc6a71","name":"d50f61ee-1ed4-4329-a0d3-20176ffc6a71","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"9a188b5e-581b-4e24-a278-56e5c336a324","name":"9a188b5e-581b-4e24-a278-56e5c336a324","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"a9f2fe5e-d679-49a6-bfda-f4cc90a1e3a2","name":"a9f2fe5e-d679-49a6-bfda-f4cc90a1e3a2","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"d50f61ee-1ed4-4329-a0d3-20176ffc6a71","name":"d50f61ee-1ed4-4329-a0d3-20176ffc6a71","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"9a188b5e-581b-4e24-a278-56e5c336a324","name":"9a188b5e-581b-4e24-a278-56e5c336a324","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"a9f2fe5e-d679-49a6-bfda-f4cc90a1e3a2","name":"a9f2fe5e-d679-49a6-bfda-f4cc90a1e3a2","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -70,15 +70,9 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"d50f61ee-1ed4-4329-a0d3-20176ffc6a71","path":"sprites/spr_knightly_robes/spr_knightly_robes.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"760e0b63-7d42-41be-ab4b-ea3807fb2c02","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"9a188b5e-581b-4e24-a278-56e5c336a324","path":"sprites/spr_knightly_robes/spr_knightly_robes.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"1f61c39e-e9b8-40cc-8f58-c42eb3501c63","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"a9f2fe5e-d679-49a6-bfda-f4cc90a1e3a2","path":"sprites/spr_knightly_robes/spr_knightly_robes.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"3ef4e6ac-c7c0-4c77-88e2-b471a1031483","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"d50f61ee-1ed4-4329-a0d3-20176ffc6a71","path":"sprites/spr_knightly_robes/spr_knightly_robes.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"760e0b63-7d42-41be-ab4b-ea3807fb2c02","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"9a188b5e-581b-4e24-a278-56e5c336a324","path":"sprites/spr_knightly_robes/spr_knightly_robes.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"1f61c39e-e9b8-40cc-8f58-c42eb3501c63","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"a9f2fe5e-d679-49a6-bfda-f4cc90a1e3a2","path":"sprites/spr_knightly_robes/spr_knightly_robes.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"3ef4e6ac-c7c0-4c77-88e2-b471a1031483","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_laurel/spr_laurel.yy b/sprites/spr_laurel/spr_laurel.yy index c313ad5e54..679ad729f4 100644 --- a/sprites/spr_laurel/spr_laurel.yy +++ b/sprites/spr_laurel/spr_laurel.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_laurel", "bboxMode":0, "bbox_bottom":64, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"61531cde-cd44-4806-ae39-3c63f51d65de","name":"61531cde-cd44-4806-ae39-3c63f51d65de","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"61531cde-cd44-4806-ae39-3c63f51d65de","name":"61531cde-cd44-4806-ae39-3c63f51d65de","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "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_laurel/spr_laurel.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"0ff43a50-5175-4249-ac1a-a39557b93c1c","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_laurel/spr_laurel.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"0ff43a50-5175-4249-ac1a-a39557b93c1c","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_left_pauldron_chainmail/spr_left_pauldron_chainmail.yy b/sprites/spr_left_pauldron_chainmail/spr_left_pauldron_chainmail.yy index a94626035c..10f9459f15 100644 --- a/sprites/spr_left_pauldron_chainmail/spr_left_pauldron_chainmail.yy +++ b/sprites/spr_left_pauldron_chainmail/spr_left_pauldron_chainmail.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_left_pauldron_chainmail", "bboxMode":0, "bbox_bottom":96, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"b6ba8600-fb6b-4fa9-abc7-bdc2311eb79e","name":"b6ba8600-fb6b-4fa9-abc7-bdc2311eb79e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"b6ba8600-fb6b-4fa9-abc7-bdc2311eb79e","name":"b6ba8600-fb6b-4fa9-abc7-bdc2311eb79e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -34,13 +34,7 @@ "resourceType":"GMNineSliceData", "resourceVersion":"2.0", "right":0, - "tileMode":[ - 0, - 0, - 0, - 0, - 0, - ], + "tileMode":[0,0,0,0,0,], "top":0, }, "origin":9, @@ -90,9 +84,7 @@ "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_left_pauldron_chainmail/spr_left_pauldron_chainmail.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"7ffd25d2-f283-4823-9926-1576535448ca","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_left_pauldron_chainmail/spr_left_pauldron_chainmail.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"7ffd25d2-f283-4823-9926-1576535448ca","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_left_pauldron_fur_hanging/spr_left_pauldron_fur_hanging.yy b/sprites/spr_left_pauldron_fur_hanging/spr_left_pauldron_fur_hanging.yy index a3d9c504bc..6dd02992f7 100644 --- a/sprites/spr_left_pauldron_fur_hanging/spr_left_pauldron_fur_hanging.yy +++ b/sprites/spr_left_pauldron_fur_hanging/spr_left_pauldron_fur_hanging.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_left_pauldron_fur_hanging", "bboxMode":0, "bbox_bottom":117, @@ -12,10 +12,10 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"b6ba8600-fb6b-4fa9-abc7-bdc2311eb79e","name":"b6ba8600-fb6b-4fa9-abc7-bdc2311eb79e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"79bd7af2-b597-4d04-9558-b8bc390d83d6","name":"79bd7af2-b597-4d04-9558-b8bc390d83d6","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"52d5981c-c162-45da-84db-60501fe9d9f1","name":"52d5981c-c162-45da-84db-60501fe9d9f1","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"460206a5-318f-4048-bdf9-249e96846430","name":"460206a5-318f-4048-bdf9-249e96846430","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"b6ba8600-fb6b-4fa9-abc7-bdc2311eb79e","name":"b6ba8600-fb6b-4fa9-abc7-bdc2311eb79e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"79bd7af2-b597-4d04-9558-b8bc390d83d6","name":"79bd7af2-b597-4d04-9558-b8bc390d83d6","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"52d5981c-c162-45da-84db-60501fe9d9f1","name":"52d5981c-c162-45da-84db-60501fe9d9f1","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"460206a5-318f-4048-bdf9-249e96846430","name":"460206a5-318f-4048-bdf9-249e96846430","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -38,13 +38,7 @@ "resourceType":"GMNineSliceData", "resourceVersion":"2.0", "right":0, - "tileMode":[ - 0, - 0, - 0, - 0, - 0, - ], + "tileMode":[0,0,0,0,0,], "top":0, }, "origin":9, @@ -94,18 +88,10 @@ "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_left_pauldron_fur_hanging/spr_left_pauldron_fur_hanging.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"fac0f522-8b4a-4288-ad9c-70f373393e94","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"79bd7af2-b597-4d04-9558-b8bc390d83d6","path":"sprites/spr_left_pauldron_fur_hanging/spr_left_pauldron_fur_hanging.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"1bd0f84a-fd4a-496b-9fd1-369d25bd45ec","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"52d5981c-c162-45da-84db-60501fe9d9f1","path":"sprites/spr_left_pauldron_fur_hanging/spr_left_pauldron_fur_hanging.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"168346db-67b1-47ac-b145-52da0b158996","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"460206a5-318f-4048-bdf9-249e96846430","path":"sprites/spr_left_pauldron_fur_hanging/spr_left_pauldron_fur_hanging.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"aba64abc-cd2b-43a1-8891-da658e78d283","IsCreationKey":false,"Key":3.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_left_pauldron_fur_hanging/spr_left_pauldron_fur_hanging.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"fac0f522-8b4a-4288-ad9c-70f373393e94","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"79bd7af2-b597-4d04-9558-b8bc390d83d6","path":"sprites/spr_left_pauldron_fur_hanging/spr_left_pauldron_fur_hanging.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"1bd0f84a-fd4a-496b-9fd1-369d25bd45ec","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"52d5981c-c162-45da-84db-60501fe9d9f1","path":"sprites/spr_left_pauldron_fur_hanging/spr_left_pauldron_fur_hanging.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"168346db-67b1-47ac-b145-52da0b158996","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"460206a5-318f-4048-bdf9-249e96846430","path":"sprites/spr_left_pauldron_fur_hanging/spr_left_pauldron_fur_hanging.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"aba64abc-cd2b-43a1-8891-da658e78d283","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_left_shin_spikes/spr_left_shin_spikes.yy b/sprites/spr_left_shin_spikes/spr_left_shin_spikes.yy index 53694dcafc..da9d4b35ee 100644 --- a/sprites/spr_left_shin_spikes/spr_left_shin_spikes.yy +++ b/sprites/spr_left_shin_spikes/spr_left_shin_spikes.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_left_shin_spikes", "bboxMode":0, "bbox_bottom":199, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"89a6d4dd-18ab-43ec-ad94-6adb0940fd20","name":"89a6d4dd-18ab-43ec-ad94-6adb0940fd20","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"89a6d4dd-18ab-43ec-ad94-6adb0940fd20","name":"89a6d4dd-18ab-43ec-ad94-6adb0940fd20","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -70,9 +70,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"89a6d4dd-18ab-43ec-ad94-6adb0940fd20","path":"sprites/spr_left_shin_spikes/spr_left_shin_spikes.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"4cca9923-5ca1-4f6c-8e91-f7ec56fa92a6","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"89a6d4dd-18ab-43ec-ad94-6adb0940fd20","path":"sprites/spr_left_shin_spikes/spr_left_shin_spikes.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"4cca9923-5ca1-4f6c-8e91-f7ec56fa92a6","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_leopard_sprite/spr_leopard_sprite.yy b/sprites/spr_leopard_sprite/spr_leopard_sprite.yy index 611ba4f450..e1e33b8165 100644 --- a/sprites/spr_leopard_sprite/spr_leopard_sprite.yy +++ b/sprites/spr_leopard_sprite/spr_leopard_sprite.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_leopard_sprite", "bboxMode":0, "bbox_bottom":1045, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":true, "frames":[ - {"$GMSpriteFrame":"","%Name":"65e7e956-93b9-47bc-8d8d-2515bf68797e","name":"65e7e956-93b9-47bc-8d8d-2515bf68797e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"65e7e956-93b9-47bc-8d8d-2515bf68797e","name":"65e7e956-93b9-47bc-8d8d-2515bf68797e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -33,13 +33,7 @@ "resourceType":"GMNineSliceData", "resourceVersion":"2.0", "right":0, - "tileMode":[ - 0, - 0, - 0, - 0, - 0, - ], + "tileMode":[0,0,0,0,0,], "top":0, }, "origin":0, @@ -87,9 +81,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"65e7e956-93b9-47bc-8d8d-2515bf68797e","path":"sprites/spr_leopard_sprite/spr_leopard_sprite.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"062dc391-a5c8-448f-ae78-77f49f609d50","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"65e7e956-93b9-47bc-8d8d-2515bf68797e","path":"sprites/spr_leopard_sprite/spr_leopard_sprite.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"062dc391-a5c8-448f-ae78-77f49f609d50","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_lib_area_pad/spr_lib_area_pad.yy b/sprites/spr_lib_area_pad/spr_lib_area_pad.yy index 56a13254bb..caa64fa184 100644 --- a/sprites/spr_lib_area_pad/spr_lib_area_pad.yy +++ b/sprites/spr_lib_area_pad/spr_lib_area_pad.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_lib_area_pad", "bboxMode":0, "bbox_bottom":156, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"79a89cdc-8304-4ba7-85bc-216c6b783541","name":"79a89cdc-8304-4ba7-85bc-216c6b783541","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"79a89cdc-8304-4ba7-85bc-216c6b783541","name":"79a89cdc-8304-4ba7-85bc-216c6b783541","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"79a89cdc-8304-4ba7-85bc-216c6b783541","path":"sprites/spr_lib_area_pad/spr_lib_area_pad.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"18b5f818-4948-4206-9e3b-991e27ceb176","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"79a89cdc-8304-4ba7-85bc-216c6b783541","path":"sprites/spr_lib_area_pad/spr_lib_area_pad.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"18b5f818-4948-4206-9e3b-991e27ceb176","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_lion_belt/spr_lion_belt.yy b/sprites/spr_lion_belt/spr_lion_belt.yy index 4ef9561af1..104e0121f5 100644 --- a/sprites/spr_lion_belt/spr_lion_belt.yy +++ b/sprites/spr_lion_belt/spr_lion_belt.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_lion_belt", "bboxMode":0, "bbox_bottom":106, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"dbb220c9-62b6-4ca7-a13f-5951132d0d13","name":"dbb220c9-62b6-4ca7-a13f-5951132d0d13","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"dbb220c9-62b6-4ca7-a13f-5951132d0d13","name":"dbb220c9-62b6-4ca7-a13f-5951132d0d13","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "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_load_splash/spr_load_splash.yy b/sprites/spr_load_splash/spr_load_splash.yy index 4bb6e38af9..8e28f807ca 100644 --- a/sprites/spr_load_splash/spr_load_splash.yy +++ b/sprites/spr_load_splash/spr_load_splash.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_load_splash", "bboxMode":0, "bbox_bottom":0, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"9f37f9ad-5acf-4749-b330-653b00bf1685","name":"9f37f9ad-5acf-4749-b330-653b00bf1685","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"9f37f9ad-5acf-4749-b330-653b00bf1685","name":"9f37f9ad-5acf-4749-b330-653b00bf1685","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"9f37f9ad-5acf-4749-b330-653b00bf1685","path":"sprites/spr_load_splash/spr_load_splash.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"f4a62229-0821-40e8-ba11-6460df7dfcbf","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"9f37f9ad-5acf-4749-b330-653b00bf1685","path":"sprites/spr_load_splash/spr_load_splash.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"f4a62229-0821-40e8-ba11-6460df7dfcbf","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_load_text/spr_load_text.yy b/sprites/spr_load_text/spr_load_text.yy index 1d2b8442d2..307254ed1f 100644 --- a/sprites/spr_load_text/spr_load_text.yy +++ b/sprites/spr_load_text/spr_load_text.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_load_text", "bboxMode":0, "bbox_bottom":52, @@ -12,9 +12,9 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"babe11d3-8f2c-4fc0-8eb3-ffc125e6fb5c","name":"babe11d3-8f2c-4fc0-8eb3-ffc125e6fb5c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"b065e4b2-6233-4f3b-8c82-cf5a9264d1e8","name":"b065e4b2-6233-4f3b-8c82-cf5a9264d1e8","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"5a4b62e7-6e59-4e4e-b377-fc2bda6b5e79","name":"5a4b62e7-6e59-4e4e-b377-fc2bda6b5e79","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"babe11d3-8f2c-4fc0-8eb3-ffc125e6fb5c","name":"babe11d3-8f2c-4fc0-8eb3-ffc125e6fb5c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"b065e4b2-6233-4f3b-8c82-cf5a9264d1e8","name":"b065e4b2-6233-4f3b-8c82-cf5a9264d1e8","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"5a4b62e7-6e59-4e4e-b377-fc2bda6b5e79","name":"5a4b62e7-6e59-4e4e-b377-fc2bda6b5e79","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -70,15 +70,9 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"babe11d3-8f2c-4fc0-8eb3-ffc125e6fb5c","path":"sprites/spr_load_text/spr_load_text.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"70d9d206-2244-4eb3-ab1e-db128d778083","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"b065e4b2-6233-4f3b-8c82-cf5a9264d1e8","path":"sprites/spr_load_text/spr_load_text.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"e3e5baa6-38ac-4bc8-874e-4765f803541f","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"5a4b62e7-6e59-4e4e-b377-fc2bda6b5e79","path":"sprites/spr_load_text/spr_load_text.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"f6fb65d0-5839-486c-b262-bb90df98c9dd","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"babe11d3-8f2c-4fc0-8eb3-ffc125e6fb5c","path":"sprites/spr_load_text/spr_load_text.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"70d9d206-2244-4eb3-ab1e-db128d778083","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"b065e4b2-6233-4f3b-8c82-cf5a9264d1e8","path":"sprites/spr_load_text/spr_load_text.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"e3e5baa6-38ac-4bc8-874e-4765f803541f","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"5a4b62e7-6e59-4e4e-b377-fc2bda6b5e79","path":"sprites/spr_load_text/spr_load_text.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"f6fb65d0-5839-486c-b262-bb90df98c9dd","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_loadbar/spr_loadbar.yy b/sprites/spr_loadbar/spr_loadbar.yy index f0e35ac0c6..2d45f1de76 100644 --- a/sprites/spr_loadbar/spr_loadbar.yy +++ b/sprites/spr_loadbar/spr_loadbar.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_loadbar", "bboxMode":0, "bbox_bottom":10, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"90751334-decf-4a0b-8001-6657b1ffacce","name":"90751334-decf-4a0b-8001-6657b1ffacce","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"90751334-decf-4a0b-8001-6657b1ffacce","name":"90751334-decf-4a0b-8001-6657b1ffacce","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"90751334-decf-4a0b-8001-6657b1ffacce","path":"sprites/spr_loadbar/spr_loadbar.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"69fbbe7f-fe79-4fac-888c-f3b6a0794f2d","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"90751334-decf-4a0b-8001-6657b1ffacce","path":"sprites/spr_loadbar/spr_loadbar.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"69fbbe7f-fe79-4fac-888c-f3b6a0794f2d","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":{ diff --git a/sprites/spr_loadbar_cover/spr_loadbar_cover.yy b/sprites/spr_loadbar_cover/spr_loadbar_cover.yy index 850818832f..96e076bab2 100644 --- a/sprites/spr_loadbar_cover/spr_loadbar_cover.yy +++ b/sprites/spr_loadbar_cover/spr_loadbar_cover.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_loadbar_cover", "bboxMode":0, "bbox_bottom":12, @@ -12,107 +12,107 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"ee0d14e4-33e3-41e9-b76d-dca309d76ad9","name":"ee0d14e4-33e3-41e9-b76d-dca309d76ad9","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"f270f2a7-106e-4206-b281-695e204d1fb5","name":"f270f2a7-106e-4206-b281-695e204d1fb5","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"522fa573-e304-4534-9cd1-3a7eb9d1fa85","name":"522fa573-e304-4534-9cd1-3a7eb9d1fa85","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"936fdbeb-4b78-4752-a6f2-e034907abe7b","name":"936fdbeb-4b78-4752-a6f2-e034907abe7b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"2f30c4f3-a697-4fd9-9169-f435b4405a16","name":"2f30c4f3-a697-4fd9-9169-f435b4405a16","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"4d46705d-b833-4d6e-8abd-6033c5cd5ce5","name":"4d46705d-b833-4d6e-8abd-6033c5cd5ce5","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"7d5b3d2c-0241-4728-995f-e7677c1e7e2e","name":"7d5b3d2c-0241-4728-995f-e7677c1e7e2e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"16d84a8d-7b48-4f33-83f4-26d64fcb25c2","name":"16d84a8d-7b48-4f33-83f4-26d64fcb25c2","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"96733f64-cd1f-4cec-8e30-dc22a2e69a46","name":"96733f64-cd1f-4cec-8e30-dc22a2e69a46","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"39e4d2ef-0a45-4891-aba7-fe8fee30953e","name":"39e4d2ef-0a45-4891-aba7-fe8fee30953e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"cd69f163-4f5d-498f-9626-78607c751537","name":"cd69f163-4f5d-498f-9626-78607c751537","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"5b8470f0-1f27-4104-b687-cb965c775614","name":"5b8470f0-1f27-4104-b687-cb965c775614","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"b4d0f773-f488-4932-9aa3-265920a8f897","name":"b4d0f773-f488-4932-9aa3-265920a8f897","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"996a27ed-d5bc-4d10-bc45-024bb9576ff8","name":"996a27ed-d5bc-4d10-bc45-024bb9576ff8","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"112e4e63-bd13-4011-8039-f279dadb602e","name":"112e4e63-bd13-4011-8039-f279dadb602e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"aa241cbb-d783-4a57-b89f-a3d03e66f21d","name":"aa241cbb-d783-4a57-b89f-a3d03e66f21d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"dd62d727-be6c-415a-99cd-f5de4fdb103a","name":"dd62d727-be6c-415a-99cd-f5de4fdb103a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"f4ff012a-ee06-4fe8-84b7-82842d5fb3e9","name":"f4ff012a-ee06-4fe8-84b7-82842d5fb3e9","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"2b1b8ba1-1c08-4982-aa07-e7b934a90a91","name":"2b1b8ba1-1c08-4982-aa07-e7b934a90a91","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"16883075-4215-499b-8420-ae62da7885b3","name":"16883075-4215-499b-8420-ae62da7885b3","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"67ca0cc1-b3e6-4030-a21b-3fbccb49e569","name":"67ca0cc1-b3e6-4030-a21b-3fbccb49e569","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"073c6354-9f1a-403c-af4c-9f7e11558113","name":"073c6354-9f1a-403c-af4c-9f7e11558113","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"c50586b8-1616-46a7-ab52-621258e72d24","name":"c50586b8-1616-46a7-ab52-621258e72d24","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"7dea7750-7395-4a7e-bc4c-1622df7a2cbf","name":"7dea7750-7395-4a7e-bc4c-1622df7a2cbf","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"92b7ffac-f927-44fe-95f2-bd4341b5f27a","name":"92b7ffac-f927-44fe-95f2-bd4341b5f27a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"bc92382f-39f4-4234-a7ec-9adff3753797","name":"bc92382f-39f4-4234-a7ec-9adff3753797","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"e61b5912-0ae5-4c54-bde5-a78fc0369549","name":"e61b5912-0ae5-4c54-bde5-a78fc0369549","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"086ee7b7-2a83-46bd-801c-034bd3897145","name":"086ee7b7-2a83-46bd-801c-034bd3897145","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"17186ae0-6f03-47a5-b79b-a745ced48618","name":"17186ae0-6f03-47a5-b79b-a745ced48618","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"f0011933-8620-4fe5-90bc-2fe2b3df5bef","name":"f0011933-8620-4fe5-90bc-2fe2b3df5bef","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"b330b6b2-192a-4de0-adfd-cba28cdd83d2","name":"b330b6b2-192a-4de0-adfd-cba28cdd83d2","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"88dff011-f0d7-43fc-94a8-32f332baf6c1","name":"88dff011-f0d7-43fc-94a8-32f332baf6c1","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"2eb5da78-7aaf-42fe-b31a-9e8bcb4a721c","name":"2eb5da78-7aaf-42fe-b31a-9e8bcb4a721c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"59b94851-05b4-424c-a678-d9df694da13f","name":"59b94851-05b4-424c-a678-d9df694da13f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"48e6e0df-250c-4313-9521-88fc5cee2be2","name":"48e6e0df-250c-4313-9521-88fc5cee2be2","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"6706cebb-96d9-4335-8dec-4fc2285a98e1","name":"6706cebb-96d9-4335-8dec-4fc2285a98e1","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"ab4ed675-82c1-4f80-abd4-ddbcadbf7114","name":"ab4ed675-82c1-4f80-abd4-ddbcadbf7114","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"b54bf828-8d29-4e6b-9e09-5863969f44b4","name":"b54bf828-8d29-4e6b-9e09-5863969f44b4","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"82780114-bc2c-4080-95ea-0b3908914da6","name":"82780114-bc2c-4080-95ea-0b3908914da6","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"df11f0c7-ba0c-4c65-b86e-a368c90d8094","name":"df11f0c7-ba0c-4c65-b86e-a368c90d8094","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"425a2b21-1b7c-4060-9429-39cc3011d999","name":"425a2b21-1b7c-4060-9429-39cc3011d999","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"913e2d4b-0ca1-4bbd-bc01-4fd5e599053a","name":"913e2d4b-0ca1-4bbd-bc01-4fd5e599053a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"7a265b9c-cde0-4ff5-bf6e-364d90bcdb5e","name":"7a265b9c-cde0-4ff5-bf6e-364d90bcdb5e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"ee4e0a74-c9e9-4bab-b85c-183df0b5070b","name":"ee4e0a74-c9e9-4bab-b85c-183df0b5070b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"5439c2d6-ee02-4bc7-ab82-4a5854ee1d2c","name":"5439c2d6-ee02-4bc7-ab82-4a5854ee1d2c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"aed5da4d-ea30-4654-a61f-16967414002e","name":"aed5da4d-ea30-4654-a61f-16967414002e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"c5bba97a-d671-49c8-84d2-f995712fc403","name":"c5bba97a-d671-49c8-84d2-f995712fc403","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"daa9667b-a496-4f30-b167-6af80c119e30","name":"daa9667b-a496-4f30-b167-6af80c119e30","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"f22c2d34-46b9-4440-a86f-37fd859f7cda","name":"f22c2d34-46b9-4440-a86f-37fd859f7cda","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"a9cd073b-de37-49db-9f59-f6cd38490c52","name":"a9cd073b-de37-49db-9f59-f6cd38490c52","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"24bea0d7-bb4e-469d-a9c0-97635743d8ed","name":"24bea0d7-bb4e-469d-a9c0-97635743d8ed","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"4f82e291-5fc6-45bc-a208-3647e5830f17","name":"4f82e291-5fc6-45bc-a208-3647e5830f17","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"c113a74f-504d-475b-8115-f90294743c81","name":"c113a74f-504d-475b-8115-f90294743c81","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"be762ab0-d12d-48d2-bb53-d4730721531b","name":"be762ab0-d12d-48d2-bb53-d4730721531b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"e0e1e619-158f-4bba-b8b5-94dcc1953491","name":"e0e1e619-158f-4bba-b8b5-94dcc1953491","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"71bd4d2e-1907-49d9-b5b0-6ee0d6aabb00","name":"71bd4d2e-1907-49d9-b5b0-6ee0d6aabb00","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"af6c6100-804f-4c05-8d22-71e0211d277a","name":"af6c6100-804f-4c05-8d22-71e0211d277a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"44daeebc-81f7-4a3e-9566-e297f548509d","name":"44daeebc-81f7-4a3e-9566-e297f548509d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"76358f9c-44de-4773-bf94-08cfd0b706b7","name":"76358f9c-44de-4773-bf94-08cfd0b706b7","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"f3a1b3c0-9b73-40e4-bbcf-e3c2b025a98b","name":"f3a1b3c0-9b73-40e4-bbcf-e3c2b025a98b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"5324fcf9-6bd3-4064-9ebf-0af8b4c636d7","name":"5324fcf9-6bd3-4064-9ebf-0af8b4c636d7","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"428c192f-e278-49f5-8d3b-74b07cd088b1","name":"428c192f-e278-49f5-8d3b-74b07cd088b1","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"a53ac2d7-2889-41a4-8d1b-6a0bf2f7bac9","name":"a53ac2d7-2889-41a4-8d1b-6a0bf2f7bac9","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"51927562-4d2a-436b-adbb-62a690d6c661","name":"51927562-4d2a-436b-adbb-62a690d6c661","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"59b0bcf3-19ed-4f4c-b0e5-2c349fc1a26b","name":"59b0bcf3-19ed-4f4c-b0e5-2c349fc1a26b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"f45bfd5f-8167-4b03-a26c-6468a48db3f1","name":"f45bfd5f-8167-4b03-a26c-6468a48db3f1","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"8af43abe-2954-4429-a96e-5553ad6375c9","name":"8af43abe-2954-4429-a96e-5553ad6375c9","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"578f1ad8-ccce-405b-af49-70f5b5ec6bc5","name":"578f1ad8-ccce-405b-af49-70f5b5ec6bc5","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"16dfc277-8209-4c38-a4fa-acff85d6b150","name":"16dfc277-8209-4c38-a4fa-acff85d6b150","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"f068b9df-7ba7-4686-85c5-88a2ec6ce6a9","name":"f068b9df-7ba7-4686-85c5-88a2ec6ce6a9","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"43771aa1-f221-4485-9c32-0ca06344e04c","name":"43771aa1-f221-4485-9c32-0ca06344e04c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"6d9c5187-edc7-4f27-a6b0-7c3fb4a355d7","name":"6d9c5187-edc7-4f27-a6b0-7c3fb4a355d7","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"6f3452a1-a45b-4c09-a126-a8f0afafd909","name":"6f3452a1-a45b-4c09-a126-a8f0afafd909","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"e522eb85-b82f-4feb-b671-5108350cfb16","name":"e522eb85-b82f-4feb-b671-5108350cfb16","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"b398bcd4-2967-43bd-aceb-351f1a577bd9","name":"b398bcd4-2967-43bd-aceb-351f1a577bd9","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"71ff8ca0-3f42-4dda-9730-4a2ac4530c17","name":"71ff8ca0-3f42-4dda-9730-4a2ac4530c17","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"db054ef7-2537-41d7-bcaf-34b5f9073296","name":"db054ef7-2537-41d7-bcaf-34b5f9073296","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"7e595fd1-f058-4eb0-92b2-7112b02693f0","name":"7e595fd1-f058-4eb0-92b2-7112b02693f0","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"73be05d6-bdbf-488d-824a-4fe1cb89e070","name":"73be05d6-bdbf-488d-824a-4fe1cb89e070","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"76cd8d8c-db17-401c-a660-84e8565440be","name":"76cd8d8c-db17-401c-a660-84e8565440be","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"fa9a6a5f-d27f-4915-bd3c-654e9b88bad4","name":"fa9a6a5f-d27f-4915-bd3c-654e9b88bad4","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"59a7ad1b-f30b-468a-b661-11fa1a07fcff","name":"59a7ad1b-f30b-468a-b661-11fa1a07fcff","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"beea7bcb-bb67-48bd-abce-529db7dbe41c","name":"beea7bcb-bb67-48bd-abce-529db7dbe41c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"8698f1a0-7ff8-4a84-8bd2-e389ec25a420","name":"8698f1a0-7ff8-4a84-8bd2-e389ec25a420","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"932663f3-9530-4c49-8d84-8c20a41549ef","name":"932663f3-9530-4c49-8d84-8c20a41549ef","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"13c95d20-70e5-4988-b859-c15ab08abd85","name":"13c95d20-70e5-4988-b859-c15ab08abd85","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"b709ce77-9b28-4388-bd75-f096350846ff","name":"b709ce77-9b28-4388-bd75-f096350846ff","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"f8fe5a01-de13-4476-9af8-bcc7f187bba4","name":"f8fe5a01-de13-4476-9af8-bcc7f187bba4","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"164fb034-c917-4aeb-8e30-0c4c989a3560","name":"164fb034-c917-4aeb-8e30-0c4c989a3560","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"bbe1b91b-58af-460f-abd5-80225a8dde77","name":"bbe1b91b-58af-460f-abd5-80225a8dde77","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"d1aff5b9-0c78-4ddc-8cf9-1e2daf3607b0","name":"d1aff5b9-0c78-4ddc-8cf9-1e2daf3607b0","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"e3adda1a-086e-4eab-92b9-84b6bbaa6b58","name":"e3adda1a-086e-4eab-92b9-84b6bbaa6b58","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"df79b26f-f1ee-45c0-a52a-17bd22edf09b","name":"df79b26f-f1ee-45c0-a52a-17bd22edf09b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"1769e8b5-3c03-48a9-90a2-0502b8dd5d79","name":"1769e8b5-3c03-48a9-90a2-0502b8dd5d79","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"83b76c05-deaf-4543-862f-8e5bc4f242d4","name":"83b76c05-deaf-4543-862f-8e5bc4f242d4","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"2dddb531-3570-44ff-bfb0-d647ac3c37ed","name":"2dddb531-3570-44ff-bfb0-d647ac3c37ed","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"7df26bce-c930-4969-ab20-6aaa30f85c2e","name":"7df26bce-c930-4969-ab20-6aaa30f85c2e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"b1ef6c7d-b668-4ece-9607-822177143185","name":"b1ef6c7d-b668-4ece-9607-822177143185","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"a261ce25-dc09-4e9c-b2ab-ca494eb7f6af","name":"a261ce25-dc09-4e9c-b2ab-ca494eb7f6af","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"3c32a1e3-ebc0-4ac5-bad5-8a1aca452527","name":"3c32a1e3-ebc0-4ac5-bad5-8a1aca452527","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"92f5ddbd-2444-4532-808e-3b2e26795ba7","name":"92f5ddbd-2444-4532-808e-3b2e26795ba7","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"ee0d14e4-33e3-41e9-b76d-dca309d76ad9","name":"ee0d14e4-33e3-41e9-b76d-dca309d76ad9","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"f270f2a7-106e-4206-b281-695e204d1fb5","name":"f270f2a7-106e-4206-b281-695e204d1fb5","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"522fa573-e304-4534-9cd1-3a7eb9d1fa85","name":"522fa573-e304-4534-9cd1-3a7eb9d1fa85","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"936fdbeb-4b78-4752-a6f2-e034907abe7b","name":"936fdbeb-4b78-4752-a6f2-e034907abe7b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"2f30c4f3-a697-4fd9-9169-f435b4405a16","name":"2f30c4f3-a697-4fd9-9169-f435b4405a16","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"4d46705d-b833-4d6e-8abd-6033c5cd5ce5","name":"4d46705d-b833-4d6e-8abd-6033c5cd5ce5","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"7d5b3d2c-0241-4728-995f-e7677c1e7e2e","name":"7d5b3d2c-0241-4728-995f-e7677c1e7e2e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"16d84a8d-7b48-4f33-83f4-26d64fcb25c2","name":"16d84a8d-7b48-4f33-83f4-26d64fcb25c2","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"96733f64-cd1f-4cec-8e30-dc22a2e69a46","name":"96733f64-cd1f-4cec-8e30-dc22a2e69a46","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"39e4d2ef-0a45-4891-aba7-fe8fee30953e","name":"39e4d2ef-0a45-4891-aba7-fe8fee30953e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"cd69f163-4f5d-498f-9626-78607c751537","name":"cd69f163-4f5d-498f-9626-78607c751537","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"5b8470f0-1f27-4104-b687-cb965c775614","name":"5b8470f0-1f27-4104-b687-cb965c775614","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"b4d0f773-f488-4932-9aa3-265920a8f897","name":"b4d0f773-f488-4932-9aa3-265920a8f897","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"996a27ed-d5bc-4d10-bc45-024bb9576ff8","name":"996a27ed-d5bc-4d10-bc45-024bb9576ff8","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"112e4e63-bd13-4011-8039-f279dadb602e","name":"112e4e63-bd13-4011-8039-f279dadb602e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"aa241cbb-d783-4a57-b89f-a3d03e66f21d","name":"aa241cbb-d783-4a57-b89f-a3d03e66f21d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"dd62d727-be6c-415a-99cd-f5de4fdb103a","name":"dd62d727-be6c-415a-99cd-f5de4fdb103a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"f4ff012a-ee06-4fe8-84b7-82842d5fb3e9","name":"f4ff012a-ee06-4fe8-84b7-82842d5fb3e9","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"2b1b8ba1-1c08-4982-aa07-e7b934a90a91","name":"2b1b8ba1-1c08-4982-aa07-e7b934a90a91","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"16883075-4215-499b-8420-ae62da7885b3","name":"16883075-4215-499b-8420-ae62da7885b3","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"67ca0cc1-b3e6-4030-a21b-3fbccb49e569","name":"67ca0cc1-b3e6-4030-a21b-3fbccb49e569","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"073c6354-9f1a-403c-af4c-9f7e11558113","name":"073c6354-9f1a-403c-af4c-9f7e11558113","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"c50586b8-1616-46a7-ab52-621258e72d24","name":"c50586b8-1616-46a7-ab52-621258e72d24","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"7dea7750-7395-4a7e-bc4c-1622df7a2cbf","name":"7dea7750-7395-4a7e-bc4c-1622df7a2cbf","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"92b7ffac-f927-44fe-95f2-bd4341b5f27a","name":"92b7ffac-f927-44fe-95f2-bd4341b5f27a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"bc92382f-39f4-4234-a7ec-9adff3753797","name":"bc92382f-39f4-4234-a7ec-9adff3753797","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"e61b5912-0ae5-4c54-bde5-a78fc0369549","name":"e61b5912-0ae5-4c54-bde5-a78fc0369549","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"086ee7b7-2a83-46bd-801c-034bd3897145","name":"086ee7b7-2a83-46bd-801c-034bd3897145","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"17186ae0-6f03-47a5-b79b-a745ced48618","name":"17186ae0-6f03-47a5-b79b-a745ced48618","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"f0011933-8620-4fe5-90bc-2fe2b3df5bef","name":"f0011933-8620-4fe5-90bc-2fe2b3df5bef","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"b330b6b2-192a-4de0-adfd-cba28cdd83d2","name":"b330b6b2-192a-4de0-adfd-cba28cdd83d2","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"88dff011-f0d7-43fc-94a8-32f332baf6c1","name":"88dff011-f0d7-43fc-94a8-32f332baf6c1","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"2eb5da78-7aaf-42fe-b31a-9e8bcb4a721c","name":"2eb5da78-7aaf-42fe-b31a-9e8bcb4a721c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"59b94851-05b4-424c-a678-d9df694da13f","name":"59b94851-05b4-424c-a678-d9df694da13f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"48e6e0df-250c-4313-9521-88fc5cee2be2","name":"48e6e0df-250c-4313-9521-88fc5cee2be2","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"6706cebb-96d9-4335-8dec-4fc2285a98e1","name":"6706cebb-96d9-4335-8dec-4fc2285a98e1","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"ab4ed675-82c1-4f80-abd4-ddbcadbf7114","name":"ab4ed675-82c1-4f80-abd4-ddbcadbf7114","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"b54bf828-8d29-4e6b-9e09-5863969f44b4","name":"b54bf828-8d29-4e6b-9e09-5863969f44b4","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"82780114-bc2c-4080-95ea-0b3908914da6","name":"82780114-bc2c-4080-95ea-0b3908914da6","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"df11f0c7-ba0c-4c65-b86e-a368c90d8094","name":"df11f0c7-ba0c-4c65-b86e-a368c90d8094","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"425a2b21-1b7c-4060-9429-39cc3011d999","name":"425a2b21-1b7c-4060-9429-39cc3011d999","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"913e2d4b-0ca1-4bbd-bc01-4fd5e599053a","name":"913e2d4b-0ca1-4bbd-bc01-4fd5e599053a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"7a265b9c-cde0-4ff5-bf6e-364d90bcdb5e","name":"7a265b9c-cde0-4ff5-bf6e-364d90bcdb5e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"ee4e0a74-c9e9-4bab-b85c-183df0b5070b","name":"ee4e0a74-c9e9-4bab-b85c-183df0b5070b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"5439c2d6-ee02-4bc7-ab82-4a5854ee1d2c","name":"5439c2d6-ee02-4bc7-ab82-4a5854ee1d2c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"aed5da4d-ea30-4654-a61f-16967414002e","name":"aed5da4d-ea30-4654-a61f-16967414002e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"c5bba97a-d671-49c8-84d2-f995712fc403","name":"c5bba97a-d671-49c8-84d2-f995712fc403","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"daa9667b-a496-4f30-b167-6af80c119e30","name":"daa9667b-a496-4f30-b167-6af80c119e30","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"f22c2d34-46b9-4440-a86f-37fd859f7cda","name":"f22c2d34-46b9-4440-a86f-37fd859f7cda","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"a9cd073b-de37-49db-9f59-f6cd38490c52","name":"a9cd073b-de37-49db-9f59-f6cd38490c52","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"24bea0d7-bb4e-469d-a9c0-97635743d8ed","name":"24bea0d7-bb4e-469d-a9c0-97635743d8ed","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"4f82e291-5fc6-45bc-a208-3647e5830f17","name":"4f82e291-5fc6-45bc-a208-3647e5830f17","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"c113a74f-504d-475b-8115-f90294743c81","name":"c113a74f-504d-475b-8115-f90294743c81","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"be762ab0-d12d-48d2-bb53-d4730721531b","name":"be762ab0-d12d-48d2-bb53-d4730721531b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"e0e1e619-158f-4bba-b8b5-94dcc1953491","name":"e0e1e619-158f-4bba-b8b5-94dcc1953491","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"71bd4d2e-1907-49d9-b5b0-6ee0d6aabb00","name":"71bd4d2e-1907-49d9-b5b0-6ee0d6aabb00","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"af6c6100-804f-4c05-8d22-71e0211d277a","name":"af6c6100-804f-4c05-8d22-71e0211d277a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"44daeebc-81f7-4a3e-9566-e297f548509d","name":"44daeebc-81f7-4a3e-9566-e297f548509d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"76358f9c-44de-4773-bf94-08cfd0b706b7","name":"76358f9c-44de-4773-bf94-08cfd0b706b7","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"f3a1b3c0-9b73-40e4-bbcf-e3c2b025a98b","name":"f3a1b3c0-9b73-40e4-bbcf-e3c2b025a98b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"5324fcf9-6bd3-4064-9ebf-0af8b4c636d7","name":"5324fcf9-6bd3-4064-9ebf-0af8b4c636d7","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"428c192f-e278-49f5-8d3b-74b07cd088b1","name":"428c192f-e278-49f5-8d3b-74b07cd088b1","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"a53ac2d7-2889-41a4-8d1b-6a0bf2f7bac9","name":"a53ac2d7-2889-41a4-8d1b-6a0bf2f7bac9","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"51927562-4d2a-436b-adbb-62a690d6c661","name":"51927562-4d2a-436b-adbb-62a690d6c661","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"59b0bcf3-19ed-4f4c-b0e5-2c349fc1a26b","name":"59b0bcf3-19ed-4f4c-b0e5-2c349fc1a26b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"f45bfd5f-8167-4b03-a26c-6468a48db3f1","name":"f45bfd5f-8167-4b03-a26c-6468a48db3f1","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"8af43abe-2954-4429-a96e-5553ad6375c9","name":"8af43abe-2954-4429-a96e-5553ad6375c9","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"578f1ad8-ccce-405b-af49-70f5b5ec6bc5","name":"578f1ad8-ccce-405b-af49-70f5b5ec6bc5","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"16dfc277-8209-4c38-a4fa-acff85d6b150","name":"16dfc277-8209-4c38-a4fa-acff85d6b150","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"f068b9df-7ba7-4686-85c5-88a2ec6ce6a9","name":"f068b9df-7ba7-4686-85c5-88a2ec6ce6a9","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"43771aa1-f221-4485-9c32-0ca06344e04c","name":"43771aa1-f221-4485-9c32-0ca06344e04c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"6d9c5187-edc7-4f27-a6b0-7c3fb4a355d7","name":"6d9c5187-edc7-4f27-a6b0-7c3fb4a355d7","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"6f3452a1-a45b-4c09-a126-a8f0afafd909","name":"6f3452a1-a45b-4c09-a126-a8f0afafd909","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"e522eb85-b82f-4feb-b671-5108350cfb16","name":"e522eb85-b82f-4feb-b671-5108350cfb16","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"b398bcd4-2967-43bd-aceb-351f1a577bd9","name":"b398bcd4-2967-43bd-aceb-351f1a577bd9","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"71ff8ca0-3f42-4dda-9730-4a2ac4530c17","name":"71ff8ca0-3f42-4dda-9730-4a2ac4530c17","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"db054ef7-2537-41d7-bcaf-34b5f9073296","name":"db054ef7-2537-41d7-bcaf-34b5f9073296","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"7e595fd1-f058-4eb0-92b2-7112b02693f0","name":"7e595fd1-f058-4eb0-92b2-7112b02693f0","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"73be05d6-bdbf-488d-824a-4fe1cb89e070","name":"73be05d6-bdbf-488d-824a-4fe1cb89e070","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"76cd8d8c-db17-401c-a660-84e8565440be","name":"76cd8d8c-db17-401c-a660-84e8565440be","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"fa9a6a5f-d27f-4915-bd3c-654e9b88bad4","name":"fa9a6a5f-d27f-4915-bd3c-654e9b88bad4","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"59a7ad1b-f30b-468a-b661-11fa1a07fcff","name":"59a7ad1b-f30b-468a-b661-11fa1a07fcff","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"beea7bcb-bb67-48bd-abce-529db7dbe41c","name":"beea7bcb-bb67-48bd-abce-529db7dbe41c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"8698f1a0-7ff8-4a84-8bd2-e389ec25a420","name":"8698f1a0-7ff8-4a84-8bd2-e389ec25a420","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"932663f3-9530-4c49-8d84-8c20a41549ef","name":"932663f3-9530-4c49-8d84-8c20a41549ef","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"13c95d20-70e5-4988-b859-c15ab08abd85","name":"13c95d20-70e5-4988-b859-c15ab08abd85","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"b709ce77-9b28-4388-bd75-f096350846ff","name":"b709ce77-9b28-4388-bd75-f096350846ff","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"f8fe5a01-de13-4476-9af8-bcc7f187bba4","name":"f8fe5a01-de13-4476-9af8-bcc7f187bba4","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"164fb034-c917-4aeb-8e30-0c4c989a3560","name":"164fb034-c917-4aeb-8e30-0c4c989a3560","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"bbe1b91b-58af-460f-abd5-80225a8dde77","name":"bbe1b91b-58af-460f-abd5-80225a8dde77","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"d1aff5b9-0c78-4ddc-8cf9-1e2daf3607b0","name":"d1aff5b9-0c78-4ddc-8cf9-1e2daf3607b0","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"e3adda1a-086e-4eab-92b9-84b6bbaa6b58","name":"e3adda1a-086e-4eab-92b9-84b6bbaa6b58","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"df79b26f-f1ee-45c0-a52a-17bd22edf09b","name":"df79b26f-f1ee-45c0-a52a-17bd22edf09b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"1769e8b5-3c03-48a9-90a2-0502b8dd5d79","name":"1769e8b5-3c03-48a9-90a2-0502b8dd5d79","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"83b76c05-deaf-4543-862f-8e5bc4f242d4","name":"83b76c05-deaf-4543-862f-8e5bc4f242d4","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"2dddb531-3570-44ff-bfb0-d647ac3c37ed","name":"2dddb531-3570-44ff-bfb0-d647ac3c37ed","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"7df26bce-c930-4969-ab20-6aaa30f85c2e","name":"7df26bce-c930-4969-ab20-6aaa30f85c2e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"b1ef6c7d-b668-4ece-9607-822177143185","name":"b1ef6c7d-b668-4ece-9607-822177143185","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"a261ce25-dc09-4e9c-b2ab-ca494eb7f6af","name":"a261ce25-dc09-4e9c-b2ab-ca494eb7f6af","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"3c32a1e3-ebc0-4ac5-bad5-8a1aca452527","name":"3c32a1e3-ebc0-4ac5-bad5-8a1aca452527","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"92f5ddbd-2444-4532-808e-3b2e26795ba7","name":"92f5ddbd-2444-4532-808e-3b2e26795ba7","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -168,309 +168,107 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"ee0d14e4-33e3-41e9-b76d-dca309d76ad9","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"2b0b789b-4bdb-401e-96da-afd7c75c6210","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"f270f2a7-106e-4206-b281-695e204d1fb5","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"bbdbe1e1-971b-4311-9cb1-02d712e9c45d","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"522fa573-e304-4534-9cd1-3a7eb9d1fa85","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"739b10e1-22aa-4249-b5ef-46e7de8f01ba","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"936fdbeb-4b78-4752-a6f2-e034907abe7b","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"7e7b972c-c86c-4927-9a87-3f5f42040f25","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"2f30c4f3-a697-4fd9-9169-f435b4405a16","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"005472ef-931c-469f-9b69-bf219369c957","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"4d46705d-b833-4d6e-8abd-6033c5cd5ce5","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"f8a29f74-64aa-4e66-a3ff-04705653ca26","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"7d5b3d2c-0241-4728-995f-e7677c1e7e2e","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"ad0a45db-46f4-4610-af7e-61aad464033d","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"16d84a8d-7b48-4f33-83f4-26d64fcb25c2","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"d278022c-ce16-41a7-8353-cdde545725cb","IsCreationKey":false,"Key":7.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"96733f64-cd1f-4cec-8e30-dc22a2e69a46","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"03b3f0d0-dfbd-4da7-9d9b-c8af86b22b49","IsCreationKey":false,"Key":8.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"39e4d2ef-0a45-4891-aba7-fe8fee30953e","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"c722e800-1cf3-4261-9f64-975857febd9f","IsCreationKey":false,"Key":9.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"cd69f163-4f5d-498f-9626-78607c751537","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"24bc6109-dc30-4c93-961c-08deaecc686e","IsCreationKey":false,"Key":10.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"5b8470f0-1f27-4104-b687-cb965c775614","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"38a86e47-5cb0-4b12-80bd-64a52904c277","IsCreationKey":false,"Key":11.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"b4d0f773-f488-4932-9aa3-265920a8f897","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"984d49d9-9992-46a5-bc95-9bdd882f1d74","IsCreationKey":false,"Key":12.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"996a27ed-d5bc-4d10-bc45-024bb9576ff8","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"9431008b-0236-4d32-b6b9-d9b49ff2d1f9","IsCreationKey":false,"Key":13.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"112e4e63-bd13-4011-8039-f279dadb602e","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"d975b258-346e-4e6e-ad69-749afe3437e1","IsCreationKey":false,"Key":14.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"aa241cbb-d783-4a57-b89f-a3d03e66f21d","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"44699ee4-d5f8-43ea-b53f-b0c8b6edf660","IsCreationKey":false,"Key":15.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"dd62d727-be6c-415a-99cd-f5de4fdb103a","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"16b61097-3845-4557-b2bf-d98cd8802e98","IsCreationKey":false,"Key":16.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"f4ff012a-ee06-4fe8-84b7-82842d5fb3e9","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"24153104-6610-48e7-ae67-f3e70f6eddb9","IsCreationKey":false,"Key":17.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"2b1b8ba1-1c08-4982-aa07-e7b934a90a91","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"6d6f6a2b-0fad-4e3e-8e22-ffebef9054c5","IsCreationKey":false,"Key":18.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"16883075-4215-499b-8420-ae62da7885b3","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"37dafa46-2c53-4558-b0bb-dd9fc36d7436","IsCreationKey":false,"Key":19.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"67ca0cc1-b3e6-4030-a21b-3fbccb49e569","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"37d06089-d4dc-4d9f-8610-eb87e097c6bb","IsCreationKey":false,"Key":20.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"073c6354-9f1a-403c-af4c-9f7e11558113","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"cf884d00-1749-4528-823d-3f8d181e6e01","IsCreationKey":false,"Key":21.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"c50586b8-1616-46a7-ab52-621258e72d24","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"a159d481-4be3-4d4d-b7f7-ec8fd2c7c9d0","IsCreationKey":false,"Key":22.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"7dea7750-7395-4a7e-bc4c-1622df7a2cbf","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"2b573560-5787-4e28-9679-1437b238717e","IsCreationKey":false,"Key":23.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"92b7ffac-f927-44fe-95f2-bd4341b5f27a","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"292929e6-f71b-4075-b1a8-09b429e1452a","IsCreationKey":false,"Key":24.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"bc92382f-39f4-4234-a7ec-9adff3753797","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"53aaea6d-7fec-406d-9cd5-c4b3ffa4fdf9","IsCreationKey":false,"Key":25.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"e61b5912-0ae5-4c54-bde5-a78fc0369549","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"30b8af86-0f0c-456b-abfc-9ae65d1468b2","IsCreationKey":false,"Key":26.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"086ee7b7-2a83-46bd-801c-034bd3897145","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"cee99131-344c-47b4-a677-40fd26cc818c","IsCreationKey":false,"Key":27.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"17186ae0-6f03-47a5-b79b-a745ced48618","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"cf16cec1-c3ee-4125-a420-a75feffded91","IsCreationKey":false,"Key":28.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"f0011933-8620-4fe5-90bc-2fe2b3df5bef","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"7f9fead9-cae1-4f65-b3ed-b2b74007d2b6","IsCreationKey":false,"Key":29.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"b330b6b2-192a-4de0-adfd-cba28cdd83d2","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"bd6760f6-1268-414b-8766-6b54ef3dfb54","IsCreationKey":false,"Key":30.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"88dff011-f0d7-43fc-94a8-32f332baf6c1","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"ac0acf35-3b64-4e58-a163-7fe24cea802e","IsCreationKey":false,"Key":31.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"2eb5da78-7aaf-42fe-b31a-9e8bcb4a721c","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"d6724212-220c-49e5-b2d1-d5ca38544c0e","IsCreationKey":false,"Key":32.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"59b94851-05b4-424c-a678-d9df694da13f","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"1bebb4de-d816-40e6-a212-be02c23b7371","IsCreationKey":false,"Key":33.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"48e6e0df-250c-4313-9521-88fc5cee2be2","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"7faec82c-af74-4e1a-b2d4-4b26d90177e2","IsCreationKey":false,"Key":34.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"6706cebb-96d9-4335-8dec-4fc2285a98e1","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"9d4f482a-716b-4e29-bf35-eaf601939091","IsCreationKey":false,"Key":35.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"ab4ed675-82c1-4f80-abd4-ddbcadbf7114","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"e9620a79-e6dd-4938-a234-5dc3801cf2b3","IsCreationKey":false,"Key":36.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"b54bf828-8d29-4e6b-9e09-5863969f44b4","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"0bc6d2e7-33fc-4e30-b3e7-aa4d0f97618c","IsCreationKey":false,"Key":37.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"82780114-bc2c-4080-95ea-0b3908914da6","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"9c13ea8e-eefe-470c-bdf6-41c08f6ee95d","IsCreationKey":false,"Key":38.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"df11f0c7-ba0c-4c65-b86e-a368c90d8094","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"7d902a25-39e8-4a6c-aeb2-39658d78e27c","IsCreationKey":false,"Key":39.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"425a2b21-1b7c-4060-9429-39cc3011d999","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"ae86d625-c635-47ba-9df2-ffddc11d41cc","IsCreationKey":false,"Key":40.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"913e2d4b-0ca1-4bbd-bc01-4fd5e599053a","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"8576f60e-16af-42f7-a350-ed6edb82f163","IsCreationKey":false,"Key":41.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"7a265b9c-cde0-4ff5-bf6e-364d90bcdb5e","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"d21af454-b326-4b54-b79d-4266b32b7f32","IsCreationKey":false,"Key":42.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"ee4e0a74-c9e9-4bab-b85c-183df0b5070b","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"79c3668c-6b4e-4f08-93ad-d241bffbfa8f","IsCreationKey":false,"Key":43.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"5439c2d6-ee02-4bc7-ab82-4a5854ee1d2c","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"0964d0e0-8720-49e0-b660-21d00d6afc67","IsCreationKey":false,"Key":44.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"aed5da4d-ea30-4654-a61f-16967414002e","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"7a539e36-19c9-4b11-bf0c-543c10ce9d5c","IsCreationKey":false,"Key":45.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"c5bba97a-d671-49c8-84d2-f995712fc403","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"a82a0bf8-2e6b-4d8e-b502-3bbaad4b3e1b","IsCreationKey":false,"Key":46.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"daa9667b-a496-4f30-b167-6af80c119e30","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"1442d228-921c-44f3-8190-d495e0b40d7c","IsCreationKey":false,"Key":47.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"f22c2d34-46b9-4440-a86f-37fd859f7cda","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"64cb21de-5b8f-4c11-876d-84c96c118770","IsCreationKey":false,"Key":48.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"a9cd073b-de37-49db-9f59-f6cd38490c52","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"20e56132-6426-44ab-bd71-83a8e39e5e25","IsCreationKey":false,"Key":49.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"24bea0d7-bb4e-469d-a9c0-97635743d8ed","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"c6a4a33c-b0ee-4efa-a014-74cf6037c262","IsCreationKey":false,"Key":50.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"4f82e291-5fc6-45bc-a208-3647e5830f17","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"414d5ad0-8dc3-445e-a5e1-3529223ce19e","IsCreationKey":false,"Key":51.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"c113a74f-504d-475b-8115-f90294743c81","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"b0b3db1b-5491-4baf-a0e5-f2b5f75624e6","IsCreationKey":false,"Key":52.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"be762ab0-d12d-48d2-bb53-d4730721531b","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"95e3bd3f-ca82-4058-8ceb-65f74e7a5c89","IsCreationKey":false,"Key":53.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"e0e1e619-158f-4bba-b8b5-94dcc1953491","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"cd83a6b7-311f-4808-873c-c58f1b0db25f","IsCreationKey":false,"Key":54.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"71bd4d2e-1907-49d9-b5b0-6ee0d6aabb00","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"62d887ff-579d-4210-a7db-8129c8e81fde","IsCreationKey":false,"Key":55.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"af6c6100-804f-4c05-8d22-71e0211d277a","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"7311716e-8bfc-494e-8c50-f96a90f80b50","IsCreationKey":false,"Key":56.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"44daeebc-81f7-4a3e-9566-e297f548509d","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"e425231f-3a7e-4074-8576-7784f54854b5","IsCreationKey":false,"Key":57.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"76358f9c-44de-4773-bf94-08cfd0b706b7","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"f29bee25-b9a9-414e-9f6f-af7368b6b2e3","IsCreationKey":false,"Key":58.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"f3a1b3c0-9b73-40e4-bbcf-e3c2b025a98b","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"d29a2eb1-995f-416f-8d57-591692b16f8f","IsCreationKey":false,"Key":59.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"5324fcf9-6bd3-4064-9ebf-0af8b4c636d7","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"78090b8e-e008-4abe-b9d9-cd85610ceb8b","IsCreationKey":false,"Key":60.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"428c192f-e278-49f5-8d3b-74b07cd088b1","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"ce03e653-b78e-487d-8d27-d7c309147c31","IsCreationKey":false,"Key":61.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"a53ac2d7-2889-41a4-8d1b-6a0bf2f7bac9","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"ac0b54a5-db44-4308-96c3-c2ac0ed47b6d","IsCreationKey":false,"Key":62.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"51927562-4d2a-436b-adbb-62a690d6c661","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"de398855-c826-42e4-8362-bc3e291045b5","IsCreationKey":false,"Key":63.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"59b0bcf3-19ed-4f4c-b0e5-2c349fc1a26b","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"de94934c-4ebf-44dd-b634-54132bf008b5","IsCreationKey":false,"Key":64.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"f45bfd5f-8167-4b03-a26c-6468a48db3f1","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"0c870f91-064e-48c8-8038-9edb0c837366","IsCreationKey":false,"Key":65.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"8af43abe-2954-4429-a96e-5553ad6375c9","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"55054fbe-46a5-4879-acb7-40660cfdc7e5","IsCreationKey":false,"Key":66.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"578f1ad8-ccce-405b-af49-70f5b5ec6bc5","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"40b36087-ab89-4d97-8a24-749b87b03beb","IsCreationKey":false,"Key":67.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"16dfc277-8209-4c38-a4fa-acff85d6b150","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"58ab3ae2-4ba4-472d-88d7-451f6e5ca2eb","IsCreationKey":false,"Key":68.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"f068b9df-7ba7-4686-85c5-88a2ec6ce6a9","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"2ff78728-0939-4a0e-9b9c-9851d8047ffd","IsCreationKey":false,"Key":69.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"43771aa1-f221-4485-9c32-0ca06344e04c","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"a4857572-07c1-4a73-bf58-d9f8464fc2fb","IsCreationKey":false,"Key":70.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"6d9c5187-edc7-4f27-a6b0-7c3fb4a355d7","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"8d58b775-994c-4ca0-a3bf-a8742b9c21de","IsCreationKey":false,"Key":71.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"6f3452a1-a45b-4c09-a126-a8f0afafd909","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"d993ee28-a89d-42cc-bef9-51c5caf584d8","IsCreationKey":false,"Key":72.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"e522eb85-b82f-4feb-b671-5108350cfb16","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"97a668ce-c178-4d92-9e9b-dc4aff0cb736","IsCreationKey":false,"Key":73.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"b398bcd4-2967-43bd-aceb-351f1a577bd9","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"46a5df03-5cf0-4b89-a27c-ee7e2d3a2c80","IsCreationKey":false,"Key":74.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"71ff8ca0-3f42-4dda-9730-4a2ac4530c17","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"1f8dc377-3aa1-4816-a121-6a259c18db36","IsCreationKey":false,"Key":75.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"db054ef7-2537-41d7-bcaf-34b5f9073296","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"6f82652c-28d3-4186-b10c-c9109b2c55e8","IsCreationKey":false,"Key":76.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"7e595fd1-f058-4eb0-92b2-7112b02693f0","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"1492999b-1cb4-4c01-80f0-35941c4bf15d","IsCreationKey":false,"Key":77.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"73be05d6-bdbf-488d-824a-4fe1cb89e070","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"b5dee69b-eb3a-47a8-b11d-b76de78a9a28","IsCreationKey":false,"Key":78.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"76cd8d8c-db17-401c-a660-84e8565440be","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"f4f905d2-ad21-47e7-a476-1fb03417644f","IsCreationKey":false,"Key":79.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"fa9a6a5f-d27f-4915-bd3c-654e9b88bad4","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"73da1b91-82d6-4fb1-9452-acad9f6d75fc","IsCreationKey":false,"Key":80.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"59a7ad1b-f30b-468a-b661-11fa1a07fcff","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"4a13fa07-b693-4d51-910f-92c8867be917","IsCreationKey":false,"Key":81.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"beea7bcb-bb67-48bd-abce-529db7dbe41c","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"62a6e637-eb9f-4f76-a6fa-ca9c1e6de9df","IsCreationKey":false,"Key":82.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"8698f1a0-7ff8-4a84-8bd2-e389ec25a420","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"a53e3b90-cf7f-47b2-9ad2-3105e0b2fc3c","IsCreationKey":false,"Key":83.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"932663f3-9530-4c49-8d84-8c20a41549ef","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"2b82f6ff-199b-46dc-a0cd-f754e229ceb1","IsCreationKey":false,"Key":84.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"13c95d20-70e5-4988-b859-c15ab08abd85","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"82405c83-797a-4506-bceb-490563a38732","IsCreationKey":false,"Key":85.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"b709ce77-9b28-4388-bd75-f096350846ff","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"ca72f368-e6aa-4854-87b0-a68da0221055","IsCreationKey":false,"Key":86.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"f8fe5a01-de13-4476-9af8-bcc7f187bba4","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"2ee0754e-dac4-4409-b340-891ed282fa74","IsCreationKey":false,"Key":87.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"164fb034-c917-4aeb-8e30-0c4c989a3560","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"7bd3efdd-0bc5-41af-af15-2795d790b5ad","IsCreationKey":false,"Key":88.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"bbe1b91b-58af-460f-abd5-80225a8dde77","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"707bed96-75aa-4dd0-81fd-c35afaab1262","IsCreationKey":false,"Key":89.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"d1aff5b9-0c78-4ddc-8cf9-1e2daf3607b0","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"26e6d9d7-a200-4539-936f-c8b5aa45c97b","IsCreationKey":false,"Key":90.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"e3adda1a-086e-4eab-92b9-84b6bbaa6b58","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"463084e1-f006-476e-82bb-0be3e235ae58","IsCreationKey":false,"Key":91.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"df79b26f-f1ee-45c0-a52a-17bd22edf09b","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"a90247f4-f046-491d-8522-841702b91185","IsCreationKey":false,"Key":92.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"1769e8b5-3c03-48a9-90a2-0502b8dd5d79","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"fa446947-631d-4127-8790-7011d8c63b45","IsCreationKey":false,"Key":93.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"83b76c05-deaf-4543-862f-8e5bc4f242d4","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"49be7cd9-0092-467a-b854-351a2c2d014a","IsCreationKey":false,"Key":94.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"2dddb531-3570-44ff-bfb0-d647ac3c37ed","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"f9a92718-eab9-4754-94f9-64c6c5907072","IsCreationKey":false,"Key":95.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"7df26bce-c930-4969-ab20-6aaa30f85c2e","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"f09d320d-b486-4965-849c-91ef3f2f5d7b","IsCreationKey":false,"Key":96.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"b1ef6c7d-b668-4ece-9607-822177143185","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"de182601-fc79-4a18-afa5-6ae0564ce725","IsCreationKey":false,"Key":97.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"a261ce25-dc09-4e9c-b2ab-ca494eb7f6af","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"a7a40882-8686-40cd-98b5-60b337991b92","IsCreationKey":false,"Key":98.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"3c32a1e3-ebc0-4ac5-bad5-8a1aca452527","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"0ccf1f50-5300-4601-af65-e0d89fe4dd67","IsCreationKey":false,"Key":99.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"92f5ddbd-2444-4532-808e-3b2e26795ba7","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"63a97d6d-c248-471b-baff-5c341a6781d7","IsCreationKey":false,"Key":100.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"ee0d14e4-33e3-41e9-b76d-dca309d76ad9","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"2b0b789b-4bdb-401e-96da-afd7c75c6210","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"f270f2a7-106e-4206-b281-695e204d1fb5","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"bbdbe1e1-971b-4311-9cb1-02d712e9c45d","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"522fa573-e304-4534-9cd1-3a7eb9d1fa85","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"739b10e1-22aa-4249-b5ef-46e7de8f01ba","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"936fdbeb-4b78-4752-a6f2-e034907abe7b","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"7e7b972c-c86c-4927-9a87-3f5f42040f25","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"2f30c4f3-a697-4fd9-9169-f435b4405a16","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"005472ef-931c-469f-9b69-bf219369c957","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"4d46705d-b833-4d6e-8abd-6033c5cd5ce5","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"f8a29f74-64aa-4e66-a3ff-04705653ca26","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"7d5b3d2c-0241-4728-995f-e7677c1e7e2e","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"ad0a45db-46f4-4610-af7e-61aad464033d","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"16d84a8d-7b48-4f33-83f4-26d64fcb25c2","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"d278022c-ce16-41a7-8353-cdde545725cb","IsCreationKey":false,"Key":7.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"96733f64-cd1f-4cec-8e30-dc22a2e69a46","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"03b3f0d0-dfbd-4da7-9d9b-c8af86b22b49","IsCreationKey":false,"Key":8.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"39e4d2ef-0a45-4891-aba7-fe8fee30953e","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"c722e800-1cf3-4261-9f64-975857febd9f","IsCreationKey":false,"Key":9.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"cd69f163-4f5d-498f-9626-78607c751537","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"24bc6109-dc30-4c93-961c-08deaecc686e","IsCreationKey":false,"Key":10.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"5b8470f0-1f27-4104-b687-cb965c775614","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"38a86e47-5cb0-4b12-80bd-64a52904c277","IsCreationKey":false,"Key":11.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"b4d0f773-f488-4932-9aa3-265920a8f897","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"984d49d9-9992-46a5-bc95-9bdd882f1d74","IsCreationKey":false,"Key":12.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"996a27ed-d5bc-4d10-bc45-024bb9576ff8","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"9431008b-0236-4d32-b6b9-d9b49ff2d1f9","IsCreationKey":false,"Key":13.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"112e4e63-bd13-4011-8039-f279dadb602e","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"d975b258-346e-4e6e-ad69-749afe3437e1","IsCreationKey":false,"Key":14.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"aa241cbb-d783-4a57-b89f-a3d03e66f21d","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"44699ee4-d5f8-43ea-b53f-b0c8b6edf660","IsCreationKey":false,"Key":15.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"dd62d727-be6c-415a-99cd-f5de4fdb103a","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"16b61097-3845-4557-b2bf-d98cd8802e98","IsCreationKey":false,"Key":16.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"f4ff012a-ee06-4fe8-84b7-82842d5fb3e9","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"24153104-6610-48e7-ae67-f3e70f6eddb9","IsCreationKey":false,"Key":17.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"2b1b8ba1-1c08-4982-aa07-e7b934a90a91","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"6d6f6a2b-0fad-4e3e-8e22-ffebef9054c5","IsCreationKey":false,"Key":18.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"16883075-4215-499b-8420-ae62da7885b3","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"37dafa46-2c53-4558-b0bb-dd9fc36d7436","IsCreationKey":false,"Key":19.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"67ca0cc1-b3e6-4030-a21b-3fbccb49e569","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"37d06089-d4dc-4d9f-8610-eb87e097c6bb","IsCreationKey":false,"Key":20.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"073c6354-9f1a-403c-af4c-9f7e11558113","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"cf884d00-1749-4528-823d-3f8d181e6e01","IsCreationKey":false,"Key":21.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"c50586b8-1616-46a7-ab52-621258e72d24","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"a159d481-4be3-4d4d-b7f7-ec8fd2c7c9d0","IsCreationKey":false,"Key":22.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"7dea7750-7395-4a7e-bc4c-1622df7a2cbf","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"2b573560-5787-4e28-9679-1437b238717e","IsCreationKey":false,"Key":23.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"92b7ffac-f927-44fe-95f2-bd4341b5f27a","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"292929e6-f71b-4075-b1a8-09b429e1452a","IsCreationKey":false,"Key":24.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"bc92382f-39f4-4234-a7ec-9adff3753797","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"53aaea6d-7fec-406d-9cd5-c4b3ffa4fdf9","IsCreationKey":false,"Key":25.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"e61b5912-0ae5-4c54-bde5-a78fc0369549","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"30b8af86-0f0c-456b-abfc-9ae65d1468b2","IsCreationKey":false,"Key":26.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"086ee7b7-2a83-46bd-801c-034bd3897145","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"cee99131-344c-47b4-a677-40fd26cc818c","IsCreationKey":false,"Key":27.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"17186ae0-6f03-47a5-b79b-a745ced48618","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"cf16cec1-c3ee-4125-a420-a75feffded91","IsCreationKey":false,"Key":28.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"f0011933-8620-4fe5-90bc-2fe2b3df5bef","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"7f9fead9-cae1-4f65-b3ed-b2b74007d2b6","IsCreationKey":false,"Key":29.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"b330b6b2-192a-4de0-adfd-cba28cdd83d2","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"bd6760f6-1268-414b-8766-6b54ef3dfb54","IsCreationKey":false,"Key":30.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"88dff011-f0d7-43fc-94a8-32f332baf6c1","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"ac0acf35-3b64-4e58-a163-7fe24cea802e","IsCreationKey":false,"Key":31.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"2eb5da78-7aaf-42fe-b31a-9e8bcb4a721c","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"d6724212-220c-49e5-b2d1-d5ca38544c0e","IsCreationKey":false,"Key":32.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"59b94851-05b4-424c-a678-d9df694da13f","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"1bebb4de-d816-40e6-a212-be02c23b7371","IsCreationKey":false,"Key":33.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"48e6e0df-250c-4313-9521-88fc5cee2be2","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"7faec82c-af74-4e1a-b2d4-4b26d90177e2","IsCreationKey":false,"Key":34.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"6706cebb-96d9-4335-8dec-4fc2285a98e1","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"9d4f482a-716b-4e29-bf35-eaf601939091","IsCreationKey":false,"Key":35.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"ab4ed675-82c1-4f80-abd4-ddbcadbf7114","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"e9620a79-e6dd-4938-a234-5dc3801cf2b3","IsCreationKey":false,"Key":36.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"b54bf828-8d29-4e6b-9e09-5863969f44b4","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"0bc6d2e7-33fc-4e30-b3e7-aa4d0f97618c","IsCreationKey":false,"Key":37.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"82780114-bc2c-4080-95ea-0b3908914da6","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"9c13ea8e-eefe-470c-bdf6-41c08f6ee95d","IsCreationKey":false,"Key":38.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"df11f0c7-ba0c-4c65-b86e-a368c90d8094","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"7d902a25-39e8-4a6c-aeb2-39658d78e27c","IsCreationKey":false,"Key":39.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"425a2b21-1b7c-4060-9429-39cc3011d999","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"ae86d625-c635-47ba-9df2-ffddc11d41cc","IsCreationKey":false,"Key":40.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"913e2d4b-0ca1-4bbd-bc01-4fd5e599053a","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"8576f60e-16af-42f7-a350-ed6edb82f163","IsCreationKey":false,"Key":41.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"7a265b9c-cde0-4ff5-bf6e-364d90bcdb5e","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"d21af454-b326-4b54-b79d-4266b32b7f32","IsCreationKey":false,"Key":42.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"ee4e0a74-c9e9-4bab-b85c-183df0b5070b","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"79c3668c-6b4e-4f08-93ad-d241bffbfa8f","IsCreationKey":false,"Key":43.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"5439c2d6-ee02-4bc7-ab82-4a5854ee1d2c","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"0964d0e0-8720-49e0-b660-21d00d6afc67","IsCreationKey":false,"Key":44.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"aed5da4d-ea30-4654-a61f-16967414002e","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"7a539e36-19c9-4b11-bf0c-543c10ce9d5c","IsCreationKey":false,"Key":45.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"c5bba97a-d671-49c8-84d2-f995712fc403","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"a82a0bf8-2e6b-4d8e-b502-3bbaad4b3e1b","IsCreationKey":false,"Key":46.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"daa9667b-a496-4f30-b167-6af80c119e30","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"1442d228-921c-44f3-8190-d495e0b40d7c","IsCreationKey":false,"Key":47.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"f22c2d34-46b9-4440-a86f-37fd859f7cda","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"64cb21de-5b8f-4c11-876d-84c96c118770","IsCreationKey":false,"Key":48.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"a9cd073b-de37-49db-9f59-f6cd38490c52","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"20e56132-6426-44ab-bd71-83a8e39e5e25","IsCreationKey":false,"Key":49.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"24bea0d7-bb4e-469d-a9c0-97635743d8ed","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"c6a4a33c-b0ee-4efa-a014-74cf6037c262","IsCreationKey":false,"Key":50.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"4f82e291-5fc6-45bc-a208-3647e5830f17","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"414d5ad0-8dc3-445e-a5e1-3529223ce19e","IsCreationKey":false,"Key":51.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"c113a74f-504d-475b-8115-f90294743c81","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"b0b3db1b-5491-4baf-a0e5-f2b5f75624e6","IsCreationKey":false,"Key":52.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"be762ab0-d12d-48d2-bb53-d4730721531b","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"95e3bd3f-ca82-4058-8ceb-65f74e7a5c89","IsCreationKey":false,"Key":53.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"e0e1e619-158f-4bba-b8b5-94dcc1953491","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"cd83a6b7-311f-4808-873c-c58f1b0db25f","IsCreationKey":false,"Key":54.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"71bd4d2e-1907-49d9-b5b0-6ee0d6aabb00","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"62d887ff-579d-4210-a7db-8129c8e81fde","IsCreationKey":false,"Key":55.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"af6c6100-804f-4c05-8d22-71e0211d277a","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"7311716e-8bfc-494e-8c50-f96a90f80b50","IsCreationKey":false,"Key":56.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"44daeebc-81f7-4a3e-9566-e297f548509d","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"e425231f-3a7e-4074-8576-7784f54854b5","IsCreationKey":false,"Key":57.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"76358f9c-44de-4773-bf94-08cfd0b706b7","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"f29bee25-b9a9-414e-9f6f-af7368b6b2e3","IsCreationKey":false,"Key":58.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"f3a1b3c0-9b73-40e4-bbcf-e3c2b025a98b","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"d29a2eb1-995f-416f-8d57-591692b16f8f","IsCreationKey":false,"Key":59.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"5324fcf9-6bd3-4064-9ebf-0af8b4c636d7","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"78090b8e-e008-4abe-b9d9-cd85610ceb8b","IsCreationKey":false,"Key":60.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"428c192f-e278-49f5-8d3b-74b07cd088b1","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"ce03e653-b78e-487d-8d27-d7c309147c31","IsCreationKey":false,"Key":61.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"a53ac2d7-2889-41a4-8d1b-6a0bf2f7bac9","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"ac0b54a5-db44-4308-96c3-c2ac0ed47b6d","IsCreationKey":false,"Key":62.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"51927562-4d2a-436b-adbb-62a690d6c661","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"de398855-c826-42e4-8362-bc3e291045b5","IsCreationKey":false,"Key":63.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"59b0bcf3-19ed-4f4c-b0e5-2c349fc1a26b","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"de94934c-4ebf-44dd-b634-54132bf008b5","IsCreationKey":false,"Key":64.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"f45bfd5f-8167-4b03-a26c-6468a48db3f1","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"0c870f91-064e-48c8-8038-9edb0c837366","IsCreationKey":false,"Key":65.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"8af43abe-2954-4429-a96e-5553ad6375c9","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"55054fbe-46a5-4879-acb7-40660cfdc7e5","IsCreationKey":false,"Key":66.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"578f1ad8-ccce-405b-af49-70f5b5ec6bc5","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"40b36087-ab89-4d97-8a24-749b87b03beb","IsCreationKey":false,"Key":67.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"16dfc277-8209-4c38-a4fa-acff85d6b150","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"58ab3ae2-4ba4-472d-88d7-451f6e5ca2eb","IsCreationKey":false,"Key":68.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"f068b9df-7ba7-4686-85c5-88a2ec6ce6a9","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"2ff78728-0939-4a0e-9b9c-9851d8047ffd","IsCreationKey":false,"Key":69.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"43771aa1-f221-4485-9c32-0ca06344e04c","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"a4857572-07c1-4a73-bf58-d9f8464fc2fb","IsCreationKey":false,"Key":70.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"6d9c5187-edc7-4f27-a6b0-7c3fb4a355d7","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"8d58b775-994c-4ca0-a3bf-a8742b9c21de","IsCreationKey":false,"Key":71.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"6f3452a1-a45b-4c09-a126-a8f0afafd909","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"d993ee28-a89d-42cc-bef9-51c5caf584d8","IsCreationKey":false,"Key":72.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"e522eb85-b82f-4feb-b671-5108350cfb16","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"97a668ce-c178-4d92-9e9b-dc4aff0cb736","IsCreationKey":false,"Key":73.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"b398bcd4-2967-43bd-aceb-351f1a577bd9","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"46a5df03-5cf0-4b89-a27c-ee7e2d3a2c80","IsCreationKey":false,"Key":74.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"71ff8ca0-3f42-4dda-9730-4a2ac4530c17","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"1f8dc377-3aa1-4816-a121-6a259c18db36","IsCreationKey":false,"Key":75.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"db054ef7-2537-41d7-bcaf-34b5f9073296","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"6f82652c-28d3-4186-b10c-c9109b2c55e8","IsCreationKey":false,"Key":76.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"7e595fd1-f058-4eb0-92b2-7112b02693f0","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"1492999b-1cb4-4c01-80f0-35941c4bf15d","IsCreationKey":false,"Key":77.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"73be05d6-bdbf-488d-824a-4fe1cb89e070","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"b5dee69b-eb3a-47a8-b11d-b76de78a9a28","IsCreationKey":false,"Key":78.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"76cd8d8c-db17-401c-a660-84e8565440be","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"f4f905d2-ad21-47e7-a476-1fb03417644f","IsCreationKey":false,"Key":79.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"fa9a6a5f-d27f-4915-bd3c-654e9b88bad4","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"73da1b91-82d6-4fb1-9452-acad9f6d75fc","IsCreationKey":false,"Key":80.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"59a7ad1b-f30b-468a-b661-11fa1a07fcff","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"4a13fa07-b693-4d51-910f-92c8867be917","IsCreationKey":false,"Key":81.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"beea7bcb-bb67-48bd-abce-529db7dbe41c","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"62a6e637-eb9f-4f76-a6fa-ca9c1e6de9df","IsCreationKey":false,"Key":82.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"8698f1a0-7ff8-4a84-8bd2-e389ec25a420","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"a53e3b90-cf7f-47b2-9ad2-3105e0b2fc3c","IsCreationKey":false,"Key":83.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"932663f3-9530-4c49-8d84-8c20a41549ef","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"2b82f6ff-199b-46dc-a0cd-f754e229ceb1","IsCreationKey":false,"Key":84.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"13c95d20-70e5-4988-b859-c15ab08abd85","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"82405c83-797a-4506-bceb-490563a38732","IsCreationKey":false,"Key":85.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"b709ce77-9b28-4388-bd75-f096350846ff","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"ca72f368-e6aa-4854-87b0-a68da0221055","IsCreationKey":false,"Key":86.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"f8fe5a01-de13-4476-9af8-bcc7f187bba4","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"2ee0754e-dac4-4409-b340-891ed282fa74","IsCreationKey":false,"Key":87.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"164fb034-c917-4aeb-8e30-0c4c989a3560","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"7bd3efdd-0bc5-41af-af15-2795d790b5ad","IsCreationKey":false,"Key":88.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"bbe1b91b-58af-460f-abd5-80225a8dde77","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"707bed96-75aa-4dd0-81fd-c35afaab1262","IsCreationKey":false,"Key":89.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"d1aff5b9-0c78-4ddc-8cf9-1e2daf3607b0","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"26e6d9d7-a200-4539-936f-c8b5aa45c97b","IsCreationKey":false,"Key":90.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"e3adda1a-086e-4eab-92b9-84b6bbaa6b58","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"463084e1-f006-476e-82bb-0be3e235ae58","IsCreationKey":false,"Key":91.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"df79b26f-f1ee-45c0-a52a-17bd22edf09b","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"a90247f4-f046-491d-8522-841702b91185","IsCreationKey":false,"Key":92.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"1769e8b5-3c03-48a9-90a2-0502b8dd5d79","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"fa446947-631d-4127-8790-7011d8c63b45","IsCreationKey":false,"Key":93.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"83b76c05-deaf-4543-862f-8e5bc4f242d4","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"49be7cd9-0092-467a-b854-351a2c2d014a","IsCreationKey":false,"Key":94.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"2dddb531-3570-44ff-bfb0-d647ac3c37ed","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"f9a92718-eab9-4754-94f9-64c6c5907072","IsCreationKey":false,"Key":95.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"7df26bce-c930-4969-ab20-6aaa30f85c2e","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"f09d320d-b486-4965-849c-91ef3f2f5d7b","IsCreationKey":false,"Key":96.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"b1ef6c7d-b668-4ece-9607-822177143185","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"de182601-fc79-4a18-afa5-6ae0564ce725","IsCreationKey":false,"Key":97.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"a261ce25-dc09-4e9c-b2ab-ca494eb7f6af","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"a7a40882-8686-40cd-98b5-60b337991b92","IsCreationKey":false,"Key":98.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"3c32a1e3-ebc0-4ac5-bad5-8a1aca452527","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"0ccf1f50-5300-4601-af65-e0d89fe4dd67","IsCreationKey":false,"Key":99.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"92f5ddbd-2444-4532-808e-3b2e26795ba7","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"63a97d6d-c248-471b-baff-5c341a6781d7","IsCreationKey":false,"Key":100.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_loadbar_empty/spr_loadbar_empty.yy b/sprites/spr_loadbar_empty/spr_loadbar_empty.yy index 37389b4e54..fb7fb75f26 100644 --- a/sprites/spr_loadbar_empty/spr_loadbar_empty.yy +++ b/sprites/spr_loadbar_empty/spr_loadbar_empty.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_loadbar_empty", "bboxMode":0, "bbox_bottom":12, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"c2994374-2a5e-4831-bc9e-33b033839c5c","name":"c2994374-2a5e-4831-bc9e-33b033839c5c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"c2994374-2a5e-4831-bc9e-33b033839c5c","name":"c2994374-2a5e-4831-bc9e-33b033839c5c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"c2994374-2a5e-4831-bc9e-33b033839c5c","path":"sprites/spr_loadbar_empty/spr_loadbar_empty.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"7068dcdf-b01a-46c2-a3ad-05538327613e","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"c2994374-2a5e-4831-bc9e-33b033839c5c","path":"sprites/spr_loadbar_empty/spr_loadbar_empty.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"7068dcdf-b01a-46c2-a3ad-05538327613e","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_loading/spr_loading.yy b/sprites/spr_loading/spr_loading.yy index 81fee7819a..7d0b2341ec 100644 --- a/sprites/spr_loading/spr_loading.yy +++ b/sprites/spr_loading/spr_loading.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_loading", "bboxMode":0, "bbox_bottom":27, @@ -12,18 +12,18 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"9b9dca6d-d089-4673-81d4-02a8b047a84a","name":"9b9dca6d-d089-4673-81d4-02a8b047a84a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"181b8dfe-0174-4adf-bf1f-7dabe62cbab1","name":"181b8dfe-0174-4adf-bf1f-7dabe62cbab1","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"3b43abf4-eaa0-4558-a721-1a690a34c000","name":"3b43abf4-eaa0-4558-a721-1a690a34c000","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"31b73db6-9d1e-46e6-90bd-782fc318bba0","name":"31b73db6-9d1e-46e6-90bd-782fc318bba0","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"58a4c9c7-9418-4292-86fd-6f85f0e091df","name":"58a4c9c7-9418-4292-86fd-6f85f0e091df","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"30976229-98b3-46f2-a241-48171df83ad2","name":"30976229-98b3-46f2-a241-48171df83ad2","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"cfba1c13-c0e8-4899-849a-892b6eef93fe","name":"cfba1c13-c0e8-4899-849a-892b6eef93fe","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"9bfa8ee6-df56-467c-b545-4d443c335479","name":"9bfa8ee6-df56-467c-b545-4d443c335479","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"dc9b1cca-ca4c-40d5-8b3a-d825a2be1e90","name":"dc9b1cca-ca4c-40d5-8b3a-d825a2be1e90","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"1271b1cf-ff42-4fbe-b17d-d8a074adad17","name":"1271b1cf-ff42-4fbe-b17d-d8a074adad17","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"d93fd483-f225-4990-bf6f-df877d244664","name":"d93fd483-f225-4990-bf6f-df877d244664","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"38fdffdf-322e-409a-88d8-ae352474fde6","name":"38fdffdf-322e-409a-88d8-ae352474fde6","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"9b9dca6d-d089-4673-81d4-02a8b047a84a","name":"9b9dca6d-d089-4673-81d4-02a8b047a84a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"181b8dfe-0174-4adf-bf1f-7dabe62cbab1","name":"181b8dfe-0174-4adf-bf1f-7dabe62cbab1","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"3b43abf4-eaa0-4558-a721-1a690a34c000","name":"3b43abf4-eaa0-4558-a721-1a690a34c000","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"31b73db6-9d1e-46e6-90bd-782fc318bba0","name":"31b73db6-9d1e-46e6-90bd-782fc318bba0","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"58a4c9c7-9418-4292-86fd-6f85f0e091df","name":"58a4c9c7-9418-4292-86fd-6f85f0e091df","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"30976229-98b3-46f2-a241-48171df83ad2","name":"30976229-98b3-46f2-a241-48171df83ad2","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"cfba1c13-c0e8-4899-849a-892b6eef93fe","name":"cfba1c13-c0e8-4899-849a-892b6eef93fe","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"9bfa8ee6-df56-467c-b545-4d443c335479","name":"9bfa8ee6-df56-467c-b545-4d443c335479","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"dc9b1cca-ca4c-40d5-8b3a-d825a2be1e90","name":"dc9b1cca-ca4c-40d5-8b3a-d825a2be1e90","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"1271b1cf-ff42-4fbe-b17d-d8a074adad17","name":"1271b1cf-ff42-4fbe-b17d-d8a074adad17","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"d93fd483-f225-4990-bf6f-df877d244664","name":"d93fd483-f225-4990-bf6f-df877d244664","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"38fdffdf-322e-409a-88d8-ae352474fde6","name":"38fdffdf-322e-409a-88d8-ae352474fde6","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -79,42 +79,18 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"9b9dca6d-d089-4673-81d4-02a8b047a84a","path":"sprites/spr_loading/spr_loading.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"f5c82248-146e-4c1f-bb5a-5e0eb42dd21e","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"181b8dfe-0174-4adf-bf1f-7dabe62cbab1","path":"sprites/spr_loading/spr_loading.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"11e76469-4652-456e-b4ea-e8d3396bce4e","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"3b43abf4-eaa0-4558-a721-1a690a34c000","path":"sprites/spr_loading/spr_loading.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"8d8d8818-5383-49e9-8f18-f15e75ec6d3f","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"31b73db6-9d1e-46e6-90bd-782fc318bba0","path":"sprites/spr_loading/spr_loading.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"e20eaf16-b6f3-432f-8560-2875bdaaaffe","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"58a4c9c7-9418-4292-86fd-6f85f0e091df","path":"sprites/spr_loading/spr_loading.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"0d8728df-953a-4970-84d2-c0fad08b5f27","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"30976229-98b3-46f2-a241-48171df83ad2","path":"sprites/spr_loading/spr_loading.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"2c52796a-9504-42a5-b6de-e10fd3719d7f","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"cfba1c13-c0e8-4899-849a-892b6eef93fe","path":"sprites/spr_loading/spr_loading.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"210aa3d9-0330-4726-954b-bdadbb88c61e","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"9bfa8ee6-df56-467c-b545-4d443c335479","path":"sprites/spr_loading/spr_loading.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"68b1ed21-fda6-49ff-b716-78e6b898a509","IsCreationKey":false,"Key":7.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"dc9b1cca-ca4c-40d5-8b3a-d825a2be1e90","path":"sprites/spr_loading/spr_loading.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"d8f99ee7-5163-4470-aad9-fac87b12da19","IsCreationKey":false,"Key":8.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"1271b1cf-ff42-4fbe-b17d-d8a074adad17","path":"sprites/spr_loading/spr_loading.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"00c9cad2-ecc5-438d-83a4-e38fa9441462","IsCreationKey":false,"Key":9.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"d93fd483-f225-4990-bf6f-df877d244664","path":"sprites/spr_loading/spr_loading.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"087a699e-17e0-4f78-b453-c65d84bc01f0","IsCreationKey":false,"Key":10.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"38fdffdf-322e-409a-88d8-ae352474fde6","path":"sprites/spr_loading/spr_loading.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"a6ae7486-b8a8-4184-af83-46889b187aa0","IsCreationKey":false,"Key":11.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"9b9dca6d-d089-4673-81d4-02a8b047a84a","path":"sprites/spr_loading/spr_loading.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"f5c82248-146e-4c1f-bb5a-5e0eb42dd21e","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"181b8dfe-0174-4adf-bf1f-7dabe62cbab1","path":"sprites/spr_loading/spr_loading.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"11e76469-4652-456e-b4ea-e8d3396bce4e","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"3b43abf4-eaa0-4558-a721-1a690a34c000","path":"sprites/spr_loading/spr_loading.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"8d8d8818-5383-49e9-8f18-f15e75ec6d3f","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"31b73db6-9d1e-46e6-90bd-782fc318bba0","path":"sprites/spr_loading/spr_loading.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"e20eaf16-b6f3-432f-8560-2875bdaaaffe","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"58a4c9c7-9418-4292-86fd-6f85f0e091df","path":"sprites/spr_loading/spr_loading.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"0d8728df-953a-4970-84d2-c0fad08b5f27","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"30976229-98b3-46f2-a241-48171df83ad2","path":"sprites/spr_loading/spr_loading.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"2c52796a-9504-42a5-b6de-e10fd3719d7f","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"cfba1c13-c0e8-4899-849a-892b6eef93fe","path":"sprites/spr_loading/spr_loading.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"210aa3d9-0330-4726-954b-bdadbb88c61e","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"9bfa8ee6-df56-467c-b545-4d443c335479","path":"sprites/spr_loading/spr_loading.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"68b1ed21-fda6-49ff-b716-78e6b898a509","IsCreationKey":false,"Key":7.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"dc9b1cca-ca4c-40d5-8b3a-d825a2be1e90","path":"sprites/spr_loading/spr_loading.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"d8f99ee7-5163-4470-aad9-fac87b12da19","IsCreationKey":false,"Key":8.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"1271b1cf-ff42-4fbe-b17d-d8a074adad17","path":"sprites/spr_loading/spr_loading.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"00c9cad2-ecc5-438d-83a4-e38fa9441462","IsCreationKey":false,"Key":9.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"d93fd483-f225-4990-bf6f-df877d244664","path":"sprites/spr_loading/spr_loading.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"087a699e-17e0-4f78-b453-c65d84bc01f0","IsCreationKey":false,"Key":10.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"38fdffdf-322e-409a-88d8-ae352474fde6","path":"sprites/spr_loading/spr_loading.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"a6ae7486-b8a8-4184-af83-46889b187aa0","IsCreationKey":false,"Key":11.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_loading2/spr_loading2.yy b/sprites/spr_loading2/spr_loading2.yy index a8e2449c66..0d5c7e90f5 100644 --- a/sprites/spr_loading2/spr_loading2.yy +++ b/sprites/spr_loading2/spr_loading2.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_loading2", "bboxMode":0, "bbox_bottom":30, @@ -12,14 +12,14 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"cfe64c72-788d-4d52-bbd4-58b53f3c2e49","name":"cfe64c72-788d-4d52-bbd4-58b53f3c2e49","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"8b470910-b621-490a-a783-411ee078b812","name":"8b470910-b621-490a-a783-411ee078b812","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"05f5f018-2f5d-40a3-a69e-4ef342b4279a","name":"05f5f018-2f5d-40a3-a69e-4ef342b4279a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"cf510d03-7a34-4777-a6e6-009ebcd6fccc","name":"cf510d03-7a34-4777-a6e6-009ebcd6fccc","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"37a52a8f-f010-4987-8d6a-4b83e1ff1186","name":"37a52a8f-f010-4987-8d6a-4b83e1ff1186","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"91f77803-fdbf-45b9-ba2a-d6a00911d13f","name":"91f77803-fdbf-45b9-ba2a-d6a00911d13f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"41726c78-4d1d-46a5-9941-be0886823037","name":"41726c78-4d1d-46a5-9941-be0886823037","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"039f8acb-ac48-46ba-beb3-62711c4d69f8","name":"039f8acb-ac48-46ba-beb3-62711c4d69f8","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"cfe64c72-788d-4d52-bbd4-58b53f3c2e49","name":"cfe64c72-788d-4d52-bbd4-58b53f3c2e49","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"8b470910-b621-490a-a783-411ee078b812","name":"8b470910-b621-490a-a783-411ee078b812","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"05f5f018-2f5d-40a3-a69e-4ef342b4279a","name":"05f5f018-2f5d-40a3-a69e-4ef342b4279a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"cf510d03-7a34-4777-a6e6-009ebcd6fccc","name":"cf510d03-7a34-4777-a6e6-009ebcd6fccc","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"37a52a8f-f010-4987-8d6a-4b83e1ff1186","name":"37a52a8f-f010-4987-8d6a-4b83e1ff1186","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"91f77803-fdbf-45b9-ba2a-d6a00911d13f","name":"91f77803-fdbf-45b9-ba2a-d6a00911d13f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"41726c78-4d1d-46a5-9941-be0886823037","name":"41726c78-4d1d-46a5-9941-be0886823037","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"039f8acb-ac48-46ba-beb3-62711c4d69f8","name":"039f8acb-ac48-46ba-beb3-62711c4d69f8","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -75,30 +75,14 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"cfe64c72-788d-4d52-bbd4-58b53f3c2e49","path":"sprites/spr_loading2/spr_loading2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"975627ff-8df0-4e31-9c0d-3a165e9ffa3e","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"8b470910-b621-490a-a783-411ee078b812","path":"sprites/spr_loading2/spr_loading2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"dff72920-d2c1-4bcb-84ea-e539caa245f8","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"05f5f018-2f5d-40a3-a69e-4ef342b4279a","path":"sprites/spr_loading2/spr_loading2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"ec783239-b271-4744-bb34-213183fb1a9d","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"cf510d03-7a34-4777-a6e6-009ebcd6fccc","path":"sprites/spr_loading2/spr_loading2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"736d229f-771c-4808-9b47-82ef5d3714cc","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"37a52a8f-f010-4987-8d6a-4b83e1ff1186","path":"sprites/spr_loading2/spr_loading2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"b15ab235-87fe-4537-8c07-baf077dc99db","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"91f77803-fdbf-45b9-ba2a-d6a00911d13f","path":"sprites/spr_loading2/spr_loading2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"9384749d-c62a-421f-91b2-eab291a261f3","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"41726c78-4d1d-46a5-9941-be0886823037","path":"sprites/spr_loading2/spr_loading2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"e3389ee4-0d85-4801-9fd2-4a1a3975b2cf","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"039f8acb-ac48-46ba-beb3-62711c4d69f8","path":"sprites/spr_loading2/spr_loading2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"2600ef86-25f5-4f17-8f93-e74a66748e6d","IsCreationKey":false,"Key":7.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"cfe64c72-788d-4d52-bbd4-58b53f3c2e49","path":"sprites/spr_loading2/spr_loading2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"975627ff-8df0-4e31-9c0d-3a165e9ffa3e","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"8b470910-b621-490a-a783-411ee078b812","path":"sprites/spr_loading2/spr_loading2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"dff72920-d2c1-4bcb-84ea-e539caa245f8","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"05f5f018-2f5d-40a3-a69e-4ef342b4279a","path":"sprites/spr_loading2/spr_loading2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"ec783239-b271-4744-bb34-213183fb1a9d","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"cf510d03-7a34-4777-a6e6-009ebcd6fccc","path":"sprites/spr_loading2/spr_loading2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"736d229f-771c-4808-9b47-82ef5d3714cc","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"37a52a8f-f010-4987-8d6a-4b83e1ff1186","path":"sprites/spr_loading2/spr_loading2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"b15ab235-87fe-4537-8c07-baf077dc99db","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"91f77803-fdbf-45b9-ba2a-d6a00911d13f","path":"sprites/spr_loading2/spr_loading2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"9384749d-c62a-421f-91b2-eab291a261f3","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"41726c78-4d1d-46a5-9941-be0886823037","path":"sprites/spr_loading2/spr_loading2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"e3389ee4-0d85-4801-9fd2-4a1a3975b2cf","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"039f8acb-ac48-46ba-beb3-62711c4d69f8","path":"sprites/spr_loading2/spr_loading2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"2600ef86-25f5-4f17-8f93-e74a66748e6d","IsCreationKey":false,"Key":7.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_loc_icon/spr_loc_icon.yy b/sprites/spr_loc_icon/spr_loc_icon.yy index de2ed727ea..b31b1b50ae 100644 --- a/sprites/spr_loc_icon/spr_loc_icon.yy +++ b/sprites/spr_loc_icon/spr_loc_icon.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_loc_icon", "bboxMode":0, "bbox_bottom":17, @@ -12,11 +12,11 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"416b110b-43f5-4021-ac05-3f87227dc544","name":"416b110b-43f5-4021-ac05-3f87227dc544","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"cd18c971-69e9-4263-a0e6-d2df33ee95d6","name":"cd18c971-69e9-4263-a0e6-d2df33ee95d6","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"d3d07a76-1f81-4273-866b-71e2736d7b6f","name":"d3d07a76-1f81-4273-866b-71e2736d7b6f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"c3673468-8b19-4bac-9539-3ff7228b6921","name":"c3673468-8b19-4bac-9539-3ff7228b6921","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"e7c2d2df-3cab-474a-8058-96fa1b687654","name":"e7c2d2df-3cab-474a-8058-96fa1b687654","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"416b110b-43f5-4021-ac05-3f87227dc544","name":"416b110b-43f5-4021-ac05-3f87227dc544","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"cd18c971-69e9-4263-a0e6-d2df33ee95d6","name":"cd18c971-69e9-4263-a0e6-d2df33ee95d6","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"d3d07a76-1f81-4273-866b-71e2736d7b6f","name":"d3d07a76-1f81-4273-866b-71e2736d7b6f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"c3673468-8b19-4bac-9539-3ff7228b6921","name":"c3673468-8b19-4bac-9539-3ff7228b6921","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"e7c2d2df-3cab-474a-8058-96fa1b687654","name":"e7c2d2df-3cab-474a-8058-96fa1b687654","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -72,21 +72,11 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"416b110b-43f5-4021-ac05-3f87227dc544","path":"sprites/spr_loc_icon/spr_loc_icon.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"cbfc9e28-0682-4eeb-92dc-2455cf8e6fa8","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"cd18c971-69e9-4263-a0e6-d2df33ee95d6","path":"sprites/spr_loc_icon/spr_loc_icon.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"ab72642d-2755-4891-b086-f3538e23f1af","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"d3d07a76-1f81-4273-866b-71e2736d7b6f","path":"sprites/spr_loc_icon/spr_loc_icon.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"f0011c1c-e1e5-4c3c-b96e-605c82ac9fe9","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"c3673468-8b19-4bac-9539-3ff7228b6921","path":"sprites/spr_loc_icon/spr_loc_icon.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"3ee84902-0ebb-4605-a786-50c295102bdb","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"e7c2d2df-3cab-474a-8058-96fa1b687654","path":"sprites/spr_loc_icon/spr_loc_icon.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"7280c334-9fc8-44b0-ae02-aeeac20c963a","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"416b110b-43f5-4021-ac05-3f87227dc544","path":"sprites/spr_loc_icon/spr_loc_icon.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"cbfc9e28-0682-4eeb-92dc-2455cf8e6fa8","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"cd18c971-69e9-4263-a0e6-d2df33ee95d6","path":"sprites/spr_loc_icon/spr_loc_icon.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"ab72642d-2755-4891-b086-f3538e23f1af","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"d3d07a76-1f81-4273-866b-71e2736d7b6f","path":"sprites/spr_loc_icon/spr_loc_icon.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"f0011c1c-e1e5-4c3c-b96e-605c82ac9fe9","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"c3673468-8b19-4bac-9539-3ff7228b6921","path":"sprites/spr_loc_icon/spr_loc_icon.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"3ee84902-0ebb-4605-a786-50c295102bdb","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"e7c2d2df-3cab-474a-8058-96fa1b687654","path":"sprites/spr_loc_icon/spr_loc_icon.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"7280c334-9fc8-44b0-ae02-aeeac20c963a","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_luck_icon/spr_luck_icon.yy b/sprites/spr_luck_icon/spr_luck_icon.yy index 307a98485f..86481556bf 100644 --- a/sprites/spr_luck_icon/spr_luck_icon.yy +++ b/sprites/spr_luck_icon/spr_luck_icon.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_luck_icon", "bboxMode":0, "bbox_bottom":56, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"30b283ed-a5bc-430c-92bc-94c1dc9dc0b8","name":"30b283ed-a5bc-430c-92bc-94c1dc9dc0b8","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"30b283ed-a5bc-430c-92bc-94c1dc9dc0b8","name":"30b283ed-a5bc-430c-92bc-94c1dc9dc0b8","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"30b283ed-a5bc-430c-92bc-94c1dc9dc0b8","path":"sprites/spr_luck_icon/spr_luck_icon.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"d0e216b8-a255-4367-8128-437a22f3baa4","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"30b283ed-a5bc-430c-92bc-94c1dc9dc0b8","path":"sprites/spr_luck_icon/spr_luck_icon.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"d0e216b8-a255-4367-8128-437a22f3baa4","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_mahreen/spr_mahreen.yy b/sprites/spr_mahreen/spr_mahreen.yy index 180007fdf6..6ef3101495 100644 --- a/sprites/spr_mahreen/spr_mahreen.yy +++ b/sprites/spr_mahreen/spr_mahreen.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_mahreen", "bboxMode":0, "bbox_bottom":52, @@ -12,21 +12,21 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"14de9ffa-b488-44f9-afd3-fb4030398a09","name":"14de9ffa-b488-44f9-afd3-fb4030398a09","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"ba4be018-3c02-477d-bb65-62fa67dc3b67","name":"ba4be018-3c02-477d-bb65-62fa67dc3b67","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"3f565aef-eb59-4b1d-876e-f7b88d0f7129","name":"3f565aef-eb59-4b1d-876e-f7b88d0f7129","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"d875b6df-8ffd-4a18-b575-19f871ab433e","name":"d875b6df-8ffd-4a18-b575-19f871ab433e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"4b9d55d7-a4d2-44dc-985e-50763bb1810d","name":"4b9d55d7-a4d2-44dc-985e-50763bb1810d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"90f3dd18-f272-42c4-8509-dc1667fd2c7a","name":"90f3dd18-f272-42c4-8509-dc1667fd2c7a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"15368c39-27df-4dcb-b87b-94593dd25c57","name":"15368c39-27df-4dcb-b87b-94593dd25c57","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"315144e4-36e5-4485-83ba-b61ec26febf9","name":"315144e4-36e5-4485-83ba-b61ec26febf9","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"b29d1b35-9e76-41f9-9970-17c607f6793f","name":"b29d1b35-9e76-41f9-9970-17c607f6793f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"4f4e0662-c792-4b27-825d-9cb06fe183ff","name":"4f4e0662-c792-4b27-825d-9cb06fe183ff","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"cb04c4cd-f562-4c14-ac9a-e437ce7f46ed","name":"cb04c4cd-f562-4c14-ac9a-e437ce7f46ed","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"e081e164-ccf6-449f-9060-35f957ad22e5","name":"e081e164-ccf6-449f-9060-35f957ad22e5","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"aae59b9b-c126-4b33-bb10-f7a40cad275f","name":"aae59b9b-c126-4b33-bb10-f7a40cad275f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"e5eae182-4aa0-4282-bfe8-fa1c1e89083c","name":"e5eae182-4aa0-4282-bfe8-fa1c1e89083c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"063437d3-cd92-4e25-96f1-97ef985aa6db","name":"063437d3-cd92-4e25-96f1-97ef985aa6db","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"14de9ffa-b488-44f9-afd3-fb4030398a09","name":"14de9ffa-b488-44f9-afd3-fb4030398a09","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"ba4be018-3c02-477d-bb65-62fa67dc3b67","name":"ba4be018-3c02-477d-bb65-62fa67dc3b67","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"3f565aef-eb59-4b1d-876e-f7b88d0f7129","name":"3f565aef-eb59-4b1d-876e-f7b88d0f7129","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"d875b6df-8ffd-4a18-b575-19f871ab433e","name":"d875b6df-8ffd-4a18-b575-19f871ab433e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"4b9d55d7-a4d2-44dc-985e-50763bb1810d","name":"4b9d55d7-a4d2-44dc-985e-50763bb1810d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"90f3dd18-f272-42c4-8509-dc1667fd2c7a","name":"90f3dd18-f272-42c4-8509-dc1667fd2c7a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"15368c39-27df-4dcb-b87b-94593dd25c57","name":"15368c39-27df-4dcb-b87b-94593dd25c57","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"315144e4-36e5-4485-83ba-b61ec26febf9","name":"315144e4-36e5-4485-83ba-b61ec26febf9","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"b29d1b35-9e76-41f9-9970-17c607f6793f","name":"b29d1b35-9e76-41f9-9970-17c607f6793f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"4f4e0662-c792-4b27-825d-9cb06fe183ff","name":"4f4e0662-c792-4b27-825d-9cb06fe183ff","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"cb04c4cd-f562-4c14-ac9a-e437ce7f46ed","name":"cb04c4cd-f562-4c14-ac9a-e437ce7f46ed","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"e081e164-ccf6-449f-9060-35f957ad22e5","name":"e081e164-ccf6-449f-9060-35f957ad22e5","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"aae59b9b-c126-4b33-bb10-f7a40cad275f","name":"aae59b9b-c126-4b33-bb10-f7a40cad275f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"e5eae182-4aa0-4282-bfe8-fa1c1e89083c","name":"e5eae182-4aa0-4282-bfe8-fa1c1e89083c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"063437d3-cd92-4e25-96f1-97ef985aa6db","name":"063437d3-cd92-4e25-96f1-97ef985aa6db","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -82,51 +82,21 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"14de9ffa-b488-44f9-afd3-fb4030398a09","path":"sprites/spr_mahreen/spr_mahreen.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"c32fc363-3fc0-4f92-a088-d7a8feb6c58b","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"ba4be018-3c02-477d-bb65-62fa67dc3b67","path":"sprites/spr_mahreen/spr_mahreen.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"19d2f518-dd6c-4879-a04e-2c7116330dff","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"3f565aef-eb59-4b1d-876e-f7b88d0f7129","path":"sprites/spr_mahreen/spr_mahreen.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"44db714c-bea2-479b-a486-f98f439e81e4","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"d875b6df-8ffd-4a18-b575-19f871ab433e","path":"sprites/spr_mahreen/spr_mahreen.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"73fcc85b-1be6-4763-ae2c-b7e76f75c5a0","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"4b9d55d7-a4d2-44dc-985e-50763bb1810d","path":"sprites/spr_mahreen/spr_mahreen.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"d4940806-389e-4a3b-a400-6c4c24e42fc2","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"90f3dd18-f272-42c4-8509-dc1667fd2c7a","path":"sprites/spr_mahreen/spr_mahreen.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"97da6424-ca4f-452a-9e65-de6d331da653","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"15368c39-27df-4dcb-b87b-94593dd25c57","path":"sprites/spr_mahreen/spr_mahreen.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"1594b838-67b0-41f4-b1f5-15815e7ad64f","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"315144e4-36e5-4485-83ba-b61ec26febf9","path":"sprites/spr_mahreen/spr_mahreen.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"66c0d605-f696-47ff-8228-2ad92d4fe67b","IsCreationKey":false,"Key":7.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"b29d1b35-9e76-41f9-9970-17c607f6793f","path":"sprites/spr_mahreen/spr_mahreen.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"9c0339df-59a2-4224-b4ea-a5d6b57ea56c","IsCreationKey":false,"Key":8.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"4f4e0662-c792-4b27-825d-9cb06fe183ff","path":"sprites/spr_mahreen/spr_mahreen.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"465d239f-2864-49ca-9501-11df5da0dd3b","IsCreationKey":false,"Key":9.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"cb04c4cd-f562-4c14-ac9a-e437ce7f46ed","path":"sprites/spr_mahreen/spr_mahreen.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"e7a641f1-ab25-4635-a1e8-09f5cb4869a6","IsCreationKey":false,"Key":10.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"e081e164-ccf6-449f-9060-35f957ad22e5","path":"sprites/spr_mahreen/spr_mahreen.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"b7220668-2d49-4c83-b07d-8f55c99872df","IsCreationKey":false,"Key":11.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"aae59b9b-c126-4b33-bb10-f7a40cad275f","path":"sprites/spr_mahreen/spr_mahreen.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"2f81c49b-475d-4053-9122-2bc970556538","IsCreationKey":false,"Key":12.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"e5eae182-4aa0-4282-bfe8-fa1c1e89083c","path":"sprites/spr_mahreen/spr_mahreen.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"1df1f1e3-1879-4906-af31-7645d8144a4a","IsCreationKey":false,"Key":13.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"063437d3-cd92-4e25-96f1-97ef985aa6db","path":"sprites/spr_mahreen/spr_mahreen.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"be276b34-4e94-4a14-8bdf-af36af0f5c5a","IsCreationKey":false,"Key":14.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"14de9ffa-b488-44f9-afd3-fb4030398a09","path":"sprites/spr_mahreen/spr_mahreen.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"c32fc363-3fc0-4f92-a088-d7a8feb6c58b","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"ba4be018-3c02-477d-bb65-62fa67dc3b67","path":"sprites/spr_mahreen/spr_mahreen.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"19d2f518-dd6c-4879-a04e-2c7116330dff","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"3f565aef-eb59-4b1d-876e-f7b88d0f7129","path":"sprites/spr_mahreen/spr_mahreen.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"44db714c-bea2-479b-a486-f98f439e81e4","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"d875b6df-8ffd-4a18-b575-19f871ab433e","path":"sprites/spr_mahreen/spr_mahreen.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"73fcc85b-1be6-4763-ae2c-b7e76f75c5a0","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"4b9d55d7-a4d2-44dc-985e-50763bb1810d","path":"sprites/spr_mahreen/spr_mahreen.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"d4940806-389e-4a3b-a400-6c4c24e42fc2","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"90f3dd18-f272-42c4-8509-dc1667fd2c7a","path":"sprites/spr_mahreen/spr_mahreen.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"97da6424-ca4f-452a-9e65-de6d331da653","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"15368c39-27df-4dcb-b87b-94593dd25c57","path":"sprites/spr_mahreen/spr_mahreen.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"1594b838-67b0-41f4-b1f5-15815e7ad64f","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"315144e4-36e5-4485-83ba-b61ec26febf9","path":"sprites/spr_mahreen/spr_mahreen.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"66c0d605-f696-47ff-8228-2ad92d4fe67b","IsCreationKey":false,"Key":7.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"b29d1b35-9e76-41f9-9970-17c607f6793f","path":"sprites/spr_mahreen/spr_mahreen.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"9c0339df-59a2-4224-b4ea-a5d6b57ea56c","IsCreationKey":false,"Key":8.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"4f4e0662-c792-4b27-825d-9cb06fe183ff","path":"sprites/spr_mahreen/spr_mahreen.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"465d239f-2864-49ca-9501-11df5da0dd3b","IsCreationKey":false,"Key":9.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"cb04c4cd-f562-4c14-ac9a-e437ce7f46ed","path":"sprites/spr_mahreen/spr_mahreen.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"e7a641f1-ab25-4635-a1e8-09f5cb4869a6","IsCreationKey":false,"Key":10.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"e081e164-ccf6-449f-9060-35f957ad22e5","path":"sprites/spr_mahreen/spr_mahreen.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"b7220668-2d49-4c83-b07d-8f55c99872df","IsCreationKey":false,"Key":11.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"aae59b9b-c126-4b33-bb10-f7a40cad275f","path":"sprites/spr_mahreen/spr_mahreen.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"2f81c49b-475d-4053-9122-2bc970556538","IsCreationKey":false,"Key":12.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"e5eae182-4aa0-4282-bfe8-fa1c1e89083c","path":"sprites/spr_mahreen/spr_mahreen.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"1df1f1e3-1879-4906-af31-7645d8144a4a","IsCreationKey":false,"Key":13.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"063437d3-cd92-4e25-96f1-97ef985aa6db","path":"sprites/spr_mahreen/spr_mahreen.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"be276b34-4e94-4a14-8bdf-af36af0f5c5a","IsCreationKey":false,"Key":14.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_mahreen_gun/spr_mahreen_gun.yy b/sprites/spr_mahreen_gun/spr_mahreen_gun.yy index 3f7ff0a1be..cb09c8dfe4 100644 --- a/sprites/spr_mahreen_gun/spr_mahreen_gun.yy +++ b/sprites/spr_mahreen_gun/spr_mahreen_gun.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_mahreen_gun", "bboxMode":0, "bbox_bottom":51, @@ -12,21 +12,21 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"26b32576-846a-4d2c-957b-8d8ea19e7d97","name":"26b32576-846a-4d2c-957b-8d8ea19e7d97","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"1c4c8e8d-1419-4455-a133-2fdbbdd0845e","name":"1c4c8e8d-1419-4455-a133-2fdbbdd0845e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"ef768e33-ee33-41e5-9a93-9aca665e8d0f","name":"ef768e33-ee33-41e5-9a93-9aca665e8d0f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"834da95f-937d-4755-ba47-5cc13d8b4d5d","name":"834da95f-937d-4755-ba47-5cc13d8b4d5d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"f4bd5971-3e67-4ca4-8989-8fbadbd28769","name":"f4bd5971-3e67-4ca4-8989-8fbadbd28769","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"1503ec11-e9c9-4d29-8297-78bd0515a012","name":"1503ec11-e9c9-4d29-8297-78bd0515a012","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"b5dad1e7-3a8d-484c-a6ad-d460d98d657d","name":"b5dad1e7-3a8d-484c-a6ad-d460d98d657d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"9ce214a4-56de-421a-aa04-e6cfe7d0a13b","name":"9ce214a4-56de-421a-aa04-e6cfe7d0a13b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"0b7e43c3-f13b-40f4-9eca-167ff22e296b","name":"0b7e43c3-f13b-40f4-9eca-167ff22e296b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"3eabc99b-f00d-4acf-893d-69b898ffdfe7","name":"3eabc99b-f00d-4acf-893d-69b898ffdfe7","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"f1f90d51-a0ec-47f9-b0e3-19af05cdf3a3","name":"f1f90d51-a0ec-47f9-b0e3-19af05cdf3a3","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"8455f93d-b9c8-4156-8956-56244747b171","name":"8455f93d-b9c8-4156-8956-56244747b171","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"742e6880-3cda-4cde-982f-60b8dafa6112","name":"742e6880-3cda-4cde-982f-60b8dafa6112","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"6ff28df7-7cf4-4dc7-bf60-21e32687a7c1","name":"6ff28df7-7cf4-4dc7-bf60-21e32687a7c1","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"74ac2f73-28fb-479b-911c-7ca0384f9738","name":"74ac2f73-28fb-479b-911c-7ca0384f9738","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"26b32576-846a-4d2c-957b-8d8ea19e7d97","name":"26b32576-846a-4d2c-957b-8d8ea19e7d97","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"1c4c8e8d-1419-4455-a133-2fdbbdd0845e","name":"1c4c8e8d-1419-4455-a133-2fdbbdd0845e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"ef768e33-ee33-41e5-9a93-9aca665e8d0f","name":"ef768e33-ee33-41e5-9a93-9aca665e8d0f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"834da95f-937d-4755-ba47-5cc13d8b4d5d","name":"834da95f-937d-4755-ba47-5cc13d8b4d5d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"f4bd5971-3e67-4ca4-8989-8fbadbd28769","name":"f4bd5971-3e67-4ca4-8989-8fbadbd28769","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"1503ec11-e9c9-4d29-8297-78bd0515a012","name":"1503ec11-e9c9-4d29-8297-78bd0515a012","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"b5dad1e7-3a8d-484c-a6ad-d460d98d657d","name":"b5dad1e7-3a8d-484c-a6ad-d460d98d657d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"9ce214a4-56de-421a-aa04-e6cfe7d0a13b","name":"9ce214a4-56de-421a-aa04-e6cfe7d0a13b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"0b7e43c3-f13b-40f4-9eca-167ff22e296b","name":"0b7e43c3-f13b-40f4-9eca-167ff22e296b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"3eabc99b-f00d-4acf-893d-69b898ffdfe7","name":"3eabc99b-f00d-4acf-893d-69b898ffdfe7","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"f1f90d51-a0ec-47f9-b0e3-19af05cdf3a3","name":"f1f90d51-a0ec-47f9-b0e3-19af05cdf3a3","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"8455f93d-b9c8-4156-8956-56244747b171","name":"8455f93d-b9c8-4156-8956-56244747b171","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"742e6880-3cda-4cde-982f-60b8dafa6112","name":"742e6880-3cda-4cde-982f-60b8dafa6112","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"6ff28df7-7cf4-4dc7-bf60-21e32687a7c1","name":"6ff28df7-7cf4-4dc7-bf60-21e32687a7c1","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"74ac2f73-28fb-479b-911c-7ca0384f9738","name":"74ac2f73-28fb-479b-911c-7ca0384f9738","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -82,51 +82,21 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"26b32576-846a-4d2c-957b-8d8ea19e7d97","path":"sprites/spr_mahreen_gun/spr_mahreen_gun.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"d080e80e-2e64-416c-ab86-a82df3a1d9fd","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"1c4c8e8d-1419-4455-a133-2fdbbdd0845e","path":"sprites/spr_mahreen_gun/spr_mahreen_gun.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"d4551645-6945-49a3-a74b-be127b7b90b6","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"ef768e33-ee33-41e5-9a93-9aca665e8d0f","path":"sprites/spr_mahreen_gun/spr_mahreen_gun.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"6c8a89b8-59a6-41fc-abcc-a25a329477c5","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"834da95f-937d-4755-ba47-5cc13d8b4d5d","path":"sprites/spr_mahreen_gun/spr_mahreen_gun.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"e2b8c888-4a78-4dd1-a5b9-3a51745509ef","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"f4bd5971-3e67-4ca4-8989-8fbadbd28769","path":"sprites/spr_mahreen_gun/spr_mahreen_gun.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"0fcd727c-0b77-460c-9833-588b29c77fe3","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"1503ec11-e9c9-4d29-8297-78bd0515a012","path":"sprites/spr_mahreen_gun/spr_mahreen_gun.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"13eb5f60-95ed-497e-8fd6-d60bbed2b6f3","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"b5dad1e7-3a8d-484c-a6ad-d460d98d657d","path":"sprites/spr_mahreen_gun/spr_mahreen_gun.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"8fbffe1c-a902-49ad-a926-3d610aa4e63f","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"9ce214a4-56de-421a-aa04-e6cfe7d0a13b","path":"sprites/spr_mahreen_gun/spr_mahreen_gun.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"6065c582-12c0-41b6-8c28-3e6c752390ba","IsCreationKey":false,"Key":7.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"0b7e43c3-f13b-40f4-9eca-167ff22e296b","path":"sprites/spr_mahreen_gun/spr_mahreen_gun.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"39c463f5-38ac-4cfa-9357-ced874d14c67","IsCreationKey":false,"Key":8.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"3eabc99b-f00d-4acf-893d-69b898ffdfe7","path":"sprites/spr_mahreen_gun/spr_mahreen_gun.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"1670f0bc-0eaa-42b5-9e68-577b74371851","IsCreationKey":false,"Key":9.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"f1f90d51-a0ec-47f9-b0e3-19af05cdf3a3","path":"sprites/spr_mahreen_gun/spr_mahreen_gun.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"0adb3fae-5b8e-4e06-ba18-f126862b1cf9","IsCreationKey":false,"Key":10.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"8455f93d-b9c8-4156-8956-56244747b171","path":"sprites/spr_mahreen_gun/spr_mahreen_gun.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"f7cf4139-37f4-4875-b097-7aab1d8b2f41","IsCreationKey":false,"Key":11.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"742e6880-3cda-4cde-982f-60b8dafa6112","path":"sprites/spr_mahreen_gun/spr_mahreen_gun.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"23526fe7-d62c-4258-9aa9-ef5e9d498646","IsCreationKey":false,"Key":12.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"6ff28df7-7cf4-4dc7-bf60-21e32687a7c1","path":"sprites/spr_mahreen_gun/spr_mahreen_gun.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"d45104df-28dc-4ad9-8c58-2a723b8e0c09","IsCreationKey":false,"Key":13.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"74ac2f73-28fb-479b-911c-7ca0384f9738","path":"sprites/spr_mahreen_gun/spr_mahreen_gun.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"46fa195a-7db8-47e8-890c-3aa7c0fb18fd","IsCreationKey":false,"Key":14.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"26b32576-846a-4d2c-957b-8d8ea19e7d97","path":"sprites/spr_mahreen_gun/spr_mahreen_gun.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"d080e80e-2e64-416c-ab86-a82df3a1d9fd","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"1c4c8e8d-1419-4455-a133-2fdbbdd0845e","path":"sprites/spr_mahreen_gun/spr_mahreen_gun.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"d4551645-6945-49a3-a74b-be127b7b90b6","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"ef768e33-ee33-41e5-9a93-9aca665e8d0f","path":"sprites/spr_mahreen_gun/spr_mahreen_gun.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"6c8a89b8-59a6-41fc-abcc-a25a329477c5","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"834da95f-937d-4755-ba47-5cc13d8b4d5d","path":"sprites/spr_mahreen_gun/spr_mahreen_gun.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"e2b8c888-4a78-4dd1-a5b9-3a51745509ef","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"f4bd5971-3e67-4ca4-8989-8fbadbd28769","path":"sprites/spr_mahreen_gun/spr_mahreen_gun.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"0fcd727c-0b77-460c-9833-588b29c77fe3","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"1503ec11-e9c9-4d29-8297-78bd0515a012","path":"sprites/spr_mahreen_gun/spr_mahreen_gun.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"13eb5f60-95ed-497e-8fd6-d60bbed2b6f3","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"b5dad1e7-3a8d-484c-a6ad-d460d98d657d","path":"sprites/spr_mahreen_gun/spr_mahreen_gun.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"8fbffe1c-a902-49ad-a926-3d610aa4e63f","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"9ce214a4-56de-421a-aa04-e6cfe7d0a13b","path":"sprites/spr_mahreen_gun/spr_mahreen_gun.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"6065c582-12c0-41b6-8c28-3e6c752390ba","IsCreationKey":false,"Key":7.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"0b7e43c3-f13b-40f4-9eca-167ff22e296b","path":"sprites/spr_mahreen_gun/spr_mahreen_gun.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"39c463f5-38ac-4cfa-9357-ced874d14c67","IsCreationKey":false,"Key":8.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"3eabc99b-f00d-4acf-893d-69b898ffdfe7","path":"sprites/spr_mahreen_gun/spr_mahreen_gun.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"1670f0bc-0eaa-42b5-9e68-577b74371851","IsCreationKey":false,"Key":9.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"f1f90d51-a0ec-47f9-b0e3-19af05cdf3a3","path":"sprites/spr_mahreen_gun/spr_mahreen_gun.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"0adb3fae-5b8e-4e06-ba18-f126862b1cf9","IsCreationKey":false,"Key":10.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"8455f93d-b9c8-4156-8956-56244747b171","path":"sprites/spr_mahreen_gun/spr_mahreen_gun.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"f7cf4139-37f4-4875-b097-7aab1d8b2f41","IsCreationKey":false,"Key":11.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"742e6880-3cda-4cde-982f-60b8dafa6112","path":"sprites/spr_mahreen_gun/spr_mahreen_gun.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"23526fe7-d62c-4258-9aa9-ef5e9d498646","IsCreationKey":false,"Key":12.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"6ff28df7-7cf4-4dc7-bf60-21e32687a7c1","path":"sprites/spr_mahreen_gun/spr_mahreen_gun.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"d45104df-28dc-4ad9-8c58-2a723b8e0c09","IsCreationKey":false,"Key":13.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"74ac2f73-28fb-479b-911c-7ca0384f9738","path":"sprites/spr_mahreen_gun/spr_mahreen_gun.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"46fa195a-7db8-47e8-890c-3aa7c0fb18fd","IsCreationKey":false,"Key":14.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":{ diff --git a/sprites/spr_mahreen_secondary/spr_mahreen_secondary.yy b/sprites/spr_mahreen_secondary/spr_mahreen_secondary.yy index 384c8a3d5c..084b9920ba 100644 --- a/sprites/spr_mahreen_secondary/spr_mahreen_secondary.yy +++ b/sprites/spr_mahreen_secondary/spr_mahreen_secondary.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_mahreen_secondary", "bboxMode":0, "bbox_bottom":34, @@ -12,21 +12,21 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"39fa9316-112e-4905-81ed-5d32ece608d0","name":"39fa9316-112e-4905-81ed-5d32ece608d0","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"c0cd8bb6-1285-4414-a383-6cfa0e8a5b73","name":"c0cd8bb6-1285-4414-a383-6cfa0e8a5b73","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"2682bc13-59ea-489d-8a57-a5bfcd569f04","name":"2682bc13-59ea-489d-8a57-a5bfcd569f04","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"693e6ced-dbdf-4425-8848-f4ac590b520c","name":"693e6ced-dbdf-4425-8848-f4ac590b520c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"c4599e38-a482-46a2-a468-ddb4e7214e34","name":"c4599e38-a482-46a2-a468-ddb4e7214e34","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"13074c90-cc1a-433a-b435-cfdee44786bd","name":"13074c90-cc1a-433a-b435-cfdee44786bd","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"eeb0644b-18bf-447c-bbf3-534a72f57e0d","name":"eeb0644b-18bf-447c-bbf3-534a72f57e0d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"db4a9a8c-e96a-4f9d-a7d5-d69f401c4f6f","name":"db4a9a8c-e96a-4f9d-a7d5-d69f401c4f6f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"2c1593c4-869f-4aca-a1b3-33b3e9ab15c9","name":"2c1593c4-869f-4aca-a1b3-33b3e9ab15c9","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"079cf1c0-5db0-4fb6-8d0a-13fcd36a6afb","name":"079cf1c0-5db0-4fb6-8d0a-13fcd36a6afb","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"7fa2715f-5a22-4174-9809-708623e4c6c1","name":"7fa2715f-5a22-4174-9809-708623e4c6c1","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"3b1b06dd-2ef1-47ee-b7b4-e16fc2189627","name":"3b1b06dd-2ef1-47ee-b7b4-e16fc2189627","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"3d516822-d888-40f2-bae9-7a98c273c307","name":"3d516822-d888-40f2-bae9-7a98c273c307","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"153ad7f3-c616-4efb-bc80-4beb31a2b363","name":"153ad7f3-c616-4efb-bc80-4beb31a2b363","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"bc106fdf-8dc9-465f-86cf-ce5a888edae7","name":"bc106fdf-8dc9-465f-86cf-ce5a888edae7","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"39fa9316-112e-4905-81ed-5d32ece608d0","name":"39fa9316-112e-4905-81ed-5d32ece608d0","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"c0cd8bb6-1285-4414-a383-6cfa0e8a5b73","name":"c0cd8bb6-1285-4414-a383-6cfa0e8a5b73","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"2682bc13-59ea-489d-8a57-a5bfcd569f04","name":"2682bc13-59ea-489d-8a57-a5bfcd569f04","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"693e6ced-dbdf-4425-8848-f4ac590b520c","name":"693e6ced-dbdf-4425-8848-f4ac590b520c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"c4599e38-a482-46a2-a468-ddb4e7214e34","name":"c4599e38-a482-46a2-a468-ddb4e7214e34","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"13074c90-cc1a-433a-b435-cfdee44786bd","name":"13074c90-cc1a-433a-b435-cfdee44786bd","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"eeb0644b-18bf-447c-bbf3-534a72f57e0d","name":"eeb0644b-18bf-447c-bbf3-534a72f57e0d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"db4a9a8c-e96a-4f9d-a7d5-d69f401c4f6f","name":"db4a9a8c-e96a-4f9d-a7d5-d69f401c4f6f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"2c1593c4-869f-4aca-a1b3-33b3e9ab15c9","name":"2c1593c4-869f-4aca-a1b3-33b3e9ab15c9","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"079cf1c0-5db0-4fb6-8d0a-13fcd36a6afb","name":"079cf1c0-5db0-4fb6-8d0a-13fcd36a6afb","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"7fa2715f-5a22-4174-9809-708623e4c6c1","name":"7fa2715f-5a22-4174-9809-708623e4c6c1","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"3b1b06dd-2ef1-47ee-b7b4-e16fc2189627","name":"3b1b06dd-2ef1-47ee-b7b4-e16fc2189627","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"3d516822-d888-40f2-bae9-7a98c273c307","name":"3d516822-d888-40f2-bae9-7a98c273c307","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"153ad7f3-c616-4efb-bc80-4beb31a2b363","name":"153ad7f3-c616-4efb-bc80-4beb31a2b363","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"bc106fdf-8dc9-465f-86cf-ce5a888edae7","name":"bc106fdf-8dc9-465f-86cf-ce5a888edae7","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -82,51 +82,21 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"39fa9316-112e-4905-81ed-5d32ece608d0","path":"sprites/spr_mahreen_secondary/spr_mahreen_secondary.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"7c264cd4-4730-4a9b-bf9e-d764125b9bae","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"c0cd8bb6-1285-4414-a383-6cfa0e8a5b73","path":"sprites/spr_mahreen_secondary/spr_mahreen_secondary.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"99691236-7ce3-4580-8c6e-2b186e45f54d","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"2682bc13-59ea-489d-8a57-a5bfcd569f04","path":"sprites/spr_mahreen_secondary/spr_mahreen_secondary.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"d8fc769d-8830-4603-b31e-185623028d9f","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"693e6ced-dbdf-4425-8848-f4ac590b520c","path":"sprites/spr_mahreen_secondary/spr_mahreen_secondary.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"f9a635ea-5d94-47ed-a5b3-e765b78aa4c2","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"c4599e38-a482-46a2-a468-ddb4e7214e34","path":"sprites/spr_mahreen_secondary/spr_mahreen_secondary.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"b6a52467-3838-49f8-81b7-0f5272fccef4","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"13074c90-cc1a-433a-b435-cfdee44786bd","path":"sprites/spr_mahreen_secondary/spr_mahreen_secondary.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"32713d25-ecff-47b4-9da5-4e49e3f34ce2","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"eeb0644b-18bf-447c-bbf3-534a72f57e0d","path":"sprites/spr_mahreen_secondary/spr_mahreen_secondary.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"d68ba8d1-3df2-4bdf-991b-c051db694ac8","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"db4a9a8c-e96a-4f9d-a7d5-d69f401c4f6f","path":"sprites/spr_mahreen_secondary/spr_mahreen_secondary.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"31607eb0-41e8-406b-ae45-deb3bcc4c18d","IsCreationKey":false,"Key":7.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"2c1593c4-869f-4aca-a1b3-33b3e9ab15c9","path":"sprites/spr_mahreen_secondary/spr_mahreen_secondary.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"9027993f-4420-4b89-8fb0-a138124e5528","IsCreationKey":false,"Key":8.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"079cf1c0-5db0-4fb6-8d0a-13fcd36a6afb","path":"sprites/spr_mahreen_secondary/spr_mahreen_secondary.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"c8bc27d5-b80d-4b9b-a0f4-8ec7c0df980e","IsCreationKey":false,"Key":9.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"7fa2715f-5a22-4174-9809-708623e4c6c1","path":"sprites/spr_mahreen_secondary/spr_mahreen_secondary.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"af7ff51f-f2fb-46a7-bf03-db0e458197d8","IsCreationKey":false,"Key":10.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"3b1b06dd-2ef1-47ee-b7b4-e16fc2189627","path":"sprites/spr_mahreen_secondary/spr_mahreen_secondary.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"0c2ba782-39ea-4de9-9300-da1fc687eb5b","IsCreationKey":false,"Key":11.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"3d516822-d888-40f2-bae9-7a98c273c307","path":"sprites/spr_mahreen_secondary/spr_mahreen_secondary.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"2fcb8330-b75e-4c95-aa3c-9af440f6516d","IsCreationKey":false,"Key":12.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"153ad7f3-c616-4efb-bc80-4beb31a2b363","path":"sprites/spr_mahreen_secondary/spr_mahreen_secondary.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"06ff3a4a-9032-4c22-8fd7-6b3a169899ef","IsCreationKey":false,"Key":13.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"bc106fdf-8dc9-465f-86cf-ce5a888edae7","path":"sprites/spr_mahreen_secondary/spr_mahreen_secondary.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"acec81cf-187f-4f3d-861e-f0c706ff2750","IsCreationKey":false,"Key":14.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"39fa9316-112e-4905-81ed-5d32ece608d0","path":"sprites/spr_mahreen_secondary/spr_mahreen_secondary.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"7c264cd4-4730-4a9b-bf9e-d764125b9bae","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"c0cd8bb6-1285-4414-a383-6cfa0e8a5b73","path":"sprites/spr_mahreen_secondary/spr_mahreen_secondary.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"99691236-7ce3-4580-8c6e-2b186e45f54d","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"2682bc13-59ea-489d-8a57-a5bfcd569f04","path":"sprites/spr_mahreen_secondary/spr_mahreen_secondary.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"d8fc769d-8830-4603-b31e-185623028d9f","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"693e6ced-dbdf-4425-8848-f4ac590b520c","path":"sprites/spr_mahreen_secondary/spr_mahreen_secondary.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"f9a635ea-5d94-47ed-a5b3-e765b78aa4c2","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"c4599e38-a482-46a2-a468-ddb4e7214e34","path":"sprites/spr_mahreen_secondary/spr_mahreen_secondary.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"b6a52467-3838-49f8-81b7-0f5272fccef4","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"13074c90-cc1a-433a-b435-cfdee44786bd","path":"sprites/spr_mahreen_secondary/spr_mahreen_secondary.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"32713d25-ecff-47b4-9da5-4e49e3f34ce2","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"eeb0644b-18bf-447c-bbf3-534a72f57e0d","path":"sprites/spr_mahreen_secondary/spr_mahreen_secondary.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"d68ba8d1-3df2-4bdf-991b-c051db694ac8","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"db4a9a8c-e96a-4f9d-a7d5-d69f401c4f6f","path":"sprites/spr_mahreen_secondary/spr_mahreen_secondary.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"31607eb0-41e8-406b-ae45-deb3bcc4c18d","IsCreationKey":false,"Key":7.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"2c1593c4-869f-4aca-a1b3-33b3e9ab15c9","path":"sprites/spr_mahreen_secondary/spr_mahreen_secondary.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"9027993f-4420-4b89-8fb0-a138124e5528","IsCreationKey":false,"Key":8.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"079cf1c0-5db0-4fb6-8d0a-13fcd36a6afb","path":"sprites/spr_mahreen_secondary/spr_mahreen_secondary.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"c8bc27d5-b80d-4b9b-a0f4-8ec7c0df980e","IsCreationKey":false,"Key":9.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"7fa2715f-5a22-4174-9809-708623e4c6c1","path":"sprites/spr_mahreen_secondary/spr_mahreen_secondary.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"af7ff51f-f2fb-46a7-bf03-db0e458197d8","IsCreationKey":false,"Key":10.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"3b1b06dd-2ef1-47ee-b7b4-e16fc2189627","path":"sprites/spr_mahreen_secondary/spr_mahreen_secondary.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"0c2ba782-39ea-4de9-9300-da1fc687eb5b","IsCreationKey":false,"Key":11.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"3d516822-d888-40f2-bae9-7a98c273c307","path":"sprites/spr_mahreen_secondary/spr_mahreen_secondary.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"2fcb8330-b75e-4c95-aa3c-9af440f6516d","IsCreationKey":false,"Key":12.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"153ad7f3-c616-4efb-bc80-4beb31a2b363","path":"sprites/spr_mahreen_secondary/spr_mahreen_secondary.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"06ff3a4a-9032-4c22-8fd7-6b3a169899ef","IsCreationKey":false,"Key":13.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"bc106fdf-8dc9-465f-86cf-ce5a888edae7","path":"sprites/spr_mahreen_secondary/spr_mahreen_secondary.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"acec81cf-187f-4f3d-861e-f0c706ff2750","IsCreationKey":false,"Key":14.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":{ diff --git a/sprites/spr_mahreen_visor/spr_mahreen_visor.yy b/sprites/spr_mahreen_visor/spr_mahreen_visor.yy index 73a64b6503..216322791c 100644 --- a/sprites/spr_mahreen_visor/spr_mahreen_visor.yy +++ b/sprites/spr_mahreen_visor/spr_mahreen_visor.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_mahreen_visor", "bboxMode":0, "bbox_bottom":12, @@ -12,21 +12,21 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"7af506e9-e6fb-4104-9837-15d29df97d09","name":"7af506e9-e6fb-4104-9837-15d29df97d09","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"3b90c868-5420-425d-840d-218478167973","name":"3b90c868-5420-425d-840d-218478167973","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"6e1823b8-a7fa-42f9-b1c9-9d861c06ea26","name":"6e1823b8-a7fa-42f9-b1c9-9d861c06ea26","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"07bbef0d-d9c8-4b16-8de1-560f31f9114f","name":"07bbef0d-d9c8-4b16-8de1-560f31f9114f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"0c9f03b4-63af-4763-a7a8-bcdf89a8627f","name":"0c9f03b4-63af-4763-a7a8-bcdf89a8627f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"af80be5a-c8a3-4e11-b275-992a36db6482","name":"af80be5a-c8a3-4e11-b275-992a36db6482","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"789a0f32-fb81-43ee-8538-9edf934797a9","name":"789a0f32-fb81-43ee-8538-9edf934797a9","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"7d5ecfb8-f210-42ce-bbe2-bf8a917b4e85","name":"7d5ecfb8-f210-42ce-bbe2-bf8a917b4e85","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"9e806d42-0922-476d-8d9c-e37aaf9aa07d","name":"9e806d42-0922-476d-8d9c-e37aaf9aa07d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"d156d998-2521-4b7d-980a-5271ec8b3897","name":"d156d998-2521-4b7d-980a-5271ec8b3897","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"5e7fa1cb-9835-4af2-af83-d0519e041c02","name":"5e7fa1cb-9835-4af2-af83-d0519e041c02","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"804ae55c-6893-462b-a31b-d176381419fc","name":"804ae55c-6893-462b-a31b-d176381419fc","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"af3416e4-f87d-4aed-90e1-9aa672dbe43d","name":"af3416e4-f87d-4aed-90e1-9aa672dbe43d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"5168cffa-a26b-444c-bc2a-61bf8674a560","name":"5168cffa-a26b-444c-bc2a-61bf8674a560","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"71a92573-c199-49aa-92f4-ef2bfa4b245b","name":"71a92573-c199-49aa-92f4-ef2bfa4b245b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"7af506e9-e6fb-4104-9837-15d29df97d09","name":"7af506e9-e6fb-4104-9837-15d29df97d09","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"3b90c868-5420-425d-840d-218478167973","name":"3b90c868-5420-425d-840d-218478167973","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"6e1823b8-a7fa-42f9-b1c9-9d861c06ea26","name":"6e1823b8-a7fa-42f9-b1c9-9d861c06ea26","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"07bbef0d-d9c8-4b16-8de1-560f31f9114f","name":"07bbef0d-d9c8-4b16-8de1-560f31f9114f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"0c9f03b4-63af-4763-a7a8-bcdf89a8627f","name":"0c9f03b4-63af-4763-a7a8-bcdf89a8627f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"af80be5a-c8a3-4e11-b275-992a36db6482","name":"af80be5a-c8a3-4e11-b275-992a36db6482","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"789a0f32-fb81-43ee-8538-9edf934797a9","name":"789a0f32-fb81-43ee-8538-9edf934797a9","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"7d5ecfb8-f210-42ce-bbe2-bf8a917b4e85","name":"7d5ecfb8-f210-42ce-bbe2-bf8a917b4e85","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"9e806d42-0922-476d-8d9c-e37aaf9aa07d","name":"9e806d42-0922-476d-8d9c-e37aaf9aa07d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"d156d998-2521-4b7d-980a-5271ec8b3897","name":"d156d998-2521-4b7d-980a-5271ec8b3897","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"5e7fa1cb-9835-4af2-af83-d0519e041c02","name":"5e7fa1cb-9835-4af2-af83-d0519e041c02","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"804ae55c-6893-462b-a31b-d176381419fc","name":"804ae55c-6893-462b-a31b-d176381419fc","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"af3416e4-f87d-4aed-90e1-9aa672dbe43d","name":"af3416e4-f87d-4aed-90e1-9aa672dbe43d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"5168cffa-a26b-444c-bc2a-61bf8674a560","name":"5168cffa-a26b-444c-bc2a-61bf8674a560","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"71a92573-c199-49aa-92f4-ef2bfa4b245b","name":"71a92573-c199-49aa-92f4-ef2bfa4b245b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -82,51 +82,21 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"7af506e9-e6fb-4104-9837-15d29df97d09","path":"sprites/spr_mahreen_visor/spr_mahreen_visor.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"cf6543f1-58b9-4b31-a36a-717dea5e6a7c","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"3b90c868-5420-425d-840d-218478167973","path":"sprites/spr_mahreen_visor/spr_mahreen_visor.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"5cc113f7-867f-470e-b882-87e8d20b31bc","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"6e1823b8-a7fa-42f9-b1c9-9d861c06ea26","path":"sprites/spr_mahreen_visor/spr_mahreen_visor.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"6f2f1a8e-2da3-4a2e-9bdb-129d86c1241f","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"07bbef0d-d9c8-4b16-8de1-560f31f9114f","path":"sprites/spr_mahreen_visor/spr_mahreen_visor.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"2e25a334-4340-4c46-b0a8-5da549f782b8","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"0c9f03b4-63af-4763-a7a8-bcdf89a8627f","path":"sprites/spr_mahreen_visor/spr_mahreen_visor.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"691134e1-5fec-424c-a344-c6c8bf05aa21","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"af80be5a-c8a3-4e11-b275-992a36db6482","path":"sprites/spr_mahreen_visor/spr_mahreen_visor.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"4bfe5bf8-b809-4cfb-84c6-995c59bb311c","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"789a0f32-fb81-43ee-8538-9edf934797a9","path":"sprites/spr_mahreen_visor/spr_mahreen_visor.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"9e3b95f8-639f-476f-ba9d-20860f96f499","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"7d5ecfb8-f210-42ce-bbe2-bf8a917b4e85","path":"sprites/spr_mahreen_visor/spr_mahreen_visor.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"d8f565e5-70d2-491a-83d3-e1c579cee9a6","IsCreationKey":false,"Key":7.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"9e806d42-0922-476d-8d9c-e37aaf9aa07d","path":"sprites/spr_mahreen_visor/spr_mahreen_visor.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"412eac1e-7d00-4ef9-acbe-61b7c1dedd1b","IsCreationKey":false,"Key":8.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"d156d998-2521-4b7d-980a-5271ec8b3897","path":"sprites/spr_mahreen_visor/spr_mahreen_visor.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"1a9ebc85-4f8e-425b-94dc-7c8a4d09bbc3","IsCreationKey":false,"Key":9.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"5e7fa1cb-9835-4af2-af83-d0519e041c02","path":"sprites/spr_mahreen_visor/spr_mahreen_visor.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"120a012d-0b78-490f-8e9b-0553b9d43f4b","IsCreationKey":false,"Key":10.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"804ae55c-6893-462b-a31b-d176381419fc","path":"sprites/spr_mahreen_visor/spr_mahreen_visor.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"2e7be5e7-79ac-4f35-a84c-2689e54b87a7","IsCreationKey":false,"Key":11.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"af3416e4-f87d-4aed-90e1-9aa672dbe43d","path":"sprites/spr_mahreen_visor/spr_mahreen_visor.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"923e7314-a879-42b5-bdd5-2b8e791ca784","IsCreationKey":false,"Key":12.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"5168cffa-a26b-444c-bc2a-61bf8674a560","path":"sprites/spr_mahreen_visor/spr_mahreen_visor.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"c992c954-80e2-4c90-a649-238d976cff90","IsCreationKey":false,"Key":13.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"71a92573-c199-49aa-92f4-ef2bfa4b245b","path":"sprites/spr_mahreen_visor/spr_mahreen_visor.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"9c63d7c0-4a78-4d1c-a4d3-87781aae3f63","IsCreationKey":false,"Key":14.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"7af506e9-e6fb-4104-9837-15d29df97d09","path":"sprites/spr_mahreen_visor/spr_mahreen_visor.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"cf6543f1-58b9-4b31-a36a-717dea5e6a7c","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"3b90c868-5420-425d-840d-218478167973","path":"sprites/spr_mahreen_visor/spr_mahreen_visor.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"5cc113f7-867f-470e-b882-87e8d20b31bc","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"6e1823b8-a7fa-42f9-b1c9-9d861c06ea26","path":"sprites/spr_mahreen_visor/spr_mahreen_visor.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"6f2f1a8e-2da3-4a2e-9bdb-129d86c1241f","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"07bbef0d-d9c8-4b16-8de1-560f31f9114f","path":"sprites/spr_mahreen_visor/spr_mahreen_visor.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"2e25a334-4340-4c46-b0a8-5da549f782b8","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"0c9f03b4-63af-4763-a7a8-bcdf89a8627f","path":"sprites/spr_mahreen_visor/spr_mahreen_visor.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"691134e1-5fec-424c-a344-c6c8bf05aa21","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"af80be5a-c8a3-4e11-b275-992a36db6482","path":"sprites/spr_mahreen_visor/spr_mahreen_visor.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"4bfe5bf8-b809-4cfb-84c6-995c59bb311c","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"789a0f32-fb81-43ee-8538-9edf934797a9","path":"sprites/spr_mahreen_visor/spr_mahreen_visor.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"9e3b95f8-639f-476f-ba9d-20860f96f499","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"7d5ecfb8-f210-42ce-bbe2-bf8a917b4e85","path":"sprites/spr_mahreen_visor/spr_mahreen_visor.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"d8f565e5-70d2-491a-83d3-e1c579cee9a6","IsCreationKey":false,"Key":7.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"9e806d42-0922-476d-8d9c-e37aaf9aa07d","path":"sprites/spr_mahreen_visor/spr_mahreen_visor.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"412eac1e-7d00-4ef9-acbe-61b7c1dedd1b","IsCreationKey":false,"Key":8.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"d156d998-2521-4b7d-980a-5271ec8b3897","path":"sprites/spr_mahreen_visor/spr_mahreen_visor.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"1a9ebc85-4f8e-425b-94dc-7c8a4d09bbc3","IsCreationKey":false,"Key":9.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"5e7fa1cb-9835-4af2-af83-d0519e041c02","path":"sprites/spr_mahreen_visor/spr_mahreen_visor.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"120a012d-0b78-490f-8e9b-0553b9d43f4b","IsCreationKey":false,"Key":10.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"804ae55c-6893-462b-a31b-d176381419fc","path":"sprites/spr_mahreen_visor/spr_mahreen_visor.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"2e7be5e7-79ac-4f35-a84c-2689e54b87a7","IsCreationKey":false,"Key":11.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"af3416e4-f87d-4aed-90e1-9aa672dbe43d","path":"sprites/spr_mahreen_visor/spr_mahreen_visor.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"923e7314-a879-42b5-bdd5-2b8e791ca784","IsCreationKey":false,"Key":12.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"5168cffa-a26b-444c-bc2a-61bf8674a560","path":"sprites/spr_mahreen_visor/spr_mahreen_visor.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"c992c954-80e2-4c90-a649-238d976cff90","IsCreationKey":false,"Key":13.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"71a92573-c199-49aa-92f4-ef2bfa4b245b","path":"sprites/spr_mahreen_visor/spr_mahreen_visor.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"9c63d7c0-4a78-4d1c-a4d3-87781aae3f63","IsCreationKey":false,"Key":14.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":{ diff --git a/sprites/spr_manta/spr_manta.yy b/sprites/spr_manta/spr_manta.yy index 0c9fa27cf2..2851379efb 100644 --- a/sprites/spr_manta/spr_manta.yy +++ b/sprites/spr_manta/spr_manta.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_manta", "bboxMode":0, "bbox_bottom":47, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"5f787cb0-7e13-451c-890c-3ef5add27e66","name":"5f787cb0-7e13-451c-890c-3ef5add27e66","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"5f787cb0-7e13-451c-890c-3ef5add27e66","name":"5f787cb0-7e13-451c-890c-3ef5add27e66","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"5f787cb0-7e13-451c-890c-3ef5add27e66","path":"sprites/spr_manta/spr_manta.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"f9ba13ab-74a9-4415-b636-70b079792bc7","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"5f787cb0-7e13-451c-890c-3ef5add27e66","path":"sprites/spr_manta/spr_manta.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"f9ba13ab-74a9-4415-b636-70b079792bc7","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":{ diff --git a/sprites/spr_mantis_warriors_icon/spr_mantis_warriors_icon.yy b/sprites/spr_mantis_warriors_icon/spr_mantis_warriors_icon.yy index 89d4807e14..da4f406aa3 100644 --- a/sprites/spr_mantis_warriors_icon/spr_mantis_warriors_icon.yy +++ b/sprites/spr_mantis_warriors_icon/spr_mantis_warriors_icon.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_mantis_warriors_icon", "bboxMode":0, "bbox_bottom":72, @@ -12,8 +12,8 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"a47d6a18-1de6-44c5-b1b5-899bf4162402","name":"a47d6a18-1de6-44c5-b1b5-899bf4162402","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"8f304484-8756-4ea1-800a-b54b710b175d","name":"8f304484-8756-4ea1-800a-b54b710b175d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"a47d6a18-1de6-44c5-b1b5-899bf4162402","name":"a47d6a18-1de6-44c5-b1b5-899bf4162402","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"8f304484-8756-4ea1-800a-b54b710b175d","name":"8f304484-8756-4ea1-800a-b54b710b175d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -70,12 +70,8 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"a47d6a18-1de6-44c5-b1b5-899bf4162402","path":"sprites/spr_mantis_warriors_icon/spr_mantis_warriors_icon.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"1a5d5c4a-4588-4129-9abb-f210090c169c","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"8f304484-8756-4ea1-800a-b54b710b175d","path":"sprites/spr_mantis_warriors_icon/spr_mantis_warriors_icon.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"62e74cff-5357-4b1a-9049-84c4e78299a4","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"a47d6a18-1de6-44c5-b1b5-899bf4162402","path":"sprites/spr_mantis_warriors_icon/spr_mantis_warriors_icon.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"1a5d5c4a-4588-4129-9abb-f210090c169c","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"8f304484-8756-4ea1-800a-b54b710b175d","path":"sprites/spr_mantis_warriors_icon/spr_mantis_warriors_icon.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"62e74cff-5357-4b1a-9049-84c4e78299a4","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_mar_collision/spr_mar_collision.yy b/sprites/spr_mar_collision/spr_mar_collision.yy index 81e7818bb0..d4e9fccf8f 100644 --- a/sprites/spr_mar_collision/spr_mar_collision.yy +++ b/sprites/spr_mar_collision/spr_mar_collision.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_mar_collision", "bboxMode":2, "bbox_bottom":38, @@ -12,23 +12,23 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"98e46c57-e2c4-40cc-be18-0d9c957f9ddc","name":"98e46c57-e2c4-40cc-be18-0d9c957f9ddc","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"1674be3c-5769-44c3-81e8-c574d1aada7e","name":"1674be3c-5769-44c3-81e8-c574d1aada7e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"dc91e6af-a580-481b-86d8-2218efdf1bd4","name":"dc91e6af-a580-481b-86d8-2218efdf1bd4","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"2c6619ce-8999-4deb-8866-715dbad4ebfb","name":"2c6619ce-8999-4deb-8866-715dbad4ebfb","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"73dfb102-c129-4c22-94b5-873f24246195","name":"73dfb102-c129-4c22-94b5-873f24246195","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"e7d2a384-1c48-41be-9909-2cc16a84f88f","name":"e7d2a384-1c48-41be-9909-2cc16a84f88f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"f154861b-1ec2-4b0d-b3db-606ee8c7378b","name":"f154861b-1ec2-4b0d-b3db-606ee8c7378b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"2a106682-8b51-41e2-b785-e56933172957","name":"2a106682-8b51-41e2-b785-e56933172957","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"4f7466f3-22ea-434b-b759-14d8cf633d6b","name":"4f7466f3-22ea-434b-b759-14d8cf633d6b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"59c3df88-024a-4d43-9eb6-479b616a5a8f","name":"59c3df88-024a-4d43-9eb6-479b616a5a8f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"f798c093-387b-4249-9e78-21c3cf42ab6a","name":"f798c093-387b-4249-9e78-21c3cf42ab6a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"6334a270-feae-41eb-bfcb-27bddb85fc08","name":"6334a270-feae-41eb-bfcb-27bddb85fc08","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"789c3d1b-bf8d-4a82-bb84-791e93be0e66","name":"789c3d1b-bf8d-4a82-bb84-791e93be0e66","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"f2512b2a-a43d-4c58-b0c6-11431094a257","name":"f2512b2a-a43d-4c58-b0c6-11431094a257","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"d14d60dc-3cad-4f33-ab49-c6c5aa26343d","name":"d14d60dc-3cad-4f33-ab49-c6c5aa26343d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"c50735d8-7c0e-4d82-bbf2-f1695a62e5fb","name":"c50735d8-7c0e-4d82-bbf2-f1695a62e5fb","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"8045ea39-103b-4f28-ac8f-8c4e6826fbb7","name":"8045ea39-103b-4f28-ac8f-8c4e6826fbb7","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"98e46c57-e2c4-40cc-be18-0d9c957f9ddc","name":"98e46c57-e2c4-40cc-be18-0d9c957f9ddc","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"1674be3c-5769-44c3-81e8-c574d1aada7e","name":"1674be3c-5769-44c3-81e8-c574d1aada7e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"dc91e6af-a580-481b-86d8-2218efdf1bd4","name":"dc91e6af-a580-481b-86d8-2218efdf1bd4","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"2c6619ce-8999-4deb-8866-715dbad4ebfb","name":"2c6619ce-8999-4deb-8866-715dbad4ebfb","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"73dfb102-c129-4c22-94b5-873f24246195","name":"73dfb102-c129-4c22-94b5-873f24246195","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"e7d2a384-1c48-41be-9909-2cc16a84f88f","name":"e7d2a384-1c48-41be-9909-2cc16a84f88f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"f154861b-1ec2-4b0d-b3db-606ee8c7378b","name":"f154861b-1ec2-4b0d-b3db-606ee8c7378b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"2a106682-8b51-41e2-b785-e56933172957","name":"2a106682-8b51-41e2-b785-e56933172957","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"4f7466f3-22ea-434b-b759-14d8cf633d6b","name":"4f7466f3-22ea-434b-b759-14d8cf633d6b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"59c3df88-024a-4d43-9eb6-479b616a5a8f","name":"59c3df88-024a-4d43-9eb6-479b616a5a8f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"f798c093-387b-4249-9e78-21c3cf42ab6a","name":"f798c093-387b-4249-9e78-21c3cf42ab6a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"6334a270-feae-41eb-bfcb-27bddb85fc08","name":"6334a270-feae-41eb-bfcb-27bddb85fc08","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"789c3d1b-bf8d-4a82-bb84-791e93be0e66","name":"789c3d1b-bf8d-4a82-bb84-791e93be0e66","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"f2512b2a-a43d-4c58-b0c6-11431094a257","name":"f2512b2a-a43d-4c58-b0c6-11431094a257","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"d14d60dc-3cad-4f33-ab49-c6c5aa26343d","name":"d14d60dc-3cad-4f33-ab49-c6c5aa26343d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"c50735d8-7c0e-4d82-bbf2-f1695a62e5fb","name":"c50735d8-7c0e-4d82-bbf2-f1695a62e5fb","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"8045ea39-103b-4f28-ac8f-8c4e6826fbb7","name":"8045ea39-103b-4f28-ac8f-8c4e6826fbb7","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -86,57 +86,23 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"98e46c57-e2c4-40cc-be18-0d9c957f9ddc","path":"sprites/spr_mar_collision/spr_mar_collision.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"ef388b7f-ba09-4d17-a004-a92fcdb86fbf","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"1674be3c-5769-44c3-81e8-c574d1aada7e","path":"sprites/spr_mar_collision/spr_mar_collision.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"344d8112-ce2c-434d-8738-3f0b8c8b01fd","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"dc91e6af-a580-481b-86d8-2218efdf1bd4","path":"sprites/spr_mar_collision/spr_mar_collision.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"91d37893-4565-49d2-a9a7-3db7befd7eda","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"2c6619ce-8999-4deb-8866-715dbad4ebfb","path":"sprites/spr_mar_collision/spr_mar_collision.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"d5047741-bf2a-419e-a4f4-56ab24e09b01","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"73dfb102-c129-4c22-94b5-873f24246195","path":"sprites/spr_mar_collision/spr_mar_collision.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"53f64345-c8a5-445e-830a-b9e5bdd8cfac","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"e7d2a384-1c48-41be-9909-2cc16a84f88f","path":"sprites/spr_mar_collision/spr_mar_collision.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"303eef0a-81fd-4e4f-981b-e1e710e6f662","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"f154861b-1ec2-4b0d-b3db-606ee8c7378b","path":"sprites/spr_mar_collision/spr_mar_collision.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"7985c880-8351-4466-b139-e36ebf2d647d","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"2a106682-8b51-41e2-b785-e56933172957","path":"sprites/spr_mar_collision/spr_mar_collision.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"d2ca48f5-06fa-4dea-9913-90f27af95398","IsCreationKey":false,"Key":7.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"4f7466f3-22ea-434b-b759-14d8cf633d6b","path":"sprites/spr_mar_collision/spr_mar_collision.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"0c433fd3-2fd0-4d7a-acf7-0e422f71be5c","IsCreationKey":false,"Key":8.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"59c3df88-024a-4d43-9eb6-479b616a5a8f","path":"sprites/spr_mar_collision/spr_mar_collision.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"6f604799-de6e-4458-8af2-294213d98556","IsCreationKey":false,"Key":9.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"f798c093-387b-4249-9e78-21c3cf42ab6a","path":"sprites/spr_mar_collision/spr_mar_collision.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"96b94c6e-13fe-4a6e-86ba-9f2cbad8ab00","IsCreationKey":false,"Key":10.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"6334a270-feae-41eb-bfcb-27bddb85fc08","path":"sprites/spr_mar_collision/spr_mar_collision.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"e0142ec8-d841-48cb-936e-82a13956511f","IsCreationKey":false,"Key":11.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"789c3d1b-bf8d-4a82-bb84-791e93be0e66","path":"sprites/spr_mar_collision/spr_mar_collision.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"ebeff04f-5606-4d71-993e-558cbedac30b","IsCreationKey":false,"Key":12.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"f2512b2a-a43d-4c58-b0c6-11431094a257","path":"sprites/spr_mar_collision/spr_mar_collision.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"9505c8f1-0494-4159-ac5d-da5869ecc711","IsCreationKey":false,"Key":13.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"d14d60dc-3cad-4f33-ab49-c6c5aa26343d","path":"sprites/spr_mar_collision/spr_mar_collision.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"71124f4a-45df-4a75-b534-7cbedb524849","IsCreationKey":false,"Key":14.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"c50735d8-7c0e-4d82-bbf2-f1695a62e5fb","path":"sprites/spr_mar_collision/spr_mar_collision.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"dfa989b8-a09a-4f2a-8a74-d5dcbdb904a5","IsCreationKey":false,"Key":15.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"8045ea39-103b-4f28-ac8f-8c4e6826fbb7","path":"sprites/spr_mar_collision/spr_mar_collision.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"00599ad0-601a-4cb3-9583-e321154407ec","IsCreationKey":false,"Key":16.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"98e46c57-e2c4-40cc-be18-0d9c957f9ddc","path":"sprites/spr_mar_collision/spr_mar_collision.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"ef388b7f-ba09-4d17-a004-a92fcdb86fbf","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"1674be3c-5769-44c3-81e8-c574d1aada7e","path":"sprites/spr_mar_collision/spr_mar_collision.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"344d8112-ce2c-434d-8738-3f0b8c8b01fd","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"dc91e6af-a580-481b-86d8-2218efdf1bd4","path":"sprites/spr_mar_collision/spr_mar_collision.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"91d37893-4565-49d2-a9a7-3db7befd7eda","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"2c6619ce-8999-4deb-8866-715dbad4ebfb","path":"sprites/spr_mar_collision/spr_mar_collision.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"d5047741-bf2a-419e-a4f4-56ab24e09b01","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"73dfb102-c129-4c22-94b5-873f24246195","path":"sprites/spr_mar_collision/spr_mar_collision.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"53f64345-c8a5-445e-830a-b9e5bdd8cfac","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"e7d2a384-1c48-41be-9909-2cc16a84f88f","path":"sprites/spr_mar_collision/spr_mar_collision.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"303eef0a-81fd-4e4f-981b-e1e710e6f662","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"f154861b-1ec2-4b0d-b3db-606ee8c7378b","path":"sprites/spr_mar_collision/spr_mar_collision.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"7985c880-8351-4466-b139-e36ebf2d647d","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"2a106682-8b51-41e2-b785-e56933172957","path":"sprites/spr_mar_collision/spr_mar_collision.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"d2ca48f5-06fa-4dea-9913-90f27af95398","IsCreationKey":false,"Key":7.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"4f7466f3-22ea-434b-b759-14d8cf633d6b","path":"sprites/spr_mar_collision/spr_mar_collision.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"0c433fd3-2fd0-4d7a-acf7-0e422f71be5c","IsCreationKey":false,"Key":8.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"59c3df88-024a-4d43-9eb6-479b616a5a8f","path":"sprites/spr_mar_collision/spr_mar_collision.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"6f604799-de6e-4458-8af2-294213d98556","IsCreationKey":false,"Key":9.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"f798c093-387b-4249-9e78-21c3cf42ab6a","path":"sprites/spr_mar_collision/spr_mar_collision.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"96b94c6e-13fe-4a6e-86ba-9f2cbad8ab00","IsCreationKey":false,"Key":10.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"6334a270-feae-41eb-bfcb-27bddb85fc08","path":"sprites/spr_mar_collision/spr_mar_collision.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"e0142ec8-d841-48cb-936e-82a13956511f","IsCreationKey":false,"Key":11.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"789c3d1b-bf8d-4a82-bb84-791e93be0e66","path":"sprites/spr_mar_collision/spr_mar_collision.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"ebeff04f-5606-4d71-993e-558cbedac30b","IsCreationKey":false,"Key":12.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"f2512b2a-a43d-4c58-b0c6-11431094a257","path":"sprites/spr_mar_collision/spr_mar_collision.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"9505c8f1-0494-4159-ac5d-da5869ecc711","IsCreationKey":false,"Key":13.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"d14d60dc-3cad-4f33-ab49-c6c5aa26343d","path":"sprites/spr_mar_collision/spr_mar_collision.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"71124f4a-45df-4a75-b534-7cbedb524849","IsCreationKey":false,"Key":14.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"c50735d8-7c0e-4d82-bbf2-f1695a62e5fb","path":"sprites/spr_mar_collision/spr_mar_collision.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"dfa989b8-a09a-4f2a-8a74-d5dcbdb904a5","IsCreationKey":false,"Key":15.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"8045ea39-103b-4f28-ac8f-8c4e6826fbb7","path":"sprites/spr_mar_collision/spr_mar_collision.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"00599ad0-601a-4cb3-9583-e321154407ec","IsCreationKey":false,"Key":16.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_mar_fire_body1/spr_mar_fire_body1.yy b/sprites/spr_mar_fire_body1/spr_mar_fire_body1.yy index a5d2f2defb..e4bd9e51aa 100644 --- a/sprites/spr_mar_fire_body1/spr_mar_fire_body1.yy +++ b/sprites/spr_mar_fire_body1/spr_mar_fire_body1.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_mar_fire_body1", "bboxMode":0, "bbox_bottom":21, @@ -12,10 +12,10 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"01affcad-7536-4bf5-b69f-c617ef77ee73","name":"01affcad-7536-4bf5-b69f-c617ef77ee73","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"df131e14-4494-465a-8c50-27ba2e8f8e85","name":"df131e14-4494-465a-8c50-27ba2e8f8e85","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"86691a2b-a73b-4513-9f17-c8bcadf34ff7","name":"86691a2b-a73b-4513-9f17-c8bcadf34ff7","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"28560d18-6336-4c17-b74a-90012673caf8","name":"28560d18-6336-4c17-b74a-90012673caf8","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"01affcad-7536-4bf5-b69f-c617ef77ee73","name":"01affcad-7536-4bf5-b69f-c617ef77ee73","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"df131e14-4494-465a-8c50-27ba2e8f8e85","name":"df131e14-4494-465a-8c50-27ba2e8f8e85","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"86691a2b-a73b-4513-9f17-c8bcadf34ff7","name":"86691a2b-a73b-4513-9f17-c8bcadf34ff7","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"28560d18-6336-4c17-b74a-90012673caf8","name":"28560d18-6336-4c17-b74a-90012673caf8","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -71,18 +71,10 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"01affcad-7536-4bf5-b69f-c617ef77ee73","path":"sprites/spr_mar_fire_body1/spr_mar_fire_body1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"ea94f0b1-bd27-4e6e-8da4-b55352effd08","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"df131e14-4494-465a-8c50-27ba2e8f8e85","path":"sprites/spr_mar_fire_body1/spr_mar_fire_body1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"2cbd5256-4d85-4a0c-9612-a24c946faa34","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"86691a2b-a73b-4513-9f17-c8bcadf34ff7","path":"sprites/spr_mar_fire_body1/spr_mar_fire_body1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"dd3eda7e-1232-4176-b9b0-ba25bcbb3c68","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"28560d18-6336-4c17-b74a-90012673caf8","path":"sprites/spr_mar_fire_body1/spr_mar_fire_body1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"150b7f86-89d2-44f7-b072-e0a61d54d8d4","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"01affcad-7536-4bf5-b69f-c617ef77ee73","path":"sprites/spr_mar_fire_body1/spr_mar_fire_body1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"ea94f0b1-bd27-4e6e-8da4-b55352effd08","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"df131e14-4494-465a-8c50-27ba2e8f8e85","path":"sprites/spr_mar_fire_body1/spr_mar_fire_body1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"2cbd5256-4d85-4a0c-9612-a24c946faa34","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"86691a2b-a73b-4513-9f17-c8bcadf34ff7","path":"sprites/spr_mar_fire_body1/spr_mar_fire_body1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"dd3eda7e-1232-4176-b9b0-ba25bcbb3c68","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"28560d18-6336-4c17-b74a-90012673caf8","path":"sprites/spr_mar_fire_body1/spr_mar_fire_body1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"150b7f86-89d2-44f7-b072-e0a61d54d8d4","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":{ diff --git a/sprites/spr_mar_fire_body2/spr_mar_fire_body2.yy b/sprites/spr_mar_fire_body2/spr_mar_fire_body2.yy index 863019f48d..1db99b3123 100644 --- a/sprites/spr_mar_fire_body2/spr_mar_fire_body2.yy +++ b/sprites/spr_mar_fire_body2/spr_mar_fire_body2.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_mar_fire_body2", "bboxMode":0, "bbox_bottom":21, @@ -12,10 +12,10 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"38210a5c-143d-47db-89c1-09ba5ae9e1c3","name":"38210a5c-143d-47db-89c1-09ba5ae9e1c3","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"fc78904a-61cb-4bbe-9320-d5b4d0939fbe","name":"fc78904a-61cb-4bbe-9320-d5b4d0939fbe","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"8c4d598b-ad21-4c5c-b58d-98a36755c3da","name":"8c4d598b-ad21-4c5c-b58d-98a36755c3da","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"43151143-33ae-4b30-b675-230f6d4b65c3","name":"43151143-33ae-4b30-b675-230f6d4b65c3","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"38210a5c-143d-47db-89c1-09ba5ae9e1c3","name":"38210a5c-143d-47db-89c1-09ba5ae9e1c3","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"fc78904a-61cb-4bbe-9320-d5b4d0939fbe","name":"fc78904a-61cb-4bbe-9320-d5b4d0939fbe","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"8c4d598b-ad21-4c5c-b58d-98a36755c3da","name":"8c4d598b-ad21-4c5c-b58d-98a36755c3da","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"43151143-33ae-4b30-b675-230f6d4b65c3","name":"43151143-33ae-4b30-b675-230f6d4b65c3","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -71,18 +71,10 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"38210a5c-143d-47db-89c1-09ba5ae9e1c3","path":"sprites/spr_mar_fire_body2/spr_mar_fire_body2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"07897a39-2fbd-409b-87f4-1cd3904179c1","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"fc78904a-61cb-4bbe-9320-d5b4d0939fbe","path":"sprites/spr_mar_fire_body2/spr_mar_fire_body2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"224c5f12-1b61-43fa-bef0-898d61d48471","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"8c4d598b-ad21-4c5c-b58d-98a36755c3da","path":"sprites/spr_mar_fire_body2/spr_mar_fire_body2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"f3637fc5-96d0-40da-974a-6a478148f4bd","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"43151143-33ae-4b30-b675-230f6d4b65c3","path":"sprites/spr_mar_fire_body2/spr_mar_fire_body2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"c415e46f-1c71-4842-9cf3-0191411cba7a","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"38210a5c-143d-47db-89c1-09ba5ae9e1c3","path":"sprites/spr_mar_fire_body2/spr_mar_fire_body2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"07897a39-2fbd-409b-87f4-1cd3904179c1","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"fc78904a-61cb-4bbe-9320-d5b4d0939fbe","path":"sprites/spr_mar_fire_body2/spr_mar_fire_body2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"224c5f12-1b61-43fa-bef0-898d61d48471","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"8c4d598b-ad21-4c5c-b58d-98a36755c3da","path":"sprites/spr_mar_fire_body2/spr_mar_fire_body2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"f3637fc5-96d0-40da-974a-6a478148f4bd","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"43151143-33ae-4b30-b675-230f6d4b65c3","path":"sprites/spr_mar_fire_body2/spr_mar_fire_body2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"c415e46f-1c71-4842-9cf3-0191411cba7a","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":{ diff --git a/sprites/spr_mar_fire_body3/spr_mar_fire_body3.yy b/sprites/spr_mar_fire_body3/spr_mar_fire_body3.yy index 304c0067d2..00e5ad146e 100644 --- a/sprites/spr_mar_fire_body3/spr_mar_fire_body3.yy +++ b/sprites/spr_mar_fire_body3/spr_mar_fire_body3.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_mar_fire_body3", "bboxMode":0, "bbox_bottom":21, @@ -12,10 +12,10 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"72fa21ad-3151-4426-8d7a-193683cf4ffb","name":"72fa21ad-3151-4426-8d7a-193683cf4ffb","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"047ad514-4829-45b0-b1e3-4df5ec519c30","name":"047ad514-4829-45b0-b1e3-4df5ec519c30","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"8a15141a-5786-4c79-9fde-b10c457a32e8","name":"8a15141a-5786-4c79-9fde-b10c457a32e8","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"cfb8c2c7-f509-4ab5-9f9d-7d8eeab20312","name":"cfb8c2c7-f509-4ab5-9f9d-7d8eeab20312","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"72fa21ad-3151-4426-8d7a-193683cf4ffb","name":"72fa21ad-3151-4426-8d7a-193683cf4ffb","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"047ad514-4829-45b0-b1e3-4df5ec519c30","name":"047ad514-4829-45b0-b1e3-4df5ec519c30","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"8a15141a-5786-4c79-9fde-b10c457a32e8","name":"8a15141a-5786-4c79-9fde-b10c457a32e8","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"cfb8c2c7-f509-4ab5-9f9d-7d8eeab20312","name":"cfb8c2c7-f509-4ab5-9f9d-7d8eeab20312","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -71,18 +71,10 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"72fa21ad-3151-4426-8d7a-193683cf4ffb","path":"sprites/spr_mar_fire_body3/spr_mar_fire_body3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"1ba287f0-053e-46d5-a151-03d599b06430","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"047ad514-4829-45b0-b1e3-4df5ec519c30","path":"sprites/spr_mar_fire_body3/spr_mar_fire_body3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"3b35e38a-df41-43e4-8738-49c0596d86a8","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"8a15141a-5786-4c79-9fde-b10c457a32e8","path":"sprites/spr_mar_fire_body3/spr_mar_fire_body3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"26713e1c-51b7-458c-aa43-e7621843eb88","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"cfb8c2c7-f509-4ab5-9f9d-7d8eeab20312","path":"sprites/spr_mar_fire_body3/spr_mar_fire_body3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"b3f3c26e-0b7a-4e8a-8f75-067fb1384a68","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"72fa21ad-3151-4426-8d7a-193683cf4ffb","path":"sprites/spr_mar_fire_body3/spr_mar_fire_body3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"1ba287f0-053e-46d5-a151-03d599b06430","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"047ad514-4829-45b0-b1e3-4df5ec519c30","path":"sprites/spr_mar_fire_body3/spr_mar_fire_body3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"3b35e38a-df41-43e4-8738-49c0596d86a8","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"8a15141a-5786-4c79-9fde-b10c457a32e8","path":"sprites/spr_mar_fire_body3/spr_mar_fire_body3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"26713e1c-51b7-458c-aa43-e7621843eb88","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"cfb8c2c7-f509-4ab5-9f9d-7d8eeab20312","path":"sprites/spr_mar_fire_body3/spr_mar_fire_body3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"b3f3c26e-0b7a-4e8a-8f75-067fb1384a68","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":{ diff --git a/sprites/spr_mar_fire_pauldron1/spr_mar_fire_pauldron1.yy b/sprites/spr_mar_fire_pauldron1/spr_mar_fire_pauldron1.yy index 3ccc4d77a4..af173ce4a3 100644 --- a/sprites/spr_mar_fire_pauldron1/spr_mar_fire_pauldron1.yy +++ b/sprites/spr_mar_fire_pauldron1/spr_mar_fire_pauldron1.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_mar_fire_pauldron1", "bboxMode":0, "bbox_bottom":12, @@ -12,10 +12,10 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"44561e3e-695b-42b6-a9cb-05df7b491263","name":"44561e3e-695b-42b6-a9cb-05df7b491263","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"0fb87477-e686-4d73-9109-792d5902591b","name":"0fb87477-e686-4d73-9109-792d5902591b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"4f1d4ecd-4b1c-45ba-8259-8a7bad6ceebf","name":"4f1d4ecd-4b1c-45ba-8259-8a7bad6ceebf","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"15ca85c2-a667-484b-ad43-0519cbbe3ad6","name":"15ca85c2-a667-484b-ad43-0519cbbe3ad6","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"44561e3e-695b-42b6-a9cb-05df7b491263","name":"44561e3e-695b-42b6-a9cb-05df7b491263","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"0fb87477-e686-4d73-9109-792d5902591b","name":"0fb87477-e686-4d73-9109-792d5902591b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"4f1d4ecd-4b1c-45ba-8259-8a7bad6ceebf","name":"4f1d4ecd-4b1c-45ba-8259-8a7bad6ceebf","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"15ca85c2-a667-484b-ad43-0519cbbe3ad6","name":"15ca85c2-a667-484b-ad43-0519cbbe3ad6","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -71,18 +71,10 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"44561e3e-695b-42b6-a9cb-05df7b491263","path":"sprites/spr_mar_fire_pauldron1/spr_mar_fire_pauldron1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"9837af83-5d30-4704-83f5-4237d2aa22f5","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"0fb87477-e686-4d73-9109-792d5902591b","path":"sprites/spr_mar_fire_pauldron1/spr_mar_fire_pauldron1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"1fa1abe3-4d15-47ab-bf7b-87858dcd3a03","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"4f1d4ecd-4b1c-45ba-8259-8a7bad6ceebf","path":"sprites/spr_mar_fire_pauldron1/spr_mar_fire_pauldron1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"1d998a60-9a9c-4668-acdf-6a912756b3d5","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"15ca85c2-a667-484b-ad43-0519cbbe3ad6","path":"sprites/spr_mar_fire_pauldron1/spr_mar_fire_pauldron1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"b8188cdf-b45d-4742-8d5b-2d124a5dc1ce","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"44561e3e-695b-42b6-a9cb-05df7b491263","path":"sprites/spr_mar_fire_pauldron1/spr_mar_fire_pauldron1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"9837af83-5d30-4704-83f5-4237d2aa22f5","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"0fb87477-e686-4d73-9109-792d5902591b","path":"sprites/spr_mar_fire_pauldron1/spr_mar_fire_pauldron1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"1fa1abe3-4d15-47ab-bf7b-87858dcd3a03","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"4f1d4ecd-4b1c-45ba-8259-8a7bad6ceebf","path":"sprites/spr_mar_fire_pauldron1/spr_mar_fire_pauldron1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"1d998a60-9a9c-4668-acdf-6a912756b3d5","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"15ca85c2-a667-484b-ad43-0519cbbe3ad6","path":"sprites/spr_mar_fire_pauldron1/spr_mar_fire_pauldron1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"b8188cdf-b45d-4742-8d5b-2d124a5dc1ce","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":{ diff --git a/sprites/spr_mar_fire_pauldron2/spr_mar_fire_pauldron2.yy b/sprites/spr_mar_fire_pauldron2/spr_mar_fire_pauldron2.yy index b5e2481570..0ef765296c 100644 --- a/sprites/spr_mar_fire_pauldron2/spr_mar_fire_pauldron2.yy +++ b/sprites/spr_mar_fire_pauldron2/spr_mar_fire_pauldron2.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_mar_fire_pauldron2", "bboxMode":0, "bbox_bottom":12, @@ -12,10 +12,10 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"15b8fe75-8faf-415b-97e1-fd9046dd1092","name":"15b8fe75-8faf-415b-97e1-fd9046dd1092","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"3ffac56e-c40f-4bc1-baf7-88dea80e1614","name":"3ffac56e-c40f-4bc1-baf7-88dea80e1614","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"38bc760b-cb19-45ae-b9db-808873773b0d","name":"38bc760b-cb19-45ae-b9db-808873773b0d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"ccd8433e-0945-4f53-abd2-ccc162d812f8","name":"ccd8433e-0945-4f53-abd2-ccc162d812f8","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"15b8fe75-8faf-415b-97e1-fd9046dd1092","name":"15b8fe75-8faf-415b-97e1-fd9046dd1092","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"3ffac56e-c40f-4bc1-baf7-88dea80e1614","name":"3ffac56e-c40f-4bc1-baf7-88dea80e1614","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"38bc760b-cb19-45ae-b9db-808873773b0d","name":"38bc760b-cb19-45ae-b9db-808873773b0d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"ccd8433e-0945-4f53-abd2-ccc162d812f8","name":"ccd8433e-0945-4f53-abd2-ccc162d812f8","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -71,18 +71,10 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"15b8fe75-8faf-415b-97e1-fd9046dd1092","path":"sprites/spr_mar_fire_pauldron2/spr_mar_fire_pauldron2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"a47727c0-b49a-4dce-bcd4-8d0a92a7b96e","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"3ffac56e-c40f-4bc1-baf7-88dea80e1614","path":"sprites/spr_mar_fire_pauldron2/spr_mar_fire_pauldron2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"130b5dd0-bbb1-4dab-9cf6-0dd46d30e73e","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"38bc760b-cb19-45ae-b9db-808873773b0d","path":"sprites/spr_mar_fire_pauldron2/spr_mar_fire_pauldron2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"46768cec-37de-4e55-9143-ceb57239d74a","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"ccd8433e-0945-4f53-abd2-ccc162d812f8","path":"sprites/spr_mar_fire_pauldron2/spr_mar_fire_pauldron2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"a9a12232-13cf-430e-8a54-4e19517033eb","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"15b8fe75-8faf-415b-97e1-fd9046dd1092","path":"sprites/spr_mar_fire_pauldron2/spr_mar_fire_pauldron2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"a47727c0-b49a-4dce-bcd4-8d0a92a7b96e","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"3ffac56e-c40f-4bc1-baf7-88dea80e1614","path":"sprites/spr_mar_fire_pauldron2/spr_mar_fire_pauldron2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"130b5dd0-bbb1-4dab-9cf6-0dd46d30e73e","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"38bc760b-cb19-45ae-b9db-808873773b0d","path":"sprites/spr_mar_fire_pauldron2/spr_mar_fire_pauldron2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"46768cec-37de-4e55-9143-ceb57239d74a","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"ccd8433e-0945-4f53-abd2-ccc162d812f8","path":"sprites/spr_mar_fire_pauldron2/spr_mar_fire_pauldron2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"a9a12232-13cf-430e-8a54-4e19517033eb","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":{ diff --git a/sprites/spr_mar_walk_body1/spr_mar_walk_body1.yy b/sprites/spr_mar_walk_body1/spr_mar_walk_body1.yy index 6af9cb58e3..cf71eeaece 100644 --- a/sprites/spr_mar_walk_body1/spr_mar_walk_body1.yy +++ b/sprites/spr_mar_walk_body1/spr_mar_walk_body1.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_mar_walk_body1", "bboxMode":0, "bbox_bottom":23, @@ -12,23 +12,23 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"90e1e875-f064-4f29-ab11-2d784ff7b6a5","name":"90e1e875-f064-4f29-ab11-2d784ff7b6a5","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"3bfb1a68-d8d5-4eb4-818b-67979dcc8f38","name":"3bfb1a68-d8d5-4eb4-818b-67979dcc8f38","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"cc7f4a26-46c8-4137-90ff-52f0a474323b","name":"cc7f4a26-46c8-4137-90ff-52f0a474323b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"c3b365d2-f0c9-4b82-8668-a1a14f3a9ff8","name":"c3b365d2-f0c9-4b82-8668-a1a14f3a9ff8","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"2654f12c-02e1-44c3-9902-4fea338cc91d","name":"2654f12c-02e1-44c3-9902-4fea338cc91d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"74ba2eae-27b1-4937-af8b-a963929d1dc7","name":"74ba2eae-27b1-4937-af8b-a963929d1dc7","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"e8887d72-3dff-4109-9420-cbb8d7e93dc3","name":"e8887d72-3dff-4109-9420-cbb8d7e93dc3","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"68deea30-4635-4fca-bfcb-c630cdf2ee48","name":"68deea30-4635-4fca-bfcb-c630cdf2ee48","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"941bdb8d-1fd3-47c3-80fd-e60cadd36344","name":"941bdb8d-1fd3-47c3-80fd-e60cadd36344","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"1f952ea3-eaaa-4446-935d-8de3733d898f","name":"1f952ea3-eaaa-4446-935d-8de3733d898f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"f4e33722-8245-4eb1-a2dc-8c71c2dde44b","name":"f4e33722-8245-4eb1-a2dc-8c71c2dde44b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"045820a2-27c8-4a17-9860-ed379673f5f8","name":"045820a2-27c8-4a17-9860-ed379673f5f8","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"8e2b012c-2123-414b-b3f2-3b91c062e3d8","name":"8e2b012c-2123-414b-b3f2-3b91c062e3d8","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"d2bb8428-0e2e-40c3-97d5-36f938701f6e","name":"d2bb8428-0e2e-40c3-97d5-36f938701f6e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"c227c5fc-e20f-4a40-a4df-15d58e99e0b6","name":"c227c5fc-e20f-4a40-a4df-15d58e99e0b6","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"972c5fb8-c64d-4f45-ab78-e01aa6f532e2","name":"972c5fb8-c64d-4f45-ab78-e01aa6f532e2","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"b9fc0b41-f1ab-489a-88ea-11a8bf17698a","name":"b9fc0b41-f1ab-489a-88ea-11a8bf17698a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"90e1e875-f064-4f29-ab11-2d784ff7b6a5","name":"90e1e875-f064-4f29-ab11-2d784ff7b6a5","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"3bfb1a68-d8d5-4eb4-818b-67979dcc8f38","name":"3bfb1a68-d8d5-4eb4-818b-67979dcc8f38","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"cc7f4a26-46c8-4137-90ff-52f0a474323b","name":"cc7f4a26-46c8-4137-90ff-52f0a474323b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"c3b365d2-f0c9-4b82-8668-a1a14f3a9ff8","name":"c3b365d2-f0c9-4b82-8668-a1a14f3a9ff8","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"2654f12c-02e1-44c3-9902-4fea338cc91d","name":"2654f12c-02e1-44c3-9902-4fea338cc91d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"74ba2eae-27b1-4937-af8b-a963929d1dc7","name":"74ba2eae-27b1-4937-af8b-a963929d1dc7","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"e8887d72-3dff-4109-9420-cbb8d7e93dc3","name":"e8887d72-3dff-4109-9420-cbb8d7e93dc3","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"68deea30-4635-4fca-bfcb-c630cdf2ee48","name":"68deea30-4635-4fca-bfcb-c630cdf2ee48","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"941bdb8d-1fd3-47c3-80fd-e60cadd36344","name":"941bdb8d-1fd3-47c3-80fd-e60cadd36344","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"1f952ea3-eaaa-4446-935d-8de3733d898f","name":"1f952ea3-eaaa-4446-935d-8de3733d898f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"f4e33722-8245-4eb1-a2dc-8c71c2dde44b","name":"f4e33722-8245-4eb1-a2dc-8c71c2dde44b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"045820a2-27c8-4a17-9860-ed379673f5f8","name":"045820a2-27c8-4a17-9860-ed379673f5f8","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"8e2b012c-2123-414b-b3f2-3b91c062e3d8","name":"8e2b012c-2123-414b-b3f2-3b91c062e3d8","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"d2bb8428-0e2e-40c3-97d5-36f938701f6e","name":"d2bb8428-0e2e-40c3-97d5-36f938701f6e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"c227c5fc-e20f-4a40-a4df-15d58e99e0b6","name":"c227c5fc-e20f-4a40-a4df-15d58e99e0b6","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"972c5fb8-c64d-4f45-ab78-e01aa6f532e2","name":"972c5fb8-c64d-4f45-ab78-e01aa6f532e2","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"b9fc0b41-f1ab-489a-88ea-11a8bf17698a","name":"b9fc0b41-f1ab-489a-88ea-11a8bf17698a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -84,57 +84,23 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"90e1e875-f064-4f29-ab11-2d784ff7b6a5","path":"sprites/spr_mar_walk_body1/spr_mar_walk_body1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"791b0399-0529-41db-837e-2956828ca90b","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"3bfb1a68-d8d5-4eb4-818b-67979dcc8f38","path":"sprites/spr_mar_walk_body1/spr_mar_walk_body1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"c0b9fa42-7067-4a16-81cc-3f210c3c2676","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"cc7f4a26-46c8-4137-90ff-52f0a474323b","path":"sprites/spr_mar_walk_body1/spr_mar_walk_body1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"bd5ff78c-1e07-4b5a-8732-b18dffba7d50","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"c3b365d2-f0c9-4b82-8668-a1a14f3a9ff8","path":"sprites/spr_mar_walk_body1/spr_mar_walk_body1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"1f39d291-581a-4340-9f54-230ecdf3c0bd","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"2654f12c-02e1-44c3-9902-4fea338cc91d","path":"sprites/spr_mar_walk_body1/spr_mar_walk_body1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"255720a5-147d-4039-b072-2c4e4b4d0b32","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"74ba2eae-27b1-4937-af8b-a963929d1dc7","path":"sprites/spr_mar_walk_body1/spr_mar_walk_body1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"d771123e-76c3-4acf-aac8-cc7b6409a83d","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"e8887d72-3dff-4109-9420-cbb8d7e93dc3","path":"sprites/spr_mar_walk_body1/spr_mar_walk_body1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"59118366-e90b-41ca-91af-b8618a336f0b","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"68deea30-4635-4fca-bfcb-c630cdf2ee48","path":"sprites/spr_mar_walk_body1/spr_mar_walk_body1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"41220da6-5d68-484c-8b2a-a0388b76c77f","IsCreationKey":false,"Key":7.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"941bdb8d-1fd3-47c3-80fd-e60cadd36344","path":"sprites/spr_mar_walk_body1/spr_mar_walk_body1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"0abe53ee-c1c9-4253-8978-f1d051c031b6","IsCreationKey":false,"Key":8.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"1f952ea3-eaaa-4446-935d-8de3733d898f","path":"sprites/spr_mar_walk_body1/spr_mar_walk_body1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"bcf64e1d-590e-41bb-87b2-4c79d4a9f895","IsCreationKey":false,"Key":9.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"f4e33722-8245-4eb1-a2dc-8c71c2dde44b","path":"sprites/spr_mar_walk_body1/spr_mar_walk_body1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"1841081d-3a92-4307-9db8-fb088ed65cc0","IsCreationKey":false,"Key":10.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"045820a2-27c8-4a17-9860-ed379673f5f8","path":"sprites/spr_mar_walk_body1/spr_mar_walk_body1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"1bf2917b-f8eb-4fd8-934b-9f8a1abc5f7b","IsCreationKey":false,"Key":11.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"8e2b012c-2123-414b-b3f2-3b91c062e3d8","path":"sprites/spr_mar_walk_body1/spr_mar_walk_body1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"becb79e7-b8c1-4d16-94a5-89ac8fe8979c","IsCreationKey":false,"Key":12.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"d2bb8428-0e2e-40c3-97d5-36f938701f6e","path":"sprites/spr_mar_walk_body1/spr_mar_walk_body1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"cfdabb68-ba40-430e-8592-c01b9cad91aa","IsCreationKey":false,"Key":13.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"c227c5fc-e20f-4a40-a4df-15d58e99e0b6","path":"sprites/spr_mar_walk_body1/spr_mar_walk_body1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"6ab92e60-55c3-4950-b118-8083482f48c9","IsCreationKey":false,"Key":14.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"972c5fb8-c64d-4f45-ab78-e01aa6f532e2","path":"sprites/spr_mar_walk_body1/spr_mar_walk_body1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"873c8618-4057-4d64-bbee-574285f38f6a","IsCreationKey":false,"Key":15.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"b9fc0b41-f1ab-489a-88ea-11a8bf17698a","path":"sprites/spr_mar_walk_body1/spr_mar_walk_body1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"a302f0b2-b45a-46cc-93ed-04b24e2a1c90","IsCreationKey":false,"Key":16.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"90e1e875-f064-4f29-ab11-2d784ff7b6a5","path":"sprites/spr_mar_walk_body1/spr_mar_walk_body1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"791b0399-0529-41db-837e-2956828ca90b","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"3bfb1a68-d8d5-4eb4-818b-67979dcc8f38","path":"sprites/spr_mar_walk_body1/spr_mar_walk_body1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"c0b9fa42-7067-4a16-81cc-3f210c3c2676","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"cc7f4a26-46c8-4137-90ff-52f0a474323b","path":"sprites/spr_mar_walk_body1/spr_mar_walk_body1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"bd5ff78c-1e07-4b5a-8732-b18dffba7d50","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"c3b365d2-f0c9-4b82-8668-a1a14f3a9ff8","path":"sprites/spr_mar_walk_body1/spr_mar_walk_body1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"1f39d291-581a-4340-9f54-230ecdf3c0bd","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"2654f12c-02e1-44c3-9902-4fea338cc91d","path":"sprites/spr_mar_walk_body1/spr_mar_walk_body1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"255720a5-147d-4039-b072-2c4e4b4d0b32","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"74ba2eae-27b1-4937-af8b-a963929d1dc7","path":"sprites/spr_mar_walk_body1/spr_mar_walk_body1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"d771123e-76c3-4acf-aac8-cc7b6409a83d","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"e8887d72-3dff-4109-9420-cbb8d7e93dc3","path":"sprites/spr_mar_walk_body1/spr_mar_walk_body1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"59118366-e90b-41ca-91af-b8618a336f0b","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"68deea30-4635-4fca-bfcb-c630cdf2ee48","path":"sprites/spr_mar_walk_body1/spr_mar_walk_body1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"41220da6-5d68-484c-8b2a-a0388b76c77f","IsCreationKey":false,"Key":7.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"941bdb8d-1fd3-47c3-80fd-e60cadd36344","path":"sprites/spr_mar_walk_body1/spr_mar_walk_body1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"0abe53ee-c1c9-4253-8978-f1d051c031b6","IsCreationKey":false,"Key":8.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"1f952ea3-eaaa-4446-935d-8de3733d898f","path":"sprites/spr_mar_walk_body1/spr_mar_walk_body1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"bcf64e1d-590e-41bb-87b2-4c79d4a9f895","IsCreationKey":false,"Key":9.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"f4e33722-8245-4eb1-a2dc-8c71c2dde44b","path":"sprites/spr_mar_walk_body1/spr_mar_walk_body1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"1841081d-3a92-4307-9db8-fb088ed65cc0","IsCreationKey":false,"Key":10.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"045820a2-27c8-4a17-9860-ed379673f5f8","path":"sprites/spr_mar_walk_body1/spr_mar_walk_body1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"1bf2917b-f8eb-4fd8-934b-9f8a1abc5f7b","IsCreationKey":false,"Key":11.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"8e2b012c-2123-414b-b3f2-3b91c062e3d8","path":"sprites/spr_mar_walk_body1/spr_mar_walk_body1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"becb79e7-b8c1-4d16-94a5-89ac8fe8979c","IsCreationKey":false,"Key":12.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"d2bb8428-0e2e-40c3-97d5-36f938701f6e","path":"sprites/spr_mar_walk_body1/spr_mar_walk_body1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"cfdabb68-ba40-430e-8592-c01b9cad91aa","IsCreationKey":false,"Key":13.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"c227c5fc-e20f-4a40-a4df-15d58e99e0b6","path":"sprites/spr_mar_walk_body1/spr_mar_walk_body1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"6ab92e60-55c3-4950-b118-8083482f48c9","IsCreationKey":false,"Key":14.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"972c5fb8-c64d-4f45-ab78-e01aa6f532e2","path":"sprites/spr_mar_walk_body1/spr_mar_walk_body1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"873c8618-4057-4d64-bbee-574285f38f6a","IsCreationKey":false,"Key":15.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"b9fc0b41-f1ab-489a-88ea-11a8bf17698a","path":"sprites/spr_mar_walk_body1/spr_mar_walk_body1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"a302f0b2-b45a-46cc-93ed-04b24e2a1c90","IsCreationKey":false,"Key":16.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":{ diff --git a/sprites/spr_mar_walk_body2/spr_mar_walk_body2.yy b/sprites/spr_mar_walk_body2/spr_mar_walk_body2.yy index 3effa2e49f..5fd0bf7a17 100644 --- a/sprites/spr_mar_walk_body2/spr_mar_walk_body2.yy +++ b/sprites/spr_mar_walk_body2/spr_mar_walk_body2.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_mar_walk_body2", "bboxMode":0, "bbox_bottom":23, @@ -12,23 +12,23 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"467523c5-1041-45cb-8d64-8e6050ce3f09","name":"467523c5-1041-45cb-8d64-8e6050ce3f09","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"066b0a13-b2c6-4823-bfa8-30d2732a2fc8","name":"066b0a13-b2c6-4823-bfa8-30d2732a2fc8","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"b12ffb2d-a3d9-4847-9ead-c0e7bf24a7a5","name":"b12ffb2d-a3d9-4847-9ead-c0e7bf24a7a5","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"27894834-ac2a-4345-b497-a51d1bf8ccf2","name":"27894834-ac2a-4345-b497-a51d1bf8ccf2","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"c00bec42-7e5f-4a1c-b625-a0a53066e6e2","name":"c00bec42-7e5f-4a1c-b625-a0a53066e6e2","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"b4c963d0-b475-4267-a887-fc3e016a2222","name":"b4c963d0-b475-4267-a887-fc3e016a2222","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"25a47dbf-754a-4a39-a8b9-f8913277ec00","name":"25a47dbf-754a-4a39-a8b9-f8913277ec00","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"50e9196c-59b5-4c30-aa86-fd9f37ccd7a3","name":"50e9196c-59b5-4c30-aa86-fd9f37ccd7a3","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"ad6b9726-05d8-443a-a232-84859891d411","name":"ad6b9726-05d8-443a-a232-84859891d411","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"1e481ea8-380e-441c-a6fa-d59987014d25","name":"1e481ea8-380e-441c-a6fa-d59987014d25","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"4387a9e7-f250-4afe-9e45-d3ad3d4f86d7","name":"4387a9e7-f250-4afe-9e45-d3ad3d4f86d7","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"b60ae3f9-a3b1-4e65-b222-ec853bc9fa0d","name":"b60ae3f9-a3b1-4e65-b222-ec853bc9fa0d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"7150c51c-937d-47d1-b5d2-7f3a3b82f5c5","name":"7150c51c-937d-47d1-b5d2-7f3a3b82f5c5","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"180a201d-8a4c-4ddc-b137-2fe7ff8a3f5c","name":"180a201d-8a4c-4ddc-b137-2fe7ff8a3f5c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"7e65cb8f-d2c1-40f8-87a0-880d3fb252ba","name":"7e65cb8f-d2c1-40f8-87a0-880d3fb252ba","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"07e2c5b6-a398-42be-8d89-87492926392c","name":"07e2c5b6-a398-42be-8d89-87492926392c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"03f517fd-fe76-4a54-9034-88e734e84398","name":"03f517fd-fe76-4a54-9034-88e734e84398","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"467523c5-1041-45cb-8d64-8e6050ce3f09","name":"467523c5-1041-45cb-8d64-8e6050ce3f09","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"066b0a13-b2c6-4823-bfa8-30d2732a2fc8","name":"066b0a13-b2c6-4823-bfa8-30d2732a2fc8","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"b12ffb2d-a3d9-4847-9ead-c0e7bf24a7a5","name":"b12ffb2d-a3d9-4847-9ead-c0e7bf24a7a5","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"27894834-ac2a-4345-b497-a51d1bf8ccf2","name":"27894834-ac2a-4345-b497-a51d1bf8ccf2","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"c00bec42-7e5f-4a1c-b625-a0a53066e6e2","name":"c00bec42-7e5f-4a1c-b625-a0a53066e6e2","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"b4c963d0-b475-4267-a887-fc3e016a2222","name":"b4c963d0-b475-4267-a887-fc3e016a2222","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"25a47dbf-754a-4a39-a8b9-f8913277ec00","name":"25a47dbf-754a-4a39-a8b9-f8913277ec00","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"50e9196c-59b5-4c30-aa86-fd9f37ccd7a3","name":"50e9196c-59b5-4c30-aa86-fd9f37ccd7a3","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"ad6b9726-05d8-443a-a232-84859891d411","name":"ad6b9726-05d8-443a-a232-84859891d411","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"1e481ea8-380e-441c-a6fa-d59987014d25","name":"1e481ea8-380e-441c-a6fa-d59987014d25","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"4387a9e7-f250-4afe-9e45-d3ad3d4f86d7","name":"4387a9e7-f250-4afe-9e45-d3ad3d4f86d7","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"b60ae3f9-a3b1-4e65-b222-ec853bc9fa0d","name":"b60ae3f9-a3b1-4e65-b222-ec853bc9fa0d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"7150c51c-937d-47d1-b5d2-7f3a3b82f5c5","name":"7150c51c-937d-47d1-b5d2-7f3a3b82f5c5","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"180a201d-8a4c-4ddc-b137-2fe7ff8a3f5c","name":"180a201d-8a4c-4ddc-b137-2fe7ff8a3f5c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"7e65cb8f-d2c1-40f8-87a0-880d3fb252ba","name":"7e65cb8f-d2c1-40f8-87a0-880d3fb252ba","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"07e2c5b6-a398-42be-8d89-87492926392c","name":"07e2c5b6-a398-42be-8d89-87492926392c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"03f517fd-fe76-4a54-9034-88e734e84398","name":"03f517fd-fe76-4a54-9034-88e734e84398","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -84,57 +84,23 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"467523c5-1041-45cb-8d64-8e6050ce3f09","path":"sprites/spr_mar_walk_body2/spr_mar_walk_body2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"b0262acb-01f2-4d60-8e20-519e5aa4ce08","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"066b0a13-b2c6-4823-bfa8-30d2732a2fc8","path":"sprites/spr_mar_walk_body2/spr_mar_walk_body2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"b1ae5075-5aa6-4bb0-bbde-3ce85ea507b0","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"b12ffb2d-a3d9-4847-9ead-c0e7bf24a7a5","path":"sprites/spr_mar_walk_body2/spr_mar_walk_body2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"afbce28b-935f-4730-bbaf-f35fb81bb939","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"27894834-ac2a-4345-b497-a51d1bf8ccf2","path":"sprites/spr_mar_walk_body2/spr_mar_walk_body2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"e825447b-2c95-4607-961b-fdbd4a7ae13a","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"c00bec42-7e5f-4a1c-b625-a0a53066e6e2","path":"sprites/spr_mar_walk_body2/spr_mar_walk_body2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"fba64b1a-a025-46ec-b972-94378c3f43e7","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"b4c963d0-b475-4267-a887-fc3e016a2222","path":"sprites/spr_mar_walk_body2/spr_mar_walk_body2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"8911da3b-6ace-4ff9-989d-29ea04ef059b","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"25a47dbf-754a-4a39-a8b9-f8913277ec00","path":"sprites/spr_mar_walk_body2/spr_mar_walk_body2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"69b19c6c-3dd2-4e84-ad02-d854a1f0e1fa","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"50e9196c-59b5-4c30-aa86-fd9f37ccd7a3","path":"sprites/spr_mar_walk_body2/spr_mar_walk_body2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"f440ed57-94c4-434c-9d3a-6b0dadef08c1","IsCreationKey":false,"Key":7.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"ad6b9726-05d8-443a-a232-84859891d411","path":"sprites/spr_mar_walk_body2/spr_mar_walk_body2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"456edfe0-ed8d-478f-bb52-350f549f5092","IsCreationKey":false,"Key":8.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"1e481ea8-380e-441c-a6fa-d59987014d25","path":"sprites/spr_mar_walk_body2/spr_mar_walk_body2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"38444669-8149-410f-a484-ee6ad3f63841","IsCreationKey":false,"Key":9.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"4387a9e7-f250-4afe-9e45-d3ad3d4f86d7","path":"sprites/spr_mar_walk_body2/spr_mar_walk_body2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"d666dea7-f511-4d8f-bb0f-2db6629ea19d","IsCreationKey":false,"Key":10.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"b60ae3f9-a3b1-4e65-b222-ec853bc9fa0d","path":"sprites/spr_mar_walk_body2/spr_mar_walk_body2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"b8b0c450-d879-435f-a9c5-f36600252da2","IsCreationKey":false,"Key":11.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"7150c51c-937d-47d1-b5d2-7f3a3b82f5c5","path":"sprites/spr_mar_walk_body2/spr_mar_walk_body2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"2577d053-353b-45c4-970a-4b9598c0e571","IsCreationKey":false,"Key":12.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"180a201d-8a4c-4ddc-b137-2fe7ff8a3f5c","path":"sprites/spr_mar_walk_body2/spr_mar_walk_body2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"9f90e72f-15e1-441b-a3f4-ec59294cf95c","IsCreationKey":false,"Key":13.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"7e65cb8f-d2c1-40f8-87a0-880d3fb252ba","path":"sprites/spr_mar_walk_body2/spr_mar_walk_body2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"274498ff-9483-4279-a711-6486069cabf3","IsCreationKey":false,"Key":14.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"07e2c5b6-a398-42be-8d89-87492926392c","path":"sprites/spr_mar_walk_body2/spr_mar_walk_body2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"90e0ce56-5b21-478f-810a-e1dc998b0a80","IsCreationKey":false,"Key":15.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"03f517fd-fe76-4a54-9034-88e734e84398","path":"sprites/spr_mar_walk_body2/spr_mar_walk_body2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"098a5439-72b0-4a86-a7e2-83a6aa6b7031","IsCreationKey":false,"Key":16.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"467523c5-1041-45cb-8d64-8e6050ce3f09","path":"sprites/spr_mar_walk_body2/spr_mar_walk_body2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"b0262acb-01f2-4d60-8e20-519e5aa4ce08","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"066b0a13-b2c6-4823-bfa8-30d2732a2fc8","path":"sprites/spr_mar_walk_body2/spr_mar_walk_body2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"b1ae5075-5aa6-4bb0-bbde-3ce85ea507b0","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"b12ffb2d-a3d9-4847-9ead-c0e7bf24a7a5","path":"sprites/spr_mar_walk_body2/spr_mar_walk_body2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"afbce28b-935f-4730-bbaf-f35fb81bb939","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"27894834-ac2a-4345-b497-a51d1bf8ccf2","path":"sprites/spr_mar_walk_body2/spr_mar_walk_body2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"e825447b-2c95-4607-961b-fdbd4a7ae13a","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"c00bec42-7e5f-4a1c-b625-a0a53066e6e2","path":"sprites/spr_mar_walk_body2/spr_mar_walk_body2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"fba64b1a-a025-46ec-b972-94378c3f43e7","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"b4c963d0-b475-4267-a887-fc3e016a2222","path":"sprites/spr_mar_walk_body2/spr_mar_walk_body2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"8911da3b-6ace-4ff9-989d-29ea04ef059b","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"25a47dbf-754a-4a39-a8b9-f8913277ec00","path":"sprites/spr_mar_walk_body2/spr_mar_walk_body2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"69b19c6c-3dd2-4e84-ad02-d854a1f0e1fa","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"50e9196c-59b5-4c30-aa86-fd9f37ccd7a3","path":"sprites/spr_mar_walk_body2/spr_mar_walk_body2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"f440ed57-94c4-434c-9d3a-6b0dadef08c1","IsCreationKey":false,"Key":7.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"ad6b9726-05d8-443a-a232-84859891d411","path":"sprites/spr_mar_walk_body2/spr_mar_walk_body2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"456edfe0-ed8d-478f-bb52-350f549f5092","IsCreationKey":false,"Key":8.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"1e481ea8-380e-441c-a6fa-d59987014d25","path":"sprites/spr_mar_walk_body2/spr_mar_walk_body2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"38444669-8149-410f-a484-ee6ad3f63841","IsCreationKey":false,"Key":9.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"4387a9e7-f250-4afe-9e45-d3ad3d4f86d7","path":"sprites/spr_mar_walk_body2/spr_mar_walk_body2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"d666dea7-f511-4d8f-bb0f-2db6629ea19d","IsCreationKey":false,"Key":10.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"b60ae3f9-a3b1-4e65-b222-ec853bc9fa0d","path":"sprites/spr_mar_walk_body2/spr_mar_walk_body2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"b8b0c450-d879-435f-a9c5-f36600252da2","IsCreationKey":false,"Key":11.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"7150c51c-937d-47d1-b5d2-7f3a3b82f5c5","path":"sprites/spr_mar_walk_body2/spr_mar_walk_body2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"2577d053-353b-45c4-970a-4b9598c0e571","IsCreationKey":false,"Key":12.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"180a201d-8a4c-4ddc-b137-2fe7ff8a3f5c","path":"sprites/spr_mar_walk_body2/spr_mar_walk_body2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"9f90e72f-15e1-441b-a3f4-ec59294cf95c","IsCreationKey":false,"Key":13.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"7e65cb8f-d2c1-40f8-87a0-880d3fb252ba","path":"sprites/spr_mar_walk_body2/spr_mar_walk_body2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"274498ff-9483-4279-a711-6486069cabf3","IsCreationKey":false,"Key":14.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"07e2c5b6-a398-42be-8d89-87492926392c","path":"sprites/spr_mar_walk_body2/spr_mar_walk_body2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"90e0ce56-5b21-478f-810a-e1dc998b0a80","IsCreationKey":false,"Key":15.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"03f517fd-fe76-4a54-9034-88e734e84398","path":"sprites/spr_mar_walk_body2/spr_mar_walk_body2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"098a5439-72b0-4a86-a7e2-83a6aa6b7031","IsCreationKey":false,"Key":16.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":{ diff --git a/sprites/spr_mar_walk_body3/spr_mar_walk_body3.yy b/sprites/spr_mar_walk_body3/spr_mar_walk_body3.yy index c3ddbf4c5e..14260bc3b3 100644 --- a/sprites/spr_mar_walk_body3/spr_mar_walk_body3.yy +++ b/sprites/spr_mar_walk_body3/spr_mar_walk_body3.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_mar_walk_body3", "bboxMode":0, "bbox_bottom":23, @@ -12,23 +12,23 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"52144d87-ab6a-4acd-aa23-3251a5059ea8","name":"52144d87-ab6a-4acd-aa23-3251a5059ea8","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"b7d8cbac-4aa1-462a-b0c6-e7959c4a341d","name":"b7d8cbac-4aa1-462a-b0c6-e7959c4a341d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"236377e1-ced1-4636-91b5-c4af681da3ea","name":"236377e1-ced1-4636-91b5-c4af681da3ea","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"89d88cfe-6a4c-4f9b-941b-36e2f6852712","name":"89d88cfe-6a4c-4f9b-941b-36e2f6852712","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"154a1029-63af-4304-a7b4-37deec6d4299","name":"154a1029-63af-4304-a7b4-37deec6d4299","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"ce0b271d-a10b-48f0-8dcb-1840947bd9a0","name":"ce0b271d-a10b-48f0-8dcb-1840947bd9a0","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"72ec45fe-9568-407e-a51b-0b33ebd671fd","name":"72ec45fe-9568-407e-a51b-0b33ebd671fd","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"e819277b-fad6-4235-8163-e3845f10510b","name":"e819277b-fad6-4235-8163-e3845f10510b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"1096a6c5-b038-4de2-89c2-433a93cc549c","name":"1096a6c5-b038-4de2-89c2-433a93cc549c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"dd421efe-30e3-483c-b66e-3c3a77ed7651","name":"dd421efe-30e3-483c-b66e-3c3a77ed7651","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"fc9837a8-68a4-4105-a0cf-1d51c03d9303","name":"fc9837a8-68a4-4105-a0cf-1d51c03d9303","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"2d5e6037-56eb-4229-be25-821d2746541b","name":"2d5e6037-56eb-4229-be25-821d2746541b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"bc4f5f09-2786-4121-9883-f0a81ff1c633","name":"bc4f5f09-2786-4121-9883-f0a81ff1c633","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"ab22c645-65eb-4850-92bb-4dc1efd37598","name":"ab22c645-65eb-4850-92bb-4dc1efd37598","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"fa7d2cc9-0fb3-4def-a4d9-b9890e0320ad","name":"fa7d2cc9-0fb3-4def-a4d9-b9890e0320ad","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"acf9bd95-2d1e-44b7-943e-acd686b267d6","name":"acf9bd95-2d1e-44b7-943e-acd686b267d6","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"ef994322-3af5-469a-a31a-e766754c6852","name":"ef994322-3af5-469a-a31a-e766754c6852","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"52144d87-ab6a-4acd-aa23-3251a5059ea8","name":"52144d87-ab6a-4acd-aa23-3251a5059ea8","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"b7d8cbac-4aa1-462a-b0c6-e7959c4a341d","name":"b7d8cbac-4aa1-462a-b0c6-e7959c4a341d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"236377e1-ced1-4636-91b5-c4af681da3ea","name":"236377e1-ced1-4636-91b5-c4af681da3ea","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"89d88cfe-6a4c-4f9b-941b-36e2f6852712","name":"89d88cfe-6a4c-4f9b-941b-36e2f6852712","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"154a1029-63af-4304-a7b4-37deec6d4299","name":"154a1029-63af-4304-a7b4-37deec6d4299","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"ce0b271d-a10b-48f0-8dcb-1840947bd9a0","name":"ce0b271d-a10b-48f0-8dcb-1840947bd9a0","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"72ec45fe-9568-407e-a51b-0b33ebd671fd","name":"72ec45fe-9568-407e-a51b-0b33ebd671fd","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"e819277b-fad6-4235-8163-e3845f10510b","name":"e819277b-fad6-4235-8163-e3845f10510b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"1096a6c5-b038-4de2-89c2-433a93cc549c","name":"1096a6c5-b038-4de2-89c2-433a93cc549c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"dd421efe-30e3-483c-b66e-3c3a77ed7651","name":"dd421efe-30e3-483c-b66e-3c3a77ed7651","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"fc9837a8-68a4-4105-a0cf-1d51c03d9303","name":"fc9837a8-68a4-4105-a0cf-1d51c03d9303","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"2d5e6037-56eb-4229-be25-821d2746541b","name":"2d5e6037-56eb-4229-be25-821d2746541b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"bc4f5f09-2786-4121-9883-f0a81ff1c633","name":"bc4f5f09-2786-4121-9883-f0a81ff1c633","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"ab22c645-65eb-4850-92bb-4dc1efd37598","name":"ab22c645-65eb-4850-92bb-4dc1efd37598","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"fa7d2cc9-0fb3-4def-a4d9-b9890e0320ad","name":"fa7d2cc9-0fb3-4def-a4d9-b9890e0320ad","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"acf9bd95-2d1e-44b7-943e-acd686b267d6","name":"acf9bd95-2d1e-44b7-943e-acd686b267d6","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"ef994322-3af5-469a-a31a-e766754c6852","name":"ef994322-3af5-469a-a31a-e766754c6852","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -84,57 +84,23 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"52144d87-ab6a-4acd-aa23-3251a5059ea8","path":"sprites/spr_mar_walk_body3/spr_mar_walk_body3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"e91e7fb6-71d4-42ae-b53d-a55af28ded7a","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"b7d8cbac-4aa1-462a-b0c6-e7959c4a341d","path":"sprites/spr_mar_walk_body3/spr_mar_walk_body3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"1cb9cdb0-422f-4a9f-a3d1-77ec0ed9ca5c","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"236377e1-ced1-4636-91b5-c4af681da3ea","path":"sprites/spr_mar_walk_body3/spr_mar_walk_body3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"ffcc3b7f-e557-43b8-9e97-6b72dae68ce9","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"89d88cfe-6a4c-4f9b-941b-36e2f6852712","path":"sprites/spr_mar_walk_body3/spr_mar_walk_body3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"2274549d-7845-451b-b683-65c8ef433e34","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"154a1029-63af-4304-a7b4-37deec6d4299","path":"sprites/spr_mar_walk_body3/spr_mar_walk_body3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"9b9b332c-bb9d-401e-a3d5-57368a0eeadc","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"ce0b271d-a10b-48f0-8dcb-1840947bd9a0","path":"sprites/spr_mar_walk_body3/spr_mar_walk_body3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"7705b38b-35a6-4a6a-834b-074c782ee423","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"72ec45fe-9568-407e-a51b-0b33ebd671fd","path":"sprites/spr_mar_walk_body3/spr_mar_walk_body3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"99448237-30a9-4675-85b1-ce634aac94b3","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"e819277b-fad6-4235-8163-e3845f10510b","path":"sprites/spr_mar_walk_body3/spr_mar_walk_body3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"0d2f2819-906e-4896-9c2c-e74970a820fb","IsCreationKey":false,"Key":7.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"1096a6c5-b038-4de2-89c2-433a93cc549c","path":"sprites/spr_mar_walk_body3/spr_mar_walk_body3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"cf60c901-315c-4470-acb5-022272e954b2","IsCreationKey":false,"Key":8.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"dd421efe-30e3-483c-b66e-3c3a77ed7651","path":"sprites/spr_mar_walk_body3/spr_mar_walk_body3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"7586d567-a3e5-40f3-9306-8ae1475893c4","IsCreationKey":false,"Key":9.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"fc9837a8-68a4-4105-a0cf-1d51c03d9303","path":"sprites/spr_mar_walk_body3/spr_mar_walk_body3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"ec7fa86f-5973-4c36-a6cc-3e59b4319c59","IsCreationKey":false,"Key":10.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"2d5e6037-56eb-4229-be25-821d2746541b","path":"sprites/spr_mar_walk_body3/spr_mar_walk_body3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"d45813a0-3a85-4499-9846-85b5bf859820","IsCreationKey":false,"Key":11.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"bc4f5f09-2786-4121-9883-f0a81ff1c633","path":"sprites/spr_mar_walk_body3/spr_mar_walk_body3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"7cfab11f-c45c-4333-b5f0-24e3ecd0b7ee","IsCreationKey":false,"Key":12.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"ab22c645-65eb-4850-92bb-4dc1efd37598","path":"sprites/spr_mar_walk_body3/spr_mar_walk_body3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"d9243bd4-5d21-4b7c-b38e-eb6c1dce5a9b","IsCreationKey":false,"Key":13.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"fa7d2cc9-0fb3-4def-a4d9-b9890e0320ad","path":"sprites/spr_mar_walk_body3/spr_mar_walk_body3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"0335e729-472f-4df9-9359-371794cf03cd","IsCreationKey":false,"Key":14.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"acf9bd95-2d1e-44b7-943e-acd686b267d6","path":"sprites/spr_mar_walk_body3/spr_mar_walk_body3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"1379ab9e-d061-40dc-8ad0-8e6b21df5fa5","IsCreationKey":false,"Key":15.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"ef994322-3af5-469a-a31a-e766754c6852","path":"sprites/spr_mar_walk_body3/spr_mar_walk_body3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"83adbcc0-9d56-40f3-8993-2f72d1940009","IsCreationKey":false,"Key":16.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"52144d87-ab6a-4acd-aa23-3251a5059ea8","path":"sprites/spr_mar_walk_body3/spr_mar_walk_body3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"e91e7fb6-71d4-42ae-b53d-a55af28ded7a","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"b7d8cbac-4aa1-462a-b0c6-e7959c4a341d","path":"sprites/spr_mar_walk_body3/spr_mar_walk_body3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"1cb9cdb0-422f-4a9f-a3d1-77ec0ed9ca5c","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"236377e1-ced1-4636-91b5-c4af681da3ea","path":"sprites/spr_mar_walk_body3/spr_mar_walk_body3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"ffcc3b7f-e557-43b8-9e97-6b72dae68ce9","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"89d88cfe-6a4c-4f9b-941b-36e2f6852712","path":"sprites/spr_mar_walk_body3/spr_mar_walk_body3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"2274549d-7845-451b-b683-65c8ef433e34","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"154a1029-63af-4304-a7b4-37deec6d4299","path":"sprites/spr_mar_walk_body3/spr_mar_walk_body3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"9b9b332c-bb9d-401e-a3d5-57368a0eeadc","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"ce0b271d-a10b-48f0-8dcb-1840947bd9a0","path":"sprites/spr_mar_walk_body3/spr_mar_walk_body3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"7705b38b-35a6-4a6a-834b-074c782ee423","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"72ec45fe-9568-407e-a51b-0b33ebd671fd","path":"sprites/spr_mar_walk_body3/spr_mar_walk_body3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"99448237-30a9-4675-85b1-ce634aac94b3","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"e819277b-fad6-4235-8163-e3845f10510b","path":"sprites/spr_mar_walk_body3/spr_mar_walk_body3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"0d2f2819-906e-4896-9c2c-e74970a820fb","IsCreationKey":false,"Key":7.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"1096a6c5-b038-4de2-89c2-433a93cc549c","path":"sprites/spr_mar_walk_body3/spr_mar_walk_body3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"cf60c901-315c-4470-acb5-022272e954b2","IsCreationKey":false,"Key":8.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"dd421efe-30e3-483c-b66e-3c3a77ed7651","path":"sprites/spr_mar_walk_body3/spr_mar_walk_body3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"7586d567-a3e5-40f3-9306-8ae1475893c4","IsCreationKey":false,"Key":9.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"fc9837a8-68a4-4105-a0cf-1d51c03d9303","path":"sprites/spr_mar_walk_body3/spr_mar_walk_body3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"ec7fa86f-5973-4c36-a6cc-3e59b4319c59","IsCreationKey":false,"Key":10.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"2d5e6037-56eb-4229-be25-821d2746541b","path":"sprites/spr_mar_walk_body3/spr_mar_walk_body3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"d45813a0-3a85-4499-9846-85b5bf859820","IsCreationKey":false,"Key":11.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"bc4f5f09-2786-4121-9883-f0a81ff1c633","path":"sprites/spr_mar_walk_body3/spr_mar_walk_body3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"7cfab11f-c45c-4333-b5f0-24e3ecd0b7ee","IsCreationKey":false,"Key":12.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"ab22c645-65eb-4850-92bb-4dc1efd37598","path":"sprites/spr_mar_walk_body3/spr_mar_walk_body3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"d9243bd4-5d21-4b7c-b38e-eb6c1dce5a9b","IsCreationKey":false,"Key":13.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"fa7d2cc9-0fb3-4def-a4d9-b9890e0320ad","path":"sprites/spr_mar_walk_body3/spr_mar_walk_body3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"0335e729-472f-4df9-9359-371794cf03cd","IsCreationKey":false,"Key":14.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"acf9bd95-2d1e-44b7-943e-acd686b267d6","path":"sprites/spr_mar_walk_body3/spr_mar_walk_body3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"1379ab9e-d061-40dc-8ad0-8e6b21df5fa5","IsCreationKey":false,"Key":15.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"ef994322-3af5-469a-a31a-e766754c6852","path":"sprites/spr_mar_walk_body3/spr_mar_walk_body3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"83adbcc0-9d56-40f3-8993-2f72d1940009","IsCreationKey":false,"Key":16.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":{ diff --git a/sprites/spr_mar_walk_legs1/spr_mar_walk_legs1.yy b/sprites/spr_mar_walk_legs1/spr_mar_walk_legs1.yy index bd0e0ccad0..12e353fd7a 100644 --- a/sprites/spr_mar_walk_legs1/spr_mar_walk_legs1.yy +++ b/sprites/spr_mar_walk_legs1/spr_mar_walk_legs1.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_mar_walk_legs1", "bboxMode":0, "bbox_bottom":37, @@ -12,23 +12,23 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"c2f036ba-6dfb-46d7-a569-361317d930eb","name":"c2f036ba-6dfb-46d7-a569-361317d930eb","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"f6dd5d91-65e5-40a4-b1aa-9c7cdb777295","name":"f6dd5d91-65e5-40a4-b1aa-9c7cdb777295","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"eb2af642-9022-4f21-9660-2703755609ea","name":"eb2af642-9022-4f21-9660-2703755609ea","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"965fff3f-1783-457c-9393-a03c1931ae10","name":"965fff3f-1783-457c-9393-a03c1931ae10","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"e8a371f7-4ee6-4a35-b2f2-727706fe163f","name":"e8a371f7-4ee6-4a35-b2f2-727706fe163f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"dbee7f5e-5160-403d-8567-5df73e765eeb","name":"dbee7f5e-5160-403d-8567-5df73e765eeb","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"22a707ef-ff83-495a-abec-8ad9dd05f3fb","name":"22a707ef-ff83-495a-abec-8ad9dd05f3fb","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"8744b640-716d-4d4e-9513-00e317357df6","name":"8744b640-716d-4d4e-9513-00e317357df6","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"645ae09e-fcf3-446f-b807-fb00205d8f87","name":"645ae09e-fcf3-446f-b807-fb00205d8f87","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"997f6c7b-e898-4e66-b59b-772d60f0c829","name":"997f6c7b-e898-4e66-b59b-772d60f0c829","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"ca07ac06-7e66-46ab-b936-a7e43bbdfeaa","name":"ca07ac06-7e66-46ab-b936-a7e43bbdfeaa","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"638ce1cd-1072-4d30-aaea-22b9b132a7c0","name":"638ce1cd-1072-4d30-aaea-22b9b132a7c0","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"ce1449fa-495c-4d39-8e55-6cacd176f505","name":"ce1449fa-495c-4d39-8e55-6cacd176f505","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"5490e1ed-6181-4153-b10e-fdec7a84b36e","name":"5490e1ed-6181-4153-b10e-fdec7a84b36e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"4f8b3a70-e22f-43f6-9c7d-f556befc9055","name":"4f8b3a70-e22f-43f6-9c7d-f556befc9055","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"c060e23e-b430-4136-a4c6-0e97db7a4a3e","name":"c060e23e-b430-4136-a4c6-0e97db7a4a3e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"944eafd1-f8f9-43e7-9123-47a3efe9740b","name":"944eafd1-f8f9-43e7-9123-47a3efe9740b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"c2f036ba-6dfb-46d7-a569-361317d930eb","name":"c2f036ba-6dfb-46d7-a569-361317d930eb","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"f6dd5d91-65e5-40a4-b1aa-9c7cdb777295","name":"f6dd5d91-65e5-40a4-b1aa-9c7cdb777295","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"eb2af642-9022-4f21-9660-2703755609ea","name":"eb2af642-9022-4f21-9660-2703755609ea","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"965fff3f-1783-457c-9393-a03c1931ae10","name":"965fff3f-1783-457c-9393-a03c1931ae10","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"e8a371f7-4ee6-4a35-b2f2-727706fe163f","name":"e8a371f7-4ee6-4a35-b2f2-727706fe163f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"dbee7f5e-5160-403d-8567-5df73e765eeb","name":"dbee7f5e-5160-403d-8567-5df73e765eeb","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"22a707ef-ff83-495a-abec-8ad9dd05f3fb","name":"22a707ef-ff83-495a-abec-8ad9dd05f3fb","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"8744b640-716d-4d4e-9513-00e317357df6","name":"8744b640-716d-4d4e-9513-00e317357df6","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"645ae09e-fcf3-446f-b807-fb00205d8f87","name":"645ae09e-fcf3-446f-b807-fb00205d8f87","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"997f6c7b-e898-4e66-b59b-772d60f0c829","name":"997f6c7b-e898-4e66-b59b-772d60f0c829","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"ca07ac06-7e66-46ab-b936-a7e43bbdfeaa","name":"ca07ac06-7e66-46ab-b936-a7e43bbdfeaa","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"638ce1cd-1072-4d30-aaea-22b9b132a7c0","name":"638ce1cd-1072-4d30-aaea-22b9b132a7c0","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"ce1449fa-495c-4d39-8e55-6cacd176f505","name":"ce1449fa-495c-4d39-8e55-6cacd176f505","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"5490e1ed-6181-4153-b10e-fdec7a84b36e","name":"5490e1ed-6181-4153-b10e-fdec7a84b36e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"4f8b3a70-e22f-43f6-9c7d-f556befc9055","name":"4f8b3a70-e22f-43f6-9c7d-f556befc9055","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"c060e23e-b430-4136-a4c6-0e97db7a4a3e","name":"c060e23e-b430-4136-a4c6-0e97db7a4a3e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"944eafd1-f8f9-43e7-9123-47a3efe9740b","name":"944eafd1-f8f9-43e7-9123-47a3efe9740b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -84,57 +84,23 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"c2f036ba-6dfb-46d7-a569-361317d930eb","path":"sprites/spr_mar_walk_legs1/spr_mar_walk_legs1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"6d86851b-e1a3-4ea1-bfe8-0919044ab423","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"f6dd5d91-65e5-40a4-b1aa-9c7cdb777295","path":"sprites/spr_mar_walk_legs1/spr_mar_walk_legs1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"48ae85a6-c68a-48bb-9db1-c096d55ba89c","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"eb2af642-9022-4f21-9660-2703755609ea","path":"sprites/spr_mar_walk_legs1/spr_mar_walk_legs1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"f2d2c23a-91ed-42db-a4bb-f16713dbfa78","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"965fff3f-1783-457c-9393-a03c1931ae10","path":"sprites/spr_mar_walk_legs1/spr_mar_walk_legs1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"5a474b0a-54b5-45c3-a003-d6f081a47d7b","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"e8a371f7-4ee6-4a35-b2f2-727706fe163f","path":"sprites/spr_mar_walk_legs1/spr_mar_walk_legs1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"5db78d0d-8574-4432-832c-6955a66a38ee","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"dbee7f5e-5160-403d-8567-5df73e765eeb","path":"sprites/spr_mar_walk_legs1/spr_mar_walk_legs1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"4659ea85-ef68-4926-9b35-467ce96ac92a","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"22a707ef-ff83-495a-abec-8ad9dd05f3fb","path":"sprites/spr_mar_walk_legs1/spr_mar_walk_legs1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"6127d529-6bda-4910-b02e-f81da044e691","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"8744b640-716d-4d4e-9513-00e317357df6","path":"sprites/spr_mar_walk_legs1/spr_mar_walk_legs1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"8a31b1a1-1c0d-45f8-aee5-0dcb5e172678","IsCreationKey":false,"Key":7.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"645ae09e-fcf3-446f-b807-fb00205d8f87","path":"sprites/spr_mar_walk_legs1/spr_mar_walk_legs1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"3de86e30-d61f-4d67-a64f-eb2735ecd72b","IsCreationKey":false,"Key":8.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"997f6c7b-e898-4e66-b59b-772d60f0c829","path":"sprites/spr_mar_walk_legs1/spr_mar_walk_legs1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"7f3b7675-e2b5-4c75-b351-755181189d6d","IsCreationKey":false,"Key":9.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"ca07ac06-7e66-46ab-b936-a7e43bbdfeaa","path":"sprites/spr_mar_walk_legs1/spr_mar_walk_legs1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"f70e9054-b6a8-4239-be1e-6f151eb25910","IsCreationKey":false,"Key":10.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"638ce1cd-1072-4d30-aaea-22b9b132a7c0","path":"sprites/spr_mar_walk_legs1/spr_mar_walk_legs1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"72666edf-3d1a-4a45-be71-ab09a846bc90","IsCreationKey":false,"Key":11.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"ce1449fa-495c-4d39-8e55-6cacd176f505","path":"sprites/spr_mar_walk_legs1/spr_mar_walk_legs1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"5876e088-9df4-4a21-a80b-5d3ddf9f62d2","IsCreationKey":false,"Key":12.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"5490e1ed-6181-4153-b10e-fdec7a84b36e","path":"sprites/spr_mar_walk_legs1/spr_mar_walk_legs1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"21965edc-adc9-4724-9bf6-af11c62d9522","IsCreationKey":false,"Key":13.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"4f8b3a70-e22f-43f6-9c7d-f556befc9055","path":"sprites/spr_mar_walk_legs1/spr_mar_walk_legs1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"75f5f4a1-d044-4b4b-889f-0d3c3d031d51","IsCreationKey":false,"Key":14.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"c060e23e-b430-4136-a4c6-0e97db7a4a3e","path":"sprites/spr_mar_walk_legs1/spr_mar_walk_legs1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"73127f5d-2f5d-498b-a7d0-e8c19a17c2ed","IsCreationKey":false,"Key":15.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"944eafd1-f8f9-43e7-9123-47a3efe9740b","path":"sprites/spr_mar_walk_legs1/spr_mar_walk_legs1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"54d73ba7-6b05-4f08-9a32-204eb788ec2c","IsCreationKey":false,"Key":16.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"c2f036ba-6dfb-46d7-a569-361317d930eb","path":"sprites/spr_mar_walk_legs1/spr_mar_walk_legs1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"6d86851b-e1a3-4ea1-bfe8-0919044ab423","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"f6dd5d91-65e5-40a4-b1aa-9c7cdb777295","path":"sprites/spr_mar_walk_legs1/spr_mar_walk_legs1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"48ae85a6-c68a-48bb-9db1-c096d55ba89c","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"eb2af642-9022-4f21-9660-2703755609ea","path":"sprites/spr_mar_walk_legs1/spr_mar_walk_legs1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"f2d2c23a-91ed-42db-a4bb-f16713dbfa78","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"965fff3f-1783-457c-9393-a03c1931ae10","path":"sprites/spr_mar_walk_legs1/spr_mar_walk_legs1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"5a474b0a-54b5-45c3-a003-d6f081a47d7b","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"e8a371f7-4ee6-4a35-b2f2-727706fe163f","path":"sprites/spr_mar_walk_legs1/spr_mar_walk_legs1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"5db78d0d-8574-4432-832c-6955a66a38ee","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"dbee7f5e-5160-403d-8567-5df73e765eeb","path":"sprites/spr_mar_walk_legs1/spr_mar_walk_legs1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"4659ea85-ef68-4926-9b35-467ce96ac92a","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"22a707ef-ff83-495a-abec-8ad9dd05f3fb","path":"sprites/spr_mar_walk_legs1/spr_mar_walk_legs1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"6127d529-6bda-4910-b02e-f81da044e691","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"8744b640-716d-4d4e-9513-00e317357df6","path":"sprites/spr_mar_walk_legs1/spr_mar_walk_legs1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"8a31b1a1-1c0d-45f8-aee5-0dcb5e172678","IsCreationKey":false,"Key":7.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"645ae09e-fcf3-446f-b807-fb00205d8f87","path":"sprites/spr_mar_walk_legs1/spr_mar_walk_legs1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"3de86e30-d61f-4d67-a64f-eb2735ecd72b","IsCreationKey":false,"Key":8.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"997f6c7b-e898-4e66-b59b-772d60f0c829","path":"sprites/spr_mar_walk_legs1/spr_mar_walk_legs1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"7f3b7675-e2b5-4c75-b351-755181189d6d","IsCreationKey":false,"Key":9.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"ca07ac06-7e66-46ab-b936-a7e43bbdfeaa","path":"sprites/spr_mar_walk_legs1/spr_mar_walk_legs1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"f70e9054-b6a8-4239-be1e-6f151eb25910","IsCreationKey":false,"Key":10.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"638ce1cd-1072-4d30-aaea-22b9b132a7c0","path":"sprites/spr_mar_walk_legs1/spr_mar_walk_legs1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"72666edf-3d1a-4a45-be71-ab09a846bc90","IsCreationKey":false,"Key":11.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"ce1449fa-495c-4d39-8e55-6cacd176f505","path":"sprites/spr_mar_walk_legs1/spr_mar_walk_legs1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"5876e088-9df4-4a21-a80b-5d3ddf9f62d2","IsCreationKey":false,"Key":12.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"5490e1ed-6181-4153-b10e-fdec7a84b36e","path":"sprites/spr_mar_walk_legs1/spr_mar_walk_legs1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"21965edc-adc9-4724-9bf6-af11c62d9522","IsCreationKey":false,"Key":13.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"4f8b3a70-e22f-43f6-9c7d-f556befc9055","path":"sprites/spr_mar_walk_legs1/spr_mar_walk_legs1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"75f5f4a1-d044-4b4b-889f-0d3c3d031d51","IsCreationKey":false,"Key":14.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"c060e23e-b430-4136-a4c6-0e97db7a4a3e","path":"sprites/spr_mar_walk_legs1/spr_mar_walk_legs1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"73127f5d-2f5d-498b-a7d0-e8c19a17c2ed","IsCreationKey":false,"Key":15.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"944eafd1-f8f9-43e7-9123-47a3efe9740b","path":"sprites/spr_mar_walk_legs1/spr_mar_walk_legs1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"54d73ba7-6b05-4f08-9a32-204eb788ec2c","IsCreationKey":false,"Key":16.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":{ diff --git a/sprites/spr_mar_walk_legs3/spr_mar_walk_legs3.yy b/sprites/spr_mar_walk_legs3/spr_mar_walk_legs3.yy index 5d4aa560fa..45a6cf6a08 100644 --- a/sprites/spr_mar_walk_legs3/spr_mar_walk_legs3.yy +++ b/sprites/spr_mar_walk_legs3/spr_mar_walk_legs3.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_mar_walk_legs3", "bboxMode":0, "bbox_bottom":37, @@ -12,23 +12,23 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"1ce337ce-7d1c-4b5b-bf79-024ef178d7d9","name":"1ce337ce-7d1c-4b5b-bf79-024ef178d7d9","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"2c72cd2b-fccb-4c59-9d75-42a3c1a4e4e6","name":"2c72cd2b-fccb-4c59-9d75-42a3c1a4e4e6","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"5b0a7bd9-06d5-402f-9246-50e2baf0b92c","name":"5b0a7bd9-06d5-402f-9246-50e2baf0b92c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"5fa70dc1-d979-417b-8ef4-7aa9c0f0f58a","name":"5fa70dc1-d979-417b-8ef4-7aa9c0f0f58a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"cd70c167-7cc7-41ed-ae05-6bd2bf3b2d19","name":"cd70c167-7cc7-41ed-ae05-6bd2bf3b2d19","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"77638842-d819-4373-8f3b-3d002b35dc20","name":"77638842-d819-4373-8f3b-3d002b35dc20","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"76f9eb70-2f86-41c2-ac22-a392c5f45b00","name":"76f9eb70-2f86-41c2-ac22-a392c5f45b00","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"3b58c877-3ee4-4b95-b654-75568d548ab6","name":"3b58c877-3ee4-4b95-b654-75568d548ab6","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"dfaa01bc-0674-449b-9218-7f7b08913781","name":"dfaa01bc-0674-449b-9218-7f7b08913781","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"3ae80d3d-77f3-47d8-927e-faf5be09b47f","name":"3ae80d3d-77f3-47d8-927e-faf5be09b47f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"6f7cd542-f922-43ab-b933-251126717e95","name":"6f7cd542-f922-43ab-b933-251126717e95","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"f9e90dda-a498-4844-bcb5-64cdd6d5ae5f","name":"f9e90dda-a498-4844-bcb5-64cdd6d5ae5f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"0b1bd3b4-9357-4aaa-b4ee-f86618c3d5ca","name":"0b1bd3b4-9357-4aaa-b4ee-f86618c3d5ca","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"57c33534-9b8a-4e50-9c46-cc1bf20d7abf","name":"57c33534-9b8a-4e50-9c46-cc1bf20d7abf","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"84e60c23-9d89-4831-b241-c08e4a5e6526","name":"84e60c23-9d89-4831-b241-c08e4a5e6526","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"1305ebd8-1ec7-4311-aa0d-b4b80c847f55","name":"1305ebd8-1ec7-4311-aa0d-b4b80c847f55","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"b0dae561-f13a-4ead-8783-f71e946a49cc","name":"b0dae561-f13a-4ead-8783-f71e946a49cc","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"1ce337ce-7d1c-4b5b-bf79-024ef178d7d9","name":"1ce337ce-7d1c-4b5b-bf79-024ef178d7d9","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"2c72cd2b-fccb-4c59-9d75-42a3c1a4e4e6","name":"2c72cd2b-fccb-4c59-9d75-42a3c1a4e4e6","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"5b0a7bd9-06d5-402f-9246-50e2baf0b92c","name":"5b0a7bd9-06d5-402f-9246-50e2baf0b92c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"5fa70dc1-d979-417b-8ef4-7aa9c0f0f58a","name":"5fa70dc1-d979-417b-8ef4-7aa9c0f0f58a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"cd70c167-7cc7-41ed-ae05-6bd2bf3b2d19","name":"cd70c167-7cc7-41ed-ae05-6bd2bf3b2d19","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"77638842-d819-4373-8f3b-3d002b35dc20","name":"77638842-d819-4373-8f3b-3d002b35dc20","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"76f9eb70-2f86-41c2-ac22-a392c5f45b00","name":"76f9eb70-2f86-41c2-ac22-a392c5f45b00","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"3b58c877-3ee4-4b95-b654-75568d548ab6","name":"3b58c877-3ee4-4b95-b654-75568d548ab6","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"dfaa01bc-0674-449b-9218-7f7b08913781","name":"dfaa01bc-0674-449b-9218-7f7b08913781","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"3ae80d3d-77f3-47d8-927e-faf5be09b47f","name":"3ae80d3d-77f3-47d8-927e-faf5be09b47f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"6f7cd542-f922-43ab-b933-251126717e95","name":"6f7cd542-f922-43ab-b933-251126717e95","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"f9e90dda-a498-4844-bcb5-64cdd6d5ae5f","name":"f9e90dda-a498-4844-bcb5-64cdd6d5ae5f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"0b1bd3b4-9357-4aaa-b4ee-f86618c3d5ca","name":"0b1bd3b4-9357-4aaa-b4ee-f86618c3d5ca","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"57c33534-9b8a-4e50-9c46-cc1bf20d7abf","name":"57c33534-9b8a-4e50-9c46-cc1bf20d7abf","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"84e60c23-9d89-4831-b241-c08e4a5e6526","name":"84e60c23-9d89-4831-b241-c08e4a5e6526","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"1305ebd8-1ec7-4311-aa0d-b4b80c847f55","name":"1305ebd8-1ec7-4311-aa0d-b4b80c847f55","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"b0dae561-f13a-4ead-8783-f71e946a49cc","name":"b0dae561-f13a-4ead-8783-f71e946a49cc","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -84,57 +84,23 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"1ce337ce-7d1c-4b5b-bf79-024ef178d7d9","path":"sprites/spr_mar_walk_legs3/spr_mar_walk_legs3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"b1a483ed-5e77-43a9-96ce-4b62b867f7f1","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"2c72cd2b-fccb-4c59-9d75-42a3c1a4e4e6","path":"sprites/spr_mar_walk_legs3/spr_mar_walk_legs3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"d9d70c72-6e46-4b96-af44-be960316171f","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"5b0a7bd9-06d5-402f-9246-50e2baf0b92c","path":"sprites/spr_mar_walk_legs3/spr_mar_walk_legs3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"2413b45c-cde3-45de-8133-b20d1f554433","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"5fa70dc1-d979-417b-8ef4-7aa9c0f0f58a","path":"sprites/spr_mar_walk_legs3/spr_mar_walk_legs3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"7d84cb2c-0ef8-4dc3-9125-45b73b65ee86","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"cd70c167-7cc7-41ed-ae05-6bd2bf3b2d19","path":"sprites/spr_mar_walk_legs3/spr_mar_walk_legs3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"a2ee9969-cd0d-45e5-a275-763e221414bd","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"77638842-d819-4373-8f3b-3d002b35dc20","path":"sprites/spr_mar_walk_legs3/spr_mar_walk_legs3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"c795c091-a988-4ee9-a846-6caf8690562b","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"76f9eb70-2f86-41c2-ac22-a392c5f45b00","path":"sprites/spr_mar_walk_legs3/spr_mar_walk_legs3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"24f9becf-c663-4005-a926-e0012f014c7e","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"3b58c877-3ee4-4b95-b654-75568d548ab6","path":"sprites/spr_mar_walk_legs3/spr_mar_walk_legs3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"3fbe6f0d-3484-4c62-92f7-d83878f4c6e5","IsCreationKey":false,"Key":7.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"dfaa01bc-0674-449b-9218-7f7b08913781","path":"sprites/spr_mar_walk_legs3/spr_mar_walk_legs3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"1d940cea-52b4-44e4-bd3d-884bd56cef01","IsCreationKey":false,"Key":8.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"3ae80d3d-77f3-47d8-927e-faf5be09b47f","path":"sprites/spr_mar_walk_legs3/spr_mar_walk_legs3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"42a0ac23-afdf-4805-93b2-51e900bb2b8a","IsCreationKey":false,"Key":9.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"6f7cd542-f922-43ab-b933-251126717e95","path":"sprites/spr_mar_walk_legs3/spr_mar_walk_legs3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"0e146ecd-2e8e-48de-b68c-0111dd0f1eab","IsCreationKey":false,"Key":10.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"f9e90dda-a498-4844-bcb5-64cdd6d5ae5f","path":"sprites/spr_mar_walk_legs3/spr_mar_walk_legs3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"ef155006-a64a-478f-a369-5a54bfaac69f","IsCreationKey":false,"Key":11.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"0b1bd3b4-9357-4aaa-b4ee-f86618c3d5ca","path":"sprites/spr_mar_walk_legs3/spr_mar_walk_legs3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"7894ac22-7768-481b-a050-2080121b1dc4","IsCreationKey":false,"Key":12.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"57c33534-9b8a-4e50-9c46-cc1bf20d7abf","path":"sprites/spr_mar_walk_legs3/spr_mar_walk_legs3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"d8b147c8-8847-4a5d-838a-7c1135823e8b","IsCreationKey":false,"Key":13.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"84e60c23-9d89-4831-b241-c08e4a5e6526","path":"sprites/spr_mar_walk_legs3/spr_mar_walk_legs3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"b0983887-af1d-4bc2-b1f4-cefc411c69c0","IsCreationKey":false,"Key":14.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"1305ebd8-1ec7-4311-aa0d-b4b80c847f55","path":"sprites/spr_mar_walk_legs3/spr_mar_walk_legs3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"5925805b-4db1-4b6e-a59a-6a21bfbaf0b1","IsCreationKey":false,"Key":15.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"b0dae561-f13a-4ead-8783-f71e946a49cc","path":"sprites/spr_mar_walk_legs3/spr_mar_walk_legs3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"be39ee89-f754-490c-b725-3b6a703116e4","IsCreationKey":false,"Key":16.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"1ce337ce-7d1c-4b5b-bf79-024ef178d7d9","path":"sprites/spr_mar_walk_legs3/spr_mar_walk_legs3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"b1a483ed-5e77-43a9-96ce-4b62b867f7f1","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"2c72cd2b-fccb-4c59-9d75-42a3c1a4e4e6","path":"sprites/spr_mar_walk_legs3/spr_mar_walk_legs3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"d9d70c72-6e46-4b96-af44-be960316171f","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"5b0a7bd9-06d5-402f-9246-50e2baf0b92c","path":"sprites/spr_mar_walk_legs3/spr_mar_walk_legs3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"2413b45c-cde3-45de-8133-b20d1f554433","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"5fa70dc1-d979-417b-8ef4-7aa9c0f0f58a","path":"sprites/spr_mar_walk_legs3/spr_mar_walk_legs3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"7d84cb2c-0ef8-4dc3-9125-45b73b65ee86","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"cd70c167-7cc7-41ed-ae05-6bd2bf3b2d19","path":"sprites/spr_mar_walk_legs3/spr_mar_walk_legs3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"a2ee9969-cd0d-45e5-a275-763e221414bd","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"77638842-d819-4373-8f3b-3d002b35dc20","path":"sprites/spr_mar_walk_legs3/spr_mar_walk_legs3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"c795c091-a988-4ee9-a846-6caf8690562b","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"76f9eb70-2f86-41c2-ac22-a392c5f45b00","path":"sprites/spr_mar_walk_legs3/spr_mar_walk_legs3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"24f9becf-c663-4005-a926-e0012f014c7e","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"3b58c877-3ee4-4b95-b654-75568d548ab6","path":"sprites/spr_mar_walk_legs3/spr_mar_walk_legs3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"3fbe6f0d-3484-4c62-92f7-d83878f4c6e5","IsCreationKey":false,"Key":7.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"dfaa01bc-0674-449b-9218-7f7b08913781","path":"sprites/spr_mar_walk_legs3/spr_mar_walk_legs3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"1d940cea-52b4-44e4-bd3d-884bd56cef01","IsCreationKey":false,"Key":8.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"3ae80d3d-77f3-47d8-927e-faf5be09b47f","path":"sprites/spr_mar_walk_legs3/spr_mar_walk_legs3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"42a0ac23-afdf-4805-93b2-51e900bb2b8a","IsCreationKey":false,"Key":9.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"6f7cd542-f922-43ab-b933-251126717e95","path":"sprites/spr_mar_walk_legs3/spr_mar_walk_legs3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"0e146ecd-2e8e-48de-b68c-0111dd0f1eab","IsCreationKey":false,"Key":10.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"f9e90dda-a498-4844-bcb5-64cdd6d5ae5f","path":"sprites/spr_mar_walk_legs3/spr_mar_walk_legs3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"ef155006-a64a-478f-a369-5a54bfaac69f","IsCreationKey":false,"Key":11.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"0b1bd3b4-9357-4aaa-b4ee-f86618c3d5ca","path":"sprites/spr_mar_walk_legs3/spr_mar_walk_legs3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"7894ac22-7768-481b-a050-2080121b1dc4","IsCreationKey":false,"Key":12.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"57c33534-9b8a-4e50-9c46-cc1bf20d7abf","path":"sprites/spr_mar_walk_legs3/spr_mar_walk_legs3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"d8b147c8-8847-4a5d-838a-7c1135823e8b","IsCreationKey":false,"Key":13.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"84e60c23-9d89-4831-b241-c08e4a5e6526","path":"sprites/spr_mar_walk_legs3/spr_mar_walk_legs3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"b0983887-af1d-4bc2-b1f4-cefc411c69c0","IsCreationKey":false,"Key":14.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"1305ebd8-1ec7-4311-aa0d-b4b80c847f55","path":"sprites/spr_mar_walk_legs3/spr_mar_walk_legs3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"5925805b-4db1-4b6e-a59a-6a21bfbaf0b1","IsCreationKey":false,"Key":15.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"b0dae561-f13a-4ead-8783-f71e946a49cc","path":"sprites/spr_mar_walk_legs3/spr_mar_walk_legs3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"be39ee89-f754-490c-b725-3b6a703116e4","IsCreationKey":false,"Key":16.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":{ diff --git a/sprites/spr_mar_walk_legs4/spr_mar_walk_legs4.yy b/sprites/spr_mar_walk_legs4/spr_mar_walk_legs4.yy index ceb25b5514..c3c0f105f7 100644 --- a/sprites/spr_mar_walk_legs4/spr_mar_walk_legs4.yy +++ b/sprites/spr_mar_walk_legs4/spr_mar_walk_legs4.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_mar_walk_legs4", "bboxMode":0, "bbox_bottom":37, @@ -12,23 +12,23 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"caa00d1c-443e-49d6-941c-29529df71739","name":"caa00d1c-443e-49d6-941c-29529df71739","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"55e96122-72ec-459e-aca9-db53e3c08f8d","name":"55e96122-72ec-459e-aca9-db53e3c08f8d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"5737f0b0-c620-45a9-9c93-b7fbcef6c4c8","name":"5737f0b0-c620-45a9-9c93-b7fbcef6c4c8","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"906b5068-61b4-4fe0-acbf-bc0d774aab2b","name":"906b5068-61b4-4fe0-acbf-bc0d774aab2b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"c04df1e1-5044-4f44-8b87-54c625d3f7c0","name":"c04df1e1-5044-4f44-8b87-54c625d3f7c0","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"6607f421-d530-4ab4-b20d-ef4240becd9c","name":"6607f421-d530-4ab4-b20d-ef4240becd9c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"5d150cdd-95c4-45ea-80a7-0b34f49510b5","name":"5d150cdd-95c4-45ea-80a7-0b34f49510b5","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"17a776e8-c3ab-4411-ac50-0f2033957381","name":"17a776e8-c3ab-4411-ac50-0f2033957381","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"5cf5656b-80b4-4aa6-b9c4-b38322a57112","name":"5cf5656b-80b4-4aa6-b9c4-b38322a57112","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"9df407ba-5bda-401c-b27c-53eb9c7c2e16","name":"9df407ba-5bda-401c-b27c-53eb9c7c2e16","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"bbf95248-3480-4c61-8898-4ddc75a49628","name":"bbf95248-3480-4c61-8898-4ddc75a49628","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"877c1656-505c-4ca1-9c43-057e4cd76346","name":"877c1656-505c-4ca1-9c43-057e4cd76346","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"e8ab57e3-e2c2-401f-a63c-736b5fa231fd","name":"e8ab57e3-e2c2-401f-a63c-736b5fa231fd","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"09745b8e-9657-451a-8ce4-456d2eef61ac","name":"09745b8e-9657-451a-8ce4-456d2eef61ac","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"19d5a9c1-4f24-4826-8ffe-6b9f7e73cfaf","name":"19d5a9c1-4f24-4826-8ffe-6b9f7e73cfaf","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"36361e69-53b7-40cf-905d-95b15eaf953b","name":"36361e69-53b7-40cf-905d-95b15eaf953b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"1b567b3e-977a-4dfa-a2af-e616f95663e6","name":"1b567b3e-977a-4dfa-a2af-e616f95663e6","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"caa00d1c-443e-49d6-941c-29529df71739","name":"caa00d1c-443e-49d6-941c-29529df71739","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"55e96122-72ec-459e-aca9-db53e3c08f8d","name":"55e96122-72ec-459e-aca9-db53e3c08f8d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"5737f0b0-c620-45a9-9c93-b7fbcef6c4c8","name":"5737f0b0-c620-45a9-9c93-b7fbcef6c4c8","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"906b5068-61b4-4fe0-acbf-bc0d774aab2b","name":"906b5068-61b4-4fe0-acbf-bc0d774aab2b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"c04df1e1-5044-4f44-8b87-54c625d3f7c0","name":"c04df1e1-5044-4f44-8b87-54c625d3f7c0","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"6607f421-d530-4ab4-b20d-ef4240becd9c","name":"6607f421-d530-4ab4-b20d-ef4240becd9c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"5d150cdd-95c4-45ea-80a7-0b34f49510b5","name":"5d150cdd-95c4-45ea-80a7-0b34f49510b5","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"17a776e8-c3ab-4411-ac50-0f2033957381","name":"17a776e8-c3ab-4411-ac50-0f2033957381","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"5cf5656b-80b4-4aa6-b9c4-b38322a57112","name":"5cf5656b-80b4-4aa6-b9c4-b38322a57112","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"9df407ba-5bda-401c-b27c-53eb9c7c2e16","name":"9df407ba-5bda-401c-b27c-53eb9c7c2e16","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"bbf95248-3480-4c61-8898-4ddc75a49628","name":"bbf95248-3480-4c61-8898-4ddc75a49628","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"877c1656-505c-4ca1-9c43-057e4cd76346","name":"877c1656-505c-4ca1-9c43-057e4cd76346","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"e8ab57e3-e2c2-401f-a63c-736b5fa231fd","name":"e8ab57e3-e2c2-401f-a63c-736b5fa231fd","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"09745b8e-9657-451a-8ce4-456d2eef61ac","name":"09745b8e-9657-451a-8ce4-456d2eef61ac","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"19d5a9c1-4f24-4826-8ffe-6b9f7e73cfaf","name":"19d5a9c1-4f24-4826-8ffe-6b9f7e73cfaf","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"36361e69-53b7-40cf-905d-95b15eaf953b","name":"36361e69-53b7-40cf-905d-95b15eaf953b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"1b567b3e-977a-4dfa-a2af-e616f95663e6","name":"1b567b3e-977a-4dfa-a2af-e616f95663e6","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -84,57 +84,23 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"caa00d1c-443e-49d6-941c-29529df71739","path":"sprites/spr_mar_walk_legs4/spr_mar_walk_legs4.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"4432def1-2c16-4762-a486-98859e253902","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"55e96122-72ec-459e-aca9-db53e3c08f8d","path":"sprites/spr_mar_walk_legs4/spr_mar_walk_legs4.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"dc6fb347-fee6-4420-88cf-4473e511fd32","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"5737f0b0-c620-45a9-9c93-b7fbcef6c4c8","path":"sprites/spr_mar_walk_legs4/spr_mar_walk_legs4.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"4d2ef441-b40a-4681-bcc1-62ce6ec9f565","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"906b5068-61b4-4fe0-acbf-bc0d774aab2b","path":"sprites/spr_mar_walk_legs4/spr_mar_walk_legs4.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"a0335310-0f37-4143-8405-75861681e88a","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"c04df1e1-5044-4f44-8b87-54c625d3f7c0","path":"sprites/spr_mar_walk_legs4/spr_mar_walk_legs4.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"40357d02-75cc-4ae8-a8ba-c4bdf0227a04","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"6607f421-d530-4ab4-b20d-ef4240becd9c","path":"sprites/spr_mar_walk_legs4/spr_mar_walk_legs4.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"7a7bafff-bcf9-44d7-96b6-844c22fab10d","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"5d150cdd-95c4-45ea-80a7-0b34f49510b5","path":"sprites/spr_mar_walk_legs4/spr_mar_walk_legs4.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"5219354d-bb8f-4a30-b2dd-9af0362869eb","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"17a776e8-c3ab-4411-ac50-0f2033957381","path":"sprites/spr_mar_walk_legs4/spr_mar_walk_legs4.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"7608aa62-d2f6-40c0-90c5-f65811df1022","IsCreationKey":false,"Key":7.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"5cf5656b-80b4-4aa6-b9c4-b38322a57112","path":"sprites/spr_mar_walk_legs4/spr_mar_walk_legs4.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"69ec8aab-f5b0-42eb-8952-8443d056ce26","IsCreationKey":false,"Key":8.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"9df407ba-5bda-401c-b27c-53eb9c7c2e16","path":"sprites/spr_mar_walk_legs4/spr_mar_walk_legs4.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"54bc4f58-03ef-4a00-8048-f979196e28db","IsCreationKey":false,"Key":9.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"bbf95248-3480-4c61-8898-4ddc75a49628","path":"sprites/spr_mar_walk_legs4/spr_mar_walk_legs4.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"127dc9bf-f4d6-42a2-bbaf-a6f8f010deba","IsCreationKey":false,"Key":10.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"877c1656-505c-4ca1-9c43-057e4cd76346","path":"sprites/spr_mar_walk_legs4/spr_mar_walk_legs4.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"dc060b96-fe48-4cc0-aeb0-e87e725ece2e","IsCreationKey":false,"Key":11.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"e8ab57e3-e2c2-401f-a63c-736b5fa231fd","path":"sprites/spr_mar_walk_legs4/spr_mar_walk_legs4.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"50f8a3f1-435b-4339-ac14-d99f7dea4cef","IsCreationKey":false,"Key":12.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"09745b8e-9657-451a-8ce4-456d2eef61ac","path":"sprites/spr_mar_walk_legs4/spr_mar_walk_legs4.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"334edbbe-8c21-467c-a914-e51e3e06b91a","IsCreationKey":false,"Key":13.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"19d5a9c1-4f24-4826-8ffe-6b9f7e73cfaf","path":"sprites/spr_mar_walk_legs4/spr_mar_walk_legs4.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"131de9ef-1e27-4f50-bbee-22319b25d980","IsCreationKey":false,"Key":14.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"36361e69-53b7-40cf-905d-95b15eaf953b","path":"sprites/spr_mar_walk_legs4/spr_mar_walk_legs4.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"27b33854-917d-421d-bd55-81f716db4900","IsCreationKey":false,"Key":15.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"1b567b3e-977a-4dfa-a2af-e616f95663e6","path":"sprites/spr_mar_walk_legs4/spr_mar_walk_legs4.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"4e323067-52fa-45a5-9a9f-cf5c93962d78","IsCreationKey":false,"Key":16.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"caa00d1c-443e-49d6-941c-29529df71739","path":"sprites/spr_mar_walk_legs4/spr_mar_walk_legs4.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"4432def1-2c16-4762-a486-98859e253902","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"55e96122-72ec-459e-aca9-db53e3c08f8d","path":"sprites/spr_mar_walk_legs4/spr_mar_walk_legs4.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"dc6fb347-fee6-4420-88cf-4473e511fd32","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"5737f0b0-c620-45a9-9c93-b7fbcef6c4c8","path":"sprites/spr_mar_walk_legs4/spr_mar_walk_legs4.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"4d2ef441-b40a-4681-bcc1-62ce6ec9f565","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"906b5068-61b4-4fe0-acbf-bc0d774aab2b","path":"sprites/spr_mar_walk_legs4/spr_mar_walk_legs4.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"a0335310-0f37-4143-8405-75861681e88a","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"c04df1e1-5044-4f44-8b87-54c625d3f7c0","path":"sprites/spr_mar_walk_legs4/spr_mar_walk_legs4.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"40357d02-75cc-4ae8-a8ba-c4bdf0227a04","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"6607f421-d530-4ab4-b20d-ef4240becd9c","path":"sprites/spr_mar_walk_legs4/spr_mar_walk_legs4.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"7a7bafff-bcf9-44d7-96b6-844c22fab10d","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"5d150cdd-95c4-45ea-80a7-0b34f49510b5","path":"sprites/spr_mar_walk_legs4/spr_mar_walk_legs4.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"5219354d-bb8f-4a30-b2dd-9af0362869eb","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"17a776e8-c3ab-4411-ac50-0f2033957381","path":"sprites/spr_mar_walk_legs4/spr_mar_walk_legs4.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"7608aa62-d2f6-40c0-90c5-f65811df1022","IsCreationKey":false,"Key":7.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"5cf5656b-80b4-4aa6-b9c4-b38322a57112","path":"sprites/spr_mar_walk_legs4/spr_mar_walk_legs4.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"69ec8aab-f5b0-42eb-8952-8443d056ce26","IsCreationKey":false,"Key":8.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"9df407ba-5bda-401c-b27c-53eb9c7c2e16","path":"sprites/spr_mar_walk_legs4/spr_mar_walk_legs4.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"54bc4f58-03ef-4a00-8048-f979196e28db","IsCreationKey":false,"Key":9.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"bbf95248-3480-4c61-8898-4ddc75a49628","path":"sprites/spr_mar_walk_legs4/spr_mar_walk_legs4.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"127dc9bf-f4d6-42a2-bbaf-a6f8f010deba","IsCreationKey":false,"Key":10.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"877c1656-505c-4ca1-9c43-057e4cd76346","path":"sprites/spr_mar_walk_legs4/spr_mar_walk_legs4.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"dc060b96-fe48-4cc0-aeb0-e87e725ece2e","IsCreationKey":false,"Key":11.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"e8ab57e3-e2c2-401f-a63c-736b5fa231fd","path":"sprites/spr_mar_walk_legs4/spr_mar_walk_legs4.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"50f8a3f1-435b-4339-ac14-d99f7dea4cef","IsCreationKey":false,"Key":12.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"09745b8e-9657-451a-8ce4-456d2eef61ac","path":"sprites/spr_mar_walk_legs4/spr_mar_walk_legs4.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"334edbbe-8c21-467c-a914-e51e3e06b91a","IsCreationKey":false,"Key":13.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"19d5a9c1-4f24-4826-8ffe-6b9f7e73cfaf","path":"sprites/spr_mar_walk_legs4/spr_mar_walk_legs4.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"131de9ef-1e27-4f50-bbee-22319b25d980","IsCreationKey":false,"Key":14.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"36361e69-53b7-40cf-905d-95b15eaf953b","path":"sprites/spr_mar_walk_legs4/spr_mar_walk_legs4.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"27b33854-917d-421d-bd55-81f716db4900","IsCreationKey":false,"Key":15.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"1b567b3e-977a-4dfa-a2af-e616f95663e6","path":"sprites/spr_mar_walk_legs4/spr_mar_walk_legs4.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"4e323067-52fa-45a5-9a9f-cf5c93962d78","IsCreationKey":false,"Key":16.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":{ diff --git a/sprites/spr_mar_walk_pauldron1/spr_mar_walk_pauldron1.yy b/sprites/spr_mar_walk_pauldron1/spr_mar_walk_pauldron1.yy index 5d8c897a75..6c8463d5d3 100644 --- a/sprites/spr_mar_walk_pauldron1/spr_mar_walk_pauldron1.yy +++ b/sprites/spr_mar_walk_pauldron1/spr_mar_walk_pauldron1.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_mar_walk_pauldron1", "bboxMode":0, "bbox_bottom":14, @@ -12,23 +12,23 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"af2cb782-beb6-49fd-b8b1-ec37aaba3a60","name":"af2cb782-beb6-49fd-b8b1-ec37aaba3a60","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"f991fe3b-a1b2-4faa-92a5-d3be126df12a","name":"f991fe3b-a1b2-4faa-92a5-d3be126df12a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"661b3802-8624-40e2-930f-6474feb5b781","name":"661b3802-8624-40e2-930f-6474feb5b781","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"a7d88cc6-5638-4273-8d59-cd784cd11f69","name":"a7d88cc6-5638-4273-8d59-cd784cd11f69","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"6cecddef-acd7-4a72-bf73-ea2c6e4d9502","name":"6cecddef-acd7-4a72-bf73-ea2c6e4d9502","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"dc56116f-9cdf-4989-bc05-5791009049da","name":"dc56116f-9cdf-4989-bc05-5791009049da","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"e1b4bc06-317a-441b-a7d1-17bd27f70682","name":"e1b4bc06-317a-441b-a7d1-17bd27f70682","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"bd66c7ad-b9cb-49d5-af4b-a31c412d973c","name":"bd66c7ad-b9cb-49d5-af4b-a31c412d973c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"b35eb062-430f-4247-8a95-80ade92fd13d","name":"b35eb062-430f-4247-8a95-80ade92fd13d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"73bff7a1-50c9-48dc-afa8-93a5127fc152","name":"73bff7a1-50c9-48dc-afa8-93a5127fc152","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"3c62e46c-d633-472c-aeac-28c65405201d","name":"3c62e46c-d633-472c-aeac-28c65405201d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"b270eba5-87f5-4299-b055-42d8650a1049","name":"b270eba5-87f5-4299-b055-42d8650a1049","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"70433f03-e533-40ef-ac04-b6699f39f2db","name":"70433f03-e533-40ef-ac04-b6699f39f2db","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"051bcf5e-2c35-43ff-8882-3a43fe168a58","name":"051bcf5e-2c35-43ff-8882-3a43fe168a58","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"ec7a710a-9cdc-4ffc-9fbb-cde0806ef68b","name":"ec7a710a-9cdc-4ffc-9fbb-cde0806ef68b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"4dca56da-691f-43b2-ae74-94e7269fad99","name":"4dca56da-691f-43b2-ae74-94e7269fad99","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"1949a57d-1c65-4841-aee8-4993f8e2d0ec","name":"1949a57d-1c65-4841-aee8-4993f8e2d0ec","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"af2cb782-beb6-49fd-b8b1-ec37aaba3a60","name":"af2cb782-beb6-49fd-b8b1-ec37aaba3a60","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"f991fe3b-a1b2-4faa-92a5-d3be126df12a","name":"f991fe3b-a1b2-4faa-92a5-d3be126df12a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"661b3802-8624-40e2-930f-6474feb5b781","name":"661b3802-8624-40e2-930f-6474feb5b781","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"a7d88cc6-5638-4273-8d59-cd784cd11f69","name":"a7d88cc6-5638-4273-8d59-cd784cd11f69","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"6cecddef-acd7-4a72-bf73-ea2c6e4d9502","name":"6cecddef-acd7-4a72-bf73-ea2c6e4d9502","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"dc56116f-9cdf-4989-bc05-5791009049da","name":"dc56116f-9cdf-4989-bc05-5791009049da","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"e1b4bc06-317a-441b-a7d1-17bd27f70682","name":"e1b4bc06-317a-441b-a7d1-17bd27f70682","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"bd66c7ad-b9cb-49d5-af4b-a31c412d973c","name":"bd66c7ad-b9cb-49d5-af4b-a31c412d973c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"b35eb062-430f-4247-8a95-80ade92fd13d","name":"b35eb062-430f-4247-8a95-80ade92fd13d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"73bff7a1-50c9-48dc-afa8-93a5127fc152","name":"73bff7a1-50c9-48dc-afa8-93a5127fc152","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"3c62e46c-d633-472c-aeac-28c65405201d","name":"3c62e46c-d633-472c-aeac-28c65405201d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"b270eba5-87f5-4299-b055-42d8650a1049","name":"b270eba5-87f5-4299-b055-42d8650a1049","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"70433f03-e533-40ef-ac04-b6699f39f2db","name":"70433f03-e533-40ef-ac04-b6699f39f2db","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"051bcf5e-2c35-43ff-8882-3a43fe168a58","name":"051bcf5e-2c35-43ff-8882-3a43fe168a58","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"ec7a710a-9cdc-4ffc-9fbb-cde0806ef68b","name":"ec7a710a-9cdc-4ffc-9fbb-cde0806ef68b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"4dca56da-691f-43b2-ae74-94e7269fad99","name":"4dca56da-691f-43b2-ae74-94e7269fad99","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"1949a57d-1c65-4841-aee8-4993f8e2d0ec","name":"1949a57d-1c65-4841-aee8-4993f8e2d0ec","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -84,57 +84,23 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"af2cb782-beb6-49fd-b8b1-ec37aaba3a60","path":"sprites/spr_mar_walk_pauldron1/spr_mar_walk_pauldron1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"44b617f3-0fae-4f1e-9d44-4bd1a2a38ede","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"f991fe3b-a1b2-4faa-92a5-d3be126df12a","path":"sprites/spr_mar_walk_pauldron1/spr_mar_walk_pauldron1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"4ba20f51-d770-4609-bffa-c007416ec912","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"661b3802-8624-40e2-930f-6474feb5b781","path":"sprites/spr_mar_walk_pauldron1/spr_mar_walk_pauldron1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"6b1a8513-11a8-4cd8-b846-abdab255f0d8","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"a7d88cc6-5638-4273-8d59-cd784cd11f69","path":"sprites/spr_mar_walk_pauldron1/spr_mar_walk_pauldron1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"a4efd5d7-a6f0-4326-bf31-46c5860043e4","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"6cecddef-acd7-4a72-bf73-ea2c6e4d9502","path":"sprites/spr_mar_walk_pauldron1/spr_mar_walk_pauldron1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"b60564e1-8ac0-4bcc-b78a-ac25a2d6b7d6","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"dc56116f-9cdf-4989-bc05-5791009049da","path":"sprites/spr_mar_walk_pauldron1/spr_mar_walk_pauldron1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"c1ff97f3-c2cc-406a-8ec9-2a9273cd41c1","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"e1b4bc06-317a-441b-a7d1-17bd27f70682","path":"sprites/spr_mar_walk_pauldron1/spr_mar_walk_pauldron1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"46417154-91f6-4286-b4de-a96a1af577de","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"bd66c7ad-b9cb-49d5-af4b-a31c412d973c","path":"sprites/spr_mar_walk_pauldron1/spr_mar_walk_pauldron1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"e93be9a4-d28e-468a-ada5-220892e8cf69","IsCreationKey":false,"Key":7.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"b35eb062-430f-4247-8a95-80ade92fd13d","path":"sprites/spr_mar_walk_pauldron1/spr_mar_walk_pauldron1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"81f2b4a3-305a-43b6-812b-16eb48e67471","IsCreationKey":false,"Key":8.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"73bff7a1-50c9-48dc-afa8-93a5127fc152","path":"sprites/spr_mar_walk_pauldron1/spr_mar_walk_pauldron1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"a9c00d12-87e7-42c5-bfbe-dd82b99de1fd","IsCreationKey":false,"Key":9.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"3c62e46c-d633-472c-aeac-28c65405201d","path":"sprites/spr_mar_walk_pauldron1/spr_mar_walk_pauldron1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"0103e129-31f7-45f2-bccc-d00ff0397e54","IsCreationKey":false,"Key":10.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"b270eba5-87f5-4299-b055-42d8650a1049","path":"sprites/spr_mar_walk_pauldron1/spr_mar_walk_pauldron1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"1ee15558-9b1d-4350-b6fb-3467f6b5abc4","IsCreationKey":false,"Key":11.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"70433f03-e533-40ef-ac04-b6699f39f2db","path":"sprites/spr_mar_walk_pauldron1/spr_mar_walk_pauldron1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"1ea104f0-10b6-4952-8432-593d54520fa0","IsCreationKey":false,"Key":12.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"051bcf5e-2c35-43ff-8882-3a43fe168a58","path":"sprites/spr_mar_walk_pauldron1/spr_mar_walk_pauldron1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"cc15da12-5abf-49a1-ad9f-e38dc97899b6","IsCreationKey":false,"Key":13.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"ec7a710a-9cdc-4ffc-9fbb-cde0806ef68b","path":"sprites/spr_mar_walk_pauldron1/spr_mar_walk_pauldron1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"b2a15112-e84b-4528-9935-6df7471bdf81","IsCreationKey":false,"Key":14.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"4dca56da-691f-43b2-ae74-94e7269fad99","path":"sprites/spr_mar_walk_pauldron1/spr_mar_walk_pauldron1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"b1997871-4810-42a7-8396-cb9bbe0f4966","IsCreationKey":false,"Key":15.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"1949a57d-1c65-4841-aee8-4993f8e2d0ec","path":"sprites/spr_mar_walk_pauldron1/spr_mar_walk_pauldron1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"16ff5483-4c3a-47f5-9b5a-d64b19bc16fa","IsCreationKey":false,"Key":16.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"af2cb782-beb6-49fd-b8b1-ec37aaba3a60","path":"sprites/spr_mar_walk_pauldron1/spr_mar_walk_pauldron1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"44b617f3-0fae-4f1e-9d44-4bd1a2a38ede","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"f991fe3b-a1b2-4faa-92a5-d3be126df12a","path":"sprites/spr_mar_walk_pauldron1/spr_mar_walk_pauldron1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"4ba20f51-d770-4609-bffa-c007416ec912","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"661b3802-8624-40e2-930f-6474feb5b781","path":"sprites/spr_mar_walk_pauldron1/spr_mar_walk_pauldron1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"6b1a8513-11a8-4cd8-b846-abdab255f0d8","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"a7d88cc6-5638-4273-8d59-cd784cd11f69","path":"sprites/spr_mar_walk_pauldron1/spr_mar_walk_pauldron1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"a4efd5d7-a6f0-4326-bf31-46c5860043e4","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"6cecddef-acd7-4a72-bf73-ea2c6e4d9502","path":"sprites/spr_mar_walk_pauldron1/spr_mar_walk_pauldron1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"b60564e1-8ac0-4bcc-b78a-ac25a2d6b7d6","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"dc56116f-9cdf-4989-bc05-5791009049da","path":"sprites/spr_mar_walk_pauldron1/spr_mar_walk_pauldron1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"c1ff97f3-c2cc-406a-8ec9-2a9273cd41c1","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"e1b4bc06-317a-441b-a7d1-17bd27f70682","path":"sprites/spr_mar_walk_pauldron1/spr_mar_walk_pauldron1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"46417154-91f6-4286-b4de-a96a1af577de","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"bd66c7ad-b9cb-49d5-af4b-a31c412d973c","path":"sprites/spr_mar_walk_pauldron1/spr_mar_walk_pauldron1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"e93be9a4-d28e-468a-ada5-220892e8cf69","IsCreationKey":false,"Key":7.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"b35eb062-430f-4247-8a95-80ade92fd13d","path":"sprites/spr_mar_walk_pauldron1/spr_mar_walk_pauldron1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"81f2b4a3-305a-43b6-812b-16eb48e67471","IsCreationKey":false,"Key":8.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"73bff7a1-50c9-48dc-afa8-93a5127fc152","path":"sprites/spr_mar_walk_pauldron1/spr_mar_walk_pauldron1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"a9c00d12-87e7-42c5-bfbe-dd82b99de1fd","IsCreationKey":false,"Key":9.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"3c62e46c-d633-472c-aeac-28c65405201d","path":"sprites/spr_mar_walk_pauldron1/spr_mar_walk_pauldron1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"0103e129-31f7-45f2-bccc-d00ff0397e54","IsCreationKey":false,"Key":10.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"b270eba5-87f5-4299-b055-42d8650a1049","path":"sprites/spr_mar_walk_pauldron1/spr_mar_walk_pauldron1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"1ee15558-9b1d-4350-b6fb-3467f6b5abc4","IsCreationKey":false,"Key":11.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"70433f03-e533-40ef-ac04-b6699f39f2db","path":"sprites/spr_mar_walk_pauldron1/spr_mar_walk_pauldron1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"1ea104f0-10b6-4952-8432-593d54520fa0","IsCreationKey":false,"Key":12.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"051bcf5e-2c35-43ff-8882-3a43fe168a58","path":"sprites/spr_mar_walk_pauldron1/spr_mar_walk_pauldron1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"cc15da12-5abf-49a1-ad9f-e38dc97899b6","IsCreationKey":false,"Key":13.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"ec7a710a-9cdc-4ffc-9fbb-cde0806ef68b","path":"sprites/spr_mar_walk_pauldron1/spr_mar_walk_pauldron1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"b2a15112-e84b-4528-9935-6df7471bdf81","IsCreationKey":false,"Key":14.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"4dca56da-691f-43b2-ae74-94e7269fad99","path":"sprites/spr_mar_walk_pauldron1/spr_mar_walk_pauldron1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"b1997871-4810-42a7-8396-cb9bbe0f4966","IsCreationKey":false,"Key":15.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"1949a57d-1c65-4841-aee8-4993f8e2d0ec","path":"sprites/spr_mar_walk_pauldron1/spr_mar_walk_pauldron1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"16ff5483-4c3a-47f5-9b5a-d64b19bc16fa","IsCreationKey":false,"Key":16.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":{ diff --git a/sprites/spr_mar_walk_pauldron2/spr_mar_walk_pauldron2.yy b/sprites/spr_mar_walk_pauldron2/spr_mar_walk_pauldron2.yy index 438dc91fb0..e1ccb6ea51 100644 --- a/sprites/spr_mar_walk_pauldron2/spr_mar_walk_pauldron2.yy +++ b/sprites/spr_mar_walk_pauldron2/spr_mar_walk_pauldron2.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_mar_walk_pauldron2", "bboxMode":0, "bbox_bottom":14, @@ -12,23 +12,23 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"81f9cae2-a751-4e4d-af10-3a57fec0bd40","name":"81f9cae2-a751-4e4d-af10-3a57fec0bd40","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"db63b0ea-9074-42a0-bdb0-2e1923ce2b0c","name":"db63b0ea-9074-42a0-bdb0-2e1923ce2b0c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"8df28315-269d-432b-a708-23820aeaab77","name":"8df28315-269d-432b-a708-23820aeaab77","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"dcf887bb-9920-47f6-b3e8-740fa4b83b0b","name":"dcf887bb-9920-47f6-b3e8-740fa4b83b0b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"c776f495-65b2-40a3-90c3-63df559ac482","name":"c776f495-65b2-40a3-90c3-63df559ac482","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"2047e9d2-d217-4970-a624-317dd6ce677b","name":"2047e9d2-d217-4970-a624-317dd6ce677b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"f3e7264f-0632-49ab-a30f-9be1f0a171b6","name":"f3e7264f-0632-49ab-a30f-9be1f0a171b6","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"d951311e-912b-4651-8a9c-bbbf6dbc025c","name":"d951311e-912b-4651-8a9c-bbbf6dbc025c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"5339ce2b-6d13-475f-adab-993098883b65","name":"5339ce2b-6d13-475f-adab-993098883b65","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"602b1368-8b88-4729-8a53-ba3b9d33e69e","name":"602b1368-8b88-4729-8a53-ba3b9d33e69e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"2eb2b517-510c-475d-bc56-17f25895492c","name":"2eb2b517-510c-475d-bc56-17f25895492c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"e78ca533-bd75-4242-a4fc-fea3f894a8b0","name":"e78ca533-bd75-4242-a4fc-fea3f894a8b0","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"dac8105e-f730-4b45-ab32-3878728c1cde","name":"dac8105e-f730-4b45-ab32-3878728c1cde","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"a2b6bdf4-e4f0-4fdb-92f8-f1c81d893a83","name":"a2b6bdf4-e4f0-4fdb-92f8-f1c81d893a83","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"75d57217-083f-495c-993f-4ab3e009a5a6","name":"75d57217-083f-495c-993f-4ab3e009a5a6","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"5db184dc-06b8-4417-93fd-897d7f84c2aa","name":"5db184dc-06b8-4417-93fd-897d7f84c2aa","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"9a4e1e3b-208f-4295-ad99-32db9717fd08","name":"9a4e1e3b-208f-4295-ad99-32db9717fd08","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"81f9cae2-a751-4e4d-af10-3a57fec0bd40","name":"81f9cae2-a751-4e4d-af10-3a57fec0bd40","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"db63b0ea-9074-42a0-bdb0-2e1923ce2b0c","name":"db63b0ea-9074-42a0-bdb0-2e1923ce2b0c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"8df28315-269d-432b-a708-23820aeaab77","name":"8df28315-269d-432b-a708-23820aeaab77","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"dcf887bb-9920-47f6-b3e8-740fa4b83b0b","name":"dcf887bb-9920-47f6-b3e8-740fa4b83b0b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"c776f495-65b2-40a3-90c3-63df559ac482","name":"c776f495-65b2-40a3-90c3-63df559ac482","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"2047e9d2-d217-4970-a624-317dd6ce677b","name":"2047e9d2-d217-4970-a624-317dd6ce677b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"f3e7264f-0632-49ab-a30f-9be1f0a171b6","name":"f3e7264f-0632-49ab-a30f-9be1f0a171b6","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"d951311e-912b-4651-8a9c-bbbf6dbc025c","name":"d951311e-912b-4651-8a9c-bbbf6dbc025c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"5339ce2b-6d13-475f-adab-993098883b65","name":"5339ce2b-6d13-475f-adab-993098883b65","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"602b1368-8b88-4729-8a53-ba3b9d33e69e","name":"602b1368-8b88-4729-8a53-ba3b9d33e69e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"2eb2b517-510c-475d-bc56-17f25895492c","name":"2eb2b517-510c-475d-bc56-17f25895492c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"e78ca533-bd75-4242-a4fc-fea3f894a8b0","name":"e78ca533-bd75-4242-a4fc-fea3f894a8b0","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"dac8105e-f730-4b45-ab32-3878728c1cde","name":"dac8105e-f730-4b45-ab32-3878728c1cde","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"a2b6bdf4-e4f0-4fdb-92f8-f1c81d893a83","name":"a2b6bdf4-e4f0-4fdb-92f8-f1c81d893a83","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"75d57217-083f-495c-993f-4ab3e009a5a6","name":"75d57217-083f-495c-993f-4ab3e009a5a6","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"5db184dc-06b8-4417-93fd-897d7f84c2aa","name":"5db184dc-06b8-4417-93fd-897d7f84c2aa","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"9a4e1e3b-208f-4295-ad99-32db9717fd08","name":"9a4e1e3b-208f-4295-ad99-32db9717fd08","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -84,57 +84,23 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"81f9cae2-a751-4e4d-af10-3a57fec0bd40","path":"sprites/spr_mar_walk_pauldron2/spr_mar_walk_pauldron2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"0bd342cc-a552-4293-a730-5614fdb518f3","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"db63b0ea-9074-42a0-bdb0-2e1923ce2b0c","path":"sprites/spr_mar_walk_pauldron2/spr_mar_walk_pauldron2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"37de31b9-d304-47e6-9ea5-d44e3feb0e05","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"8df28315-269d-432b-a708-23820aeaab77","path":"sprites/spr_mar_walk_pauldron2/spr_mar_walk_pauldron2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"62a71675-6595-465d-8862-b2d823563ea4","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"dcf887bb-9920-47f6-b3e8-740fa4b83b0b","path":"sprites/spr_mar_walk_pauldron2/spr_mar_walk_pauldron2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"fec6f7d8-56ca-443c-b686-3031f116090c","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"c776f495-65b2-40a3-90c3-63df559ac482","path":"sprites/spr_mar_walk_pauldron2/spr_mar_walk_pauldron2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"073660be-f7d1-4170-a21e-a2915b533139","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"2047e9d2-d217-4970-a624-317dd6ce677b","path":"sprites/spr_mar_walk_pauldron2/spr_mar_walk_pauldron2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"65e2d395-3aa7-4301-abb3-cf59ee4e21ae","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"f3e7264f-0632-49ab-a30f-9be1f0a171b6","path":"sprites/spr_mar_walk_pauldron2/spr_mar_walk_pauldron2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"bc68a23c-7e6c-4f74-8469-b5c198d165d5","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"d951311e-912b-4651-8a9c-bbbf6dbc025c","path":"sprites/spr_mar_walk_pauldron2/spr_mar_walk_pauldron2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"f7551fa3-53f0-4852-89b6-9e1fcf36997a","IsCreationKey":false,"Key":7.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"5339ce2b-6d13-475f-adab-993098883b65","path":"sprites/spr_mar_walk_pauldron2/spr_mar_walk_pauldron2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"15845535-7a76-468f-9060-74c53736dd99","IsCreationKey":false,"Key":8.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"602b1368-8b88-4729-8a53-ba3b9d33e69e","path":"sprites/spr_mar_walk_pauldron2/spr_mar_walk_pauldron2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"8ef8f55e-93f7-487a-b48d-1e942f3493b7","IsCreationKey":false,"Key":9.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"2eb2b517-510c-475d-bc56-17f25895492c","path":"sprites/spr_mar_walk_pauldron2/spr_mar_walk_pauldron2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"06b2d985-f6df-4005-81cc-18bc9aeeb94e","IsCreationKey":false,"Key":10.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"e78ca533-bd75-4242-a4fc-fea3f894a8b0","path":"sprites/spr_mar_walk_pauldron2/spr_mar_walk_pauldron2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"3f040df1-e58d-4b78-8dbd-1fa774633ec4","IsCreationKey":false,"Key":11.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"dac8105e-f730-4b45-ab32-3878728c1cde","path":"sprites/spr_mar_walk_pauldron2/spr_mar_walk_pauldron2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"e2618a44-f935-4039-9723-38995ec0f345","IsCreationKey":false,"Key":12.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"a2b6bdf4-e4f0-4fdb-92f8-f1c81d893a83","path":"sprites/spr_mar_walk_pauldron2/spr_mar_walk_pauldron2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"ef3169c9-2bde-4dc5-8bc0-b593d55b0f76","IsCreationKey":false,"Key":13.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"75d57217-083f-495c-993f-4ab3e009a5a6","path":"sprites/spr_mar_walk_pauldron2/spr_mar_walk_pauldron2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"614bc5ed-c6b8-46e6-ae81-4dd34ebfef6d","IsCreationKey":false,"Key":14.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"5db184dc-06b8-4417-93fd-897d7f84c2aa","path":"sprites/spr_mar_walk_pauldron2/spr_mar_walk_pauldron2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"b554dfe4-317b-489f-b422-929b11e52eb2","IsCreationKey":false,"Key":15.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"9a4e1e3b-208f-4295-ad99-32db9717fd08","path":"sprites/spr_mar_walk_pauldron2/spr_mar_walk_pauldron2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"ec1f66aa-c7e9-47b4-a662-669c521aa7a8","IsCreationKey":false,"Key":16.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"81f9cae2-a751-4e4d-af10-3a57fec0bd40","path":"sprites/spr_mar_walk_pauldron2/spr_mar_walk_pauldron2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"0bd342cc-a552-4293-a730-5614fdb518f3","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"db63b0ea-9074-42a0-bdb0-2e1923ce2b0c","path":"sprites/spr_mar_walk_pauldron2/spr_mar_walk_pauldron2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"37de31b9-d304-47e6-9ea5-d44e3feb0e05","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"8df28315-269d-432b-a708-23820aeaab77","path":"sprites/spr_mar_walk_pauldron2/spr_mar_walk_pauldron2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"62a71675-6595-465d-8862-b2d823563ea4","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"dcf887bb-9920-47f6-b3e8-740fa4b83b0b","path":"sprites/spr_mar_walk_pauldron2/spr_mar_walk_pauldron2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"fec6f7d8-56ca-443c-b686-3031f116090c","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"c776f495-65b2-40a3-90c3-63df559ac482","path":"sprites/spr_mar_walk_pauldron2/spr_mar_walk_pauldron2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"073660be-f7d1-4170-a21e-a2915b533139","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"2047e9d2-d217-4970-a624-317dd6ce677b","path":"sprites/spr_mar_walk_pauldron2/spr_mar_walk_pauldron2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"65e2d395-3aa7-4301-abb3-cf59ee4e21ae","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"f3e7264f-0632-49ab-a30f-9be1f0a171b6","path":"sprites/spr_mar_walk_pauldron2/spr_mar_walk_pauldron2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"bc68a23c-7e6c-4f74-8469-b5c198d165d5","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"d951311e-912b-4651-8a9c-bbbf6dbc025c","path":"sprites/spr_mar_walk_pauldron2/spr_mar_walk_pauldron2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"f7551fa3-53f0-4852-89b6-9e1fcf36997a","IsCreationKey":false,"Key":7.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"5339ce2b-6d13-475f-adab-993098883b65","path":"sprites/spr_mar_walk_pauldron2/spr_mar_walk_pauldron2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"15845535-7a76-468f-9060-74c53736dd99","IsCreationKey":false,"Key":8.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"602b1368-8b88-4729-8a53-ba3b9d33e69e","path":"sprites/spr_mar_walk_pauldron2/spr_mar_walk_pauldron2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"8ef8f55e-93f7-487a-b48d-1e942f3493b7","IsCreationKey":false,"Key":9.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"2eb2b517-510c-475d-bc56-17f25895492c","path":"sprites/spr_mar_walk_pauldron2/spr_mar_walk_pauldron2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"06b2d985-f6df-4005-81cc-18bc9aeeb94e","IsCreationKey":false,"Key":10.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"e78ca533-bd75-4242-a4fc-fea3f894a8b0","path":"sprites/spr_mar_walk_pauldron2/spr_mar_walk_pauldron2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"3f040df1-e58d-4b78-8dbd-1fa774633ec4","IsCreationKey":false,"Key":11.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"dac8105e-f730-4b45-ab32-3878728c1cde","path":"sprites/spr_mar_walk_pauldron2/spr_mar_walk_pauldron2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"e2618a44-f935-4039-9723-38995ec0f345","IsCreationKey":false,"Key":12.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"a2b6bdf4-e4f0-4fdb-92f8-f1c81d893a83","path":"sprites/spr_mar_walk_pauldron2/spr_mar_walk_pauldron2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"ef3169c9-2bde-4dc5-8bc0-b593d55b0f76","IsCreationKey":false,"Key":13.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"75d57217-083f-495c-993f-4ab3e009a5a6","path":"sprites/spr_mar_walk_pauldron2/spr_mar_walk_pauldron2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"614bc5ed-c6b8-46e6-ae81-4dd34ebfef6d","IsCreationKey":false,"Key":14.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"5db184dc-06b8-4417-93fd-897d7f84c2aa","path":"sprites/spr_mar_walk_pauldron2/spr_mar_walk_pauldron2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"b554dfe4-317b-489f-b422-929b11e52eb2","IsCreationKey":false,"Key":15.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"9a4e1e3b-208f-4295-ad99-32db9717fd08","path":"sprites/spr_mar_walk_pauldron2/spr_mar_walk_pauldron2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"ec1f66aa-c7e9-47b4-a662-669c521aa7a8","IsCreationKey":false,"Key":16.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":{ diff --git a/sprites/spr_marine_base/spr_marine_base.yy b/sprites/spr_marine_base/spr_marine_base.yy index 89b62c4e77..0a2f24af04 100644 --- a/sprites/spr_marine_base/spr_marine_base.yy +++ b/sprites/spr_marine_base/spr_marine_base.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_marine_base", "bboxMode":0, "bbox_bottom":223, @@ -12,13 +12,13 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"9f83f9cb-6eaa-4dca-80fc-48c124c81686","name":"9f83f9cb-6eaa-4dca-80fc-48c124c81686","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"5a05aea4-57b6-4ab4-803b-a93394062444","name":"5a05aea4-57b6-4ab4-803b-a93394062444","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"2c6a533b-dd56-42e8-8cb2-12e93668ef65","name":"2c6a533b-dd56-42e8-8cb2-12e93668ef65","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"fd950c16-6d9d-4e20-a10d-276227a20344","name":"fd950c16-6d9d-4e20-a10d-276227a20344","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"fba90e85-801a-4835-aed5-4bb97356cb61","name":"fba90e85-801a-4835-aed5-4bb97356cb61","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"f0de4c5d-f50a-473f-9115-15ff989e446c","name":"f0de4c5d-f50a-473f-9115-15ff989e446c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"112d615d-f6ee-4aef-b624-bf4d20ae8400","name":"112d615d-f6ee-4aef-b624-bf4d20ae8400","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"9f83f9cb-6eaa-4dca-80fc-48c124c81686","name":"9f83f9cb-6eaa-4dca-80fc-48c124c81686","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"5a05aea4-57b6-4ab4-803b-a93394062444","name":"5a05aea4-57b6-4ab4-803b-a93394062444","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"2c6a533b-dd56-42e8-8cb2-12e93668ef65","name":"2c6a533b-dd56-42e8-8cb2-12e93668ef65","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"fd950c16-6d9d-4e20-a10d-276227a20344","name":"fd950c16-6d9d-4e20-a10d-276227a20344","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"fba90e85-801a-4835-aed5-4bb97356cb61","name":"fba90e85-801a-4835-aed5-4bb97356cb61","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"f0de4c5d-f50a-473f-9115-15ff989e446c","name":"f0de4c5d-f50a-473f-9115-15ff989e446c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"112d615d-f6ee-4aef-b624-bf4d20ae8400","name":"112d615d-f6ee-4aef-b624-bf4d20ae8400","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -74,27 +74,13 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"9f83f9cb-6eaa-4dca-80fc-48c124c81686","path":"sprites/spr_marine_base/spr_marine_base.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"7e6adee3-2036-475d-9a6f-d99dc9e6e50c","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"5a05aea4-57b6-4ab4-803b-a93394062444","path":"sprites/spr_marine_base/spr_marine_base.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"40fc45f9-b0d9-411a-a4b0-64633b87398d","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"2c6a533b-dd56-42e8-8cb2-12e93668ef65","path":"sprites/spr_marine_base/spr_marine_base.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"e4353a96-ea37-4bc1-8e30-3748a110a3f5","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"fd950c16-6d9d-4e20-a10d-276227a20344","path":"sprites/spr_marine_base/spr_marine_base.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"3357145b-4829-48c8-9e70-363ecb8cccb2","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"fba90e85-801a-4835-aed5-4bb97356cb61","path":"sprites/spr_marine_base/spr_marine_base.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"88f5ae33-5381-4147-899c-feaae6733f32","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"f0de4c5d-f50a-473f-9115-15ff989e446c","path":"sprites/spr_marine_base/spr_marine_base.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"e686c46d-d3e4-42ad-b4d8-bc5c53313237","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"112d615d-f6ee-4aef-b624-bf4d20ae8400","path":"sprites/spr_marine_base/spr_marine_base.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"be715bb4-0b5e-490b-a3a1-2a4dceef2e44","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"9f83f9cb-6eaa-4dca-80fc-48c124c81686","path":"sprites/spr_marine_base/spr_marine_base.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"7e6adee3-2036-475d-9a6f-d99dc9e6e50c","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"5a05aea4-57b6-4ab4-803b-a93394062444","path":"sprites/spr_marine_base/spr_marine_base.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"40fc45f9-b0d9-411a-a4b0-64633b87398d","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"2c6a533b-dd56-42e8-8cb2-12e93668ef65","path":"sprites/spr_marine_base/spr_marine_base.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"e4353a96-ea37-4bc1-8e30-3748a110a3f5","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"fd950c16-6d9d-4e20-a10d-276227a20344","path":"sprites/spr_marine_base/spr_marine_base.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"3357145b-4829-48c8-9e70-363ecb8cccb2","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"fba90e85-801a-4835-aed5-4bb97356cb61","path":"sprites/spr_marine_base/spr_marine_base.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"88f5ae33-5381-4147-899c-feaae6733f32","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"f0de4c5d-f50a-473f-9115-15ff989e446c","path":"sprites/spr_marine_base/spr_marine_base.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"e686c46d-d3e4-42ad-b4d8-bc5c53313237","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"112d615d-f6ee-4aef-b624-bf4d20ae8400","path":"sprites/spr_marine_base/spr_marine_base.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"be715bb4-0b5e-490b-a3a1-2a4dceef2e44","IsCreationKey":false,"Key":6.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 6b1393e071..437d1ac2a5 100644 --- a/sprites/spr_marine_cloth_hood/spr_marine_cloth_hood.yy +++ b/sprites/spr_marine_cloth_hood/spr_marine_cloth_hood.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_marine_cloth_hood", "bboxMode":0, "bbox_bottom":46, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"ec5d3ec6-f2b2-4d55-b5bd-e2ffa20891ec","name":"ec5d3ec6-f2b2-4d55-b5bd-e2ffa20891ec","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"ec5d3ec6-f2b2-4d55-b5bd-e2ffa20891ec","name":"ec5d3ec6-f2b2-4d55-b5bd-e2ffa20891ec","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "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_marine_head/spr_marine_head.yy b/sprites/spr_marine_head/spr_marine_head.yy index e7b599ad17..b648dcd902 100644 --- a/sprites/spr_marine_head/spr_marine_head.yy +++ b/sprites/spr_marine_head/spr_marine_head.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_marine_head", "bboxMode":0, "bbox_bottom":61, @@ -12,12 +12,12 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"9f83f9cb-6eaa-4dca-80fc-48c124c81686","name":"9f83f9cb-6eaa-4dca-80fc-48c124c81686","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"5a05aea4-57b6-4ab4-803b-a93394062444","name":"5a05aea4-57b6-4ab4-803b-a93394062444","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"2c6a533b-dd56-42e8-8cb2-12e93668ef65","name":"2c6a533b-dd56-42e8-8cb2-12e93668ef65","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"fd950c16-6d9d-4e20-a10d-276227a20344","name":"fd950c16-6d9d-4e20-a10d-276227a20344","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"fba90e85-801a-4835-aed5-4bb97356cb61","name":"fba90e85-801a-4835-aed5-4bb97356cb61","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"f0de4c5d-f50a-473f-9115-15ff989e446c","name":"f0de4c5d-f50a-473f-9115-15ff989e446c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"9f83f9cb-6eaa-4dca-80fc-48c124c81686","name":"9f83f9cb-6eaa-4dca-80fc-48c124c81686","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"5a05aea4-57b6-4ab4-803b-a93394062444","name":"5a05aea4-57b6-4ab4-803b-a93394062444","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"2c6a533b-dd56-42e8-8cb2-12e93668ef65","name":"2c6a533b-dd56-42e8-8cb2-12e93668ef65","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"fd950c16-6d9d-4e20-a10d-276227a20344","name":"fd950c16-6d9d-4e20-a10d-276227a20344","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"fba90e85-801a-4835-aed5-4bb97356cb61","name":"fba90e85-801a-4835-aed5-4bb97356cb61","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"f0de4c5d-f50a-473f-9115-15ff989e446c","name":"f0de4c5d-f50a-473f-9115-15ff989e446c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -73,24 +73,12 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"9f83f9cb-6eaa-4dca-80fc-48c124c81686","path":"sprites/spr_marine_head/spr_marine_head.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"9baab639-23b7-4d59-88d7-494e2931e56c","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"5a05aea4-57b6-4ab4-803b-a93394062444","path":"sprites/spr_marine_head/spr_marine_head.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"997fb703-58ef-440f-9c7a-44f62882543f","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"2c6a533b-dd56-42e8-8cb2-12e93668ef65","path":"sprites/spr_marine_head/spr_marine_head.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"dc9a2629-0444-42e0-9f6d-cf2661d1b364","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"fd950c16-6d9d-4e20-a10d-276227a20344","path":"sprites/spr_marine_head/spr_marine_head.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"a7bfc88a-66d4-467a-9544-8ef7d91d3cae","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"fba90e85-801a-4835-aed5-4bb97356cb61","path":"sprites/spr_marine_head/spr_marine_head.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"709b1f01-0ae6-42a7-8c57-5676c50b7cb0","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"f0de4c5d-f50a-473f-9115-15ff989e446c","path":"sprites/spr_marine_head/spr_marine_head.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"8f63c763-7e25-4e4b-8dc2-c61e0dffca39","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"9f83f9cb-6eaa-4dca-80fc-48c124c81686","path":"sprites/spr_marine_head/spr_marine_head.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"9baab639-23b7-4d59-88d7-494e2931e56c","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"5a05aea4-57b6-4ab4-803b-a93394062444","path":"sprites/spr_marine_head/spr_marine_head.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"997fb703-58ef-440f-9c7a-44f62882543f","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"2c6a533b-dd56-42e8-8cb2-12e93668ef65","path":"sprites/spr_marine_head/spr_marine_head.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"dc9a2629-0444-42e0-9f6d-cf2661d1b364","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"fd950c16-6d9d-4e20-a10d-276227a20344","path":"sprites/spr_marine_head/spr_marine_head.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"a7bfc88a-66d4-467a-9544-8ef7d91d3cae","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"fba90e85-801a-4835-aed5-4bb97356cb61","path":"sprites/spr_marine_head/spr_marine_head.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"709b1f01-0ae6-42a7-8c57-5676c50b7cb0","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"f0de4c5d-f50a-473f-9115-15ff989e446c","path":"sprites/spr_marine_head/spr_marine_head.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"8f63c763-7e25-4e4b-8dc2-c61e0dffca39","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_marine_robes/spr_marine_robes.yy b/sprites/spr_marine_robes/spr_marine_robes.yy index bd26238f1d..836ea1ed21 100644 --- a/sprites/spr_marine_robes/spr_marine_robes.yy +++ b/sprites/spr_marine_robes/spr_marine_robes.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_marine_robes", "bboxMode":0, "bbox_bottom":198, @@ -12,8 +12,8 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"c69262d4-e553-4269-a37b-ce6d95d4fbe9","name":"c69262d4-e553-4269-a37b-ce6d95d4fbe9","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"2517a4fc-f093-4d83-8a38-f4f33e3f9ed3","name":"2517a4fc-f093-4d83-8a38-f4f33e3f9ed3","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"c69262d4-e553-4269-a37b-ce6d95d4fbe9","name":"c69262d4-e553-4269-a37b-ce6d95d4fbe9","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"2517a4fc-f093-4d83-8a38-f4f33e3f9ed3","name":"2517a4fc-f093-4d83-8a38-f4f33e3f9ed3","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -69,12 +69,8 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"c69262d4-e553-4269-a37b-ce6d95d4fbe9","path":"sprites/spr_marine_robes/spr_marine_robes.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"465410e8-8c66-4937-9939-84339eb58dc9","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"2517a4fc-f093-4d83-8a38-f4f33e3f9ed3","path":"sprites/spr_marine_robes/spr_marine_robes.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"8880f29c-fb69-4fe1-bcdf-d56db7fd4d89","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"c69262d4-e553-4269-a37b-ce6d95d4fbe9","path":"sprites/spr_marine_robes/spr_marine_robes.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"465410e8-8c66-4937-9939-84339eb58dc9","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"2517a4fc-f093-4d83-8a38-f4f33e3f9ed3","path":"sprites/spr_marine_robes/spr_marine_robes.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"8880f29c-fb69-4fe1-bcdf-d56db7fd4d89","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_marksmans_honor/spr_marksmans_honor.yy b/sprites/spr_marksmans_honor/spr_marksmans_honor.yy index 4302733979..fb9c7c8138 100644 --- a/sprites/spr_marksmans_honor/spr_marksmans_honor.yy +++ b/sprites/spr_marksmans_honor/spr_marksmans_honor.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_marksmans_honor", "bboxMode":0, "bbox_bottom":26, @@ -12,8 +12,8 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"6ebea8d5-984d-4402-9aaf-ec60793fd75d","name":"6ebea8d5-984d-4402-9aaf-ec60793fd75d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"03289b4f-ccaf-48a8-b0b7-c2a4141465d1","name":"03289b4f-ccaf-48a8-b0b7-c2a4141465d1","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"6ebea8d5-984d-4402-9aaf-ec60793fd75d","name":"6ebea8d5-984d-4402-9aaf-ec60793fd75d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"03289b4f-ccaf-48a8-b0b7-c2a4141465d1","name":"03289b4f-ccaf-48a8-b0b7-c2a4141465d1","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -69,12 +69,8 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"6ebea8d5-984d-4402-9aaf-ec60793fd75d","path":"sprites/spr_marksmans_honor/spr_marksmans_honor.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"ccb9b2a6-2d8d-4fe5-8d85-f4cf871046a5","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"03289b4f-ccaf-48a8-b0b7-c2a4141465d1","path":"sprites/spr_marksmans_honor/spr_marksmans_honor.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"399cb25a-d0c4-4928-b1ba-0f988b480254","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"6ebea8d5-984d-4402-9aaf-ec60793fd75d","path":"sprites/spr_marksmans_honor/spr_marksmans_honor.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"ccb9b2a6-2d8d-4fe5-8d85-f4cf871046a5","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"03289b4f-ccaf-48a8-b0b7-c2a4141465d1","path":"sprites/spr_marksmans_honor/spr_marksmans_honor.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"399cb25a-d0c4-4928-b1ba-0f988b480254","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_master_splash/spr_master_splash.yy b/sprites/spr_master_splash/spr_master_splash.yy index 896c339055..431f0e9700 100644 --- a/sprites/spr_master_splash/spr_master_splash.yy +++ b/sprites/spr_master_splash/spr_master_splash.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_master_splash", "bboxMode":0, "bbox_bottom":479, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"139198e3-1db0-4dfc-8fd5-2b19c54b05ba","name":"139198e3-1db0-4dfc-8fd5-2b19c54b05ba","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"139198e3-1db0-4dfc-8fd5-2b19c54b05ba","name":"139198e3-1db0-4dfc-8fd5-2b19c54b05ba","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"139198e3-1db0-4dfc-8fd5-2b19c54b05ba","path":"sprites/spr_master_splash/spr_master_splash.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"6ff8d8db-ce0f-44a4-b676-62c6aa9da21d","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"139198e3-1db0-4dfc-8fd5-2b19c54b05ba","path":"sprites/spr_master_splash/spr_master_splash.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"6ff8d8db-ce0f-44a4-b676-62c6aa9da21d","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":{ diff --git a/sprites/spr_master_title/spr_master_title.yy b/sprites/spr_master_title/spr_master_title.yy index d0dc2036ca..c10f643174 100644 --- a/sprites/spr_master_title/spr_master_title.yy +++ b/sprites/spr_master_title/spr_master_title.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_master_title", "bboxMode":0, "bbox_bottom":2, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"79c91420-f39c-4f56-9743-270274c42515","name":"79c91420-f39c-4f56-9743-270274c42515","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"79c91420-f39c-4f56-9743-270274c42515","name":"79c91420-f39c-4f56-9743-270274c42515","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"79c91420-f39c-4f56-9743-270274c42515","path":"sprites/spr_master_title/spr_master_title.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"94770730-06c8-4e1f-a4c7-7c71948ab98d","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"79c91420-f39c-4f56-9743-270274c42515","path":"sprites/spr_master_title/spr_master_title.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"94770730-06c8-4e1f-a4c7-7c71948ab98d","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_maximus_colors/spr_maximus_colors.yy b/sprites/spr_maximus_colors/spr_maximus_colors.yy index 0054d33192..95f95f1541 100644 --- a/sprites/spr_maximus_colors/spr_maximus_colors.yy +++ b/sprites/spr_maximus_colors/spr_maximus_colors.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_maximus_colors", "bboxMode":0, "bbox_bottom":220, @@ -12,19 +12,19 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"efad9889-e5a3-4dff-b1b5-a71f3d1efe66","name":"efad9889-e5a3-4dff-b1b5-a71f3d1efe66","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"d51f983a-1596-4dfa-a471-604575f8d758","name":"d51f983a-1596-4dfa-a471-604575f8d758","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"78d16c23-bebd-4773-9ae6-0e3b87a4fa74","name":"78d16c23-bebd-4773-9ae6-0e3b87a4fa74","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"2911ab4b-5f10-490e-8d4a-b378f70d4776","name":"2911ab4b-5f10-490e-8d4a-b378f70d4776","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"ca1dc041-04c2-42de-ba8f-367d17ebbaef","name":"ca1dc041-04c2-42de-ba8f-367d17ebbaef","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"493e74a6-0b54-43ee-bba5-a53005b9f601","name":"493e74a6-0b54-43ee-bba5-a53005b9f601","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"b1e887a9-9646-488d-91fa-7f71cbc257d4","name":"b1e887a9-9646-488d-91fa-7f71cbc257d4","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"63ab01ac-d593-43fe-b2f8-3fae21ad8a70","name":"63ab01ac-d593-43fe-b2f8-3fae21ad8a70","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"1947bde9-4bac-457b-b372-06b6b6c3a8b2","name":"1947bde9-4bac-457b-b372-06b6b6c3a8b2","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"d81d991c-217b-466a-817a-a195815277d7","name":"d81d991c-217b-466a-817a-a195815277d7","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"d5fca723-ed0a-493b-abfd-dd39d423f991","name":"d5fca723-ed0a-493b-abfd-dd39d423f991","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"9b0f363d-67cc-474a-83f2-88f783b12bd3","name":"9b0f363d-67cc-474a-83f2-88f783b12bd3","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"961521f2-a3f0-462d-9c13-369f928b5594","name":"961521f2-a3f0-462d-9c13-369f928b5594","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"efad9889-e5a3-4dff-b1b5-a71f3d1efe66","name":"efad9889-e5a3-4dff-b1b5-a71f3d1efe66","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"d51f983a-1596-4dfa-a471-604575f8d758","name":"d51f983a-1596-4dfa-a471-604575f8d758","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"78d16c23-bebd-4773-9ae6-0e3b87a4fa74","name":"78d16c23-bebd-4773-9ae6-0e3b87a4fa74","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"2911ab4b-5f10-490e-8d4a-b378f70d4776","name":"2911ab4b-5f10-490e-8d4a-b378f70d4776","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"ca1dc041-04c2-42de-ba8f-367d17ebbaef","name":"ca1dc041-04c2-42de-ba8f-367d17ebbaef","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"493e74a6-0b54-43ee-bba5-a53005b9f601","name":"493e74a6-0b54-43ee-bba5-a53005b9f601","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"b1e887a9-9646-488d-91fa-7f71cbc257d4","name":"b1e887a9-9646-488d-91fa-7f71cbc257d4","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"63ab01ac-d593-43fe-b2f8-3fae21ad8a70","name":"63ab01ac-d593-43fe-b2f8-3fae21ad8a70","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"1947bde9-4bac-457b-b372-06b6b6c3a8b2","name":"1947bde9-4bac-457b-b372-06b6b6c3a8b2","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"d81d991c-217b-466a-817a-a195815277d7","name":"d81d991c-217b-466a-817a-a195815277d7","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"d5fca723-ed0a-493b-abfd-dd39d423f991","name":"d5fca723-ed0a-493b-abfd-dd39d423f991","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"9b0f363d-67cc-474a-83f2-88f783b12bd3","name":"9b0f363d-67cc-474a-83f2-88f783b12bd3","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"961521f2-a3f0-462d-9c13-369f928b5594","name":"961521f2-a3f0-462d-9c13-369f928b5594","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -80,45 +80,19 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"efad9889-e5a3-4dff-b1b5-a71f3d1efe66","path":"sprites/spr_maximus_colors/spr_maximus_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"8a0f4334-9529-4cd6-ac67-1a3eab5a387a","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"d51f983a-1596-4dfa-a471-604575f8d758","path":"sprites/spr_maximus_colors/spr_maximus_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"eeb4850a-8933-4f8f-a87f-20c23dc42ec6","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"78d16c23-bebd-4773-9ae6-0e3b87a4fa74","path":"sprites/spr_maximus_colors/spr_maximus_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"722ee4dd-b531-47a5-b37d-272d3b2d7ad8","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"2911ab4b-5f10-490e-8d4a-b378f70d4776","path":"sprites/spr_maximus_colors/spr_maximus_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"3242b5b3-24bd-4175-9af2-5f379b44305a","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"ca1dc041-04c2-42de-ba8f-367d17ebbaef","path":"sprites/spr_maximus_colors/spr_maximus_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"5777af28-cf29-43d2-8092-8738a2c12b5d","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"493e74a6-0b54-43ee-bba5-a53005b9f601","path":"sprites/spr_maximus_colors/spr_maximus_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"c79176e4-18d4-4833-8f13-1b06c19e9150","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"b1e887a9-9646-488d-91fa-7f71cbc257d4","path":"sprites/spr_maximus_colors/spr_maximus_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"09b73112-ad1d-4019-a20b-07a5b569d4d8","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"63ab01ac-d593-43fe-b2f8-3fae21ad8a70","path":"sprites/spr_maximus_colors/spr_maximus_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"02aa1cdf-ecda-4511-94a3-57c8940e29ee","IsCreationKey":false,"Key":7.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"1947bde9-4bac-457b-b372-06b6b6c3a8b2","path":"sprites/spr_maximus_colors/spr_maximus_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"ddcb749d-0a9a-4f7d-a298-147aa3d94b71","IsCreationKey":false,"Key":8.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"d81d991c-217b-466a-817a-a195815277d7","path":"sprites/spr_maximus_colors/spr_maximus_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"b55c5033-5687-4c72-ad54-a614a228de1a","IsCreationKey":false,"Key":9.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"d5fca723-ed0a-493b-abfd-dd39d423f991","path":"sprites/spr_maximus_colors/spr_maximus_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"136412ca-466d-4197-b145-ac8f364356e8","IsCreationKey":false,"Key":10.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"9b0f363d-67cc-474a-83f2-88f783b12bd3","path":"sprites/spr_maximus_colors/spr_maximus_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"0f7bf925-c4c9-4a97-be0b-4d59812b39ff","IsCreationKey":false,"Key":11.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"961521f2-a3f0-462d-9c13-369f928b5594","path":"sprites/spr_maximus_colors/spr_maximus_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"839d2136-94be-4b64-b5bc-2340a2227577","IsCreationKey":false,"Key":12.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"efad9889-e5a3-4dff-b1b5-a71f3d1efe66","path":"sprites/spr_maximus_colors/spr_maximus_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"8a0f4334-9529-4cd6-ac67-1a3eab5a387a","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"d51f983a-1596-4dfa-a471-604575f8d758","path":"sprites/spr_maximus_colors/spr_maximus_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"eeb4850a-8933-4f8f-a87f-20c23dc42ec6","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"78d16c23-bebd-4773-9ae6-0e3b87a4fa74","path":"sprites/spr_maximus_colors/spr_maximus_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"722ee4dd-b531-47a5-b37d-272d3b2d7ad8","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"2911ab4b-5f10-490e-8d4a-b378f70d4776","path":"sprites/spr_maximus_colors/spr_maximus_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"3242b5b3-24bd-4175-9af2-5f379b44305a","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"ca1dc041-04c2-42de-ba8f-367d17ebbaef","path":"sprites/spr_maximus_colors/spr_maximus_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"5777af28-cf29-43d2-8092-8738a2c12b5d","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"493e74a6-0b54-43ee-bba5-a53005b9f601","path":"sprites/spr_maximus_colors/spr_maximus_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"c79176e4-18d4-4833-8f13-1b06c19e9150","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"b1e887a9-9646-488d-91fa-7f71cbc257d4","path":"sprites/spr_maximus_colors/spr_maximus_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"09b73112-ad1d-4019-a20b-07a5b569d4d8","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"63ab01ac-d593-43fe-b2f8-3fae21ad8a70","path":"sprites/spr_maximus_colors/spr_maximus_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"02aa1cdf-ecda-4511-94a3-57c8940e29ee","IsCreationKey":false,"Key":7.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"1947bde9-4bac-457b-b372-06b6b6c3a8b2","path":"sprites/spr_maximus_colors/spr_maximus_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"ddcb749d-0a9a-4f7d-a298-147aa3d94b71","IsCreationKey":false,"Key":8.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"d81d991c-217b-466a-817a-a195815277d7","path":"sprites/spr_maximus_colors/spr_maximus_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"b55c5033-5687-4c72-ad54-a614a228de1a","IsCreationKey":false,"Key":9.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"d5fca723-ed0a-493b-abfd-dd39d423f991","path":"sprites/spr_maximus_colors/spr_maximus_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"136412ca-466d-4197-b145-ac8f364356e8","IsCreationKey":false,"Key":10.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"9b0f363d-67cc-474a-83f2-88f783b12bd3","path":"sprites/spr_maximus_colors/spr_maximus_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"0f7bf925-c4c9-4a97-be0b-4d59812b39ff","IsCreationKey":false,"Key":11.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"961521f2-a3f0-462d-9c13-369f928b5594","path":"sprites/spr_maximus_colors/spr_maximus_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"839d2136-94be-4b64-b5bc-2340a2227577","IsCreationKey":false,"Key":12.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_maximus_colors2/spr_maximus_colors2.yy b/sprites/spr_maximus_colors2/spr_maximus_colors2.yy index e8c18a718c..93539fb16f 100644 --- a/sprites/spr_maximus_colors2/spr_maximus_colors2.yy +++ b/sprites/spr_maximus_colors2/spr_maximus_colors2.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_maximus_colors2", "bboxMode":0, "bbox_bottom":227, @@ -12,20 +12,20 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"c8cb17b6-c6be-417a-89ef-bf9a93bd560f","name":"c8cb17b6-c6be-417a-89ef-bf9a93bd560f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"4d7d4b8a-b7d6-40ad-9da5-97b67d5ab9a2","name":"4d7d4b8a-b7d6-40ad-9da5-97b67d5ab9a2","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"2b4bae8a-552a-4ddf-91de-7f246ad7923b","name":"2b4bae8a-552a-4ddf-91de-7f246ad7923b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"24ba43be-2ed3-4a99-82ac-a2ffb43c6e16","name":"24ba43be-2ed3-4a99-82ac-a2ffb43c6e16","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"8fecf39d-c055-449d-bec6-eba091676059","name":"8fecf39d-c055-449d-bec6-eba091676059","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"a35b52da-bf3f-483d-98ef-7a6309f140a8","name":"a35b52da-bf3f-483d-98ef-7a6309f140a8","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"03cc23b6-cf2e-405d-910c-27af987d7e4c","name":"03cc23b6-cf2e-405d-910c-27af987d7e4c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"2912ac20-8fa5-4837-aad0-eaa2ccc2a21a","name":"2912ac20-8fa5-4837-aad0-eaa2ccc2a21a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"ed42e076-eb1a-4eca-88bc-b198d12d8291","name":"ed42e076-eb1a-4eca-88bc-b198d12d8291","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"318341de-fa3b-4c86-a354-c490f5ac3a28","name":"318341de-fa3b-4c86-a354-c490f5ac3a28","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"1d0a0c1c-38a8-4327-bc89-78b0a370739a","name":"1d0a0c1c-38a8-4327-bc89-78b0a370739a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"684d2ac2-b224-45e1-bc09-69a37a9dae37","name":"684d2ac2-b224-45e1-bc09-69a37a9dae37","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"c50ba520-6850-41ff-98b0-def6581631a5","name":"c50ba520-6850-41ff-98b0-def6581631a5","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"476657fe-2ada-41a7-8162-775ffa4b1576","name":"476657fe-2ada-41a7-8162-775ffa4b1576","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"c8cb17b6-c6be-417a-89ef-bf9a93bd560f","name":"c8cb17b6-c6be-417a-89ef-bf9a93bd560f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"4d7d4b8a-b7d6-40ad-9da5-97b67d5ab9a2","name":"4d7d4b8a-b7d6-40ad-9da5-97b67d5ab9a2","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"2b4bae8a-552a-4ddf-91de-7f246ad7923b","name":"2b4bae8a-552a-4ddf-91de-7f246ad7923b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"24ba43be-2ed3-4a99-82ac-a2ffb43c6e16","name":"24ba43be-2ed3-4a99-82ac-a2ffb43c6e16","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"8fecf39d-c055-449d-bec6-eba091676059","name":"8fecf39d-c055-449d-bec6-eba091676059","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"a35b52da-bf3f-483d-98ef-7a6309f140a8","name":"a35b52da-bf3f-483d-98ef-7a6309f140a8","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"03cc23b6-cf2e-405d-910c-27af987d7e4c","name":"03cc23b6-cf2e-405d-910c-27af987d7e4c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"2912ac20-8fa5-4837-aad0-eaa2ccc2a21a","name":"2912ac20-8fa5-4837-aad0-eaa2ccc2a21a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"ed42e076-eb1a-4eca-88bc-b198d12d8291","name":"ed42e076-eb1a-4eca-88bc-b198d12d8291","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"318341de-fa3b-4c86-a354-c490f5ac3a28","name":"318341de-fa3b-4c86-a354-c490f5ac3a28","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"1d0a0c1c-38a8-4327-bc89-78b0a370739a","name":"1d0a0c1c-38a8-4327-bc89-78b0a370739a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"684d2ac2-b224-45e1-bc09-69a37a9dae37","name":"684d2ac2-b224-45e1-bc09-69a37a9dae37","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"c50ba520-6850-41ff-98b0-def6581631a5","name":"c50ba520-6850-41ff-98b0-def6581631a5","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"476657fe-2ada-41a7-8162-775ffa4b1576","name":"476657fe-2ada-41a7-8162-775ffa4b1576","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -81,48 +81,20 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"c8cb17b6-c6be-417a-89ef-bf9a93bd560f","path":"sprites/spr_maximus_colors2/spr_maximus_colors2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"275f7692-e3c9-4c5a-862c-cfcda559f1d6","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"4d7d4b8a-b7d6-40ad-9da5-97b67d5ab9a2","path":"sprites/spr_maximus_colors2/spr_maximus_colors2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"c01ace79-390d-4c4b-b80a-c17d379254b7","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"2b4bae8a-552a-4ddf-91de-7f246ad7923b","path":"sprites/spr_maximus_colors2/spr_maximus_colors2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"4e1b8ef5-df11-4a9b-a79d-e986f294c399","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"24ba43be-2ed3-4a99-82ac-a2ffb43c6e16","path":"sprites/spr_maximus_colors2/spr_maximus_colors2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"3ef6c561-6e91-43ab-871d-3b8bfbb90bce","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"8fecf39d-c055-449d-bec6-eba091676059","path":"sprites/spr_maximus_colors2/spr_maximus_colors2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"89f7e359-08d5-46aa-9b97-a9c0fff83b08","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"a35b52da-bf3f-483d-98ef-7a6309f140a8","path":"sprites/spr_maximus_colors2/spr_maximus_colors2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"f3c7ea15-503e-4e33-8e26-5dc230326770","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"03cc23b6-cf2e-405d-910c-27af987d7e4c","path":"sprites/spr_maximus_colors2/spr_maximus_colors2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"0ae99b10-6856-47e2-bc24-32f924978e77","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"2912ac20-8fa5-4837-aad0-eaa2ccc2a21a","path":"sprites/spr_maximus_colors2/spr_maximus_colors2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"a21311c7-e30f-4457-afe2-4eba5441d834","IsCreationKey":false,"Key":7.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"ed42e076-eb1a-4eca-88bc-b198d12d8291","path":"sprites/spr_maximus_colors2/spr_maximus_colors2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"c403f8cf-a7cb-4253-946d-b3e7cf5f9be7","IsCreationKey":false,"Key":8.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"318341de-fa3b-4c86-a354-c490f5ac3a28","path":"sprites/spr_maximus_colors2/spr_maximus_colors2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"90342c3a-c5e7-4c30-b02e-055b74b415ac","IsCreationKey":false,"Key":9.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"1d0a0c1c-38a8-4327-bc89-78b0a370739a","path":"sprites/spr_maximus_colors2/spr_maximus_colors2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"7fd98488-1dcd-42c5-874d-748e424b7bcc","IsCreationKey":false,"Key":10.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"684d2ac2-b224-45e1-bc09-69a37a9dae37","path":"sprites/spr_maximus_colors2/spr_maximus_colors2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"8298b0ca-d94a-4e7d-93b5-843f9e8c70ae","IsCreationKey":false,"Key":11.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"c50ba520-6850-41ff-98b0-def6581631a5","path":"sprites/spr_maximus_colors2/spr_maximus_colors2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"25845d32-a357-44c9-9fb4-5ee87128531e","IsCreationKey":false,"Key":12.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"476657fe-2ada-41a7-8162-775ffa4b1576","path":"sprites/spr_maximus_colors2/spr_maximus_colors2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"71e2989a-48fc-49e1-b7ca-5dcc46f18d6b","IsCreationKey":false,"Key":13.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"c8cb17b6-c6be-417a-89ef-bf9a93bd560f","path":"sprites/spr_maximus_colors2/spr_maximus_colors2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"275f7692-e3c9-4c5a-862c-cfcda559f1d6","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"4d7d4b8a-b7d6-40ad-9da5-97b67d5ab9a2","path":"sprites/spr_maximus_colors2/spr_maximus_colors2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"c01ace79-390d-4c4b-b80a-c17d379254b7","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"2b4bae8a-552a-4ddf-91de-7f246ad7923b","path":"sprites/spr_maximus_colors2/spr_maximus_colors2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"4e1b8ef5-df11-4a9b-a79d-e986f294c399","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"24ba43be-2ed3-4a99-82ac-a2ffb43c6e16","path":"sprites/spr_maximus_colors2/spr_maximus_colors2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"3ef6c561-6e91-43ab-871d-3b8bfbb90bce","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"8fecf39d-c055-449d-bec6-eba091676059","path":"sprites/spr_maximus_colors2/spr_maximus_colors2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"89f7e359-08d5-46aa-9b97-a9c0fff83b08","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"a35b52da-bf3f-483d-98ef-7a6309f140a8","path":"sprites/spr_maximus_colors2/spr_maximus_colors2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"f3c7ea15-503e-4e33-8e26-5dc230326770","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"03cc23b6-cf2e-405d-910c-27af987d7e4c","path":"sprites/spr_maximus_colors2/spr_maximus_colors2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"0ae99b10-6856-47e2-bc24-32f924978e77","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"2912ac20-8fa5-4837-aad0-eaa2ccc2a21a","path":"sprites/spr_maximus_colors2/spr_maximus_colors2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"a21311c7-e30f-4457-afe2-4eba5441d834","IsCreationKey":false,"Key":7.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"ed42e076-eb1a-4eca-88bc-b198d12d8291","path":"sprites/spr_maximus_colors2/spr_maximus_colors2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"c403f8cf-a7cb-4253-946d-b3e7cf5f9be7","IsCreationKey":false,"Key":8.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"318341de-fa3b-4c86-a354-c490f5ac3a28","path":"sprites/spr_maximus_colors2/spr_maximus_colors2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"90342c3a-c5e7-4c30-b02e-055b74b415ac","IsCreationKey":false,"Key":9.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"1d0a0c1c-38a8-4327-bc89-78b0a370739a","path":"sprites/spr_maximus_colors2/spr_maximus_colors2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"7fd98488-1dcd-42c5-874d-748e424b7bcc","IsCreationKey":false,"Key":10.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"684d2ac2-b224-45e1-bc09-69a37a9dae37","path":"sprites/spr_maximus_colors2/spr_maximus_colors2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"8298b0ca-d94a-4e7d-93b5-843f9e8c70ae","IsCreationKey":false,"Key":11.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"c50ba520-6850-41ff-98b0-def6581631a5","path":"sprites/spr_maximus_colors2/spr_maximus_colors2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"25845d32-a357-44c9-9fb4-5ee87128531e","IsCreationKey":false,"Key":12.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"476657fe-2ada-41a7-8162-775ffa4b1576","path":"sprites/spr_maximus_colors2/spr_maximus_colors2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"71e2989a-48fc-49e1-b7ca-5dcc46f18d6b","IsCreationKey":false,"Key":13.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_medicine_icon/spr_medicine_icon.yy b/sprites/spr_medicine_icon/spr_medicine_icon.yy index 1facd441ce..08ffa42b61 100644 --- a/sprites/spr_medicine_icon/spr_medicine_icon.yy +++ b/sprites/spr_medicine_icon/spr_medicine_icon.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_medicine_icon", "bboxMode":0, "bbox_bottom":56, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"0fbf6532-6be4-43b1-9c15-8bf354357241","name":"0fbf6532-6be4-43b1-9c15-8bf354357241","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"0fbf6532-6be4-43b1-9c15-8bf354357241","name":"0fbf6532-6be4-43b1-9c15-8bf354357241","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"0fbf6532-6be4-43b1-9c15-8bf354357241","path":"sprites/spr_medicine_icon/spr_medicine_icon.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"78528be8-8310-462c-a5df-9390de9368f4","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"0fbf6532-6be4-43b1-9c15-8bf354357241","path":"sprites/spr_medicine_icon/spr_medicine_icon.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"78528be8-8310-462c-a5df-9390de9368f4","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_melta/spr_melta.yy b/sprites/spr_melta/spr_melta.yy index d83529a0c5..3eb43b6ae8 100644 --- a/sprites/spr_melta/spr_melta.yy +++ b/sprites/spr_melta/spr_melta.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_melta", "bboxMode":2, "bbox_bottom":29, @@ -12,14 +12,14 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"9b57cafa-76c3-40cc-90ee-d3356794051b","name":"9b57cafa-76c3-40cc-90ee-d3356794051b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"3095ccce-dd3f-446b-97f7-95dd4c2c8a06","name":"3095ccce-dd3f-446b-97f7-95dd4c2c8a06","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"75264f28-3821-4997-930c-60e09ac121bd","name":"75264f28-3821-4997-930c-60e09ac121bd","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"efed80f4-9f46-4b37-ac81-066e0bb00fda","name":"efed80f4-9f46-4b37-ac81-066e0bb00fda","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"549538a6-1b70-4144-88ce-8ae66206eed9","name":"549538a6-1b70-4144-88ce-8ae66206eed9","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"0e78fbd4-5407-4d29-97ed-f7cb92f66a2d","name":"0e78fbd4-5407-4d29-97ed-f7cb92f66a2d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"6dad0bf6-dc80-40b6-8f15-c64e5792a9ce","name":"6dad0bf6-dc80-40b6-8f15-c64e5792a9ce","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"ba709feb-d1d2-432a-b1ba-72bccf507015","name":"ba709feb-d1d2-432a-b1ba-72bccf507015","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"9b57cafa-76c3-40cc-90ee-d3356794051b","name":"9b57cafa-76c3-40cc-90ee-d3356794051b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"3095ccce-dd3f-446b-97f7-95dd4c2c8a06","name":"3095ccce-dd3f-446b-97f7-95dd4c2c8a06","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"75264f28-3821-4997-930c-60e09ac121bd","name":"75264f28-3821-4997-930c-60e09ac121bd","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"efed80f4-9f46-4b37-ac81-066e0bb00fda","name":"efed80f4-9f46-4b37-ac81-066e0bb00fda","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"549538a6-1b70-4144-88ce-8ae66206eed9","name":"549538a6-1b70-4144-88ce-8ae66206eed9","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"0e78fbd4-5407-4d29-97ed-f7cb92f66a2d","name":"0e78fbd4-5407-4d29-97ed-f7cb92f66a2d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"6dad0bf6-dc80-40b6-8f15-c64e5792a9ce","name":"6dad0bf6-dc80-40b6-8f15-c64e5792a9ce","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"ba709feb-d1d2-432a-b1ba-72bccf507015","name":"ba709feb-d1d2-432a-b1ba-72bccf507015","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -75,30 +75,14 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"9b57cafa-76c3-40cc-90ee-d3356794051b","path":"sprites/spr_melta/spr_melta.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"01320803-609a-4af2-bea2-6042e6d1c093","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"3095ccce-dd3f-446b-97f7-95dd4c2c8a06","path":"sprites/spr_melta/spr_melta.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"a6dad15c-c679-46f9-af64-f168b51b1029","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"75264f28-3821-4997-930c-60e09ac121bd","path":"sprites/spr_melta/spr_melta.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"9aecd644-8450-4c87-a6e6-2f3e8310a5fe","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"efed80f4-9f46-4b37-ac81-066e0bb00fda","path":"sprites/spr_melta/spr_melta.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"587bd5b6-a72a-48e5-a2e3-a4042e58c53d","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"549538a6-1b70-4144-88ce-8ae66206eed9","path":"sprites/spr_melta/spr_melta.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"d65d15c8-88d7-493a-9ad0-d187c873732e","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"0e78fbd4-5407-4d29-97ed-f7cb92f66a2d","path":"sprites/spr_melta/spr_melta.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"8b205325-4ab1-4ecc-8807-a86c94717e8d","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"6dad0bf6-dc80-40b6-8f15-c64e5792a9ce","path":"sprites/spr_melta/spr_melta.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"d6eb84ca-ea7c-4bf8-8635-219af404dd5f","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"ba709feb-d1d2-432a-b1ba-72bccf507015","path":"sprites/spr_melta/spr_melta.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"525c863e-ef29-4744-bf9f-0f69d713c150","IsCreationKey":false,"Key":7.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"9b57cafa-76c3-40cc-90ee-d3356794051b","path":"sprites/spr_melta/spr_melta.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"01320803-609a-4af2-bea2-6042e6d1c093","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"3095ccce-dd3f-446b-97f7-95dd4c2c8a06","path":"sprites/spr_melta/spr_melta.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"a6dad15c-c679-46f9-af64-f168b51b1029","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"75264f28-3821-4997-930c-60e09ac121bd","path":"sprites/spr_melta/spr_melta.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"9aecd644-8450-4c87-a6e6-2f3e8310a5fe","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"efed80f4-9f46-4b37-ac81-066e0bb00fda","path":"sprites/spr_melta/spr_melta.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"587bd5b6-a72a-48e5-a2e3-a4042e58c53d","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"549538a6-1b70-4144-88ce-8ae66206eed9","path":"sprites/spr_melta/spr_melta.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"d65d15c8-88d7-493a-9ad0-d187c873732e","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"0e78fbd4-5407-4d29-97ed-f7cb92f66a2d","path":"sprites/spr_melta/spr_melta.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"8b205325-4ab1-4ecc-8807-a86c94717e8d","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"6dad0bf6-dc80-40b6-8f15-c64e5792a9ce","path":"sprites/spr_melta/spr_melta.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"d6eb84ca-ea7c-4bf8-8635-219af404dd5f","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"ba709feb-d1d2-432a-b1ba-72bccf507015","path":"sprites/spr_melta/spr_melta.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"525c863e-ef29-4744-bf9f-0f69d713c150","IsCreationKey":false,"Key":7.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":{ diff --git a/sprites/spr_metal_tabbard/spr_metal_tabbard.yy b/sprites/spr_metal_tabbard/spr_metal_tabbard.yy index 5f3f896479..804fa35cf6 100644 --- a/sprites/spr_metal_tabbard/spr_metal_tabbard.yy +++ b/sprites/spr_metal_tabbard/spr_metal_tabbard.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_metal_tabbard", "bboxMode":0, "bbox_bottom":226, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"c686bbde-e480-472c-bb08-d523ecc16fd7","name":"c686bbde-e480-472c-bb08-d523ecc16fd7","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"c686bbde-e480-472c-bb08-d523ecc16fd7","name":"c686bbde-e480-472c-bb08-d523ecc16fd7","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "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_belt/spr_mk3_belt.yy b/sprites/spr_mk3_belt/spr_mk3_belt.yy index 1d0a44bd03..b9140cf5a4 100644 --- a/sprites/spr_mk3_belt/spr_mk3_belt.yy +++ b/sprites/spr_mk3_belt/spr_mk3_belt.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_mk3_belt", "bboxMode":0, "bbox_bottom":133, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"358913f3-25cd-4411-aa3a-01c656c1166c","name":"358913f3-25cd-4411-aa3a-01c656c1166c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"358913f3-25cd-4411-aa3a-01c656c1166c","name":"358913f3-25cd-4411-aa3a-01c656c1166c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"358913f3-25cd-4411-aa3a-01c656c1166c","path":"sprites/spr_mk3_belt/spr_mk3_belt.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"47d7ef7d-b3f5-48e5-9ee6-d99a5f3de6a8","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"358913f3-25cd-4411-aa3a-01c656c1166c","path":"sprites/spr_mk3_belt/spr_mk3_belt.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"47d7ef7d-b3f5-48e5-9ee6-d99a5f3de6a8","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_chest/spr_mk3_chest.yy b/sprites/spr_mk3_chest/spr_mk3_chest.yy index df685b8560..243a5f82e1 100644 --- a/sprites/spr_mk3_chest/spr_mk3_chest.yy +++ b/sprites/spr_mk3_chest/spr_mk3_chest.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_mk3_chest", "bboxMode":0, "bbox_bottom":96, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"653c0ec0-9752-43fa-836d-887cd38798e4","name":"653c0ec0-9752-43fa-836d-887cd38798e4","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"653c0ec0-9752-43fa-836d-887cd38798e4","name":"653c0ec0-9752-43fa-836d-887cd38798e4","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"653c0ec0-9752-43fa-836d-887cd38798e4","path":"sprites/spr_mk3_chest/spr_mk3_chest.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"25a5823d-7e46-458c-b93f-082194e2e4a6","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"653c0ec0-9752-43fa-836d-887cd38798e4","path":"sprites/spr_mk3_chest/spr_mk3_chest.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"25a5823d-7e46-458c-b93f-082194e2e4a6","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_colors/spr_mk3_colors.yy b/sprites/spr_mk3_colors/spr_mk3_colors.yy index 430e2f0321..838df707c8 100644 --- a/sprites/spr_mk3_colors/spr_mk3_colors.yy +++ b/sprites/spr_mk3_colors/spr_mk3_colors.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_mk3_colors", "bboxMode":0, "bbox_bottom":220, @@ -12,22 +12,22 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"62c3577f-e597-4cd1-9a9e-f559e6eb42f3","name":"62c3577f-e597-4cd1-9a9e-f559e6eb42f3","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"f629c04e-891c-45a9-875c-fc3c820221d8","name":"f629c04e-891c-45a9-875c-fc3c820221d8","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"1b36a256-1a8f-46fe-927a-b454edbe5676","name":"1b36a256-1a8f-46fe-927a-b454edbe5676","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"a982464b-f06f-4e0c-8953-6e17e06f0e55","name":"a982464b-f06f-4e0c-8953-6e17e06f0e55","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"5c2e039f-fdb7-4c67-bbfb-f92673d2a953","name":"5c2e039f-fdb7-4c67-bbfb-f92673d2a953","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"4d0acb32-f02a-4e15-ae52-cef6b2c01084","name":"4d0acb32-f02a-4e15-ae52-cef6b2c01084","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"2632e926-dd48-4080-9cd6-453d5b7cf0b3","name":"2632e926-dd48-4080-9cd6-453d5b7cf0b3","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"9c2f6f26-d7bb-484b-bd34-fa9ae2fadd50","name":"9c2f6f26-d7bb-484b-bd34-fa9ae2fadd50","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"d9942e3b-b3c5-4acf-ab8a-138cdb5c9454","name":"d9942e3b-b3c5-4acf-ab8a-138cdb5c9454","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"27c3551e-1bf8-42f7-ae9b-3f5df09e2413","name":"27c3551e-1bf8-42f7-ae9b-3f5df09e2413","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"a23d5f06-e2b2-4fe9-96ba-2f0fd14f2315","name":"a23d5f06-e2b2-4fe9-96ba-2f0fd14f2315","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"fa21a8ce-25e3-4660-882c-23194594a657","name":"fa21a8ce-25e3-4660-882c-23194594a657","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"64ee1a9b-96dd-4cd2-aa93-7c7599d8b350","name":"64ee1a9b-96dd-4cd2-aa93-7c7599d8b350","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"f61ff89f-9503-40ee-913a-097280eb3137","name":"f61ff89f-9503-40ee-913a-097280eb3137","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"a6f24d0a-2c09-42f0-9ad7-0319550b7e22","name":"a6f24d0a-2c09-42f0-9ad7-0319550b7e22","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"f3ff3afd-66af-4f5b-a60d-3fe256d91dd3","name":"f3ff3afd-66af-4f5b-a60d-3fe256d91dd3","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"62c3577f-e597-4cd1-9a9e-f559e6eb42f3","name":"62c3577f-e597-4cd1-9a9e-f559e6eb42f3","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"f629c04e-891c-45a9-875c-fc3c820221d8","name":"f629c04e-891c-45a9-875c-fc3c820221d8","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"1b36a256-1a8f-46fe-927a-b454edbe5676","name":"1b36a256-1a8f-46fe-927a-b454edbe5676","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"a982464b-f06f-4e0c-8953-6e17e06f0e55","name":"a982464b-f06f-4e0c-8953-6e17e06f0e55","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"5c2e039f-fdb7-4c67-bbfb-f92673d2a953","name":"5c2e039f-fdb7-4c67-bbfb-f92673d2a953","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"4d0acb32-f02a-4e15-ae52-cef6b2c01084","name":"4d0acb32-f02a-4e15-ae52-cef6b2c01084","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"2632e926-dd48-4080-9cd6-453d5b7cf0b3","name":"2632e926-dd48-4080-9cd6-453d5b7cf0b3","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"9c2f6f26-d7bb-484b-bd34-fa9ae2fadd50","name":"9c2f6f26-d7bb-484b-bd34-fa9ae2fadd50","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"d9942e3b-b3c5-4acf-ab8a-138cdb5c9454","name":"d9942e3b-b3c5-4acf-ab8a-138cdb5c9454","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"27c3551e-1bf8-42f7-ae9b-3f5df09e2413","name":"27c3551e-1bf8-42f7-ae9b-3f5df09e2413","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"a23d5f06-e2b2-4fe9-96ba-2f0fd14f2315","name":"a23d5f06-e2b2-4fe9-96ba-2f0fd14f2315","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"fa21a8ce-25e3-4660-882c-23194594a657","name":"fa21a8ce-25e3-4660-882c-23194594a657","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"64ee1a9b-96dd-4cd2-aa93-7c7599d8b350","name":"64ee1a9b-96dd-4cd2-aa93-7c7599d8b350","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"f61ff89f-9503-40ee-913a-097280eb3137","name":"f61ff89f-9503-40ee-913a-097280eb3137","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"a6f24d0a-2c09-42f0-9ad7-0319550b7e22","name":"a6f24d0a-2c09-42f0-9ad7-0319550b7e22","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"f3ff3afd-66af-4f5b-a60d-3fe256d91dd3","name":"f3ff3afd-66af-4f5b-a60d-3fe256d91dd3","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -48,13 +48,7 @@ "resourceType":"GMNineSliceData", "resourceVersion":"2.0", "right":0, - "tileMode":[ - 0, - 0, - 0, - 0, - 0, - ], + "tileMode":[0,0,0,0,0,], "top":0, }, "origin":0, @@ -102,54 +96,22 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"62c3577f-e597-4cd1-9a9e-f559e6eb42f3","path":"sprites/spr_mk3_colors/spr_mk3_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"f7003538-a699-4f02-b362-f91da46eb0a4","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"f629c04e-891c-45a9-875c-fc3c820221d8","path":"sprites/spr_mk3_colors/spr_mk3_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"2ab6dc1f-9ab3-4a92-8089-400b97c96e5d","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"1b36a256-1a8f-46fe-927a-b454edbe5676","path":"sprites/spr_mk3_colors/spr_mk3_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"8bc7f1ed-5f9f-4390-9845-56c133191e3b","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"a982464b-f06f-4e0c-8953-6e17e06f0e55","path":"sprites/spr_mk3_colors/spr_mk3_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"baac790b-075b-4417-8789-39fdacd38ffe","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"5c2e039f-fdb7-4c67-bbfb-f92673d2a953","path":"sprites/spr_mk3_colors/spr_mk3_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"e8402d7f-6718-45fb-b930-773c521d0362","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"4d0acb32-f02a-4e15-ae52-cef6b2c01084","path":"sprites/spr_mk3_colors/spr_mk3_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"0ab6712b-9dbd-4c52-88fd-33f36c07dc71","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"2632e926-dd48-4080-9cd6-453d5b7cf0b3","path":"sprites/spr_mk3_colors/spr_mk3_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"5a828e63-dae2-4ebe-ab0f-991630962412","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"9c2f6f26-d7bb-484b-bd34-fa9ae2fadd50","path":"sprites/spr_mk3_colors/spr_mk3_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"c1641eaf-a69a-4419-a527-7b74994854a6","IsCreationKey":false,"Key":7.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"d9942e3b-b3c5-4acf-ab8a-138cdb5c9454","path":"sprites/spr_mk3_colors/spr_mk3_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"a07c98c1-b6f9-4df3-ab1e-6f92c81786b6","IsCreationKey":false,"Key":8.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"27c3551e-1bf8-42f7-ae9b-3f5df09e2413","path":"sprites/spr_mk3_colors/spr_mk3_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"82a312a8-35ce-409f-b1b9-2fe0d02f973c","IsCreationKey":false,"Key":9.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"a23d5f06-e2b2-4fe9-96ba-2f0fd14f2315","path":"sprites/spr_mk3_colors/spr_mk3_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"fc422c9a-fe9b-4a49-a96b-4d773f2526e4","IsCreationKey":false,"Key":10.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"fa21a8ce-25e3-4660-882c-23194594a657","path":"sprites/spr_mk3_colors/spr_mk3_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"4f6f6f8f-713c-4a7d-b44d-86ca9d3b1d45","IsCreationKey":false,"Key":11.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"64ee1a9b-96dd-4cd2-aa93-7c7599d8b350","path":"sprites/spr_mk3_colors/spr_mk3_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"a527c0b3-df5a-40a5-8c70-6ef4de2d6500","IsCreationKey":false,"Key":12.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"f61ff89f-9503-40ee-913a-097280eb3137","path":"sprites/spr_mk3_colors/spr_mk3_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"7b29ea8f-8c30-484e-9eaa-186bbb796b0f","IsCreationKey":false,"Key":13.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"a6f24d0a-2c09-42f0-9ad7-0319550b7e22","path":"sprites/spr_mk3_colors/spr_mk3_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"4b986f7b-7e21-48e5-9a1d-1bf9d81bf873","IsCreationKey":false,"Key":14.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"f3ff3afd-66af-4f5b-a60d-3fe256d91dd3","path":"sprites/spr_mk3_colors/spr_mk3_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"39956189-0400-4262-b523-9c96d90ba130","IsCreationKey":false,"Key":15.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"62c3577f-e597-4cd1-9a9e-f559e6eb42f3","path":"sprites/spr_mk3_colors/spr_mk3_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"f7003538-a699-4f02-b362-f91da46eb0a4","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"f629c04e-891c-45a9-875c-fc3c820221d8","path":"sprites/spr_mk3_colors/spr_mk3_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"2ab6dc1f-9ab3-4a92-8089-400b97c96e5d","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"1b36a256-1a8f-46fe-927a-b454edbe5676","path":"sprites/spr_mk3_colors/spr_mk3_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"8bc7f1ed-5f9f-4390-9845-56c133191e3b","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"a982464b-f06f-4e0c-8953-6e17e06f0e55","path":"sprites/spr_mk3_colors/spr_mk3_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"baac790b-075b-4417-8789-39fdacd38ffe","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"5c2e039f-fdb7-4c67-bbfb-f92673d2a953","path":"sprites/spr_mk3_colors/spr_mk3_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"e8402d7f-6718-45fb-b930-773c521d0362","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"4d0acb32-f02a-4e15-ae52-cef6b2c01084","path":"sprites/spr_mk3_colors/spr_mk3_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"0ab6712b-9dbd-4c52-88fd-33f36c07dc71","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"2632e926-dd48-4080-9cd6-453d5b7cf0b3","path":"sprites/spr_mk3_colors/spr_mk3_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"5a828e63-dae2-4ebe-ab0f-991630962412","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"9c2f6f26-d7bb-484b-bd34-fa9ae2fadd50","path":"sprites/spr_mk3_colors/spr_mk3_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"c1641eaf-a69a-4419-a527-7b74994854a6","IsCreationKey":false,"Key":7.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"d9942e3b-b3c5-4acf-ab8a-138cdb5c9454","path":"sprites/spr_mk3_colors/spr_mk3_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"a07c98c1-b6f9-4df3-ab1e-6f92c81786b6","IsCreationKey":false,"Key":8.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"27c3551e-1bf8-42f7-ae9b-3f5df09e2413","path":"sprites/spr_mk3_colors/spr_mk3_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"82a312a8-35ce-409f-b1b9-2fe0d02f973c","IsCreationKey":false,"Key":9.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"a23d5f06-e2b2-4fe9-96ba-2f0fd14f2315","path":"sprites/spr_mk3_colors/spr_mk3_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"fc422c9a-fe9b-4a49-a96b-4d773f2526e4","IsCreationKey":false,"Key":10.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"fa21a8ce-25e3-4660-882c-23194594a657","path":"sprites/spr_mk3_colors/spr_mk3_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"4f6f6f8f-713c-4a7d-b44d-86ca9d3b1d45","IsCreationKey":false,"Key":11.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"64ee1a9b-96dd-4cd2-aa93-7c7599d8b350","path":"sprites/spr_mk3_colors/spr_mk3_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"a527c0b3-df5a-40a5-8c70-6ef4de2d6500","IsCreationKey":false,"Key":12.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"f61ff89f-9503-40ee-913a-097280eb3137","path":"sprites/spr_mk3_colors/spr_mk3_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"7b29ea8f-8c30-484e-9eaa-186bbb796b0f","IsCreationKey":false,"Key":13.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"a6f24d0a-2c09-42f0-9ad7-0319550b7e22","path":"sprites/spr_mk3_colors/spr_mk3_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"4b986f7b-7e21-48e5-9a1d-1bf9d81bf873","IsCreationKey":false,"Key":14.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"f3ff3afd-66af-4f5b-a60d-3fe256d91dd3","path":"sprites/spr_mk3_colors/spr_mk3_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"39956189-0400-4262-b523-9c96d90ba130","IsCreationKey":false,"Key":15.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_complex/spr_mk3_complex.yy b/sprites/spr_mk3_complex/spr_mk3_complex.yy index c4d625e5b7..1f1eb012c7 100644 --- a/sprites/spr_mk3_complex/spr_mk3_complex.yy +++ b/sprites/spr_mk3_complex/spr_mk3_complex.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_mk3_complex", "bboxMode":0, "bbox_bottom":220, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"358913f3-25cd-4411-aa3a-01c656c1166c","name":"358913f3-25cd-4411-aa3a-01c656c1166c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"358913f3-25cd-4411-aa3a-01c656c1166c","name":"358913f3-25cd-4411-aa3a-01c656c1166c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -71,9 +71,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"358913f3-25cd-4411-aa3a-01c656c1166c","path":"sprites/spr_mk3_complex/spr_mk3_complex.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"ec45e7d5-2e29-4440-965b-2b5e148ec8a4","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"358913f3-25cd-4411-aa3a-01c656c1166c","path":"sprites/spr_mk3_complex/spr_mk3_complex.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"ec45e7d5-2e29-4440-965b-2b5e148ec8a4","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_complex_backpack/spr_mk3_complex_backpack.yy b/sprites/spr_mk3_complex_backpack/spr_mk3_complex_backpack.yy index 82830d778b..e7acffe5a7 100644 --- a/sprites/spr_mk3_complex_backpack/spr_mk3_complex_backpack.yy +++ b/sprites/spr_mk3_complex_backpack/spr_mk3_complex_backpack.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_mk3_complex_backpack", "bboxMode":0, "bbox_bottom":36, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"1b7c53e0-54ee-4ded-bfb1-a4a19c2f498f","name":"1b7c53e0-54ee-4ded-bfb1-a4a19c2f498f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"1b7c53e0-54ee-4ded-bfb1-a4a19c2f498f","name":"1b7c53e0-54ee-4ded-bfb1-a4a19c2f498f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -70,9 +70,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"1b7c53e0-54ee-4ded-bfb1-a4a19c2f498f","path":"sprites/spr_mk3_complex_backpack/spr_mk3_complex_backpack.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"9e7c62a0-7429-45f3-88c0-0aa6dc2ae3a2","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"1b7c53e0-54ee-4ded-bfb1-a4a19c2f498f","path":"sprites/spr_mk3_complex_backpack/spr_mk3_complex_backpack.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"9e7c62a0-7429-45f3-88c0-0aa6dc2ae3a2","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_forehead_variants/spr_mk3_forehead_variants.yy b/sprites/spr_mk3_forehead_variants/spr_mk3_forehead_variants.yy index 8c7d687e9a..804223e69f 100644 --- a/sprites/spr_mk3_forehead_variants/spr_mk3_forehead_variants.yy +++ b/sprites/spr_mk3_forehead_variants/spr_mk3_forehead_variants.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_mk3_forehead_variants", "bboxMode":0, "bbox_bottom":29, @@ -12,13 +12,13 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"006f1fc6-2a40-4299-aedd-c8ec3435711f","name":"006f1fc6-2a40-4299-aedd-c8ec3435711f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"6b0a122b-cbde-43d7-86fa-09659011d3ce","name":"6b0a122b-cbde-43d7-86fa-09659011d3ce","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"1b4c0911-af1a-4514-8459-35cf7d4f6aeb","name":"1b4c0911-af1a-4514-8459-35cf7d4f6aeb","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"ee9859ca-5867-4ea9-9c32-bce41c0bf04d","name":"ee9859ca-5867-4ea9-9c32-bce41c0bf04d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"3f3d4f82-2879-4b96-9ec5-2fd9414ac048","name":"3f3d4f82-2879-4b96-9ec5-2fd9414ac048","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"120c0dc2-09ee-43e7-8b97-23af2bfa96b6","name":"120c0dc2-09ee-43e7-8b97-23af2bfa96b6","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"37c11dd3-1414-4c8d-8d71-e00098819009","name":"37c11dd3-1414-4c8d-8d71-e00098819009","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"006f1fc6-2a40-4299-aedd-c8ec3435711f","name":"006f1fc6-2a40-4299-aedd-c8ec3435711f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"6b0a122b-cbde-43d7-86fa-09659011d3ce","name":"6b0a122b-cbde-43d7-86fa-09659011d3ce","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"1b4c0911-af1a-4514-8459-35cf7d4f6aeb","name":"1b4c0911-af1a-4514-8459-35cf7d4f6aeb","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"ee9859ca-5867-4ea9-9c32-bce41c0bf04d","name":"ee9859ca-5867-4ea9-9c32-bce41c0bf04d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"3f3d4f82-2879-4b96-9ec5-2fd9414ac048","name":"3f3d4f82-2879-4b96-9ec5-2fd9414ac048","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"120c0dc2-09ee-43e7-8b97-23af2bfa96b6","name":"120c0dc2-09ee-43e7-8b97-23af2bfa96b6","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"37c11dd3-1414-4c8d-8d71-e00098819009","name":"37c11dd3-1414-4c8d-8d71-e00098819009","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -74,27 +74,13 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"006f1fc6-2a40-4299-aedd-c8ec3435711f","path":"sprites/spr_mk3_forehead_variants/spr_mk3_forehead_variants.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"9347642e-46b3-4195-9d03-d2a761f92bc9","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"6b0a122b-cbde-43d7-86fa-09659011d3ce","path":"sprites/spr_mk3_forehead_variants/spr_mk3_forehead_variants.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"6d57cb6f-4cdd-457e-a37f-9df410e5ea56","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"1b4c0911-af1a-4514-8459-35cf7d4f6aeb","path":"sprites/spr_mk3_forehead_variants/spr_mk3_forehead_variants.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"3093b5a7-e27d-48c5-b58b-dc513e7b8e2c","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"ee9859ca-5867-4ea9-9c32-bce41c0bf04d","path":"sprites/spr_mk3_forehead_variants/spr_mk3_forehead_variants.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"70daa5bd-729f-4641-a567-78e6da5b3720","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"3f3d4f82-2879-4b96-9ec5-2fd9414ac048","path":"sprites/spr_mk3_forehead_variants/spr_mk3_forehead_variants.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"8732fa6e-e469-4750-af0f-1e60cd6e2654","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"120c0dc2-09ee-43e7-8b97-23af2bfa96b6","path":"sprites/spr_mk3_forehead_variants/spr_mk3_forehead_variants.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"946cb3e6-0dc3-45d2-8897-5093b94d1de2","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"37c11dd3-1414-4c8d-8d71-e00098819009","path":"sprites/spr_mk3_forehead_variants/spr_mk3_forehead_variants.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"9fb25342-066e-479c-8282-263f7dff3763","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"006f1fc6-2a40-4299-aedd-c8ec3435711f","path":"sprites/spr_mk3_forehead_variants/spr_mk3_forehead_variants.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"9347642e-46b3-4195-9d03-d2a761f92bc9","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"6b0a122b-cbde-43d7-86fa-09659011d3ce","path":"sprites/spr_mk3_forehead_variants/spr_mk3_forehead_variants.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"6d57cb6f-4cdd-457e-a37f-9df410e5ea56","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"1b4c0911-af1a-4514-8459-35cf7d4f6aeb","path":"sprites/spr_mk3_forehead_variants/spr_mk3_forehead_variants.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"3093b5a7-e27d-48c5-b58b-dc513e7b8e2c","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"ee9859ca-5867-4ea9-9c32-bce41c0bf04d","path":"sprites/spr_mk3_forehead_variants/spr_mk3_forehead_variants.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"70daa5bd-729f-4641-a567-78e6da5b3720","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"3f3d4f82-2879-4b96-9ec5-2fd9414ac048","path":"sprites/spr_mk3_forehead_variants/spr_mk3_forehead_variants.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"8732fa6e-e469-4750-af0f-1e60cd6e2654","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"120c0dc2-09ee-43e7-8b97-23af2bfa96b6","path":"sprites/spr_mk3_forehead_variants/spr_mk3_forehead_variants.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"946cb3e6-0dc3-45d2-8897-5093b94d1de2","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"37c11dd3-1414-4c8d-8d71-e00098819009","path":"sprites/spr_mk3_forehead_variants/spr_mk3_forehead_variants.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"9fb25342-066e-479c-8282-263f7dff3763","IsCreationKey":false,"Key":6.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_head_variants/spr_mk3_head_variants.yy b/sprites/spr_mk3_head_variants/spr_mk3_head_variants.yy index 891dd3a5b8..940e013e98 100644 --- a/sprites/spr_mk3_head_variants/spr_mk3_head_variants.yy +++ b/sprites/spr_mk3_head_variants/spr_mk3_head_variants.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_mk3_head_variants", "bboxMode":0, "bbox_bottom":37, @@ -12,8 +12,8 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"120c0dc2-09ee-43e7-8b97-23af2bfa96b6","name":"120c0dc2-09ee-43e7-8b97-23af2bfa96b6","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"6ae95461-420f-49c2-b583-d6fc14c50cb2","name":"6ae95461-420f-49c2-b583-d6fc14c50cb2","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"120c0dc2-09ee-43e7-8b97-23af2bfa96b6","name":"120c0dc2-09ee-43e7-8b97-23af2bfa96b6","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"6ae95461-420f-49c2-b583-d6fc14c50cb2","name":"6ae95461-420f-49c2-b583-d6fc14c50cb2","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -69,12 +69,8 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"120c0dc2-09ee-43e7-8b97-23af2bfa96b6","path":"sprites/spr_mk3_head_variants/spr_mk3_head_variants.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"3815daad-43a5-4bb4-bec9-9760cbddeaff","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"6ae95461-420f-49c2-b583-d6fc14c50cb2","path":"sprites/spr_mk3_head_variants/spr_mk3_head_variants.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"0eb1a70a-6aba-4101-a2a0-89b4b569a337","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"120c0dc2-09ee-43e7-8b97-23af2bfa96b6","path":"sprites/spr_mk3_head_variants/spr_mk3_head_variants.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"3815daad-43a5-4bb4-bec9-9760cbddeaff","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"6ae95461-420f-49c2-b583-d6fc14c50cb2","path":"sprites/spr_mk3_head_variants/spr_mk3_head_variants.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"0eb1a70a-6aba-4101-a2a0-89b4b569a337","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_mk3_left_arm/spr_mk3_left_arm.yy b/sprites/spr_mk3_left_arm/spr_mk3_left_arm.yy index 61bcc45399..b8a251d175 100644 --- a/sprites/spr_mk3_left_arm/spr_mk3_left_arm.yy +++ b/sprites/spr_mk3_left_arm/spr_mk3_left_arm.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_mk3_left_arm", "bboxMode":0, "bbox_bottom":125, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"0020b04c-892d-4cf2-9bf1-2240b0622ccd","name":"0020b04c-892d-4cf2-9bf1-2240b0622ccd","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"0020b04c-892d-4cf2-9bf1-2240b0622ccd","name":"0020b04c-892d-4cf2-9bf1-2240b0622ccd","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "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_mk3_left_leg_variants/spr_mk3_left_leg_variants.yy b/sprites/spr_mk3_left_leg_variants/spr_mk3_left_leg_variants.yy index 1331889720..43eaa91a21 100644 --- a/sprites/spr_mk3_left_leg_variants/spr_mk3_left_leg_variants.yy +++ b/sprites/spr_mk3_left_leg_variants/spr_mk3_left_leg_variants.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_mk3_left_leg_variants", "bboxMode":0, "bbox_bottom":220, @@ -12,9 +12,9 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"1ac1a90e-a16e-421a-8a7c-2edb61a4b0df","name":"1ac1a90e-a16e-421a-8a7c-2edb61a4b0df","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"9e7144c8-574e-488a-bdf9-38b61ac9a946","name":"9e7144c8-574e-488a-bdf9-38b61ac9a946","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"04fc9961-d557-4205-a023-dd867df0fdfb","name":"04fc9961-d557-4205-a023-dd867df0fdfb","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"1ac1a90e-a16e-421a-8a7c-2edb61a4b0df","name":"1ac1a90e-a16e-421a-8a7c-2edb61a4b0df","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"9e7144c8-574e-488a-bdf9-38b61ac9a946","name":"9e7144c8-574e-488a-bdf9-38b61ac9a946","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"04fc9961-d557-4205-a023-dd867df0fdfb","name":"04fc9961-d557-4205-a023-dd867df0fdfb","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -70,15 +70,9 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"1ac1a90e-a16e-421a-8a7c-2edb61a4b0df","path":"sprites/spr_mk3_left_leg_variants/spr_mk3_left_leg_variants.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"dd674911-3574-4213-b332-57af50579a99","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"9e7144c8-574e-488a-bdf9-38b61ac9a946","path":"sprites/spr_mk3_left_leg_variants/spr_mk3_left_leg_variants.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"1e0625e6-7cca-4fb6-9a2e-a33cabfbe0a2","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"04fc9961-d557-4205-a023-dd867df0fdfb","path":"sprites/spr_mk3_left_leg_variants/spr_mk3_left_leg_variants.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"9c70ed6c-7032-4848-8556-ff826065b08e","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"1ac1a90e-a16e-421a-8a7c-2edb61a4b0df","path":"sprites/spr_mk3_left_leg_variants/spr_mk3_left_leg_variants.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"dd674911-3574-4213-b332-57af50579a99","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"9e7144c8-574e-488a-bdf9-38b61ac9a946","path":"sprites/spr_mk3_left_leg_variants/spr_mk3_left_leg_variants.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"1e0625e6-7cca-4fb6-9a2e-a33cabfbe0a2","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"04fc9961-d557-4205-a023-dd867df0fdfb","path":"sprites/spr_mk3_left_leg_variants/spr_mk3_left_leg_variants.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"9c70ed6c-7032-4848-8556-ff826065b08e","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_mk3_left_trim/spr_mk3_left_trim.yy b/sprites/spr_mk3_left_trim/spr_mk3_left_trim.yy index 66536409a8..0645edda45 100644 --- a/sprites/spr_mk3_left_trim/spr_mk3_left_trim.yy +++ b/sprites/spr_mk3_left_trim/spr_mk3_left_trim.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_mk3_left_trim", "bboxMode":0, "bbox_bottom":81, @@ -12,10 +12,10 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"9ab63ae6-5124-4282-8187-d7e41deef9c6","name":"9ab63ae6-5124-4282-8187-d7e41deef9c6","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"a8af0d51-b28c-46a8-aac6-63d9368e47c6","name":"a8af0d51-b28c-46a8-aac6-63d9368e47c6","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"7f73e16a-8b30-45b1-be18-c7aea78c9da1","name":"7f73e16a-8b30-45b1-be18-c7aea78c9da1","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"4f23ada7-84e2-4746-8e5c-f69e283899ef","name":"4f23ada7-84e2-4746-8e5c-f69e283899ef","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"9ab63ae6-5124-4282-8187-d7e41deef9c6","name":"9ab63ae6-5124-4282-8187-d7e41deef9c6","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"a8af0d51-b28c-46a8-aac6-63d9368e47c6","name":"a8af0d51-b28c-46a8-aac6-63d9368e47c6","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"7f73e16a-8b30-45b1-be18-c7aea78c9da1","name":"7f73e16a-8b30-45b1-be18-c7aea78c9da1","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"4f23ada7-84e2-4746-8e5c-f69e283899ef","name":"4f23ada7-84e2-4746-8e5c-f69e283899ef","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -73,18 +73,10 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"9ab63ae6-5124-4282-8187-d7e41deef9c6","path":"sprites/spr_mk3_left_trim/spr_mk3_left_trim.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"8d01d6cf-461d-456e-9332-abf118aaaad7","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"a8af0d51-b28c-46a8-aac6-63d9368e47c6","path":"sprites/spr_mk3_left_trim/spr_mk3_left_trim.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"319c9c02-ebc4-458c-aa5f-b95f2e64fb44","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"7f73e16a-8b30-45b1-be18-c7aea78c9da1","path":"sprites/spr_mk3_left_trim/spr_mk3_left_trim.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"c1ca8578-2345-4f88-9c55-fdf39bfa917a","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"4f23ada7-84e2-4746-8e5c-f69e283899ef","path":"sprites/spr_mk3_left_trim/spr_mk3_left_trim.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"81050e27-d210-414e-a369-43b4bc7e99af","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"9ab63ae6-5124-4282-8187-d7e41deef9c6","path":"sprites/spr_mk3_left_trim/spr_mk3_left_trim.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"8d01d6cf-461d-456e-9332-abf118aaaad7","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"a8af0d51-b28c-46a8-aac6-63d9368e47c6","path":"sprites/spr_mk3_left_trim/spr_mk3_left_trim.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"319c9c02-ebc4-458c-aa5f-b95f2e64fb44","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"7f73e16a-8b30-45b1-be18-c7aea78c9da1","path":"sprites/spr_mk3_left_trim/spr_mk3_left_trim.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"c1ca8578-2345-4f88-9c55-fdf39bfa917a","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"4f23ada7-84e2-4746-8e5c-f69e283899ef","path":"sprites/spr_mk3_left_trim/spr_mk3_left_trim.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"81050e27-d210-414e-a369-43b4bc7e99af","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_mk3_mouth/spr_mk3_mouth.yy b/sprites/spr_mk3_mouth/spr_mk3_mouth.yy index 9b93205259..1bc783cc0a 100644 --- a/sprites/spr_mk3_mouth/spr_mk3_mouth.yy +++ b/sprites/spr_mk3_mouth/spr_mk3_mouth.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_mk3_mouth", "bboxMode":0, "bbox_bottom":50, @@ -12,9 +12,9 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"006f1fc6-2a40-4299-aedd-c8ec3435711f","name":"006f1fc6-2a40-4299-aedd-c8ec3435711f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"120c0dc2-09ee-43e7-8b97-23af2bfa96b6","name":"120c0dc2-09ee-43e7-8b97-23af2bfa96b6","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"e591e43e-d3da-42fb-bc8f-4cbae3aca323","name":"e591e43e-d3da-42fb-bc8f-4cbae3aca323","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"006f1fc6-2a40-4299-aedd-c8ec3435711f","name":"006f1fc6-2a40-4299-aedd-c8ec3435711f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"120c0dc2-09ee-43e7-8b97-23af2bfa96b6","name":"120c0dc2-09ee-43e7-8b97-23af2bfa96b6","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"e591e43e-d3da-42fb-bc8f-4cbae3aca323","name":"e591e43e-d3da-42fb-bc8f-4cbae3aca323","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -71,15 +71,9 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"006f1fc6-2a40-4299-aedd-c8ec3435711f","path":"sprites/spr_mk3_mouth/spr_mk3_mouth.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"abb8135b-2d67-4017-b74b-93be2b04f4ce","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"120c0dc2-09ee-43e7-8b97-23af2bfa96b6","path":"sprites/spr_mk3_mouth/spr_mk3_mouth.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"40eb5fb9-2992-48c1-b2be-29e23cb4bd0b","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"e591e43e-d3da-42fb-bc8f-4cbae3aca323","path":"sprites/spr_mk3_mouth/spr_mk3_mouth.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"c99907f3-988a-4e03-8c62-43e4520f2e1d","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"006f1fc6-2a40-4299-aedd-c8ec3435711f","path":"sprites/spr_mk3_mouth/spr_mk3_mouth.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"abb8135b-2d67-4017-b74b-93be2b04f4ce","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"120c0dc2-09ee-43e7-8b97-23af2bfa96b6","path":"sprites/spr_mk3_mouth/spr_mk3_mouth.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"40eb5fb9-2992-48c1-b2be-29e23cb4bd0b","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"e591e43e-d3da-42fb-bc8f-4cbae3aca323","path":"sprites/spr_mk3_mouth/spr_mk3_mouth.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"c99907f3-988a-4e03-8c62-43e4520f2e1d","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_mk3_mouth_flame_cult/spr_mk3_mouth_flame_cult.yy b/sprites/spr_mk3_mouth_flame_cult/spr_mk3_mouth_flame_cult.yy index 0415cde918..def5a6f178 100644 --- a/sprites/spr_mk3_mouth_flame_cult/spr_mk3_mouth_flame_cult.yy +++ b/sprites/spr_mk3_mouth_flame_cult/spr_mk3_mouth_flame_cult.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_mk3_mouth_flame_cult", "bboxMode":0, "bbox_bottom":50, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"006f1fc6-2a40-4299-aedd-c8ec3435711f","name":"006f1fc6-2a40-4299-aedd-c8ec3435711f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"006f1fc6-2a40-4299-aedd-c8ec3435711f","name":"006f1fc6-2a40-4299-aedd-c8ec3435711f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"006f1fc6-2a40-4299-aedd-c8ec3435711f","path":"sprites/spr_mk3_mouth_flame_cult/spr_mk3_mouth_flame_cult.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"dafbefe7-5ef7-4c6e-bf41-74e0fc0edf26","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"006f1fc6-2a40-4299-aedd-c8ec3435711f","path":"sprites/spr_mk3_mouth_flame_cult/spr_mk3_mouth_flame_cult.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"dafbefe7-5ef7-4c6e-bf41-74e0fc0edf26","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_mouth_prussian/spr_mk3_mouth_prussian.yy b/sprites/spr_mk3_mouth_prussian/spr_mk3_mouth_prussian.yy index 156afba267..9485c29772 100644 --- a/sprites/spr_mk3_mouth_prussian/spr_mk3_mouth_prussian.yy +++ b/sprites/spr_mk3_mouth_prussian/spr_mk3_mouth_prussian.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_mk3_mouth_prussian", "bboxMode":0, "bbox_bottom":50, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"120c0dc2-09ee-43e7-8b97-23af2bfa96b6","name":"120c0dc2-09ee-43e7-8b97-23af2bfa96b6","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"120c0dc2-09ee-43e7-8b97-23af2bfa96b6","name":"120c0dc2-09ee-43e7-8b97-23af2bfa96b6","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"120c0dc2-09ee-43e7-8b97-23af2bfa96b6","path":"sprites/spr_mk3_mouth_prussian/spr_mk3_mouth_prussian.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"254cb1c4-26aa-429c-8253-fafc878744e7","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"120c0dc2-09ee-43e7-8b97-23af2bfa96b6","path":"sprites/spr_mk3_mouth_prussian/spr_mk3_mouth_prussian.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"254cb1c4-26aa-429c-8253-fafc878744e7","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_right_arm/spr_mk3_right_arm.yy b/sprites/spr_mk3_right_arm/spr_mk3_right_arm.yy index a7c433a8a7..8ac587699c 100644 --- a/sprites/spr_mk3_right_arm/spr_mk3_right_arm.yy +++ b/sprites/spr_mk3_right_arm/spr_mk3_right_arm.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_mk3_right_arm", "bboxMode":0, "bbox_bottom":125, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"10d9b570-f20a-499d-a9c7-e96a1044b0f5","name":"10d9b570-f20a-499d-a9c7-e96a1044b0f5","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"10d9b570-f20a-499d-a9c7-e96a1044b0f5","name":"10d9b570-f20a-499d-a9c7-e96a1044b0f5","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"10d9b570-f20a-499d-a9c7-e96a1044b0f5","path":"sprites/spr_mk3_right_arm/spr_mk3_right_arm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"fb663579-f17d-4461-829e-36f5f9b87989","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"10d9b570-f20a-499d-a9c7-e96a1044b0f5","path":"sprites/spr_mk3_right_arm/spr_mk3_right_arm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"fb663579-f17d-4461-829e-36f5f9b87989","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_right_leg_variants/spr_mk3_right_leg_variants.yy b/sprites/spr_mk3_right_leg_variants/spr_mk3_right_leg_variants.yy index 240933b5a8..fe7f865ec2 100644 --- a/sprites/spr_mk3_right_leg_variants/spr_mk3_right_leg_variants.yy +++ b/sprites/spr_mk3_right_leg_variants/spr_mk3_right_leg_variants.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_mk3_right_leg_variants", "bboxMode":0, "bbox_bottom":220, @@ -12,9 +12,9 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"1ac1a90e-a16e-421a-8a7c-2edb61a4b0df","name":"1ac1a90e-a16e-421a-8a7c-2edb61a4b0df","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"9e7144c8-574e-488a-bdf9-38b61ac9a946","name":"9e7144c8-574e-488a-bdf9-38b61ac9a946","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"04fc9961-d557-4205-a023-dd867df0fdfb","name":"04fc9961-d557-4205-a023-dd867df0fdfb","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"1ac1a90e-a16e-421a-8a7c-2edb61a4b0df","name":"1ac1a90e-a16e-421a-8a7c-2edb61a4b0df","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"9e7144c8-574e-488a-bdf9-38b61ac9a946","name":"9e7144c8-574e-488a-bdf9-38b61ac9a946","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"04fc9961-d557-4205-a023-dd867df0fdfb","name":"04fc9961-d557-4205-a023-dd867df0fdfb","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -70,15 +70,9 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"1ac1a90e-a16e-421a-8a7c-2edb61a4b0df","path":"sprites/spr_mk3_right_leg_variants/spr_mk3_right_leg_variants.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"fb1bc77b-386e-404a-84af-e5941220ad0c","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"9e7144c8-574e-488a-bdf9-38b61ac9a946","path":"sprites/spr_mk3_right_leg_variants/spr_mk3_right_leg_variants.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"3d485ac5-c0cd-4580-a56b-a873feaf2900","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"04fc9961-d557-4205-a023-dd867df0fdfb","path":"sprites/spr_mk3_right_leg_variants/spr_mk3_right_leg_variants.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"7ee4fbca-f448-4cd3-b4a5-259657157ff5","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"1ac1a90e-a16e-421a-8a7c-2edb61a4b0df","path":"sprites/spr_mk3_right_leg_variants/spr_mk3_right_leg_variants.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"fb1bc77b-386e-404a-84af-e5941220ad0c","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"9e7144c8-574e-488a-bdf9-38b61ac9a946","path":"sprites/spr_mk3_right_leg_variants/spr_mk3_right_leg_variants.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"3d485ac5-c0cd-4580-a56b-a873feaf2900","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"04fc9961-d557-4205-a023-dd867df0fdfb","path":"sprites/spr_mk3_right_leg_variants/spr_mk3_right_leg_variants.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"7ee4fbca-f448-4cd3-b4a5-259657157ff5","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_mk3_right_trim/spr_mk3_right_trim.yy b/sprites/spr_mk3_right_trim/spr_mk3_right_trim.yy index e82663c276..bd189343d2 100644 --- a/sprites/spr_mk3_right_trim/spr_mk3_right_trim.yy +++ b/sprites/spr_mk3_right_trim/spr_mk3_right_trim.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_mk3_right_trim", "bboxMode":0, "bbox_bottom":81, @@ -12,10 +12,10 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"42c93ebb-31a5-4529-add7-5c4ada48da57","name":"42c93ebb-31a5-4529-add7-5c4ada48da57","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"e8f2b623-db31-44d0-a510-ff212dd3f269","name":"e8f2b623-db31-44d0-a510-ff212dd3f269","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"3046bd80-d3fb-4878-b070-c42a135928aa","name":"3046bd80-d3fb-4878-b070-c42a135928aa","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"b6e5adf0-e385-406b-8e12-f57ab1666a3e","name":"b6e5adf0-e385-406b-8e12-f57ab1666a3e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"42c93ebb-31a5-4529-add7-5c4ada48da57","name":"42c93ebb-31a5-4529-add7-5c4ada48da57","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"e8f2b623-db31-44d0-a510-ff212dd3f269","name":"e8f2b623-db31-44d0-a510-ff212dd3f269","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"3046bd80-d3fb-4878-b070-c42a135928aa","name":"3046bd80-d3fb-4878-b070-c42a135928aa","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"b6e5adf0-e385-406b-8e12-f57ab1666a3e","name":"b6e5adf0-e385-406b-8e12-f57ab1666a3e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -71,18 +71,10 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"42c93ebb-31a5-4529-add7-5c4ada48da57","path":"sprites/spr_mk3_right_trim/spr_mk3_right_trim.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"6a1a6de8-928a-4b5a-9b92-1eaa80fc4171","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"e8f2b623-db31-44d0-a510-ff212dd3f269","path":"sprites/spr_mk3_right_trim/spr_mk3_right_trim.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"c7301961-da67-453e-a396-070fac8dfbe4","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"3046bd80-d3fb-4878-b070-c42a135928aa","path":"sprites/spr_mk3_right_trim/spr_mk3_right_trim.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"f71392e9-e16c-4d5b-836f-daa455a41de5","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"b6e5adf0-e385-406b-8e12-f57ab1666a3e","path":"sprites/spr_mk3_right_trim/spr_mk3_right_trim.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"f4ab6e5b-4e60-4125-ad0e-f195ed660e71","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"42c93ebb-31a5-4529-add7-5c4ada48da57","path":"sprites/spr_mk3_right_trim/spr_mk3_right_trim.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"6a1a6de8-928a-4b5a-9b92-1eaa80fc4171","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"e8f2b623-db31-44d0-a510-ff212dd3f269","path":"sprites/spr_mk3_right_trim/spr_mk3_right_trim.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"c7301961-da67-453e-a396-070fac8dfbe4","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"3046bd80-d3fb-4878-b070-c42a135928aa","path":"sprites/spr_mk3_right_trim/spr_mk3_right_trim.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"f71392e9-e16c-4d5b-836f-daa455a41de5","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"b6e5adf0-e385-406b-8e12-f57ab1666a3e","path":"sprites/spr_mk3_right_trim/spr_mk3_right_trim.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"f4ab6e5b-4e60-4125-ad0e-f195ed660e71","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_mk3_runic_chest/spr_mk3_runic_chest.yy b/sprites/spr_mk3_runic_chest/spr_mk3_runic_chest.yy index 0c29273b65..7ada504a64 100644 --- a/sprites/spr_mk3_runic_chest/spr_mk3_runic_chest.yy +++ b/sprites/spr_mk3_runic_chest/spr_mk3_runic_chest.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_mk3_runic_chest", "bboxMode":0, "bbox_bottom":96, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"653c0ec0-9752-43fa-836d-887cd38798e4","name":"653c0ec0-9752-43fa-836d-887cd38798e4","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"653c0ec0-9752-43fa-836d-887cd38798e4","name":"653c0ec0-9752-43fa-836d-887cd38798e4","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -71,9 +71,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"653c0ec0-9752-43fa-836d-887cd38798e4","path":"sprites/spr_mk3_runic_chest/spr_mk3_runic_chest.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"6a61bcf7-973c-45fd-8623-cd2e2aa417c7","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"653c0ec0-9752-43fa-836d-887cd38798e4","path":"sprites/spr_mk3_runic_chest/spr_mk3_runic_chest.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"6a61bcf7-973c-45fd-8623-cd2e2aa417c7","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_mk4_chest_fastenings/spr_mk4_chest_fastenings.yy b/sprites/spr_mk4_chest_fastenings/spr_mk4_chest_fastenings.yy index 49f2fb8653..e9ec6f688f 100644 --- a/sprites/spr_mk4_chest_fastenings/spr_mk4_chest_fastenings.yy +++ b/sprites/spr_mk4_chest_fastenings/spr_mk4_chest_fastenings.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_mk4_chest_fastenings", "bboxMode":0, "bbox_bottom":86, @@ -12,10 +12,10 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"40c77a23-0d91-41c3-865e-885ca7f6df03","name":"40c77a23-0d91-41c3-865e-885ca7f6df03","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"390fa6ba-721f-4bdc-8b11-b7012f417f0e","name":"390fa6ba-721f-4bdc-8b11-b7012f417f0e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"f99c987b-7a91-4dc7-b79f-d53299f70551","name":"f99c987b-7a91-4dc7-b79f-d53299f70551","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"0de91ff0-be17-4fd1-9a82-01f42330261b","name":"0de91ff0-be17-4fd1-9a82-01f42330261b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"40c77a23-0d91-41c3-865e-885ca7f6df03","name":"40c77a23-0d91-41c3-865e-885ca7f6df03","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"390fa6ba-721f-4bdc-8b11-b7012f417f0e","name":"390fa6ba-721f-4bdc-8b11-b7012f417f0e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"f99c987b-7a91-4dc7-b79f-d53299f70551","name":"f99c987b-7a91-4dc7-b79f-d53299f70551","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"0de91ff0-be17-4fd1-9a82-01f42330261b","name":"0de91ff0-be17-4fd1-9a82-01f42330261b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -73,18 +73,10 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"40c77a23-0d91-41c3-865e-885ca7f6df03","path":"sprites/spr_mk4_chest_fastenings/spr_mk4_chest_fastenings.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"a66f3f85-cd83-4651-aa90-f25bca60da0e","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"390fa6ba-721f-4bdc-8b11-b7012f417f0e","path":"sprites/spr_mk4_chest_fastenings/spr_mk4_chest_fastenings.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"02831958-f299-4f70-8116-3a658fe588dc","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"f99c987b-7a91-4dc7-b79f-d53299f70551","path":"sprites/spr_mk4_chest_fastenings/spr_mk4_chest_fastenings.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"fecadf85-a338-45ac-b302-0176bfbe27c0","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"0de91ff0-be17-4fd1-9a82-01f42330261b","path":"sprites/spr_mk4_chest_fastenings/spr_mk4_chest_fastenings.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"c2871da1-9fb5-4779-b942-07e5460892a5","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"40c77a23-0d91-41c3-865e-885ca7f6df03","path":"sprites/spr_mk4_chest_fastenings/spr_mk4_chest_fastenings.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"a66f3f85-cd83-4651-aa90-f25bca60da0e","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"390fa6ba-721f-4bdc-8b11-b7012f417f0e","path":"sprites/spr_mk4_chest_fastenings/spr_mk4_chest_fastenings.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"02831958-f299-4f70-8116-3a658fe588dc","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"f99c987b-7a91-4dc7-b79f-d53299f70551","path":"sprites/spr_mk4_chest_fastenings/spr_mk4_chest_fastenings.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"fecadf85-a338-45ac-b302-0176bfbe27c0","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"0de91ff0-be17-4fd1-9a82-01f42330261b","path":"sprites/spr_mk4_chest_fastenings/spr_mk4_chest_fastenings.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"c2871da1-9fb5-4779-b942-07e5460892a5","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_mk4_chest_variants/spr_mk4_chest_variants.yy b/sprites/spr_mk4_chest_variants/spr_mk4_chest_variants.yy index 87cc444d39..21ec0fa38b 100644 --- a/sprites/spr_mk4_chest_variants/spr_mk4_chest_variants.yy +++ b/sprites/spr_mk4_chest_variants/spr_mk4_chest_variants.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_mk4_chest_variants", "bboxMode":0, "bbox_bottom":209, @@ -12,8 +12,8 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"40cfe8bd-f11d-4d74-a157-47d58c39d7e8","name":"40cfe8bd-f11d-4d74-a157-47d58c39d7e8","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"d25b0580-a514-4932-b9cf-76ae2aa29221","name":"d25b0580-a514-4932-b9cf-76ae2aa29221","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"40cfe8bd-f11d-4d74-a157-47d58c39d7e8","name":"40cfe8bd-f11d-4d74-a157-47d58c39d7e8","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"d25b0580-a514-4932-b9cf-76ae2aa29221","name":"d25b0580-a514-4932-b9cf-76ae2aa29221","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -69,12 +69,8 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"40cfe8bd-f11d-4d74-a157-47d58c39d7e8","path":"sprites/spr_mk4_chest_variants/spr_mk4_chest_variants.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"e2036e56-f8b6-467a-aef9-1d6ca203ba9e","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"d25b0580-a514-4932-b9cf-76ae2aa29221","path":"sprites/spr_mk4_chest_variants/spr_mk4_chest_variants.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"8d411f29-8d00-43d6-8673-d7432df20309","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"40cfe8bd-f11d-4d74-a157-47d58c39d7e8","path":"sprites/spr_mk4_chest_variants/spr_mk4_chest_variants.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"e2036e56-f8b6-467a-aef9-1d6ca203ba9e","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"d25b0580-a514-4932-b9cf-76ae2aa29221","path":"sprites/spr_mk4_chest_variants/spr_mk4_chest_variants.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"8d411f29-8d00-43d6-8673-d7432df20309","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_mk4_colors/spr_mk4_colors.yy b/sprites/spr_mk4_colors/spr_mk4_colors.yy index ceb0ce685c..345737a2a3 100644 --- a/sprites/spr_mk4_colors/spr_mk4_colors.yy +++ b/sprites/spr_mk4_colors/spr_mk4_colors.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_mk4_colors", "bboxMode":0, "bbox_bottom":220, @@ -12,22 +12,22 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"ebd378bb-3414-47cd-913e-98f9b2d84e58","name":"ebd378bb-3414-47cd-913e-98f9b2d84e58","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"e1576158-84f7-41d2-a0d5-619c7102a3ed","name":"e1576158-84f7-41d2-a0d5-619c7102a3ed","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"ef957394-0489-40b0-8de1-ccb1bf729ab2","name":"ef957394-0489-40b0-8de1-ccb1bf729ab2","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"3a907589-e0bd-4850-8d4c-e62bde16e5d7","name":"3a907589-e0bd-4850-8d4c-e62bde16e5d7","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"287f6d48-afc4-4934-99e3-6a793feaea68","name":"287f6d48-afc4-4934-99e3-6a793feaea68","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"217d09b5-981f-4d58-99c5-84e9d0ddb228","name":"217d09b5-981f-4d58-99c5-84e9d0ddb228","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"3059d51d-11a6-4332-933f-f0d0fb58181e","name":"3059d51d-11a6-4332-933f-f0d0fb58181e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"2e3dca8f-5e82-4e7a-ad81-ef7299a53953","name":"2e3dca8f-5e82-4e7a-ad81-ef7299a53953","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"ba787f16-e814-44a6-a629-1f617ec2ff7b","name":"ba787f16-e814-44a6-a629-1f617ec2ff7b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"56ffc0a1-d21a-45f0-8b3e-88025e688764","name":"56ffc0a1-d21a-45f0-8b3e-88025e688764","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"1aa3f769-e8d1-4eef-95b8-dcce13298745","name":"1aa3f769-e8d1-4eef-95b8-dcce13298745","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"eed7f8d5-4b8d-42a9-a6ed-1372de345d3d","name":"eed7f8d5-4b8d-42a9-a6ed-1372de345d3d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"7308a14a-e119-45cb-a60b-73cd37a1cd6a","name":"7308a14a-e119-45cb-a60b-73cd37a1cd6a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"e0e01d65-f432-411b-b673-239c5bfaf45b","name":"e0e01d65-f432-411b-b673-239c5bfaf45b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"4c8d673e-7d42-4987-b107-684a037cf5b6","name":"4c8d673e-7d42-4987-b107-684a037cf5b6","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"e3adeb78-1cf8-4a2a-a4d2-99183b2e36e5","name":"e3adeb78-1cf8-4a2a-a4d2-99183b2e36e5","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"ebd378bb-3414-47cd-913e-98f9b2d84e58","name":"ebd378bb-3414-47cd-913e-98f9b2d84e58","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"e1576158-84f7-41d2-a0d5-619c7102a3ed","name":"e1576158-84f7-41d2-a0d5-619c7102a3ed","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"ef957394-0489-40b0-8de1-ccb1bf729ab2","name":"ef957394-0489-40b0-8de1-ccb1bf729ab2","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"3a907589-e0bd-4850-8d4c-e62bde16e5d7","name":"3a907589-e0bd-4850-8d4c-e62bde16e5d7","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"287f6d48-afc4-4934-99e3-6a793feaea68","name":"287f6d48-afc4-4934-99e3-6a793feaea68","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"217d09b5-981f-4d58-99c5-84e9d0ddb228","name":"217d09b5-981f-4d58-99c5-84e9d0ddb228","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"3059d51d-11a6-4332-933f-f0d0fb58181e","name":"3059d51d-11a6-4332-933f-f0d0fb58181e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"2e3dca8f-5e82-4e7a-ad81-ef7299a53953","name":"2e3dca8f-5e82-4e7a-ad81-ef7299a53953","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"ba787f16-e814-44a6-a629-1f617ec2ff7b","name":"ba787f16-e814-44a6-a629-1f617ec2ff7b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"56ffc0a1-d21a-45f0-8b3e-88025e688764","name":"56ffc0a1-d21a-45f0-8b3e-88025e688764","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"1aa3f769-e8d1-4eef-95b8-dcce13298745","name":"1aa3f769-e8d1-4eef-95b8-dcce13298745","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"eed7f8d5-4b8d-42a9-a6ed-1372de345d3d","name":"eed7f8d5-4b8d-42a9-a6ed-1372de345d3d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"7308a14a-e119-45cb-a60b-73cd37a1cd6a","name":"7308a14a-e119-45cb-a60b-73cd37a1cd6a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"e0e01d65-f432-411b-b673-239c5bfaf45b","name":"e0e01d65-f432-411b-b673-239c5bfaf45b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"4c8d673e-7d42-4987-b107-684a037cf5b6","name":"4c8d673e-7d42-4987-b107-684a037cf5b6","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"e3adeb78-1cf8-4a2a-a4d2-99183b2e36e5","name":"e3adeb78-1cf8-4a2a-a4d2-99183b2e36e5","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -83,54 +83,22 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"ebd378bb-3414-47cd-913e-98f9b2d84e58","path":"sprites/spr_mk4_colors/spr_mk4_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"7aa7ae2b-508c-4b78-8b26-237fb4b31279","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"e1576158-84f7-41d2-a0d5-619c7102a3ed","path":"sprites/spr_mk4_colors/spr_mk4_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"cf163fbb-78e4-4e41-b583-c67bc8097d1e","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"ef957394-0489-40b0-8de1-ccb1bf729ab2","path":"sprites/spr_mk4_colors/spr_mk4_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"48f0d3d6-843e-48e9-b1d3-421527bee669","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"3a907589-e0bd-4850-8d4c-e62bde16e5d7","path":"sprites/spr_mk4_colors/spr_mk4_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"bd09e29d-514b-4234-8e70-7413f027cb01","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"287f6d48-afc4-4934-99e3-6a793feaea68","path":"sprites/spr_mk4_colors/spr_mk4_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"4f613c2c-fd00-4733-a64b-d4ca2796b1b0","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"217d09b5-981f-4d58-99c5-84e9d0ddb228","path":"sprites/spr_mk4_colors/spr_mk4_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"9539d417-e1c9-4696-8cfe-4e498ec1ee40","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"3059d51d-11a6-4332-933f-f0d0fb58181e","path":"sprites/spr_mk4_colors/spr_mk4_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"fecb5fb1-8817-4d28-beb0-77282063505b","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"2e3dca8f-5e82-4e7a-ad81-ef7299a53953","path":"sprites/spr_mk4_colors/spr_mk4_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"f412f3c5-96fc-42e6-8f43-b2380baf6041","IsCreationKey":false,"Key":7.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"ba787f16-e814-44a6-a629-1f617ec2ff7b","path":"sprites/spr_mk4_colors/spr_mk4_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"c16c7cb7-ce94-4501-8c83-cd879c4539f4","IsCreationKey":false,"Key":8.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"56ffc0a1-d21a-45f0-8b3e-88025e688764","path":"sprites/spr_mk4_colors/spr_mk4_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"be6d5e73-096b-420a-a3d8-ce62602f57b3","IsCreationKey":false,"Key":9.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"1aa3f769-e8d1-4eef-95b8-dcce13298745","path":"sprites/spr_mk4_colors/spr_mk4_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"6e3d0df4-9ad4-4629-9392-f873a64462a5","IsCreationKey":false,"Key":10.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"eed7f8d5-4b8d-42a9-a6ed-1372de345d3d","path":"sprites/spr_mk4_colors/spr_mk4_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"d6d05ec9-749e-456c-84e7-a1ce56d2b2dd","IsCreationKey":false,"Key":11.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"7308a14a-e119-45cb-a60b-73cd37a1cd6a","path":"sprites/spr_mk4_colors/spr_mk4_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"48ea3a9e-cee6-444d-b1da-6a83aab91101","IsCreationKey":false,"Key":12.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"e0e01d65-f432-411b-b673-239c5bfaf45b","path":"sprites/spr_mk4_colors/spr_mk4_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"626bd8a0-7388-4c79-9cfc-6815424a3f97","IsCreationKey":false,"Key":13.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"4c8d673e-7d42-4987-b107-684a037cf5b6","path":"sprites/spr_mk4_colors/spr_mk4_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"421b2d1c-319b-47d8-b080-e9e0b349b065","IsCreationKey":false,"Key":14.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"e3adeb78-1cf8-4a2a-a4d2-99183b2e36e5","path":"sprites/spr_mk4_colors/spr_mk4_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"936e4486-47a9-4643-b27b-70c3ab2f2e00","IsCreationKey":false,"Key":15.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"ebd378bb-3414-47cd-913e-98f9b2d84e58","path":"sprites/spr_mk4_colors/spr_mk4_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"7aa7ae2b-508c-4b78-8b26-237fb4b31279","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"e1576158-84f7-41d2-a0d5-619c7102a3ed","path":"sprites/spr_mk4_colors/spr_mk4_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"cf163fbb-78e4-4e41-b583-c67bc8097d1e","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"ef957394-0489-40b0-8de1-ccb1bf729ab2","path":"sprites/spr_mk4_colors/spr_mk4_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"48f0d3d6-843e-48e9-b1d3-421527bee669","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"3a907589-e0bd-4850-8d4c-e62bde16e5d7","path":"sprites/spr_mk4_colors/spr_mk4_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"bd09e29d-514b-4234-8e70-7413f027cb01","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"287f6d48-afc4-4934-99e3-6a793feaea68","path":"sprites/spr_mk4_colors/spr_mk4_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"4f613c2c-fd00-4733-a64b-d4ca2796b1b0","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"217d09b5-981f-4d58-99c5-84e9d0ddb228","path":"sprites/spr_mk4_colors/spr_mk4_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"9539d417-e1c9-4696-8cfe-4e498ec1ee40","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"3059d51d-11a6-4332-933f-f0d0fb58181e","path":"sprites/spr_mk4_colors/spr_mk4_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"fecb5fb1-8817-4d28-beb0-77282063505b","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"2e3dca8f-5e82-4e7a-ad81-ef7299a53953","path":"sprites/spr_mk4_colors/spr_mk4_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"f412f3c5-96fc-42e6-8f43-b2380baf6041","IsCreationKey":false,"Key":7.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"ba787f16-e814-44a6-a629-1f617ec2ff7b","path":"sprites/spr_mk4_colors/spr_mk4_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"c16c7cb7-ce94-4501-8c83-cd879c4539f4","IsCreationKey":false,"Key":8.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"56ffc0a1-d21a-45f0-8b3e-88025e688764","path":"sprites/spr_mk4_colors/spr_mk4_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"be6d5e73-096b-420a-a3d8-ce62602f57b3","IsCreationKey":false,"Key":9.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"1aa3f769-e8d1-4eef-95b8-dcce13298745","path":"sprites/spr_mk4_colors/spr_mk4_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"6e3d0df4-9ad4-4629-9392-f873a64462a5","IsCreationKey":false,"Key":10.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"eed7f8d5-4b8d-42a9-a6ed-1372de345d3d","path":"sprites/spr_mk4_colors/spr_mk4_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"d6d05ec9-749e-456c-84e7-a1ce56d2b2dd","IsCreationKey":false,"Key":11.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"7308a14a-e119-45cb-a60b-73cd37a1cd6a","path":"sprites/spr_mk4_colors/spr_mk4_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"48ea3a9e-cee6-444d-b1da-6a83aab91101","IsCreationKey":false,"Key":12.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"e0e01d65-f432-411b-b673-239c5bfaf45b","path":"sprites/spr_mk4_colors/spr_mk4_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"626bd8a0-7388-4c79-9cfc-6815424a3f97","IsCreationKey":false,"Key":13.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"4c8d673e-7d42-4987-b107-684a037cf5b6","path":"sprites/spr_mk4_colors/spr_mk4_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"421b2d1c-319b-47d8-b080-e9e0b349b065","IsCreationKey":false,"Key":14.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"e3adeb78-1cf8-4a2a-a4d2-99183b2e36e5","path":"sprites/spr_mk4_colors/spr_mk4_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"936e4486-47a9-4643-b27b-70c3ab2f2e00","IsCreationKey":false,"Key":15.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_mk4_complex/spr_mk4_complex.yy b/sprites/spr_mk4_complex/spr_mk4_complex.yy index 4d0c73e8db..174287f26c 100644 --- a/sprites/spr_mk4_complex/spr_mk4_complex.yy +++ b/sprites/spr_mk4_complex/spr_mk4_complex.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_mk4_complex", "bboxMode":0, "bbox_bottom":220, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"40cfe8bd-f11d-4d74-a157-47d58c39d7e8","name":"40cfe8bd-f11d-4d74-a157-47d58c39d7e8","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"40cfe8bd-f11d-4d74-a157-47d58c39d7e8","name":"40cfe8bd-f11d-4d74-a157-47d58c39d7e8","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -69,9 +69,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"40cfe8bd-f11d-4d74-a157-47d58c39d7e8","path":"sprites/spr_mk4_complex/spr_mk4_complex.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"1ea2a7fc-3120-42db-b605-8fb780ff8b5d","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"40cfe8bd-f11d-4d74-a157-47d58c39d7e8","path":"sprites/spr_mk4_complex/spr_mk4_complex.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"1ea2a7fc-3120-42db-b605-8fb780ff8b5d","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_mk4_complex_backpack/spr_mk4_complex_backpack.yy b/sprites/spr_mk4_complex_backpack/spr_mk4_complex_backpack.yy index acce101b8e..78ce856cc7 100644 --- a/sprites/spr_mk4_complex_backpack/spr_mk4_complex_backpack.yy +++ b/sprites/spr_mk4_complex_backpack/spr_mk4_complex_backpack.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_mk4_complex_backpack", "bboxMode":0, "bbox_bottom":35, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"a43406eb-6236-415d-9902-e818a2185ba9","name":"a43406eb-6236-415d-9902-e818a2185ba9","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"a43406eb-6236-415d-9902-e818a2185ba9","name":"a43406eb-6236-415d-9902-e818a2185ba9","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -70,9 +70,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"a43406eb-6236-415d-9902-e818a2185ba9","path":"sprites/spr_mk4_complex_backpack/spr_mk4_complex_backpack.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"90dd7544-906e-477c-a0a3-0c94bc9aee40","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"a43406eb-6236-415d-9902-e818a2185ba9","path":"sprites/spr_mk4_complex_backpack/spr_mk4_complex_backpack.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"90dd7544-906e-477c-a0a3-0c94bc9aee40","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_mk4_head_variants/spr_mk4_head_variants.yy b/sprites/spr_mk4_head_variants/spr_mk4_head_variants.yy index 47b9a44e7d..bb56afac64 100644 --- a/sprites/spr_mk4_head_variants/spr_mk4_head_variants.yy +++ b/sprites/spr_mk4_head_variants/spr_mk4_head_variants.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_mk4_head_variants", "bboxMode":0, "bbox_bottom":45, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"4b8ef32c-78f9-46d9-8e67-7f619d1c5356","name":"4b8ef32c-78f9-46d9-8e67-7f619d1c5356","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"4b8ef32c-78f9-46d9-8e67-7f619d1c5356","name":"4b8ef32c-78f9-46d9-8e67-7f619d1c5356","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"4b8ef32c-78f9-46d9-8e67-7f619d1c5356","path":"sprites/spr_mk4_head_variants/spr_mk4_head_variants.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"b9e1ad2f-89b1-4000-9111-d63df121427d","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"4b8ef32c-78f9-46d9-8e67-7f619d1c5356","path":"sprites/spr_mk4_head_variants/spr_mk4_head_variants.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"b9e1ad2f-89b1-4000-9111-d63df121427d","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_mk4_left_arm/spr_mk4_left_arm.yy b/sprites/spr_mk4_left_arm/spr_mk4_left_arm.yy index edd67fd904..483b6c7c74 100644 --- a/sprites/spr_mk4_left_arm/spr_mk4_left_arm.yy +++ b/sprites/spr_mk4_left_arm/spr_mk4_left_arm.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_mk4_left_arm", "bboxMode":0, "bbox_bottom":125, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"d132fab6-39de-405e-b127-9f335cf85536","name":"d132fab6-39de-405e-b127-9f335cf85536","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"d132fab6-39de-405e-b127-9f335cf85536","name":"d132fab6-39de-405e-b127-9f335cf85536","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"d132fab6-39de-405e-b127-9f335cf85536","path":"sprites/spr_mk4_left_arm/spr_mk4_left_arm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"0853379d-62d4-401d-bdeb-8b64cac8fbfa","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"d132fab6-39de-405e-b127-9f335cf85536","path":"sprites/spr_mk4_left_arm/spr_mk4_left_arm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"0853379d-62d4-401d-bdeb-8b64cac8fbfa","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_mk4_left_trim/spr_mk4_left_trim.yy b/sprites/spr_mk4_left_trim/spr_mk4_left_trim.yy index 6ea8cc3a67..8ef77826c5 100644 --- a/sprites/spr_mk4_left_trim/spr_mk4_left_trim.yy +++ b/sprites/spr_mk4_left_trim/spr_mk4_left_trim.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_mk4_left_trim", "bboxMode":0, "bbox_bottom":81, @@ -12,11 +12,11 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"c9e92ecb-d3e8-4554-b608-47b47aa79876","name":"c9e92ecb-d3e8-4554-b608-47b47aa79876","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"7d128442-bf77-4769-8d75-a63dd3942ff8","name":"7d128442-bf77-4769-8d75-a63dd3942ff8","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"0f4435dc-8ba2-40a6-a643-d38318383c10","name":"0f4435dc-8ba2-40a6-a643-d38318383c10","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"ccdf7cd6-d258-4f76-9fd9-65b076861997","name":"ccdf7cd6-d258-4f76-9fd9-65b076861997","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"f5e0817a-c222-4bd1-b7af-957a96c6334d","name":"f5e0817a-c222-4bd1-b7af-957a96c6334d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"c9e92ecb-d3e8-4554-b608-47b47aa79876","name":"c9e92ecb-d3e8-4554-b608-47b47aa79876","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"7d128442-bf77-4769-8d75-a63dd3942ff8","name":"7d128442-bf77-4769-8d75-a63dd3942ff8","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"0f4435dc-8ba2-40a6-a643-d38318383c10","name":"0f4435dc-8ba2-40a6-a643-d38318383c10","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"ccdf7cd6-d258-4f76-9fd9-65b076861997","name":"ccdf7cd6-d258-4f76-9fd9-65b076861997","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"f5e0817a-c222-4bd1-b7af-957a96c6334d","name":"f5e0817a-c222-4bd1-b7af-957a96c6334d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -72,21 +72,11 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"c9e92ecb-d3e8-4554-b608-47b47aa79876","path":"sprites/spr_mk4_left_trim/spr_mk4_left_trim.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"baf60be2-46a1-4588-a03b-762baa867599","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"7d128442-bf77-4769-8d75-a63dd3942ff8","path":"sprites/spr_mk4_left_trim/spr_mk4_left_trim.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"0e63d2dd-b459-434d-93fd-4607df6dd69a","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"0f4435dc-8ba2-40a6-a643-d38318383c10","path":"sprites/spr_mk4_left_trim/spr_mk4_left_trim.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"8dcb92ec-fd8d-4cc6-9285-dbb186051c10","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"ccdf7cd6-d258-4f76-9fd9-65b076861997","path":"sprites/spr_mk4_left_trim/spr_mk4_left_trim.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"b38845bb-5261-4b58-b135-a5718fb726f0","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"f5e0817a-c222-4bd1-b7af-957a96c6334d","path":"sprites/spr_mk4_left_trim/spr_mk4_left_trim.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"b8bd7e56-9dc2-4b90-a286-403f37e35f36","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"c9e92ecb-d3e8-4554-b608-47b47aa79876","path":"sprites/spr_mk4_left_trim/spr_mk4_left_trim.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"baf60be2-46a1-4588-a03b-762baa867599","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"7d128442-bf77-4769-8d75-a63dd3942ff8","path":"sprites/spr_mk4_left_trim/spr_mk4_left_trim.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"0e63d2dd-b459-434d-93fd-4607df6dd69a","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"0f4435dc-8ba2-40a6-a643-d38318383c10","path":"sprites/spr_mk4_left_trim/spr_mk4_left_trim.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"8dcb92ec-fd8d-4cc6-9285-dbb186051c10","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"ccdf7cd6-d258-4f76-9fd9-65b076861997","path":"sprites/spr_mk4_left_trim/spr_mk4_left_trim.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"b38845bb-5261-4b58-b135-a5718fb726f0","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"f5e0817a-c222-4bd1-b7af-957a96c6334d","path":"sprites/spr_mk4_left_trim/spr_mk4_left_trim.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"b8bd7e56-9dc2-4b90-a286-403f37e35f36","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_mk4_leg_variants/spr_mk4_leg_variants.yy b/sprites/spr_mk4_leg_variants/spr_mk4_leg_variants.yy index 17020ec82d..3e3acecc96 100644 --- a/sprites/spr_mk4_leg_variants/spr_mk4_leg_variants.yy +++ b/sprites/spr_mk4_leg_variants/spr_mk4_leg_variants.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_mk4_leg_variants", "bboxMode":0, "bbox_bottom":193, @@ -12,10 +12,10 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"f5551e24-09d8-40c0-888e-0e5818c0c403","name":"f5551e24-09d8-40c0-888e-0e5818c0c403","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"7801e3ee-eaad-4b34-af43-c6c9080b2caf","name":"7801e3ee-eaad-4b34-af43-c6c9080b2caf","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"79b13155-0f85-4e11-9fef-324bf6e87d15","name":"79b13155-0f85-4e11-9fef-324bf6e87d15","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"f43f9098-5ab6-4ea9-9d2c-9be14d2214b8","name":"f43f9098-5ab6-4ea9-9d2c-9be14d2214b8","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"f5551e24-09d8-40c0-888e-0e5818c0c403","name":"f5551e24-09d8-40c0-888e-0e5818c0c403","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"7801e3ee-eaad-4b34-af43-c6c9080b2caf","name":"7801e3ee-eaad-4b34-af43-c6c9080b2caf","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"79b13155-0f85-4e11-9fef-324bf6e87d15","name":"79b13155-0f85-4e11-9fef-324bf6e87d15","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"f43f9098-5ab6-4ea9-9d2c-9be14d2214b8","name":"f43f9098-5ab6-4ea9-9d2c-9be14d2214b8","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -71,18 +71,10 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"f5551e24-09d8-40c0-888e-0e5818c0c403","path":"sprites/spr_mk4_leg_variants/spr_mk4_leg_variants.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"f0d74eee-2fdc-4c64-89a0-eca5b14b32d6","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"7801e3ee-eaad-4b34-af43-c6c9080b2caf","path":"sprites/spr_mk4_leg_variants/spr_mk4_leg_variants.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"ee26bab2-02cc-4e4d-a75a-00c04cf56d3e","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"79b13155-0f85-4e11-9fef-324bf6e87d15","path":"sprites/spr_mk4_leg_variants/spr_mk4_leg_variants.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"6e5b82f0-b1e4-4462-9747-2831172b74a5","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"f43f9098-5ab6-4ea9-9d2c-9be14d2214b8","path":"sprites/spr_mk4_leg_variants/spr_mk4_leg_variants.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"01846774-a3dd-4995-9497-fbee372af500","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"f5551e24-09d8-40c0-888e-0e5818c0c403","path":"sprites/spr_mk4_leg_variants/spr_mk4_leg_variants.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"f0d74eee-2fdc-4c64-89a0-eca5b14b32d6","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"7801e3ee-eaad-4b34-af43-c6c9080b2caf","path":"sprites/spr_mk4_leg_variants/spr_mk4_leg_variants.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"ee26bab2-02cc-4e4d-a75a-00c04cf56d3e","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"79b13155-0f85-4e11-9fef-324bf6e87d15","path":"sprites/spr_mk4_leg_variants/spr_mk4_leg_variants.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"6e5b82f0-b1e4-4462-9747-2831172b74a5","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"f43f9098-5ab6-4ea9-9d2c-9be14d2214b8","path":"sprites/spr_mk4_leg_variants/spr_mk4_leg_variants.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"01846774-a3dd-4995-9497-fbee372af500","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_mk4_mongol_chest_variants/spr_mk4_mongol_chest_variants.yy b/sprites/spr_mk4_mongol_chest_variants/spr_mk4_mongol_chest_variants.yy index 6c4ad5dd18..cd2bd79456 100644 --- a/sprites/spr_mk4_mongol_chest_variants/spr_mk4_mongol_chest_variants.yy +++ b/sprites/spr_mk4_mongol_chest_variants/spr_mk4_mongol_chest_variants.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_mk4_mongol_chest_variants", "bboxMode":0, "bbox_bottom":79, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"2cfc06ab-7db9-40db-8c02-32b555a577e4","name":"2cfc06ab-7db9-40db-8c02-32b555a577e4","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"2cfc06ab-7db9-40db-8c02-32b555a577e4","name":"2cfc06ab-7db9-40db-8c02-32b555a577e4","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"2cfc06ab-7db9-40db-8c02-32b555a577e4","path":"sprites/spr_mk4_mongol_chest_variants/spr_mk4_mongol_chest_variants.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"f2132b90-0c80-46bb-88ef-de7faad10ae5","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"2cfc06ab-7db9-40db-8c02-32b555a577e4","path":"sprites/spr_mk4_mongol_chest_variants/spr_mk4_mongol_chest_variants.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"f2132b90-0c80-46bb-88ef-de7faad10ae5","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_mk4_mongol_hat/spr_mk4_mongol_hat.yy b/sprites/spr_mk4_mongol_hat/spr_mk4_mongol_hat.yy index 2d2b81f60d..a6fc9e6f7f 100644 --- a/sprites/spr_mk4_mongol_hat/spr_mk4_mongol_hat.yy +++ b/sprites/spr_mk4_mongol_hat/spr_mk4_mongol_hat.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_mk4_mongol_hat", "bboxMode":0, "bbox_bottom":29, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"776f298a-8428-4cd5-8716-592b704fce94","name":"776f298a-8428-4cd5-8716-592b704fce94","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"776f298a-8428-4cd5-8716-592b704fce94","name":"776f298a-8428-4cd5-8716-592b704fce94","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"776f298a-8428-4cd5-8716-592b704fce94","path":"sprites/spr_mk4_mongol_hat/spr_mk4_mongol_hat.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"83c1deea-feff-46bd-b99b-36c3d05c4bbb","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"776f298a-8428-4cd5-8716-592b704fce94","path":"sprites/spr_mk4_mongol_hat/spr_mk4_mongol_hat.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"83c1deea-feff-46bd-b99b-36c3d05c4bbb","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_mk4_mouth_variants/spr_mk4_mouth_variants.yy b/sprites/spr_mk4_mouth_variants/spr_mk4_mouth_variants.yy index 5f36bc2308..8a776f1f85 100644 --- a/sprites/spr_mk4_mouth_variants/spr_mk4_mouth_variants.yy +++ b/sprites/spr_mk4_mouth_variants/spr_mk4_mouth_variants.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_mk4_mouth_variants", "bboxMode":0, "bbox_bottom":43, @@ -12,11 +12,11 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"4b8ef32c-78f9-46d9-8e67-7f619d1c5356","name":"4b8ef32c-78f9-46d9-8e67-7f619d1c5356","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"7cb87107-55af-49a2-967f-fce654e6d0b2","name":"7cb87107-55af-49a2-967f-fce654e6d0b2","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"f57e6879-ac68-40d0-900d-57fff9a35503","name":"f57e6879-ac68-40d0-900d-57fff9a35503","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"a6d34f74-449c-4ef2-b6cf-700cbce5ac09","name":"a6d34f74-449c-4ef2-b6cf-700cbce5ac09","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"208e4971-e34d-4d7f-95dd-adc79dd8f0fd","name":"208e4971-e34d-4d7f-95dd-adc79dd8f0fd","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"4b8ef32c-78f9-46d9-8e67-7f619d1c5356","name":"4b8ef32c-78f9-46d9-8e67-7f619d1c5356","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"7cb87107-55af-49a2-967f-fce654e6d0b2","name":"7cb87107-55af-49a2-967f-fce654e6d0b2","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"f57e6879-ac68-40d0-900d-57fff9a35503","name":"f57e6879-ac68-40d0-900d-57fff9a35503","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"a6d34f74-449c-4ef2-b6cf-700cbce5ac09","name":"a6d34f74-449c-4ef2-b6cf-700cbce5ac09","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"208e4971-e34d-4d7f-95dd-adc79dd8f0fd","name":"208e4971-e34d-4d7f-95dd-adc79dd8f0fd","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -72,21 +72,11 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"4b8ef32c-78f9-46d9-8e67-7f619d1c5356","path":"sprites/spr_mk4_mouth_variants/spr_mk4_mouth_variants.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"fdd2c8c8-f92b-409f-b185-8b6f7db1b8aa","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"7cb87107-55af-49a2-967f-fce654e6d0b2","path":"sprites/spr_mk4_mouth_variants/spr_mk4_mouth_variants.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"fc1900e1-e6ba-42d6-8d89-f59b501502a7","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"f57e6879-ac68-40d0-900d-57fff9a35503","path":"sprites/spr_mk4_mouth_variants/spr_mk4_mouth_variants.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"0c312846-f775-44d4-9710-5e49bda55667","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"a6d34f74-449c-4ef2-b6cf-700cbce5ac09","path":"sprites/spr_mk4_mouth_variants/spr_mk4_mouth_variants.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"b40c0e7a-d4dc-4bf6-91f0-72ce317e597d","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"208e4971-e34d-4d7f-95dd-adc79dd8f0fd","path":"sprites/spr_mk4_mouth_variants/spr_mk4_mouth_variants.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"8b4f09f8-23a8-455e-a154-20561e393423","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"4b8ef32c-78f9-46d9-8e67-7f619d1c5356","path":"sprites/spr_mk4_mouth_variants/spr_mk4_mouth_variants.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"fdd2c8c8-f92b-409f-b185-8b6f7db1b8aa","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"7cb87107-55af-49a2-967f-fce654e6d0b2","path":"sprites/spr_mk4_mouth_variants/spr_mk4_mouth_variants.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"fc1900e1-e6ba-42d6-8d89-f59b501502a7","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"f57e6879-ac68-40d0-900d-57fff9a35503","path":"sprites/spr_mk4_mouth_variants/spr_mk4_mouth_variants.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"0c312846-f775-44d4-9710-5e49bda55667","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"a6d34f74-449c-4ef2-b6cf-700cbce5ac09","path":"sprites/spr_mk4_mouth_variants/spr_mk4_mouth_variants.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"b40c0e7a-d4dc-4bf6-91f0-72ce317e597d","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"208e4971-e34d-4d7f-95dd-adc79dd8f0fd","path":"sprites/spr_mk4_mouth_variants/spr_mk4_mouth_variants.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"8b4f09f8-23a8-455e-a154-20561e393423","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_mk4_right_arm/spr_mk4_right_arm.yy b/sprites/spr_mk4_right_arm/spr_mk4_right_arm.yy index 08acf87610..d015ece017 100644 --- a/sprites/spr_mk4_right_arm/spr_mk4_right_arm.yy +++ b/sprites/spr_mk4_right_arm/spr_mk4_right_arm.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_mk4_right_arm", "bboxMode":0, "bbox_bottom":125, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"691da313-acdf-4e3b-8a61-65b5199f6f21","name":"691da313-acdf-4e3b-8a61-65b5199f6f21","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"691da313-acdf-4e3b-8a61-65b5199f6f21","name":"691da313-acdf-4e3b-8a61-65b5199f6f21","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"691da313-acdf-4e3b-8a61-65b5199f6f21","path":"sprites/spr_mk4_right_arm/spr_mk4_right_arm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"6246d1fe-0f1d-44a4-876f-79b2e85b226a","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"691da313-acdf-4e3b-8a61-65b5199f6f21","path":"sprites/spr_mk4_right_arm/spr_mk4_right_arm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"6246d1fe-0f1d-44a4-876f-79b2e85b226a","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_mk4_right_trim/spr_mk4_right_trim.yy b/sprites/spr_mk4_right_trim/spr_mk4_right_trim.yy index cea29f3409..09f51c6865 100644 --- a/sprites/spr_mk4_right_trim/spr_mk4_right_trim.yy +++ b/sprites/spr_mk4_right_trim/spr_mk4_right_trim.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_mk4_right_trim", "bboxMode":0, "bbox_bottom":81, @@ -12,11 +12,11 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"9f939d89-30fc-4492-a4fe-b12fa412f437","name":"9f939d89-30fc-4492-a4fe-b12fa412f437","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"f6047874-066e-4ed2-a09a-5f16b7bd84ab","name":"f6047874-066e-4ed2-a09a-5f16b7bd84ab","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"8fd016a6-7fcc-4d09-97f5-dea1a98b9905","name":"8fd016a6-7fcc-4d09-97f5-dea1a98b9905","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"1b92f2fa-575c-4297-b3a2-ed23e70cd1d5","name":"1b92f2fa-575c-4297-b3a2-ed23e70cd1d5","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"fb840ad0-a0d4-4c50-83c4-1dcf5f0dfc2c","name":"fb840ad0-a0d4-4c50-83c4-1dcf5f0dfc2c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"9f939d89-30fc-4492-a4fe-b12fa412f437","name":"9f939d89-30fc-4492-a4fe-b12fa412f437","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"f6047874-066e-4ed2-a09a-5f16b7bd84ab","name":"f6047874-066e-4ed2-a09a-5f16b7bd84ab","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"8fd016a6-7fcc-4d09-97f5-dea1a98b9905","name":"8fd016a6-7fcc-4d09-97f5-dea1a98b9905","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"1b92f2fa-575c-4297-b3a2-ed23e70cd1d5","name":"1b92f2fa-575c-4297-b3a2-ed23e70cd1d5","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"fb840ad0-a0d4-4c50-83c4-1dcf5f0dfc2c","name":"fb840ad0-a0d4-4c50-83c4-1dcf5f0dfc2c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -72,21 +72,11 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"9f939d89-30fc-4492-a4fe-b12fa412f437","path":"sprites/spr_mk4_right_trim/spr_mk4_right_trim.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"7ad3f6b6-0d9e-474b-accc-e820942fdad5","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"f6047874-066e-4ed2-a09a-5f16b7bd84ab","path":"sprites/spr_mk4_right_trim/spr_mk4_right_trim.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"1d3ed260-00ee-4573-9de6-a47b932a55aa","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"8fd016a6-7fcc-4d09-97f5-dea1a98b9905","path":"sprites/spr_mk4_right_trim/spr_mk4_right_trim.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"ce299549-2c09-47b2-b44d-2306b8c0c2b4","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"1b92f2fa-575c-4297-b3a2-ed23e70cd1d5","path":"sprites/spr_mk4_right_trim/spr_mk4_right_trim.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"54242b24-25bc-4088-a2c4-fdf65553d805","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"fb840ad0-a0d4-4c50-83c4-1dcf5f0dfc2c","path":"sprites/spr_mk4_right_trim/spr_mk4_right_trim.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"a90700c3-30df-47fe-adcd-a32ef97a91b0","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"9f939d89-30fc-4492-a4fe-b12fa412f437","path":"sprites/spr_mk4_right_trim/spr_mk4_right_trim.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"7ad3f6b6-0d9e-474b-accc-e820942fdad5","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"f6047874-066e-4ed2-a09a-5f16b7bd84ab","path":"sprites/spr_mk4_right_trim/spr_mk4_right_trim.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"1d3ed260-00ee-4573-9de6-a47b932a55aa","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"8fd016a6-7fcc-4d09-97f5-dea1a98b9905","path":"sprites/spr_mk4_right_trim/spr_mk4_right_trim.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"ce299549-2c09-47b2-b44d-2306b8c0c2b4","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"1b92f2fa-575c-4297-b3a2-ed23e70cd1d5","path":"sprites/spr_mk4_right_trim/spr_mk4_right_trim.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"54242b24-25bc-4088-a2c4-fdf65553d805","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"fb840ad0-a0d4-4c50-83c4-1dcf5f0dfc2c","path":"sprites/spr_mk4_right_trim/spr_mk4_right_trim.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"a90700c3-30df-47fe-adcd-a32ef97a91b0","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_mk5_chest_variants/spr_mk5_chest_variants.yy b/sprites/spr_mk5_chest_variants/spr_mk5_chest_variants.yy index d748da46c8..7065380fff 100644 --- a/sprites/spr_mk5_chest_variants/spr_mk5_chest_variants.yy +++ b/sprites/spr_mk5_chest_variants/spr_mk5_chest_variants.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_mk5_chest_variants", "bboxMode":0, "bbox_bottom":97, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"48f72680-cb96-4361-9276-5e8d8552ae9f","name":"48f72680-cb96-4361-9276-5e8d8552ae9f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"48f72680-cb96-4361-9276-5e8d8552ae9f","name":"48f72680-cb96-4361-9276-5e8d8552ae9f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"48f72680-cb96-4361-9276-5e8d8552ae9f","path":"sprites/spr_mk5_chest_variants/spr_mk5_chest_variants.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"bafabbd7-db90-49f5-9bc8-8b338ebf2ca3","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"48f72680-cb96-4361-9276-5e8d8552ae9f","path":"sprites/spr_mk5_chest_variants/spr_mk5_chest_variants.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"bafabbd7-db90-49f5-9bc8-8b338ebf2ca3","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_mk5_colors/spr_mk5_colors.yy b/sprites/spr_mk5_colors/spr_mk5_colors.yy index 152cccd4cc..87ae564ee9 100644 --- a/sprites/spr_mk5_colors/spr_mk5_colors.yy +++ b/sprites/spr_mk5_colors/spr_mk5_colors.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_mk5_colors", "bboxMode":0, "bbox_bottom":220, @@ -12,20 +12,20 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"e925f8dc-f68b-4b57-b349-aaf54f977dcf","name":"e925f8dc-f68b-4b57-b349-aaf54f977dcf","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"2fbec92e-84b0-498f-9725-3e0eed5c65ff","name":"2fbec92e-84b0-498f-9725-3e0eed5c65ff","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"f0165640-a879-40ab-8fc1-1109f6c8ad1d","name":"f0165640-a879-40ab-8fc1-1109f6c8ad1d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"03b9eef3-bac8-4c92-b391-60154466ea63","name":"03b9eef3-bac8-4c92-b391-60154466ea63","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"f1a5d458-e6c0-4fda-a64c-d0a69dbccf3f","name":"f1a5d458-e6c0-4fda-a64c-d0a69dbccf3f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"525390cd-8f5d-4f17-b373-e7523c71e756","name":"525390cd-8f5d-4f17-b373-e7523c71e756","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"824057dd-57d8-4988-81ad-7843670e525f","name":"824057dd-57d8-4988-81ad-7843670e525f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"3a9dfd01-8e60-48cb-94b0-9e1d442bcacf","name":"3a9dfd01-8e60-48cb-94b0-9e1d442bcacf","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"04056724-6e77-47f9-bc78-04245136983a","name":"04056724-6e77-47f9-bc78-04245136983a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"a4739aff-a6c6-479d-8022-5da8edd7feac","name":"a4739aff-a6c6-479d-8022-5da8edd7feac","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"1d1808ad-4b5b-4a6b-89f1-18aa5c5d51ab","name":"1d1808ad-4b5b-4a6b-89f1-18aa5c5d51ab","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"f39e1f11-2234-4b91-b86d-2cf8ed4e612c","name":"f39e1f11-2234-4b91-b86d-2cf8ed4e612c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"0f1ab696-8adc-425d-bf80-427a3e021fe1","name":"0f1ab696-8adc-425d-bf80-427a3e021fe1","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"0538d1c9-8b5c-467f-8881-3971b138dce1","name":"0538d1c9-8b5c-467f-8881-3971b138dce1","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"e925f8dc-f68b-4b57-b349-aaf54f977dcf","name":"e925f8dc-f68b-4b57-b349-aaf54f977dcf","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"2fbec92e-84b0-498f-9725-3e0eed5c65ff","name":"2fbec92e-84b0-498f-9725-3e0eed5c65ff","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"f0165640-a879-40ab-8fc1-1109f6c8ad1d","name":"f0165640-a879-40ab-8fc1-1109f6c8ad1d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"03b9eef3-bac8-4c92-b391-60154466ea63","name":"03b9eef3-bac8-4c92-b391-60154466ea63","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"f1a5d458-e6c0-4fda-a64c-d0a69dbccf3f","name":"f1a5d458-e6c0-4fda-a64c-d0a69dbccf3f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"525390cd-8f5d-4f17-b373-e7523c71e756","name":"525390cd-8f5d-4f17-b373-e7523c71e756","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"824057dd-57d8-4988-81ad-7843670e525f","name":"824057dd-57d8-4988-81ad-7843670e525f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"3a9dfd01-8e60-48cb-94b0-9e1d442bcacf","name":"3a9dfd01-8e60-48cb-94b0-9e1d442bcacf","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"04056724-6e77-47f9-bc78-04245136983a","name":"04056724-6e77-47f9-bc78-04245136983a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"a4739aff-a6c6-479d-8022-5da8edd7feac","name":"a4739aff-a6c6-479d-8022-5da8edd7feac","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"1d1808ad-4b5b-4a6b-89f1-18aa5c5d51ab","name":"1d1808ad-4b5b-4a6b-89f1-18aa5c5d51ab","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"f39e1f11-2234-4b91-b86d-2cf8ed4e612c","name":"f39e1f11-2234-4b91-b86d-2cf8ed4e612c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"0f1ab696-8adc-425d-bf80-427a3e021fe1","name":"0f1ab696-8adc-425d-bf80-427a3e021fe1","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"0538d1c9-8b5c-467f-8881-3971b138dce1","name":"0538d1c9-8b5c-467f-8881-3971b138dce1","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -81,48 +81,20 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"e925f8dc-f68b-4b57-b349-aaf54f977dcf","path":"sprites/spr_mk5_colors/spr_mk5_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"34f79352-9e1d-41b5-971d-53bc7d180dcf","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"2fbec92e-84b0-498f-9725-3e0eed5c65ff","path":"sprites/spr_mk5_colors/spr_mk5_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"41ebc135-a734-483b-9fdb-036963d1fd78","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"f0165640-a879-40ab-8fc1-1109f6c8ad1d","path":"sprites/spr_mk5_colors/spr_mk5_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"278ee5e0-fcf7-4231-a797-cc9f649c46fe","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"03b9eef3-bac8-4c92-b391-60154466ea63","path":"sprites/spr_mk5_colors/spr_mk5_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"2698944f-a778-4862-af5e-d1e965a055e9","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"f1a5d458-e6c0-4fda-a64c-d0a69dbccf3f","path":"sprites/spr_mk5_colors/spr_mk5_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"3b4ad9b4-ccbf-40cf-9814-6c5848584e0e","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"525390cd-8f5d-4f17-b373-e7523c71e756","path":"sprites/spr_mk5_colors/spr_mk5_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"a4131ca8-4631-4aff-ba48-ffc95e14da43","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"824057dd-57d8-4988-81ad-7843670e525f","path":"sprites/spr_mk5_colors/spr_mk5_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"e54b2e68-86b8-42df-83a2-5667027c2582","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"3a9dfd01-8e60-48cb-94b0-9e1d442bcacf","path":"sprites/spr_mk5_colors/spr_mk5_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"e0bb39ab-c8b1-4931-b5b0-38d0c7e1ca9d","IsCreationKey":false,"Key":7.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"04056724-6e77-47f9-bc78-04245136983a","path":"sprites/spr_mk5_colors/spr_mk5_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"c6d661e5-6c13-4083-b139-1984b5b15593","IsCreationKey":false,"Key":8.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"a4739aff-a6c6-479d-8022-5da8edd7feac","path":"sprites/spr_mk5_colors/spr_mk5_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"2c0f3071-514e-4c64-a1a3-c1ff0538208c","IsCreationKey":false,"Key":9.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"1d1808ad-4b5b-4a6b-89f1-18aa5c5d51ab","path":"sprites/spr_mk5_colors/spr_mk5_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"7f7c6f1c-cbc1-4d9d-ab0c-3265f63aeb87","IsCreationKey":false,"Key":10.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"f39e1f11-2234-4b91-b86d-2cf8ed4e612c","path":"sprites/spr_mk5_colors/spr_mk5_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"02611d68-04eb-426c-9235-2793882b1177","IsCreationKey":false,"Key":11.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"0f1ab696-8adc-425d-bf80-427a3e021fe1","path":"sprites/spr_mk5_colors/spr_mk5_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"0340420d-ca3d-4e8f-a3d3-d39a86fc1cad","IsCreationKey":false,"Key":12.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"0538d1c9-8b5c-467f-8881-3971b138dce1","path":"sprites/spr_mk5_colors/spr_mk5_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"4ebf624a-29e0-43d1-957b-5ef6da0fd47e","IsCreationKey":false,"Key":13.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"e925f8dc-f68b-4b57-b349-aaf54f977dcf","path":"sprites/spr_mk5_colors/spr_mk5_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"34f79352-9e1d-41b5-971d-53bc7d180dcf","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"2fbec92e-84b0-498f-9725-3e0eed5c65ff","path":"sprites/spr_mk5_colors/spr_mk5_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"41ebc135-a734-483b-9fdb-036963d1fd78","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"f0165640-a879-40ab-8fc1-1109f6c8ad1d","path":"sprites/spr_mk5_colors/spr_mk5_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"278ee5e0-fcf7-4231-a797-cc9f649c46fe","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"03b9eef3-bac8-4c92-b391-60154466ea63","path":"sprites/spr_mk5_colors/spr_mk5_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"2698944f-a778-4862-af5e-d1e965a055e9","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"f1a5d458-e6c0-4fda-a64c-d0a69dbccf3f","path":"sprites/spr_mk5_colors/spr_mk5_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"3b4ad9b4-ccbf-40cf-9814-6c5848584e0e","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"525390cd-8f5d-4f17-b373-e7523c71e756","path":"sprites/spr_mk5_colors/spr_mk5_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"a4131ca8-4631-4aff-ba48-ffc95e14da43","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"824057dd-57d8-4988-81ad-7843670e525f","path":"sprites/spr_mk5_colors/spr_mk5_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"e54b2e68-86b8-42df-83a2-5667027c2582","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"3a9dfd01-8e60-48cb-94b0-9e1d442bcacf","path":"sprites/spr_mk5_colors/spr_mk5_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"e0bb39ab-c8b1-4931-b5b0-38d0c7e1ca9d","IsCreationKey":false,"Key":7.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"04056724-6e77-47f9-bc78-04245136983a","path":"sprites/spr_mk5_colors/spr_mk5_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"c6d661e5-6c13-4083-b139-1984b5b15593","IsCreationKey":false,"Key":8.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"a4739aff-a6c6-479d-8022-5da8edd7feac","path":"sprites/spr_mk5_colors/spr_mk5_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"2c0f3071-514e-4c64-a1a3-c1ff0538208c","IsCreationKey":false,"Key":9.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"1d1808ad-4b5b-4a6b-89f1-18aa5c5d51ab","path":"sprites/spr_mk5_colors/spr_mk5_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"7f7c6f1c-cbc1-4d9d-ab0c-3265f63aeb87","IsCreationKey":false,"Key":10.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"f39e1f11-2234-4b91-b86d-2cf8ed4e612c","path":"sprites/spr_mk5_colors/spr_mk5_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"02611d68-04eb-426c-9235-2793882b1177","IsCreationKey":false,"Key":11.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"0f1ab696-8adc-425d-bf80-427a3e021fe1","path":"sprites/spr_mk5_colors/spr_mk5_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"0340420d-ca3d-4e8f-a3d3-d39a86fc1cad","IsCreationKey":false,"Key":12.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"0538d1c9-8b5c-467f-8881-3971b138dce1","path":"sprites/spr_mk5_colors/spr_mk5_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"4ebf624a-29e0-43d1-957b-5ef6da0fd47e","IsCreationKey":false,"Key":13.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_mk5_complex/spr_mk5_complex.yy b/sprites/spr_mk5_complex/spr_mk5_complex.yy index 4b6e44d95c..98fc288dd9 100644 --- a/sprites/spr_mk5_complex/spr_mk5_complex.yy +++ b/sprites/spr_mk5_complex/spr_mk5_complex.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_mk5_complex", "bboxMode":0, "bbox_bottom":220, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"48f72680-cb96-4361-9276-5e8d8552ae9f","name":"48f72680-cb96-4361-9276-5e8d8552ae9f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"48f72680-cb96-4361-9276-5e8d8552ae9f","name":"48f72680-cb96-4361-9276-5e8d8552ae9f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"48f72680-cb96-4361-9276-5e8d8552ae9f","path":"sprites/spr_mk5_complex/spr_mk5_complex.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"efd749b6-b89e-48c1-99df-bde59481c13f","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"48f72680-cb96-4361-9276-5e8d8552ae9f","path":"sprites/spr_mk5_complex/spr_mk5_complex.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"efd749b6-b89e-48c1-99df-bde59481c13f","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_mk5_complex_backpack/spr_mk5_complex_backpack.yy b/sprites/spr_mk5_complex_backpack/spr_mk5_complex_backpack.yy index 26b419ba0d..2218324c12 100644 --- a/sprites/spr_mk5_complex_backpack/spr_mk5_complex_backpack.yy +++ b/sprites/spr_mk5_complex_backpack/spr_mk5_complex_backpack.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_mk5_complex_backpack", "bboxMode":0, "bbox_bottom":35, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"9aa55975-2b4b-4679-8fd7-f6141f200e93","name":"9aa55975-2b4b-4679-8fd7-f6141f200e93","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"9aa55975-2b4b-4679-8fd7-f6141f200e93","name":"9aa55975-2b4b-4679-8fd7-f6141f200e93","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"9aa55975-2b4b-4679-8fd7-f6141f200e93","path":"sprites/spr_mk5_complex_backpack/spr_mk5_complex_backpack.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"d00609fa-9d93-4657-a437-e937e9cd46e0","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"9aa55975-2b4b-4679-8fd7-f6141f200e93","path":"sprites/spr_mk5_complex_backpack/spr_mk5_complex_backpack.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"d00609fa-9d93-4657-a437-e937e9cd46e0","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_mk5_head_variants/spr_mk5_head_variants.yy b/sprites/spr_mk5_head_variants/spr_mk5_head_variants.yy index 62a3da6288..0bfe7a9246 100644 --- a/sprites/spr_mk5_head_variants/spr_mk5_head_variants.yy +++ b/sprites/spr_mk5_head_variants/spr_mk5_head_variants.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_mk5_head_variants", "bboxMode":0, "bbox_bottom":46, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"6ae9cb2a-6253-4261-9f21-88688afd2163","name":"6ae9cb2a-6253-4261-9f21-88688afd2163","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"6ae9cb2a-6253-4261-9f21-88688afd2163","name":"6ae9cb2a-6253-4261-9f21-88688afd2163","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"6ae9cb2a-6253-4261-9f21-88688afd2163","path":"sprites/spr_mk5_head_variants/spr_mk5_head_variants.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"a7a73431-ca07-41d9-b12f-d718a5984fc6","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"6ae9cb2a-6253-4261-9f21-88688afd2163","path":"sprites/spr_mk5_head_variants/spr_mk5_head_variants.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"a7a73431-ca07-41d9-b12f-d718a5984fc6","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_mk5_left_arm/spr_mk5_left_arm.yy b/sprites/spr_mk5_left_arm/spr_mk5_left_arm.yy index 975616b124..3933b3de1d 100644 --- a/sprites/spr_mk5_left_arm/spr_mk5_left_arm.yy +++ b/sprites/spr_mk5_left_arm/spr_mk5_left_arm.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_mk5_left_arm", "bboxMode":0, "bbox_bottom":125, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"b03de0e7-42de-4112-9568-659441788221","name":"b03de0e7-42de-4112-9568-659441788221","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"b03de0e7-42de-4112-9568-659441788221","name":"b03de0e7-42de-4112-9568-659441788221","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"b03de0e7-42de-4112-9568-659441788221","path":"sprites/spr_mk5_left_arm/spr_mk5_left_arm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"cabe8ec7-e204-4d1a-a7bf-1450852659fe","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"b03de0e7-42de-4112-9568-659441788221","path":"sprites/spr_mk5_left_arm/spr_mk5_left_arm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"cabe8ec7-e204-4d1a-a7bf-1450852659fe","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_mk5_right_arm/spr_mk5_right_arm.yy b/sprites/spr_mk5_right_arm/spr_mk5_right_arm.yy index c236091b21..278a6af5a0 100644 --- a/sprites/spr_mk5_right_arm/spr_mk5_right_arm.yy +++ b/sprites/spr_mk5_right_arm/spr_mk5_right_arm.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_mk5_right_arm", "bboxMode":0, "bbox_bottom":125, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"667e4008-fe43-4bbe-b40b-8411d9921596","name":"667e4008-fe43-4bbe-b40b-8411d9921596","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"667e4008-fe43-4bbe-b40b-8411d9921596","name":"667e4008-fe43-4bbe-b40b-8411d9921596","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"667e4008-fe43-4bbe-b40b-8411d9921596","path":"sprites/spr_mk5_right_arm/spr_mk5_right_arm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"993de37b-fcef-4d76-92c0-6e447ba018c7","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"667e4008-fe43-4bbe-b40b-8411d9921596","path":"sprites/spr_mk5_right_arm/spr_mk5_right_arm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"993de37b-fcef-4d76-92c0-6e447ba018c7","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_mk5_samuri_faceplate/spr_mk5_samuri_faceplate.yy b/sprites/spr_mk5_samuri_faceplate/spr_mk5_samuri_faceplate.yy index 34fa4aafe5..cc2f42a13d 100644 --- a/sprites/spr_mk5_samuri_faceplate/spr_mk5_samuri_faceplate.yy +++ b/sprites/spr_mk5_samuri_faceplate/spr_mk5_samuri_faceplate.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_mk5_samuri_faceplate", "bboxMode":0, "bbox_bottom":47, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"5333554c-9d16-493b-8907-d467605b3c7c","name":"5333554c-9d16-493b-8907-d467605b3c7c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"5333554c-9d16-493b-8907-d467605b3c7c","name":"5333554c-9d16-493b-8907-d467605b3c7c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"5333554c-9d16-493b-8907-d467605b3c7c","path":"sprites/spr_mk5_samuri_faceplate/spr_mk5_samuri_faceplate.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"6268e815-40ba-4a86-99ba-0009c1cbbc9f","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"5333554c-9d16-493b-8907-d467605b3c7c","path":"sprites/spr_mk5_samuri_faceplate/spr_mk5_samuri_faceplate.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"6268e815-40ba-4a86-99ba-0009c1cbbc9f","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_mk6_complex/spr_mk6_complex.yy b/sprites/spr_mk6_complex/spr_mk6_complex.yy index d637a5303e..881148f0e6 100644 --- a/sprites/spr_mk6_complex/spr_mk6_complex.yy +++ b/sprites/spr_mk6_complex/spr_mk6_complex.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_mk6_complex", "bboxMode":0, "bbox_bottom":220, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"fad92a4f-b6de-4209-8eed-5a7b6bf3abcf","name":"fad92a4f-b6de-4209-8eed-5a7b6bf3abcf","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"fad92a4f-b6de-4209-8eed-5a7b6bf3abcf","name":"fad92a4f-b6de-4209-8eed-5a7b6bf3abcf","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"fad92a4f-b6de-4209-8eed-5a7b6bf3abcf","path":"sprites/spr_mk6_complex/spr_mk6_complex.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"23021aeb-0c67-4243-bf92-73fe45924fe0","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"fad92a4f-b6de-4209-8eed-5a7b6bf3abcf","path":"sprites/spr_mk6_complex/spr_mk6_complex.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"23021aeb-0c67-4243-bf92-73fe45924fe0","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_mk6_complex_backpack/spr_mk6_complex_backpack.yy b/sprites/spr_mk6_complex_backpack/spr_mk6_complex_backpack.yy index b903b5661e..0d08c9ab78 100644 --- a/sprites/spr_mk6_complex_backpack/spr_mk6_complex_backpack.yy +++ b/sprites/spr_mk6_complex_backpack/spr_mk6_complex_backpack.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_mk6_complex_backpack", "bboxMode":0, "bbox_bottom":38, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"557d0497-d213-4f3c-9acb-a261ca311b93","name":"557d0497-d213-4f3c-9acb-a261ca311b93","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"557d0497-d213-4f3c-9acb-a261ca311b93","name":"557d0497-d213-4f3c-9acb-a261ca311b93","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -70,9 +70,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"557d0497-d213-4f3c-9acb-a261ca311b93","path":"sprites/spr_mk6_complex_backpack/spr_mk6_complex_backpack.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"a8ae85dd-0643-4118-a10b-348ff5c192da","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"557d0497-d213-4f3c-9acb-a261ca311b93","path":"sprites/spr_mk6_complex_backpack/spr_mk6_complex_backpack.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"a8ae85dd-0643-4118-a10b-348ff5c192da","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_mk6_cthonian_heads/spr_mk6_cthonian_heads.yy b/sprites/spr_mk6_cthonian_heads/spr_mk6_cthonian_heads.yy index fb93663d38..8ae305162e 100644 --- a/sprites/spr_mk6_cthonian_heads/spr_mk6_cthonian_heads.yy +++ b/sprites/spr_mk6_cthonian_heads/spr_mk6_cthonian_heads.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_mk6_cthonian_heads", "bboxMode":0, "bbox_bottom":46, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"83d5214e-7c9a-4b81-912a-89e8daedbab4","name":"83d5214e-7c9a-4b81-912a-89e8daedbab4","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"83d5214e-7c9a-4b81-912a-89e8daedbab4","name":"83d5214e-7c9a-4b81-912a-89e8daedbab4","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -70,9 +70,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"83d5214e-7c9a-4b81-912a-89e8daedbab4","path":"sprites/spr_mk6_cthonian_heads/spr_mk6_cthonian_heads.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"8d75e3f1-ccde-413d-ba85-55cf7f715d46","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"83d5214e-7c9a-4b81-912a-89e8daedbab4","path":"sprites/spr_mk6_cthonian_heads/spr_mk6_cthonian_heads.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"8d75e3f1-ccde-413d-ba85-55cf7f715d46","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_mk6_forehead_knightly/spr_mk6_forehead_knightly.yy b/sprites/spr_mk6_forehead_knightly/spr_mk6_forehead_knightly.yy index c4b6608c40..5600da5a74 100644 --- a/sprites/spr_mk6_forehead_knightly/spr_mk6_forehead_knightly.yy +++ b/sprites/spr_mk6_forehead_knightly/spr_mk6_forehead_knightly.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_mk6_forehead_knightly", "bboxMode":0, "bbox_bottom":29, @@ -12,9 +12,9 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"fad92a4f-b6de-4209-8eed-5a7b6bf3abcf","name":"fad92a4f-b6de-4209-8eed-5a7b6bf3abcf","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"415fcd60-4ea4-4d41-8642-a475ac5f2696","name":"415fcd60-4ea4-4d41-8642-a475ac5f2696","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"184bb9a2-c0f5-488b-9e51-6819cfc3eabf","name":"184bb9a2-c0f5-488b-9e51-6819cfc3eabf","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"fad92a4f-b6de-4209-8eed-5a7b6bf3abcf","name":"fad92a4f-b6de-4209-8eed-5a7b6bf3abcf","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"415fcd60-4ea4-4d41-8642-a475ac5f2696","name":"415fcd60-4ea4-4d41-8642-a475ac5f2696","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"184bb9a2-c0f5-488b-9e51-6819cfc3eabf","name":"184bb9a2-c0f5-488b-9e51-6819cfc3eabf","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -72,15 +72,9 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"fad92a4f-b6de-4209-8eed-5a7b6bf3abcf","path":"sprites/spr_mk6_forehead_knightly/spr_mk6_forehead_knightly.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"990daad4-708f-4aff-be58-94b415e06c63","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"415fcd60-4ea4-4d41-8642-a475ac5f2696","path":"sprites/spr_mk6_forehead_knightly/spr_mk6_forehead_knightly.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"70d60aec-8edb-4110-af4b-e8f926007ab2","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"184bb9a2-c0f5-488b-9e51-6819cfc3eabf","path":"sprites/spr_mk6_forehead_knightly/spr_mk6_forehead_knightly.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"95e20c38-53de-470d-9550-f0e9435d416a","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"fad92a4f-b6de-4209-8eed-5a7b6bf3abcf","path":"sprites/spr_mk6_forehead_knightly/spr_mk6_forehead_knightly.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"990daad4-708f-4aff-be58-94b415e06c63","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"415fcd60-4ea4-4d41-8642-a475ac5f2696","path":"sprites/spr_mk6_forehead_knightly/spr_mk6_forehead_knightly.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"70d60aec-8edb-4110-af4b-e8f926007ab2","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"184bb9a2-c0f5-488b-9e51-6819cfc3eabf","path":"sprites/spr_mk6_forehead_knightly/spr_mk6_forehead_knightly.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"95e20c38-53de-470d-9550-f0e9435d416a","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_mk6_head_variants/spr_mk6_head_variants.yy b/sprites/spr_mk6_head_variants/spr_mk6_head_variants.yy index 74d45fa7aa..7f8fc9e724 100644 --- a/sprites/spr_mk6_head_variants/spr_mk6_head_variants.yy +++ b/sprites/spr_mk6_head_variants/spr_mk6_head_variants.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_mk6_head_variants", "bboxMode":0, "bbox_bottom":46, @@ -12,9 +12,9 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"fad92a4f-b6de-4209-8eed-5a7b6bf3abcf","name":"fad92a4f-b6de-4209-8eed-5a7b6bf3abcf","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"83fc5467-64c1-49f9-8b39-0522440d9284","name":"83fc5467-64c1-49f9-8b39-0522440d9284","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"b3f65aab-e87f-4f14-a67d-19dbeac26482","name":"b3f65aab-e87f-4f14-a67d-19dbeac26482","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"fad92a4f-b6de-4209-8eed-5a7b6bf3abcf","name":"fad92a4f-b6de-4209-8eed-5a7b6bf3abcf","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"83fc5467-64c1-49f9-8b39-0522440d9284","name":"83fc5467-64c1-49f9-8b39-0522440d9284","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"b3f65aab-e87f-4f14-a67d-19dbeac26482","name":"b3f65aab-e87f-4f14-a67d-19dbeac26482","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -72,15 +72,9 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"fad92a4f-b6de-4209-8eed-5a7b6bf3abcf","path":"sprites/spr_mk6_head_variants/spr_mk6_head_variants.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"4c6fa85d-e91b-4424-a5a9-457f82bdc5b0","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"83fc5467-64c1-49f9-8b39-0522440d9284","path":"sprites/spr_mk6_head_variants/spr_mk6_head_variants.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"9fdbe958-7c98-4ca5-bc2d-75debc7c1e5b","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"b3f65aab-e87f-4f14-a67d-19dbeac26482","path":"sprites/spr_mk6_head_variants/spr_mk6_head_variants.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"5fb38721-2924-47bc-a9c0-aa2137ffc2d1","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"fad92a4f-b6de-4209-8eed-5a7b6bf3abcf","path":"sprites/spr_mk6_head_variants/spr_mk6_head_variants.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"4c6fa85d-e91b-4424-a5a9-457f82bdc5b0","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"83fc5467-64c1-49f9-8b39-0522440d9284","path":"sprites/spr_mk6_head_variants/spr_mk6_head_variants.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"9fdbe958-7c98-4ca5-bc2d-75debc7c1e5b","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"b3f65aab-e87f-4f14-a67d-19dbeac26482","path":"sprites/spr_mk6_head_variants/spr_mk6_head_variants.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"5fb38721-2924-47bc-a9c0-aa2137ffc2d1","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_mk6_knightly_mouth_variants/spr_mk6_knightly_mouth_variants.yy b/sprites/spr_mk6_knightly_mouth_variants/spr_mk6_knightly_mouth_variants.yy index 034eb566fd..9012ac6008 100644 --- a/sprites/spr_mk6_knightly_mouth_variants/spr_mk6_knightly_mouth_variants.yy +++ b/sprites/spr_mk6_knightly_mouth_variants/spr_mk6_knightly_mouth_variants.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_mk6_knightly_mouth_variants", "bboxMode":0, "bbox_bottom":46, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"fad92a4f-b6de-4209-8eed-5a7b6bf3abcf","name":"fad92a4f-b6de-4209-8eed-5a7b6bf3abcf","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"fad92a4f-b6de-4209-8eed-5a7b6bf3abcf","name":"fad92a4f-b6de-4209-8eed-5a7b6bf3abcf","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -70,9 +70,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"fad92a4f-b6de-4209-8eed-5a7b6bf3abcf","path":"sprites/spr_mk6_knightly_mouth_variants/spr_mk6_knightly_mouth_variants.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"ed8f7823-887b-4797-b2fc-2c5bebf5c720","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"fad92a4f-b6de-4209-8eed-5a7b6bf3abcf","path":"sprites/spr_mk6_knightly_mouth_variants/spr_mk6_knightly_mouth_variants.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"ed8f7823-887b-4797-b2fc-2c5bebf5c720","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_mk6_left_arm/spr_mk6_left_arm.yy b/sprites/spr_mk6_left_arm/spr_mk6_left_arm.yy index 20d965e7e7..4215ef0194 100644 --- a/sprites/spr_mk6_left_arm/spr_mk6_left_arm.yy +++ b/sprites/spr_mk6_left_arm/spr_mk6_left_arm.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_mk6_left_arm", "bboxMode":0, "bbox_bottom":125, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"22cfde6e-f8bd-4528-8635-78300f040903","name":"22cfde6e-f8bd-4528-8635-78300f040903","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"22cfde6e-f8bd-4528-8635-78300f040903","name":"22cfde6e-f8bd-4528-8635-78300f040903","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"22cfde6e-f8bd-4528-8635-78300f040903","path":"sprites/spr_mk6_left_arm/spr_mk6_left_arm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"6a261d08-29c4-4b92-b017-d0cd9ed8f1ef","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"22cfde6e-f8bd-4528-8635-78300f040903","path":"sprites/spr_mk6_left_arm/spr_mk6_left_arm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"6a261d08-29c4-4b92-b017-d0cd9ed8f1ef","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_mk6_mongol_chest_variants/spr_mk6_mongol_chest_variants.yy b/sprites/spr_mk6_mongol_chest_variants/spr_mk6_mongol_chest_variants.yy index be40e0616d..eee19efc32 100644 --- a/sprites/spr_mk6_mongol_chest_variants/spr_mk6_mongol_chest_variants.yy +++ b/sprites/spr_mk6_mongol_chest_variants/spr_mk6_mongol_chest_variants.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_mk6_mongol_chest_variants", "bboxMode":0, "bbox_bottom":77, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"be51056f-3c34-44c2-865d-3cb121432582","name":"be51056f-3c34-44c2-865d-3cb121432582","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"be51056f-3c34-44c2-865d-3cb121432582","name":"be51056f-3c34-44c2-865d-3cb121432582","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"be51056f-3c34-44c2-865d-3cb121432582","path":"sprites/spr_mk6_mongol_chest_variants/spr_mk6_mongol_chest_variants.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"6b8a0cec-2320-4e14-9783-f4e8bf0f87d3","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"be51056f-3c34-44c2-865d-3cb121432582","path":"sprites/spr_mk6_mongol_chest_variants/spr_mk6_mongol_chest_variants.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"6b8a0cec-2320-4e14-9783-f4e8bf0f87d3","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_mk6_mouth_prussian/spr_mk6_mouth_prussian.yy b/sprites/spr_mk6_mouth_prussian/spr_mk6_mouth_prussian.yy index 26b2f4dae5..4472ecb273 100644 --- a/sprites/spr_mk6_mouth_prussian/spr_mk6_mouth_prussian.yy +++ b/sprites/spr_mk6_mouth_prussian/spr_mk6_mouth_prussian.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_mk6_mouth_prussian", "bboxMode":0, "bbox_bottom":45, @@ -12,9 +12,9 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"fad92a4f-b6de-4209-8eed-5a7b6bf3abcf","name":"fad92a4f-b6de-4209-8eed-5a7b6bf3abcf","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"413c9428-5da2-4ef2-a236-fbbd9ad3d6ab","name":"413c9428-5da2-4ef2-a236-fbbd9ad3d6ab","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"ef00b133-1edd-4ecd-a7c1-41f2f80c4d01","name":"ef00b133-1edd-4ecd-a7c1-41f2f80c4d01","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"fad92a4f-b6de-4209-8eed-5a7b6bf3abcf","name":"fad92a4f-b6de-4209-8eed-5a7b6bf3abcf","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"413c9428-5da2-4ef2-a236-fbbd9ad3d6ab","name":"413c9428-5da2-4ef2-a236-fbbd9ad3d6ab","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"ef00b133-1edd-4ecd-a7c1-41f2f80c4d01","name":"ef00b133-1edd-4ecd-a7c1-41f2f80c4d01","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -70,15 +70,9 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"fad92a4f-b6de-4209-8eed-5a7b6bf3abcf","path":"sprites/spr_mk6_mouth_prussian/spr_mk6_mouth_prussian.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"f8571ae2-19d0-4093-ae0a-e5f864f1c8b4","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"413c9428-5da2-4ef2-a236-fbbd9ad3d6ab","path":"sprites/spr_mk6_mouth_prussian/spr_mk6_mouth_prussian.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"1d33d213-2125-4792-bea1-65c540c83851","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"ef00b133-1edd-4ecd-a7c1-41f2f80c4d01","path":"sprites/spr_mk6_mouth_prussian/spr_mk6_mouth_prussian.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"6423fa90-8cbf-47a6-ad5e-e020ea6ae916","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"fad92a4f-b6de-4209-8eed-5a7b6bf3abcf","path":"sprites/spr_mk6_mouth_prussian/spr_mk6_mouth_prussian.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"f8571ae2-19d0-4093-ae0a-e5f864f1c8b4","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"413c9428-5da2-4ef2-a236-fbbd9ad3d6ab","path":"sprites/spr_mk6_mouth_prussian/spr_mk6_mouth_prussian.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"1d33d213-2125-4792-bea1-65c540c83851","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"ef00b133-1edd-4ecd-a7c1-41f2f80c4d01","path":"sprites/spr_mk6_mouth_prussian/spr_mk6_mouth_prussian.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"6423fa90-8cbf-47a6-ad5e-e020ea6ae916","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_mk6_mouth_variants/spr_mk6_mouth_variants.yy b/sprites/spr_mk6_mouth_variants/spr_mk6_mouth_variants.yy index 396e34cb92..ca8a7036fe 100644 --- a/sprites/spr_mk6_mouth_variants/spr_mk6_mouth_variants.yy +++ b/sprites/spr_mk6_mouth_variants/spr_mk6_mouth_variants.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_mk6_mouth_variants", "bboxMode":0, "bbox_bottom":41, @@ -12,9 +12,9 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"79e7c2cf-678c-4a6a-863f-a7530e271840","name":"79e7c2cf-678c-4a6a-863f-a7530e271840","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"15b22a94-9604-4054-869e-a78662b8ec58","name":"15b22a94-9604-4054-869e-a78662b8ec58","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"e0baf035-398a-47b0-91c9-fd825a890c94","name":"e0baf035-398a-47b0-91c9-fd825a890c94","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"79e7c2cf-678c-4a6a-863f-a7530e271840","name":"79e7c2cf-678c-4a6a-863f-a7530e271840","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"15b22a94-9604-4054-869e-a78662b8ec58","name":"15b22a94-9604-4054-869e-a78662b8ec58","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"e0baf035-398a-47b0-91c9-fd825a890c94","name":"e0baf035-398a-47b0-91c9-fd825a890c94","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -70,15 +70,9 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"79e7c2cf-678c-4a6a-863f-a7530e271840","path":"sprites/spr_mk6_mouth_variants/spr_mk6_mouth_variants.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"87a6e7ac-eb2f-4c87-9af3-b2d14c030606","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"15b22a94-9604-4054-869e-a78662b8ec58","path":"sprites/spr_mk6_mouth_variants/spr_mk6_mouth_variants.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"af62b5cb-8786-452d-b03b-ed40c3dc6b0b","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"e0baf035-398a-47b0-91c9-fd825a890c94","path":"sprites/spr_mk6_mouth_variants/spr_mk6_mouth_variants.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"93544ea3-4ac1-4ea3-90a7-1c5f1f9626b4","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"79e7c2cf-678c-4a6a-863f-a7530e271840","path":"sprites/spr_mk6_mouth_variants/spr_mk6_mouth_variants.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"87a6e7ac-eb2f-4c87-9af3-b2d14c030606","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"15b22a94-9604-4054-869e-a78662b8ec58","path":"sprites/spr_mk6_mouth_variants/spr_mk6_mouth_variants.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"af62b5cb-8786-452d-b03b-ed40c3dc6b0b","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"e0baf035-398a-47b0-91c9-fd825a890c94","path":"sprites/spr_mk6_mouth_variants/spr_mk6_mouth_variants.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"93544ea3-4ac1-4ea3-90a7-1c5f1f9626b4","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_mk6_right_arm/spr_mk6_right_arm.yy b/sprites/spr_mk6_right_arm/spr_mk6_right_arm.yy index b3a8788f58..cc446affb7 100644 --- a/sprites/spr_mk6_right_arm/spr_mk6_right_arm.yy +++ b/sprites/spr_mk6_right_arm/spr_mk6_right_arm.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_mk6_right_arm", "bboxMode":0, "bbox_bottom":125, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"e575792d-42ea-419f-9fac-43c0dbc4a85c","name":"e575792d-42ea-419f-9fac-43c0dbc4a85c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"e575792d-42ea-419f-9fac-43c0dbc4a85c","name":"e575792d-42ea-419f-9fac-43c0dbc4a85c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"e575792d-42ea-419f-9fac-43c0dbc4a85c","path":"sprites/spr_mk6_right_arm/spr_mk6_right_arm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"8fea9cd1-fb34-40d9-a036-61a42fecb51b","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"e575792d-42ea-419f-9fac-43c0dbc4a85c","path":"sprites/spr_mk6_right_arm/spr_mk6_right_arm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"8fea9cd1-fb34-40d9-a036-61a42fecb51b","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_chest_ultra/spr_mk7_chest_ultra.yy b/sprites/spr_mk7_chest_ultra/spr_mk7_chest_ultra.yy index a8c9b88ae6..dbf734430f 100644 --- a/sprites/spr_mk7_chest_ultra/spr_mk7_chest_ultra.yy +++ b/sprites/spr_mk7_chest_ultra/spr_mk7_chest_ultra.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_mk7_chest_ultra", "bboxMode":0, "bbox_bottom":75, @@ -12,9 +12,9 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"7ac3b10a-c20f-4eae-a29d-0a446ea8e1e4","name":"7ac3b10a-c20f-4eae-a29d-0a446ea8e1e4","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"2a366fd3-4565-4f7a-9f00-8dccbe3b8a08","name":"2a366fd3-4565-4f7a-9f00-8dccbe3b8a08","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"4cf35299-781f-4c3c-94e2-4aa3eded03aa","name":"4cf35299-781f-4c3c-94e2-4aa3eded03aa","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"7ac3b10a-c20f-4eae-a29d-0a446ea8e1e4","name":"7ac3b10a-c20f-4eae-a29d-0a446ea8e1e4","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"2a366fd3-4565-4f7a-9f00-8dccbe3b8a08","name":"2a366fd3-4565-4f7a-9f00-8dccbe3b8a08","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"4cf35299-781f-4c3c-94e2-4aa3eded03aa","name":"4cf35299-781f-4c3c-94e2-4aa3eded03aa","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -70,15 +70,9 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"7ac3b10a-c20f-4eae-a29d-0a446ea8e1e4","path":"sprites/spr_mk7_chest_ultra/spr_mk7_chest_ultra.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"41ee0869-22a0-48b8-a427-0b83c48f44e0","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"2a366fd3-4565-4f7a-9f00-8dccbe3b8a08","path":"sprites/spr_mk7_chest_ultra/spr_mk7_chest_ultra.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"7fe645e7-d233-453e-94b8-ad1e403f67f3","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"4cf35299-781f-4c3c-94e2-4aa3eded03aa","path":"sprites/spr_mk7_chest_ultra/spr_mk7_chest_ultra.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"4e528881-8989-4611-9af3-d1fbfb6e801f","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"7ac3b10a-c20f-4eae-a29d-0a446ea8e1e4","path":"sprites/spr_mk7_chest_ultra/spr_mk7_chest_ultra.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"41ee0869-22a0-48b8-a427-0b83c48f44e0","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"2a366fd3-4565-4f7a-9f00-8dccbe3b8a08","path":"sprites/spr_mk7_chest_ultra/spr_mk7_chest_ultra.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"7fe645e7-d233-453e-94b8-ad1e403f67f3","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"4cf35299-781f-4c3c-94e2-4aa3eded03aa","path":"sprites/spr_mk7_chest_ultra/spr_mk7_chest_ultra.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"4e528881-8989-4611-9af3-d1fbfb6e801f","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_chest_variants/spr_mk7_chest_variants.yy b/sprites/spr_mk7_chest_variants/spr_mk7_chest_variants.yy index 3894b2ac0e..3ec8102d72 100644 --- a/sprites/spr_mk7_chest_variants/spr_mk7_chest_variants.yy +++ b/sprites/spr_mk7_chest_variants/spr_mk7_chest_variants.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_mk7_chest_variants", "bboxMode":0, "bbox_bottom":73, @@ -12,11 +12,11 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"d359bd56-6962-4c59-a10d-f16ae433baa8","name":"d359bd56-6962-4c59-a10d-f16ae433baa8","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"bc5e2753-207d-403d-81c5-a4e7066de053","name":"bc5e2753-207d-403d-81c5-a4e7066de053","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"ca44f968-4109-4468-901b-d07add46e880","name":"ca44f968-4109-4468-901b-d07add46e880","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"af74c721-e4c2-4842-b738-a2c688adc317","name":"af74c721-e4c2-4842-b738-a2c688adc317","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"5769f893-c909-4b88-9856-62d72a0b6130","name":"5769f893-c909-4b88-9856-62d72a0b6130","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"d359bd56-6962-4c59-a10d-f16ae433baa8","name":"d359bd56-6962-4c59-a10d-f16ae433baa8","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"bc5e2753-207d-403d-81c5-a4e7066de053","name":"bc5e2753-207d-403d-81c5-a4e7066de053","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"ca44f968-4109-4468-901b-d07add46e880","name":"ca44f968-4109-4468-901b-d07add46e880","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"af74c721-e4c2-4842-b738-a2c688adc317","name":"af74c721-e4c2-4842-b738-a2c688adc317","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"5769f893-c909-4b88-9856-62d72a0b6130","name":"5769f893-c909-4b88-9856-62d72a0b6130","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -72,21 +72,11 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"d359bd56-6962-4c59-a10d-f16ae433baa8","path":"sprites/spr_mk7_chest_variants/spr_mk7_chest_variants.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"8a5283cf-1b94-4acb-8e35-054b1b7e9647","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"bc5e2753-207d-403d-81c5-a4e7066de053","path":"sprites/spr_mk7_chest_variants/spr_mk7_chest_variants.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"3565a559-326d-41c5-a322-0539e7fd4db8","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"ca44f968-4109-4468-901b-d07add46e880","path":"sprites/spr_mk7_chest_variants/spr_mk7_chest_variants.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"dff23688-54a3-4f58-9748-753ea26db022","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"af74c721-e4c2-4842-b738-a2c688adc317","path":"sprites/spr_mk7_chest_variants/spr_mk7_chest_variants.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"515d67b4-d543-46e6-8846-2c782789fdc0","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"5769f893-c909-4b88-9856-62d72a0b6130","path":"sprites/spr_mk7_chest_variants/spr_mk7_chest_variants.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"efe29eea-b902-49f6-84aa-a2ed325b6df6","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"d359bd56-6962-4c59-a10d-f16ae433baa8","path":"sprites/spr_mk7_chest_variants/spr_mk7_chest_variants.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"8a5283cf-1b94-4acb-8e35-054b1b7e9647","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"bc5e2753-207d-403d-81c5-a4e7066de053","path":"sprites/spr_mk7_chest_variants/spr_mk7_chest_variants.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"3565a559-326d-41c5-a322-0539e7fd4db8","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"ca44f968-4109-4468-901b-d07add46e880","path":"sprites/spr_mk7_chest_variants/spr_mk7_chest_variants.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"dff23688-54a3-4f58-9748-753ea26db022","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"af74c721-e4c2-4842-b738-a2c688adc317","path":"sprites/spr_mk7_chest_variants/spr_mk7_chest_variants.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"515d67b4-d543-46e6-8846-2c782789fdc0","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"5769f893-c909-4b88-9856-62d72a0b6130","path":"sprites/spr_mk7_chest_variants/spr_mk7_chest_variants.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"efe29eea-b902-49f6-84aa-a2ed325b6df6","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_mk7_colors/spr_mk7_colors.yy b/sprites/spr_mk7_colors/spr_mk7_colors.yy index 4d85774d70..d1cfc8c5da 100644 --- a/sprites/spr_mk7_colors/spr_mk7_colors.yy +++ b/sprites/spr_mk7_colors/spr_mk7_colors.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_mk7_colors", "bboxMode":0, "bbox_bottom":281, @@ -12,20 +12,20 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"9e672385-98c8-4ea0-ae1e-13d49a097f5d","name":"9e672385-98c8-4ea0-ae1e-13d49a097f5d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"193aff66-5833-47c7-9ed8-759d3357f47e","name":"193aff66-5833-47c7-9ed8-759d3357f47e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"ea8ace5c-65c3-4db2-bf11-a0e546441d29","name":"ea8ace5c-65c3-4db2-bf11-a0e546441d29","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"8f979f47-d969-40e4-b2c1-9c520c3d2ba6","name":"8f979f47-d969-40e4-b2c1-9c520c3d2ba6","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"93ff5df5-2919-46d2-b6c6-7b48d36a04da","name":"93ff5df5-2919-46d2-b6c6-7b48d36a04da","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"537f38be-267b-411a-b3f5-955b65e5b516","name":"537f38be-267b-411a-b3f5-955b65e5b516","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"7770c842-4a7e-4b96-b19b-171c0fcfb3fb","name":"7770c842-4a7e-4b96-b19b-171c0fcfb3fb","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"87a7c1a3-99aa-48d9-82ee-dcc6ed2c5dd0","name":"87a7c1a3-99aa-48d9-82ee-dcc6ed2c5dd0","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"3f0324cb-c5d0-4df7-b607-449f0c42ea0f","name":"3f0324cb-c5d0-4df7-b607-449f0c42ea0f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"3519d9b7-e3c7-49ac-b339-0c76d75632e5","name":"3519d9b7-e3c7-49ac-b339-0c76d75632e5","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"d4e1caf7-804f-4a73-8115-ea6377691b4e","name":"d4e1caf7-804f-4a73-8115-ea6377691b4e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"7965302a-4558-4997-bb0a-53070501b346","name":"7965302a-4558-4997-bb0a-53070501b346","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"ee53da7c-72ca-4782-bea9-d9be0c9ee441","name":"ee53da7c-72ca-4782-bea9-d9be0c9ee441","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"d559b6fc-9f43-450c-b72d-178ab6f49a7c","name":"d559b6fc-9f43-450c-b72d-178ab6f49a7c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"9e672385-98c8-4ea0-ae1e-13d49a097f5d","name":"9e672385-98c8-4ea0-ae1e-13d49a097f5d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"193aff66-5833-47c7-9ed8-759d3357f47e","name":"193aff66-5833-47c7-9ed8-759d3357f47e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"ea8ace5c-65c3-4db2-bf11-a0e546441d29","name":"ea8ace5c-65c3-4db2-bf11-a0e546441d29","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"8f979f47-d969-40e4-b2c1-9c520c3d2ba6","name":"8f979f47-d969-40e4-b2c1-9c520c3d2ba6","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"93ff5df5-2919-46d2-b6c6-7b48d36a04da","name":"93ff5df5-2919-46d2-b6c6-7b48d36a04da","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"537f38be-267b-411a-b3f5-955b65e5b516","name":"537f38be-267b-411a-b3f5-955b65e5b516","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"7770c842-4a7e-4b96-b19b-171c0fcfb3fb","name":"7770c842-4a7e-4b96-b19b-171c0fcfb3fb","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"87a7c1a3-99aa-48d9-82ee-dcc6ed2c5dd0","name":"87a7c1a3-99aa-48d9-82ee-dcc6ed2c5dd0","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"3f0324cb-c5d0-4df7-b607-449f0c42ea0f","name":"3f0324cb-c5d0-4df7-b607-449f0c42ea0f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"3519d9b7-e3c7-49ac-b339-0c76d75632e5","name":"3519d9b7-e3c7-49ac-b339-0c76d75632e5","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"d4e1caf7-804f-4a73-8115-ea6377691b4e","name":"d4e1caf7-804f-4a73-8115-ea6377691b4e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"7965302a-4558-4997-bb0a-53070501b346","name":"7965302a-4558-4997-bb0a-53070501b346","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"ee53da7c-72ca-4782-bea9-d9be0c9ee441","name":"ee53da7c-72ca-4782-bea9-d9be0c9ee441","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"d559b6fc-9f43-450c-b72d-178ab6f49a7c","name":"d559b6fc-9f43-450c-b72d-178ab6f49a7c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -83,48 +83,20 @@ "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_mk7_colors/spr_mk7_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"2aa55f99-dcd4-44ed-8f22-89b7e6954826","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"193aff66-5833-47c7-9ed8-759d3357f47e","path":"sprites/spr_mk7_colors/spr_mk7_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"222812b7-2032-4667-9138-22e4e5ba61e6","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"ea8ace5c-65c3-4db2-bf11-a0e546441d29","path":"sprites/spr_mk7_colors/spr_mk7_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"09beb9c6-b978-4ca7-b22e-a4d4a871745b","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"8f979f47-d969-40e4-b2c1-9c520c3d2ba6","path":"sprites/spr_mk7_colors/spr_mk7_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"37f99b97-a065-4cdc-bd92-2831a8e44efd","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"93ff5df5-2919-46d2-b6c6-7b48d36a04da","path":"sprites/spr_mk7_colors/spr_mk7_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"ba68f83a-7007-4c08-a09e-685074b73eb9","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"537f38be-267b-411a-b3f5-955b65e5b516","path":"sprites/spr_mk7_colors/spr_mk7_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"fd0c33be-fe95-4d4e-896b-f695b1cad650","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"7770c842-4a7e-4b96-b19b-171c0fcfb3fb","path":"sprites/spr_mk7_colors/spr_mk7_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"53e5f5b2-541f-4b32-bf2c-d77a0ed44abb","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"87a7c1a3-99aa-48d9-82ee-dcc6ed2c5dd0","path":"sprites/spr_mk7_colors/spr_mk7_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"efd1188b-0578-4324-9a32-b99c428534b7","IsCreationKey":false,"Key":7.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"3f0324cb-c5d0-4df7-b607-449f0c42ea0f","path":"sprites/spr_mk7_colors/spr_mk7_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"4c8c2d1a-62ed-4576-9385-317f739f82ab","IsCreationKey":false,"Key":8.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"3519d9b7-e3c7-49ac-b339-0c76d75632e5","path":"sprites/spr_mk7_colors/spr_mk7_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"8c601ed8-4532-44a6-8fba-e1d41872c695","IsCreationKey":false,"Key":9.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"d4e1caf7-804f-4a73-8115-ea6377691b4e","path":"sprites/spr_mk7_colors/spr_mk7_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"64231b23-101c-4d8d-8043-efa06138ea9f","IsCreationKey":false,"Key":10.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"7965302a-4558-4997-bb0a-53070501b346","path":"sprites/spr_mk7_colors/spr_mk7_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"ae643bac-6a55-4baf-9b4f-430da92b70af","IsCreationKey":false,"Key":11.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"ee53da7c-72ca-4782-bea9-d9be0c9ee441","path":"sprites/spr_mk7_colors/spr_mk7_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"996fc6d5-2bd6-480b-b65c-77c4af03b378","IsCreationKey":false,"Key":12.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"d559b6fc-9f43-450c-b72d-178ab6f49a7c","path":"sprites/spr_mk7_colors/spr_mk7_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"6f995272-2abe-4060-a7df-e5bc4924ca70","IsCreationKey":false,"Key":13.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_mk7_colors/spr_mk7_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"2aa55f99-dcd4-44ed-8f22-89b7e6954826","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"193aff66-5833-47c7-9ed8-759d3357f47e","path":"sprites/spr_mk7_colors/spr_mk7_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"222812b7-2032-4667-9138-22e4e5ba61e6","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"ea8ace5c-65c3-4db2-bf11-a0e546441d29","path":"sprites/spr_mk7_colors/spr_mk7_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"09beb9c6-b978-4ca7-b22e-a4d4a871745b","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"8f979f47-d969-40e4-b2c1-9c520c3d2ba6","path":"sprites/spr_mk7_colors/spr_mk7_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"37f99b97-a065-4cdc-bd92-2831a8e44efd","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"93ff5df5-2919-46d2-b6c6-7b48d36a04da","path":"sprites/spr_mk7_colors/spr_mk7_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"ba68f83a-7007-4c08-a09e-685074b73eb9","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"537f38be-267b-411a-b3f5-955b65e5b516","path":"sprites/spr_mk7_colors/spr_mk7_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"fd0c33be-fe95-4d4e-896b-f695b1cad650","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"7770c842-4a7e-4b96-b19b-171c0fcfb3fb","path":"sprites/spr_mk7_colors/spr_mk7_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"53e5f5b2-541f-4b32-bf2c-d77a0ed44abb","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"87a7c1a3-99aa-48d9-82ee-dcc6ed2c5dd0","path":"sprites/spr_mk7_colors/spr_mk7_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"efd1188b-0578-4324-9a32-b99c428534b7","IsCreationKey":false,"Key":7.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"3f0324cb-c5d0-4df7-b607-449f0c42ea0f","path":"sprites/spr_mk7_colors/spr_mk7_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"4c8c2d1a-62ed-4576-9385-317f739f82ab","IsCreationKey":false,"Key":8.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"3519d9b7-e3c7-49ac-b339-0c76d75632e5","path":"sprites/spr_mk7_colors/spr_mk7_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"8c601ed8-4532-44a6-8fba-e1d41872c695","IsCreationKey":false,"Key":9.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"d4e1caf7-804f-4a73-8115-ea6377691b4e","path":"sprites/spr_mk7_colors/spr_mk7_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"64231b23-101c-4d8d-8043-efa06138ea9f","IsCreationKey":false,"Key":10.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"7965302a-4558-4997-bb0a-53070501b346","path":"sprites/spr_mk7_colors/spr_mk7_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"ae643bac-6a55-4baf-9b4f-430da92b70af","IsCreationKey":false,"Key":11.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"ee53da7c-72ca-4782-bea9-d9be0c9ee441","path":"sprites/spr_mk7_colors/spr_mk7_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"996fc6d5-2bd6-480b-b65c-77c4af03b378","IsCreationKey":false,"Key":12.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"d559b6fc-9f43-450c-b72d-178ab6f49a7c","path":"sprites/spr_mk7_colors/spr_mk7_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"6f995272-2abe-4060-a7df-e5bc4924ca70","IsCreationKey":false,"Key":13.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/spr_mk7_complex.yy b/sprites/spr_mk7_complex/spr_mk7_complex.yy index 246cccae3e..7e3c6b6b4a 100644 --- a/sprites/spr_mk7_complex/spr_mk7_complex.yy +++ b/sprites/spr_mk7_complex/spr_mk7_complex.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_mk7_complex", "bboxMode":0, "bbox_bottom":220, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"b6ba8600-fb6b-4fa9-abc7-bdc2311eb79e","name":"b6ba8600-fb6b-4fa9-abc7-bdc2311eb79e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"b6ba8600-fb6b-4fa9-abc7-bdc2311eb79e","name":"b6ba8600-fb6b-4fa9-abc7-bdc2311eb79e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -33,13 +33,7 @@ "resourceType":"GMNineSliceData", "resourceVersion":"2.0", "right":0, - "tileMode":[ - 0, - 0, - 0, - 0, - 0, - ], + "tileMode":[0,0,0,0,0,], "top":0, }, "origin":9, @@ -89,9 +83,7 @@ "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/spr_mk7_complex.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"0920e5f3-c5b3-46e7-9eb6-c9832e0b26b8","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/spr_mk7_complex.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"0920e5f3-c5b3-46e7-9eb6-c9832e0b26b8","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_backpack/spr_mk7_complex_backpack.yy b/sprites/spr_mk7_complex_backpack/spr_mk7_complex_backpack.yy index 30308453ad..8b13f59d81 100644 --- a/sprites/spr_mk7_complex_backpack/spr_mk7_complex_backpack.yy +++ b/sprites/spr_mk7_complex_backpack/spr_mk7_complex_backpack.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_mk7_complex_backpack", "bboxMode":0, "bbox_bottom":38, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"d759779c-a75b-4d79-b22b-410d27d6c6de","name":"d759779c-a75b-4d79-b22b-410d27d6c6de","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"d759779c-a75b-4d79-b22b-410d27d6c6de","name":"d759779c-a75b-4d79-b22b-410d27d6c6de","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"d759779c-a75b-4d79-b22b-410d27d6c6de","path":"sprites/spr_mk7_complex_backpack/spr_mk7_complex_backpack.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"dfcc2188-1c25-4b83-b365-64f54b46e5f6","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"d759779c-a75b-4d79-b22b-410d27d6c6de","path":"sprites/spr_mk7_complex_backpack/spr_mk7_complex_backpack.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"dfcc2188-1c25-4b83-b365-64f54b46e5f6","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 bfb4971270..f7e43de452 100644 --- a/sprites/spr_mk7_complex_belt/spr_mk7_complex_belt.yy +++ b/sprites/spr_mk7_complex_belt/spr_mk7_complex_belt.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_mk7_complex_belt", "bboxMode":0, "bbox_bottom":104, @@ -12,9 +12,9 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"b6ba8600-fb6b-4fa9-abc7-bdc2311eb79e","name":"b6ba8600-fb6b-4fa9-abc7-bdc2311eb79e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"c5eacaf3-6c5a-4af4-ac56-fd957c8f9f0b","name":"c5eacaf3-6c5a-4af4-ac56-fd957c8f9f0b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"163be470-f687-42e2-b07c-ad2291c828fa","name":"163be470-f687-42e2-b07c-ad2291c828fa","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"b6ba8600-fb6b-4fa9-abc7-bdc2311eb79e","name":"b6ba8600-fb6b-4fa9-abc7-bdc2311eb79e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"c5eacaf3-6c5a-4af4-ac56-fd957c8f9f0b","name":"c5eacaf3-6c5a-4af4-ac56-fd957c8f9f0b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"163be470-f687-42e2-b07c-ad2291c828fa","name":"163be470-f687-42e2-b07c-ad2291c828fa","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -70,15 +70,9 @@ "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 44a0e66bdd..58d29a6ecb 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 @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_mk7_complex_crux_belt", "bboxMode":0, "bbox_bottom":107, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"b6ba8600-fb6b-4fa9-abc7-bdc2311eb79e","name":"b6ba8600-fb6b-4fa9-abc7-bdc2311eb79e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"b6ba8600-fb6b-4fa9-abc7-bdc2311eb79e","name":"b6ba8600-fb6b-4fa9-abc7-bdc2311eb79e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "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_complex_knees/spr_mk7_complex_knees.yy b/sprites/spr_mk7_complex_knees/spr_mk7_complex_knees.yy index a68028e381..faa14d664a 100644 --- a/sprites/spr_mk7_complex_knees/spr_mk7_complex_knees.yy +++ b/sprites/spr_mk7_complex_knees/spr_mk7_complex_knees.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_mk7_complex_knees", "bboxMode":0, "bbox_bottom":164, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"b6ba8600-fb6b-4fa9-abc7-bdc2311eb79e","name":"b6ba8600-fb6b-4fa9-abc7-bdc2311eb79e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"b6ba8600-fb6b-4fa9-abc7-bdc2311eb79e","name":"b6ba8600-fb6b-4fa9-abc7-bdc2311eb79e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -34,13 +34,7 @@ "resourceType":"GMNineSliceData", "resourceVersion":"2.0", "right":0, - "tileMode":[ - 0, - 0, - 0, - 0, - 0, - ], + "tileMode":[0,0,0,0,0,], "top":0, }, "origin":9, @@ -88,9 +82,7 @@ "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_knees/spr_mk7_complex_knees.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"7ea69ecd-f81f-42b8-ac71-b6987343efcb","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_knees/spr_mk7_complex_knees.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"7ea69ecd-f81f-42b8-ac71-b6987343efcb","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_left_pauldron/spr_mk7_complex_left_pauldron.yy b/sprites/spr_mk7_complex_left_pauldron/spr_mk7_complex_left_pauldron.yy index 665accc9b4..9ec0e5fa74 100644 --- a/sprites/spr_mk7_complex_left_pauldron/spr_mk7_complex_left_pauldron.yy +++ b/sprites/spr_mk7_complex_left_pauldron/spr_mk7_complex_left_pauldron.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_mk7_complex_left_pauldron", "bboxMode":0, "bbox_bottom":81, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"b6ba8600-fb6b-4fa9-abc7-bdc2311eb79e","name":"b6ba8600-fb6b-4fa9-abc7-bdc2311eb79e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"b6ba8600-fb6b-4fa9-abc7-bdc2311eb79e","name":"b6ba8600-fb6b-4fa9-abc7-bdc2311eb79e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -33,13 +33,7 @@ "resourceType":"GMNineSliceData", "resourceVersion":"2.0", "right":0, - "tileMode":[ - 0, - 0, - 0, - 0, - 0, - ], + "tileMode":[0,0,0,0,0,], "top":0, }, "origin":9, @@ -87,9 +81,7 @@ "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_left_pauldron/spr_mk7_complex_left_pauldron.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"7ffd25d2-f283-4823-9926-1576535448ca","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_left_pauldron/spr_mk7_complex_left_pauldron.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"7ffd25d2-f283-4823-9926-1576535448ca","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_right_pauldron/spr_mk7_complex_right_pauldron.yy b/sprites/spr_mk7_complex_right_pauldron/spr_mk7_complex_right_pauldron.yy index b98693c9db..8cb0900ba9 100644 --- a/sprites/spr_mk7_complex_right_pauldron/spr_mk7_complex_right_pauldron.yy +++ b/sprites/spr_mk7_complex_right_pauldron/spr_mk7_complex_right_pauldron.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_mk7_complex_right_pauldron", "bboxMode":0, "bbox_bottom":81, @@ -12,8 +12,8 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"b6ba8600-fb6b-4fa9-abc7-bdc2311eb79e","name":"b6ba8600-fb6b-4fa9-abc7-bdc2311eb79e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"fec73702-4742-44a4-a0aa-eb3645361703","name":"fec73702-4742-44a4-a0aa-eb3645361703","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"b6ba8600-fb6b-4fa9-abc7-bdc2311eb79e","name":"b6ba8600-fb6b-4fa9-abc7-bdc2311eb79e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"fec73702-4742-44a4-a0aa-eb3645361703","name":"fec73702-4742-44a4-a0aa-eb3645361703","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -34,13 +34,7 @@ "resourceType":"GMNineSliceData", "resourceVersion":"2.0", "right":0, - "tileMode":[ - 0, - 0, - 0, - 0, - 0, - ], + "tileMode":[0,0,0,0,0,], "top":0, }, "origin":9, @@ -90,12 +84,8 @@ "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_right_pauldron/spr_mk7_complex_right_pauldron.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"476ba96b-7680-45aa-b001-fa8c00b30b9b","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"fec73702-4742-44a4-a0aa-eb3645361703","path":"sprites/spr_mk7_complex_right_pauldron/spr_mk7_complex_right_pauldron.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"5741aa36-ecdb-43df-978f-2fd7d30dd093","IsCreationKey":false,"Key":1.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_right_pauldron/spr_mk7_complex_right_pauldron.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"476ba96b-7680-45aa-b001-fa8c00b30b9b","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"fec73702-4742-44a4-a0aa-eb3645361703","path":"sprites/spr_mk7_complex_right_pauldron/spr_mk7_complex_right_pauldron.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"5741aa36-ecdb-43df-978f-2fd7d30dd093","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_mk7_full_colour/spr_mk7_full_colour.yy b/sprites/spr_mk7_full_colour/spr_mk7_full_colour.yy index 992b76a445..53eff73a9c 100644 --- a/sprites/spr_mk7_full_colour/spr_mk7_full_colour.yy +++ b/sprites/spr_mk7_full_colour/spr_mk7_full_colour.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_mk7_full_colour", "bboxMode":0, "bbox_bottom":220, @@ -12,10 +12,10 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"60c38400-c4aa-4c69-ba2a-e8945e9335cf","name":"60c38400-c4aa-4c69-ba2a-e8945e9335cf","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"1511823a-2bc1-4cd3-8b23-b93d0470c00d","name":"1511823a-2bc1-4cd3-8b23-b93d0470c00d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"274a8c7b-ca8c-4721-8340-7a38238347c7","name":"274a8c7b-ca8c-4721-8340-7a38238347c7","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"26ca7d83-cd69-43c3-b87e-c17db7491c50","name":"26ca7d83-cd69-43c3-b87e-c17db7491c50","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"60c38400-c4aa-4c69-ba2a-e8945e9335cf","name":"60c38400-c4aa-4c69-ba2a-e8945e9335cf","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"1511823a-2bc1-4cd3-8b23-b93d0470c00d","name":"1511823a-2bc1-4cd3-8b23-b93d0470c00d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"274a8c7b-ca8c-4721-8340-7a38238347c7","name":"274a8c7b-ca8c-4721-8340-7a38238347c7","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"26ca7d83-cd69-43c3-b87e-c17db7491c50","name":"26ca7d83-cd69-43c3-b87e-c17db7491c50","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -73,18 +73,10 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"60c38400-c4aa-4c69-ba2a-e8945e9335cf","path":"sprites/spr_mk7_full_colour/spr_mk7_full_colour.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"bc1fc3c0-fa0f-45d3-8a1a-2ffa8d073dec","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"1511823a-2bc1-4cd3-8b23-b93d0470c00d","path":"sprites/spr_mk7_full_colour/spr_mk7_full_colour.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"d6e067f3-ad2b-4116-9e07-c3b86d62143c","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"274a8c7b-ca8c-4721-8340-7a38238347c7","path":"sprites/spr_mk7_full_colour/spr_mk7_full_colour.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"1530679f-5fa0-4e40-a97f-16971a179bd4","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"26ca7d83-cd69-43c3-b87e-c17db7491c50","path":"sprites/spr_mk7_full_colour/spr_mk7_full_colour.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"8e2b4d81-03fe-4fb8-b4ec-dab2348651b5","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"60c38400-c4aa-4c69-ba2a-e8945e9335cf","path":"sprites/spr_mk7_full_colour/spr_mk7_full_colour.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"bc1fc3c0-fa0f-45d3-8a1a-2ffa8d073dec","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"1511823a-2bc1-4cd3-8b23-b93d0470c00d","path":"sprites/spr_mk7_full_colour/spr_mk7_full_colour.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"d6e067f3-ad2b-4116-9e07-c3b86d62143c","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"274a8c7b-ca8c-4721-8340-7a38238347c7","path":"sprites/spr_mk7_full_colour/spr_mk7_full_colour.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"1530679f-5fa0-4e40-a97f-16971a179bd4","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"26ca7d83-cd69-43c3-b87e-c17db7491c50","path":"sprites/spr_mk7_full_colour/spr_mk7_full_colour.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"8e2b4d81-03fe-4fb8-b4ec-dab2348651b5","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_mk7_gladiator_chest/spr_mk7_gladiator_chest.yy b/sprites/spr_mk7_gladiator_chest/spr_mk7_gladiator_chest.yy index a95b2f8f92..77e7c3fad3 100644 --- a/sprites/spr_mk7_gladiator_chest/spr_mk7_gladiator_chest.yy +++ b/sprites/spr_mk7_gladiator_chest/spr_mk7_gladiator_chest.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_mk7_gladiator_chest", "bboxMode":0, "bbox_bottom":88, @@ -12,9 +12,9 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"b6ba8600-fb6b-4fa9-abc7-bdc2311eb79e","name":"b6ba8600-fb6b-4fa9-abc7-bdc2311eb79e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"1cdabc8e-5838-4520-bb52-b164914135dd","name":"1cdabc8e-5838-4520-bb52-b164914135dd","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"058bac9e-56f9-4a9e-8b2e-4ae998099703","name":"058bac9e-56f9-4a9e-8b2e-4ae998099703","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"b6ba8600-fb6b-4fa9-abc7-bdc2311eb79e","name":"b6ba8600-fb6b-4fa9-abc7-bdc2311eb79e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"1cdabc8e-5838-4520-bb52-b164914135dd","name":"1cdabc8e-5838-4520-bb52-b164914135dd","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"058bac9e-56f9-4a9e-8b2e-4ae998099703","name":"058bac9e-56f9-4a9e-8b2e-4ae998099703","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -72,15 +72,9 @@ "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_gladiator_chest/spr_mk7_gladiator_chest.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"7154fd28-b589-4124-982c-0c705bca0e90","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"1cdabc8e-5838-4520-bb52-b164914135dd","path":"sprites/spr_mk7_gladiator_chest/spr_mk7_gladiator_chest.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"2b623e4d-4d87-4cc2-9ef5-9416c7741aea","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"058bac9e-56f9-4a9e-8b2e-4ae998099703","path":"sprites/spr_mk7_gladiator_chest/spr_mk7_gladiator_chest.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"dd2746b7-cdab-4df5-a8c4-ab06ddd6fbef","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_gladiator_chest/spr_mk7_gladiator_chest.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"7154fd28-b589-4124-982c-0c705bca0e90","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"1cdabc8e-5838-4520-bb52-b164914135dd","path":"sprites/spr_mk7_gladiator_chest/spr_mk7_gladiator_chest.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"2b623e4d-4d87-4cc2-9ef5-9416c7741aea","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"058bac9e-56f9-4a9e-8b2e-4ae998099703","path":"sprites/spr_mk7_gladiator_chest/spr_mk7_gladiator_chest.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"dd2746b7-cdab-4df5-a8c4-ab06ddd6fbef","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_head_variants/spr_mk7_head_variants.yy b/sprites/spr_mk7_head_variants/spr_mk7_head_variants.yy index 525fe935cf..4b392198ce 100644 --- a/sprites/spr_mk7_head_variants/spr_mk7_head_variants.yy +++ b/sprites/spr_mk7_head_variants/spr_mk7_head_variants.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_mk7_head_variants", "bboxMode":0, "bbox_bottom":44, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"b6ba8600-fb6b-4fa9-abc7-bdc2311eb79e","name":"b6ba8600-fb6b-4fa9-abc7-bdc2311eb79e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"b6ba8600-fb6b-4fa9-abc7-bdc2311eb79e","name":"b6ba8600-fb6b-4fa9-abc7-bdc2311eb79e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "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_head_variants/spr_mk7_head_variants.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"baf9a104-7ab3-42e8-bc99-ab91707455a7","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_head_variants/spr_mk7_head_variants.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"baf9a104-7ab3-42e8-bc99-ab91707455a7","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_knightly_chest/spr_mk7_knightly_chest.yy b/sprites/spr_mk7_knightly_chest/spr_mk7_knightly_chest.yy index bdaed8ab22..259c530676 100644 --- a/sprites/spr_mk7_knightly_chest/spr_mk7_knightly_chest.yy +++ b/sprites/spr_mk7_knightly_chest/spr_mk7_knightly_chest.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_mk7_knightly_chest", "bboxMode":0, "bbox_bottom":73, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"af4b0687-a18b-4d72-85f6-2dc19b2e74c3","name":"af4b0687-a18b-4d72-85f6-2dc19b2e74c3","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"af4b0687-a18b-4d72-85f6-2dc19b2e74c3","name":"af4b0687-a18b-4d72-85f6-2dc19b2e74c3","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"af4b0687-a18b-4d72-85f6-2dc19b2e74c3","path":"sprites/spr_mk7_knightly_chest/spr_mk7_knightly_chest.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"01437ca1-e985-4229-a447-001c9264a235","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"af4b0687-a18b-4d72-85f6-2dc19b2e74c3","path":"sprites/spr_mk7_knightly_chest/spr_mk7_knightly_chest.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"01437ca1-e985-4229-a447-001c9264a235","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_left_arm/spr_mk7_left_arm.yy b/sprites/spr_mk7_left_arm/spr_mk7_left_arm.yy index 1850d33f78..cbbdf3e612 100644 --- a/sprites/spr_mk7_left_arm/spr_mk7_left_arm.yy +++ b/sprites/spr_mk7_left_arm/spr_mk7_left_arm.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_mk7_left_arm", "bboxMode":0, "bbox_bottom":125, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"5d794479-23e8-47a4-925d-8b51fe539cad","name":"5d794479-23e8-47a4-925d-8b51fe539cad","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"5d794479-23e8-47a4-925d-8b51fe539cad","name":"5d794479-23e8-47a4-925d-8b51fe539cad","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"5d794479-23e8-47a4-925d-8b51fe539cad","path":"sprites/spr_mk7_left_arm/spr_mk7_left_arm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"0924d635-008c-493a-8c4b-3d347b7d6043","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"5d794479-23e8-47a4-925d-8b51fe539cad","path":"sprites/spr_mk7_left_arm/spr_mk7_left_arm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"0924d635-008c-493a-8c4b-3d347b7d6043","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_left_trim/spr_mk7_left_trim.yy b/sprites/spr_mk7_left_trim/spr_mk7_left_trim.yy index 38bc699b60..ba21c41b38 100644 --- a/sprites/spr_mk7_left_trim/spr_mk7_left_trim.yy +++ b/sprites/spr_mk7_left_trim/spr_mk7_left_trim.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_mk7_left_trim", "bboxMode":0, "bbox_bottom":81, @@ -12,10 +12,10 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"a9ab7201-7070-45ca-8574-83152cfd6f3c","name":"a9ab7201-7070-45ca-8574-83152cfd6f3c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"c59f380a-e222-4020-bf08-125985f587ac","name":"c59f380a-e222-4020-bf08-125985f587ac","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"dc4d4861-9b2d-464f-9682-578770b6ac9a","name":"dc4d4861-9b2d-464f-9682-578770b6ac9a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"09035cbe-5b3d-4474-a920-751ccede1b22","name":"09035cbe-5b3d-4474-a920-751ccede1b22","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"a9ab7201-7070-45ca-8574-83152cfd6f3c","name":"a9ab7201-7070-45ca-8574-83152cfd6f3c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"c59f380a-e222-4020-bf08-125985f587ac","name":"c59f380a-e222-4020-bf08-125985f587ac","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"dc4d4861-9b2d-464f-9682-578770b6ac9a","name":"dc4d4861-9b2d-464f-9682-578770b6ac9a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"09035cbe-5b3d-4474-a920-751ccede1b22","name":"09035cbe-5b3d-4474-a920-751ccede1b22","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -71,18 +71,10 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"a9ab7201-7070-45ca-8574-83152cfd6f3c","path":"sprites/spr_mk7_left_trim/spr_mk7_left_trim.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"36e4efa0-90a0-493b-8711-c38b72c203e1","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"c59f380a-e222-4020-bf08-125985f587ac","path":"sprites/spr_mk7_left_trim/spr_mk7_left_trim.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"e6fc3a72-e76f-4ffa-92a9-682bda147f0f","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"dc4d4861-9b2d-464f-9682-578770b6ac9a","path":"sprites/spr_mk7_left_trim/spr_mk7_left_trim.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"363746cf-6f85-469a-b176-f73ceba6559e","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"09035cbe-5b3d-4474-a920-751ccede1b22","path":"sprites/spr_mk7_left_trim/spr_mk7_left_trim.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"3a072026-bb8f-472a-8844-5f39c475684d","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"a9ab7201-7070-45ca-8574-83152cfd6f3c","path":"sprites/spr_mk7_left_trim/spr_mk7_left_trim.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"36e4efa0-90a0-493b-8711-c38b72c203e1","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"c59f380a-e222-4020-bf08-125985f587ac","path":"sprites/spr_mk7_left_trim/spr_mk7_left_trim.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"e6fc3a72-e76f-4ffa-92a9-682bda147f0f","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"dc4d4861-9b2d-464f-9682-578770b6ac9a","path":"sprites/spr_mk7_left_trim/spr_mk7_left_trim.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"363746cf-6f85-469a-b176-f73ceba6559e","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"09035cbe-5b3d-4474-a920-751ccede1b22","path":"sprites/spr_mk7_left_trim/spr_mk7_left_trim.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"3a072026-bb8f-472a-8844-5f39c475684d","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_mk7_leg_variants/spr_mk7_leg_variants.yy b/sprites/spr_mk7_leg_variants/spr_mk7_leg_variants.yy index b3c08ea75a..8e05a1f8dd 100644 --- a/sprites/spr_mk7_leg_variants/spr_mk7_leg_variants.yy +++ b/sprites/spr_mk7_leg_variants/spr_mk7_leg_variants.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_mk7_leg_variants", "bboxMode":0, "bbox_bottom":220, @@ -12,9 +12,9 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"89a6d4dd-18ab-43ec-ad94-6adb0940fd20","name":"89a6d4dd-18ab-43ec-ad94-6adb0940fd20","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"6481474b-6526-4bec-86dd-ba8cc60fe287","name":"6481474b-6526-4bec-86dd-ba8cc60fe287","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"9dfbc583-089d-4b8c-9012-405d17389b4b","name":"9dfbc583-089d-4b8c-9012-405d17389b4b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"89a6d4dd-18ab-43ec-ad94-6adb0940fd20","name":"89a6d4dd-18ab-43ec-ad94-6adb0940fd20","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"6481474b-6526-4bec-86dd-ba8cc60fe287","name":"6481474b-6526-4bec-86dd-ba8cc60fe287","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"9dfbc583-089d-4b8c-9012-405d17389b4b","name":"9dfbc583-089d-4b8c-9012-405d17389b4b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -70,15 +70,9 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"89a6d4dd-18ab-43ec-ad94-6adb0940fd20","path":"sprites/spr_mk7_leg_variants/spr_mk7_leg_variants.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"4cca9923-5ca1-4f6c-8e91-f7ec56fa92a6","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"6481474b-6526-4bec-86dd-ba8cc60fe287","path":"sprites/spr_mk7_leg_variants/spr_mk7_leg_variants.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"989a10c5-a397-4446-9be1-267e74dc0585","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"9dfbc583-089d-4b8c-9012-405d17389b4b","path":"sprites/spr_mk7_leg_variants/spr_mk7_leg_variants.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"8c9a2904-eb56-452e-8890-9a68ec5d0217","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"89a6d4dd-18ab-43ec-ad94-6adb0940fd20","path":"sprites/spr_mk7_leg_variants/spr_mk7_leg_variants.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"4cca9923-5ca1-4f6c-8e91-f7ec56fa92a6","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"6481474b-6526-4bec-86dd-ba8cc60fe287","path":"sprites/spr_mk7_leg_variants/spr_mk7_leg_variants.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"989a10c5-a397-4446-9be1-267e74dc0585","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"9dfbc583-089d-4b8c-9012-405d17389b4b","path":"sprites/spr_mk7_leg_variants/spr_mk7_leg_variants.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"8c9a2904-eb56-452e-8890-9a68ec5d0217","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_mongol_chest_variants/spr_mk7_mongol_chest_variants.yy b/sprites/spr_mk7_mongol_chest_variants/spr_mk7_mongol_chest_variants.yy index 49c7f81a23..5ea5bb551c 100644 --- a/sprites/spr_mk7_mongol_chest_variants/spr_mk7_mongol_chest_variants.yy +++ b/sprites/spr_mk7_mongol_chest_variants/spr_mk7_mongol_chest_variants.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_mk7_mongol_chest_variants", "bboxMode":0, "bbox_bottom":73, @@ -12,8 +12,8 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"64394992-62c2-494d-9a48-1fdaec945713","name":"64394992-62c2-494d-9a48-1fdaec945713","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"b0e3fc64-2159-4eb7-a154-6acda8ba5207","name":"b0e3fc64-2159-4eb7-a154-6acda8ba5207","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"64394992-62c2-494d-9a48-1fdaec945713","name":"64394992-62c2-494d-9a48-1fdaec945713","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"b0e3fc64-2159-4eb7-a154-6acda8ba5207","name":"b0e3fc64-2159-4eb7-a154-6acda8ba5207","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -69,12 +69,8 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"64394992-62c2-494d-9a48-1fdaec945713","path":"sprites/spr_mk7_mongol_chest_variants/spr_mk7_mongol_chest_variants.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"687774f6-25e5-43b9-9644-afb140487387","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"b0e3fc64-2159-4eb7-a154-6acda8ba5207","path":"sprites/spr_mk7_mongol_chest_variants/spr_mk7_mongol_chest_variants.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"bc0888e9-91c0-494a-b193-3ac7bb3db229","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"64394992-62c2-494d-9a48-1fdaec945713","path":"sprites/spr_mk7_mongol_chest_variants/spr_mk7_mongol_chest_variants.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"687774f6-25e5-43b9-9644-afb140487387","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"b0e3fc64-2159-4eb7-a154-6acda8ba5207","path":"sprites/spr_mk7_mongol_chest_variants/spr_mk7_mongol_chest_variants.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"bc0888e9-91c0-494a-b193-3ac7bb3db229","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_mk7_mouth_prussian/spr_mk7_mouth_prussian.yy b/sprites/spr_mk7_mouth_prussian/spr_mk7_mouth_prussian.yy index f559ed92cd..b747599ace 100644 --- a/sprites/spr_mk7_mouth_prussian/spr_mk7_mouth_prussian.yy +++ b/sprites/spr_mk7_mouth_prussian/spr_mk7_mouth_prussian.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_mk7_mouth_prussian", "bboxMode":0, "bbox_bottom":48, @@ -12,9 +12,9 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"2ee8e999-4d5c-4751-a174-4d1d8fc5c3bc","name":"2ee8e999-4d5c-4751-a174-4d1d8fc5c3bc","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"67b73bd0-4dda-4f23-b077-dcc3f76cbc45","name":"67b73bd0-4dda-4f23-b077-dcc3f76cbc45","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"39559a84-9ef2-47ad-982c-840f197ffac7","name":"39559a84-9ef2-47ad-982c-840f197ffac7","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"2ee8e999-4d5c-4751-a174-4d1d8fc5c3bc","name":"2ee8e999-4d5c-4751-a174-4d1d8fc5c3bc","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"67b73bd0-4dda-4f23-b077-dcc3f76cbc45","name":"67b73bd0-4dda-4f23-b077-dcc3f76cbc45","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"39559a84-9ef2-47ad-982c-840f197ffac7","name":"39559a84-9ef2-47ad-982c-840f197ffac7","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -70,15 +70,9 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"2ee8e999-4d5c-4751-a174-4d1d8fc5c3bc","path":"sprites/spr_mk7_mouth_prussian/spr_mk7_mouth_prussian.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"5d2d40c6-5430-4d09-a305-853a603296d9","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"67b73bd0-4dda-4f23-b077-dcc3f76cbc45","path":"sprites/spr_mk7_mouth_prussian/spr_mk7_mouth_prussian.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"3160ee19-f37b-4969-bc87-9c858e597b6b","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"39559a84-9ef2-47ad-982c-840f197ffac7","path":"sprites/spr_mk7_mouth_prussian/spr_mk7_mouth_prussian.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"58009909-cf0f-4b81-96c4-5fa8378c9091","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"2ee8e999-4d5c-4751-a174-4d1d8fc5c3bc","path":"sprites/spr_mk7_mouth_prussian/spr_mk7_mouth_prussian.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"5d2d40c6-5430-4d09-a305-853a603296d9","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"67b73bd0-4dda-4f23-b077-dcc3f76cbc45","path":"sprites/spr_mk7_mouth_prussian/spr_mk7_mouth_prussian.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"3160ee19-f37b-4969-bc87-9c858e597b6b","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"39559a84-9ef2-47ad-982c-840f197ffac7","path":"sprites/spr_mk7_mouth_prussian/spr_mk7_mouth_prussian.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"58009909-cf0f-4b81-96c4-5fa8378c9091","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_mouth_variants/spr_mk7_mouth_variants.yy b/sprites/spr_mk7_mouth_variants/spr_mk7_mouth_variants.yy index 4fcad814c3..50a02383ec 100644 --- a/sprites/spr_mk7_mouth_variants/spr_mk7_mouth_variants.yy +++ b/sprites/spr_mk7_mouth_variants/spr_mk7_mouth_variants.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_mk7_mouth_variants", "bboxMode":0, "bbox_bottom":44, @@ -12,10 +12,10 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"805b74c1-f681-48e7-abfd-6f5b223474c6","name":"805b74c1-f681-48e7-abfd-6f5b223474c6","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"68e458f5-8c1b-450b-be3f-67390cbf0b81","name":"68e458f5-8c1b-450b-be3f-67390cbf0b81","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"f81f55ba-964f-4c22-bab2-2bea5d52d416","name":"f81f55ba-964f-4c22-bab2-2bea5d52d416","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"59db1a95-f5a5-474c-b9a9-a6e2993cc98a","name":"59db1a95-f5a5-474c-b9a9-a6e2993cc98a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"805b74c1-f681-48e7-abfd-6f5b223474c6","name":"805b74c1-f681-48e7-abfd-6f5b223474c6","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"68e458f5-8c1b-450b-be3f-67390cbf0b81","name":"68e458f5-8c1b-450b-be3f-67390cbf0b81","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"f81f55ba-964f-4c22-bab2-2bea5d52d416","name":"f81f55ba-964f-4c22-bab2-2bea5d52d416","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"59db1a95-f5a5-474c-b9a9-a6e2993cc98a","name":"59db1a95-f5a5-474c-b9a9-a6e2993cc98a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -71,18 +71,10 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"805b74c1-f681-48e7-abfd-6f5b223474c6","path":"sprites/spr_mk7_mouth_variants/spr_mk7_mouth_variants.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"90424d54-c018-4c65-bf40-761e34299d1a","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"68e458f5-8c1b-450b-be3f-67390cbf0b81","path":"sprites/spr_mk7_mouth_variants/spr_mk7_mouth_variants.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"94d1248d-c0c4-4e25-8dfc-560ddc824524","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"f81f55ba-964f-4c22-bab2-2bea5d52d416","path":"sprites/spr_mk7_mouth_variants/spr_mk7_mouth_variants.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"e284f5f0-bfd1-44e1-83c7-c26b0384c4ca","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"59db1a95-f5a5-474c-b9a9-a6e2993cc98a","path":"sprites/spr_mk7_mouth_variants/spr_mk7_mouth_variants.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"7b5b860f-4677-4acd-80cd-7c6676d57d40","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"805b74c1-f681-48e7-abfd-6f5b223474c6","path":"sprites/spr_mk7_mouth_variants/spr_mk7_mouth_variants.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"90424d54-c018-4c65-bf40-761e34299d1a","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"68e458f5-8c1b-450b-be3f-67390cbf0b81","path":"sprites/spr_mk7_mouth_variants/spr_mk7_mouth_variants.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"94d1248d-c0c4-4e25-8dfc-560ddc824524","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"f81f55ba-964f-4c22-bab2-2bea5d52d416","path":"sprites/spr_mk7_mouth_variants/spr_mk7_mouth_variants.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"e284f5f0-bfd1-44e1-83c7-c26b0384c4ca","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"59db1a95-f5a5-474c-b9a9-a6e2993cc98a","path":"sprites/spr_mk7_mouth_variants/spr_mk7_mouth_variants.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"7b5b860f-4677-4acd-80cd-7c6676d57d40","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_mk7_prussia_chest/spr_mk7_prussia_chest.yy b/sprites/spr_mk7_prussia_chest/spr_mk7_prussia_chest.yy index 01cf9d494e..7ecca87e30 100644 --- a/sprites/spr_mk7_prussia_chest/spr_mk7_prussia_chest.yy +++ b/sprites/spr_mk7_prussia_chest/spr_mk7_prussia_chest.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_mk7_prussia_chest", "bboxMode":0, "bbox_bottom":82, @@ -12,11 +12,11 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"b6ba8600-fb6b-4fa9-abc7-bdc2311eb79e","name":"b6ba8600-fb6b-4fa9-abc7-bdc2311eb79e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"f29ddf8f-9b5f-481e-84fc-70def0f52822","name":"f29ddf8f-9b5f-481e-84fc-70def0f52822","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"be47593c-61a3-4f18-94fb-d10377ee52c2","name":"be47593c-61a3-4f18-94fb-d10377ee52c2","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"9cefe8d7-2292-4e91-9b7c-c798eda8297d","name":"9cefe8d7-2292-4e91-9b7c-c798eda8297d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"5e1a5df6-8fc9-48f2-8a7f-be5d7c9ab441","name":"5e1a5df6-8fc9-48f2-8a7f-be5d7c9ab441","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"b6ba8600-fb6b-4fa9-abc7-bdc2311eb79e","name":"b6ba8600-fb6b-4fa9-abc7-bdc2311eb79e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"f29ddf8f-9b5f-481e-84fc-70def0f52822","name":"f29ddf8f-9b5f-481e-84fc-70def0f52822","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"be47593c-61a3-4f18-94fb-d10377ee52c2","name":"be47593c-61a3-4f18-94fb-d10377ee52c2","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"9cefe8d7-2292-4e91-9b7c-c798eda8297d","name":"9cefe8d7-2292-4e91-9b7c-c798eda8297d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"5e1a5df6-8fc9-48f2-8a7f-be5d7c9ab441","name":"5e1a5df6-8fc9-48f2-8a7f-be5d7c9ab441","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -72,21 +72,11 @@ "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_prussia_chest/spr_mk7_prussia_chest.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"325b6201-0d39-4816-ab63-ff3059baaa71","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"f29ddf8f-9b5f-481e-84fc-70def0f52822","path":"sprites/spr_mk7_prussia_chest/spr_mk7_prussia_chest.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"8623654c-b493-4e7a-9016-c4cb86b3a5c7","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"be47593c-61a3-4f18-94fb-d10377ee52c2","path":"sprites/spr_mk7_prussia_chest/spr_mk7_prussia_chest.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"a3a1701a-91b0-42b3-821d-2ca5b311081a","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"9cefe8d7-2292-4e91-9b7c-c798eda8297d","path":"sprites/spr_mk7_prussia_chest/spr_mk7_prussia_chest.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"e60dbbc5-c2af-4409-87fb-f63db8f14b63","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"5e1a5df6-8fc9-48f2-8a7f-be5d7c9ab441","path":"sprites/spr_mk7_prussia_chest/spr_mk7_prussia_chest.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"f4db6343-e700-4a31-9305-2b0c40459865","IsCreationKey":false,"Key":4.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_prussia_chest/spr_mk7_prussia_chest.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"325b6201-0d39-4816-ab63-ff3059baaa71","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"f29ddf8f-9b5f-481e-84fc-70def0f52822","path":"sprites/spr_mk7_prussia_chest/spr_mk7_prussia_chest.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"8623654c-b493-4e7a-9016-c4cb86b3a5c7","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"be47593c-61a3-4f18-94fb-d10377ee52c2","path":"sprites/spr_mk7_prussia_chest/spr_mk7_prussia_chest.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"a3a1701a-91b0-42b3-821d-2ca5b311081a","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"9cefe8d7-2292-4e91-9b7c-c798eda8297d","path":"sprites/spr_mk7_prussia_chest/spr_mk7_prussia_chest.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"e60dbbc5-c2af-4409-87fb-f63db8f14b63","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"5e1a5df6-8fc9-48f2-8a7f-be5d7c9ab441","path":"sprites/spr_mk7_prussia_chest/spr_mk7_prussia_chest.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"f4db6343-e700-4a31-9305-2b0c40459865","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_mk7_right_arm/spr_mk7_right_arm.yy b/sprites/spr_mk7_right_arm/spr_mk7_right_arm.yy index 749775f2b1..dad32314a0 100644 --- a/sprites/spr_mk7_right_arm/spr_mk7_right_arm.yy +++ b/sprites/spr_mk7_right_arm/spr_mk7_right_arm.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_mk7_right_arm", "bboxMode":0, "bbox_bottom":125, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"1894dc2e-dcc3-4d36-a463-17cc5c39a59d","name":"1894dc2e-dcc3-4d36-a463-17cc5c39a59d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"1894dc2e-dcc3-4d36-a463-17cc5c39a59d","name":"1894dc2e-dcc3-4d36-a463-17cc5c39a59d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"1894dc2e-dcc3-4d36-a463-17cc5c39a59d","path":"sprites/spr_mk7_right_arm/spr_mk7_right_arm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"b3d2383f-78e1-45a6-b6fb-577392a18352","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"1894dc2e-dcc3-4d36-a463-17cc5c39a59d","path":"sprites/spr_mk7_right_arm/spr_mk7_right_arm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"b3d2383f-78e1-45a6-b6fb-577392a18352","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_right_trim/spr_mk7_right_trim.yy b/sprites/spr_mk7_right_trim/spr_mk7_right_trim.yy index 65beda6db2..fde1910d87 100644 --- a/sprites/spr_mk7_right_trim/spr_mk7_right_trim.yy +++ b/sprites/spr_mk7_right_trim/spr_mk7_right_trim.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_mk7_right_trim", "bboxMode":0, "bbox_bottom":81, @@ -12,10 +12,10 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"a9ab7201-7070-45ca-8574-83152cfd6f3c","name":"a9ab7201-7070-45ca-8574-83152cfd6f3c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"c59f380a-e222-4020-bf08-125985f587ac","name":"c59f380a-e222-4020-bf08-125985f587ac","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"dc4d4861-9b2d-464f-9682-578770b6ac9a","name":"dc4d4861-9b2d-464f-9682-578770b6ac9a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"09035cbe-5b3d-4474-a920-751ccede1b22","name":"09035cbe-5b3d-4474-a920-751ccede1b22","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"a9ab7201-7070-45ca-8574-83152cfd6f3c","name":"a9ab7201-7070-45ca-8574-83152cfd6f3c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"c59f380a-e222-4020-bf08-125985f587ac","name":"c59f380a-e222-4020-bf08-125985f587ac","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"dc4d4861-9b2d-464f-9682-578770b6ac9a","name":"dc4d4861-9b2d-464f-9682-578770b6ac9a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"09035cbe-5b3d-4474-a920-751ccede1b22","name":"09035cbe-5b3d-4474-a920-751ccede1b22","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -73,18 +73,10 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"a9ab7201-7070-45ca-8574-83152cfd6f3c","path":"sprites/spr_mk7_right_trim/spr_mk7_right_trim.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"22f140e8-36e9-438e-ac20-4d6a50de8292","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"c59f380a-e222-4020-bf08-125985f587ac","path":"sprites/spr_mk7_right_trim/spr_mk7_right_trim.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"2e8a26e7-bfc2-42e4-bcfe-afeebb652382","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"dc4d4861-9b2d-464f-9682-578770b6ac9a","path":"sprites/spr_mk7_right_trim/spr_mk7_right_trim.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"5a096d33-1914-457f-a964-ec5ba2833a6e","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"09035cbe-5b3d-4474-a920-751ccede1b22","path":"sprites/spr_mk7_right_trim/spr_mk7_right_trim.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"0675daf6-3a75-4886-b1c7-7d722f306c69","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"a9ab7201-7070-45ca-8574-83152cfd6f3c","path":"sprites/spr_mk7_right_trim/spr_mk7_right_trim.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"22f140e8-36e9-438e-ac20-4d6a50de8292","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"c59f380a-e222-4020-bf08-125985f587ac","path":"sprites/spr_mk7_right_trim/spr_mk7_right_trim.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"2e8a26e7-bfc2-42e4-bcfe-afeebb652382","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"dc4d4861-9b2d-464f-9682-578770b6ac9a","path":"sprites/spr_mk7_right_trim/spr_mk7_right_trim.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"5a096d33-1914-457f-a964-ec5ba2833a6e","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"09035cbe-5b3d-4474-a920-751ccede1b22","path":"sprites/spr_mk7_right_trim/spr_mk7_right_trim.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"0675daf6-3a75-4886-b1c7-7d722f306c69","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_mk7_rope_belt/spr_mk7_rope_belt.yy b/sprites/spr_mk7_rope_belt/spr_mk7_rope_belt.yy index 812efe5ed7..407591fb56 100644 --- a/sprites/spr_mk7_rope_belt/spr_mk7_rope_belt.yy +++ b/sprites/spr_mk7_rope_belt/spr_mk7_rope_belt.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_mk7_rope_belt", "bboxMode":0, "bbox_bottom":163, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"dbb220c9-62b6-4ca7-a13f-5951132d0d13","name":"dbb220c9-62b6-4ca7-a13f-5951132d0d13","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"dbb220c9-62b6-4ca7-a13f-5951132d0d13","name":"dbb220c9-62b6-4ca7-a13f-5951132d0d13","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "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_mk7_rope_belt/spr_mk7_rope_belt.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"7e921701-e99d-41a9-82a0-24a921a8ed56","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_mk7_rope_belt/spr_mk7_rope_belt.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"7e921701-e99d-41a9-82a0-24a921a8ed56","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_runic_belt/spr_mk7_runic_belt.yy b/sprites/spr_mk7_runic_belt/spr_mk7_runic_belt.yy index 97c3245e32..c95522093e 100644 --- a/sprites/spr_mk7_runic_belt/spr_mk7_runic_belt.yy +++ b/sprites/spr_mk7_runic_belt/spr_mk7_runic_belt.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_mk7_runic_belt", "bboxMode":0, "bbox_bottom":104, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"b6ba8600-fb6b-4fa9-abc7-bdc2311eb79e","name":"b6ba8600-fb6b-4fa9-abc7-bdc2311eb79e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"b6ba8600-fb6b-4fa9-abc7-bdc2311eb79e","name":"b6ba8600-fb6b-4fa9-abc7-bdc2311eb79e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "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_runic_belt/spr_mk7_runic_belt.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"30003a9b-235a-4a43-8274-13d6bc52408e","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_runic_belt/spr_mk7_runic_belt.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"30003a9b-235a-4a43-8274-13d6bc52408e","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_sculpted_chest/spr_mk7_sculpted_chest.yy b/sprites/spr_mk7_sculpted_chest/spr_mk7_sculpted_chest.yy index 86d18731af..c2daf35793 100644 --- a/sprites/spr_mk7_sculpted_chest/spr_mk7_sculpted_chest.yy +++ b/sprites/spr_mk7_sculpted_chest/spr_mk7_sculpted_chest.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_mk7_sculpted_chest", "bboxMode":0, "bbox_bottom":97, @@ -12,13 +12,13 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"d359bd56-6962-4c59-a10d-f16ae433baa8","name":"d359bd56-6962-4c59-a10d-f16ae433baa8","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"092aa646-8af7-4ede-a104-ccb04fae0cbf","name":"092aa646-8af7-4ede-a104-ccb04fae0cbf","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"bc5e2753-207d-403d-81c5-a4e7066de053","name":"bc5e2753-207d-403d-81c5-a4e7066de053","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"ca44f968-4109-4468-901b-d07add46e880","name":"ca44f968-4109-4468-901b-d07add46e880","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"af74c721-e4c2-4842-b738-a2c688adc317","name":"af74c721-e4c2-4842-b738-a2c688adc317","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"0d02faaf-2101-406d-a94f-527d1c7834db","name":"0d02faaf-2101-406d-a94f-527d1c7834db","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"5769f893-c909-4b88-9856-62d72a0b6130","name":"5769f893-c909-4b88-9856-62d72a0b6130","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"d359bd56-6962-4c59-a10d-f16ae433baa8","name":"d359bd56-6962-4c59-a10d-f16ae433baa8","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"092aa646-8af7-4ede-a104-ccb04fae0cbf","name":"092aa646-8af7-4ede-a104-ccb04fae0cbf","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"bc5e2753-207d-403d-81c5-a4e7066de053","name":"bc5e2753-207d-403d-81c5-a4e7066de053","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"ca44f968-4109-4468-901b-d07add46e880","name":"ca44f968-4109-4468-901b-d07add46e880","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"af74c721-e4c2-4842-b738-a2c688adc317","name":"af74c721-e4c2-4842-b738-a2c688adc317","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"0d02faaf-2101-406d-a94f-527d1c7834db","name":"0d02faaf-2101-406d-a94f-527d1c7834db","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"5769f893-c909-4b88-9856-62d72a0b6130","name":"5769f893-c909-4b88-9856-62d72a0b6130","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -74,27 +74,13 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"d359bd56-6962-4c59-a10d-f16ae433baa8","path":"sprites/spr_mk7_sculpted_chest/spr_mk7_sculpted_chest.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"d3d2212a-239a-4ea3-b5f3-154921fccd5e","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"092aa646-8af7-4ede-a104-ccb04fae0cbf","path":"sprites/spr_mk7_sculpted_chest/spr_mk7_sculpted_chest.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"e077023e-8787-4782-9730-7a619200302f","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"bc5e2753-207d-403d-81c5-a4e7066de053","path":"sprites/spr_mk7_sculpted_chest/spr_mk7_sculpted_chest.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"5915a327-71ae-45ce-8bf1-4f238f188d9d","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"ca44f968-4109-4468-901b-d07add46e880","path":"sprites/spr_mk7_sculpted_chest/spr_mk7_sculpted_chest.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"007cbf5c-34b9-47f6-b9ec-9ba25915eea2","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"af74c721-e4c2-4842-b738-a2c688adc317","path":"sprites/spr_mk7_sculpted_chest/spr_mk7_sculpted_chest.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"0c9ae7ee-19de-49e6-a417-1d9a3874db53","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"0d02faaf-2101-406d-a94f-527d1c7834db","path":"sprites/spr_mk7_sculpted_chest/spr_mk7_sculpted_chest.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"8cfbe42f-6839-4f34-b9fa-cba90066c043","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"5769f893-c909-4b88-9856-62d72a0b6130","path":"sprites/spr_mk7_sculpted_chest/spr_mk7_sculpted_chest.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"7ecc1285-25c4-4843-abd9-6f539e6e54c3","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"d359bd56-6962-4c59-a10d-f16ae433baa8","path":"sprites/spr_mk7_sculpted_chest/spr_mk7_sculpted_chest.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"d3d2212a-239a-4ea3-b5f3-154921fccd5e","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"092aa646-8af7-4ede-a104-ccb04fae0cbf","path":"sprites/spr_mk7_sculpted_chest/spr_mk7_sculpted_chest.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"e077023e-8787-4782-9730-7a619200302f","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"bc5e2753-207d-403d-81c5-a4e7066de053","path":"sprites/spr_mk7_sculpted_chest/spr_mk7_sculpted_chest.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"5915a327-71ae-45ce-8bf1-4f238f188d9d","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"ca44f968-4109-4468-901b-d07add46e880","path":"sprites/spr_mk7_sculpted_chest/spr_mk7_sculpted_chest.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"007cbf5c-34b9-47f6-b9ec-9ba25915eea2","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"af74c721-e4c2-4842-b738-a2c688adc317","path":"sprites/spr_mk7_sculpted_chest/spr_mk7_sculpted_chest.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"0c9ae7ee-19de-49e6-a417-1d9a3874db53","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"0d02faaf-2101-406d-a94f-527d1c7834db","path":"sprites/spr_mk7_sculpted_chest/spr_mk7_sculpted_chest.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"8cfbe42f-6839-4f34-b9fa-cba90066c043","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"5769f893-c909-4b88-9856-62d72a0b6130","path":"sprites/spr_mk7_sculpted_chest/spr_mk7_sculpted_chest.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"7ecc1285-25c4-4843-abd9-6f539e6e54c3","IsCreationKey":false,"Key":6.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_thorax_variants/spr_mk7_thorax_variants.yy b/sprites/spr_mk7_thorax_variants/spr_mk7_thorax_variants.yy index 21dba15817..f40beee983 100644 --- a/sprites/spr_mk7_thorax_variants/spr_mk7_thorax_variants.yy +++ b/sprites/spr_mk7_thorax_variants/spr_mk7_thorax_variants.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_mk7_thorax_variants", "bboxMode":0, "bbox_bottom":94, @@ -12,12 +12,12 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"d0338708-7e62-4549-91ae-e73b183dd2ef","name":"d0338708-7e62-4549-91ae-e73b183dd2ef","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"d082ec33-adf7-4978-a9fb-3fcf8cdcfbe6","name":"d082ec33-adf7-4978-a9fb-3fcf8cdcfbe6","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"44f5165b-6919-4a3a-9c58-452f3f588084","name":"44f5165b-6919-4a3a-9c58-452f3f588084","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"2a8cd791-4f7b-4fe6-993f-255b1e395f90","name":"2a8cd791-4f7b-4fe6-993f-255b1e395f90","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"979ec1c1-5d04-49f0-bb6c-2260773073c8","name":"979ec1c1-5d04-49f0-bb6c-2260773073c8","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"819e247d-9b1e-4fdc-a9d8-b719ed4cd316","name":"819e247d-9b1e-4fdc-a9d8-b719ed4cd316","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"d0338708-7e62-4549-91ae-e73b183dd2ef","name":"d0338708-7e62-4549-91ae-e73b183dd2ef","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"d082ec33-adf7-4978-a9fb-3fcf8cdcfbe6","name":"d082ec33-adf7-4978-a9fb-3fcf8cdcfbe6","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"44f5165b-6919-4a3a-9c58-452f3f588084","name":"44f5165b-6919-4a3a-9c58-452f3f588084","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"2a8cd791-4f7b-4fe6-993f-255b1e395f90","name":"2a8cd791-4f7b-4fe6-993f-255b1e395f90","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"979ec1c1-5d04-49f0-bb6c-2260773073c8","name":"979ec1c1-5d04-49f0-bb6c-2260773073c8","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"819e247d-9b1e-4fdc-a9d8-b719ed4cd316","name":"819e247d-9b1e-4fdc-a9d8-b719ed4cd316","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -73,24 +73,12 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"d0338708-7e62-4549-91ae-e73b183dd2ef","path":"sprites/spr_mk7_thorax_variants/spr_mk7_thorax_variants.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"df9c08ff-f06d-400b-80e7-bb59328f9199","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"d082ec33-adf7-4978-a9fb-3fcf8cdcfbe6","path":"sprites/spr_mk7_thorax_variants/spr_mk7_thorax_variants.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"ee5845f8-5f75-4dda-836e-fc135b26839e","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"44f5165b-6919-4a3a-9c58-452f3f588084","path":"sprites/spr_mk7_thorax_variants/spr_mk7_thorax_variants.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"db13cbd7-28ca-45ef-bbcc-e67390716428","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"2a8cd791-4f7b-4fe6-993f-255b1e395f90","path":"sprites/spr_mk7_thorax_variants/spr_mk7_thorax_variants.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"ca73c5a3-17d3-45a9-b6c9-78cb538894d1","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"979ec1c1-5d04-49f0-bb6c-2260773073c8","path":"sprites/spr_mk7_thorax_variants/spr_mk7_thorax_variants.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"0fae1fd8-4aa0-442c-994c-edeef09a437b","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"819e247d-9b1e-4fdc-a9d8-b719ed4cd316","path":"sprites/spr_mk7_thorax_variants/spr_mk7_thorax_variants.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"ec56882c-5f46-4d97-b25b-d17bbef25348","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"d0338708-7e62-4549-91ae-e73b183dd2ef","path":"sprites/spr_mk7_thorax_variants/spr_mk7_thorax_variants.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"df9c08ff-f06d-400b-80e7-bb59328f9199","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"d082ec33-adf7-4978-a9fb-3fcf8cdcfbe6","path":"sprites/spr_mk7_thorax_variants/spr_mk7_thorax_variants.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"ee5845f8-5f75-4dda-836e-fc135b26839e","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"44f5165b-6919-4a3a-9c58-452f3f588084","path":"sprites/spr_mk7_thorax_variants/spr_mk7_thorax_variants.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"db13cbd7-28ca-45ef-bbcc-e67390716428","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"2a8cd791-4f7b-4fe6-993f-255b1e395f90","path":"sprites/spr_mk7_thorax_variants/spr_mk7_thorax_variants.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"ca73c5a3-17d3-45a9-b6c9-78cb538894d1","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"979ec1c1-5d04-49f0-bb6c-2260773073c8","path":"sprites/spr_mk7_thorax_variants/spr_mk7_thorax_variants.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"0fae1fd8-4aa0-442c-994c-edeef09a437b","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"819e247d-9b1e-4fdc-a9d8-b719ed4cd316","path":"sprites/spr_mk7_thorax_variants/spr_mk7_thorax_variants.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"ec56882c-5f46-4d97-b25b-d17bbef25348","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_mk7_wolf_cult_belt/spr_mk7_wolf_cult_belt.yy b/sprites/spr_mk7_wolf_cult_belt/spr_mk7_wolf_cult_belt.yy index fee5ab2bd8..a95a560535 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 @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_mk7_wolf_cult_belt", "bboxMode":0, "bbox_bottom":105, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"b6ba8600-fb6b-4fa9-abc7-bdc2311eb79e","name":"b6ba8600-fb6b-4fa9-abc7-bdc2311eb79e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"b6ba8600-fb6b-4fa9-abc7-bdc2311eb79e","name":"b6ba8600-fb6b-4fa9-abc7-bdc2311eb79e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -70,9 +70,7 @@ "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_mk7_wolf_cult_chest_variants/spr_mk7_wolf_cult_chest_variants.yy b/sprites/spr_mk7_wolf_cult_chest_variants/spr_mk7_wolf_cult_chest_variants.yy index 79541a838e..9d2d53b28e 100644 --- a/sprites/spr_mk7_wolf_cult_chest_variants/spr_mk7_wolf_cult_chest_variants.yy +++ b/sprites/spr_mk7_wolf_cult_chest_variants/spr_mk7_wolf_cult_chest_variants.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_mk7_wolf_cult_chest_variants", "bboxMode":0, "bbox_bottom":70, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"bc5e2753-207d-403d-81c5-a4e7066de053","name":"bc5e2753-207d-403d-81c5-a4e7066de053","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"bc5e2753-207d-403d-81c5-a4e7066de053","name":"bc5e2753-207d-403d-81c5-a4e7066de053","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -69,9 +69,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"bc5e2753-207d-403d-81c5-a4e7066de053","path":"sprites/spr_mk7_wolf_cult_chest_variants/spr_mk7_wolf_cult_chest_variants.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"5ad9cfc1-5d97-4389-99cb-ecafad8ac462","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"bc5e2753-207d-403d-81c5-a4e7066de053","path":"sprites/spr_mk7_wolf_cult_chest_variants/spr_mk7_wolf_cult_chest_variants.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"5ad9cfc1-5d97-4389-99cb-ecafad8ac462","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_mk8_colors/spr_mk8_colors.yy b/sprites/spr_mk8_colors/spr_mk8_colors.yy index a800b21d31..0202853028 100644 --- a/sprites/spr_mk8_colors/spr_mk8_colors.yy +++ b/sprites/spr_mk8_colors/spr_mk8_colors.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_mk8_colors", "bboxMode":0, "bbox_bottom":220, @@ -12,19 +12,19 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"8be4a626-6064-4b08-a100-7509ef5b5e5e","name":"8be4a626-6064-4b08-a100-7509ef5b5e5e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"9e9a85f0-b4e6-4c9b-8233-0b5a268bf521","name":"9e9a85f0-b4e6-4c9b-8233-0b5a268bf521","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"981be636-52a5-4d29-96b0-5dee6151a13a","name":"981be636-52a5-4d29-96b0-5dee6151a13a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"0f0c616c-4a13-4802-b8b3-2822cfe25787","name":"0f0c616c-4a13-4802-b8b3-2822cfe25787","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"1b557307-d3ab-44db-88bd-dd939efc6f44","name":"1b557307-d3ab-44db-88bd-dd939efc6f44","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"95e99182-f9d7-45c6-aa75-55e9d68109af","name":"95e99182-f9d7-45c6-aa75-55e9d68109af","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"fbff63f1-b792-412e-9e65-2b9f52a1a2b7","name":"fbff63f1-b792-412e-9e65-2b9f52a1a2b7","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"349d1be4-0273-4d96-b600-2d943ad99dbe","name":"349d1be4-0273-4d96-b600-2d943ad99dbe","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"c002c68f-30e5-4bbe-b121-e694c138b49d","name":"c002c68f-30e5-4bbe-b121-e694c138b49d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"4d4ccd1e-f8af-41b7-9098-1af71496f28b","name":"4d4ccd1e-f8af-41b7-9098-1af71496f28b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"277f0aa2-b06c-4fa9-9656-a6bf6895da55","name":"277f0aa2-b06c-4fa9-9656-a6bf6895da55","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"01e36482-0b8b-41d7-8adc-d3c6b70c8575","name":"01e36482-0b8b-41d7-8adc-d3c6b70c8575","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"51421269-71df-4679-9664-340ff8792b13","name":"51421269-71df-4679-9664-340ff8792b13","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"8be4a626-6064-4b08-a100-7509ef5b5e5e","name":"8be4a626-6064-4b08-a100-7509ef5b5e5e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"9e9a85f0-b4e6-4c9b-8233-0b5a268bf521","name":"9e9a85f0-b4e6-4c9b-8233-0b5a268bf521","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"981be636-52a5-4d29-96b0-5dee6151a13a","name":"981be636-52a5-4d29-96b0-5dee6151a13a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"0f0c616c-4a13-4802-b8b3-2822cfe25787","name":"0f0c616c-4a13-4802-b8b3-2822cfe25787","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"1b557307-d3ab-44db-88bd-dd939efc6f44","name":"1b557307-d3ab-44db-88bd-dd939efc6f44","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"95e99182-f9d7-45c6-aa75-55e9d68109af","name":"95e99182-f9d7-45c6-aa75-55e9d68109af","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"fbff63f1-b792-412e-9e65-2b9f52a1a2b7","name":"fbff63f1-b792-412e-9e65-2b9f52a1a2b7","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"349d1be4-0273-4d96-b600-2d943ad99dbe","name":"349d1be4-0273-4d96-b600-2d943ad99dbe","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"c002c68f-30e5-4bbe-b121-e694c138b49d","name":"c002c68f-30e5-4bbe-b121-e694c138b49d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"4d4ccd1e-f8af-41b7-9098-1af71496f28b","name":"4d4ccd1e-f8af-41b7-9098-1af71496f28b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"277f0aa2-b06c-4fa9-9656-a6bf6895da55","name":"277f0aa2-b06c-4fa9-9656-a6bf6895da55","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"01e36482-0b8b-41d7-8adc-d3c6b70c8575","name":"01e36482-0b8b-41d7-8adc-d3c6b70c8575","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"51421269-71df-4679-9664-340ff8792b13","name":"51421269-71df-4679-9664-340ff8792b13","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -80,45 +80,19 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"8be4a626-6064-4b08-a100-7509ef5b5e5e","path":"sprites/spr_mk8_colors/spr_mk8_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"ebf9ae16-672c-441f-a17e-427926b6b7cf","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"9e9a85f0-b4e6-4c9b-8233-0b5a268bf521","path":"sprites/spr_mk8_colors/spr_mk8_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"cee4d72f-5a12-42ae-a9c9-3561d40b0ff2","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"981be636-52a5-4d29-96b0-5dee6151a13a","path":"sprites/spr_mk8_colors/spr_mk8_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"76a9ca46-05c1-4bb5-acc8-2a902aafaa8f","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"0f0c616c-4a13-4802-b8b3-2822cfe25787","path":"sprites/spr_mk8_colors/spr_mk8_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"ddc8d6b7-8742-46d6-b53b-8e944fa4a624","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"1b557307-d3ab-44db-88bd-dd939efc6f44","path":"sprites/spr_mk8_colors/spr_mk8_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"b2b0de0d-7520-4f67-b900-38544950c442","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"95e99182-f9d7-45c6-aa75-55e9d68109af","path":"sprites/spr_mk8_colors/spr_mk8_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"696987ef-0b47-44bd-8b4f-dc0717b4ebb1","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"fbff63f1-b792-412e-9e65-2b9f52a1a2b7","path":"sprites/spr_mk8_colors/spr_mk8_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"cad3b930-d7c0-42d9-b598-4fb681152d39","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"349d1be4-0273-4d96-b600-2d943ad99dbe","path":"sprites/spr_mk8_colors/spr_mk8_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"110ba57c-100a-4f0b-a35c-6dd3e30ad0fd","IsCreationKey":false,"Key":7.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"c002c68f-30e5-4bbe-b121-e694c138b49d","path":"sprites/spr_mk8_colors/spr_mk8_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"c77406f6-2f88-4c3c-890f-86bc5b562115","IsCreationKey":false,"Key":8.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"4d4ccd1e-f8af-41b7-9098-1af71496f28b","path":"sprites/spr_mk8_colors/spr_mk8_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"2d1a7567-af80-4b42-a3d4-f55d86e29ee0","IsCreationKey":false,"Key":9.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"277f0aa2-b06c-4fa9-9656-a6bf6895da55","path":"sprites/spr_mk8_colors/spr_mk8_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"6213a87d-cde3-4aad-96a0-66fa3cccfd96","IsCreationKey":false,"Key":10.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"01e36482-0b8b-41d7-8adc-d3c6b70c8575","path":"sprites/spr_mk8_colors/spr_mk8_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"a539504c-1db9-4b3d-ae90-398cd9f79ff7","IsCreationKey":false,"Key":11.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"51421269-71df-4679-9664-340ff8792b13","path":"sprites/spr_mk8_colors/spr_mk8_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"e08051c1-4b10-4607-aaef-e161d151137d","IsCreationKey":false,"Key":12.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"8be4a626-6064-4b08-a100-7509ef5b5e5e","path":"sprites/spr_mk8_colors/spr_mk8_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"ebf9ae16-672c-441f-a17e-427926b6b7cf","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"9e9a85f0-b4e6-4c9b-8233-0b5a268bf521","path":"sprites/spr_mk8_colors/spr_mk8_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"cee4d72f-5a12-42ae-a9c9-3561d40b0ff2","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"981be636-52a5-4d29-96b0-5dee6151a13a","path":"sprites/spr_mk8_colors/spr_mk8_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"76a9ca46-05c1-4bb5-acc8-2a902aafaa8f","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"0f0c616c-4a13-4802-b8b3-2822cfe25787","path":"sprites/spr_mk8_colors/spr_mk8_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"ddc8d6b7-8742-46d6-b53b-8e944fa4a624","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"1b557307-d3ab-44db-88bd-dd939efc6f44","path":"sprites/spr_mk8_colors/spr_mk8_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"b2b0de0d-7520-4f67-b900-38544950c442","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"95e99182-f9d7-45c6-aa75-55e9d68109af","path":"sprites/spr_mk8_colors/spr_mk8_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"696987ef-0b47-44bd-8b4f-dc0717b4ebb1","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"fbff63f1-b792-412e-9e65-2b9f52a1a2b7","path":"sprites/spr_mk8_colors/spr_mk8_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"cad3b930-d7c0-42d9-b598-4fb681152d39","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"349d1be4-0273-4d96-b600-2d943ad99dbe","path":"sprites/spr_mk8_colors/spr_mk8_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"110ba57c-100a-4f0b-a35c-6dd3e30ad0fd","IsCreationKey":false,"Key":7.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"c002c68f-30e5-4bbe-b121-e694c138b49d","path":"sprites/spr_mk8_colors/spr_mk8_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"c77406f6-2f88-4c3c-890f-86bc5b562115","IsCreationKey":false,"Key":8.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"4d4ccd1e-f8af-41b7-9098-1af71496f28b","path":"sprites/spr_mk8_colors/spr_mk8_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"2d1a7567-af80-4b42-a3d4-f55d86e29ee0","IsCreationKey":false,"Key":9.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"277f0aa2-b06c-4fa9-9656-a6bf6895da55","path":"sprites/spr_mk8_colors/spr_mk8_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"6213a87d-cde3-4aad-96a0-66fa3cccfd96","IsCreationKey":false,"Key":10.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"01e36482-0b8b-41d7-8adc-d3c6b70c8575","path":"sprites/spr_mk8_colors/spr_mk8_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"a539504c-1db9-4b3d-ae90-398cd9f79ff7","IsCreationKey":false,"Key":11.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"51421269-71df-4679-9664-340ff8792b13","path":"sprites/spr_mk8_colors/spr_mk8_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"e08051c1-4b10-4607-aaef-e161d151137d","IsCreationKey":false,"Key":12.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_mk8_gorget/spr_mk8_gorget.yy b/sprites/spr_mk8_gorget/spr_mk8_gorget.yy index 30e32980b3..bb7e1b1d87 100644 --- a/sprites/spr_mk8_gorget/spr_mk8_gorget.yy +++ b/sprites/spr_mk8_gorget/spr_mk8_gorget.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_mk8_gorget", "bboxMode":0, "bbox_bottom":53, @@ -12,13 +12,13 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"851a2104-903f-436b-b68b-06b80d754bf4","name":"851a2104-903f-436b-b68b-06b80d754bf4","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"b18dfcbc-b847-441b-9b0c-618cd25c2349","name":"b18dfcbc-b847-441b-9b0c-618cd25c2349","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"6988a4aa-1960-49dd-a4d3-166e6ff7c4df","name":"6988a4aa-1960-49dd-a4d3-166e6ff7c4df","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"603329e3-8632-4533-b8b4-82b83c307cac","name":"603329e3-8632-4533-b8b4-82b83c307cac","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"4898c548-a0c7-4e41-a1b5-a09ace2df4a7","name":"4898c548-a0c7-4e41-a1b5-a09ace2df4a7","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"d4999c3e-8f41-4b09-ac88-634015b49682","name":"d4999c3e-8f41-4b09-ac88-634015b49682","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"158ee31a-9f08-4c7d-9e87-fae8d166c376","name":"158ee31a-9f08-4c7d-9e87-fae8d166c376","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"851a2104-903f-436b-b68b-06b80d754bf4","name":"851a2104-903f-436b-b68b-06b80d754bf4","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"b18dfcbc-b847-441b-9b0c-618cd25c2349","name":"b18dfcbc-b847-441b-9b0c-618cd25c2349","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"6988a4aa-1960-49dd-a4d3-166e6ff7c4df","name":"6988a4aa-1960-49dd-a4d3-166e6ff7c4df","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"603329e3-8632-4533-b8b4-82b83c307cac","name":"603329e3-8632-4533-b8b4-82b83c307cac","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"4898c548-a0c7-4e41-a1b5-a09ace2df4a7","name":"4898c548-a0c7-4e41-a1b5-a09ace2df4a7","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"d4999c3e-8f41-4b09-ac88-634015b49682","name":"d4999c3e-8f41-4b09-ac88-634015b49682","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"158ee31a-9f08-4c7d-9e87-fae8d166c376","name":"158ee31a-9f08-4c7d-9e87-fae8d166c376","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -74,27 +74,13 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"851a2104-903f-436b-b68b-06b80d754bf4","path":"sprites/spr_mk8_gorget/spr_mk8_gorget.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"80b2289b-cc75-4ca5-96ca-3097105f3fd2","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"b18dfcbc-b847-441b-9b0c-618cd25c2349","path":"sprites/spr_mk8_gorget/spr_mk8_gorget.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"383a62b7-cef5-4267-b973-3ac3aad57cca","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"6988a4aa-1960-49dd-a4d3-166e6ff7c4df","path":"sprites/spr_mk8_gorget/spr_mk8_gorget.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"3419f9e2-c3bc-467e-bdf0-b5dab567d3fb","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"603329e3-8632-4533-b8b4-82b83c307cac","path":"sprites/spr_mk8_gorget/spr_mk8_gorget.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"533ed542-183a-4df2-9110-ce46ac29753c","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"4898c548-a0c7-4e41-a1b5-a09ace2df4a7","path":"sprites/spr_mk8_gorget/spr_mk8_gorget.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"aaaa8953-8c99-4e89-99d3-90bb371e571c","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"d4999c3e-8f41-4b09-ac88-634015b49682","path":"sprites/spr_mk8_gorget/spr_mk8_gorget.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"98495c8f-472a-43e1-9468-6da68d0a2e8f","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"158ee31a-9f08-4c7d-9e87-fae8d166c376","path":"sprites/spr_mk8_gorget/spr_mk8_gorget.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"0f44dc52-686d-478a-8f07-84ac5d102ce6","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"851a2104-903f-436b-b68b-06b80d754bf4","path":"sprites/spr_mk8_gorget/spr_mk8_gorget.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"80b2289b-cc75-4ca5-96ca-3097105f3fd2","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"b18dfcbc-b847-441b-9b0c-618cd25c2349","path":"sprites/spr_mk8_gorget/spr_mk8_gorget.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"383a62b7-cef5-4267-b973-3ac3aad57cca","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"6988a4aa-1960-49dd-a4d3-166e6ff7c4df","path":"sprites/spr_mk8_gorget/spr_mk8_gorget.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"3419f9e2-c3bc-467e-bdf0-b5dab567d3fb","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"603329e3-8632-4533-b8b4-82b83c307cac","path":"sprites/spr_mk8_gorget/spr_mk8_gorget.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"533ed542-183a-4df2-9110-ce46ac29753c","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"4898c548-a0c7-4e41-a1b5-a09ace2df4a7","path":"sprites/spr_mk8_gorget/spr_mk8_gorget.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"aaaa8953-8c99-4e89-99d3-90bb371e571c","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"d4999c3e-8f41-4b09-ac88-634015b49682","path":"sprites/spr_mk8_gorget/spr_mk8_gorget.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"98495c8f-472a-43e1-9468-6da68d0a2e8f","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"158ee31a-9f08-4c7d-9e87-fae8d166c376","path":"sprites/spr_mk8_gorget/spr_mk8_gorget.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"0f44dc52-686d-478a-8f07-84ac5d102ce6","IsCreationKey":false,"Key":6.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_mm_butts/spr_mm_butts.yy b/sprites/spr_mm_butts/spr_mm_butts.yy index dab65c487f..1e54636e49 100644 --- a/sprites/spr_mm_butts/spr_mm_butts.yy +++ b/sprites/spr_mm_butts/spr_mm_butts.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_mm_butts", "bboxMode":0, "bbox_bottom":19, @@ -12,11 +12,11 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"b2f3fc02-83c3-4384-8cf7-349730941d32","name":"b2f3fc02-83c3-4384-8cf7-349730941d32","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"8ada21ef-8373-4ce3-a587-650fb8da0541","name":"8ada21ef-8373-4ce3-a587-650fb8da0541","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"a490443b-3cdf-4753-9ffc-2896f0104827","name":"a490443b-3cdf-4753-9ffc-2896f0104827","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"07b73ac4-39da-4acb-9f11-a9ee3400a71f","name":"07b73ac4-39da-4acb-9f11-a9ee3400a71f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"8122bd56-7d5c-49d3-a373-6548e3cf9b7b","name":"8122bd56-7d5c-49d3-a373-6548e3cf9b7b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"b2f3fc02-83c3-4384-8cf7-349730941d32","name":"b2f3fc02-83c3-4384-8cf7-349730941d32","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"8ada21ef-8373-4ce3-a587-650fb8da0541","name":"8ada21ef-8373-4ce3-a587-650fb8da0541","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"a490443b-3cdf-4753-9ffc-2896f0104827","name":"a490443b-3cdf-4753-9ffc-2896f0104827","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"07b73ac4-39da-4acb-9f11-a9ee3400a71f","name":"07b73ac4-39da-4acb-9f11-a9ee3400a71f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"8122bd56-7d5c-49d3-a373-6548e3cf9b7b","name":"8122bd56-7d5c-49d3-a373-6548e3cf9b7b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -72,21 +72,11 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"b2f3fc02-83c3-4384-8cf7-349730941d32","path":"sprites/spr_mm_butts/spr_mm_butts.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"a3a0d07f-06dc-4ca4-b90a-8a1d3ac5001c","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"8ada21ef-8373-4ce3-a587-650fb8da0541","path":"sprites/spr_mm_butts/spr_mm_butts.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"85c4ac87-7c94-4842-aed9-9ecf21a490bb","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"a490443b-3cdf-4753-9ffc-2896f0104827","path":"sprites/spr_mm_butts/spr_mm_butts.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"89e01832-b757-43a7-97c2-1be750fd2a76","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"07b73ac4-39da-4acb-9f11-a9ee3400a71f","path":"sprites/spr_mm_butts/spr_mm_butts.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"ca031830-21c6-4642-818b-5df96fb549d2","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"8122bd56-7d5c-49d3-a373-6548e3cf9b7b","path":"sprites/spr_mm_butts/spr_mm_butts.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"04528819-a220-4726-8700-303995f2fb3c","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"b2f3fc02-83c3-4384-8cf7-349730941d32","path":"sprites/spr_mm_butts/spr_mm_butts.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"a3a0d07f-06dc-4ca4-b90a-8a1d3ac5001c","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"8ada21ef-8373-4ce3-a587-650fb8da0541","path":"sprites/spr_mm_butts/spr_mm_butts.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"85c4ac87-7c94-4842-aed9-9ecf21a490bb","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"a490443b-3cdf-4753-9ffc-2896f0104827","path":"sprites/spr_mm_butts/spr_mm_butts.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"89e01832-b757-43a7-97c2-1be750fd2a76","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"07b73ac4-39da-4acb-9f11-a9ee3400a71f","path":"sprites/spr_mm_butts/spr_mm_butts.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"ca031830-21c6-4642-818b-5df96fb549d2","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"8122bd56-7d5c-49d3-a373-6548e3cf9b7b","path":"sprites/spr_mm_butts/spr_mm_butts.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"04528819-a220-4726-8700-303995f2fb3c","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_mm_butts_small/spr_mm_butts_small.yy b/sprites/spr_mm_butts_small/spr_mm_butts_small.yy index 707db231a6..a5014c3ab4 100644 --- a/sprites/spr_mm_butts_small/spr_mm_butts_small.yy +++ b/sprites/spr_mm_butts_small/spr_mm_butts_small.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_mm_butts_small", "bboxMode":0, "bbox_bottom":19, @@ -12,8 +12,8 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"a490443b-3cdf-4753-9ffc-2896f0104827","name":"a490443b-3cdf-4753-9ffc-2896f0104827","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"8122bd56-7d5c-49d3-a373-6548e3cf9b7b","name":"8122bd56-7d5c-49d3-a373-6548e3cf9b7b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"a490443b-3cdf-4753-9ffc-2896f0104827","name":"a490443b-3cdf-4753-9ffc-2896f0104827","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"8122bd56-7d5c-49d3-a373-6548e3cf9b7b","name":"8122bd56-7d5c-49d3-a373-6548e3cf9b7b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -69,12 +69,8 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"a490443b-3cdf-4753-9ffc-2896f0104827","path":"sprites/spr_mm_butts_small/spr_mm_butts_small.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"7f7c9bd0-1068-40a4-9cd4-3638dca38bb5","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"8122bd56-7d5c-49d3-a373-6548e3cf9b7b","path":"sprites/spr_mm_butts_small/spr_mm_butts_small.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"ab03fb07-e69f-4023-b23b-278203142e4a","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"a490443b-3cdf-4753-9ffc-2896f0104827","path":"sprites/spr_mm_butts_small/spr_mm_butts_small.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"7f7c9bd0-1068-40a4-9cd4-3638dca38bb5","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"8122bd56-7d5c-49d3-a373-6548e3cf9b7b","path":"sprites/spr_mm_butts_small/spr_mm_butts_small.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"ab03fb07-e69f-4023-b23b-278203142e4a","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_mm_glow/spr_mm_glow.yy b/sprites/spr_mm_glow/spr_mm_glow.yy index 20b8314a19..6992b7deae 100644 --- a/sprites/spr_mm_glow/spr_mm_glow.yy +++ b/sprites/spr_mm_glow/spr_mm_glow.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_mm_glow", "bboxMode":0, "bbox_bottom":0, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"4556acbf-7ef8-4c6f-9353-35cbb469a534","name":"4556acbf-7ef8-4c6f-9353-35cbb469a534","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"4556acbf-7ef8-4c6f-9353-35cbb469a534","name":"4556acbf-7ef8-4c6f-9353-35cbb469a534","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -33,13 +33,7 @@ "resourceType":"GMNineSliceData", "resourceVersion":"2.0", "right":0, - "tileMode":[ - 0, - 0, - 0, - 0, - 0, - ], + "tileMode":[0,0,0,0,0,], "top":0, }, "origin":0, @@ -87,9 +81,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"4556acbf-7ef8-4c6f-9353-35cbb469a534","path":"sprites/spr_mm_glow/spr_mm_glow.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"d532e166-1426-4753-a82c-2239adaee1f9","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"4556acbf-7ef8-4c6f-9353-35cbb469a534","path":"sprites/spr_mm_glow/spr_mm_glow.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"d532e166-1426-4753-a82c-2239adaee1f9","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_mm_glowold/spr_mm_glowold.yy b/sprites/spr_mm_glowold/spr_mm_glowold.yy index 2f34d688c5..52be77ffd3 100644 --- a/sprites/spr_mm_glowold/spr_mm_glowold.yy +++ b/sprites/spr_mm_glowold/spr_mm_glowold.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_mm_glowold", "bboxMode":0, "bbox_bottom":0, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"a810a33a-a34b-49b8-a394-e5126d46c22f","name":"a810a33a-a34b-49b8-a394-e5126d46c22f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"a810a33a-a34b-49b8-a394-e5126d46c22f","name":"a810a33a-a34b-49b8-a394-e5126d46c22f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -33,13 +33,7 @@ "resourceType":"GMNineSliceData", "resourceVersion":"2.0", "right":0, - "tileMode":[ - 0, - 0, - 0, - 0, - 0, - ], + "tileMode":[0,0,0,0,0,], "top":0, }, "origin":0, @@ -87,9 +81,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"a810a33a-a34b-49b8-a394-e5126d46c22f","path":"sprites/spr_mm_glowold/spr_mm_glowold.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"d3d2b87d-08e3-49ce-95d6-627e333eca68","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"a810a33a-a34b-49b8-a394-e5126d46c22f","path":"sprites/spr_mm_glowold/spr_mm_glowold.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"d3d2b87d-08e3-49ce-95d6-627e333eca68","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 a5cac3914a..324d768d63 100644 --- a/sprites/spr_mongol_hat/spr_mongol_hat.yy +++ b/sprites/spr_mongol_hat/spr_mongol_hat.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_mongol_hat", "bboxMode":0, "bbox_bottom":37, @@ -12,8 +12,8 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"f98623c4-a90f-4f13-a78b-50d7aae8aca6","name":"f98623c4-a90f-4f13-a78b-50d7aae8aca6","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"2f4626ef-3b9b-492c-9b46-13db7e74e087","name":"2f4626ef-3b9b-492c-9b46-13db7e74e087","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"f98623c4-a90f-4f13-a78b-50d7aae8aca6","name":"f98623c4-a90f-4f13-a78b-50d7aae8aca6","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"2f4626ef-3b9b-492c-9b46-13db7e74e087","name":"2f4626ef-3b9b-492c-9b46-13db7e74e087","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -69,12 +69,8 @@ "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 3c32849d9f..979312ed4e 100644 --- a/sprites/spr_mongol_topknots/spr_mongol_topknots.yy +++ b/sprites/spr_mongol_topknots/spr_mongol_topknots.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_mongol_topknots", "bboxMode":0, "bbox_bottom":69, @@ -12,9 +12,9 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"5a405388-8efb-49b6-a38f-f27ec42f29e3","name":"5a405388-8efb-49b6-a38f-f27ec42f29e3","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"4a660cc7-bffb-4e55-a447-3261a00bc7c8","name":"4a660cc7-bffb-4e55-a447-3261a00bc7c8","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"8dfcac38-dfd1-4639-84d7-f101aec4c205","name":"8dfcac38-dfd1-4639-84d7-f101aec4c205","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"5a405388-8efb-49b6-a38f-f27ec42f29e3","name":"5a405388-8efb-49b6-a38f-f27ec42f29e3","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"4a660cc7-bffb-4e55-a447-3261a00bc7c8","name":"4a660cc7-bffb-4e55-a447-3261a00bc7c8","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"8dfcac38-dfd1-4639-84d7-f101aec4c205","name":"8dfcac38-dfd1-4639-84d7-f101aec4c205","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -70,15 +70,9 @@ "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_narthecium_2/spr_narthecium_2.yy b/sprites/spr_narthecium_2/spr_narthecium_2.yy index be1d7326dc..6cf1fbf539 100644 --- a/sprites/spr_narthecium_2/spr_narthecium_2.yy +++ b/sprites/spr_narthecium_2/spr_narthecium_2.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_narthecium_2", "bboxMode":0, "bbox_bottom":134, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"350bde68-1664-48e8-97c4-7cff3c59b4ae","name":"350bde68-1664-48e8-97c4-7cff3c59b4ae","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"350bde68-1664-48e8-97c4-7cff3c59b4ae","name":"350bde68-1664-48e8-97c4-7cff3c59b4ae","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"350bde68-1664-48e8-97c4-7cff3c59b4ae","path":"sprites/spr_narthecium_2/spr_narthecium_2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"25b210ef-73fb-4ec5-bcd7-b16bd2738aa9","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"350bde68-1664-48e8-97c4-7cff3c59b4ae","path":"sprites/spr_narthecium_2/spr_narthecium_2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"25b210ef-73fb-4ec5-bcd7-b16bd2738aa9","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_new_banner/spr_new_banner.yy b/sprites/spr_new_banner/spr_new_banner.yy index c5332cb062..49db4b6e17 100644 --- a/sprites/spr_new_banner/spr_new_banner.yy +++ b/sprites/spr_new_banner/spr_new_banner.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_new_banner", "bboxMode":0, "bbox_bottom":197, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"affc02cd-401a-4d10-8d72-28cb9fc69444","name":"affc02cd-401a-4d10-8d72-28cb9fc69444","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"affc02cd-401a-4d10-8d72-28cb9fc69444","name":"affc02cd-401a-4d10-8d72-28cb9fc69444","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"affc02cd-401a-4d10-8d72-28cb9fc69444","path":"sprites/spr_new_banner/spr_new_banner.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"3187ab50-787e-4692-9541-b46b5dd9ffd0","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"affc02cd-401a-4d10-8d72-28cb9fc69444","path":"sprites/spr_new_banner/spr_new_banner.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"3187ab50-787e-4692-9541-b46b5dd9ffd0","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_new_mm/spr_new_mm.yy b/sprites/spr_new_mm/spr_new_mm.yy index f53214f6a2..285d68329c 100644 --- a/sprites/spr_new_mm/spr_new_mm.yy +++ b/sprites/spr_new_mm/spr_new_mm.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_new_mm", "bboxMode":0, "bbox_bottom":0, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"24507153-8c4a-4a69-b14f-9a079657f166","name":"24507153-8c4a-4a69-b14f-9a079657f166","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"24507153-8c4a-4a69-b14f-9a079657f166","name":"24507153-8c4a-4a69-b14f-9a079657f166","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"24507153-8c4a-4a69-b14f-9a079657f166","path":"sprites/spr_new_mm/spr_new_mm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"5ccf15d7-8a86-430e-a2ca-93818cb6d7f7","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"24507153-8c4a-4a69-b14f-9a079657f166","path":"sprites/spr_new_mm/spr_new_mm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"5ccf15d7-8a86-430e-a2ca-93818cb6d7f7","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_new_resource/spr_new_resource.yy b/sprites/spr_new_resource/spr_new_resource.yy index a7c43fcbb3..c507c235a1 100644 --- a/sprites/spr_new_resource/spr_new_resource.yy +++ b/sprites/spr_new_resource/spr_new_resource.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_new_resource", "bboxMode":0, "bbox_bottom":16, @@ -12,10 +12,10 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"284792e4-d862-4f8a-a95c-5da79bfd3c5e","name":"284792e4-d862-4f8a-a95c-5da79bfd3c5e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"99dadd8d-4acd-431a-b7f3-9b4cb6925ed9","name":"99dadd8d-4acd-431a-b7f3-9b4cb6925ed9","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"3b715fa2-79cd-4464-9f8a-de6c2ef6b6bc","name":"3b715fa2-79cd-4464-9f8a-de6c2ef6b6bc","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"f4978835-d9d6-4bd9-9090-17f08503e7f7","name":"f4978835-d9d6-4bd9-9090-17f08503e7f7","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"284792e4-d862-4f8a-a95c-5da79bfd3c5e","name":"284792e4-d862-4f8a-a95c-5da79bfd3c5e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"99dadd8d-4acd-431a-b7f3-9b4cb6925ed9","name":"99dadd8d-4acd-431a-b7f3-9b4cb6925ed9","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"3b715fa2-79cd-4464-9f8a-de6c2ef6b6bc","name":"3b715fa2-79cd-4464-9f8a-de6c2ef6b6bc","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"f4978835-d9d6-4bd9-9090-17f08503e7f7","name":"f4978835-d9d6-4bd9-9090-17f08503e7f7","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -71,18 +71,10 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"284792e4-d862-4f8a-a95c-5da79bfd3c5e","path":"sprites/spr_new_resource/spr_new_resource.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"5d19f578-139c-4064-8be1-47be64f4285e","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"99dadd8d-4acd-431a-b7f3-9b4cb6925ed9","path":"sprites/spr_new_resource/spr_new_resource.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"23d29671-1fde-42a4-b10a-af9b95b35347","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"3b715fa2-79cd-4464-9f8a-de6c2ef6b6bc","path":"sprites/spr_new_resource/spr_new_resource.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"e1e32982-b0e4-4d65-9829-47a9b31990ca","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"f4978835-d9d6-4bd9-9090-17f08503e7f7","path":"sprites/spr_new_resource/spr_new_resource.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"184f4138-aff7-414c-ad9b-da8d8f89d9b8","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"284792e4-d862-4f8a-a95c-5da79bfd3c5e","path":"sprites/spr_new_resource/spr_new_resource.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"5d19f578-139c-4064-8be1-47be64f4285e","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"99dadd8d-4acd-431a-b7f3-9b4cb6925ed9","path":"sprites/spr_new_resource/spr_new_resource.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"23d29671-1fde-42a4-b10a-af9b95b35347","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"3b715fa2-79cd-4464-9f8a-de6c2ef6b6bc","path":"sprites/spr_new_resource/spr_new_resource.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"e1e32982-b0e4-4d65-9829-47a9b31990ca","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"f4978835-d9d6-4bd9-9090-17f08503e7f7","path":"sprites/spr_new_resource/spr_new_resource.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"184f4138-aff7-414c-ad9b-da8d8f89d9b8","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_new_ui/spr_new_ui.yy b/sprites/spr_new_ui/spr_new_ui.yy index 6c60cea1a0..b06921e5ef 100644 --- a/sprites/spr_new_ui/spr_new_ui.yy +++ b/sprites/spr_new_ui/spr_new_ui.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_new_ui", "bboxMode":0, "bbox_bottom":899, @@ -12,8 +12,8 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"751eeb13-8d20-4ec3-a112-2614d1d1869c","name":"751eeb13-8d20-4ec3-a112-2614d1d1869c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"8d415ed6-0e26-4ceb-81b7-9d0cbac59606","name":"8d415ed6-0e26-4ceb-81b7-9d0cbac59606","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"751eeb13-8d20-4ec3-a112-2614d1d1869c","name":"751eeb13-8d20-4ec3-a112-2614d1d1869c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"8d415ed6-0e26-4ceb-81b7-9d0cbac59606","name":"8d415ed6-0e26-4ceb-81b7-9d0cbac59606","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -73,12 +73,8 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"751eeb13-8d20-4ec3-a112-2614d1d1869c","path":"sprites/spr_new_ui/spr_new_ui.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"78876266-578e-4c35-9427-365cd0f530f9","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"8d415ed6-0e26-4ceb-81b7-9d0cbac59606","path":"sprites/spr_new_ui/spr_new_ui.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"52b35884-ddd9-4ffa-9407-83da11883191","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"751eeb13-8d20-4ec3-a112-2614d1d1869c","path":"sprites/spr_new_ui/spr_new_ui.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"78876266-578e-4c35-9427-365cd0f530f9","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"8d415ed6-0e26-4ceb-81b7-9d0cbac59606","path":"sprites/spr_new_ui/spr_new_ui.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"52b35884-ddd9-4ffa-9407-83da11883191","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_new_ui_cover/spr_new_ui_cover.yy b/sprites/spr_new_ui_cover/spr_new_ui_cover.yy index f2db196f68..6f1fc1d976 100644 --- a/sprites/spr_new_ui_cover/spr_new_ui_cover.yy +++ b/sprites/spr_new_ui_cover/spr_new_ui_cover.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_new_ui_cover", "bboxMode":0, "bbox_bottom":16, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"40857d9f-b7b0-460f-8da3-993db52e0aee","name":"40857d9f-b7b0-460f-8da3-993db52e0aee","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"40857d9f-b7b0-460f-8da3-993db52e0aee","name":"40857d9f-b7b0-460f-8da3-993db52e0aee","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"40857d9f-b7b0-460f-8da3-993db52e0aee","path":"sprites/spr_new_ui_cover/spr_new_ui_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"bf14c101-a0a4-4283-81ca-19d9c4c64d75","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"40857d9f-b7b0-460f-8da3-993db52e0aee","path":"sprites/spr_new_ui_cover/spr_new_ui_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"bf14c101-a0a4-4283-81ca-19d9c4c64d75","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_noarmour_colors/spr_noarmour_colors.yy b/sprites/spr_noarmour_colors/spr_noarmour_colors.yy index 426778757f..1077824ab1 100644 --- a/sprites/spr_noarmour_colors/spr_noarmour_colors.yy +++ b/sprites/spr_noarmour_colors/spr_noarmour_colors.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_noarmour_colors", "bboxMode":0, "bbox_bottom":223, @@ -12,8 +12,8 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"7fda383a-1b96-43ab-9b00-348ba94f24e3","name":"7fda383a-1b96-43ab-9b00-348ba94f24e3","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"dfcef27b-ef94-422d-b312-1aeaffa3836e","name":"dfcef27b-ef94-422d-b312-1aeaffa3836e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"7fda383a-1b96-43ab-9b00-348ba94f24e3","name":"7fda383a-1b96-43ab-9b00-348ba94f24e3","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"dfcef27b-ef94-422d-b312-1aeaffa3836e","name":"dfcef27b-ef94-422d-b312-1aeaffa3836e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -69,12 +69,8 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"7fda383a-1b96-43ab-9b00-348ba94f24e3","path":"sprites/spr_noarmour_colors/spr_noarmour_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"ee2b0a1a-4b5e-48a3-8ce7-58a199d69840","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"dfcef27b-ef94-422d-b312-1aeaffa3836e","path":"sprites/spr_noarmour_colors/spr_noarmour_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"38cc4662-e007-4c05-a7a0-3f86779d9c91","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"7fda383a-1b96-43ab-9b00-348ba94f24e3","path":"sprites/spr_noarmour_colors/spr_noarmour_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"ee2b0a1a-4b5e-48a3-8ce7-58a199d69840","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"dfcef27b-ef94-422d-b312-1aeaffa3836e","path":"sprites/spr_noarmour_colors/spr_noarmour_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"38cc4662-e007-4c05-a7a0-3f86779d9c91","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":{ diff --git a/sprites/spr_none/spr_none.yy b/sprites/spr_none/spr_none.yy index 1259ef6117..0b964ea1cc 100644 --- a/sprites/spr_none/spr_none.yy +++ b/sprites/spr_none/spr_none.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_none", "bboxMode":0, "bbox_bottom":63, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"4a6846e4-12cb-4abb-9404-633df612cd68","name":"4a6846e4-12cb-4abb-9404-633df612cd68","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"4a6846e4-12cb-4abb-9404-633df612cd68","name":"4a6846e4-12cb-4abb-9404-633df612cd68","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"4a6846e4-12cb-4abb-9404-633df612cd68","path":"sprites/spr_none/spr_none.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"3a859341-0d2d-4356-b87d-df4182e972bc","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"4a6846e4-12cb-4abb-9404-633df612cd68","path":"sprites/spr_none/spr_none.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"3a859341-0d2d-4356-b87d-df4182e972bc","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_numeral_left_knee/spr_numeral_left_knee.yy b/sprites/spr_numeral_left_knee/spr_numeral_left_knee.yy index 6bb656566a..8764a267df 100644 --- a/sprites/spr_numeral_left_knee/spr_numeral_left_knee.yy +++ b/sprites/spr_numeral_left_knee/spr_numeral_left_knee.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_numeral_left_knee", "bboxMode":0, "bbox_bottom":157, @@ -12,17 +12,17 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"3e3f21a7-0c9e-42e8-b7b8-d88b3d32cdf5","name":"3e3f21a7-0c9e-42e8-b7b8-d88b3d32cdf5","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"74541f65-2a87-4ba1-b43a-968fffc9b1a9","name":"74541f65-2a87-4ba1-b43a-968fffc9b1a9","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"3d6d3aec-7568-4b23-ad3c-5a7a6dfbfdf8","name":"3d6d3aec-7568-4b23-ad3c-5a7a6dfbfdf8","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"b1a1eaf9-13dc-467e-b01e-c9bc4b05b11d","name":"b1a1eaf9-13dc-467e-b01e-c9bc4b05b11d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"83d0a8ac-8f98-4424-958c-95b882ab0e67","name":"83d0a8ac-8f98-4424-958c-95b882ab0e67","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"4257bedb-e4c1-47ce-99d8-f9c6ed903889","name":"4257bedb-e4c1-47ce-99d8-f9c6ed903889","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"25b1f798-03df-4b5e-a0b2-11a6c49d2369","name":"25b1f798-03df-4b5e-a0b2-11a6c49d2369","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"29533519-c6e5-4bda-a613-b26007242bcb","name":"29533519-c6e5-4bda-a613-b26007242bcb","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"a4cc7d3c-52d3-4b40-8dfa-8e17c9c83fa6","name":"a4cc7d3c-52d3-4b40-8dfa-8e17c9c83fa6","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"e4b15ce1-2cf7-4657-b4de-036b06455aad","name":"e4b15ce1-2cf7-4657-b4de-036b06455aad","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"c4049b43-1809-4728-924c-5444da8719b5","name":"c4049b43-1809-4728-924c-5444da8719b5","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"3e3f21a7-0c9e-42e8-b7b8-d88b3d32cdf5","name":"3e3f21a7-0c9e-42e8-b7b8-d88b3d32cdf5","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"74541f65-2a87-4ba1-b43a-968fffc9b1a9","name":"74541f65-2a87-4ba1-b43a-968fffc9b1a9","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"3d6d3aec-7568-4b23-ad3c-5a7a6dfbfdf8","name":"3d6d3aec-7568-4b23-ad3c-5a7a6dfbfdf8","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"b1a1eaf9-13dc-467e-b01e-c9bc4b05b11d","name":"b1a1eaf9-13dc-467e-b01e-c9bc4b05b11d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"83d0a8ac-8f98-4424-958c-95b882ab0e67","name":"83d0a8ac-8f98-4424-958c-95b882ab0e67","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"4257bedb-e4c1-47ce-99d8-f9c6ed903889","name":"4257bedb-e4c1-47ce-99d8-f9c6ed903889","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"25b1f798-03df-4b5e-a0b2-11a6c49d2369","name":"25b1f798-03df-4b5e-a0b2-11a6c49d2369","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"29533519-c6e5-4bda-a613-b26007242bcb","name":"29533519-c6e5-4bda-a613-b26007242bcb","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"a4cc7d3c-52d3-4b40-8dfa-8e17c9c83fa6","name":"a4cc7d3c-52d3-4b40-8dfa-8e17c9c83fa6","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"e4b15ce1-2cf7-4657-b4de-036b06455aad","name":"e4b15ce1-2cf7-4657-b4de-036b06455aad","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"c4049b43-1809-4728-924c-5444da8719b5","name":"c4049b43-1809-4728-924c-5444da8719b5","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -78,39 +78,17 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"3e3f21a7-0c9e-42e8-b7b8-d88b3d32cdf5","path":"sprites/spr_numeral_left_knee/spr_numeral_left_knee.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"09b95042-aae6-492f-b786-b74c8c6e9263","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"74541f65-2a87-4ba1-b43a-968fffc9b1a9","path":"sprites/spr_numeral_left_knee/spr_numeral_left_knee.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"47ab4ac3-1121-425c-9979-42936e389541","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"3d6d3aec-7568-4b23-ad3c-5a7a6dfbfdf8","path":"sprites/spr_numeral_left_knee/spr_numeral_left_knee.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"36a71730-fbce-4be8-b54c-fd8eaf732dad","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"b1a1eaf9-13dc-467e-b01e-c9bc4b05b11d","path":"sprites/spr_numeral_left_knee/spr_numeral_left_knee.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"ec4374be-3bbd-4d09-aeda-dd7c2f4b6da2","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"83d0a8ac-8f98-4424-958c-95b882ab0e67","path":"sprites/spr_numeral_left_knee/spr_numeral_left_knee.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"ee25b373-1963-4f2e-9aa5-3532ed45cff6","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"4257bedb-e4c1-47ce-99d8-f9c6ed903889","path":"sprites/spr_numeral_left_knee/spr_numeral_left_knee.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"af3546e5-fb3f-4506-9654-5aafa55e19fd","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"25b1f798-03df-4b5e-a0b2-11a6c49d2369","path":"sprites/spr_numeral_left_knee/spr_numeral_left_knee.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"0cbf6635-ee09-47d2-a582-f271220c8676","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"29533519-c6e5-4bda-a613-b26007242bcb","path":"sprites/spr_numeral_left_knee/spr_numeral_left_knee.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"de7ee4b9-7b88-45f6-965e-8c99fe6bd60a","IsCreationKey":false,"Key":7.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"a4cc7d3c-52d3-4b40-8dfa-8e17c9c83fa6","path":"sprites/spr_numeral_left_knee/spr_numeral_left_knee.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"f9729f53-ea1d-4a0d-adfe-4596f2e3bd5c","IsCreationKey":false,"Key":8.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"e4b15ce1-2cf7-4657-b4de-036b06455aad","path":"sprites/spr_numeral_left_knee/spr_numeral_left_knee.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"2c2462aa-f436-4f4a-97e8-831ed46702b7","IsCreationKey":false,"Key":9.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"c4049b43-1809-4728-924c-5444da8719b5","path":"sprites/spr_numeral_left_knee/spr_numeral_left_knee.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"502ea72f-bafd-4719-b46e-178305e29cda","IsCreationKey":false,"Key":10.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"3e3f21a7-0c9e-42e8-b7b8-d88b3d32cdf5","path":"sprites/spr_numeral_left_knee/spr_numeral_left_knee.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"09b95042-aae6-492f-b786-b74c8c6e9263","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"74541f65-2a87-4ba1-b43a-968fffc9b1a9","path":"sprites/spr_numeral_left_knee/spr_numeral_left_knee.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"47ab4ac3-1121-425c-9979-42936e389541","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"3d6d3aec-7568-4b23-ad3c-5a7a6dfbfdf8","path":"sprites/spr_numeral_left_knee/spr_numeral_left_knee.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"36a71730-fbce-4be8-b54c-fd8eaf732dad","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"b1a1eaf9-13dc-467e-b01e-c9bc4b05b11d","path":"sprites/spr_numeral_left_knee/spr_numeral_left_knee.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"ec4374be-3bbd-4d09-aeda-dd7c2f4b6da2","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"83d0a8ac-8f98-4424-958c-95b882ab0e67","path":"sprites/spr_numeral_left_knee/spr_numeral_left_knee.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"ee25b373-1963-4f2e-9aa5-3532ed45cff6","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"4257bedb-e4c1-47ce-99d8-f9c6ed903889","path":"sprites/spr_numeral_left_knee/spr_numeral_left_knee.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"af3546e5-fb3f-4506-9654-5aafa55e19fd","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"25b1f798-03df-4b5e-a0b2-11a6c49d2369","path":"sprites/spr_numeral_left_knee/spr_numeral_left_knee.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"0cbf6635-ee09-47d2-a582-f271220c8676","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"29533519-c6e5-4bda-a613-b26007242bcb","path":"sprites/spr_numeral_left_knee/spr_numeral_left_knee.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"de7ee4b9-7b88-45f6-965e-8c99fe6bd60a","IsCreationKey":false,"Key":7.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"a4cc7d3c-52d3-4b40-8dfa-8e17c9c83fa6","path":"sprites/spr_numeral_left_knee/spr_numeral_left_knee.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"f9729f53-ea1d-4a0d-adfe-4596f2e3bd5c","IsCreationKey":false,"Key":8.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"e4b15ce1-2cf7-4657-b4de-036b06455aad","path":"sprites/spr_numeral_left_knee/spr_numeral_left_knee.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"2c2462aa-f436-4f4a-97e8-831ed46702b7","IsCreationKey":false,"Key":9.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"c4049b43-1809-4728-924c-5444da8719b5","path":"sprites/spr_numeral_left_knee/spr_numeral_left_knee.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"502ea72f-bafd-4719-b46e-178305e29cda","IsCreationKey":false,"Key":10.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_ork_target/spr_ork_target.yy b/sprites/spr_ork_target/spr_ork_target.yy index 246116103c..6d2a6a23d9 100644 --- a/sprites/spr_ork_target/spr_ork_target.yy +++ b/sprites/spr_ork_target/spr_ork_target.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_ork_target", "bboxMode":2, "bbox_bottom":31, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"da401b80-f220-4151-8235-7d11983b9b40","name":"da401b80-f220-4151-8235-7d11983b9b40","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"da401b80-f220-4151-8235-7d11983b9b40","name":"da401b80-f220-4151-8235-7d11983b9b40","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"da401b80-f220-4151-8235-7d11983b9b40","path":"sprites/spr_ork_target/spr_ork_target.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"5209f4b7-620f-415b-8e5a-03ade6474c7b","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"da401b80-f220-4151-8235-7d11983b9b40","path":"sprites/spr_ork_target/spr_ork_target.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"5209f4b7-620f-415b-8e5a-03ade6474c7b","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":{ diff --git a/sprites/spr_p_name_bg/spr_p_name_bg.yy b/sprites/spr_p_name_bg/spr_p_name_bg.yy index 11a6cf1b03..0694b71d9f 100644 --- a/sprites/spr_p_name_bg/spr_p_name_bg.yy +++ b/sprites/spr_p_name_bg/spr_p_name_bg.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_p_name_bg", "bboxMode":0, "bbox_bottom":271, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"a11f2334-9852-4e7b-b697-8d03d2b129a2","name":"a11f2334-9852-4e7b-b697-8d03d2b129a2","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"a11f2334-9852-4e7b-b697-8d03d2b129a2","name":"a11f2334-9852-4e7b-b697-8d03d2b129a2","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"a11f2334-9852-4e7b-b697-8d03d2b129a2","path":"sprites/spr_p_name_bg/spr_p_name_bg.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"a5f223cb-8fe5-4bd4-bb65-4996f34d2fb3","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"a11f2334-9852-4e7b-b697-8d03d2b129a2","path":"sprites/spr_p_name_bg/spr_p_name_bg.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"a5f223cb-8fe5-4bd4-bb65-4996f34d2fb3","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_pa_arms/spr_pa_arms.yy b/sprites/spr_pa_arms/spr_pa_arms.yy index 0fa3e1b58d..b6845624d4 100644 --- a/sprites/spr_pa_arms/spr_pa_arms.yy +++ b/sprites/spr_pa_arms/spr_pa_arms.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_pa_arms", "bboxMode":0, "bbox_bottom":126, @@ -12,8 +12,8 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"c9be93fb-8a44-449a-9b86-8579b9a9f1b7","name":"c9be93fb-8a44-449a-9b86-8579b9a9f1b7","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"8a98a9c8-9d01-439b-8b0a-d66fba9e548d","name":"8a98a9c8-9d01-439b-8b0a-d66fba9e548d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"c9be93fb-8a44-449a-9b86-8579b9a9f1b7","name":"c9be93fb-8a44-449a-9b86-8579b9a9f1b7","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"8a98a9c8-9d01-439b-8b0a-d66fba9e548d","name":"8a98a9c8-9d01-439b-8b0a-d66fba9e548d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -72,12 +72,8 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"c9be93fb-8a44-449a-9b86-8579b9a9f1b7","path":"sprites/spr_pa_arms/spr_pa_arms.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"c707c1b9-a614-4238-989e-e486b4848dbf","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"8a98a9c8-9d01-439b-8b0a-d66fba9e548d","path":"sprites/spr_pa_arms/spr_pa_arms.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"d39f4531-dd1e-4b87-878a-c5d11affd31f","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"c9be93fb-8a44-449a-9b86-8579b9a9f1b7","path":"sprites/spr_pa_arms/spr_pa_arms.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"c707c1b9-a614-4238-989e-e486b4848dbf","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"8a98a9c8-9d01-439b-8b0a-d66fba9e548d","path":"sprites/spr_pa_arms/spr_pa_arms.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"d39f4531-dd1e-4b87-878a-c5d11affd31f","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_pa_arms_ornate/spr_pa_arms_ornate.yy b/sprites/spr_pa_arms_ornate/spr_pa_arms_ornate.yy index ec128d53f5..6f67fb6fcb 100644 --- a/sprites/spr_pa_arms_ornate/spr_pa_arms_ornate.yy +++ b/sprites/spr_pa_arms_ornate/spr_pa_arms_ornate.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_pa_arms_ornate", "bboxMode":0, "bbox_bottom":126, @@ -12,8 +12,8 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"c9be93fb-8a44-449a-9b86-8579b9a9f1b7","name":"c9be93fb-8a44-449a-9b86-8579b9a9f1b7","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"8a98a9c8-9d01-439b-8b0a-d66fba9e548d","name":"8a98a9c8-9d01-439b-8b0a-d66fba9e548d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"c9be93fb-8a44-449a-9b86-8579b9a9f1b7","name":"c9be93fb-8a44-449a-9b86-8579b9a9f1b7","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"8a98a9c8-9d01-439b-8b0a-d66fba9e548d","name":"8a98a9c8-9d01-439b-8b0a-d66fba9e548d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -70,12 +70,8 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"c9be93fb-8a44-449a-9b86-8579b9a9f1b7","path":"sprites/spr_pa_arms_ornate/spr_pa_arms_ornate.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"8363e074-6ccb-4eab-8cd5-9d0ea12c4e60","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"8a98a9c8-9d01-439b-8b0a-d66fba9e548d","path":"sprites/spr_pa_arms_ornate/spr_pa_arms_ornate.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"1728fb22-de3b-4c95-872c-cc9250da60e5","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"c9be93fb-8a44-449a-9b86-8579b9a9f1b7","path":"sprites/spr_pa_arms_ornate/spr_pa_arms_ornate.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"8363e074-6ccb-4eab-8cd5-9d0ea12c4e60","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"8a98a9c8-9d01-439b-8b0a-d66fba9e548d","path":"sprites/spr_pa_arms_ornate/spr_pa_arms_ornate.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"1728fb22-de3b-4c95-872c-cc9250da60e5","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_pa_hands/spr_pa_hands.yy b/sprites/spr_pa_hands/spr_pa_hands.yy index 6ccc6b749b..f34966c090 100644 --- a/sprites/spr_pa_hands/spr_pa_hands.yy +++ b/sprites/spr_pa_hands/spr_pa_hands.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_pa_hands", "bboxMode":0, "bbox_bottom":126, @@ -12,18 +12,18 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"b6827b9c-6f8a-4700-91e5-b7b0cf730f8a","name":"b6827b9c-6f8a-4700-91e5-b7b0cf730f8a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"6eff66f0-db00-47d5-b4be-d57184964002","name":"6eff66f0-db00-47d5-b4be-d57184964002","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"9dd4e8a9-3493-4422-8009-b60fa5153b4d","name":"9dd4e8a9-3493-4422-8009-b60fa5153b4d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"155b1984-8759-413d-8092-2796ab1a3a09","name":"155b1984-8759-413d-8092-2796ab1a3a09","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"20c640ed-d95e-40ec-bbda-7300bdb69b68","name":"20c640ed-d95e-40ec-bbda-7300bdb69b68","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"c85b1159-fa0f-48ec-93eb-753cf138faf3","name":"c85b1159-fa0f-48ec-93eb-753cf138faf3","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"50dac15c-77fd-4ed1-8285-b9ad17031b87","name":"50dac15c-77fd-4ed1-8285-b9ad17031b87","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"a35b258a-44c7-430f-99de-c54f836b592a","name":"a35b258a-44c7-430f-99de-c54f836b592a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"bbb28863-c4dc-4319-b68f-28f3eddb0958","name":"bbb28863-c4dc-4319-b68f-28f3eddb0958","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"9b630790-a06c-4a90-b3c5-720b7345b536","name":"9b630790-a06c-4a90-b3c5-720b7345b536","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"84bcd5f4-d5f6-4fab-a2ae-15204455599d","name":"84bcd5f4-d5f6-4fab-a2ae-15204455599d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"03fa6ac5-772e-4580-9e7e-3eaf30b21491","name":"03fa6ac5-772e-4580-9e7e-3eaf30b21491","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"b6827b9c-6f8a-4700-91e5-b7b0cf730f8a","name":"b6827b9c-6f8a-4700-91e5-b7b0cf730f8a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"6eff66f0-db00-47d5-b4be-d57184964002","name":"6eff66f0-db00-47d5-b4be-d57184964002","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"9dd4e8a9-3493-4422-8009-b60fa5153b4d","name":"9dd4e8a9-3493-4422-8009-b60fa5153b4d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"155b1984-8759-413d-8092-2796ab1a3a09","name":"155b1984-8759-413d-8092-2796ab1a3a09","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"20c640ed-d95e-40ec-bbda-7300bdb69b68","name":"20c640ed-d95e-40ec-bbda-7300bdb69b68","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"c85b1159-fa0f-48ec-93eb-753cf138faf3","name":"c85b1159-fa0f-48ec-93eb-753cf138faf3","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"50dac15c-77fd-4ed1-8285-b9ad17031b87","name":"50dac15c-77fd-4ed1-8285-b9ad17031b87","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"a35b258a-44c7-430f-99de-c54f836b592a","name":"a35b258a-44c7-430f-99de-c54f836b592a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"bbb28863-c4dc-4319-b68f-28f3eddb0958","name":"bbb28863-c4dc-4319-b68f-28f3eddb0958","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"9b630790-a06c-4a90-b3c5-720b7345b536","name":"9b630790-a06c-4a90-b3c5-720b7345b536","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"84bcd5f4-d5f6-4fab-a2ae-15204455599d","name":"84bcd5f4-d5f6-4fab-a2ae-15204455599d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"03fa6ac5-772e-4580-9e7e-3eaf30b21491","name":"03fa6ac5-772e-4580-9e7e-3eaf30b21491","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -81,42 +81,18 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"b6827b9c-6f8a-4700-91e5-b7b0cf730f8a","path":"sprites/spr_pa_hands/spr_pa_hands.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"c995ba96-5312-4067-ac4e-80e3f9a3cfe3","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"6eff66f0-db00-47d5-b4be-d57184964002","path":"sprites/spr_pa_hands/spr_pa_hands.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"036f006a-c105-4025-bfa6-f12fad434fba","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"9dd4e8a9-3493-4422-8009-b60fa5153b4d","path":"sprites/spr_pa_hands/spr_pa_hands.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"0f5500df-9a23-49bc-9bf9-acd7cb3706df","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"155b1984-8759-413d-8092-2796ab1a3a09","path":"sprites/spr_pa_hands/spr_pa_hands.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"64489bc4-4523-4692-af5f-6f1896df5dc9","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"20c640ed-d95e-40ec-bbda-7300bdb69b68","path":"sprites/spr_pa_hands/spr_pa_hands.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"6341f511-a84d-4e6c-85a2-8e2eb49d7a37","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"c85b1159-fa0f-48ec-93eb-753cf138faf3","path":"sprites/spr_pa_hands/spr_pa_hands.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"6c9f00a5-3395-42bb-8316-ad0c9dd02fe9","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"50dac15c-77fd-4ed1-8285-b9ad17031b87","path":"sprites/spr_pa_hands/spr_pa_hands.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"7e840d8a-dd19-4272-9d33-fd5aee23576d","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"a35b258a-44c7-430f-99de-c54f836b592a","path":"sprites/spr_pa_hands/spr_pa_hands.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"66a8a65b-7d54-4c68-987c-ddeef4b4946a","IsCreationKey":false,"Key":7.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"bbb28863-c4dc-4319-b68f-28f3eddb0958","path":"sprites/spr_pa_hands/spr_pa_hands.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"7e6b8980-b8a1-4a97-a7d0-a5c63705e814","IsCreationKey":false,"Key":8.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"9b630790-a06c-4a90-b3c5-720b7345b536","path":"sprites/spr_pa_hands/spr_pa_hands.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"3f8266ab-f08f-4789-bf17-d6bbc1172c5c","IsCreationKey":false,"Key":9.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"84bcd5f4-d5f6-4fab-a2ae-15204455599d","path":"sprites/spr_pa_hands/spr_pa_hands.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"d1c9d65e-2cea-414f-910a-6f8feea246d8","IsCreationKey":false,"Key":10.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"03fa6ac5-772e-4580-9e7e-3eaf30b21491","path":"sprites/spr_pa_hands/spr_pa_hands.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"0f31a737-8fc9-4606-9bf4-63ab1f940942","IsCreationKey":false,"Key":11.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"b6827b9c-6f8a-4700-91e5-b7b0cf730f8a","path":"sprites/spr_pa_hands/spr_pa_hands.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"c995ba96-5312-4067-ac4e-80e3f9a3cfe3","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"6eff66f0-db00-47d5-b4be-d57184964002","path":"sprites/spr_pa_hands/spr_pa_hands.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"036f006a-c105-4025-bfa6-f12fad434fba","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"9dd4e8a9-3493-4422-8009-b60fa5153b4d","path":"sprites/spr_pa_hands/spr_pa_hands.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"0f5500df-9a23-49bc-9bf9-acd7cb3706df","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"155b1984-8759-413d-8092-2796ab1a3a09","path":"sprites/spr_pa_hands/spr_pa_hands.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"64489bc4-4523-4692-af5f-6f1896df5dc9","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"20c640ed-d95e-40ec-bbda-7300bdb69b68","path":"sprites/spr_pa_hands/spr_pa_hands.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"6341f511-a84d-4e6c-85a2-8e2eb49d7a37","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"c85b1159-fa0f-48ec-93eb-753cf138faf3","path":"sprites/spr_pa_hands/spr_pa_hands.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"6c9f00a5-3395-42bb-8316-ad0c9dd02fe9","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"50dac15c-77fd-4ed1-8285-b9ad17031b87","path":"sprites/spr_pa_hands/spr_pa_hands.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"7e840d8a-dd19-4272-9d33-fd5aee23576d","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"a35b258a-44c7-430f-99de-c54f836b592a","path":"sprites/spr_pa_hands/spr_pa_hands.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"66a8a65b-7d54-4c68-987c-ddeef4b4946a","IsCreationKey":false,"Key":7.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"bbb28863-c4dc-4319-b68f-28f3eddb0958","path":"sprites/spr_pa_hands/spr_pa_hands.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"7e6b8980-b8a1-4a97-a7d0-a5c63705e814","IsCreationKey":false,"Key":8.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"9b630790-a06c-4a90-b3c5-720b7345b536","path":"sprites/spr_pa_hands/spr_pa_hands.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"3f8266ab-f08f-4789-bf17-d6bbc1172c5c","IsCreationKey":false,"Key":9.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"84bcd5f4-d5f6-4fab-a2ae-15204455599d","path":"sprites/spr_pa_hands/spr_pa_hands.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"d1c9d65e-2cea-414f-910a-6f8feea246d8","IsCreationKey":false,"Key":10.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"03fa6ac5-772e-4580-9e7e-3eaf30b21491","path":"sprites/spr_pa_hands/spr_pa_hands.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"0f31a737-8fc9-4606-9bf4-63ab1f940942","IsCreationKey":false,"Key":11.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_arm/spr_pack_arm.yy b/sprites/spr_pack_arm/spr_pack_arm.yy index 8161899e76..bb52801509 100644 --- a/sprites/spr_pack_arm/spr_pack_arm.yy +++ b/sprites/spr_pack_arm/spr_pack_arm.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_pack_arm", "bboxMode":0, "bbox_bottom":206, @@ -12,8 +12,8 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"84b91922-cc04-47fc-989c-1f57e3b1fafe","name":"84b91922-cc04-47fc-989c-1f57e3b1fafe","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"248cf0d9-174e-4863-8f84-e32382a7c773","name":"248cf0d9-174e-4863-8f84-e32382a7c773","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"84b91922-cc04-47fc-989c-1f57e3b1fafe","name":"84b91922-cc04-47fc-989c-1f57e3b1fafe","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"248cf0d9-174e-4863-8f84-e32382a7c773","name":"248cf0d9-174e-4863-8f84-e32382a7c773","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -69,12 +69,8 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"84b91922-cc04-47fc-989c-1f57e3b1fafe","path":"sprites/spr_pack_arm/spr_pack_arm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"878757e1-ecdc-4262-9fac-0cd2cc896318","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"248cf0d9-174e-4863-8f84-e32382a7c773","path":"sprites/spr_pack_arm/spr_pack_arm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"99c18d6d-89c3-455b-be9f-a6f49f0864d4","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"84b91922-cc04-47fc-989c-1f57e3b1fafe","path":"sprites/spr_pack_arm/spr_pack_arm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"878757e1-ecdc-4262-9fac-0cd2cc896318","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"248cf0d9-174e-4863-8f84-e32382a7c773","path":"sprites/spr_pack_arm/spr_pack_arm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"99c18d6d-89c3-455b-be9f-a6f49f0864d4","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":{ diff --git a/sprites/spr_pack_arms/spr_pack_arms.yy b/sprites/spr_pack_arms/spr_pack_arms.yy index 70b7f6b02b..d693a5ec27 100644 --- a/sprites/spr_pack_arms/spr_pack_arms.yy +++ b/sprites/spr_pack_arms/spr_pack_arms.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_pack_arms", "bboxMode":0, "bbox_bottom":206, @@ -12,9 +12,9 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"0a62add5-b009-4050-ad6b-642b81efdcee","name":"0a62add5-b009-4050-ad6b-642b81efdcee","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"bd9433c3-b178-4b5e-80c1-0f0daa3c9f1e","name":"bd9433c3-b178-4b5e-80c1-0f0daa3c9f1e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"dce20ba2-abbe-43c0-b5a2-22334ddd6fc7","name":"dce20ba2-abbe-43c0-b5a2-22334ddd6fc7","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"0a62add5-b009-4050-ad6b-642b81efdcee","name":"0a62add5-b009-4050-ad6b-642b81efdcee","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"bd9433c3-b178-4b5e-80c1-0f0daa3c9f1e","name":"bd9433c3-b178-4b5e-80c1-0f0daa3c9f1e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"dce20ba2-abbe-43c0-b5a2-22334ddd6fc7","name":"dce20ba2-abbe-43c0-b5a2-22334ddd6fc7","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -70,15 +70,9 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"0a62add5-b009-4050-ad6b-642b81efdcee","path":"sprites/spr_pack_arms/spr_pack_arms.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"1789541c-4533-4609-a018-a82ef1b709a0","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"bd9433c3-b178-4b5e-80c1-0f0daa3c9f1e","path":"sprites/spr_pack_arms/spr_pack_arms.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"2450620f-c70f-4df1-b4f4-bf7ea3682c22","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"dce20ba2-abbe-43c0-b5a2-22334ddd6fc7","path":"sprites/spr_pack_arms/spr_pack_arms.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"961fb051-1332-4540-9c9c-b86c69a2d34a","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"0a62add5-b009-4050-ad6b-642b81efdcee","path":"sprites/spr_pack_arms/spr_pack_arms.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"1789541c-4533-4609-a018-a82ef1b709a0","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"bd9433c3-b178-4b5e-80c1-0f0daa3c9f1e","path":"sprites/spr_pack_arms/spr_pack_arms.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"2450620f-c70f-4df1-b4f4-bf7ea3682c22","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"dce20ba2-abbe-43c0-b5a2-22334ddd6fc7","path":"sprites/spr_pack_arms/spr_pack_arms.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"961fb051-1332-4540-9c9c-b86c69a2d34a","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_brazier/spr_pack_brazier.yy b/sprites/spr_pack_brazier/spr_pack_brazier.yy index 3345415fa4..0efe887f30 100644 --- a/sprites/spr_pack_brazier/spr_pack_brazier.yy +++ b/sprites/spr_pack_brazier/spr_pack_brazier.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_pack_brazier", "bboxMode":0, "bbox_bottom":53, @@ -12,9 +12,9 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"3368318c-d87a-46c2-891b-f8d5cebbf275","name":"3368318c-d87a-46c2-891b-f8d5cebbf275","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"4dbb61b5-014b-49c6-90e2-0a89427c2fb6","name":"4dbb61b5-014b-49c6-90e2-0a89427c2fb6","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"fdac9a6c-2f3a-44f5-babc-322180e5b74a","name":"fdac9a6c-2f3a-44f5-babc-322180e5b74a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"3368318c-d87a-46c2-891b-f8d5cebbf275","name":"3368318c-d87a-46c2-891b-f8d5cebbf275","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"4dbb61b5-014b-49c6-90e2-0a89427c2fb6","name":"4dbb61b5-014b-49c6-90e2-0a89427c2fb6","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"fdac9a6c-2f3a-44f5-babc-322180e5b74a","name":"fdac9a6c-2f3a-44f5-babc-322180e5b74a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -70,15 +70,9 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"3368318c-d87a-46c2-891b-f8d5cebbf275","path":"sprites/spr_pack_brazier/spr_pack_brazier.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"3a56ce07-8e61-4c45-b30f-8fdfa4e44d2d","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"4dbb61b5-014b-49c6-90e2-0a89427c2fb6","path":"sprites/spr_pack_brazier/spr_pack_brazier.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"9565c920-28b4-410e-9be7-a89088b5b95c","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"fdac9a6c-2f3a-44f5-babc-322180e5b74a","path":"sprites/spr_pack_brazier/spr_pack_brazier.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"7bf2e48d-0846-455b-ab62-0f5943650061","IsCreationKey":false,"Key":2.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_brazier/spr_pack_brazier.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"3a56ce07-8e61-4c45-b30f-8fdfa4e44d2d","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"4dbb61b5-014b-49c6-90e2-0a89427c2fb6","path":"sprites/spr_pack_brazier/spr_pack_brazier.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"9565c920-28b4-410e-9be7-a89088b5b95c","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"fdac9a6c-2f3a-44f5-babc-322180e5b74a","path":"sprites/spr_pack_brazier/spr_pack_brazier.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"7bf2e48d-0846-455b-ab62-0f5943650061","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_brazier2/spr_pack_brazier2.yy b/sprites/spr_pack_brazier2/spr_pack_brazier2.yy index 530902bffa..5094b04a85 100644 --- a/sprites/spr_pack_brazier2/spr_pack_brazier2.yy +++ b/sprites/spr_pack_brazier2/spr_pack_brazier2.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_pack_brazier2", "bboxMode":0, "bbox_bottom":97, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"3368318c-d87a-46c2-891b-f8d5cebbf275","name":"3368318c-d87a-46c2-891b-f8d5cebbf275","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, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"3368318c-d87a-46c2-891b-f8d5cebbf275","path":"sprites/spr_pack_brazier2/spr_pack_brazier2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"41a45b27-c017-44df-9857-968f0d783204","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_brazier2/spr_pack_brazier2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"41a45b27-c017-44df-9857-968f0d783204","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_pack_brazier3/spr_pack_brazier3.yy b/sprites/spr_pack_brazier3/spr_pack_brazier3.yy index c87e3aa5bd..761348fb9e 100644 --- a/sprites/spr_pack_brazier3/spr_pack_brazier3.yy +++ b/sprites/spr_pack_brazier3/spr_pack_brazier3.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_pack_brazier3", "bboxMode":0, "bbox_bottom":99, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"3368318c-d87a-46c2-891b-f8d5cebbf275","name":"3368318c-d87a-46c2-891b-f8d5cebbf275","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, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$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,}, + {"$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,}, ],"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_devastator/spr_pack_devastator.yy b/sprites/spr_pack_devastator/spr_pack_devastator.yy index 66fb610765..d38a1c7292 100644 --- a/sprites/spr_pack_devastator/spr_pack_devastator.yy +++ b/sprites/spr_pack_devastator/spr_pack_devastator.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_pack_devastator", "bboxMode":0, "bbox_bottom":37, @@ -12,9 +12,9 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"e5637504-add9-474b-ae10-1e954d497810","name":"e5637504-add9-474b-ae10-1e954d497810","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"979ae0e5-f063-4c2b-a97a-acb0b32a860f","name":"979ae0e5-f063-4c2b-a97a-acb0b32a860f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"b1e913d3-e6e0-41c1-9cdd-2e2fb3b41530","name":"b1e913d3-e6e0-41c1-9cdd-2e2fb3b41530","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"e5637504-add9-474b-ae10-1e954d497810","name":"e5637504-add9-474b-ae10-1e954d497810","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"979ae0e5-f063-4c2b-a97a-acb0b32a860f","name":"979ae0e5-f063-4c2b-a97a-acb0b32a860f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"b1e913d3-e6e0-41c1-9cdd-2e2fb3b41530","name":"b1e913d3-e6e0-41c1-9cdd-2e2fb3b41530","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -70,15 +70,9 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"e5637504-add9-474b-ae10-1e954d497810","path":"sprites/spr_pack_devastator/spr_pack_devastator.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"6ab86151-8a87-45d0-9c06-4741f1b23ffd","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"979ae0e5-f063-4c2b-a97a-acb0b32a860f","path":"sprites/spr_pack_devastator/spr_pack_devastator.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"25804a20-d9f7-4f58-aede-581f282f1199","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"b1e913d3-e6e0-41c1-9cdd-2e2fb3b41530","path":"sprites/spr_pack_devastator/spr_pack_devastator.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"a2d952f8-77b2-4fde-92ee-dce364d06519","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"e5637504-add9-474b-ae10-1e954d497810","path":"sprites/spr_pack_devastator/spr_pack_devastator.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"6ab86151-8a87-45d0-9c06-4741f1b23ffd","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"979ae0e5-f063-4c2b-a97a-acb0b32a860f","path":"sprites/spr_pack_devastator/spr_pack_devastator.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"25804a20-d9f7-4f58-aede-581f282f1199","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"b1e913d3-e6e0-41c1-9cdd-2e2fb3b41530","path":"sprites/spr_pack_devastator/spr_pack_devastator.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"a2d952f8-77b2-4fde-92ee-dce364d06519","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_jump/spr_pack_jump.yy b/sprites/spr_pack_jump/spr_pack_jump.yy index c8144980c9..408b8188f3 100644 --- a/sprites/spr_pack_jump/spr_pack_jump.yy +++ b/sprites/spr_pack_jump/spr_pack_jump.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_pack_jump", "bboxMode":0, "bbox_bottom":77, @@ -12,9 +12,9 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"c5bc43cd-b567-4673-92b9-efede7a0b44f","name":"c5bc43cd-b567-4673-92b9-efede7a0b44f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"f9fc03b0-0d35-4e00-b5c9-7c857679e38b","name":"f9fc03b0-0d35-4e00-b5c9-7c857679e38b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"777ae2eb-75f6-4a1f-8633-057327b9a258","name":"777ae2eb-75f6-4a1f-8633-057327b9a258","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"c5bc43cd-b567-4673-92b9-efede7a0b44f","name":"c5bc43cd-b567-4673-92b9-efede7a0b44f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"f9fc03b0-0d35-4e00-b5c9-7c857679e38b","name":"f9fc03b0-0d35-4e00-b5c9-7c857679e38b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"777ae2eb-75f6-4a1f-8633-057327b9a258","name":"777ae2eb-75f6-4a1f-8633-057327b9a258","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -70,15 +70,9 @@ "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_pack_jump/spr_pack_jump.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"232f2f80-aef0-425c-91c6-b057a1e4eab0","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"f9fc03b0-0d35-4e00-b5c9-7c857679e38b","path":"sprites/spr_pack_jump/spr_pack_jump.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"fb16272d-2add-47a5-895f-f9827024011d","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"777ae2eb-75f6-4a1f-8633-057327b9a258","path":"sprites/spr_pack_jump/spr_pack_jump.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"02d8ecc3-ce99-4de6-a06b-f69ff1bfe13e","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"c5bc43cd-b567-4673-92b9-efede7a0b44f","path":"sprites/spr_pack_jump/spr_pack_jump.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"232f2f80-aef0-425c-91c6-b057a1e4eab0","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"f9fc03b0-0d35-4e00-b5c9-7c857679e38b","path":"sprites/spr_pack_jump/spr_pack_jump.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"fb16272d-2add-47a5-895f-f9827024011d","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"777ae2eb-75f6-4a1f-8633-057327b9a258","path":"sprites/spr_pack_jump/spr_pack_jump.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"02d8ecc3-ce99-4de6-a06b-f69ff1bfe13e","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_pauldron_spikes_left/spr_pauldron_spikes_left.yy b/sprites/spr_pauldron_spikes_left/spr_pauldron_spikes_left.yy index 0cdb31f36c..098bc42341 100644 --- a/sprites/spr_pauldron_spikes_left/spr_pauldron_spikes_left.yy +++ b/sprites/spr_pauldron_spikes_left/spr_pauldron_spikes_left.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_pauldron_spikes_left", "bboxMode":0, "bbox_bottom":75, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"7fc53778-12a4-4b34-8591-e40108986c71","name":"7fc53778-12a4-4b34-8591-e40108986c71","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"7fc53778-12a4-4b34-8591-e40108986c71","name":"7fc53778-12a4-4b34-8591-e40108986c71","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -70,9 +70,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"7fc53778-12a4-4b34-8591-e40108986c71","path":"sprites/spr_pauldron_spikes_left/spr_pauldron_spikes_left.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"c1dca78a-a6a8-48f4-9199-bb30337ec2be","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"7fc53778-12a4-4b34-8591-e40108986c71","path":"sprites/spr_pauldron_spikes_left/spr_pauldron_spikes_left.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"c1dca78a-a6a8-48f4-9199-bb30337ec2be","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_pauldron_spikes_right/spr_pauldron_spikes_right.yy b/sprites/spr_pauldron_spikes_right/spr_pauldron_spikes_right.yy index 989232794e..c750d16d5d 100644 --- a/sprites/spr_pauldron_spikes_right/spr_pauldron_spikes_right.yy +++ b/sprites/spr_pauldron_spikes_right/spr_pauldron_spikes_right.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_pauldron_spikes_right", "bboxMode":0, "bbox_bottom":75, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"48f72680-cb96-4361-9276-5e8d8552ae9f","name":"48f72680-cb96-4361-9276-5e8d8552ae9f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"48f72680-cb96-4361-9276-5e8d8552ae9f","name":"48f72680-cb96-4361-9276-5e8d8552ae9f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -70,9 +70,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"48f72680-cb96-4361-9276-5e8d8552ae9f","path":"sprites/spr_pauldron_spikes_right/spr_pauldron_spikes_right.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"34a5702d-932b-4320-bbce-57b6f082d8a3","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"48f72680-cb96-4361-9276-5e8d8552ae9f","path":"sprites/spr_pauldron_spikes_right/spr_pauldron_spikes_right.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"34a5702d-932b-4320-bbce-57b6f082d8a3","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_penitent_ui/spr_penitent_ui.yy b/sprites/spr_penitent_ui/spr_penitent_ui.yy index a1d1740000..d80ed92237 100644 --- a/sprites/spr_penitent_ui/spr_penitent_ui.yy +++ b/sprites/spr_penitent_ui/spr_penitent_ui.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_penitent_ui", "bboxMode":0, "bbox_bottom":24, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"ce5f6285-54f8-4aef-8e6f-596e2e822426","name":"ce5f6285-54f8-4aef-8e6f-596e2e822426","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"ce5f6285-54f8-4aef-8e6f-596e2e822426","name":"ce5f6285-54f8-4aef-8e6f-596e2e822426","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"ce5f6285-54f8-4aef-8e6f-596e2e822426","path":"sprites/spr_penitent_ui/spr_penitent_ui.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"e43885ff-f49c-42e0-9d0c-cfc22ce51284","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"ce5f6285-54f8-4aef-8e6f-596e2e822426","path":"sprites/spr_penitent_ui/spr_penitent_ui.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"e43885ff-f49c-42e0-9d0c-cfc22ce51284","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":{ diff --git a/sprites/spr_pixel_button_left/spr_pixel_button_left.yy b/sprites/spr_pixel_button_left/spr_pixel_button_left.yy index 0c9bb360ee..51dd8a856d 100644 --- a/sprites/spr_pixel_button_left/spr_pixel_button_left.yy +++ b/sprites/spr_pixel_button_left/spr_pixel_button_left.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_pixel_button_left", "bboxMode":0, "bbox_bottom":27, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"8a326ff2-8fec-4031-abef-2b299f66f9b0","name":"8a326ff2-8fec-4031-abef-2b299f66f9b0","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"8a326ff2-8fec-4031-abef-2b299f66f9b0","name":"8a326ff2-8fec-4031-abef-2b299f66f9b0","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"8a326ff2-8fec-4031-abef-2b299f66f9b0","path":"sprites/spr_pixel_button_left/spr_pixel_button_left.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"c35b10b1-5374-4d18-bff9-7373fd5c1c8d","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"8a326ff2-8fec-4031-abef-2b299f66f9b0","path":"sprites/spr_pixel_button_left/spr_pixel_button_left.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"c35b10b1-5374-4d18-bff9-7373fd5c1c8d","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_pixel_button_middle/spr_pixel_button_middle.yy b/sprites/spr_pixel_button_middle/spr_pixel_button_middle.yy index 47f39abccc..583ac2fb85 100644 --- a/sprites/spr_pixel_button_middle/spr_pixel_button_middle.yy +++ b/sprites/spr_pixel_button_middle/spr_pixel_button_middle.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_pixel_button_middle", "bboxMode":0, "bbox_bottom":27, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"7ab35a5d-4138-4cd7-a5ce-654faab31f81","name":"7ab35a5d-4138-4cd7-a5ce-654faab31f81","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"7ab35a5d-4138-4cd7-a5ce-654faab31f81","name":"7ab35a5d-4138-4cd7-a5ce-654faab31f81","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"7ab35a5d-4138-4cd7-a5ce-654faab31f81","path":"sprites/spr_pixel_button_middle/spr_pixel_button_middle.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"0b9d0197-8c88-4a7d-908c-67e942c40821","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"7ab35a5d-4138-4cd7-a5ce-654faab31f81","path":"sprites/spr_pixel_button_middle/spr_pixel_button_middle.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"0b9d0197-8c88-4a7d-908c-67e942c40821","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_pixel_button_right/spr_pixel_button_right.yy b/sprites/spr_pixel_button_right/spr_pixel_button_right.yy index 9b86f78d93..37b0751f74 100644 --- a/sprites/spr_pixel_button_right/spr_pixel_button_right.yy +++ b/sprites/spr_pixel_button_right/spr_pixel_button_right.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_pixel_button_right", "bboxMode":0, "bbox_bottom":27, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"531933e7-b10e-42c4-96fd-7b6aaf423b29","name":"531933e7-b10e-42c4-96fd-7b6aaf423b29","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"531933e7-b10e-42c4-96fd-7b6aaf423b29","name":"531933e7-b10e-42c4-96fd-7b6aaf423b29","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"531933e7-b10e-42c4-96fd-7b6aaf423b29","path":"sprites/spr_pixel_button_right/spr_pixel_button_right.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"bb32a9c7-a6e7-47d3-86a8-a0bc2d995ce5","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"531933e7-b10e-42c4-96fd-7b6aaf423b29","path":"sprites/spr_pixel_button_right/spr_pixel_button_right.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"bb32a9c7-a6e7-47d3-86a8-a0bc2d995ce5","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_planet_screen/spr_planet_screen.yy b/sprites/spr_planet_screen/spr_planet_screen.yy index e30d03ad29..f3749893eb 100644 --- a/sprites/spr_planet_screen/spr_planet_screen.yy +++ b/sprites/spr_planet_screen/spr_planet_screen.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_planet_screen", "bboxMode":0, "bbox_bottom":293, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"1086920f-108b-4fc6-93c0-e148bf438fe6","name":"1086920f-108b-4fc6-93c0-e148bf438fe6","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"1086920f-108b-4fc6-93c0-e148bf438fe6","name":"1086920f-108b-4fc6-93c0-e148bf438fe6","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"1086920f-108b-4fc6-93c0-e148bf438fe6","path":"sprites/spr_planet_screen/spr_planet_screen.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"73a40a92-c3a3-4dbc-9c6c-7be898649750","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"1086920f-108b-4fc6-93c0-e148bf438fe6","path":"sprites/spr_planet_screen/spr_planet_screen.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"73a40a92-c3a3-4dbc-9c6c-7be898649750","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_planet_splash/spr_planet_splash.yy b/sprites/spr_planet_splash/spr_planet_splash.yy index 9bb728b71e..be9af08d9d 100644 --- a/sprites/spr_planet_splash/spr_planet_splash.yy +++ b/sprites/spr_planet_splash/spr_planet_splash.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_planet_splash", "bboxMode":0, "bbox_bottom":0, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"2c9150bc-4398-4602-912c-ca4949edb320","name":"2c9150bc-4398-4602-912c-ca4949edb320","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"2c9150bc-4398-4602-912c-ca4949edb320","name":"2c9150bc-4398-4602-912c-ca4949edb320","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "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_planets/spr_planets.yy b/sprites/spr_planets/spr_planets.yy index de312cb614..cf32396d66 100644 --- a/sprites/spr_planets/spr_planets.yy +++ b/sprites/spr_planets/spr_planets.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_planets", "bboxMode":0, "bbox_bottom":31, @@ -12,27 +12,27 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"181a775a-4952-48db-90d2-1b3fef4cae06","name":"181a775a-4952-48db-90d2-1b3fef4cae06","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"7dc545d7-cb74-455f-9122-a8de598730d7","name":"7dc545d7-cb74-455f-9122-a8de598730d7","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"99571177-9e49-4765-861d-b8f711717ce2","name":"99571177-9e49-4765-861d-b8f711717ce2","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"1edf8291-4dc4-4034-a324-4a803e5b4d20","name":"1edf8291-4dc4-4034-a324-4a803e5b4d20","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"f773ac73-a560-46d1-9dc8-426c4bbda42f","name":"f773ac73-a560-46d1-9dc8-426c4bbda42f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"b9e90a7c-1810-4687-95d1-8926bdc06e4b","name":"b9e90a7c-1810-4687-95d1-8926bdc06e4b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"408c6368-40f2-4d72-80af-2a1756e36642","name":"408c6368-40f2-4d72-80af-2a1756e36642","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"cf6c06a0-35df-418d-ac85-45ac5b8e285f","name":"cf6c06a0-35df-418d-ac85-45ac5b8e285f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"7ba9fde6-e959-4a4d-a2d2-1ddcf7dba119","name":"7ba9fde6-e959-4a4d-a2d2-1ddcf7dba119","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"eeab9bc1-ad30-4ec0-bdba-2dca30f6f4c2","name":"eeab9bc1-ad30-4ec0-bdba-2dca30f6f4c2","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"f1e8ceb4-44fa-4951-9dc0-0fb91768ff96","name":"f1e8ceb4-44fa-4951-9dc0-0fb91768ff96","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"c8cf5a99-d524-4ed0-8254-1c520010e5b8","name":"c8cf5a99-d524-4ed0-8254-1c520010e5b8","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"2388d2cb-3c3c-4725-850a-aa27c32fd293","name":"2388d2cb-3c3c-4725-850a-aa27c32fd293","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"8615a206-0f18-4722-a4ae-4899f089587c","name":"8615a206-0f18-4722-a4ae-4899f089587c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"d60044a0-af82-4fb3-8e49-bb6520e52808","name":"d60044a0-af82-4fb3-8e49-bb6520e52808","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"93d1aa32-eb20-4c29-98f8-d59acf8219b2","name":"93d1aa32-eb20-4c29-98f8-d59acf8219b2","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"ac0155df-72bd-4471-a1a3-f61e07a66d83","name":"ac0155df-72bd-4471-a1a3-f61e07a66d83","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"fb8ebd46-efd0-493e-bd15-4d22c3f8fab5","name":"fb8ebd46-efd0-493e-bd15-4d22c3f8fab5","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"62040f87-514e-47c8-9541-112685e3f530","name":"62040f87-514e-47c8-9541-112685e3f530","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"d5a3104e-ba0b-496f-8dc6-40b44fe501f6","name":"d5a3104e-ba0b-496f-8dc6-40b44fe501f6","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"adc60ca3-cfe9-46f9-afc1-870909f094e5","name":"adc60ca3-cfe9-46f9-afc1-870909f094e5","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"181a775a-4952-48db-90d2-1b3fef4cae06","name":"181a775a-4952-48db-90d2-1b3fef4cae06","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"7dc545d7-cb74-455f-9122-a8de598730d7","name":"7dc545d7-cb74-455f-9122-a8de598730d7","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"99571177-9e49-4765-861d-b8f711717ce2","name":"99571177-9e49-4765-861d-b8f711717ce2","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"1edf8291-4dc4-4034-a324-4a803e5b4d20","name":"1edf8291-4dc4-4034-a324-4a803e5b4d20","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"f773ac73-a560-46d1-9dc8-426c4bbda42f","name":"f773ac73-a560-46d1-9dc8-426c4bbda42f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"b9e90a7c-1810-4687-95d1-8926bdc06e4b","name":"b9e90a7c-1810-4687-95d1-8926bdc06e4b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"408c6368-40f2-4d72-80af-2a1756e36642","name":"408c6368-40f2-4d72-80af-2a1756e36642","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"cf6c06a0-35df-418d-ac85-45ac5b8e285f","name":"cf6c06a0-35df-418d-ac85-45ac5b8e285f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"7ba9fde6-e959-4a4d-a2d2-1ddcf7dba119","name":"7ba9fde6-e959-4a4d-a2d2-1ddcf7dba119","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"eeab9bc1-ad30-4ec0-bdba-2dca30f6f4c2","name":"eeab9bc1-ad30-4ec0-bdba-2dca30f6f4c2","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"f1e8ceb4-44fa-4951-9dc0-0fb91768ff96","name":"f1e8ceb4-44fa-4951-9dc0-0fb91768ff96","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"c8cf5a99-d524-4ed0-8254-1c520010e5b8","name":"c8cf5a99-d524-4ed0-8254-1c520010e5b8","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"2388d2cb-3c3c-4725-850a-aa27c32fd293","name":"2388d2cb-3c3c-4725-850a-aa27c32fd293","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"8615a206-0f18-4722-a4ae-4899f089587c","name":"8615a206-0f18-4722-a4ae-4899f089587c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"d60044a0-af82-4fb3-8e49-bb6520e52808","name":"d60044a0-af82-4fb3-8e49-bb6520e52808","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"93d1aa32-eb20-4c29-98f8-d59acf8219b2","name":"93d1aa32-eb20-4c29-98f8-d59acf8219b2","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"ac0155df-72bd-4471-a1a3-f61e07a66d83","name":"ac0155df-72bd-4471-a1a3-f61e07a66d83","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"fb8ebd46-efd0-493e-bd15-4d22c3f8fab5","name":"fb8ebd46-efd0-493e-bd15-4d22c3f8fab5","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"62040f87-514e-47c8-9541-112685e3f530","name":"62040f87-514e-47c8-9541-112685e3f530","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"d5a3104e-ba0b-496f-8dc6-40b44fe501f6","name":"d5a3104e-ba0b-496f-8dc6-40b44fe501f6","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"adc60ca3-cfe9-46f9-afc1-870909f094e5","name":"adc60ca3-cfe9-46f9-afc1-870909f094e5","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -88,69 +88,27 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"181a775a-4952-48db-90d2-1b3fef4cae06","path":"sprites/spr_planets/spr_planets.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"3d9dacf7-ad8b-4edf-bfd0-624027251d40","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"7dc545d7-cb74-455f-9122-a8de598730d7","path":"sprites/spr_planets/spr_planets.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"d03183c7-6624-4a7a-bbca-e0cc0c0c09f6","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"99571177-9e49-4765-861d-b8f711717ce2","path":"sprites/spr_planets/spr_planets.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"69a15a91-fcc1-4f28-a65e-e166b5751a52","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"1edf8291-4dc4-4034-a324-4a803e5b4d20","path":"sprites/spr_planets/spr_planets.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"395570ba-a096-4896-a1c4-7b7d90e9b1b1","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"f773ac73-a560-46d1-9dc8-426c4bbda42f","path":"sprites/spr_planets/spr_planets.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"f63676b1-5f8d-4ea3-9cb4-09f84bc95b5c","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"b9e90a7c-1810-4687-95d1-8926bdc06e4b","path":"sprites/spr_planets/spr_planets.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"a4d5e6c7-2b5a-431a-9e47-5c843d58a1ff","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"408c6368-40f2-4d72-80af-2a1756e36642","path":"sprites/spr_planets/spr_planets.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"c30d912d-4df4-404a-b38f-ce8dda5d458d","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"cf6c06a0-35df-418d-ac85-45ac5b8e285f","path":"sprites/spr_planets/spr_planets.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"d4155acf-3e82-4cb2-92c7-10316d0ee9c3","IsCreationKey":false,"Key":7.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"7ba9fde6-e959-4a4d-a2d2-1ddcf7dba119","path":"sprites/spr_planets/spr_planets.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"3ae654d1-25d9-4269-940b-e1e7fc72d625","IsCreationKey":false,"Key":8.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"eeab9bc1-ad30-4ec0-bdba-2dca30f6f4c2","path":"sprites/spr_planets/spr_planets.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"de5bffaf-c831-43d4-9b48-89a5618b09ac","IsCreationKey":false,"Key":9.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"f1e8ceb4-44fa-4951-9dc0-0fb91768ff96","path":"sprites/spr_planets/spr_planets.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"1dbfd5f7-fe0f-494c-b4fa-3de37ffaa8be","IsCreationKey":false,"Key":10.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"c8cf5a99-d524-4ed0-8254-1c520010e5b8","path":"sprites/spr_planets/spr_planets.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"b56335f0-c594-468c-b9cf-257a4f546fa0","IsCreationKey":false,"Key":11.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"2388d2cb-3c3c-4725-850a-aa27c32fd293","path":"sprites/spr_planets/spr_planets.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"bed3a042-e251-4d6e-89e6-5e544dcb1ff6","IsCreationKey":false,"Key":12.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"8615a206-0f18-4722-a4ae-4899f089587c","path":"sprites/spr_planets/spr_planets.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"3524370c-3828-4c5f-8dec-dd6c226c217c","IsCreationKey":false,"Key":13.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"d60044a0-af82-4fb3-8e49-bb6520e52808","path":"sprites/spr_planets/spr_planets.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"325d6ae0-a21f-4350-9c1c-3af98ab3c0cd","IsCreationKey":false,"Key":14.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"93d1aa32-eb20-4c29-98f8-d59acf8219b2","path":"sprites/spr_planets/spr_planets.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"0bb71ca1-af6d-4ae9-8614-22ebf352e3c9","IsCreationKey":false,"Key":15.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"ac0155df-72bd-4471-a1a3-f61e07a66d83","path":"sprites/spr_planets/spr_planets.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"78125f44-1c11-47ad-85ff-c496612e6b2c","IsCreationKey":false,"Key":16.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"fb8ebd46-efd0-493e-bd15-4d22c3f8fab5","path":"sprites/spr_planets/spr_planets.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"e7f41fba-0333-4687-b256-a1d38f6896d4","IsCreationKey":false,"Key":17.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"62040f87-514e-47c8-9541-112685e3f530","path":"sprites/spr_planets/spr_planets.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"211e6999-babe-483d-8c39-1b83087d41bf","IsCreationKey":false,"Key":18.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"d5a3104e-ba0b-496f-8dc6-40b44fe501f6","path":"sprites/spr_planets/spr_planets.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"a7a141fe-5907-401c-881a-37f7ae9f2f8d","IsCreationKey":false,"Key":19.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"adc60ca3-cfe9-46f9-afc1-870909f094e5","path":"sprites/spr_planets/spr_planets.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"edfb3906-d795-4658-8ef4-e1065bbaf111","IsCreationKey":false,"Key":20.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"181a775a-4952-48db-90d2-1b3fef4cae06","path":"sprites/spr_planets/spr_planets.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"3d9dacf7-ad8b-4edf-bfd0-624027251d40","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"7dc545d7-cb74-455f-9122-a8de598730d7","path":"sprites/spr_planets/spr_planets.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"d03183c7-6624-4a7a-bbca-e0cc0c0c09f6","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"99571177-9e49-4765-861d-b8f711717ce2","path":"sprites/spr_planets/spr_planets.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"69a15a91-fcc1-4f28-a65e-e166b5751a52","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"1edf8291-4dc4-4034-a324-4a803e5b4d20","path":"sprites/spr_planets/spr_planets.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"395570ba-a096-4896-a1c4-7b7d90e9b1b1","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"f773ac73-a560-46d1-9dc8-426c4bbda42f","path":"sprites/spr_planets/spr_planets.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"f63676b1-5f8d-4ea3-9cb4-09f84bc95b5c","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"b9e90a7c-1810-4687-95d1-8926bdc06e4b","path":"sprites/spr_planets/spr_planets.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"a4d5e6c7-2b5a-431a-9e47-5c843d58a1ff","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"408c6368-40f2-4d72-80af-2a1756e36642","path":"sprites/spr_planets/spr_planets.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"c30d912d-4df4-404a-b38f-ce8dda5d458d","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"cf6c06a0-35df-418d-ac85-45ac5b8e285f","path":"sprites/spr_planets/spr_planets.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"d4155acf-3e82-4cb2-92c7-10316d0ee9c3","IsCreationKey":false,"Key":7.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"7ba9fde6-e959-4a4d-a2d2-1ddcf7dba119","path":"sprites/spr_planets/spr_planets.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"3ae654d1-25d9-4269-940b-e1e7fc72d625","IsCreationKey":false,"Key":8.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"eeab9bc1-ad30-4ec0-bdba-2dca30f6f4c2","path":"sprites/spr_planets/spr_planets.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"de5bffaf-c831-43d4-9b48-89a5618b09ac","IsCreationKey":false,"Key":9.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"f1e8ceb4-44fa-4951-9dc0-0fb91768ff96","path":"sprites/spr_planets/spr_planets.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"1dbfd5f7-fe0f-494c-b4fa-3de37ffaa8be","IsCreationKey":false,"Key":10.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"c8cf5a99-d524-4ed0-8254-1c520010e5b8","path":"sprites/spr_planets/spr_planets.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"b56335f0-c594-468c-b9cf-257a4f546fa0","IsCreationKey":false,"Key":11.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"2388d2cb-3c3c-4725-850a-aa27c32fd293","path":"sprites/spr_planets/spr_planets.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"bed3a042-e251-4d6e-89e6-5e544dcb1ff6","IsCreationKey":false,"Key":12.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"8615a206-0f18-4722-a4ae-4899f089587c","path":"sprites/spr_planets/spr_planets.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"3524370c-3828-4c5f-8dec-dd6c226c217c","IsCreationKey":false,"Key":13.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"d60044a0-af82-4fb3-8e49-bb6520e52808","path":"sprites/spr_planets/spr_planets.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"325d6ae0-a21f-4350-9c1c-3af98ab3c0cd","IsCreationKey":false,"Key":14.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"93d1aa32-eb20-4c29-98f8-d59acf8219b2","path":"sprites/spr_planets/spr_planets.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"0bb71ca1-af6d-4ae9-8614-22ebf352e3c9","IsCreationKey":false,"Key":15.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"ac0155df-72bd-4471-a1a3-f61e07a66d83","path":"sprites/spr_planets/spr_planets.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"78125f44-1c11-47ad-85ff-c496612e6b2c","IsCreationKey":false,"Key":16.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"fb8ebd46-efd0-493e-bd15-4d22c3f8fab5","path":"sprites/spr_planets/spr_planets.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"e7f41fba-0333-4687-b256-a1d38f6896d4","IsCreationKey":false,"Key":17.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"62040f87-514e-47c8-9541-112685e3f530","path":"sprites/spr_planets/spr_planets.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"211e6999-babe-483d-8c39-1b83087d41bf","IsCreationKey":false,"Key":18.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"d5a3104e-ba0b-496f-8dc6-40b44fe501f6","path":"sprites/spr_planets/spr_planets.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"a7a141fe-5907-401c-881a-37f7ae9f2f8d","IsCreationKey":false,"Key":19.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"adc60ca3-cfe9-46f9-afc1-870909f094e5","path":"sprites/spr_planets/spr_planets.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"edfb3906-d795-4658-8ef4-e1065bbaf111","IsCreationKey":false,"Key":20.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_popup/spr_popup.yy b/sprites/spr_popup/spr_popup.yy index e4a6f32231..3f509030dc 100644 --- a/sprites/spr_popup/spr_popup.yy +++ b/sprites/spr_popup/spr_popup.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_popup", "bboxMode":0, "bbox_bottom":287, @@ -12,8 +12,8 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"818b0ce5-b55a-4033-8366-844e3fb02b9c","name":"818b0ce5-b55a-4033-8366-844e3fb02b9c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"0b81ee58-349d-4e4a-87e2-44cc946f0a32","name":"0b81ee58-349d-4e4a-87e2-44cc946f0a32","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"818b0ce5-b55a-4033-8366-844e3fb02b9c","name":"818b0ce5-b55a-4033-8366-844e3fb02b9c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"0b81ee58-349d-4e4a-87e2-44cc946f0a32","name":"0b81ee58-349d-4e4a-87e2-44cc946f0a32","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -69,12 +69,8 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"818b0ce5-b55a-4033-8366-844e3fb02b9c","path":"sprites/spr_popup/spr_popup.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"9ad78fbb-c358-45fd-88f9-e5369faed57a","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"0b81ee58-349d-4e4a-87e2-44cc946f0a32","path":"sprites/spr_popup/spr_popup.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"34f81e50-3bc5-4ec7-92f2-f09b4c113e6e","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"818b0ce5-b55a-4033-8366-844e3fb02b9c","path":"sprites/spr_popup/spr_popup.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"9ad78fbb-c358-45fd-88f9-e5369faed57a","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"0b81ee58-349d-4e4a-87e2-44cc946f0a32","path":"sprites/spr_popup/spr_popup.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"34f81e50-3bc5-4ec7-92f2-f09b4c113e6e","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":{ diff --git a/sprites/spr_popup_dialogue/spr_popup_dialogue.yy b/sprites/spr_popup_dialogue/spr_popup_dialogue.yy index e7841dac57..62bd897e94 100644 --- a/sprites/spr_popup_dialogue/spr_popup_dialogue.yy +++ b/sprites/spr_popup_dialogue/spr_popup_dialogue.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_popup_dialogue", "bboxMode":0, "bbox_bottom":146, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"e9f89fec-8957-4b51-af6e-afe30a3bec04","name":"e9f89fec-8957-4b51-af6e-afe30a3bec04","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"e9f89fec-8957-4b51-af6e-afe30a3bec04","name":"e9f89fec-8957-4b51-af6e-afe30a3bec04","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"e9f89fec-8957-4b51-af6e-afe30a3bec04","path":"sprites/spr_popup_dialogue/spr_popup_dialogue.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"aa362568-b6a2-4a5b-be4a-271695972d87","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"e9f89fec-8957-4b51-af6e-afe30a3bec04","path":"sprites/spr_popup_dialogue/spr_popup_dialogue.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"aa362568-b6a2-4a5b-be4a-271695972d87","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":{ diff --git a/sprites/spr_popup_event/spr_popup_event.yy b/sprites/spr_popup_event/spr_popup_event.yy index da6690cee9..0e8729d93d 100644 --- a/sprites/spr_popup_event/spr_popup_event.yy +++ b/sprites/spr_popup_event/spr_popup_event.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_popup_event", "bboxMode":0, "bbox_bottom":602, @@ -12,8 +12,8 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"d76ef3fd-d887-4d0f-9bf8-dc0ffe1e9f60","name":"d76ef3fd-d887-4d0f-9bf8-dc0ffe1e9f60","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"a2fc932a-c165-4e00-9ee1-5377afd490a2","name":"a2fc932a-c165-4e00-9ee1-5377afd490a2","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"d76ef3fd-d887-4d0f-9bf8-dc0ffe1e9f60","name":"d76ef3fd-d887-4d0f-9bf8-dc0ffe1e9f60","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"a2fc932a-c165-4e00-9ee1-5377afd490a2","name":"a2fc932a-c165-4e00-9ee1-5377afd490a2","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -69,12 +69,8 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"d76ef3fd-d887-4d0f-9bf8-dc0ffe1e9f60","path":"sprites/spr_popup_event/spr_popup_event.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"e1550ec3-8ef7-4b66-b938-85de6e30b587","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"a2fc932a-c165-4e00-9ee1-5377afd490a2","path":"sprites/spr_popup_event/spr_popup_event.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"fcfc72ea-4585-4003-8f57-fcd1e98e8d62","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"d76ef3fd-d887-4d0f-9bf8-dc0ffe1e9f60","path":"sprites/spr_popup_event/spr_popup_event.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"e1550ec3-8ef7-4b66-b938-85de6e30b587","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"a2fc932a-c165-4e00-9ee1-5377afd490a2","path":"sprites/spr_popup_event/spr_popup_event.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"fcfc72ea-4585-4003-8f57-fcd1e98e8d62","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":{ diff --git a/sprites/spr_popup_event_avatar/spr_popup_event_avatar.yy b/sprites/spr_popup_event_avatar/spr_popup_event_avatar.yy index c6cd61142a..85afb4429b 100644 --- a/sprites/spr_popup_event_avatar/spr_popup_event_avatar.yy +++ b/sprites/spr_popup_event_avatar/spr_popup_event_avatar.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_popup_event_avatar", "bboxMode":0, "bbox_bottom":0, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"194603b5-15a9-40de-be4a-f33d87da14f9","name":"194603b5-15a9-40de-be4a-f33d87da14f9","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"194603b5-15a9-40de-be4a-f33d87da14f9","name":"194603b5-15a9-40de-be4a-f33d87da14f9","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"194603b5-15a9-40de-be4a-f33d87da14f9","path":"sprites/spr_popup_event_avatar/spr_popup_event_avatar.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"a54b2f11-3f4e-4e52-97b2-9e5eeeffa1ee","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"194603b5-15a9-40de-be4a-f33d87da14f9","path":"sprites/spr_popup_event_avatar/spr_popup_event_avatar.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"a54b2f11-3f4e-4e52-97b2-9e5eeeffa1ee","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_popup_large/spr_popup_large.yy b/sprites/spr_popup_large/spr_popup_large.yy index 04031a662d..b441825f1f 100644 --- a/sprites/spr_popup_large/spr_popup_large.yy +++ b/sprites/spr_popup_large/spr_popup_large.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_popup_large", "bboxMode":0, "bbox_bottom":431, @@ -12,8 +12,8 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"4bf2b29b-2d50-46ab-8c3a-ba6be1dfa0aa","name":"4bf2b29b-2d50-46ab-8c3a-ba6be1dfa0aa","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"fcd8569d-481d-4125-8dd4-f909a8072676","name":"fcd8569d-481d-4125-8dd4-f909a8072676","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"4bf2b29b-2d50-46ab-8c3a-ba6be1dfa0aa","name":"4bf2b29b-2d50-46ab-8c3a-ba6be1dfa0aa","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"fcd8569d-481d-4125-8dd4-f909a8072676","name":"fcd8569d-481d-4125-8dd4-f909a8072676","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -69,12 +69,8 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"4bf2b29b-2d50-46ab-8c3a-ba6be1dfa0aa","path":"sprites/spr_popup_large/spr_popup_large.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"c89065fb-82cd-4a55-8377-98dfd5690db7","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"fcd8569d-481d-4125-8dd4-f909a8072676","path":"sprites/spr_popup_large/spr_popup_large.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"dd94c960-1265-4fa8-b9f5-cd210600f0c3","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"4bf2b29b-2d50-46ab-8c3a-ba6be1dfa0aa","path":"sprites/spr_popup_large/spr_popup_large.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"c89065fb-82cd-4a55-8377-98dfd5690db7","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"fcd8569d-481d-4125-8dd4-f909a8072676","path":"sprites/spr_popup_large/spr_popup_large.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"dd94c960-1265-4fa8-b9f5-cd210600f0c3","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":{ diff --git a/sprites/spr_popup_manage/spr_popup_manage.yy b/sprites/spr_popup_manage/spr_popup_manage.yy index cb9f1743ed..d898c03dd3 100644 --- a/sprites/spr_popup_manage/spr_popup_manage.yy +++ b/sprites/spr_popup_manage/spr_popup_manage.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_popup_manage", "bboxMode":0, "bbox_bottom":31, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"a59dec74-1bb0-4342-876c-99ac5dfc80bc","name":"a59dec74-1bb0-4342-876c-99ac5dfc80bc","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"a59dec74-1bb0-4342-876c-99ac5dfc80bc","name":"a59dec74-1bb0-4342-876c-99ac5dfc80bc","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"a59dec74-1bb0-4342-876c-99ac5dfc80bc","path":"sprites/spr_popup_manage/spr_popup_manage.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"8116bdaf-a3ea-46cd-b211-840747ff36d5","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"a59dec74-1bb0-4342-876c-99ac5dfc80bc","path":"sprites/spr_popup_manage/spr_popup_manage.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"8116bdaf-a3ea-46cd-b211-840747ff36d5","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_popup_medium/spr_popup_medium.yy b/sprites/spr_popup_medium/spr_popup_medium.yy index ca70fde681..4b88f3a669 100644 --- a/sprites/spr_popup_medium/spr_popup_medium.yy +++ b/sprites/spr_popup_medium/spr_popup_medium.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_popup_medium", "bboxMode":0, "bbox_bottom":323, @@ -12,8 +12,8 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"e581ac8a-5bd5-49dc-b5fe-b4ee836ccb65","name":"e581ac8a-5bd5-49dc-b5fe-b4ee836ccb65","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"d335f5fa-340d-44d4-ad9a-69cd54c42237","name":"d335f5fa-340d-44d4-ad9a-69cd54c42237","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"e581ac8a-5bd5-49dc-b5fe-b4ee836ccb65","name":"e581ac8a-5bd5-49dc-b5fe-b4ee836ccb65","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"d335f5fa-340d-44d4-ad9a-69cd54c42237","name":"d335f5fa-340d-44d4-ad9a-69cd54c42237","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -69,12 +69,8 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"e581ac8a-5bd5-49dc-b5fe-b4ee836ccb65","path":"sprites/spr_popup_medium/spr_popup_medium.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"5a0b9f7e-d70e-44bd-aef3-295ac159bfc7","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"d335f5fa-340d-44d4-ad9a-69cd54c42237","path":"sprites/spr_popup_medium/spr_popup_medium.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"ccf5fc1f-fcea-4c0e-a400-30e315180537","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"e581ac8a-5bd5-49dc-b5fe-b4ee836ccb65","path":"sprites/spr_popup_medium/spr_popup_medium.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"5a0b9f7e-d70e-44bd-aef3-295ac159bfc7","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"d335f5fa-340d-44d4-ad9a-69cd54c42237","path":"sprites/spr_popup_medium/spr_popup_medium.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"ccf5fc1f-fcea-4c0e-a400-30e315180537","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":{ diff --git a/sprites/spr_popup_pic/spr_popup_pic.yy b/sprites/spr_popup_pic/spr_popup_pic.yy index ca684faa6c..1966058f14 100644 --- a/sprites/spr_popup_pic/spr_popup_pic.yy +++ b/sprites/spr_popup_pic/spr_popup_pic.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_popup_pic", "bboxMode":0, "bbox_bottom":0, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"9fc5b893-861d-414d-bb6f-a1000c7dd42d","name":"9fc5b893-861d-414d-bb6f-a1000c7dd42d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"9fc5b893-861d-414d-bb6f-a1000c7dd42d","name":"9fc5b893-861d-414d-bb6f-a1000c7dd42d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -70,9 +70,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"9fc5b893-861d-414d-bb6f-a1000c7dd42d","path":"sprites/spr_popup_pic/spr_popup_pic.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"aeba4c16-c958-463b-b3cf-e0f6230963a8","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"9fc5b893-861d-414d-bb6f-a1000c7dd42d","path":"sprites/spr_popup_pic/spr_popup_pic.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"aeba4c16-c958-463b-b3cf-e0f6230963a8","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_popup_select/spr_popup_select.yy b/sprites/spr_popup_select/spr_popup_select.yy index 640998425b..c1a0042ba1 100644 --- a/sprites/spr_popup_select/spr_popup_select.yy +++ b/sprites/spr_popup_select/spr_popup_select.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_popup_select", "bboxMode":0, "bbox_bottom":14, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"51edd839-9f92-4390-bd00-98fd88f418f5","name":"51edd839-9f92-4390-bd00-98fd88f418f5","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"51edd839-9f92-4390-bd00-98fd88f418f5","name":"51edd839-9f92-4390-bd00-98fd88f418f5","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"51edd839-9f92-4390-bd00-98fd88f418f5","path":"sprites/spr_popup_select/spr_popup_select.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"1f47bec7-dfd3-417b-8d4b-afef3dc60b06","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"51edd839-9f92-4390-bd00-98fd88f418f5","path":"sprites/spr_popup_select/spr_popup_select.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"1f47bec7-dfd3-417b-8d4b-afef3dc60b06","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_popup_small/spr_popup_small.yy b/sprites/spr_popup_small/spr_popup_small.yy index 063857151e..863e371331 100644 --- a/sprites/spr_popup_small/spr_popup_small.yy +++ b/sprites/spr_popup_small/spr_popup_small.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_popup_small", "bboxMode":0, "bbox_bottom":242, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"82319a6a-45e9-4485-8f08-078bc038a38e","name":"82319a6a-45e9-4485-8f08-078bc038a38e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"82319a6a-45e9-4485-8f08-078bc038a38e","name":"82319a6a-45e9-4485-8f08-078bc038a38e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"82319a6a-45e9-4485-8f08-078bc038a38e","path":"sprites/spr_popup_small/spr_popup_small.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"97b4525a-1cad-40d4-9aad-bea97fde4a16","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"82319a6a-45e9-4485-8f08-078bc038a38e","path":"sprites/spr_popup_small/spr_popup_small.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"97b4525a-1cad-40d4-9aad-bea97fde4a16","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_postbattle/spr_postbattle.yy b/sprites/spr_postbattle/spr_postbattle.yy index 1bcf922ac7..aaa723e0bc 100644 --- a/sprites/spr_postbattle/spr_postbattle.yy +++ b/sprites/spr_postbattle/spr_postbattle.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_postbattle", "bboxMode":0, "bbox_bottom":0, diff --git a/sprites/spr_postbattle_space/spr_postbattle_space.yy b/sprites/spr_postbattle_space/spr_postbattle_space.yy index e740a62d11..190267cbdc 100644 --- a/sprites/spr_postbattle_space/spr_postbattle_space.yy +++ b/sprites/spr_postbattle_space/spr_postbattle_space.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_postbattle_space", "bboxMode":0, "bbox_bottom":0, diff --git a/sprites/spr_prussian_spike/spr_prussian_spike.yy b/sprites/spr_prussian_spike/spr_prussian_spike.yy index 2427bc7c35..984217b8c2 100644 --- a/sprites/spr_prussian_spike/spr_prussian_spike.yy +++ b/sprites/spr_prussian_spike/spr_prussian_spike.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_prussian_spike", "bboxMode":0, "bbox_bottom":64, @@ -12,11 +12,11 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"5a405388-8efb-49b6-a38f-f27ec42f29e3","name":"5a405388-8efb-49b6-a38f-f27ec42f29e3","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"441fec2f-4b09-4221-8c3f-ea3cd809adeb","name":"441fec2f-4b09-4221-8c3f-ea3cd809adeb","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"cae929a5-f374-473f-a6d0-cf192764bb7e","name":"cae929a5-f374-473f-a6d0-cf192764bb7e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"f63f419a-507b-4755-ad2f-88e97c7be7f9","name":"f63f419a-507b-4755-ad2f-88e97c7be7f9","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"15b2950d-a703-41a5-9fda-cf6e20097872","name":"15b2950d-a703-41a5-9fda-cf6e20097872","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"5a405388-8efb-49b6-a38f-f27ec42f29e3","name":"5a405388-8efb-49b6-a38f-f27ec42f29e3","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"441fec2f-4b09-4221-8c3f-ea3cd809adeb","name":"441fec2f-4b09-4221-8c3f-ea3cd809adeb","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"cae929a5-f374-473f-a6d0-cf192764bb7e","name":"cae929a5-f374-473f-a6d0-cf192764bb7e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"f63f419a-507b-4755-ad2f-88e97c7be7f9","name":"f63f419a-507b-4755-ad2f-88e97c7be7f9","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"15b2950d-a703-41a5-9fda-cf6e20097872","name":"15b2950d-a703-41a5-9fda-cf6e20097872","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -72,21 +72,11 @@ "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_psy_hood/spr_psy_hood.yy b/sprites/spr_psy_hood/spr_psy_hood.yy index 99d66f5664..9aeba0c484 100644 --- a/sprites/spr_psy_hood/spr_psy_hood.yy +++ b/sprites/spr_psy_hood/spr_psy_hood.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_psy_hood", "bboxMode":0, "bbox_bottom":203, @@ -12,10 +12,10 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"c00a412a-a9bc-45ec-9142-9d8a013a975a","name":"c00a412a-a9bc-45ec-9142-9d8a013a975a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"e9dab986-458a-47fd-80b0-9fe27508109d","name":"e9dab986-458a-47fd-80b0-9fe27508109d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"da4d2ca5-ded6-4a96-bef4-a1c048f10f67","name":"da4d2ca5-ded6-4a96-bef4-a1c048f10f67","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"00179c07-d252-45ef-b3ab-ce1592356c5e","name":"00179c07-d252-45ef-b3ab-ce1592356c5e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"c00a412a-a9bc-45ec-9142-9d8a013a975a","name":"c00a412a-a9bc-45ec-9142-9d8a013a975a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"e9dab986-458a-47fd-80b0-9fe27508109d","name":"e9dab986-458a-47fd-80b0-9fe27508109d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"da4d2ca5-ded6-4a96-bef4-a1c048f10f67","name":"da4d2ca5-ded6-4a96-bef4-a1c048f10f67","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"00179c07-d252-45ef-b3ab-ce1592356c5e","name":"00179c07-d252-45ef-b3ab-ce1592356c5e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -71,18 +71,10 @@ "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_psy_hood/spr_psy_hood.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,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"e9dab986-458a-47fd-80b0-9fe27508109d","path":"sprites/spr_psy_hood/spr_psy_hood.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"c69bf823-ffbd-4cb3-b33f-35f35acf7786","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"da4d2ca5-ded6-4a96-bef4-a1c048f10f67","path":"sprites/spr_psy_hood/spr_psy_hood.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"87f19802-bd95-4849-8a1c-6fd2716596c3","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"00179c07-d252-45ef-b3ab-ce1592356c5e","path":"sprites/spr_psy_hood/spr_psy_hood.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"10320bca-2abd-4fce-b081-c3aa679fae96","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"c00a412a-a9bc-45ec-9142-9d8a013a975a","path":"sprites/spr_psy_hood/spr_psy_hood.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,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"e9dab986-458a-47fd-80b0-9fe27508109d","path":"sprites/spr_psy_hood/spr_psy_hood.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"c69bf823-ffbd-4cb3-b33f-35f35acf7786","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"da4d2ca5-ded6-4a96-bef4-a1c048f10f67","path":"sprites/spr_psy_hood/spr_psy_hood.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"87f19802-bd95-4849-8a1c-6fd2716596c3","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"00179c07-d252-45ef-b3ab-ce1592356c5e","path":"sprites/spr_psy_hood/spr_psy_hood.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"10320bca-2abd-4fce-b081-c3aa679fae96","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_psy_hood_complex/spr_psy_hood_complex.yy b/sprites/spr_psy_hood_complex/spr_psy_hood_complex.yy index 1f24dcf7c6..47b18885af 100644 --- a/sprites/spr_psy_hood_complex/spr_psy_hood_complex.yy +++ b/sprites/spr_psy_hood_complex/spr_psy_hood_complex.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_psy_hood_complex", "bboxMode":0, "bbox_bottom":51, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"da4d2ca5-ded6-4a96-bef4-a1c048f10f67","name":"da4d2ca5-ded6-4a96-bef4-a1c048f10f67","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"da4d2ca5-ded6-4a96-bef4-a1c048f10f67","name":"da4d2ca5-ded6-4a96-bef4-a1c048f10f67","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -70,9 +70,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"da4d2ca5-ded6-4a96-bef4-a1c048f10f67","path":"sprites/spr_psy_hood_complex/spr_psy_hood_complex.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"bd2d4908-2e48-4f69-8c27-96c251f4d07e","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"da4d2ca5-ded6-4a96-bef4-a1c048f10f67","path":"sprites/spr_psy_hood_complex/spr_psy_hood_complex.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"bd2d4908-2e48-4f69-8c27-96c251f4d07e","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_pulse/spr_pulse.yy b/sprites/spr_pulse/spr_pulse.yy index 7af03e1903..3a5203ab9c 100644 --- a/sprites/spr_pulse/spr_pulse.yy +++ b/sprites/spr_pulse/spr_pulse.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_pulse", "bboxMode":0, "bbox_bottom":1, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"beb51875-fde0-449b-9feb-bdd9fc7e5b15","name":"beb51875-fde0-449b-9feb-bdd9fc7e5b15","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"beb51875-fde0-449b-9feb-bdd9fc7e5b15","name":"beb51875-fde0-449b-9feb-bdd9fc7e5b15","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"beb51875-fde0-449b-9feb-bdd9fc7e5b15","path":"sprites/spr_pulse/spr_pulse.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"bea83358-4f2a-4a9d-ab40-f1a58e73e370","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"beb51875-fde0-449b-9feb-bdd9fc7e5b15","path":"sprites/spr_pulse/spr_pulse.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"bea83358-4f2a-4a9d-ab40-f1a58e73e370","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":{ diff --git a/sprites/spr_purge_1/spr_purge_1.yy b/sprites/spr_purge_1/spr_purge_1.yy index 198e747870..9af7d76b5c 100644 --- a/sprites/spr_purge_1/spr_purge_1.yy +++ b/sprites/spr_purge_1/spr_purge_1.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_purge_1", "bboxMode":0, "bbox_bottom":0, diff --git a/sprites/spr_purge_2/spr_purge_2.yy b/sprites/spr_purge_2/spr_purge_2.yy index 2b8450f3ed..471230fc5b 100644 --- a/sprites/spr_purge_2/spr_purge_2.yy +++ b/sprites/spr_purge_2/spr_purge_2.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_purge_2", "bboxMode":0, "bbox_bottom":0, diff --git a/sprites/spr_purge_buttons/spr_purge_buttons.yy b/sprites/spr_purge_buttons/spr_purge_buttons.yy index 48ea8b9abd..4a22d0cd9b 100644 --- a/sprites/spr_purge_buttons/spr_purge_buttons.yy +++ b/sprites/spr_purge_buttons/spr_purge_buttons.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_purge_buttons", "bboxMode":0, "bbox_bottom":0, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"d9a10719-dd38-43e2-82b7-62f03a6de243","name":"d9a10719-dd38-43e2-82b7-62f03a6de243","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"d9a10719-dd38-43e2-82b7-62f03a6de243","name":"d9a10719-dd38-43e2-82b7-62f03a6de243","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"d9a10719-dd38-43e2-82b7-62f03a6de243","path":"sprites/spr_purge_buttons/spr_purge_buttons.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"fed73b7e-5330-4e80-a7c6-0cec4a4ed761","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"d9a10719-dd38-43e2-82b7-62f03a6de243","path":"sprites/spr_purge_buttons/spr_purge_buttons.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"fed73b7e-5330-4e80-a7c6-0cec4a4ed761","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":{ diff --git a/sprites/spr_purge_panel/spr_purge_panel.yy b/sprites/spr_purge_panel/spr_purge_panel.yy index a49d40d9eb..95ff974a51 100644 --- a/sprites/spr_purge_panel/spr_purge_panel.yy +++ b/sprites/spr_purge_panel/spr_purge_panel.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_purge_panel", "bboxMode":0, "bbox_bottom":399, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"92a13947-7100-4a9e-96d0-2af58cd2d330","name":"92a13947-7100-4a9e-96d0-2af58cd2d330","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"92a13947-7100-4a9e-96d0-2af58cd2d330","name":"92a13947-7100-4a9e-96d0-2af58cd2d330","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"92a13947-7100-4a9e-96d0-2af58cd2d330","path":"sprites/spr_purge_panel/spr_purge_panel.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"89cc209d-0fa1-4713-be02-efb2bfdf7d52","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"92a13947-7100-4a9e-96d0-2af58cd2d330","path":"sprites/spr_purge_panel/spr_purge_panel.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"89cc209d-0fa1-4713-be02-efb2bfdf7d52","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":{ diff --git a/sprites/spr_purity_s/spr_purity_s.yy b/sprites/spr_purity_s/spr_purity_s.yy index 532b8b7108..122958dadb 100644 --- a/sprites/spr_purity_s/spr_purity_s.yy +++ b/sprites/spr_purity_s/spr_purity_s.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_purity_s", "bboxMode":0, "bbox_bottom":60, @@ -12,8 +12,8 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"4b074bea-caac-469b-9dc8-35be1593a7aa","name":"4b074bea-caac-469b-9dc8-35be1593a7aa","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"ebc45331-ddb7-4801-be91-f23288c05447","name":"ebc45331-ddb7-4801-be91-f23288c05447","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"4b074bea-caac-469b-9dc8-35be1593a7aa","name":"4b074bea-caac-469b-9dc8-35be1593a7aa","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"ebc45331-ddb7-4801-be91-f23288c05447","name":"ebc45331-ddb7-4801-be91-f23288c05447","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -71,12 +71,8 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"4b074bea-caac-469b-9dc8-35be1593a7aa","path":"sprites/spr_purity_s/spr_purity_s.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"5ff55be1-b90d-4d5d-baed-3a98a57c2fb3","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"ebc45331-ddb7-4801-be91-f23288c05447","path":"sprites/spr_purity_s/spr_purity_s.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"44283d58-d9c9-4ca2-ac9d-2477d311bd16","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"4b074bea-caac-469b-9dc8-35be1593a7aa","path":"sprites/spr_purity_s/spr_purity_s.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"5ff55be1-b90d-4d5d-baed-3a98a57c2fb3","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"ebc45331-ddb7-4801-be91-f23288c05447","path":"sprites/spr_purity_s/spr_purity_s.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"44283d58-d9c9-4ca2-ac9d-2477d311bd16","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_purity_seal/spr_purity_seal.yy b/sprites/spr_purity_seal/spr_purity_seal.yy index 08105fcd98..cedf7af02f 100644 --- a/sprites/spr_purity_seal/spr_purity_seal.yy +++ b/sprites/spr_purity_seal/spr_purity_seal.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_purity_seal", "bboxMode":0, "bbox_bottom":34, @@ -12,10 +12,10 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"39dc5d62-01e8-4a52-99be-1d12790fcbfc","name":"39dc5d62-01e8-4a52-99be-1d12790fcbfc","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"595ff173-4df7-4f84-aebc-576f91f18c23","name":"595ff173-4df7-4f84-aebc-576f91f18c23","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"40957cfc-9310-4d3e-82de-89b771ac8e99","name":"40957cfc-9310-4d3e-82de-89b771ac8e99","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"cd65f936-1dae-4e5a-a681-a5d359010378","name":"cd65f936-1dae-4e5a-a681-a5d359010378","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"39dc5d62-01e8-4a52-99be-1d12790fcbfc","name":"39dc5d62-01e8-4a52-99be-1d12790fcbfc","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"595ff173-4df7-4f84-aebc-576f91f18c23","name":"595ff173-4df7-4f84-aebc-576f91f18c23","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"40957cfc-9310-4d3e-82de-89b771ac8e99","name":"40957cfc-9310-4d3e-82de-89b771ac8e99","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"cd65f936-1dae-4e5a-a681-a5d359010378","name":"cd65f936-1dae-4e5a-a681-a5d359010378","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -71,18 +71,10 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"39dc5d62-01e8-4a52-99be-1d12790fcbfc","path":"sprites/spr_purity_seal/spr_purity_seal.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"41685129-d244-497a-a3e8-0e14686d6982","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"595ff173-4df7-4f84-aebc-576f91f18c23","path":"sprites/spr_purity_seal/spr_purity_seal.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"cdca2c2b-2c35-469c-8ef2-2c9abf1ee822","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"40957cfc-9310-4d3e-82de-89b771ac8e99","path":"sprites/spr_purity_seal/spr_purity_seal.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"b4fb4474-fd47-425f-9aa4-3f8a7dc7647b","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"cd65f936-1dae-4e5a-a681-a5d359010378","path":"sprites/spr_purity_seal/spr_purity_seal.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"fd004756-0650-4537-8065-75fdb6c773e5","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"39dc5d62-01e8-4a52-99be-1d12790fcbfc","path":"sprites/spr_purity_seal/spr_purity_seal.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"41685129-d244-497a-a3e8-0e14686d6982","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"595ff173-4df7-4f84-aebc-576f91f18c23","path":"sprites/spr_purity_seal/spr_purity_seal.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"cdca2c2b-2c35-469c-8ef2-2c9abf1ee822","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"40957cfc-9310-4d3e-82de-89b771ac8e99","path":"sprites/spr_purity_seal/spr_purity_seal.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"b4fb4474-fd47-425f-9aa4-3f8a7dc7647b","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"cd65f936-1dae-4e5a-a681-a5d359010378","path":"sprites/spr_purity_seal/spr_purity_seal.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"fd004756-0650-4537-8065-75fdb6c773e5","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_rack/spr_rack.yy b/sprites/spr_rack/spr_rack.yy index 3f07d72ebc..a2ee56947e 100644 --- a/sprites/spr_rack/spr_rack.yy +++ b/sprites/spr_rack/spr_rack.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_rack", "bboxMode":0, "bbox_bottom":55, @@ -12,9 +12,9 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"3d9b8260-d4b2-4400-8a8b-5bebedbc126c","name":"3d9b8260-d4b2-4400-8a8b-5bebedbc126c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"4d6ddd0e-c313-489e-80ed-a098199fe1ec","name":"4d6ddd0e-c313-489e-80ed-a098199fe1ec","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"200951dc-976d-43f5-b63c-55247595c3c4","name":"200951dc-976d-43f5-b63c-55247595c3c4","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"3d9b8260-d4b2-4400-8a8b-5bebedbc126c","name":"3d9b8260-d4b2-4400-8a8b-5bebedbc126c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"4d6ddd0e-c313-489e-80ed-a098199fe1ec","name":"4d6ddd0e-c313-489e-80ed-a098199fe1ec","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"200951dc-976d-43f5-b63c-55247595c3c4","name":"200951dc-976d-43f5-b63c-55247595c3c4","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -70,15 +70,9 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"3d9b8260-d4b2-4400-8a8b-5bebedbc126c","path":"sprites/spr_rack/spr_rack.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"4a18159c-4459-42a4-8c29-8f30e8382d64","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"4d6ddd0e-c313-489e-80ed-a098199fe1ec","path":"sprites/spr_rack/spr_rack.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"db36723d-e503-4b00-b23e-b55a501c4a13","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"200951dc-976d-43f5-b63c-55247595c3c4","path":"sprites/spr_rack/spr_rack.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"2bb5956b-927a-43e4-a043-90eeca134dbe","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"3d9b8260-d4b2-4400-8a8b-5bebedbc126c","path":"sprites/spr_rack/spr_rack.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"4a18159c-4459-42a4-8c29-8f30e8382d64","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"4d6ddd0e-c313-489e-80ed-a098199fe1ec","path":"sprites/spr_rack/spr_rack.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"db36723d-e503-4b00-b23e-b55a501c4a13","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"200951dc-976d-43f5-b63c-55247595c3c4","path":"sprites/spr_rack/spr_rack.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"2bb5956b-927a-43e4-a043-90eeca134dbe","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_rack_and_pinion/spr_rack_and_pinion.yy b/sprites/spr_rack_and_pinion/spr_rack_and_pinion.yy index bdb3d387c7..dc149d7efa 100644 --- a/sprites/spr_rack_and_pinion/spr_rack_and_pinion.yy +++ b/sprites/spr_rack_and_pinion/spr_rack_and_pinion.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_rack_and_pinion", "bboxMode":0, "bbox_bottom":98, @@ -12,8 +12,8 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"43e1b595-b1d7-42e5-8bd5-8f57ab87f474","name":"43e1b595-b1d7-42e5-8bd5-8f57ab87f474","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"77b808e9-cf80-4505-82f1-e7844a0e438e","name":"77b808e9-cf80-4505-82f1-e7844a0e438e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"43e1b595-b1d7-42e5-8bd5-8f57ab87f474","name":"43e1b595-b1d7-42e5-8bd5-8f57ab87f474","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"77b808e9-cf80-4505-82f1-e7844a0e438e","name":"77b808e9-cf80-4505-82f1-e7844a0e438e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -69,12 +69,8 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"43e1b595-b1d7-42e5-8bd5-8f57ab87f474","path":"sprites/spr_rack_and_pinion/spr_rack_and_pinion.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"6c4e1e22-99f3-45f0-bbc7-9ffbbcc84d94","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"77b808e9-cf80-4505-82f1-e7844a0e438e","path":"sprites/spr_rack_and_pinion/spr_rack_and_pinion.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"a4d8925e-44b2-47d5-821b-ce6c5b56c499","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"43e1b595-b1d7-42e5-8bd5-8f57ab87f474","path":"sprites/spr_rack_and_pinion/spr_rack_and_pinion.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"6c4e1e22-99f3-45f0-bbc7-9ffbbcc84d94","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"77b808e9-cf80-4505-82f1-e7844a0e438e","path":"sprites/spr_rack_and_pinion/spr_rack_and_pinion.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"a4d8925e-44b2-47d5-821b-ce6c5b56c499","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_raid/spr_raid.yy b/sprites/spr_raid/spr_raid.yy index f0e636ae43..d60da68ecf 100644 --- a/sprites/spr_raid/spr_raid.yy +++ b/sprites/spr_raid/spr_raid.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_raid", "bboxMode":0, "bbox_bottom":0, diff --git a/sprites/spr_railgun/spr_railgun.yy b/sprites/spr_railgun/spr_railgun.yy index dba93f0a9c..654ba1e2e0 100644 --- a/sprites/spr_railgun/spr_railgun.yy +++ b/sprites/spr_railgun/spr_railgun.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_railgun", "bboxMode":0, "bbox_bottom":2, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"cde6279c-d0b6-4214-8413-c1d4d6c9206e","name":"cde6279c-d0b6-4214-8413-c1d4d6c9206e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"cde6279c-d0b6-4214-8413-c1d4d6c9206e","name":"cde6279c-d0b6-4214-8413-c1d4d6c9206e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"cde6279c-d0b6-4214-8413-c1d4d6c9206e","path":"sprites/spr_railgun/spr_railgun.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"d3e8013e-d7cb-4e2f-99bf-b1d015a71030","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"cde6279c-d0b6-4214-8413-c1d4d6c9206e","path":"sprites/spr_railgun/spr_railgun.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"d3e8013e-d7cb-4e2f-99bf-b1d015a71030","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":{ diff --git a/sprites/spr_rectangle/spr_rectangle.yy b/sprites/spr_rectangle/spr_rectangle.yy index 08bb52c75b..ba18df5be6 100644 --- a/sprites/spr_rectangle/spr_rectangle.yy +++ b/sprites/spr_rectangle/spr_rectangle.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_rectangle", "bboxMode":0, "bbox_bottom":63, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"5c14ef64-e89b-4d3e-84fb-ae15783d918e","name":"5c14ef64-e89b-4d3e-84fb-ae15783d918e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"5c14ef64-e89b-4d3e-84fb-ae15783d918e","name":"5c14ef64-e89b-4d3e-84fb-ae15783d918e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"5c14ef64-e89b-4d3e-84fb-ae15783d918e","path":"sprites/spr_rectangle/spr_rectangle.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"6a5922e9-fdf9-46ba-9e50-4e975a5185b0","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"5c14ef64-e89b-4d3e-84fb-ae15783d918e","path":"sprites/spr_rectangle/spr_rectangle.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"6a5922e9-fdf9-46ba-9e50-4e975a5185b0","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_red_button/spr_red_button.yy b/sprites/spr_red_button/spr_red_button.yy index b8897ea438..f7eea4e5dd 100644 --- a/sprites/spr_red_button/spr_red_button.yy +++ b/sprites/spr_red_button/spr_red_button.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_red_button", "bboxMode":0, "bbox_bottom":14, @@ -12,11 +12,11 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"1d99ce01-9a03-434f-bbf5-eaf445c38567","name":"1d99ce01-9a03-434f-bbf5-eaf445c38567","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"42d4f096-7a12-431c-b52e-70dfab70905b","name":"42d4f096-7a12-431c-b52e-70dfab70905b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"31b41486-9b21-47ca-a6a5-44fa61f6b67b","name":"31b41486-9b21-47ca-a6a5-44fa61f6b67b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"2c2dd157-8cfe-46da-bdb0-787eb12ad230","name":"2c2dd157-8cfe-46da-bdb0-787eb12ad230","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"2b40951a-6001-451b-9b42-d414988c9166","name":"2b40951a-6001-451b-9b42-d414988c9166","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"1d99ce01-9a03-434f-bbf5-eaf445c38567","name":"1d99ce01-9a03-434f-bbf5-eaf445c38567","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"42d4f096-7a12-431c-b52e-70dfab70905b","name":"42d4f096-7a12-431c-b52e-70dfab70905b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"31b41486-9b21-47ca-a6a5-44fa61f6b67b","name":"31b41486-9b21-47ca-a6a5-44fa61f6b67b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"2c2dd157-8cfe-46da-bdb0-787eb12ad230","name":"2c2dd157-8cfe-46da-bdb0-787eb12ad230","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"2b40951a-6001-451b-9b42-d414988c9166","name":"2b40951a-6001-451b-9b42-d414988c9166","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -72,21 +72,11 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"1d99ce01-9a03-434f-bbf5-eaf445c38567","path":"sprites/spr_red_button/spr_red_button.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"c65371fa-e5df-4e1a-aa5f-0d7a9c9d5caa","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"42d4f096-7a12-431c-b52e-70dfab70905b","path":"sprites/spr_red_button/spr_red_button.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"977e278b-9d59-4a1e-bc3a-10e616a2eb1a","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"31b41486-9b21-47ca-a6a5-44fa61f6b67b","path":"sprites/spr_red_button/spr_red_button.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"cce11ad7-1ee4-42c4-8f05-d1a8b12225ee","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"2c2dd157-8cfe-46da-bdb0-787eb12ad230","path":"sprites/spr_red_button/spr_red_button.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"6a19fad0-1940-464a-9ac4-65537e18eba6","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"2b40951a-6001-451b-9b42-d414988c9166","path":"sprites/spr_red_button/spr_red_button.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"6d65637f-4e2b-4d02-b19a-4160209998dc","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"1d99ce01-9a03-434f-bbf5-eaf445c38567","path":"sprites/spr_red_button/spr_red_button.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"c65371fa-e5df-4e1a-aa5f-0d7a9c9d5caa","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"42d4f096-7a12-431c-b52e-70dfab70905b","path":"sprites/spr_red_button/spr_red_button.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"977e278b-9d59-4a1e-bc3a-10e616a2eb1a","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"31b41486-9b21-47ca-a6a5-44fa61f6b67b","path":"sprites/spr_red_button/spr_red_button.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"cce11ad7-1ee4-42c4-8f05-d1a8b12225ee","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"2c2dd157-8cfe-46da-bdb0-787eb12ad230","path":"sprites/spr_red_button/spr_red_button.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"6a19fad0-1940-464a-9ac4-65537e18eba6","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"2b40951a-6001-451b-9b42-d414988c9166","path":"sprites/spr_red_button/spr_red_button.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"6d65637f-4e2b-4d02-b19a-4160209998dc","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":{ diff --git a/sprites/spr_requisition/spr_requisition.yy b/sprites/spr_requisition/spr_requisition.yy index c0dc9d03ca..314359ae77 100644 --- a/sprites/spr_requisition/spr_requisition.yy +++ b/sprites/spr_requisition/spr_requisition.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_requisition", "bboxMode":0, "bbox_bottom":12, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"5ba3628f-40c8-428a-bce0-7e95d2db8ec4","name":"5ba3628f-40c8-428a-bce0-7e95d2db8ec4","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"5ba3628f-40c8-428a-bce0-7e95d2db8ec4","name":"5ba3628f-40c8-428a-bce0-7e95d2db8ec4","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"5ba3628f-40c8-428a-bce0-7e95d2db8ec4","path":"sprites/spr_requisition/spr_requisition.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"0f22ebed-4e20-47f6-8189-3f42d1a5f4d6","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"5ba3628f-40c8-428a-bce0-7e95d2db8ec4","path":"sprites/spr_requisition/spr_requisition.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"0f22ebed-4e20-47f6-8189-3f42d1a5f4d6","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":{ diff --git a/sprites/spr_research_bar/spr_research_bar.yy b/sprites/spr_research_bar/spr_research_bar.yy index 0916d96065..879f57927b 100644 --- a/sprites/spr_research_bar/spr_research_bar.yy +++ b/sprites/spr_research_bar/spr_research_bar.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_research_bar", "bboxMode":0, "bbox_bottom":361, @@ -12,9 +12,9 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"cd763fd7-8004-4d62-bc1a-be3268cef684","name":"cd763fd7-8004-4d62-bc1a-be3268cef684","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"63f140c0-9df0-45cf-bc48-c71f52cccbf1","name":"63f140c0-9df0-45cf-bc48-c71f52cccbf1","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"d5b48025-2525-46d9-8c75-c549648ded91","name":"d5b48025-2525-46d9-8c75-c549648ded91","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"cd763fd7-8004-4d62-bc1a-be3268cef684","name":"cd763fd7-8004-4d62-bc1a-be3268cef684","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"63f140c0-9df0-45cf-bc48-c71f52cccbf1","name":"63f140c0-9df0-45cf-bc48-c71f52cccbf1","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"d5b48025-2525-46d9-8c75-c549648ded91","name":"d5b48025-2525-46d9-8c75-c549648ded91","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -70,15 +70,9 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"cd763fd7-8004-4d62-bc1a-be3268cef684","path":"sprites/spr_research_bar/spr_research_bar.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"805a2c94-7484-4778-84be-453aa5d791f3","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"63f140c0-9df0-45cf-bc48-c71f52cccbf1","path":"sprites/spr_research_bar/spr_research_bar.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"938b49cd-3ce1-4611-8b7b-36691b2a339e","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"d5b48025-2525-46d9-8c75-c549648ded91","path":"sprites/spr_research_bar/spr_research_bar.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"6ce8ad41-35df-4164-ba8e-1d0ad7fc40a5","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"cd763fd7-8004-4d62-bc1a-be3268cef684","path":"sprites/spr_research_bar/spr_research_bar.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"805a2c94-7484-4778-84be-453aa5d791f3","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"63f140c0-9df0-45cf-bc48-c71f52cccbf1","path":"sprites/spr_research_bar/spr_research_bar.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"938b49cd-3ce1-4611-8b7b-36691b2a339e","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"d5b48025-2525-46d9-8c75-c549648ded91","path":"sprites/spr_research_bar/spr_research_bar.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"6ce8ad41-35df-4164-ba8e-1d0ad7fc40a5","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_rg_mk5_helm/spr_rg_mk5_helm.yy b/sprites/spr_rg_mk5_helm/spr_rg_mk5_helm.yy index 636ae54657..d8ec7e0dc2 100644 --- a/sprites/spr_rg_mk5_helm/spr_rg_mk5_helm.yy +++ b/sprites/spr_rg_mk5_helm/spr_rg_mk5_helm.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_rg_mk5_helm", "bboxMode":0, "bbox_bottom":43, @@ -12,8 +12,8 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"2c0915b1-4f26-423a-a956-3a0630133ae1","name":"2c0915b1-4f26-423a-a956-3a0630133ae1","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"72defa52-0aba-434c-b51c-01507cb45ea6","name":"72defa52-0aba-434c-b51c-01507cb45ea6","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"2c0915b1-4f26-423a-a956-3a0630133ae1","name":"2c0915b1-4f26-423a-a956-3a0630133ae1","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"72defa52-0aba-434c-b51c-01507cb45ea6","name":"72defa52-0aba-434c-b51c-01507cb45ea6","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -69,12 +69,8 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"2c0915b1-4f26-423a-a956-3a0630133ae1","path":"sprites/spr_rg_mk5_helm/spr_rg_mk5_helm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"9f67310a-5e8a-43c9-8389-ba3149221012","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"72defa52-0aba-434c-b51c-01507cb45ea6","path":"sprites/spr_rg_mk5_helm/spr_rg_mk5_helm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"6fcdc1b7-dc3c-43c9-8b6a-16e91f98fa20","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"2c0915b1-4f26-423a-a956-3a0630133ae1","path":"sprites/spr_rg_mk5_helm/spr_rg_mk5_helm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"9f67310a-5e8a-43c9-8389-ba3149221012","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"72defa52-0aba-434c-b51c-01507cb45ea6","path":"sprites/spr_rg_mk5_helm/spr_rg_mk5_helm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"6fcdc1b7-dc3c-43c9-8b6a-16e91f98fa20","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_rg_mk6_helm/spr_rg_mk6_helm.yy b/sprites/spr_rg_mk6_helm/spr_rg_mk6_helm.yy index 25f60bf307..10e5e6ca30 100644 --- a/sprites/spr_rg_mk6_helm/spr_rg_mk6_helm.yy +++ b/sprites/spr_rg_mk6_helm/spr_rg_mk6_helm.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_rg_mk6_helm", "bboxMode":0, "bbox_bottom":47, @@ -12,8 +12,8 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"4ea300aa-38d8-4aee-99d8-c285deb673ee","name":"4ea300aa-38d8-4aee-99d8-c285deb673ee","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"d894a82d-5ebc-4d95-85c3-77c1ea5a803e","name":"d894a82d-5ebc-4d95-85c3-77c1ea5a803e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"4ea300aa-38d8-4aee-99d8-c285deb673ee","name":"4ea300aa-38d8-4aee-99d8-c285deb673ee","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"d894a82d-5ebc-4d95-85c3-77c1ea5a803e","name":"d894a82d-5ebc-4d95-85c3-77c1ea5a803e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -69,12 +69,8 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"4ea300aa-38d8-4aee-99d8-c285deb673ee","path":"sprites/spr_rg_mk6_helm/spr_rg_mk6_helm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"7f1677e0-0f38-4f52-a627-47e4289d2362","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"d894a82d-5ebc-4d95-85c3-77c1ea5a803e","path":"sprites/spr_rg_mk6_helm/spr_rg_mk6_helm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"9b689ef9-d60a-4607-8763-a4787092f4c9","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"4ea300aa-38d8-4aee-99d8-c285deb673ee","path":"sprites/spr_rg_mk6_helm/spr_rg_mk6_helm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"7f1677e0-0f38-4f52-a627-47e4289d2362","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"d894a82d-5ebc-4d95-85c3-77c1ea5a803e","path":"sprites/spr_rg_mk6_helm/spr_rg_mk6_helm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"9b689ef9-d60a-4607-8763-a4787092f4c9","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_rg_mk7_helm/spr_rg_mk7_helm.yy b/sprites/spr_rg_mk7_helm/spr_rg_mk7_helm.yy index 20583297a0..7f829e9dd6 100644 --- a/sprites/spr_rg_mk7_helm/spr_rg_mk7_helm.yy +++ b/sprites/spr_rg_mk7_helm/spr_rg_mk7_helm.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_rg_mk7_helm", "bboxMode":0, "bbox_bottom":43, @@ -12,8 +12,8 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"d180ba81-7586-41b6-a6d4-50590e5bf476","name":"d180ba81-7586-41b6-a6d4-50590e5bf476","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"035dc48e-d054-4138-99c1-3c0ba9933028","name":"035dc48e-d054-4138-99c1-3c0ba9933028","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"d180ba81-7586-41b6-a6d4-50590e5bf476","name":"d180ba81-7586-41b6-a6d4-50590e5bf476","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"035dc48e-d054-4138-99c1-3c0ba9933028","name":"035dc48e-d054-4138-99c1-3c0ba9933028","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -69,12 +69,8 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"d180ba81-7586-41b6-a6d4-50590e5bf476","path":"sprites/spr_rg_mk7_helm/spr_rg_mk7_helm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"6daeef45-8813-4e6d-9ef8-7612a88be84c","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"035dc48e-d054-4138-99c1-3c0ba9933028","path":"sprites/spr_rg_mk7_helm/spr_rg_mk7_helm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"88334651-7f26-4851-be94-2d5a48c4c788","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"d180ba81-7586-41b6-a6d4-50590e5bf476","path":"sprites/spr_rg_mk7_helm/spr_rg_mk7_helm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"6daeef45-8813-4e6d-9ef8-7612a88be84c","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"035dc48e-d054-4138-99c1-3c0ba9933028","path":"sprites/spr_rg_mk7_helm/spr_rg_mk7_helm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"88334651-7f26-4851-be94-2d5a48c4c788","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_right_pauldron_chainmail/spr_right_pauldron_chainmail.yy b/sprites/spr_right_pauldron_chainmail/spr_right_pauldron_chainmail.yy index b33eb95a2f..0d5a461ced 100644 --- a/sprites/spr_right_pauldron_chainmail/spr_right_pauldron_chainmail.yy +++ b/sprites/spr_right_pauldron_chainmail/spr_right_pauldron_chainmail.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_right_pauldron_chainmail", "bboxMode":0, "bbox_bottom":101, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"b6ba8600-fb6b-4fa9-abc7-bdc2311eb79e","name":"b6ba8600-fb6b-4fa9-abc7-bdc2311eb79e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"b6ba8600-fb6b-4fa9-abc7-bdc2311eb79e","name":"b6ba8600-fb6b-4fa9-abc7-bdc2311eb79e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -34,13 +34,7 @@ "resourceType":"GMNineSliceData", "resourceVersion":"2.0", "right":0, - "tileMode":[ - 0, - 0, - 0, - 0, - 0, - ], + "tileMode":[0,0,0,0,0,], "top":0, }, "origin":9, @@ -90,9 +84,7 @@ "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_right_pauldron_chainmail/spr_right_pauldron_chainmail.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"476ba96b-7680-45aa-b001-fa8c00b30b9b","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_right_pauldron_chainmail/spr_right_pauldron_chainmail.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"476ba96b-7680-45aa-b001-fa8c00b30b9b","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_right_pauldron_fur_hanging/spr_right_pauldron_fur_hanging.yy b/sprites/spr_right_pauldron_fur_hanging/spr_right_pauldron_fur_hanging.yy index 12ded5c93d..e9c5e959a5 100644 --- a/sprites/spr_right_pauldron_fur_hanging/spr_right_pauldron_fur_hanging.yy +++ b/sprites/spr_right_pauldron_fur_hanging/spr_right_pauldron_fur_hanging.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_right_pauldron_fur_hanging", "bboxMode":0, "bbox_bottom":117, @@ -12,10 +12,10 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"b6ba8600-fb6b-4fa9-abc7-bdc2311eb79e","name":"b6ba8600-fb6b-4fa9-abc7-bdc2311eb79e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"79bd7af2-b597-4d04-9558-b8bc390d83d6","name":"79bd7af2-b597-4d04-9558-b8bc390d83d6","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"52d5981c-c162-45da-84db-60501fe9d9f1","name":"52d5981c-c162-45da-84db-60501fe9d9f1","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"460206a5-318f-4048-bdf9-249e96846430","name":"460206a5-318f-4048-bdf9-249e96846430","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"b6ba8600-fb6b-4fa9-abc7-bdc2311eb79e","name":"b6ba8600-fb6b-4fa9-abc7-bdc2311eb79e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"79bd7af2-b597-4d04-9558-b8bc390d83d6","name":"79bd7af2-b597-4d04-9558-b8bc390d83d6","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"52d5981c-c162-45da-84db-60501fe9d9f1","name":"52d5981c-c162-45da-84db-60501fe9d9f1","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"460206a5-318f-4048-bdf9-249e96846430","name":"460206a5-318f-4048-bdf9-249e96846430","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -38,13 +38,7 @@ "resourceType":"GMNineSliceData", "resourceVersion":"2.0", "right":0, - "tileMode":[ - 0, - 0, - 0, - 0, - 0, - ], + "tileMode":[0,0,0,0,0,], "top":0, }, "origin":9, @@ -94,18 +88,10 @@ "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_right_pauldron_fur_hanging/spr_right_pauldron_fur_hanging.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"33d2e335-5dc5-4789-8de3-f0a1d7cd31eb","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"79bd7af2-b597-4d04-9558-b8bc390d83d6","path":"sprites/spr_right_pauldron_fur_hanging/spr_right_pauldron_fur_hanging.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"a12ed751-04fc-4209-ac99-48bcdbbc6165","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"52d5981c-c162-45da-84db-60501fe9d9f1","path":"sprites/spr_right_pauldron_fur_hanging/spr_right_pauldron_fur_hanging.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"e69e0ac3-f154-4767-862b-5fa127764071","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"460206a5-318f-4048-bdf9-249e96846430","path":"sprites/spr_right_pauldron_fur_hanging/spr_right_pauldron_fur_hanging.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"9fa8ac9e-2744-463d-8742-e306d24015c5","IsCreationKey":false,"Key":3.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_right_pauldron_fur_hanging/spr_right_pauldron_fur_hanging.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"33d2e335-5dc5-4789-8de3-f0a1d7cd31eb","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"79bd7af2-b597-4d04-9558-b8bc390d83d6","path":"sprites/spr_right_pauldron_fur_hanging/spr_right_pauldron_fur_hanging.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"a12ed751-04fc-4209-ac99-48bcdbbc6165","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"52d5981c-c162-45da-84db-60501fe9d9f1","path":"sprites/spr_right_pauldron_fur_hanging/spr_right_pauldron_fur_hanging.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"e69e0ac3-f154-4767-862b-5fa127764071","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"460206a5-318f-4048-bdf9-249e96846430","path":"sprites/spr_right_pauldron_fur_hanging/spr_right_pauldron_fur_hanging.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"9fa8ac9e-2744-463d-8742-e306d24015c5","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_right_shin_spikes/spr_right_shin_spikes.yy b/sprites/spr_right_shin_spikes/spr_right_shin_spikes.yy index f7253930c9..a9ed516189 100644 --- a/sprites/spr_right_shin_spikes/spr_right_shin_spikes.yy +++ b/sprites/spr_right_shin_spikes/spr_right_shin_spikes.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_right_shin_spikes", "bboxMode":0, "bbox_bottom":199, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"89a6d4dd-18ab-43ec-ad94-6adb0940fd20","name":"89a6d4dd-18ab-43ec-ad94-6adb0940fd20","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"89a6d4dd-18ab-43ec-ad94-6adb0940fd20","name":"89a6d4dd-18ab-43ec-ad94-6adb0940fd20","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -70,9 +70,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"89a6d4dd-18ab-43ec-ad94-6adb0940fd20","path":"sprites/spr_right_shin_spikes/spr_right_shin_spikes.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"4cca9923-5ca1-4f6c-8e91-f7ec56fa92a6","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"89a6d4dd-18ab-43ec-ad94-6adb0940fd20","path":"sprites/spr_right_shin_spikes/spr_right_shin_spikes.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"4cca9923-5ca1-4f6c-8e91-f7ec56fa92a6","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_rock_bg/spr_rock_bg.yy b/sprites/spr_rock_bg/spr_rock_bg.yy index 321f668fc0..a9eed43a6c 100644 --- a/sprites/spr_rock_bg/spr_rock_bg.yy +++ b/sprites/spr_rock_bg/spr_rock_bg.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_rock_bg", "bboxMode":0, "bbox_bottom":899, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"5bb8bcb3-8511-4a40-b275-1455a28fda12","name":"5bb8bcb3-8511-4a40-b275-1455a28fda12","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"5bb8bcb3-8511-4a40-b275-1455a28fda12","name":"5bb8bcb3-8511-4a40-b275-1455a28fda12","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"5bb8bcb3-8511-4a40-b275-1455a28fda12","path":"sprites/spr_rock_bg/spr_rock_bg.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"a2c8c984-e1ff-4038-9274-cae4d4aba40d","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"5bb8bcb3-8511-4a40-b275-1455a28fda12","path":"sprites/spr_rock_bg/spr_rock_bg.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"a2c8c984-e1ff-4038-9274-cae4d4aba40d","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_rocket/spr_rocket.yy b/sprites/spr_rocket/spr_rocket.yy index e867945c85..dd6b45a0d3 100644 --- a/sprites/spr_rocket/spr_rocket.yy +++ b/sprites/spr_rocket/spr_rocket.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_rocket", "bboxMode":0, "bbox_bottom":2, @@ -12,8 +12,8 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"fbdab96e-f60e-4aa7-a2c1-016c4609918a","name":"fbdab96e-f60e-4aa7-a2c1-016c4609918a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"31cd5292-4c56-490a-ac3b-bd6e71071eda","name":"31cd5292-4c56-490a-ac3b-bd6e71071eda","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"fbdab96e-f60e-4aa7-a2c1-016c4609918a","name":"fbdab96e-f60e-4aa7-a2c1-016c4609918a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"31cd5292-4c56-490a-ac3b-bd6e71071eda","name":"31cd5292-4c56-490a-ac3b-bd6e71071eda","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -69,12 +69,8 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"fbdab96e-f60e-4aa7-a2c1-016c4609918a","path":"sprites/spr_rocket/spr_rocket.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"a1f991b9-5dd3-499c-bcf3-a5e1a9a9dd46","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"31cd5292-4c56-490a-ac3b-bd6e71071eda","path":"sprites/spr_rocket/spr_rocket.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"72f52d58-18c4-4aee-8d08-559c984219a0","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"fbdab96e-f60e-4aa7-a2c1-016c4609918a","path":"sprites/spr_rocket/spr_rocket.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"a1f991b9-5dd3-499c-bcf3-a5e1a9a9dd46","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"31cd5292-4c56-490a-ac3b-bd6e71071eda","path":"sprites/spr_rocket/spr_rocket.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"72f52d58-18c4-4aee-8d08-559c984219a0","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":{ diff --git a/sprites/spr_rocket_ork/spr_rocket_ork.yy b/sprites/spr_rocket_ork/spr_rocket_ork.yy index 7c2df176de..f3c4c9d32f 100644 --- a/sprites/spr_rocket_ork/spr_rocket_ork.yy +++ b/sprites/spr_rocket_ork/spr_rocket_ork.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_rocket_ork", "bboxMode":0, "bbox_bottom":3, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"b424104a-105d-41c8-bc78-ffc41dcb6a5b","name":"b424104a-105d-41c8-bc78-ffc41dcb6a5b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"b424104a-105d-41c8-bc78-ffc41dcb6a5b","name":"b424104a-105d-41c8-bc78-ffc41dcb6a5b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"b424104a-105d-41c8-bc78-ffc41dcb6a5b","path":"sprites/spr_rocket_ork/spr_rocket_ork.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"7edaff64-0a68-4835-9f47-726e08bf1f2c","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"b424104a-105d-41c8-bc78-ffc41dcb6a5b","path":"sprites/spr_rocket_ork/spr_rocket_ork.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"7edaff64-0a68-4835-9f47-726e08bf1f2c","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":{ diff --git a/sprites/spr_rocket_whirl/spr_rocket_whirl.yy b/sprites/spr_rocket_whirl/spr_rocket_whirl.yy index 830a098fc1..cc163cea5c 100644 --- a/sprites/spr_rocket_whirl/spr_rocket_whirl.yy +++ b/sprites/spr_rocket_whirl/spr_rocket_whirl.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_rocket_whirl", "bboxMode":0, "bbox_bottom":3, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"46a69d36-f9b9-42e5-b49b-29e46f310d4d","name":"46a69d36-f9b9-42e5-b49b-29e46f310d4d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"46a69d36-f9b9-42e5-b49b-29e46f310d4d","name":"46a69d36-f9b9-42e5-b49b-29e46f310d4d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"46a69d36-f9b9-42e5-b49b-29e46f310d4d","path":"sprites/spr_rocket_whirl/spr_rocket_whirl.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"dfd43af1-35a8-43b8-98e6-2b1a7a9f9aa4","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"46a69d36-f9b9-42e5-b49b-29e46f310d4d","path":"sprites/spr_rocket_whirl/spr_rocket_whirl.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"dfd43af1-35a8-43b8-98e6-2b1a7a9f9aa4","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":{ diff --git a/sprites/spr_roman_centurian_crest/spr_roman_centurian_crest.yy b/sprites/spr_roman_centurian_crest/spr_roman_centurian_crest.yy index eee2f59f99..8e7ef3fb82 100644 --- a/sprites/spr_roman_centurian_crest/spr_roman_centurian_crest.yy +++ b/sprites/spr_roman_centurian_crest/spr_roman_centurian_crest.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_roman_centurian_crest", "bboxMode":0, "bbox_bottom":87, @@ -12,9 +12,9 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"dd649fd8-7e35-4852-a36d-a78f4f914d36","name":"dd649fd8-7e35-4852-a36d-a78f4f914d36","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"ecad98d1-bb1f-4cb3-b4f0-6d3bdd38418e","name":"ecad98d1-bb1f-4cb3-b4f0-6d3bdd38418e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"93ba81df-88f2-4d08-9f82-8e78097802e9","name":"93ba81df-88f2-4d08-9f82-8e78097802e9","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"dd649fd8-7e35-4852-a36d-a78f4f914d36","name":"dd649fd8-7e35-4852-a36d-a78f4f914d36","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"ecad98d1-bb1f-4cb3-b4f0-6d3bdd38418e","name":"ecad98d1-bb1f-4cb3-b4f0-6d3bdd38418e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"93ba81df-88f2-4d08-9f82-8e78097802e9","name":"93ba81df-88f2-4d08-9f82-8e78097802e9","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -70,15 +70,9 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"dd649fd8-7e35-4852-a36d-a78f4f914d36","path":"sprites/spr_roman_centurian_crest/spr_roman_centurian_crest.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"508f7cdc-6556-4fd2-ae19-caa00fdda7cd","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"ecad98d1-bb1f-4cb3-b4f0-6d3bdd38418e","path":"sprites/spr_roman_centurian_crest/spr_roman_centurian_crest.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"081e45b1-f437-4ec9-bca2-4b4d5bd6000f","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"93ba81df-88f2-4d08-9f82-8e78097802e9","path":"sprites/spr_roman_centurian_crest/spr_roman_centurian_crest.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"2c11e64b-0ad4-4a34-a388-29e5e02054b8","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"dd649fd8-7e35-4852-a36d-a78f4f914d36","path":"sprites/spr_roman_centurian_crest/spr_roman_centurian_crest.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"508f7cdc-6556-4fd2-ae19-caa00fdda7cd","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"ecad98d1-bb1f-4cb3-b4f0-6d3bdd38418e","path":"sprites/spr_roman_centurian_crest/spr_roman_centurian_crest.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"081e45b1-f437-4ec9-bca2-4b4d5bd6000f","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"93ba81df-88f2-4d08-9f82-8e78097802e9","path":"sprites/spr_roman_centurian_crest/spr_roman_centurian_crest.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"2c11e64b-0ad4-4a34-a388-29e5e02054b8","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_roman_cloak/spr_roman_cloak.yy b/sprites/spr_roman_cloak/spr_roman_cloak.yy index 67d20f28ba..d1fe356077 100644 --- a/sprites/spr_roman_cloak/spr_roman_cloak.yy +++ b/sprites/spr_roman_cloak/spr_roman_cloak.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_roman_cloak", "bboxMode":0, "bbox_bottom":198, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"a480dd5e-cfcb-474b-a59c-731ac71985a6","name":"a480dd5e-cfcb-474b-a59c-731ac71985a6","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"a480dd5e-cfcb-474b-a59c-731ac71985a6","name":"a480dd5e-cfcb-474b-a59c-731ac71985a6","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -69,9 +69,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"a480dd5e-cfcb-474b-a59c-731ac71985a6","path":"sprites/spr_roman_cloak/spr_roman_cloak.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"60ec27ae-3716-4f2f-bedd-ecb89a562808","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"a480dd5e-cfcb-474b-a59c-731ac71985a6","path":"sprites/spr_roman_cloak/spr_roman_cloak.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"60ec27ae-3716-4f2f-bedd-ecb89a562808","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_roman_tabbard/spr_roman_tabbard.yy b/sprites/spr_roman_tabbard/spr_roman_tabbard.yy index d9a1bdc2ad..41e56a2f11 100644 --- a/sprites/spr_roman_tabbard/spr_roman_tabbard.yy +++ b/sprites/spr_roman_tabbard/spr_roman_tabbard.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_roman_tabbard", "bboxMode":0, "bbox_bottom":167, @@ -12,10 +12,10 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"438faf08-020c-4bdf-a878-8a0b45400e3a","name":"438faf08-020c-4bdf-a878-8a0b45400e3a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"ecc8abbc-4261-4c83-9cc1-81689ab505bf","name":"ecc8abbc-4261-4c83-9cc1-81689ab505bf","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"b829e070-a074-46e9-8d94-6507222cc796","name":"b829e070-a074-46e9-8d94-6507222cc796","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"e4a11296-f2eb-4f90-9581-bbca8ab08d78","name":"e4a11296-f2eb-4f90-9581-bbca8ab08d78","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"438faf08-020c-4bdf-a878-8a0b45400e3a","name":"438faf08-020c-4bdf-a878-8a0b45400e3a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"ecc8abbc-4261-4c83-9cc1-81689ab505bf","name":"ecc8abbc-4261-4c83-9cc1-81689ab505bf","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"b829e070-a074-46e9-8d94-6507222cc796","name":"b829e070-a074-46e9-8d94-6507222cc796","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"e4a11296-f2eb-4f90-9581-bbca8ab08d78","name":"e4a11296-f2eb-4f90-9581-bbca8ab08d78","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -73,18 +73,10 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"438faf08-020c-4bdf-a878-8a0b45400e3a","path":"sprites/spr_roman_tabbard/spr_roman_tabbard.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"4e16b319-3f1e-426c-b41e-a1334b774b27","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"ecc8abbc-4261-4c83-9cc1-81689ab505bf","path":"sprites/spr_roman_tabbard/spr_roman_tabbard.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"dc2b5276-f541-4905-907d-6ff1d1db896d","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"b829e070-a074-46e9-8d94-6507222cc796","path":"sprites/spr_roman_tabbard/spr_roman_tabbard.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"236d0bfc-7eb0-434a-936b-b17f5ed52954","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"e4a11296-f2eb-4f90-9581-bbca8ab08d78","path":"sprites/spr_roman_tabbard/spr_roman_tabbard.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"5d0ab5f8-6b38-401e-ab12-57064b78101a","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"438faf08-020c-4bdf-a878-8a0b45400e3a","path":"sprites/spr_roman_tabbard/spr_roman_tabbard.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"4e16b319-3f1e-426c-b41e-a1334b774b27","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"ecc8abbc-4261-4c83-9cc1-81689ab505bf","path":"sprites/spr_roman_tabbard/spr_roman_tabbard.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"dc2b5276-f541-4905-907d-6ff1d1db896d","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"b829e070-a074-46e9-8d94-6507222cc796","path":"sprites/spr_roman_tabbard/spr_roman_tabbard.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"236d0bfc-7eb0-434a-936b-b17f5ed52954","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"e4a11296-f2eb-4f90-9581-bbca8ab08d78","path":"sprites/spr_roman_tabbard/spr_roman_tabbard.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"5d0ab5f8-6b38-401e-ab12-57064b78101a","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_round/spr_round.yy b/sprites/spr_round/spr_round.yy index 49fdb14d54..6764226735 100644 --- a/sprites/spr_round/spr_round.yy +++ b/sprites/spr_round/spr_round.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_round", "bboxMode":0, "bbox_bottom":4, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"8a689993-189b-4e77-b0e3-ce46b98da50f","name":"8a689993-189b-4e77-b0e3-ce46b98da50f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"8a689993-189b-4e77-b0e3-ce46b98da50f","name":"8a689993-189b-4e77-b0e3-ce46b98da50f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"8a689993-189b-4e77-b0e3-ce46b98da50f","path":"sprites/spr_round/spr_round.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"3404087c-38fe-4166-a339-626d9a1dbf54","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"8a689993-189b-4e77-b0e3-ce46b98da50f","path":"sprites/spr_round/spr_round.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"3404087c-38fe-4166-a339-626d9a1dbf54","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":{ diff --git a/sprites/spr_runes_hanging/spr_runes_hanging.yy b/sprites/spr_runes_hanging/spr_runes_hanging.yy index 39a9060978..fa7278b636 100644 --- a/sprites/spr_runes_hanging/spr_runes_hanging.yy +++ b/sprites/spr_runes_hanging/spr_runes_hanging.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_runes_hanging", "bboxMode":0, "bbox_bottom":33, @@ -12,9 +12,9 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"0926bad1-dfb3-41bb-b6ee-7732d3036688","name":"0926bad1-dfb3-41bb-b6ee-7732d3036688","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"3a6549d5-f97d-40c9-99e2-44d6dfa275a9","name":"3a6549d5-f97d-40c9-99e2-44d6dfa275a9","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"9ca26a83-de22-44ea-b6e3-881cdf1d011e","name":"9ca26a83-de22-44ea-b6e3-881cdf1d011e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"0926bad1-dfb3-41bb-b6ee-7732d3036688","name":"0926bad1-dfb3-41bb-b6ee-7732d3036688","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"3a6549d5-f97d-40c9-99e2-44d6dfa275a9","name":"3a6549d5-f97d-40c9-99e2-44d6dfa275a9","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"9ca26a83-de22-44ea-b6e3-881cdf1d011e","name":"9ca26a83-de22-44ea-b6e3-881cdf1d011e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -70,15 +70,9 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"0926bad1-dfb3-41bb-b6ee-7732d3036688","path":"sprites/spr_runes_hanging/spr_runes_hanging.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"8063ca68-f497-45e7-a395-cefa25b8634d","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"3a6549d5-f97d-40c9-99e2-44d6dfa275a9","path":"sprites/spr_runes_hanging/spr_runes_hanging.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"0030ce9b-8b1d-4287-8146-0ee5744db08f","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"9ca26a83-de22-44ea-b6e3-881cdf1d011e","path":"sprites/spr_runes_hanging/spr_runes_hanging.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"b42a06ce-b79c-4c9f-91f7-7f2f50d3f451","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"0926bad1-dfb3-41bb-b6ee-7732d3036688","path":"sprites/spr_runes_hanging/spr_runes_hanging.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"8063ca68-f497-45e7-a395-cefa25b8634d","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"3a6549d5-f97d-40c9-99e2-44d6dfa275a9","path":"sprites/spr_runes_hanging/spr_runes_hanging.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"0030ce9b-8b1d-4287-8146-0ee5744db08f","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"9ca26a83-de22-44ea-b6e3-881cdf1d011e","path":"sprites/spr_runes_hanging/spr_runes_hanging.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"b42a06ce-b79c-4c9f-91f7-7f2f50d3f451","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_runi/spr_runi.yy b/sprites/spr_runi/spr_runi.yy index 3d0e4f22d6..fa007b6c48 100644 --- a/sprites/spr_runi/spr_runi.yy +++ b/sprites/spr_runi/spr_runi.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_runi", "bboxMode":0, "bbox_bottom":594, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"e8353308-fb32-4fe2-ba12-699e1c9324fe","name":"e8353308-fb32-4fe2-ba12-699e1c9324fe","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"e8353308-fb32-4fe2-ba12-699e1c9324fe","name":"e8353308-fb32-4fe2-ba12-699e1c9324fe","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -70,9 +70,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"e8353308-fb32-4fe2-ba12-699e1c9324fe","path":"sprites/spr_runi/spr_runi.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"12a9f26e-4b5b-4a77-94da-1a7dcb969626","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"e8353308-fb32-4fe2-ba12-699e1c9324fe","path":"sprites/spr_runi/spr_runi.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"12a9f26e-4b5b-4a77-94da-1a7dcb969626","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_sal_mk5_helm/spr_sal_mk5_helm.yy b/sprites/spr_sal_mk5_helm/spr_sal_mk5_helm.yy index 091d0159f2..3d51596537 100644 --- a/sprites/spr_sal_mk5_helm/spr_sal_mk5_helm.yy +++ b/sprites/spr_sal_mk5_helm/spr_sal_mk5_helm.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_sal_mk5_helm", "bboxMode":0, "bbox_bottom":43, @@ -12,8 +12,8 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"2f64d54a-0827-4814-aa34-420768d2e26f","name":"2f64d54a-0827-4814-aa34-420768d2e26f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"eddeafd5-5003-4157-91a2-8d4836dd19da","name":"eddeafd5-5003-4157-91a2-8d4836dd19da","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"2f64d54a-0827-4814-aa34-420768d2e26f","name":"2f64d54a-0827-4814-aa34-420768d2e26f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"eddeafd5-5003-4157-91a2-8d4836dd19da","name":"eddeafd5-5003-4157-91a2-8d4836dd19da","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -69,12 +69,8 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"2f64d54a-0827-4814-aa34-420768d2e26f","path":"sprites/spr_sal_mk5_helm/spr_sal_mk5_helm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"11e32477-62a6-4221-aed9-7427cfef7d74","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"eddeafd5-5003-4157-91a2-8d4836dd19da","path":"sprites/spr_sal_mk5_helm/spr_sal_mk5_helm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"2f67fbbb-e174-495e-8ddd-953b11ba345d","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"2f64d54a-0827-4814-aa34-420768d2e26f","path":"sprites/spr_sal_mk5_helm/spr_sal_mk5_helm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"11e32477-62a6-4221-aed9-7427cfef7d74","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"eddeafd5-5003-4157-91a2-8d4836dd19da","path":"sprites/spr_sal_mk5_helm/spr_sal_mk5_helm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"2f67fbbb-e174-495e-8ddd-953b11ba345d","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_sal_mk6_helm/spr_sal_mk6_helm.yy b/sprites/spr_sal_mk6_helm/spr_sal_mk6_helm.yy index 3c76fb79aa..2cf8084790 100644 --- a/sprites/spr_sal_mk6_helm/spr_sal_mk6_helm.yy +++ b/sprites/spr_sal_mk6_helm/spr_sal_mk6_helm.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_sal_mk6_helm", "bboxMode":0, "bbox_bottom":47, @@ -12,8 +12,8 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"edc2bf09-71a9-4262-82e3-7d521f4df9b4","name":"edc2bf09-71a9-4262-82e3-7d521f4df9b4","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"ac6be2f1-61f6-4dcb-8c1a-c8c4ce138dda","name":"ac6be2f1-61f6-4dcb-8c1a-c8c4ce138dda","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"edc2bf09-71a9-4262-82e3-7d521f4df9b4","name":"edc2bf09-71a9-4262-82e3-7d521f4df9b4","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"ac6be2f1-61f6-4dcb-8c1a-c8c4ce138dda","name":"ac6be2f1-61f6-4dcb-8c1a-c8c4ce138dda","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -69,12 +69,8 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"edc2bf09-71a9-4262-82e3-7d521f4df9b4","path":"sprites/spr_sal_mk6_helm/spr_sal_mk6_helm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"179171d0-8a6b-49c9-aaf5-cf15c1fe2765","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"ac6be2f1-61f6-4dcb-8c1a-c8c4ce138dda","path":"sprites/spr_sal_mk6_helm/spr_sal_mk6_helm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"dc8b1087-d55f-49fb-8979-f211b1113861","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"edc2bf09-71a9-4262-82e3-7d521f4df9b4","path":"sprites/spr_sal_mk6_helm/spr_sal_mk6_helm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"179171d0-8a6b-49c9-aaf5-cf15c1fe2765","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"ac6be2f1-61f6-4dcb-8c1a-c8c4ce138dda","path":"sprites/spr_sal_mk6_helm/spr_sal_mk6_helm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"dc8b1087-d55f-49fb-8979-f211b1113861","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_sal_mk7_helm/spr_sal_mk7_helm.yy b/sprites/spr_sal_mk7_helm/spr_sal_mk7_helm.yy index f586bafef3..f12df3e139 100644 --- a/sprites/spr_sal_mk7_helm/spr_sal_mk7_helm.yy +++ b/sprites/spr_sal_mk7_helm/spr_sal_mk7_helm.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_sal_mk7_helm", "bboxMode":0, "bbox_bottom":43, @@ -12,8 +12,8 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"abe0f8e7-4465-4a93-aa4e-d3f59a6ea099","name":"abe0f8e7-4465-4a93-aa4e-d3f59a6ea099","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"bb9199c9-3066-4c7d-9c29-8d5d7acac4f2","name":"bb9199c9-3066-4c7d-9c29-8d5d7acac4f2","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"abe0f8e7-4465-4a93-aa4e-d3f59a6ea099","name":"abe0f8e7-4465-4a93-aa4e-d3f59a6ea099","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"bb9199c9-3066-4c7d-9c29-8d5d7acac4f2","name":"bb9199c9-3066-4c7d-9c29-8d5d7acac4f2","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -69,12 +69,8 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"abe0f8e7-4465-4a93-aa4e-d3f59a6ea099","path":"sprites/spr_sal_mk7_helm/spr_sal_mk7_helm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"98f7ee0d-de6c-40e4-bea8-5cdb875c68aa","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"bb9199c9-3066-4c7d-9c29-8d5d7acac4f2","path":"sprites/spr_sal_mk7_helm/spr_sal_mk7_helm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"f71d9fe5-e2bc-451e-8e76-ddc75512c23e","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"abe0f8e7-4465-4a93-aa4e-d3f59a6ea099","path":"sprites/spr_sal_mk7_helm/spr_sal_mk7_helm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"98f7ee0d-de6c-40e4-bea8-5cdb875c68aa","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"bb9199c9-3066-4c7d-9c29-8d5d7acac4f2","path":"sprites/spr_sal_mk7_helm/spr_sal_mk7_helm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"f71d9fe5-e2bc-451e-8e76-ddc75512c23e","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_sanguin_guard/spr_sanguin_guard.yy b/sprites/spr_sanguin_guard/spr_sanguin_guard.yy index 6d290489db..803d21a215 100644 --- a/sprites/spr_sanguin_guard/spr_sanguin_guard.yy +++ b/sprites/spr_sanguin_guard/spr_sanguin_guard.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_sanguin_guard", "bboxMode":0, "bbox_bottom":271, @@ -12,8 +12,8 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"1d39ed2e-1e13-4613-90de-a21b28017808","name":"1d39ed2e-1e13-4613-90de-a21b28017808","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"6e84cd8e-d989-4364-8931-044b097b2c0b","name":"6e84cd8e-d989-4364-8931-044b097b2c0b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"1d39ed2e-1e13-4613-90de-a21b28017808","name":"1d39ed2e-1e13-4613-90de-a21b28017808","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"6e84cd8e-d989-4364-8931-044b097b2c0b","name":"6e84cd8e-d989-4364-8931-044b097b2c0b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -69,12 +69,8 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"1d39ed2e-1e13-4613-90de-a21b28017808","path":"sprites/spr_sanguin_guard/spr_sanguin_guard.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"46b887ed-d41d-4816-934e-b3d81925b4ec","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"6e84cd8e-d989-4364-8931-044b097b2c0b","path":"sprites/spr_sanguin_guard/spr_sanguin_guard.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"41a96470-a2cc-4913-89ba-084ca5b95be3","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"1d39ed2e-1e13-4613-90de-a21b28017808","path":"sprites/spr_sanguin_guard/spr_sanguin_guard.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"46b887ed-d41d-4816-934e-b3d81925b4ec","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"6e84cd8e-d989-4364-8931-044b097b2c0b","path":"sprites/spr_sanguin_guard/spr_sanguin_guard.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"41a96470-a2cc-4913-89ba-084ca5b95be3","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_save_data/spr_save_data.yy b/sprites/spr_save_data/spr_save_data.yy index 05029a0881..0299fd0e30 100644 --- a/sprites/spr_save_data/spr_save_data.yy +++ b/sprites/spr_save_data/spr_save_data.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_save_data", "bboxMode":0, "bbox_bottom":148, @@ -12,8 +12,8 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"a2573e7a-66aa-414c-a9e4-dba6d74b27ce","name":"a2573e7a-66aa-414c-a9e4-dba6d74b27ce","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"9b5c2bb2-6ea3-4af1-a773-dbf96c46133b","name":"9b5c2bb2-6ea3-4af1-a773-dbf96c46133b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"a2573e7a-66aa-414c-a9e4-dba6d74b27ce","name":"a2573e7a-66aa-414c-a9e4-dba6d74b27ce","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"9b5c2bb2-6ea3-4af1-a773-dbf96c46133b","name":"9b5c2bb2-6ea3-4af1-a773-dbf96c46133b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -69,12 +69,8 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"a2573e7a-66aa-414c-a9e4-dba6d74b27ce","path":"sprites/spr_save_data/spr_save_data.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"fa10b32e-1760-4f33-a7de-ab420904efee","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"9b5c2bb2-6ea3-4af1-a773-dbf96c46133b","path":"sprites/spr_save_data/spr_save_data.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"f9ce4746-507b-478b-abb0-c66f8a91886a","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"a2573e7a-66aa-414c-a9e4-dba6d74b27ce","path":"sprites/spr_save_data/spr_save_data.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"fa10b32e-1760-4f33-a7de-ab420904efee","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"9b5c2bb2-6ea3-4af1-a773-dbf96c46133b","path":"sprites/spr_save_data/spr_save_data.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"f9ce4746-507b-478b-abb0-c66f8a91886a","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":{ diff --git a/sprites/spr_save_footer/spr_save_footer.yy b/sprites/spr_save_footer/spr_save_footer.yy index d747c49060..eebb11ce8c 100644 --- a/sprites/spr_save_footer/spr_save_footer.yy +++ b/sprites/spr_save_footer/spr_save_footer.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_save_footer", "bboxMode":0, "bbox_bottom":22, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"7fac7063-30a5-452e-9407-1c9ff0a74081","name":"7fac7063-30a5-452e-9407-1c9ff0a74081","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"7fac7063-30a5-452e-9407-1c9ff0a74081","name":"7fac7063-30a5-452e-9407-1c9ff0a74081","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"7fac7063-30a5-452e-9407-1c9ff0a74081","path":"sprites/spr_save_footer/spr_save_footer.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"d1dc09db-0d3d-47f3-95ad-8da60232d5c4","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"7fac7063-30a5-452e-9407-1c9ff0a74081","path":"sprites/spr_save_footer/spr_save_footer.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"d1dc09db-0d3d-47f3-95ad-8da60232d5c4","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_save_header/spr_save_header.yy b/sprites/spr_save_header/spr_save_header.yy index 9026f30431..38d593c5e8 100644 --- a/sprites/spr_save_header/spr_save_header.yy +++ b/sprites/spr_save_header/spr_save_header.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_save_header", "bboxMode":0, "bbox_bottom":121, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"daa34b23-2885-4a5d-a159-a3a2a8fd2ee5","name":"daa34b23-2885-4a5d-a159-a3a2a8fd2ee5","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"daa34b23-2885-4a5d-a159-a3a2a8fd2ee5","name":"daa34b23-2885-4a5d-a159-a3a2a8fd2ee5","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"daa34b23-2885-4a5d-a159-a3a2a8fd2ee5","path":"sprites/spr_save_header/spr_save_header.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"dea20569-1407-453c-ad16-91a5dccef40c","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"daa34b23-2885-4a5d-a159-a3a2a8fd2ee5","path":"sprites/spr_save_header/spr_save_header.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"dea20569-1407-453c-ad16-91a5dccef40c","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_save_headers/spr_save_headers.yy b/sprites/spr_save_headers/spr_save_headers.yy index d9d16c670c..b8a5fa4240 100644 --- a/sprites/spr_save_headers/spr_save_headers.yy +++ b/sprites/spr_save_headers/spr_save_headers.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_save_headers", "bboxMode":0, "bbox_bottom":43, @@ -12,8 +12,8 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"ba4bb2da-0bb0-40ce-a88c-8e60a1914620","name":"ba4bb2da-0bb0-40ce-a88c-8e60a1914620","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"09e014e6-17f3-43e9-8c5c-f36cdf4973be","name":"09e014e6-17f3-43e9-8c5c-f36cdf4973be","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"ba4bb2da-0bb0-40ce-a88c-8e60a1914620","name":"ba4bb2da-0bb0-40ce-a88c-8e60a1914620","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"09e014e6-17f3-43e9-8c5c-f36cdf4973be","name":"09e014e6-17f3-43e9-8c5c-f36cdf4973be","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -69,12 +69,8 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"ba4bb2da-0bb0-40ce-a88c-8e60a1914620","path":"sprites/spr_save_headers/spr_save_headers.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"4265250d-287d-4acb-8680-f4646fa0c8ac","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"09e014e6-17f3-43e9-8c5c-f36cdf4973be","path":"sprites/spr_save_headers/spr_save_headers.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"38bad956-b039-4cbb-9d79-eff1f3f84425","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"ba4bb2da-0bb0-40ce-a88c-8e60a1914620","path":"sprites/spr_save_headers/spr_save_headers.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"4265250d-287d-4acb-8680-f4646fa0c8ac","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"09e014e6-17f3-43e9-8c5c-f36cdf4973be","path":"sprites/spr_save_headers/spr_save_headers.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"38bad956-b039-4cbb-9d79-eff1f3f84425","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_saveload/spr_saveload.yy b/sprites/spr_saveload/spr_saveload.yy index 13a4b6ef27..56f23f4d44 100644 --- a/sprites/spr_saveload/spr_saveload.yy +++ b/sprites/spr_saveload/spr_saveload.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_saveload", "bboxMode":0, "bbox_bottom":134, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"b8e32215-7622-4eef-af7b-824e15be42d2","name":"b8e32215-7622-4eef-af7b-824e15be42d2","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"b8e32215-7622-4eef-af7b-824e15be42d2","name":"b8e32215-7622-4eef-af7b-824e15be42d2","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"b8e32215-7622-4eef-af7b-824e15be42d2","path":"sprites/spr_saveload/spr_saveload.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"813303e0-d3ae-424e-b769-32da363af5c8","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"b8e32215-7622-4eef-af7b-824e15be42d2","path":"sprites/spr_saveload/spr_saveload.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"813303e0-d3ae-424e-b769-32da363af5c8","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":{ diff --git a/sprites/spr_scout_arms/spr_scout_arms.yy b/sprites/spr_scout_arms/spr_scout_arms.yy index f4bc0468e8..ace7e27f01 100644 --- a/sprites/spr_scout_arms/spr_scout_arms.yy +++ b/sprites/spr_scout_arms/spr_scout_arms.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_scout_arms", "bboxMode":0, "bbox_bottom":148, @@ -12,8 +12,8 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"7d0becbe-30f8-4a46-bedf-3d9495863023","name":"7d0becbe-30f8-4a46-bedf-3d9495863023","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"5a5a1c0d-1fdd-4ff5-ab6a-43ed5e540374","name":"5a5a1c0d-1fdd-4ff5-ab6a-43ed5e540374","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"7d0becbe-30f8-4a46-bedf-3d9495863023","name":"7d0becbe-30f8-4a46-bedf-3d9495863023","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"5a5a1c0d-1fdd-4ff5-ab6a-43ed5e540374","name":"5a5a1c0d-1fdd-4ff5-ab6a-43ed5e540374","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -69,12 +69,8 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"7d0becbe-30f8-4a46-bedf-3d9495863023","path":"sprites/spr_scout_arms/spr_scout_arms.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"c6bc053b-c894-460e-ac79-cd852f23c9c3","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"5a5a1c0d-1fdd-4ff5-ab6a-43ed5e540374","path":"sprites/spr_scout_arms/spr_scout_arms.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"41583aef-5412-457d-9744-f18a930b7a7c","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"7d0becbe-30f8-4a46-bedf-3d9495863023","path":"sprites/spr_scout_arms/spr_scout_arms.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"c6bc053b-c894-460e-ac79-cd852f23c9c3","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"5a5a1c0d-1fdd-4ff5-ab6a-43ed5e540374","path":"sprites/spr_scout_arms/spr_scout_arms.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"41583aef-5412-457d-9744-f18a930b7a7c","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_scout_colors/spr_scout_colors.yy b/sprites/spr_scout_colors/spr_scout_colors.yy index c2d62c1425..40dae1500a 100644 --- a/sprites/spr_scout_colors/spr_scout_colors.yy +++ b/sprites/spr_scout_colors/spr_scout_colors.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_scout_colors", "bboxMode":0, "bbox_bottom":224, @@ -12,18 +12,18 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"9e0bccee-8acd-43a6-b2a2-dde31188a7bd","name":"9e0bccee-8acd-43a6-b2a2-dde31188a7bd","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"ef0f181d-ac35-46c7-a638-d4505b813415","name":"ef0f181d-ac35-46c7-a638-d4505b813415","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"955d0257-722c-4028-932b-5740aecc7d30","name":"955d0257-722c-4028-932b-5740aecc7d30","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"bce9e34a-4a90-4f93-83c7-018f77addcdf","name":"bce9e34a-4a90-4f93-83c7-018f77addcdf","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"a6da1856-79f0-4a6f-940c-bf95033834d1","name":"a6da1856-79f0-4a6f-940c-bf95033834d1","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"48e52af8-1443-4d50-8ab3-941caf166149","name":"48e52af8-1443-4d50-8ab3-941caf166149","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"a291a646-2b5b-4a52-b47a-3814c77f4dfe","name":"a291a646-2b5b-4a52-b47a-3814c77f4dfe","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"e57071a6-5e15-446b-85b0-c663e938470c","name":"e57071a6-5e15-446b-85b0-c663e938470c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"4e58d1f2-8813-4ca7-b477-8f85dfa5fb63","name":"4e58d1f2-8813-4ca7-b477-8f85dfa5fb63","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"cf79f59c-ee61-423f-8697-26acae0d7361","name":"cf79f59c-ee61-423f-8697-26acae0d7361","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"faa1c73b-982b-4c8c-9302-14f9cdf5126a","name":"faa1c73b-982b-4c8c-9302-14f9cdf5126a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"38579090-ad10-4741-9b4a-7c6478e31a26","name":"38579090-ad10-4741-9b4a-7c6478e31a26","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"9e0bccee-8acd-43a6-b2a2-dde31188a7bd","name":"9e0bccee-8acd-43a6-b2a2-dde31188a7bd","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"ef0f181d-ac35-46c7-a638-d4505b813415","name":"ef0f181d-ac35-46c7-a638-d4505b813415","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"955d0257-722c-4028-932b-5740aecc7d30","name":"955d0257-722c-4028-932b-5740aecc7d30","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"bce9e34a-4a90-4f93-83c7-018f77addcdf","name":"bce9e34a-4a90-4f93-83c7-018f77addcdf","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"a6da1856-79f0-4a6f-940c-bf95033834d1","name":"a6da1856-79f0-4a6f-940c-bf95033834d1","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"48e52af8-1443-4d50-8ab3-941caf166149","name":"48e52af8-1443-4d50-8ab3-941caf166149","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"a291a646-2b5b-4a52-b47a-3814c77f4dfe","name":"a291a646-2b5b-4a52-b47a-3814c77f4dfe","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"e57071a6-5e15-446b-85b0-c663e938470c","name":"e57071a6-5e15-446b-85b0-c663e938470c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"4e58d1f2-8813-4ca7-b477-8f85dfa5fb63","name":"4e58d1f2-8813-4ca7-b477-8f85dfa5fb63","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"cf79f59c-ee61-423f-8697-26acae0d7361","name":"cf79f59c-ee61-423f-8697-26acae0d7361","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"faa1c73b-982b-4c8c-9302-14f9cdf5126a","name":"faa1c73b-982b-4c8c-9302-14f9cdf5126a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"38579090-ad10-4741-9b4a-7c6478e31a26","name":"38579090-ad10-4741-9b4a-7c6478e31a26","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -81,42 +81,18 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"9e0bccee-8acd-43a6-b2a2-dde31188a7bd","path":"sprites/spr_scout_colors/spr_scout_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"8d5d4c8b-01fd-4390-8694-cf9ddd810069","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"ef0f181d-ac35-46c7-a638-d4505b813415","path":"sprites/spr_scout_colors/spr_scout_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"4aa7b4ca-0c75-457b-a50f-13d5f19245cb","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"955d0257-722c-4028-932b-5740aecc7d30","path":"sprites/spr_scout_colors/spr_scout_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"fe7f9372-79c7-437e-bbb4-7790f934e59e","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"bce9e34a-4a90-4f93-83c7-018f77addcdf","path":"sprites/spr_scout_colors/spr_scout_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"c507679e-8f8a-4ef4-8222-1b9ce635927b","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"a6da1856-79f0-4a6f-940c-bf95033834d1","path":"sprites/spr_scout_colors/spr_scout_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"5a84c13f-6866-4eec-8bae-6be7cb7a0362","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"48e52af8-1443-4d50-8ab3-941caf166149","path":"sprites/spr_scout_colors/spr_scout_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"de2bac43-95c3-4de0-83e3-8f3de63440d4","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"a291a646-2b5b-4a52-b47a-3814c77f4dfe","path":"sprites/spr_scout_colors/spr_scout_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"147bd5ab-89e6-4a62-bfdc-8349bdc18418","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"e57071a6-5e15-446b-85b0-c663e938470c","path":"sprites/spr_scout_colors/spr_scout_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"ff8965c0-516f-4910-be5f-29bbda2b7dad","IsCreationKey":false,"Key":7.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"4e58d1f2-8813-4ca7-b477-8f85dfa5fb63","path":"sprites/spr_scout_colors/spr_scout_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"17242221-c2eb-40aa-9597-b0fe258a7de0","IsCreationKey":false,"Key":8.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"cf79f59c-ee61-423f-8697-26acae0d7361","path":"sprites/spr_scout_colors/spr_scout_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"91cb7282-2dc4-44bc-8b17-2f5588596a4e","IsCreationKey":false,"Key":9.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"faa1c73b-982b-4c8c-9302-14f9cdf5126a","path":"sprites/spr_scout_colors/spr_scout_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"4cb8dde6-007f-4ada-a643-60e7a3e8795d","IsCreationKey":false,"Key":10.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"38579090-ad10-4741-9b4a-7c6478e31a26","path":"sprites/spr_scout_colors/spr_scout_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"d40f65ca-ce19-40f9-9564-74c25672707f","IsCreationKey":false,"Key":11.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"9e0bccee-8acd-43a6-b2a2-dde31188a7bd","path":"sprites/spr_scout_colors/spr_scout_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"8d5d4c8b-01fd-4390-8694-cf9ddd810069","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"ef0f181d-ac35-46c7-a638-d4505b813415","path":"sprites/spr_scout_colors/spr_scout_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"4aa7b4ca-0c75-457b-a50f-13d5f19245cb","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"955d0257-722c-4028-932b-5740aecc7d30","path":"sprites/spr_scout_colors/spr_scout_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"fe7f9372-79c7-437e-bbb4-7790f934e59e","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"bce9e34a-4a90-4f93-83c7-018f77addcdf","path":"sprites/spr_scout_colors/spr_scout_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"c507679e-8f8a-4ef4-8222-1b9ce635927b","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"a6da1856-79f0-4a6f-940c-bf95033834d1","path":"sprites/spr_scout_colors/spr_scout_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"5a84c13f-6866-4eec-8bae-6be7cb7a0362","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"48e52af8-1443-4d50-8ab3-941caf166149","path":"sprites/spr_scout_colors/spr_scout_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"de2bac43-95c3-4de0-83e3-8f3de63440d4","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"a291a646-2b5b-4a52-b47a-3814c77f4dfe","path":"sprites/spr_scout_colors/spr_scout_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"147bd5ab-89e6-4a62-bfdc-8349bdc18418","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"e57071a6-5e15-446b-85b0-c663e938470c","path":"sprites/spr_scout_colors/spr_scout_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"ff8965c0-516f-4910-be5f-29bbda2b7dad","IsCreationKey":false,"Key":7.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"4e58d1f2-8813-4ca7-b477-8f85dfa5fb63","path":"sprites/spr_scout_colors/spr_scout_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"17242221-c2eb-40aa-9597-b0fe258a7de0","IsCreationKey":false,"Key":8.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"cf79f59c-ee61-423f-8697-26acae0d7361","path":"sprites/spr_scout_colors/spr_scout_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"91cb7282-2dc4-44bc-8b17-2f5588596a4e","IsCreationKey":false,"Key":9.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"faa1c73b-982b-4c8c-9302-14f9cdf5126a","path":"sprites/spr_scout_colors/spr_scout_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"4cb8dde6-007f-4ada-a643-60e7a3e8795d","IsCreationKey":false,"Key":10.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"38579090-ad10-4741-9b4a-7c6478e31a26","path":"sprites/spr_scout_colors/spr_scout_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"d40f65ca-ce19-40f9-9564-74c25672707f","IsCreationKey":false,"Key":11.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_scout_complex/spr_scout_complex.yy b/sprites/spr_scout_complex/spr_scout_complex.yy index cd69b27854..21cd9ea9e4 100644 --- a/sprites/spr_scout_complex/spr_scout_complex.yy +++ b/sprites/spr_scout_complex/spr_scout_complex.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_scout_complex", "bboxMode":0, "bbox_bottom":231, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"2462092a-8f18-48d4-9694-48ea1de535d9","name":"2462092a-8f18-48d4-9694-48ea1de535d9","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"2462092a-8f18-48d4-9694-48ea1de535d9","name":"2462092a-8f18-48d4-9694-48ea1de535d9","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -70,9 +70,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"2462092a-8f18-48d4-9694-48ea1de535d9","path":"sprites/spr_scout_complex/spr_scout_complex.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"c74f3d25-50a8-4016-8372-0d7a2c479225","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"2462092a-8f18-48d4-9694-48ea1de535d9","path":"sprites/spr_scout_complex/spr_scout_complex.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"c74f3d25-50a8-4016-8372-0d7a2c479225","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_scout_heads/spr_scout_heads.yy b/sprites/spr_scout_heads/spr_scout_heads.yy index 05336f619e..3953dba83f 100644 --- a/sprites/spr_scout_heads/spr_scout_heads.yy +++ b/sprites/spr_scout_heads/spr_scout_heads.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_scout_heads", "bboxMode":0, "bbox_bottom":62, @@ -12,8 +12,8 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"f983ac49-49e4-493b-a33e-522f5e49f625","name":"f983ac49-49e4-493b-a33e-522f5e49f625","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"84beb665-cb67-4e10-8b97-8a016f610d39","name":"84beb665-cb67-4e10-8b97-8a016f610d39","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"f983ac49-49e4-493b-a33e-522f5e49f625","name":"f983ac49-49e4-493b-a33e-522f5e49f625","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"84beb665-cb67-4e10-8b97-8a016f610d39","name":"84beb665-cb67-4e10-8b97-8a016f610d39","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -71,12 +71,8 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"f983ac49-49e4-493b-a33e-522f5e49f625","path":"sprites/spr_scout_heads/spr_scout_heads.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"d1556974-823e-42d5-aab9-580ae03ef33e","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"84beb665-cb67-4e10-8b97-8a016f610d39","path":"sprites/spr_scout_heads/spr_scout_heads.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"5a8357cc-4b19-4835-bf07-8e4e579ef6de","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"f983ac49-49e4-493b-a33e-522f5e49f625","path":"sprites/spr_scout_heads/spr_scout_heads.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"d1556974-823e-42d5-aab9-580ae03ef33e","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"84beb665-cb67-4e10-8b97-8a016f610d39","path":"sprites/spr_scout_heads/spr_scout_heads.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"5a8357cc-4b19-4835-bf07-8e4e579ef6de","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_scout_left/spr_scout_left.yy b/sprites/spr_scout_left/spr_scout_left.yy index 52766f5ab0..1ea10a311d 100644 --- a/sprites/spr_scout_left/spr_scout_left.yy +++ b/sprites/spr_scout_left/spr_scout_left.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_scout_left", "bboxMode":0, "bbox_bottom":148, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"7d0becbe-30f8-4a46-bedf-3d9495863023","name":"7d0becbe-30f8-4a46-bedf-3d9495863023","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"7d0becbe-30f8-4a46-bedf-3d9495863023","name":"7d0becbe-30f8-4a46-bedf-3d9495863023","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"7d0becbe-30f8-4a46-bedf-3d9495863023","path":"sprites/spr_scout_left/spr_scout_left.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"3a267d99-aaba-41f0-b003-f0a2fb5b595d","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"7d0becbe-30f8-4a46-bedf-3d9495863023","path":"sprites/spr_scout_left/spr_scout_left.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"3a267d99-aaba-41f0-b003-f0a2fb5b595d","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_scout_new/spr_scout_new.yy b/sprites/spr_scout_new/spr_scout_new.yy index 62630facc7..e7a7e1bfcc 100644 --- a/sprites/spr_scout_new/spr_scout_new.yy +++ b/sprites/spr_scout_new/spr_scout_new.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_scout_new", "bboxMode":0, "bbox_bottom":231, @@ -12,15 +12,15 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"2462092a-8f18-48d4-9694-48ea1de535d9","name":"2462092a-8f18-48d4-9694-48ea1de535d9","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"5fec1b1d-b8d8-4670-a500-898e3a451f83","name":"5fec1b1d-b8d8-4670-a500-898e3a451f83","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"64729cc4-00dc-45e2-9ea3-69e9224b631a","name":"64729cc4-00dc-45e2-9ea3-69e9224b631a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"d5936ecb-6646-4a4a-a4a3-d5ef0e835c62","name":"d5936ecb-6646-4a4a-a4a3-d5ef0e835c62","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"929493f8-01f3-4199-a6ce-a69c82f7cdf0","name":"929493f8-01f3-4199-a6ce-a69c82f7cdf0","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"7d0becbe-30f8-4a46-bedf-3d9495863023","name":"7d0becbe-30f8-4a46-bedf-3d9495863023","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"5a5a1c0d-1fdd-4ff5-ab6a-43ed5e540374","name":"5a5a1c0d-1fdd-4ff5-ab6a-43ed5e540374","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"82f2cb7a-a266-4656-8a58-99ba2e420640","name":"82f2cb7a-a266-4656-8a58-99ba2e420640","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"df188ab0-15cc-489f-be4e-3c05681254e5","name":"df188ab0-15cc-489f-be4e-3c05681254e5","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"2462092a-8f18-48d4-9694-48ea1de535d9","name":"2462092a-8f18-48d4-9694-48ea1de535d9","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"5fec1b1d-b8d8-4670-a500-898e3a451f83","name":"5fec1b1d-b8d8-4670-a500-898e3a451f83","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"64729cc4-00dc-45e2-9ea3-69e9224b631a","name":"64729cc4-00dc-45e2-9ea3-69e9224b631a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"d5936ecb-6646-4a4a-a4a3-d5ef0e835c62","name":"d5936ecb-6646-4a4a-a4a3-d5ef0e835c62","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"929493f8-01f3-4199-a6ce-a69c82f7cdf0","name":"929493f8-01f3-4199-a6ce-a69c82f7cdf0","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"7d0becbe-30f8-4a46-bedf-3d9495863023","name":"7d0becbe-30f8-4a46-bedf-3d9495863023","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"5a5a1c0d-1fdd-4ff5-ab6a-43ed5e540374","name":"5a5a1c0d-1fdd-4ff5-ab6a-43ed5e540374","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"82f2cb7a-a266-4656-8a58-99ba2e420640","name":"82f2cb7a-a266-4656-8a58-99ba2e420640","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"df188ab0-15cc-489f-be4e-3c05681254e5","name":"df188ab0-15cc-489f-be4e-3c05681254e5","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -78,33 +78,15 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"2462092a-8f18-48d4-9694-48ea1de535d9","path":"sprites/spr_scout_new/spr_scout_new.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"b31af662-ba1d-4d27-9df0-c883a9cb9df0","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"5fec1b1d-b8d8-4670-a500-898e3a451f83","path":"sprites/spr_scout_new/spr_scout_new.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"6b9777d1-7fcc-4592-8be4-75b3800b827d","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"64729cc4-00dc-45e2-9ea3-69e9224b631a","path":"sprites/spr_scout_new/spr_scout_new.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"162b08ca-f2e2-49d1-9537-d39b34544a88","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"d5936ecb-6646-4a4a-a4a3-d5ef0e835c62","path":"sprites/spr_scout_new/spr_scout_new.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"bb4566d4-91b3-4db5-afc7-614fdcb9f276","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"929493f8-01f3-4199-a6ce-a69c82f7cdf0","path":"sprites/spr_scout_new/spr_scout_new.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"4849c4a7-07d6-40bc-99df-fba446ffb063","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"7d0becbe-30f8-4a46-bedf-3d9495863023","path":"sprites/spr_scout_new/spr_scout_new.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"321ec812-a02f-41e5-b397-5d2b32198c0d","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"5a5a1c0d-1fdd-4ff5-ab6a-43ed5e540374","path":"sprites/spr_scout_new/spr_scout_new.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"a2c8eee3-df35-4327-9c95-9f658774bdfa","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"82f2cb7a-a266-4656-8a58-99ba2e420640","path":"sprites/spr_scout_new/spr_scout_new.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"31a14009-85d3-47a8-bdfb-d9f082fbb6da","IsCreationKey":false,"Key":7.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"df188ab0-15cc-489f-be4e-3c05681254e5","path":"sprites/spr_scout_new/spr_scout_new.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"9c225af2-ada9-46d5-8d46-9959e85fc393","IsCreationKey":false,"Key":8.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"2462092a-8f18-48d4-9694-48ea1de535d9","path":"sprites/spr_scout_new/spr_scout_new.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"b31af662-ba1d-4d27-9df0-c883a9cb9df0","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"5fec1b1d-b8d8-4670-a500-898e3a451f83","path":"sprites/spr_scout_new/spr_scout_new.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"6b9777d1-7fcc-4592-8be4-75b3800b827d","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"64729cc4-00dc-45e2-9ea3-69e9224b631a","path":"sprites/spr_scout_new/spr_scout_new.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"162b08ca-f2e2-49d1-9537-d39b34544a88","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"d5936ecb-6646-4a4a-a4a3-d5ef0e835c62","path":"sprites/spr_scout_new/spr_scout_new.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"bb4566d4-91b3-4db5-afc7-614fdcb9f276","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"929493f8-01f3-4199-a6ce-a69c82f7cdf0","path":"sprites/spr_scout_new/spr_scout_new.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"4849c4a7-07d6-40bc-99df-fba446ffb063","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"7d0becbe-30f8-4a46-bedf-3d9495863023","path":"sprites/spr_scout_new/spr_scout_new.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"321ec812-a02f-41e5-b397-5d2b32198c0d","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"5a5a1c0d-1fdd-4ff5-ab6a-43ed5e540374","path":"sprites/spr_scout_new/spr_scout_new.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"a2c8eee3-df35-4327-9c95-9f658774bdfa","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"82f2cb7a-a266-4656-8a58-99ba2e420640","path":"sprites/spr_scout_new/spr_scout_new.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"31a14009-85d3-47a8-bdfb-d9f082fbb6da","IsCreationKey":false,"Key":7.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"df188ab0-15cc-489f-be4e-3c05681254e5","path":"sprites/spr_scout_new/spr_scout_new.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"9c225af2-ada9-46d5-8d46-9959e85fc393","IsCreationKey":false,"Key":8.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_scout_right/spr_scout_right.yy b/sprites/spr_scout_right/spr_scout_right.yy index dae1c22b31..a7fcff52de 100644 --- a/sprites/spr_scout_right/spr_scout_right.yy +++ b/sprites/spr_scout_right/spr_scout_right.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_scout_right", "bboxMode":0, "bbox_bottom":148, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"7d0becbe-30f8-4a46-bedf-3d9495863023","name":"7d0becbe-30f8-4a46-bedf-3d9495863023","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"7d0becbe-30f8-4a46-bedf-3d9495863023","name":"7d0becbe-30f8-4a46-bedf-3d9495863023","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"7d0becbe-30f8-4a46-bedf-3d9495863023","path":"sprites/spr_scout_right/spr_scout_right.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"ff644c2f-3222-44a3-9955-1166309280e6","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"7d0becbe-30f8-4a46-bedf-3d9495863023","path":"sprites/spr_scout_right/spr_scout_right.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"ff644c2f-3222-44a3-9955-1166309280e6","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_servo_arm/spr_servo_arm.yy b/sprites/spr_servo_arm/spr_servo_arm.yy index d41a902fee..ec68a0573a 100644 --- a/sprites/spr_servo_arm/spr_servo_arm.yy +++ b/sprites/spr_servo_arm/spr_servo_arm.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_servo_arm", "bboxMode":0, "bbox_bottom":84, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"da5f0368-88c5-42b7-b6de-e4d62467b7ee","name":"da5f0368-88c5-42b7-b6de-e4d62467b7ee","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"da5f0368-88c5-42b7-b6de-e4d62467b7ee","name":"da5f0368-88c5-42b7-b6de-e4d62467b7ee","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "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_arm/spr_servo_arm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"5207aa92-d126-4f55-aa26-68a203e9ca4e","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_arm/spr_servo_arm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"5207aa92-d126-4f55-aa26-68a203e9ca4e","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_servo_harness/spr_servo_harness.yy b/sprites/spr_servo_harness/spr_servo_harness.yy index f378056629..719d822d87 100644 --- a/sprites/spr_servo_harness/spr_servo_harness.yy +++ b/sprites/spr_servo_harness/spr_servo_harness.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_servo_harness", "bboxMode":0, "bbox_bottom":240, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"da5f0368-88c5-42b7-b6de-e4d62467b7ee","name":"da5f0368-88c5-42b7-b6de-e4d62467b7ee","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"da5f0368-88c5-42b7-b6de-e4d62467b7ee","name":"da5f0368-88c5-42b7-b6de-e4d62467b7ee","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -69,9 +69,7 @@ "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 7108fa64a0..48dca5d6f9 100644 --- a/sprites/spr_settings_bg/spr_settings_bg.yy +++ b/sprites/spr_settings_bg/spr_settings_bg.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_settings_bg", "bboxMode":0, "bbox_bottom":899, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"b5316788-02cb-4b6d-acca-4ed4d8672ce5","name":"b5316788-02cb-4b6d-acca-4ed4d8672ce5","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"b5316788-02cb-4b6d-acca-4ed4d8672ce5","name":"b5316788-02cb-4b6d-acca-4ed4d8672ce5","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "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_settings_button/spr_settings_button.yy b/sprites/spr_settings_button/spr_settings_button.yy index 19f9cbf23e..bee2101d3d 100644 --- a/sprites/spr_settings_button/spr_settings_button.yy +++ b/sprites/spr_settings_button/spr_settings_button.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_settings_button", "bboxMode":0, "bbox_bottom":115, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"c756afca-6761-4c70-b4d1-b9bb0bc6059c","name":"c756afca-6761-4c70-b4d1-b9bb0bc6059c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"c756afca-6761-4c70-b4d1-b9bb0bc6059c","name":"c756afca-6761-4c70-b4d1-b9bb0bc6059c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"c756afca-6761-4c70-b4d1-b9bb0bc6059c","path":"sprites/spr_settings_button/spr_settings_button.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"65dc51be-7c3a-43b6-8534-c0d168564495","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"c756afca-6761-4c70-b4d1-b9bb0bc6059c","path":"sprites/spr_settings_button/spr_settings_button.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"65dc51be-7c3a-43b6-8534-c0d168564495","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_ship_aconite/spr_ship_aconite.yy b/sprites/spr_ship_aconite/spr_ship_aconite.yy index 860ea93221..64b55a553d 100644 --- a/sprites/spr_ship_aconite/spr_ship_aconite.yy +++ b/sprites/spr_ship_aconite/spr_ship_aconite.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_ship_aconite", "bboxMode":0, "bbox_bottom":28, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"0135cb67-e9d4-47f9-ae29-035c8a8dfafa","name":"0135cb67-e9d4-47f9-ae29-035c8a8dfafa","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"0135cb67-e9d4-47f9-ae29-035c8a8dfafa","name":"0135cb67-e9d4-47f9-ae29-035c8a8dfafa","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"0135cb67-e9d4-47f9-ae29-035c8a8dfafa","path":"sprites/spr_ship_aconite/spr_ship_aconite.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"08b75cf2-26f5-4e6f-ad20-0821d2aa305a","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"0135cb67-e9d4-47f9-ae29-035c8a8dfafa","path":"sprites/spr_ship_aconite/spr_ship_aconite.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"08b75cf2-26f5-4e6f-ad20-0821d2aa305a","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":{ diff --git a/sprites/spr_ship_ammer/spr_ship_ammer.yy b/sprites/spr_ship_ammer/spr_ship_ammer.yy index 0dbbc04d5f..e068e85c9c 100644 --- a/sprites/spr_ship_ammer/spr_ship_ammer.yy +++ b/sprites/spr_ship_ammer/spr_ship_ammer.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_ship_ammer", "bboxMode":0, "bbox_bottom":57, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"aecbecdd-4094-46cf-8a12-6fa03388a226","name":"aecbecdd-4094-46cf-8a12-6fa03388a226","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"aecbecdd-4094-46cf-8a12-6fa03388a226","name":"aecbecdd-4094-46cf-8a12-6fa03388a226","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"aecbecdd-4094-46cf-8a12-6fa03388a226","path":"sprites/spr_ship_ammer/spr_ship_ammer.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"c02728c4-68e1-453f-8fa8-598ef2561c23","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"aecbecdd-4094-46cf-8a12-6fa03388a226","path":"sprites/spr_ship_ammer/spr_ship_ammer.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"c02728c4-68e1-453f-8fa8-598ef2561c23","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":{ diff --git a/sprites/spr_ship_apoc/spr_ship_apoc.yy b/sprites/spr_ship_apoc/spr_ship_apoc.yy index 2c2faf3b7a..08ebbee5a5 100644 --- a/sprites/spr_ship_apoc/spr_ship_apoc.yy +++ b/sprites/spr_ship_apoc/spr_ship_apoc.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_ship_apoc", "bboxMode":0, "bbox_bottom":91, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"6dc6f331-41a9-44b7-a4c9-24ab7fe44bd0","name":"6dc6f331-41a9-44b7-a4c9-24ab7fe44bd0","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"6dc6f331-41a9-44b7-a4c9-24ab7fe44bd0","name":"6dc6f331-41a9-44b7-a4c9-24ab7fe44bd0","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"6dc6f331-41a9-44b7-a4c9-24ab7fe44bd0","path":"sprites/spr_ship_apoc/spr_ship_apoc.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"0bee0e78-a619-4cda-9d54-12a929878829","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"6dc6f331-41a9-44b7-a4c9-24ab7fe44bd0","path":"sprites/spr_ship_apoc/spr_ship_apoc.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"0bee0e78-a619-4cda-9d54-12a929878829","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":{ diff --git a/sprites/spr_ship_aven/spr_ship_aven.yy b/sprites/spr_ship_aven/spr_ship_aven.yy index 8e589bb085..54701be189 100644 --- a/sprites/spr_ship_aven/spr_ship_aven.yy +++ b/sprites/spr_ship_aven/spr_ship_aven.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_ship_aven", "bboxMode":0, "bbox_bottom":59, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"3b549580-f553-4212-b6bb-c41c3ff18e19","name":"3b549580-f553-4212-b6bb-c41c3ff18e19","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"3b549580-f553-4212-b6bb-c41c3ff18e19","name":"3b549580-f553-4212-b6bb-c41c3ff18e19","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"3b549580-f553-4212-b6bb-c41c3ff18e19","path":"sprites/spr_ship_aven/spr_ship_aven.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"5c4593dc-7dbb-404f-8004-0357ea802527","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"3b549580-f553-4212-b6bb-c41c3ff18e19","path":"sprites/spr_ship_aven/spr_ship_aven.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"5c4593dc-7dbb-404f-8004-0357ea802527","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":{ diff --git a/sprites/spr_ship_back_black/spr_ship_back_black.yy b/sprites/spr_ship_back_black/spr_ship_back_black.yy index d17a11420a..14a5f76c8d 100644 --- a/sprites/spr_ship_back_black/spr_ship_back_black.yy +++ b/sprites/spr_ship_back_black/spr_ship_back_black.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_ship_back_black", "bboxMode":0, "bbox_bottom":116, @@ -12,10 +12,10 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"41b410c3-01c1-440c-bd9d-40498f3ee679","name":"41b410c3-01c1-440c-bd9d-40498f3ee679","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"00dd47db-65d6-4276-90cd-12c8e6708bcc","name":"00dd47db-65d6-4276-90cd-12c8e6708bcc","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"f84f2a39-f16e-4874-809b-e99be35df387","name":"f84f2a39-f16e-4874-809b-e99be35df387","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"7f115bba-8dfa-467c-b850-6053b3321a30","name":"7f115bba-8dfa-467c-b850-6053b3321a30","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"41b410c3-01c1-440c-bd9d-40498f3ee679","name":"41b410c3-01c1-440c-bd9d-40498f3ee679","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"00dd47db-65d6-4276-90cd-12c8e6708bcc","name":"00dd47db-65d6-4276-90cd-12c8e6708bcc","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"f84f2a39-f16e-4874-809b-e99be35df387","name":"f84f2a39-f16e-4874-809b-e99be35df387","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"7f115bba-8dfa-467c-b850-6053b3321a30","name":"7f115bba-8dfa-467c-b850-6053b3321a30","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -71,18 +71,10 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"41b410c3-01c1-440c-bd9d-40498f3ee679","path":"sprites/spr_ship_back_black/spr_ship_back_black.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"d5b49c97-eb68-44d9-85f7-56308f784f56","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"00dd47db-65d6-4276-90cd-12c8e6708bcc","path":"sprites/spr_ship_back_black/spr_ship_back_black.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"6a3f9dfb-09e6-49d7-9e49-459c61fb20c5","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"f84f2a39-f16e-4874-809b-e99be35df387","path":"sprites/spr_ship_back_black/spr_ship_back_black.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"439c05d6-5612-440b-bd9b-3221d09bd73b","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"7f115bba-8dfa-467c-b850-6053b3321a30","path":"sprites/spr_ship_back_black/spr_ship_back_black.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"0b8203b0-1a34-40c1-b27e-a6d7d549bb87","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"41b410c3-01c1-440c-bd9d-40498f3ee679","path":"sprites/spr_ship_back_black/spr_ship_back_black.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"d5b49c97-eb68-44d9-85f7-56308f784f56","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"00dd47db-65d6-4276-90cd-12c8e6708bcc","path":"sprites/spr_ship_back_black/spr_ship_back_black.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"6a3f9dfb-09e6-49d7-9e49-459c61fb20c5","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"f84f2a39-f16e-4874-809b-e99be35df387","path":"sprites/spr_ship_back_black/spr_ship_back_black.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"439c05d6-5612-440b-bd9b-3221d09bd73b","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"7f115bba-8dfa-467c-b850-6053b3321a30","path":"sprites/spr_ship_back_black/spr_ship_back_black.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"0b8203b0-1a34-40c1-b27e-a6d7d549bb87","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_ship_back_white/spr_ship_back_white.yy b/sprites/spr_ship_back_white/spr_ship_back_white.yy index d13cbcd416..8403fc60ff 100644 --- a/sprites/spr_ship_back_white/spr_ship_back_white.yy +++ b/sprites/spr_ship_back_white/spr_ship_back_white.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_ship_back_white", "bboxMode":0, "bbox_bottom":116, @@ -12,10 +12,10 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"1aa71696-4ad5-412d-9f14-342cd38f5631","name":"1aa71696-4ad5-412d-9f14-342cd38f5631","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"36a2218b-dff1-41ce-890d-520e37171b31","name":"36a2218b-dff1-41ce-890d-520e37171b31","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"5af2c4c0-c4b0-47ad-a7f1-8ec1d4aea4cf","name":"5af2c4c0-c4b0-47ad-a7f1-8ec1d4aea4cf","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"965b4909-9ecd-4504-9ac1-ad7559c50805","name":"965b4909-9ecd-4504-9ac1-ad7559c50805","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"1aa71696-4ad5-412d-9f14-342cd38f5631","name":"1aa71696-4ad5-412d-9f14-342cd38f5631","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"36a2218b-dff1-41ce-890d-520e37171b31","name":"36a2218b-dff1-41ce-890d-520e37171b31","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"5af2c4c0-c4b0-47ad-a7f1-8ec1d4aea4cf","name":"5af2c4c0-c4b0-47ad-a7f1-8ec1d4aea4cf","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"965b4909-9ecd-4504-9ac1-ad7559c50805","name":"965b4909-9ecd-4504-9ac1-ad7559c50805","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -71,18 +71,10 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"1aa71696-4ad5-412d-9f14-342cd38f5631","path":"sprites/spr_ship_back_white/spr_ship_back_white.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"7305107d-cd32-473d-89ec-c95e03ea3123","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"36a2218b-dff1-41ce-890d-520e37171b31","path":"sprites/spr_ship_back_white/spr_ship_back_white.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"0746d0f4-e483-44c7-b37f-73d286bbe7f1","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"5af2c4c0-c4b0-47ad-a7f1-8ec1d4aea4cf","path":"sprites/spr_ship_back_white/spr_ship_back_white.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"f452a7af-801c-4f84-b0f4-dc73532f0037","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"965b4909-9ecd-4504-9ac1-ad7559c50805","path":"sprites/spr_ship_back_white/spr_ship_back_white.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"6d495220-6a63-4ead-840b-771b34989d14","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"1aa71696-4ad5-412d-9f14-342cd38f5631","path":"sprites/spr_ship_back_white/spr_ship_back_white.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"7305107d-cd32-473d-89ec-c95e03ea3123","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"36a2218b-dff1-41ce-890d-520e37171b31","path":"sprites/spr_ship_back_white/spr_ship_back_white.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"0746d0f4-e483-44c7-b37f-73d286bbe7f1","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"5af2c4c0-c4b0-47ad-a7f1-8ec1d4aea4cf","path":"sprites/spr_ship_back_white/spr_ship_back_white.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"f452a7af-801c-4f84-b0f4-dc73532f0037","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"965b4909-9ecd-4504-9ac1-ad7559c50805","path":"sprites/spr_ship_back_white/spr_ship_back_white.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"6d495220-6a63-4ead-840b-771b34989d14","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_ship_bb/spr_ship_bb.yy b/sprites/spr_ship_bb/spr_ship_bb.yy index ad04c09570..3d8709745b 100644 --- a/sprites/spr_ship_bb/spr_ship_bb.yy +++ b/sprites/spr_ship_bb/spr_ship_bb.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_ship_bb", "bboxMode":0, "bbox_bottom":107, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"96ec14b1-8003-4935-8f74-42e9b2745881","name":"96ec14b1-8003-4935-8f74-42e9b2745881","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"96ec14b1-8003-4935-8f74-42e9b2745881","name":"96ec14b1-8003-4935-8f74-42e9b2745881","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -70,9 +70,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"96ec14b1-8003-4935-8f74-42e9b2745881","path":"sprites/spr_ship_bb/spr_ship_bb.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"6633c984-3753-45cd-96e4-8b814e874c8f","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"96ec14b1-8003-4935-8f74-42e9b2745881","path":"sprites/spr_ship_bb/spr_ship_bb.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"6633c984-3753-45cd-96e4-8b814e874c8f","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_ship_black/spr_ship_black.yy b/sprites/spr_ship_black/spr_ship_black.yy index 88d9588b5d..2f96c2bfb1 100644 --- a/sprites/spr_ship_black/spr_ship_black.yy +++ b/sprites/spr_ship_black/spr_ship_black.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_ship_black", "bboxMode":0, "bbox_bottom":59, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"1160e664-0428-462e-a0fa-9720be0f263d","name":"1160e664-0428-462e-a0fa-9720be0f263d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"1160e664-0428-462e-a0fa-9720be0f263d","name":"1160e664-0428-462e-a0fa-9720be0f263d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"1160e664-0428-462e-a0fa-9720be0f263d","path":"sprites/spr_ship_black/spr_ship_black.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"ac1354f0-7622-4cc8-8099-1ffdb0d0c310","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"1160e664-0428-462e-a0fa-9720be0f263d","path":"sprites/spr_ship_black/spr_ship_black.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"ac1354f0-7622-4cc8-8099-1ffdb0d0c310","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":{ diff --git a/sprites/spr_ship_cairn/spr_ship_cairn.yy b/sprites/spr_ship_cairn/spr_ship_cairn.yy index 493b59d7f2..98f171ad00 100644 --- a/sprites/spr_ship_cairn/spr_ship_cairn.yy +++ b/sprites/spr_ship_cairn/spr_ship_cairn.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_ship_cairn", "bboxMode":0, "bbox_bottom":190, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"daf4a208-d2c2-43b3-9ac8-014c8f7d2d83","name":"daf4a208-d2c2-43b3-9ac8-014c8f7d2d83","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"daf4a208-d2c2-43b3-9ac8-014c8f7d2d83","name":"daf4a208-d2c2-43b3-9ac8-014c8f7d2d83","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"daf4a208-d2c2-43b3-9ac8-014c8f7d2d83","path":"sprites/spr_ship_cairn/spr_ship_cairn.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"602e325e-4d92-43dc-baf7-5933f1213a55","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"daf4a208-d2c2-43b3-9ac8-014c8f7d2d83","path":"sprites/spr_ship_cairn/spr_ship_cairn.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"602e325e-4d92-43dc-baf7-5933f1213a55","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":{ diff --git a/sprites/spr_ship_carnage/spr_ship_carnage.yy b/sprites/spr_ship_carnage/spr_ship_carnage.yy index 9886132837..962f5c3041 100644 --- a/sprites/spr_ship_carnage/spr_ship_carnage.yy +++ b/sprites/spr_ship_carnage/spr_ship_carnage.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_ship_carnage", "bboxMode":0, "bbox_bottom":45, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"cd11c84c-47ae-4e57-9b99-f34b1015940e","name":"cd11c84c-47ae-4e57-9b99-f34b1015940e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"cd11c84c-47ae-4e57-9b99-f34b1015940e","name":"cd11c84c-47ae-4e57-9b99-f34b1015940e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"cd11c84c-47ae-4e57-9b99-f34b1015940e","path":"sprites/spr_ship_carnage/spr_ship_carnage.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"7bee4553-fc2f-442d-9707-5190ea802b9f","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"cd11c84c-47ae-4e57-9b99-f34b1015940e","path":"sprites/spr_ship_carnage/spr_ship_carnage.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"7bee4553-fc2f-442d-9707-5190ea802b9f","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":{ diff --git a/sprites/spr_ship_castellan/spr_ship_castellan.yy b/sprites/spr_ship_castellan/spr_ship_castellan.yy index aed43c53c6..22d8ef5c2d 100644 --- a/sprites/spr_ship_castellan/spr_ship_castellan.yy +++ b/sprites/spr_ship_castellan/spr_ship_castellan.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_ship_castellan", "bboxMode":0, "bbox_bottom":83, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"3224b95f-84a0-4626-a51b-35b507429cc9","name":"3224b95f-84a0-4626-a51b-35b507429cc9","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"3224b95f-84a0-4626-a51b-35b507429cc9","name":"3224b95f-84a0-4626-a51b-35b507429cc9","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"3224b95f-84a0-4626-a51b-35b507429cc9","path":"sprites/spr_ship_castellan/spr_ship_castellan.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"a2a64330-a52a-4a89-9633-babd1b2c633d","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"3224b95f-84a0-4626-a51b-35b507429cc9","path":"sprites/spr_ship_castellan/spr_ship_castellan.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"a2a64330-a52a-4a89-9633-babd1b2c633d","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":{ diff --git a/sprites/spr_ship_craftworld/spr_ship_craftworld.yy b/sprites/spr_ship_craftworld/spr_ship_craftworld.yy index 3b73f1bc63..b006c6fe9f 100644 --- a/sprites/spr_ship_craftworld/spr_ship_craftworld.yy +++ b/sprites/spr_ship_craftworld/spr_ship_craftworld.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_ship_craftworld", "bboxMode":0, "bbox_bottom":319, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"277fd817-4103-4272-9c5e-bf244d349ad3","name":"277fd817-4103-4272-9c5e-bf244d349ad3","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"277fd817-4103-4272-9c5e-bf244d349ad3","name":"277fd817-4103-4272-9c5e-bf244d349ad3","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"277fd817-4103-4272-9c5e-bf244d349ad3","path":"sprites/spr_ship_craftworld/spr_ship_craftworld.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"b33532c1-2896-4b70-ae77-1de4c9948658","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"277fd817-4103-4272-9c5e-bf244d349ad3","path":"sprites/spr_ship_craftworld/spr_ship_craftworld.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"b33532c1-2896-4b70-ae77-1de4c9948658","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":{ diff --git a/sprites/spr_ship_custodian/spr_ship_custodian.yy b/sprites/spr_ship_custodian/spr_ship_custodian.yy index 96125f8653..fff5c7295b 100644 --- a/sprites/spr_ship_custodian/spr_ship_custodian.yy +++ b/sprites/spr_ship_custodian/spr_ship_custodian.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_ship_custodian", "bboxMode":0, "bbox_bottom":222, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"e58cb568-7cf6-4f96-881f-f23673f4daae","name":"e58cb568-7cf6-4f96-881f-f23673f4daae","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"e58cb568-7cf6-4f96-881f-f23673f4daae","name":"e58cb568-7cf6-4f96-881f-f23673f4daae","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"e58cb568-7cf6-4f96-881f-f23673f4daae","path":"sprites/spr_ship_custodian/spr_ship_custodian.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"1cb5bffe-8f97-4870-9150-067479ba4b19","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"e58cb568-7cf6-4f96-881f-f23673f4daae","path":"sprites/spr_ship_custodian/spr_ship_custodian.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"1cb5bffe-8f97-4870-9150-067479ba4b19","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":{ diff --git a/sprites/spr_ship_daemon/spr_ship_daemon.yy b/sprites/spr_ship_daemon/spr_ship_daemon.yy index 02fcb04b85..a39ed98c37 100644 --- a/sprites/spr_ship_daemon/spr_ship_daemon.yy +++ b/sprites/spr_ship_daemon/spr_ship_daemon.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_ship_daemon", "bboxMode":0, "bbox_bottom":49, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"90ed25d5-5cbb-46f8-a5f5-bd059e3a3240","name":"90ed25d5-5cbb-46f8-a5f5-bd059e3a3240","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"90ed25d5-5cbb-46f8-a5f5-bd059e3a3240","name":"90ed25d5-5cbb-46f8-a5f5-bd059e3a3240","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"90ed25d5-5cbb-46f8-a5f5-bd059e3a3240","path":"sprites/spr_ship_daemon/spr_ship_daemon.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"0600b960-8db3-43f5-ad86-98323bda79fe","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"90ed25d5-5cbb-46f8-a5f5-bd059e3a3240","path":"sprites/spr_ship_daemon/spr_ship_daemon.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"0600b960-8db3-43f5-ad86-98323bda79fe","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":{ diff --git a/sprites/spr_ship_dese/spr_ship_dese.yy b/sprites/spr_ship_dese/spr_ship_dese.yy index 7d87f1738f..82e0346573 100644 --- a/sprites/spr_ship_dese/spr_ship_dese.yy +++ b/sprites/spr_ship_dese/spr_ship_dese.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_ship_dese", "bboxMode":0, "bbox_bottom":80, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"9e92274f-9009-40ac-bc73-a614141501a6","name":"9e92274f-9009-40ac-bc73-a614141501a6","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"9e92274f-9009-40ac-bc73-a614141501a6","name":"9e92274f-9009-40ac-bc73-a614141501a6","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"9e92274f-9009-40ac-bc73-a614141501a6","path":"sprites/spr_ship_dese/spr_ship_dese.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"2ded885e-1a85-4322-86f3-622e3d240e2a","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"9e92274f-9009-40ac-bc73-a614141501a6","path":"sprites/spr_ship_dese/spr_ship_dese.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"2ded885e-1a85-4322-86f3-622e3d240e2a","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_ship_deth/spr_ship_deth.yy b/sprites/spr_ship_deth/spr_ship_deth.yy index ec1c601627..f8db12b1da 100644 --- a/sprites/spr_ship_deth/spr_ship_deth.yy +++ b/sprites/spr_ship_deth/spr_ship_deth.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_ship_deth", "bboxMode":0, "bbox_bottom":79, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"32535205-6fbd-4e16-bcfa-b50dc43fa707","name":"32535205-6fbd-4e16-bcfa-b50dc43fa707","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"32535205-6fbd-4e16-bcfa-b50dc43fa707","name":"32535205-6fbd-4e16-bcfa-b50dc43fa707","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -70,9 +70,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"32535205-6fbd-4e16-bcfa-b50dc43fa707","path":"sprites/spr_ship_deth/spr_ship_deth.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"69824969-8aec-4e69-b60d-c2a00439a438","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"32535205-6fbd-4e16-bcfa-b50dc43fa707","path":"sprites/spr_ship_deth/spr_ship_deth.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"69824969-8aec-4e69-b60d-c2a00439a438","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_ship_dirge/spr_ship_dirge.yy b/sprites/spr_ship_dirge/spr_ship_dirge.yy index 0861a1375b..92155fd0cd 100644 --- a/sprites/spr_ship_dirge/spr_ship_dirge.yy +++ b/sprites/spr_ship_dirge/spr_ship_dirge.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_ship_dirge", "bboxMode":0, "bbox_bottom":90, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"c5565f16-87ee-484b-a3fa-776d094d2629","name":"c5565f16-87ee-484b-a3fa-776d094d2629","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"c5565f16-87ee-484b-a3fa-776d094d2629","name":"c5565f16-87ee-484b-a3fa-776d094d2629","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"c5565f16-87ee-484b-a3fa-776d094d2629","path":"sprites/spr_ship_dirge/spr_ship_dirge.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"a9a80a4a-48e8-47db-a92e-23554ce30ecc","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"c5565f16-87ee-484b-a3fa-776d094d2629","path":"sprites/spr_ship_dirge/spr_ship_dirge.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"a9a80a4a-48e8-47db-a92e-23554ce30ecc","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":{ diff --git a/sprites/spr_ship_dreadclaw/spr_ship_dreadclaw.yy b/sprites/spr_ship_dreadclaw/spr_ship_dreadclaw.yy index 26dc0a5758..2c842669bd 100644 --- a/sprites/spr_ship_dreadclaw/spr_ship_dreadclaw.yy +++ b/sprites/spr_ship_dreadclaw/spr_ship_dreadclaw.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_ship_dreadclaw", "bboxMode":0, "bbox_bottom":20, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"d33e8f9e-1c99-40eb-8eda-e532cfe2194a","name":"d33e8f9e-1c99-40eb-8eda-e532cfe2194a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"d33e8f9e-1c99-40eb-8eda-e532cfe2194a","name":"d33e8f9e-1c99-40eb-8eda-e532cfe2194a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"d33e8f9e-1c99-40eb-8eda-e532cfe2194a","path":"sprites/spr_ship_dreadclaw/spr_ship_dreadclaw.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"97bff932-8634-4a28-b278-fb211a2d59fc","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"d33e8f9e-1c99-40eb-8eda-e532cfe2194a","path":"sprites/spr_ship_dreadclaw/spr_ship_dreadclaw.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"97bff932-8634-4a28-b278-fb211a2d59fc","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":{ diff --git a/sprites/spr_ship_emissary/spr_ship_emissary.yy b/sprites/spr_ship_emissary/spr_ship_emissary.yy index b542535371..43fe658e40 100644 --- a/sprites/spr_ship_emissary/spr_ship_emissary.yy +++ b/sprites/spr_ship_emissary/spr_ship_emissary.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_ship_emissary", "bboxMode":0, "bbox_bottom":115, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"64bd879f-5681-42f8-a1ca-d51c0625d460","name":"64bd879f-5681-42f8-a1ca-d51c0625d460","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"64bd879f-5681-42f8-a1ca-d51c0625d460","name":"64bd879f-5681-42f8-a1ca-d51c0625d460","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"64bd879f-5681-42f8-a1ca-d51c0625d460","path":"sprites/spr_ship_emissary/spr_ship_emissary.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"67fac36f-c8fb-4799-a125-1ae93af67e18","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"64bd879f-5681-42f8-a1ca-d51c0625d460","path":"sprites/spr_ship_emissary/spr_ship_emissary.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"67fac36f-c8fb-4799-a125-1ae93af67e18","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":{ diff --git a/sprites/spr_ship_glad/spr_ship_glad.yy b/sprites/spr_ship_glad/spr_ship_glad.yy index 572141dc6e..8f67c0bf03 100644 --- a/sprites/spr_ship_glad/spr_ship_glad.yy +++ b/sprites/spr_ship_glad/spr_ship_glad.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_ship_glad", "bboxMode":0, "bbox_bottom":29, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"be2b8b48-0ab2-4b69-b879-4af5e4ede8a4","name":"be2b8b48-0ab2-4b69-b879-4af5e4ede8a4","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"be2b8b48-0ab2-4b69-b879-4af5e4ede8a4","name":"be2b8b48-0ab2-4b69-b879-4af5e4ede8a4","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -70,9 +70,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"be2b8b48-0ab2-4b69-b879-4af5e4ede8a4","path":"sprites/spr_ship_glad/spr_ship_glad.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"dc542ebd-2f6e-43f1-b053-8b4014539608","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"be2b8b48-0ab2-4b69-b879-4af5e4ede8a4","path":"sprites/spr_ship_glad/spr_ship_glad.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"dc542ebd-2f6e-43f1-b053-8b4014539608","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_ship_gorbag/spr_ship_gorbag.yy b/sprites/spr_ship_gorbag/spr_ship_gorbag.yy index ef20f7097a..b9f750856d 100644 --- a/sprites/spr_ship_gorbag/spr_ship_gorbag.yy +++ b/sprites/spr_ship_gorbag/spr_ship_gorbag.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_ship_gorbag", "bboxMode":0, "bbox_bottom":92, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"ba55eaf2-fb08-45e8-981a-cfa282a5a010","name":"ba55eaf2-fb08-45e8-981a-cfa282a5a010","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"ba55eaf2-fb08-45e8-981a-cfa282a5a010","name":"ba55eaf2-fb08-45e8-981a-cfa282a5a010","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -70,9 +70,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"ba55eaf2-fb08-45e8-981a-cfa282a5a010","path":"sprites/spr_ship_gorbag/spr_ship_gorbag.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"f104132a-3439-4d37-88e1-75d95f3f8607","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"ba55eaf2-fb08-45e8-981a-cfa282a5a010","path":"sprites/spr_ship_gorbag/spr_ship_gorbag.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"f104132a-3439-4d37-88e1-75d95f3f8607","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_ship_hellebore/spr_ship_hellebore.yy b/sprites/spr_ship_hellebore/spr_ship_hellebore.yy index c58946c8a1..7575709a19 100644 --- a/sprites/spr_ship_hellebore/spr_ship_hellebore.yy +++ b/sprites/spr_ship_hellebore/spr_ship_hellebore.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_ship_hellebore", "bboxMode":0, "bbox_bottom":29, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"6b68f550-f04a-441f-a440-82ad542d0a30","name":"6b68f550-f04a-441f-a440-82ad542d0a30","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"6b68f550-f04a-441f-a440-82ad542d0a30","name":"6b68f550-f04a-441f-a440-82ad542d0a30","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"6b68f550-f04a-441f-a440-82ad542d0a30","path":"sprites/spr_ship_hellebore/spr_ship_hellebore.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"d5969f53-a04e-459a-bcaf-8d79be1dd662","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"6b68f550-f04a-441f-a440-82ad542d0a30","path":"sprites/spr_ship_hellebore/spr_ship_hellebore.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"d5969f53-a04e-459a-bcaf-8d79be1dd662","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":{ diff --git a/sprites/spr_ship_hulk/spr_ship_hulk.yy b/sprites/spr_ship_hulk/spr_ship_hulk.yy index 1af5ec901e..9edd65bc16 100644 --- a/sprites/spr_ship_hulk/spr_ship_hulk.yy +++ b/sprites/spr_ship_hulk/spr_ship_hulk.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_ship_hulk", "bboxMode":0, "bbox_bottom":407, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"81541e4e-2b46-4e16-8859-224aca1545b8","name":"81541e4e-2b46-4e16-8859-224aca1545b8","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"81541e4e-2b46-4e16-8859-224aca1545b8","name":"81541e4e-2b46-4e16-8859-224aca1545b8","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"81541e4e-2b46-4e16-8859-224aca1545b8","path":"sprites/spr_ship_hulk/spr_ship_hulk.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"26ff0a1f-7db1-49af-b1cd-c7315bfcf762","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"81541e4e-2b46-4e16-8859-224aca1545b8","path":"sprites/spr_ship_hulk/spr_ship_hulk.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"26ff0a1f-7db1-49af-b1cd-c7315bfcf762","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":{ diff --git a/sprites/spr_ship_hunt/spr_ship_hunt.yy b/sprites/spr_ship_hunt/spr_ship_hunt.yy index d35e63257f..6375c77d2a 100644 --- a/sprites/spr_ship_hunt/spr_ship_hunt.yy +++ b/sprites/spr_ship_hunt/spr_ship_hunt.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_ship_hunt", "bboxMode":0, "bbox_bottom":23, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"691a7b56-f5f3-455c-971e-eb7d163628c2","name":"691a7b56-f5f3-455c-971e-eb7d163628c2","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"691a7b56-f5f3-455c-971e-eb7d163628c2","name":"691a7b56-f5f3-455c-971e-eb7d163628c2","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -70,9 +70,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"691a7b56-f5f3-455c-971e-eb7d163628c2","path":"sprites/spr_ship_hunt/spr_ship_hunt.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"7c1b99c0-ab70-44a8-9a5a-0738a1058783","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"691a7b56-f5f3-455c-971e-eb7d163628c2","path":"sprites/spr_ship_hunt/spr_ship_hunt.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"7c1b99c0-ab70-44a8-9a5a-0738a1058783","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_ship_icono/spr_ship_icono.yy b/sprites/spr_ship_icono/spr_ship_icono.yy index 0cd2646f99..3165c88287 100644 --- a/sprites/spr_ship_icono/spr_ship_icono.yy +++ b/sprites/spr_ship_icono/spr_ship_icono.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_ship_icono", "bboxMode":0, "bbox_bottom":34, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"d7b6e2bd-d9bc-4e49-83bc-d959fc26ba74","name":"d7b6e2bd-d9bc-4e49-83bc-d959fc26ba74","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"d7b6e2bd-d9bc-4e49-83bc-d959fc26ba74","name":"d7b6e2bd-d9bc-4e49-83bc-d959fc26ba74","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"d7b6e2bd-d9bc-4e49-83bc-d959fc26ba74","path":"sprites/spr_ship_icono/spr_ship_icono.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"3cf2dce6-1f4f-483b-8fcf-4856742320fa","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"d7b6e2bd-d9bc-4e49-83bc-d959fc26ba74","path":"sprites/spr_ship_icono/spr_ship_icono.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"3cf2dce6-1f4f-483b-8fcf-4856742320fa","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":{ diff --git a/sprites/spr_ship_inter/spr_ship_inter.yy b/sprites/spr_ship_inter/spr_ship_inter.yy index 65425d0c97..f54842c376 100644 --- a/sprites/spr_ship_inter/spr_ship_inter.yy +++ b/sprites/spr_ship_inter/spr_ship_inter.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_ship_inter", "bboxMode":0, "bbox_bottom":20, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"393aa440-3bae-402e-af32-abeecd9a0b5c","name":"393aa440-3bae-402e-af32-abeecd9a0b5c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"393aa440-3bae-402e-af32-abeecd9a0b5c","name":"393aa440-3bae-402e-af32-abeecd9a0b5c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"393aa440-3bae-402e-af32-abeecd9a0b5c","path":"sprites/spr_ship_inter/spr_ship_inter.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"65d75e07-bd0b-4485-925e-6b0873ef009f","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"393aa440-3bae-402e-af32-abeecd9a0b5c","path":"sprites/spr_ship_inter/spr_ship_inter.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"65d75e07-bd0b-4485-925e-6b0873ef009f","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":{ diff --git a/sprites/spr_ship_jackal/spr_ship_jackal.yy b/sprites/spr_ship_jackal/spr_ship_jackal.yy index 5942c67b35..766b34cfda 100644 --- a/sprites/spr_ship_jackal/spr_ship_jackal.yy +++ b/sprites/spr_ship_jackal/spr_ship_jackal.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_ship_jackal", "bboxMode":0, "bbox_bottom":103, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"3063bdf1-a213-4fe3-a728-cc41b97965da","name":"3063bdf1-a213-4fe3-a728-cc41b97965da","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"3063bdf1-a213-4fe3-a728-cc41b97965da","name":"3063bdf1-a213-4fe3-a728-cc41b97965da","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"3063bdf1-a213-4fe3-a728-cc41b97965da","path":"sprites/spr_ship_jackal/spr_ship_jackal.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"cd273b51-3692-4062-b9a7-517780b9be01","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"3063bdf1-a213-4fe3-a728-cc41b97965da","path":"sprites/spr_ship_jackal/spr_ship_jackal.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"cd273b51-3692-4062-b9a7-517780b9be01","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":{ diff --git a/sprites/spr_ship_krool/spr_ship_krool.yy b/sprites/spr_ship_krool/spr_ship_krool.yy index 65da354558..cffad18d40 100644 --- a/sprites/spr_ship_krool/spr_ship_krool.yy +++ b/sprites/spr_ship_krool/spr_ship_krool.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_ship_krool", "bboxMode":0, "bbox_bottom":74, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"4f91b9df-9fa8-4f11-bb0d-dd33fcdcd75e","name":"4f91b9df-9fa8-4f11-bb0d-dd33fcdcd75e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"4f91b9df-9fa8-4f11-bb0d-dd33fcdcd75e","name":"4f91b9df-9fa8-4f11-bb0d-dd33fcdcd75e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"4f91b9df-9fa8-4f11-bb0d-dd33fcdcd75e","path":"sprites/spr_ship_krool/spr_ship_krool.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"e7a4450f-59a6-451c-ba8f-d311b992363f","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"4f91b9df-9fa8-4f11-bb0d-dd33fcdcd75e","path":"sprites/spr_ship_krool/spr_ship_krool.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"e7a4450f-59a6-451c-ba8f-d311b992363f","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":{ diff --git a/sprites/spr_ship_kroozer/spr_ship_kroozer.yy b/sprites/spr_ship_kroozer/spr_ship_kroozer.yy index 7079a91f96..81a594cafc 100644 --- a/sprites/spr_ship_kroozer/spr_ship_kroozer.yy +++ b/sprites/spr_ship_kroozer/spr_ship_kroozer.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_ship_kroozer", "bboxMode":0, "bbox_bottom":57, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"c7ab190f-80bc-4a25-894a-0952346a02e3","name":"c7ab190f-80bc-4a25-894a-0952346a02e3","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"c7ab190f-80bc-4a25-894a-0952346a02e3","name":"c7ab190f-80bc-4a25-894a-0952346a02e3","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -70,9 +70,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"c7ab190f-80bc-4a25-894a-0952346a02e3","path":"sprites/spr_ship_kroozer/spr_ship_kroozer.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"7553d091-4021-4d8f-8705-9a7ea17ee8d6","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"c7ab190f-80bc-4a25-894a-0952346a02e3","path":"sprites/spr_ship_kroozer/spr_ship_kroozer.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"7553d091-4021-4d8f-8705-9a7ea17ee8d6","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_ship_leviathan/spr_ship_leviathan.yy b/sprites/spr_ship_leviathan/spr_ship_leviathan.yy index 0ec805bef7..a96a7b74cf 100644 --- a/sprites/spr_ship_leviathan/spr_ship_leviathan.yy +++ b/sprites/spr_ship_leviathan/spr_ship_leviathan.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_ship_leviathan", "bboxMode":0, "bbox_bottom":90, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"6cc70763-89ce-43c0-a254-cc94649feba6","name":"6cc70763-89ce-43c0-a254-cc94649feba6","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"6cc70763-89ce-43c0-a254-cc94649feba6","name":"6cc70763-89ce-43c0-a254-cc94649feba6","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"6cc70763-89ce-43c0-a254-cc94649feba6","path":"sprites/spr_ship_leviathan/spr_ship_leviathan.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"b0ac4187-2465-40eb-85b5-dc728746f758","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"6cc70763-89ce-43c0-a254-cc94649feba6","path":"sprites/spr_ship_leviathan/spr_ship_leviathan.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"b0ac4187-2465-40eb-85b5-dc728746f758","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":{ diff --git a/sprites/spr_ship_nem/spr_ship_nem.yy b/sprites/spr_ship_nem/spr_ship_nem.yy index 50e26038d8..4aee217c58 100644 --- a/sprites/spr_ship_nem/spr_ship_nem.yy +++ b/sprites/spr_ship_nem/spr_ship_nem.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_ship_nem", "bboxMode":0, "bbox_bottom":91, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"917f9e5a-3547-4828-b346-63dc57b3f0a1","name":"917f9e5a-3547-4828-b346-63dc57b3f0a1","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"917f9e5a-3547-4828-b346-63dc57b3f0a1","name":"917f9e5a-3547-4828-b346-63dc57b3f0a1","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"917f9e5a-3547-4828-b346-63dc57b3f0a1","path":"sprites/spr_ship_nem/spr_ship_nem.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"d9a533f1-3c83-49c3-9c5a-644d09d03580","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"917f9e5a-3547-4828-b346-63dc57b3f0a1","path":"sprites/spr_ship_nem/spr_ship_nem.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"d9a533f1-3c83-49c3-9c5a-644d09d03580","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":{ diff --git a/sprites/spr_ship_protector/spr_ship_protector.yy b/sprites/spr_ship_protector/spr_ship_protector.yy index c3cd30076a..ffbed4213a 100644 --- a/sprites/spr_ship_protector/spr_ship_protector.yy +++ b/sprites/spr_ship_protector/spr_ship_protector.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_ship_protector", "bboxMode":0, "bbox_bottom":163, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"aa829dc1-929b-4987-91e0-c6059198a0ac","name":"aa829dc1-929b-4987-91e0-c6059198a0ac","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"aa829dc1-929b-4987-91e0-c6059198a0ac","name":"aa829dc1-929b-4987-91e0-c6059198a0ac","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"aa829dc1-929b-4987-91e0-c6059198a0ac","path":"sprites/spr_ship_protector/spr_ship_protector.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"ae69cb97-130e-449c-a631-88426f264c8d","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"aa829dc1-929b-4987-91e0-c6059198a0ac","path":"sprites/spr_ship_protector/spr_ship_protector.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"ae69cb97-130e-449c-a631-88426f264c8d","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":{ diff --git a/sprites/spr_ship_prowler/spr_ship_prowler.yy b/sprites/spr_ship_prowler/spr_ship_prowler.yy index a6bb4ca1e7..770df48f2a 100644 --- a/sprites/spr_ship_prowler/spr_ship_prowler.yy +++ b/sprites/spr_ship_prowler/spr_ship_prowler.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_ship_prowler", "bboxMode":0, "bbox_bottom":44, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"44887184-b806-4f09-bcd1-814d58f1e37f","name":"44887184-b806-4f09-bcd1-814d58f1e37f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"44887184-b806-4f09-bcd1-814d58f1e37f","name":"44887184-b806-4f09-bcd1-814d58f1e37f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"44887184-b806-4f09-bcd1-814d58f1e37f","path":"sprites/spr_ship_prowler/spr_ship_prowler.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"369c475b-1a5f-4ff3-94f8-14a2ff02d272","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"44887184-b806-4f09-bcd1-814d58f1e37f","path":"sprites/spr_ship_prowler/spr_ship_prowler.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"369c475b-1a5f-4ff3-94f8-14a2ff02d272","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":{ diff --git a/sprites/spr_ship_ravager/spr_ship_ravager.yy b/sprites/spr_ship_ravager/spr_ship_ravager.yy index 93af5424ef..fb0c332183 100644 --- a/sprites/spr_ship_ravager/spr_ship_ravager.yy +++ b/sprites/spr_ship_ravager/spr_ship_ravager.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_ship_ravager", "bboxMode":0, "bbox_bottom":32, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"707cc706-dd30-4efe-a19d-4aaa095f781a","name":"707cc706-dd30-4efe-a19d-4aaa095f781a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"707cc706-dd30-4efe-a19d-4aaa095f781a","name":"707cc706-dd30-4efe-a19d-4aaa095f781a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"707cc706-dd30-4efe-a19d-4aaa095f781a","path":"sprites/spr_ship_ravager/spr_ship_ravager.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"d47814c5-4403-42e6-a7e1-813d00520084","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"707cc706-dd30-4efe-a19d-4aaa095f781a","path":"sprites/spr_ship_ravager/spr_ship_ravager.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"d47814c5-4403-42e6-a7e1-813d00520084","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":{ diff --git a/sprites/spr_ship_razorfiend/spr_ship_razorfiend.yy b/sprites/spr_ship_razorfiend/spr_ship_razorfiend.yy index 2e418882f3..19c898dfce 100644 --- a/sprites/spr_ship_razorfiend/spr_ship_razorfiend.yy +++ b/sprites/spr_ship_razorfiend/spr_ship_razorfiend.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_ship_razorfiend", "bboxMode":0, "bbox_bottom":88, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"0b9df6cb-28ec-4e75-b875-657f2f86c6a7","name":"0b9df6cb-28ec-4e75-b875-657f2f86c6a7","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"0b9df6cb-28ec-4e75-b875-657f2f86c6a7","name":"0b9df6cb-28ec-4e75-b875-657f2f86c6a7","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"0b9df6cb-28ec-4e75-b875-657f2f86c6a7","path":"sprites/spr_ship_razorfiend/spr_ship_razorfiend.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"9e4561a1-64f7-4e04-b03c-13b5699b5686","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"0b9df6cb-28ec-4e75-b875-657f2f86c6a7","path":"sprites/spr_ship_razorfiend/spr_ship_razorfiend.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"9e4561a1-64f7-4e04-b03c-13b5699b5686","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":{ diff --git a/sprites/spr_ship_reaper/spr_ship_reaper.yy b/sprites/spr_ship_reaper/spr_ship_reaper.yy index b02d77c1b5..654b32ffe7 100644 --- a/sprites/spr_ship_reaper/spr_ship_reaper.yy +++ b/sprites/spr_ship_reaper/spr_ship_reaper.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_ship_reaper", "bboxMode":0, "bbox_bottom":133, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"9f3f9e9d-fc78-4a1c-bfa6-c8b415cac5f8","name":"9f3f9e9d-fc78-4a1c-bfa6-c8b415cac5f8","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"9f3f9e9d-fc78-4a1c-bfa6-c8b415cac5f8","name":"9f3f9e9d-fc78-4a1c-bfa6-c8b415cac5f8","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"9f3f9e9d-fc78-4a1c-bfa6-c8b415cac5f8","path":"sprites/spr_ship_reaper/spr_ship_reaper.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"039617f9-7696-438d-bdab-4e9fcf4ded4b","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"9f3f9e9d-fc78-4a1c-bfa6-c8b415cac5f8","path":"sprites/spr_ship_reaper/spr_ship_reaper.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"039617f9-7696-438d-bdab-4e9fcf4ded4b","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":{ diff --git a/sprites/spr_ship_shadow/spr_ship_shadow.yy b/sprites/spr_ship_shadow/spr_ship_shadow.yy index 6e0fe26314..7980676a38 100644 --- a/sprites/spr_ship_shadow/spr_ship_shadow.yy +++ b/sprites/spr_ship_shadow/spr_ship_shadow.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_ship_shadow", "bboxMode":0, "bbox_bottom":107, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"bb6866c4-a79e-4651-a7bb-7a7a530bf7d3","name":"bb6866c4-a79e-4651-a7bb-7a7a530bf7d3","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"bb6866c4-a79e-4651-a7bb-7a7a530bf7d3","name":"bb6866c4-a79e-4651-a7bb-7a7a530bf7d3","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"bb6866c4-a79e-4651-a7bb-7a7a530bf7d3","path":"sprites/spr_ship_shadow/spr_ship_shadow.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"3bf9d86d-79ff-4645-87d1-9c999e8b1c1a","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"bb6866c4-a79e-4651-a7bb-7a7a530bf7d3","path":"sprites/spr_ship_shadow/spr_ship_shadow.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"3bf9d86d-79ff-4645-87d1-9c999e8b1c1a","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":{ diff --git a/sprites/spr_ship_shroud/spr_ship_shroud.yy b/sprites/spr_ship_shroud/spr_ship_shroud.yy index 0ee2f0e56c..d9143bad03 100644 --- a/sprites/spr_ship_shroud/spr_ship_shroud.yy +++ b/sprites/spr_ship_shroud/spr_ship_shroud.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_ship_shroud", "bboxMode":0, "bbox_bottom":134, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"7d4f0fc8-fba6-48fa-a81e-670dc23d1ce7","name":"7d4f0fc8-fba6-48fa-a81e-670dc23d1ce7","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"7d4f0fc8-fba6-48fa-a81e-670dc23d1ce7","name":"7d4f0fc8-fba6-48fa-a81e-670dc23d1ce7","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"7d4f0fc8-fba6-48fa-a81e-670dc23d1ce7","path":"sprites/spr_ship_shroud/spr_ship_shroud.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"11e928b5-b85a-4cf4-88b6-c59c618a9f75","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"7d4f0fc8-fba6-48fa-a81e-670dc23d1ce7","path":"sprites/spr_ship_shroud/spr_ship_shroud.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"11e928b5-b85a-4cf4-88b6-c59c618a9f75","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":{ diff --git a/sprites/spr_ship_slam/spr_ship_slam.yy b/sprites/spr_ship_slam/spr_ship_slam.yy index 0064e6edd5..2ef5b5dff5 100644 --- a/sprites/spr_ship_slam/spr_ship_slam.yy +++ b/sprites/spr_ship_slam/spr_ship_slam.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_ship_slam", "bboxMode":0, "bbox_bottom":72, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"d237a8dc-12ac-44a8-8063-fc43c3c39fa6","name":"d237a8dc-12ac-44a8-8063-fc43c3c39fa6","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"d237a8dc-12ac-44a8-8063-fc43c3c39fa6","name":"d237a8dc-12ac-44a8-8063-fc43c3c39fa6","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"d237a8dc-12ac-44a8-8063-fc43c3c39fa6","path":"sprites/spr_ship_slam/spr_ship_slam.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"bc3eb73e-f4d8-43c8-8e66-26a1d3da703f","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"d237a8dc-12ac-44a8-8063-fc43c3c39fa6","path":"sprites/spr_ship_slam/spr_ship_slam.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"bc3eb73e-f4d8-43c8-8e66-26a1d3da703f","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":{ diff --git a/sprites/spr_ship_song/spr_ship_song.yy b/sprites/spr_ship_song/spr_ship_song.yy index 7bf1268299..3b0b109fbd 100644 --- a/sprites/spr_ship_song/spr_ship_song.yy +++ b/sprites/spr_ship_song/spr_ship_song.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_ship_song", "bboxMode":0, "bbox_bottom":144, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"7f882f8a-eb3f-4429-b7ee-96426a62cfce","name":"7f882f8a-eb3f-4429-b7ee-96426a62cfce","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"7f882f8a-eb3f-4429-b7ee-96426a62cfce","name":"7f882f8a-eb3f-4429-b7ee-96426a62cfce","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -70,9 +70,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"7f882f8a-eb3f-4429-b7ee-96426a62cfce","path":"sprites/spr_ship_song/spr_ship_song.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"0c049868-56f8-4a4a-b66e-0a379b5bd341","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"7f882f8a-eb3f-4429-b7ee-96426a62cfce","path":"sprites/spr_ship_song/spr_ship_song.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"0c049868-56f8-4a4a-b66e-0a379b5bd341","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_ship_stalker/spr_ship_stalker.yy b/sprites/spr_ship_stalker/spr_ship_stalker.yy index 74c4e1ba27..01012e222c 100644 --- a/sprites/spr_ship_stalker/spr_ship_stalker.yy +++ b/sprites/spr_ship_stalker/spr_ship_stalker.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_ship_stalker", "bboxMode":0, "bbox_bottom":40, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"2db40a3c-713e-46c8-8e8f-b7874235cbee","name":"2db40a3c-713e-46c8-8e8f-b7874235cbee","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"2db40a3c-713e-46c8-8e8f-b7874235cbee","name":"2db40a3c-713e-46c8-8e8f-b7874235cbee","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"2db40a3c-713e-46c8-8e8f-b7874235cbee","path":"sprites/spr_ship_stalker/spr_ship_stalker.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"3a4010b0-a750-414c-a074-7960ed916a8b","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"2db40a3c-713e-46c8-8e8f-b7874235cbee","path":"sprites/spr_ship_stalker/spr_ship_stalker.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"3a4010b0-a750-414c-a074-7960ed916a8b","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":{ diff --git a/sprites/spr_ship_stri/spr_ship_stri.yy b/sprites/spr_ship_stri/spr_ship_stri.yy index 23cd650996..134b41cd10 100644 --- a/sprites/spr_ship_stri/spr_ship_stri.yy +++ b/sprites/spr_ship_stri/spr_ship_stri.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_ship_stri", "bboxMode":0, "bbox_bottom":50, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"a9f7a1f3-c0fb-4f8b-b270-14a3cb990890","name":"a9f7a1f3-c0fb-4f8b-b270-14a3cb990890","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"a9f7a1f3-c0fb-4f8b-b270-14a3cb990890","name":"a9f7a1f3-c0fb-4f8b-b270-14a3cb990890","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -70,9 +70,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"a9f7a1f3-c0fb-4f8b-b270-14a3cb990890","path":"sprites/spr_ship_stri/spr_ship_stri.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"43a254cb-346b-4949-bbdc-8440067748f4","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"a9f7a1f3-c0fb-4f8b-b270-14a3cb990890","path":"sprites/spr_ship_stri/spr_ship_stri.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"43a254cb-346b-4949-bbdc-8440067748f4","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_ship_sword/spr_ship_sword.yy b/sprites/spr_ship_sword/spr_ship_sword.yy index 8724fc38f1..bc0c935800 100644 --- a/sprites/spr_ship_sword/spr_ship_sword.yy +++ b/sprites/spr_ship_sword/spr_ship_sword.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_ship_sword", "bboxMode":0, "bbox_bottom":22, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"b0f97522-d3a1-44a4-955a-d60e67613c61","name":"b0f97522-d3a1-44a4-955a-d60e67613c61","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"b0f97522-d3a1-44a4-955a-d60e67613c61","name":"b0f97522-d3a1-44a4-955a-d60e67613c61","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"b0f97522-d3a1-44a4-955a-d60e67613c61","path":"sprites/spr_ship_sword/spr_ship_sword.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"1a9df30a-a4ff-4310-981b-fd2b9038034a","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"b0f97522-d3a1-44a4-955a-d60e67613c61","path":"sprites/spr_ship_sword/spr_ship_sword.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"1a9df30a-a4ff-4310-981b-fd2b9038034a","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":{ diff --git a/sprites/spr_ship_th/spr_ship_th.yy b/sprites/spr_ship_th/spr_ship_th.yy index c63e4499b4..67ef0f9262 100644 --- a/sprites/spr_ship_th/spr_ship_th.yy +++ b/sprites/spr_ship_th/spr_ship_th.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_ship_th", "bboxMode":0, "bbox_bottom":20, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"67140c44-e0e7-4b0d-b2f5-e9385f381067","name":"67140c44-e0e7-4b0d-b2f5-e9385f381067","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"67140c44-e0e7-4b0d-b2f5-e9385f381067","name":"67140c44-e0e7-4b0d-b2f5-e9385f381067","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"67140c44-e0e7-4b0d-b2f5-e9385f381067","path":"sprites/spr_ship_th/spr_ship_th.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"04c54e34-ade2-4147-82b0-3f873c34c30a","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"67140c44-e0e7-4b0d-b2f5-e9385f381067","path":"sprites/spr_ship_th/spr_ship_th.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"04c54e34-ade2-4147-82b0-3f873c34c30a","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":{ diff --git a/sprites/spr_ship_veng/spr_ship_veng.yy b/sprites/spr_ship_veng/spr_ship_veng.yy index a29eda5f94..0f9682df11 100644 --- a/sprites/spr_ship_veng/spr_ship_veng.yy +++ b/sprites/spr_ship_veng/spr_ship_veng.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_ship_veng", "bboxMode":0, "bbox_bottom":58, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"c0b9020c-add6-4831-bc5f-f3d7d1a4030b","name":"c0b9020c-add6-4831-bc5f-f3d7d1a4030b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"c0b9020c-add6-4831-bc5f-f3d7d1a4030b","name":"c0b9020c-add6-4831-bc5f-f3d7d1a4030b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"c0b9020c-add6-4831-bc5f-f3d7d1a4030b","path":"sprites/spr_ship_veng/spr_ship_veng.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"127ec400-7ba9-4185-8a45-4c9a23e595a8","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"c0b9020c-add6-4831-bc5f-f3d7d1a4030b","path":"sprites/spr_ship_veng/spr_ship_veng.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"127ec400-7ba9-4185-8a45-4c9a23e595a8","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":{ diff --git a/sprites/spr_ship_void/spr_ship_void.yy b/sprites/spr_ship_void/spr_ship_void.yy index 84b427d583..f84483ae71 100644 --- a/sprites/spr_ship_void/spr_ship_void.yy +++ b/sprites/spr_ship_void/spr_ship_void.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_ship_void", "bboxMode":0, "bbox_bottom":151, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"0d2ddf8e-1645-4518-927f-068bd10ba6d0","name":"0d2ddf8e-1645-4518-927f-068bd10ba6d0","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"0d2ddf8e-1645-4518-927f-068bd10ba6d0","name":"0d2ddf8e-1645-4518-927f-068bd10ba6d0","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"0d2ddf8e-1645-4518-927f-068bd10ba6d0","path":"sprites/spr_ship_void/spr_ship_void.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"712cdbb6-4651-48ff-ab35-b7c717708be8","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"0d2ddf8e-1645-4518-927f-068bd10ba6d0","path":"sprites/spr_ship_void/spr_ship_void.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"712cdbb6-4651-48ff-ab35-b7c717708be8","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":{ diff --git a/sprites/spr_ship_warden/spr_ship_warden.yy b/sprites/spr_ship_warden/spr_ship_warden.yy index e1af6526fb..6c1786db0f 100644 --- a/sprites/spr_ship_warden/spr_ship_warden.yy +++ b/sprites/spr_ship_warden/spr_ship_warden.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_ship_warden", "bboxMode":0, "bbox_bottom":70, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"a1ad8039-e998-4feb-a162-38d6960fe860","name":"a1ad8039-e998-4feb-a162-38d6960fe860","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"a1ad8039-e998-4feb-a162-38d6960fe860","name":"a1ad8039-e998-4feb-a162-38d6960fe860","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"a1ad8039-e998-4feb-a162-38d6960fe860","path":"sprites/spr_ship_warden/spr_ship_warden.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"f81da50e-d3bb-4920-a16f-40b833647603","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"a1ad8039-e998-4feb-a162-38d6960fe860","path":"sprites/spr_ship_warden/spr_ship_warden.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"f81da50e-d3bb-4920-a16f-40b833647603","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":{ diff --git a/sprites/spr_shutter_button/spr_shutter_button.yy b/sprites/spr_shutter_button/spr_shutter_button.yy index 3e0d4ff753..f2087345f2 100644 --- a/sprites/spr_shutter_button/spr_shutter_button.yy +++ b/sprites/spr_shutter_button/spr_shutter_button.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_shutter_button", "bboxMode":0, "bbox_bottom":505, @@ -12,13 +12,13 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"76267b7c-4ed6-4e13-80f8-12d83c354c19","name":"76267b7c-4ed6-4e13-80f8-12d83c354c19","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"a33f3820-f817-47b2-93f6-e09657a03620","name":"a33f3820-f817-47b2-93f6-e09657a03620","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"aea54f21-da01-4b3e-9c86-4eea4991976a","name":"aea54f21-da01-4b3e-9c86-4eea4991976a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"2b44ab3a-cd61-4236-9265-0539c255cabf","name":"2b44ab3a-cd61-4236-9265-0539c255cabf","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"b34f158b-68fc-4c52-a2e1-539e6e07fb3b","name":"b34f158b-68fc-4c52-a2e1-539e6e07fb3b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"42138070-4e1e-4bfb-97a2-79941ef72bc0","name":"42138070-4e1e-4bfb-97a2-79941ef72bc0","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"14089c53-1775-4c86-81db-815184b41de3","name":"14089c53-1775-4c86-81db-815184b41de3","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"76267b7c-4ed6-4e13-80f8-12d83c354c19","name":"76267b7c-4ed6-4e13-80f8-12d83c354c19","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"a33f3820-f817-47b2-93f6-e09657a03620","name":"a33f3820-f817-47b2-93f6-e09657a03620","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"aea54f21-da01-4b3e-9c86-4eea4991976a","name":"aea54f21-da01-4b3e-9c86-4eea4991976a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"2b44ab3a-cd61-4236-9265-0539c255cabf","name":"2b44ab3a-cd61-4236-9265-0539c255cabf","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"b34f158b-68fc-4c52-a2e1-539e6e07fb3b","name":"b34f158b-68fc-4c52-a2e1-539e6e07fb3b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"42138070-4e1e-4bfb-97a2-79941ef72bc0","name":"42138070-4e1e-4bfb-97a2-79941ef72bc0","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"14089c53-1775-4c86-81db-815184b41de3","name":"14089c53-1775-4c86-81db-815184b41de3","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -74,27 +74,13 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"76267b7c-4ed6-4e13-80f8-12d83c354c19","path":"sprites/spr_shutter_button/spr_shutter_button.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"131c5b6e-7e6d-4009-9f41-8c682fdbe6fa","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"a33f3820-f817-47b2-93f6-e09657a03620","path":"sprites/spr_shutter_button/spr_shutter_button.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"8b2f33da-9466-442e-9b49-a8be14781d23","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"aea54f21-da01-4b3e-9c86-4eea4991976a","path":"sprites/spr_shutter_button/spr_shutter_button.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"42f184d7-359c-409a-86f2-4fb35d8de685","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"2b44ab3a-cd61-4236-9265-0539c255cabf","path":"sprites/spr_shutter_button/spr_shutter_button.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"f847a9bf-64e9-41a5-8c31-b4b1085f5841","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"b34f158b-68fc-4c52-a2e1-539e6e07fb3b","path":"sprites/spr_shutter_button/spr_shutter_button.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"2b65eff6-9705-4575-b40b-fe35ca5b6b5e","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"42138070-4e1e-4bfb-97a2-79941ef72bc0","path":"sprites/spr_shutter_button/spr_shutter_button.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"4045f3a4-6d84-4fc7-aa09-6af816c64206","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"14089c53-1775-4c86-81db-815184b41de3","path":"sprites/spr_shutter_button/spr_shutter_button.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"f8850346-d50b-45ab-a5d3-417dcfbe9311","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"76267b7c-4ed6-4e13-80f8-12d83c354c19","path":"sprites/spr_shutter_button/spr_shutter_button.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"131c5b6e-7e6d-4009-9f41-8c682fdbe6fa","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"a33f3820-f817-47b2-93f6-e09657a03620","path":"sprites/spr_shutter_button/spr_shutter_button.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"8b2f33da-9466-442e-9b49-a8be14781d23","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"aea54f21-da01-4b3e-9c86-4eea4991976a","path":"sprites/spr_shutter_button/spr_shutter_button.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"42f184d7-359c-409a-86f2-4fb35d8de685","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"2b44ab3a-cd61-4236-9265-0539c255cabf","path":"sprites/spr_shutter_button/spr_shutter_button.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"f847a9bf-64e9-41a5-8c31-b4b1085f5841","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"b34f158b-68fc-4c52-a2e1-539e6e07fb3b","path":"sprites/spr_shutter_button/spr_shutter_button.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"2b65eff6-9705-4575-b40b-fe35ca5b6b5e","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"42138070-4e1e-4bfb-97a2-79941ef72bc0","path":"sprites/spr_shutter_button/spr_shutter_button.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"4045f3a4-6d84-4fc7-aa09-6af816c64206","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"14089c53-1775-4c86-81db-815184b41de3","path":"sprites/spr_shutter_button/spr_shutter_button.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"f8850346-d50b-45ab-a5d3-417dcfbe9311","IsCreationKey":false,"Key":6.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_sister_hospitaler/spr_sister_hospitaler.yy b/sprites/spr_sister_hospitaler/spr_sister_hospitaler.yy index cb91167053..4f8ff89929 100644 --- a/sprites/spr_sister_hospitaler/spr_sister_hospitaler.yy +++ b/sprites/spr_sister_hospitaler/spr_sister_hospitaler.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_sister_hospitaler", "bboxMode":0, "bbox_bottom":230, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"b70be9a4-24d9-4d7f-a8ae-38c71a83ddbe","name":"b70be9a4-24d9-4d7f-a8ae-38c71a83ddbe","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"b70be9a4-24d9-4d7f-a8ae-38c71a83ddbe","name":"b70be9a4-24d9-4d7f-a8ae-38c71a83ddbe","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -70,9 +70,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"b70be9a4-24d9-4d7f-a8ae-38c71a83ddbe","path":"sprites/spr_sister_hospitaler/spr_sister_hospitaler.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"5988268a-350a-499e-a70b-6cb6849b5f91","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"b70be9a4-24d9-4d7f-a8ae-38c71a83ddbe","path":"sprites/spr_sister_hospitaler/spr_sister_hospitaler.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"5988268a-350a-499e-a70b-6cb6849b5f91","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_sister_of_battle/spr_sister_of_battle.yy b/sprites/spr_sister_of_battle/spr_sister_of_battle.yy index 68c5aa00b5..ffce2a0e5e 100644 --- a/sprites/spr_sister_of_battle/spr_sister_of_battle.yy +++ b/sprites/spr_sister_of_battle/spr_sister_of_battle.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_sister_of_battle", "bboxMode":0, "bbox_bottom":230, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"ae300a7c-eb85-4b95-aded-5820a4156d85","name":"ae300a7c-eb85-4b95-aded-5820a4156d85","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"ae300a7c-eb85-4b95-aded-5820a4156d85","name":"ae300a7c-eb85-4b95-aded-5820a4156d85","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -70,9 +70,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"ae300a7c-eb85-4b95-aded-5820a4156d85","path":"sprites/spr_sister_of_battle/spr_sister_of_battle.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"0ed3578e-7db9-4027-bb0f-ec3180e86658","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"ae300a7c-eb85-4b95-aded-5820a4156d85","path":"sprites/spr_sister_of_battle/spr_sister_of_battle.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"0ed3578e-7db9-4027-bb0f-ec3180e86658","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_skitarii/spr_skitarii.yy b/sprites/spr_skitarii/spr_skitarii.yy index 61fa473789..07fa112b3b 100644 --- a/sprites/spr_skitarii/spr_skitarii.yy +++ b/sprites/spr_skitarii/spr_skitarii.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_skitarii", "bboxMode":0, "bbox_bottom":230, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"e7ee6da0-bb88-4354-8662-c4b6a15db73b","name":"e7ee6da0-bb88-4354-8662-c4b6a15db73b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"e7ee6da0-bb88-4354-8662-c4b6a15db73b","name":"e7ee6da0-bb88-4354-8662-c4b6a15db73b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -70,9 +70,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"e7ee6da0-bb88-4354-8662-c4b6a15db73b","path":"sprites/spr_skitarii/spr_skitarii.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"2c9f3812-394f-42f9-bb3c-d22560aa6c92","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"e7ee6da0-bb88-4354-8662-c4b6a15db73b","path":"sprites/spr_skitarii/spr_skitarii.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"2c9f3812-394f-42f9-bb3c-d22560aa6c92","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_skull_on_chain/spr_skull_on_chain.yy b/sprites/spr_skull_on_chain/spr_skull_on_chain.yy index d5a6000d7d..8512da9e70 100644 --- a/sprites/spr_skull_on_chain/spr_skull_on_chain.yy +++ b/sprites/spr_skull_on_chain/spr_skull_on_chain.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_skull_on_chain", "bboxMode":0, "bbox_bottom":39, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"0926bad1-dfb3-41bb-b6ee-7732d3036688","name":"0926bad1-dfb3-41bb-b6ee-7732d3036688","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"0926bad1-dfb3-41bb-b6ee-7732d3036688","name":"0926bad1-dfb3-41bb-b6ee-7732d3036688","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"0926bad1-dfb3-41bb-b6ee-7732d3036688","path":"sprites/spr_skull_on_chain/spr_skull_on_chain.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"6d6e7ff8-cb18-4100-9159-42068b16e4c3","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"0926bad1-dfb3-41bb-b6ee-7732d3036688","path":"sprites/spr_skull_on_chain/spr_skull_on_chain.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"6d6e7ff8-cb18-4100-9159-42068b16e4c3","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_skulls_belt/spr_skulls_belt.yy b/sprites/spr_skulls_belt/spr_skulls_belt.yy index c87de44ac5..bdc90db20b 100644 --- a/sprites/spr_skulls_belt/spr_skulls_belt.yy +++ b/sprites/spr_skulls_belt/spr_skulls_belt.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_skulls_belt", "bboxMode":0, "bbox_bottom":104, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"dbb220c9-62b6-4ca7-a13f-5951132d0d13","name":"dbb220c9-62b6-4ca7-a13f-5951132d0d13","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"dbb220c9-62b6-4ca7-a13f-5951132d0d13","name":"dbb220c9-62b6-4ca7-a13f-5951132d0d13","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "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_skulls_belt/spr_skulls_belt.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"037f80d3-2475-45e9-9eea-477515faed6d","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_skulls_belt/spr_skulls_belt.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"037f80d3-2475-45e9-9eea-477515faed6d","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_slate_2/spr_slate_2.yy b/sprites/spr_slate_2/spr_slate_2.yy index 8339762259..23a68f879f 100644 --- a/sprites/spr_slate_2/spr_slate_2.yy +++ b/sprites/spr_slate_2/spr_slate_2.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_slate_2", "bboxMode":0, "bbox_bottom":417, @@ -12,16 +12,16 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"3fde6f7d-26b0-4214-b224-cb9cdf0cecc5","name":"3fde6f7d-26b0-4214-b224-cb9cdf0cecc5","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"58154a86-8657-4704-884c-466b6abbd78b","name":"58154a86-8657-4704-884c-466b6abbd78b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"c7044a7b-17ba-4473-a4e1-8b1a36614a2c","name":"c7044a7b-17ba-4473-a4e1-8b1a36614a2c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"da3ce017-7535-4db9-a251-65f496434a8d","name":"da3ce017-7535-4db9-a251-65f496434a8d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"0f0a7b25-40f7-4263-8613-022aa4055c2b","name":"0f0a7b25-40f7-4263-8613-022aa4055c2b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"e082e106-f541-4c95-8004-18ff816e3609","name":"e082e106-f541-4c95-8004-18ff816e3609","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"1dd526d6-d1e9-40a8-87f6-4152d387ead4","name":"1dd526d6-d1e9-40a8-87f6-4152d387ead4","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"7b072440-87d3-4d45-b8ab-894956f7df0c","name":"7b072440-87d3-4d45-b8ab-894956f7df0c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"73d93106-75ce-42b6-9dda-6a3d9b5d359c","name":"73d93106-75ce-42b6-9dda-6a3d9b5d359c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"dfbb965a-c3eb-4d9f-8f3b-7e2b1fd0f6ce","name":"dfbb965a-c3eb-4d9f-8f3b-7e2b1fd0f6ce","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"3fde6f7d-26b0-4214-b224-cb9cdf0cecc5","name":"3fde6f7d-26b0-4214-b224-cb9cdf0cecc5","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"58154a86-8657-4704-884c-466b6abbd78b","name":"58154a86-8657-4704-884c-466b6abbd78b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"c7044a7b-17ba-4473-a4e1-8b1a36614a2c","name":"c7044a7b-17ba-4473-a4e1-8b1a36614a2c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"da3ce017-7535-4db9-a251-65f496434a8d","name":"da3ce017-7535-4db9-a251-65f496434a8d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"0f0a7b25-40f7-4263-8613-022aa4055c2b","name":"0f0a7b25-40f7-4263-8613-022aa4055c2b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"e082e106-f541-4c95-8004-18ff816e3609","name":"e082e106-f541-4c95-8004-18ff816e3609","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"1dd526d6-d1e9-40a8-87f6-4152d387ead4","name":"1dd526d6-d1e9-40a8-87f6-4152d387ead4","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"7b072440-87d3-4d45-b8ab-894956f7df0c","name":"7b072440-87d3-4d45-b8ab-894956f7df0c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"73d93106-75ce-42b6-9dda-6a3d9b5d359c","name":"73d93106-75ce-42b6-9dda-6a3d9b5d359c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"dfbb965a-c3eb-4d9f-8f3b-7e2b1fd0f6ce","name":"dfbb965a-c3eb-4d9f-8f3b-7e2b1fd0f6ce","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -77,36 +77,16 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"3fde6f7d-26b0-4214-b224-cb9cdf0cecc5","path":"sprites/spr_slate_2/spr_slate_2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"caac8738-2aca-40a9-9ca5-6b67e73f3f53","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"58154a86-8657-4704-884c-466b6abbd78b","path":"sprites/spr_slate_2/spr_slate_2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"c0d605b5-5836-450b-94a2-3b35505908ab","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"c7044a7b-17ba-4473-a4e1-8b1a36614a2c","path":"sprites/spr_slate_2/spr_slate_2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"04b94baa-e3c6-4a28-b9fa-a49c76f2ff8d","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"da3ce017-7535-4db9-a251-65f496434a8d","path":"sprites/spr_slate_2/spr_slate_2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"3399fee2-a76a-4850-9fa5-bc2fc3a77313","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"0f0a7b25-40f7-4263-8613-022aa4055c2b","path":"sprites/spr_slate_2/spr_slate_2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"7893b14b-0c17-4422-a83c-faa224efe77d","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"e082e106-f541-4c95-8004-18ff816e3609","path":"sprites/spr_slate_2/spr_slate_2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"f6986fa2-28f3-4e7f-88d9-76f787d3b10c","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"1dd526d6-d1e9-40a8-87f6-4152d387ead4","path":"sprites/spr_slate_2/spr_slate_2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"390e46d1-0ccd-42b3-8e62-03b0311775a7","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"7b072440-87d3-4d45-b8ab-894956f7df0c","path":"sprites/spr_slate_2/spr_slate_2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"997d7151-a105-438a-b205-d685a0ff0489","IsCreationKey":false,"Key":7.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"73d93106-75ce-42b6-9dda-6a3d9b5d359c","path":"sprites/spr_slate_2/spr_slate_2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"3a916ded-cadb-41f7-9fb3-2748557af882","IsCreationKey":false,"Key":8.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"dfbb965a-c3eb-4d9f-8f3b-7e2b1fd0f6ce","path":"sprites/spr_slate_2/spr_slate_2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"bfdb174a-4cda-4108-a52d-9be62ca8b763","IsCreationKey":false,"Key":9.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"3fde6f7d-26b0-4214-b224-cb9cdf0cecc5","path":"sprites/spr_slate_2/spr_slate_2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"caac8738-2aca-40a9-9ca5-6b67e73f3f53","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"58154a86-8657-4704-884c-466b6abbd78b","path":"sprites/spr_slate_2/spr_slate_2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"c0d605b5-5836-450b-94a2-3b35505908ab","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"c7044a7b-17ba-4473-a4e1-8b1a36614a2c","path":"sprites/spr_slate_2/spr_slate_2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"04b94baa-e3c6-4a28-b9fa-a49c76f2ff8d","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"da3ce017-7535-4db9-a251-65f496434a8d","path":"sprites/spr_slate_2/spr_slate_2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"3399fee2-a76a-4850-9fa5-bc2fc3a77313","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"0f0a7b25-40f7-4263-8613-022aa4055c2b","path":"sprites/spr_slate_2/spr_slate_2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"7893b14b-0c17-4422-a83c-faa224efe77d","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"e082e106-f541-4c95-8004-18ff816e3609","path":"sprites/spr_slate_2/spr_slate_2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"f6986fa2-28f3-4e7f-88d9-76f787d3b10c","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"1dd526d6-d1e9-40a8-87f6-4152d387ead4","path":"sprites/spr_slate_2/spr_slate_2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"390e46d1-0ccd-42b3-8e62-03b0311775a7","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"7b072440-87d3-4d45-b8ab-894956f7df0c","path":"sprites/spr_slate_2/spr_slate_2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"997d7151-a105-438a-b205-d685a0ff0489","IsCreationKey":false,"Key":7.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"73d93106-75ce-42b6-9dda-6a3d9b5d359c","path":"sprites/spr_slate_2/spr_slate_2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"3a916ded-cadb-41f7-9fb3-2748557af882","IsCreationKey":false,"Key":8.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"dfbb965a-c3eb-4d9f-8f3b-7e2b1fd0f6ce","path":"sprites/spr_slate_2/spr_slate_2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"bfdb174a-4cda-4108-a52d-9be62ca8b763","IsCreationKey":false,"Key":9.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_sororitas1/spr_sororitas1.yy b/sprites/spr_sororitas1/spr_sororitas1.yy index d8a4bfd561..e41d1c24bd 100644 --- a/sprites/spr_sororitas1/spr_sororitas1.yy +++ b/sprites/spr_sororitas1/spr_sororitas1.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_sororitas1", "bboxMode":0, "bbox_bottom":230, @@ -12,8 +12,8 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"6194dec1-6893-4139-8e2f-af5dd83e9dbc","name":"6194dec1-6893-4139-8e2f-af5dd83e9dbc","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"66086a6e-1b58-4594-801d-a5e38212e3ad","name":"66086a6e-1b58-4594-801d-a5e38212e3ad","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"6194dec1-6893-4139-8e2f-af5dd83e9dbc","name":"6194dec1-6893-4139-8e2f-af5dd83e9dbc","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"66086a6e-1b58-4594-801d-a5e38212e3ad","name":"66086a6e-1b58-4594-801d-a5e38212e3ad","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -69,12 +69,8 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"6194dec1-6893-4139-8e2f-af5dd83e9dbc","path":"sprites/spr_sororitas1/spr_sororitas1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"5effdf5d-1256-4cb9-8f03-14870afd2ebe","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"66086a6e-1b58-4594-801d-a5e38212e3ad","path":"sprites/spr_sororitas1/spr_sororitas1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"6d607d68-908c-419e-bea3-0ddb206bf1bf","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"6194dec1-6893-4139-8e2f-af5dd83e9dbc","path":"sprites/spr_sororitas1/spr_sororitas1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"5effdf5d-1256-4cb9-8f03-14870afd2ebe","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"66086a6e-1b58-4594-801d-a5e38212e3ad","path":"sprites/spr_sororitas1/spr_sororitas1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"6d607d68-908c-419e-bea3-0ddb206bf1bf","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_space_bg/spr_space_bg.yy b/sprites/spr_space_bg/spr_space_bg.yy index ac58dc7061..c3afd6da65 100644 --- a/sprites/spr_space_bg/spr_space_bg.yy +++ b/sprites/spr_space_bg/spr_space_bg.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_space_bg", "bboxMode":0, "bbox_bottom":959, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"4e8c4f34-0cb6-4b5d-88e8-c6dcaa46cda2","name":"4e8c4f34-0cb6-4b5d-88e8-c6dcaa46cda2","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"4e8c4f34-0cb6-4b5d-88e8-c6dcaa46cda2","name":"4e8c4f34-0cb6-4b5d-88e8-c6dcaa46cda2","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"4e8c4f34-0cb6-4b5d-88e8-c6dcaa46cda2","path":"sprites/spr_space_bg/spr_space_bg.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"c537d8f6-0233-4c6b-b155-7dc19778ee2d","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"4e8c4f34-0cb6-4b5d-88e8-c6dcaa46cda2","path":"sprites/spr_space_bg/spr_space_bg.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"c537d8f6-0233-4c6b-b155-7dc19778ee2d","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_special_helm/spr_special_helm.yy b/sprites/spr_special_helm/spr_special_helm.yy index edc4532213..a316e8b055 100644 --- a/sprites/spr_special_helm/spr_special_helm.yy +++ b/sprites/spr_special_helm/spr_special_helm.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_special_helm", "bboxMode":0, "bbox_bottom":47, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"8362ac13-7231-4584-a993-c6d4f51343b0","name":"8362ac13-7231-4584-a993-c6d4f51343b0","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"8362ac13-7231-4584-a993-c6d4f51343b0","name":"8362ac13-7231-4584-a993-c6d4f51343b0","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"8362ac13-7231-4584-a993-c6d4f51343b0","path":"sprites/spr_special_helm/spr_special_helm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"29377d0a-8ebc-44cf-a0ff-6122525f31aa","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"8362ac13-7231-4584-a993-c6d4f51343b0","path":"sprites/spr_special_helm/spr_special_helm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"29377d0a-8ebc-44cf-a0ff-6122525f31aa","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_star/spr_star.yy b/sprites/spr_star/spr_star.yy index 202a96a2af..44240d6e5e 100644 --- a/sprites/spr_star/spr_star.yy +++ b/sprites/spr_star/spr_star.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_star", "bboxMode":0, "bbox_bottom":72, @@ -12,12 +12,12 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"61e9fd0f-8f10-45a6-8bc1-28717245fd09","name":"61e9fd0f-8f10-45a6-8bc1-28717245fd09","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"282c87ae-537d-4711-a30b-867b90772a06","name":"282c87ae-537d-4711-a30b-867b90772a06","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"4ba5bd68-4c5a-4f6e-a30a-e5b257991933","name":"4ba5bd68-4c5a-4f6e-a30a-e5b257991933","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"c2c97573-50d7-4380-97e7-912a14586164","name":"c2c97573-50d7-4380-97e7-912a14586164","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"38b74789-1504-4070-ad76-e81c8093ef03","name":"38b74789-1504-4070-ad76-e81c8093ef03","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"b6bd31d7-a5f1-464f-ab35-5baed5926179","name":"b6bd31d7-a5f1-464f-ab35-5baed5926179","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"61e9fd0f-8f10-45a6-8bc1-28717245fd09","name":"61e9fd0f-8f10-45a6-8bc1-28717245fd09","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"282c87ae-537d-4711-a30b-867b90772a06","name":"282c87ae-537d-4711-a30b-867b90772a06","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"4ba5bd68-4c5a-4f6e-a30a-e5b257991933","name":"4ba5bd68-4c5a-4f6e-a30a-e5b257991933","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"c2c97573-50d7-4380-97e7-912a14586164","name":"c2c97573-50d7-4380-97e7-912a14586164","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"38b74789-1504-4070-ad76-e81c8093ef03","name":"38b74789-1504-4070-ad76-e81c8093ef03","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"b6bd31d7-a5f1-464f-ab35-5baed5926179","name":"b6bd31d7-a5f1-464f-ab35-5baed5926179","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -73,24 +73,12 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"61e9fd0f-8f10-45a6-8bc1-28717245fd09","path":"sprites/spr_star/spr_star.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"676cefc3-1d44-4b87-82a3-2be0a63f5ba6","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"282c87ae-537d-4711-a30b-867b90772a06","path":"sprites/spr_star/spr_star.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"1403b62b-f2e9-46c8-9a38-eb371632c278","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"4ba5bd68-4c5a-4f6e-a30a-e5b257991933","path":"sprites/spr_star/spr_star.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"e38b42a0-fdb5-483e-96e5-9202be8febe0","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"c2c97573-50d7-4380-97e7-912a14586164","path":"sprites/spr_star/spr_star.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"6a26c70c-4898-4592-b517-859992da0a34","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"38b74789-1504-4070-ad76-e81c8093ef03","path":"sprites/spr_star/spr_star.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"4e938f3b-04a3-49eb-a82c-9ea5eb79b86b","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"b6bd31d7-a5f1-464f-ab35-5baed5926179","path":"sprites/spr_star/spr_star.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"05e516f5-df1d-461e-a970-8f8ee2d3bd29","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"61e9fd0f-8f10-45a6-8bc1-28717245fd09","path":"sprites/spr_star/spr_star.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"676cefc3-1d44-4b87-82a3-2be0a63f5ba6","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"282c87ae-537d-4711-a30b-867b90772a06","path":"sprites/spr_star/spr_star.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"1403b62b-f2e9-46c8-9a38-eb371632c278","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"4ba5bd68-4c5a-4f6e-a30a-e5b257991933","path":"sprites/spr_star/spr_star.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"e38b42a0-fdb5-483e-96e5-9202be8febe0","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"c2c97573-50d7-4380-97e7-912a14586164","path":"sprites/spr_star/spr_star.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"6a26c70c-4898-4592-b517-859992da0a34","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"38b74789-1504-4070-ad76-e81c8093ef03","path":"sprites/spr_star/spr_star.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"4e938f3b-04a3-49eb-a82c-9ea5eb79b86b","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"b6bd31d7-a5f1-464f-ab35-5baed5926179","path":"sprites/spr_star/spr_star.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"05e516f5-df1d-461e-a970-8f8ee2d3bd29","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_star_hulk/spr_star_hulk.yy b/sprites/spr_star_hulk/spr_star_hulk.yy index 2e27b25b38..86320406dc 100644 --- a/sprites/spr_star_hulk/spr_star_hulk.yy +++ b/sprites/spr_star_hulk/spr_star_hulk.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_star_hulk", "bboxMode":0, "bbox_bottom":21, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"16de02a6-5396-4e08-a02f-fd696ada6e19","name":"16de02a6-5396-4e08-a02f-fd696ada6e19","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"16de02a6-5396-4e08-a02f-fd696ada6e19","name":"16de02a6-5396-4e08-a02f-fd696ada6e19","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"16de02a6-5396-4e08-a02f-fd696ada6e19","path":"sprites/spr_star_hulk/spr_star_hulk.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"75469e35-9e31-4205-864f-c31c0e2e7edc","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"16de02a6-5396-4e08-a02f-fd696ada6e19","path":"sprites/spr_star_hulk/spr_star_hulk.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"75469e35-9e31-4205-864f-c31c0e2e7edc","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":{ diff --git a/sprites/spr_star_pulse/spr_star_pulse.yy b/sprites/spr_star_pulse/spr_star_pulse.yy index 8f2bd4ce7c..815942bbb9 100644 --- a/sprites/spr_star_pulse/spr_star_pulse.yy +++ b/sprites/spr_star_pulse/spr_star_pulse.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_star_pulse", "bboxMode":0, "bbox_bottom":172, @@ -12,42 +12,42 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"b17570c1-c47a-44d2-b51b-126fc579948d","name":"b17570c1-c47a-44d2-b51b-126fc579948d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"0777e751-6431-464d-b099-418effdbd3a1","name":"0777e751-6431-464d-b099-418effdbd3a1","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"048f7bf1-9dd2-4350-a9b2-f4fbf8847b31","name":"048f7bf1-9dd2-4350-a9b2-f4fbf8847b31","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"ea9ead90-c343-4b79-9686-7ec1be403072","name":"ea9ead90-c343-4b79-9686-7ec1be403072","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"4f4c1cb5-c95a-4abf-93e8-6a7be4c21352","name":"4f4c1cb5-c95a-4abf-93e8-6a7be4c21352","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"99cde262-86c1-4089-96d9-b8b54aa96b82","name":"99cde262-86c1-4089-96d9-b8b54aa96b82","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"d094549a-5d8e-42fe-a706-fc7bc673123b","name":"d094549a-5d8e-42fe-a706-fc7bc673123b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"b83f259f-eb38-4a40-8a70-3e9536a068b7","name":"b83f259f-eb38-4a40-8a70-3e9536a068b7","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"a12fe0aa-a85c-49b1-bae8-b765e55b6d55","name":"a12fe0aa-a85c-49b1-bae8-b765e55b6d55","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"f7009f93-222f-46bb-84d1-12a94037855b","name":"f7009f93-222f-46bb-84d1-12a94037855b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"a3258b60-39f8-48b1-a06e-45fd6f1c6850","name":"a3258b60-39f8-48b1-a06e-45fd6f1c6850","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"72206475-ad68-4919-9969-2de3db0e18bc","name":"72206475-ad68-4919-9969-2de3db0e18bc","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"8000c82d-f2ef-4200-a84e-92f1e1266b58","name":"8000c82d-f2ef-4200-a84e-92f1e1266b58","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"ca7944d4-7f5a-4b40-86ae-0e7f8cf97fc6","name":"ca7944d4-7f5a-4b40-86ae-0e7f8cf97fc6","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"568395ee-201e-45aa-9611-258858807004","name":"568395ee-201e-45aa-9611-258858807004","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"39c10657-aea4-44a7-bb34-2dcc25920d7e","name":"39c10657-aea4-44a7-bb34-2dcc25920d7e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"e0d513c3-981a-4ef2-b197-8ef6de9ae580","name":"e0d513c3-981a-4ef2-b197-8ef6de9ae580","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"0aade7f8-cffc-45f9-925d-25bd852fb0fb","name":"0aade7f8-cffc-45f9-925d-25bd852fb0fb","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"eff16d73-dfd8-4eca-94ac-d7531d111fbb","name":"eff16d73-dfd8-4eca-94ac-d7531d111fbb","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"b19a9a19-b6a6-4664-ad56-f5fd59c964e5","name":"b19a9a19-b6a6-4664-ad56-f5fd59c964e5","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"5427b7b0-a5b2-4c6f-9433-a334525b1518","name":"5427b7b0-a5b2-4c6f-9433-a334525b1518","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"d036c9cb-4a41-4864-8113-d520943c398c","name":"d036c9cb-4a41-4864-8113-d520943c398c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"f1981546-9720-4545-a78f-2b6bc11c32f4","name":"f1981546-9720-4545-a78f-2b6bc11c32f4","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"accaf748-55fa-4cd5-9d3a-00256a23ffed","name":"accaf748-55fa-4cd5-9d3a-00256a23ffed","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"1b20fd01-2476-4442-8a3c-59bb2b6e251d","name":"1b20fd01-2476-4442-8a3c-59bb2b6e251d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"112097cd-6cb9-419f-bc06-c403bd9c6f77","name":"112097cd-6cb9-419f-bc06-c403bd9c6f77","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"01c90faf-0ab8-458b-8c6f-01aa222e841d","name":"01c90faf-0ab8-458b-8c6f-01aa222e841d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"b102ba61-35fb-46bc-8cb4-58bdd86eb7b1","name":"b102ba61-35fb-46bc-8cb4-58bdd86eb7b1","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"2a0f2afb-00f0-4c5f-95b3-9d06039c8513","name":"2a0f2afb-00f0-4c5f-95b3-9d06039c8513","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"8208d694-5ad2-4bba-aa7c-a457f2a775a9","name":"8208d694-5ad2-4bba-aa7c-a457f2a775a9","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"896295c8-c0e5-48b8-af68-18eb27b600f2","name":"896295c8-c0e5-48b8-af68-18eb27b600f2","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"8e03c34c-4131-49d6-b4e7-f1f25042b6c0","name":"8e03c34c-4131-49d6-b4e7-f1f25042b6c0","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"a6cee4b5-13a3-4de6-9a74-1185a4b63a29","name":"a6cee4b5-13a3-4de6-9a74-1185a4b63a29","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"4529e739-ef42-43ed-8520-b8702a46b840","name":"4529e739-ef42-43ed-8520-b8702a46b840","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"1cbb1dc0-723e-4686-9958-a5535884d7d8","name":"1cbb1dc0-723e-4686-9958-a5535884d7d8","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"a156d4d7-b489-4793-b1dc-69f1046127f4","name":"a156d4d7-b489-4793-b1dc-69f1046127f4","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"b17570c1-c47a-44d2-b51b-126fc579948d","name":"b17570c1-c47a-44d2-b51b-126fc579948d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"0777e751-6431-464d-b099-418effdbd3a1","name":"0777e751-6431-464d-b099-418effdbd3a1","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"048f7bf1-9dd2-4350-a9b2-f4fbf8847b31","name":"048f7bf1-9dd2-4350-a9b2-f4fbf8847b31","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"ea9ead90-c343-4b79-9686-7ec1be403072","name":"ea9ead90-c343-4b79-9686-7ec1be403072","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"4f4c1cb5-c95a-4abf-93e8-6a7be4c21352","name":"4f4c1cb5-c95a-4abf-93e8-6a7be4c21352","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"99cde262-86c1-4089-96d9-b8b54aa96b82","name":"99cde262-86c1-4089-96d9-b8b54aa96b82","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"d094549a-5d8e-42fe-a706-fc7bc673123b","name":"d094549a-5d8e-42fe-a706-fc7bc673123b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"b83f259f-eb38-4a40-8a70-3e9536a068b7","name":"b83f259f-eb38-4a40-8a70-3e9536a068b7","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"a12fe0aa-a85c-49b1-bae8-b765e55b6d55","name":"a12fe0aa-a85c-49b1-bae8-b765e55b6d55","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"f7009f93-222f-46bb-84d1-12a94037855b","name":"f7009f93-222f-46bb-84d1-12a94037855b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"a3258b60-39f8-48b1-a06e-45fd6f1c6850","name":"a3258b60-39f8-48b1-a06e-45fd6f1c6850","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"72206475-ad68-4919-9969-2de3db0e18bc","name":"72206475-ad68-4919-9969-2de3db0e18bc","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"8000c82d-f2ef-4200-a84e-92f1e1266b58","name":"8000c82d-f2ef-4200-a84e-92f1e1266b58","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"ca7944d4-7f5a-4b40-86ae-0e7f8cf97fc6","name":"ca7944d4-7f5a-4b40-86ae-0e7f8cf97fc6","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"568395ee-201e-45aa-9611-258858807004","name":"568395ee-201e-45aa-9611-258858807004","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"39c10657-aea4-44a7-bb34-2dcc25920d7e","name":"39c10657-aea4-44a7-bb34-2dcc25920d7e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"e0d513c3-981a-4ef2-b197-8ef6de9ae580","name":"e0d513c3-981a-4ef2-b197-8ef6de9ae580","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"0aade7f8-cffc-45f9-925d-25bd852fb0fb","name":"0aade7f8-cffc-45f9-925d-25bd852fb0fb","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"eff16d73-dfd8-4eca-94ac-d7531d111fbb","name":"eff16d73-dfd8-4eca-94ac-d7531d111fbb","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"b19a9a19-b6a6-4664-ad56-f5fd59c964e5","name":"b19a9a19-b6a6-4664-ad56-f5fd59c964e5","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"5427b7b0-a5b2-4c6f-9433-a334525b1518","name":"5427b7b0-a5b2-4c6f-9433-a334525b1518","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"d036c9cb-4a41-4864-8113-d520943c398c","name":"d036c9cb-4a41-4864-8113-d520943c398c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"f1981546-9720-4545-a78f-2b6bc11c32f4","name":"f1981546-9720-4545-a78f-2b6bc11c32f4","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"accaf748-55fa-4cd5-9d3a-00256a23ffed","name":"accaf748-55fa-4cd5-9d3a-00256a23ffed","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"1b20fd01-2476-4442-8a3c-59bb2b6e251d","name":"1b20fd01-2476-4442-8a3c-59bb2b6e251d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"112097cd-6cb9-419f-bc06-c403bd9c6f77","name":"112097cd-6cb9-419f-bc06-c403bd9c6f77","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"01c90faf-0ab8-458b-8c6f-01aa222e841d","name":"01c90faf-0ab8-458b-8c6f-01aa222e841d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"b102ba61-35fb-46bc-8cb4-58bdd86eb7b1","name":"b102ba61-35fb-46bc-8cb4-58bdd86eb7b1","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"2a0f2afb-00f0-4c5f-95b3-9d06039c8513","name":"2a0f2afb-00f0-4c5f-95b3-9d06039c8513","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"8208d694-5ad2-4bba-aa7c-a457f2a775a9","name":"8208d694-5ad2-4bba-aa7c-a457f2a775a9","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"896295c8-c0e5-48b8-af68-18eb27b600f2","name":"896295c8-c0e5-48b8-af68-18eb27b600f2","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"8e03c34c-4131-49d6-b4e7-f1f25042b6c0","name":"8e03c34c-4131-49d6-b4e7-f1f25042b6c0","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"a6cee4b5-13a3-4de6-9a74-1185a4b63a29","name":"a6cee4b5-13a3-4de6-9a74-1185a4b63a29","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"4529e739-ef42-43ed-8520-b8702a46b840","name":"4529e739-ef42-43ed-8520-b8702a46b840","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"1cbb1dc0-723e-4686-9958-a5535884d7d8","name":"1cbb1dc0-723e-4686-9958-a5535884d7d8","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"a156d4d7-b489-4793-b1dc-69f1046127f4","name":"a156d4d7-b489-4793-b1dc-69f1046127f4","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -103,114 +103,42 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"b17570c1-c47a-44d2-b51b-126fc579948d","path":"sprites/spr_star_pulse/spr_star_pulse.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"022aa52b-6dcf-4392-ba1b-c135a09fb45b","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"0777e751-6431-464d-b099-418effdbd3a1","path":"sprites/spr_star_pulse/spr_star_pulse.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"3ed53312-bf9a-4cd2-862a-13c542640202","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"048f7bf1-9dd2-4350-a9b2-f4fbf8847b31","path":"sprites/spr_star_pulse/spr_star_pulse.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"d6edff08-437d-4ce7-a8c0-d505859e7f60","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"ea9ead90-c343-4b79-9686-7ec1be403072","path":"sprites/spr_star_pulse/spr_star_pulse.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"339b3224-c7b4-4038-b63a-c47b7e8c714b","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"4f4c1cb5-c95a-4abf-93e8-6a7be4c21352","path":"sprites/spr_star_pulse/spr_star_pulse.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"b712de29-3b00-4ecb-bed9-a462d3ac5db4","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"99cde262-86c1-4089-96d9-b8b54aa96b82","path":"sprites/spr_star_pulse/spr_star_pulse.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"b3a282a9-1b54-48ed-a31d-383bf7aa2570","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"d094549a-5d8e-42fe-a706-fc7bc673123b","path":"sprites/spr_star_pulse/spr_star_pulse.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"c43e5851-8ca3-4cf1-82b0-56edfa8bcef1","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"b83f259f-eb38-4a40-8a70-3e9536a068b7","path":"sprites/spr_star_pulse/spr_star_pulse.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"28b0e804-a08a-4e7d-bdb0-cca10a53c611","IsCreationKey":false,"Key":7.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"a12fe0aa-a85c-49b1-bae8-b765e55b6d55","path":"sprites/spr_star_pulse/spr_star_pulse.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"8dfeaee9-9b0f-4e18-806f-c9ef09a9fdb1","IsCreationKey":false,"Key":8.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"f7009f93-222f-46bb-84d1-12a94037855b","path":"sprites/spr_star_pulse/spr_star_pulse.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"f1711c68-311f-4f81-9607-87c5cfad5eaf","IsCreationKey":false,"Key":9.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"a3258b60-39f8-48b1-a06e-45fd6f1c6850","path":"sprites/spr_star_pulse/spr_star_pulse.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"75aeec36-56f3-4dc7-b4c9-e2c7719e997f","IsCreationKey":false,"Key":10.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"72206475-ad68-4919-9969-2de3db0e18bc","path":"sprites/spr_star_pulse/spr_star_pulse.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"b64f550e-ffd3-40ca-8b69-5b160dd0aab7","IsCreationKey":false,"Key":11.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"8000c82d-f2ef-4200-a84e-92f1e1266b58","path":"sprites/spr_star_pulse/spr_star_pulse.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"04bd8c72-3118-4ed1-b208-c8ac4880e000","IsCreationKey":false,"Key":12.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"ca7944d4-7f5a-4b40-86ae-0e7f8cf97fc6","path":"sprites/spr_star_pulse/spr_star_pulse.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"4b5ea088-5d42-4613-a0ec-071190cf32ee","IsCreationKey":false,"Key":13.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"568395ee-201e-45aa-9611-258858807004","path":"sprites/spr_star_pulse/spr_star_pulse.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"ecb80c0b-8492-4e25-89f0-a70b67f448b9","IsCreationKey":false,"Key":14.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"39c10657-aea4-44a7-bb34-2dcc25920d7e","path":"sprites/spr_star_pulse/spr_star_pulse.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"70321b1b-d944-482d-80c6-8075c413c313","IsCreationKey":false,"Key":15.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"e0d513c3-981a-4ef2-b197-8ef6de9ae580","path":"sprites/spr_star_pulse/spr_star_pulse.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"a9b0f7b4-8c3f-4227-a8c6-5fa5ac9f7e41","IsCreationKey":false,"Key":16.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"0aade7f8-cffc-45f9-925d-25bd852fb0fb","path":"sprites/spr_star_pulse/spr_star_pulse.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"95ba5536-93a6-444e-b7a9-a3e4b64e7e61","IsCreationKey":false,"Key":17.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"eff16d73-dfd8-4eca-94ac-d7531d111fbb","path":"sprites/spr_star_pulse/spr_star_pulse.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"02a19f5a-045d-4731-9040-e7fff02841bb","IsCreationKey":false,"Key":18.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"b19a9a19-b6a6-4664-ad56-f5fd59c964e5","path":"sprites/spr_star_pulse/spr_star_pulse.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"05b9c39e-3d12-46db-8165-bdbfd2803879","IsCreationKey":false,"Key":19.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"5427b7b0-a5b2-4c6f-9433-a334525b1518","path":"sprites/spr_star_pulse/spr_star_pulse.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"69e1440d-58bd-435d-a21a-aed34aa20da6","IsCreationKey":false,"Key":20.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"d036c9cb-4a41-4864-8113-d520943c398c","path":"sprites/spr_star_pulse/spr_star_pulse.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"d191695b-32c4-4118-966f-df1022efd415","IsCreationKey":false,"Key":21.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"f1981546-9720-4545-a78f-2b6bc11c32f4","path":"sprites/spr_star_pulse/spr_star_pulse.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"5e51ed73-fa84-444e-8685-768804493025","IsCreationKey":false,"Key":22.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"accaf748-55fa-4cd5-9d3a-00256a23ffed","path":"sprites/spr_star_pulse/spr_star_pulse.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"7cfa1d74-7dda-4f30-8473-b912f6ab8527","IsCreationKey":false,"Key":23.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"1b20fd01-2476-4442-8a3c-59bb2b6e251d","path":"sprites/spr_star_pulse/spr_star_pulse.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"a4c44ea2-10a7-4d06-b956-29b9c1590ecc","IsCreationKey":false,"Key":24.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"112097cd-6cb9-419f-bc06-c403bd9c6f77","path":"sprites/spr_star_pulse/spr_star_pulse.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"8d9ef554-3d8e-4ea3-a3f8-f6753696fd68","IsCreationKey":false,"Key":25.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"01c90faf-0ab8-458b-8c6f-01aa222e841d","path":"sprites/spr_star_pulse/spr_star_pulse.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"85f84d1a-91fa-42c5-a570-ede9ac2de9d5","IsCreationKey":false,"Key":26.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"b102ba61-35fb-46bc-8cb4-58bdd86eb7b1","path":"sprites/spr_star_pulse/spr_star_pulse.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"7a83bbd8-53e2-45dc-a8e3-3a44e3d96301","IsCreationKey":false,"Key":27.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"2a0f2afb-00f0-4c5f-95b3-9d06039c8513","path":"sprites/spr_star_pulse/spr_star_pulse.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"0db64db2-476d-48b3-9870-6807a514bc1a","IsCreationKey":false,"Key":28.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"8208d694-5ad2-4bba-aa7c-a457f2a775a9","path":"sprites/spr_star_pulse/spr_star_pulse.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"5ce1af65-e4f0-4527-8b5b-a3950b8fb3e3","IsCreationKey":false,"Key":29.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"896295c8-c0e5-48b8-af68-18eb27b600f2","path":"sprites/spr_star_pulse/spr_star_pulse.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"dc914f29-e38a-4e8c-9882-003d1af471b1","IsCreationKey":false,"Key":30.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"8e03c34c-4131-49d6-b4e7-f1f25042b6c0","path":"sprites/spr_star_pulse/spr_star_pulse.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"7f6977aa-07f2-4021-8442-027421b15871","IsCreationKey":false,"Key":31.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"a6cee4b5-13a3-4de6-9a74-1185a4b63a29","path":"sprites/spr_star_pulse/spr_star_pulse.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"a26c223e-e49e-42e7-a245-8d8cb339920d","IsCreationKey":false,"Key":32.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"4529e739-ef42-43ed-8520-b8702a46b840","path":"sprites/spr_star_pulse/spr_star_pulse.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"dda2b9c8-c8e0-4e78-a9bf-783b63564baa","IsCreationKey":false,"Key":33.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"1cbb1dc0-723e-4686-9958-a5535884d7d8","path":"sprites/spr_star_pulse/spr_star_pulse.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"e4783230-51be-41b8-8b71-a27d32398c5d","IsCreationKey":false,"Key":34.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"a156d4d7-b489-4793-b1dc-69f1046127f4","path":"sprites/spr_star_pulse/spr_star_pulse.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"0b9c0da2-e18b-4a4d-91ea-643fe9c5d9a1","IsCreationKey":false,"Key":35.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"b17570c1-c47a-44d2-b51b-126fc579948d","path":"sprites/spr_star_pulse/spr_star_pulse.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"022aa52b-6dcf-4392-ba1b-c135a09fb45b","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"0777e751-6431-464d-b099-418effdbd3a1","path":"sprites/spr_star_pulse/spr_star_pulse.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"3ed53312-bf9a-4cd2-862a-13c542640202","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"048f7bf1-9dd2-4350-a9b2-f4fbf8847b31","path":"sprites/spr_star_pulse/spr_star_pulse.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"d6edff08-437d-4ce7-a8c0-d505859e7f60","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"ea9ead90-c343-4b79-9686-7ec1be403072","path":"sprites/spr_star_pulse/spr_star_pulse.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"339b3224-c7b4-4038-b63a-c47b7e8c714b","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"4f4c1cb5-c95a-4abf-93e8-6a7be4c21352","path":"sprites/spr_star_pulse/spr_star_pulse.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"b712de29-3b00-4ecb-bed9-a462d3ac5db4","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"99cde262-86c1-4089-96d9-b8b54aa96b82","path":"sprites/spr_star_pulse/spr_star_pulse.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"b3a282a9-1b54-48ed-a31d-383bf7aa2570","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"d094549a-5d8e-42fe-a706-fc7bc673123b","path":"sprites/spr_star_pulse/spr_star_pulse.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"c43e5851-8ca3-4cf1-82b0-56edfa8bcef1","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"b83f259f-eb38-4a40-8a70-3e9536a068b7","path":"sprites/spr_star_pulse/spr_star_pulse.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"28b0e804-a08a-4e7d-bdb0-cca10a53c611","IsCreationKey":false,"Key":7.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"a12fe0aa-a85c-49b1-bae8-b765e55b6d55","path":"sprites/spr_star_pulse/spr_star_pulse.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"8dfeaee9-9b0f-4e18-806f-c9ef09a9fdb1","IsCreationKey":false,"Key":8.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"f7009f93-222f-46bb-84d1-12a94037855b","path":"sprites/spr_star_pulse/spr_star_pulse.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"f1711c68-311f-4f81-9607-87c5cfad5eaf","IsCreationKey":false,"Key":9.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"a3258b60-39f8-48b1-a06e-45fd6f1c6850","path":"sprites/spr_star_pulse/spr_star_pulse.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"75aeec36-56f3-4dc7-b4c9-e2c7719e997f","IsCreationKey":false,"Key":10.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"72206475-ad68-4919-9969-2de3db0e18bc","path":"sprites/spr_star_pulse/spr_star_pulse.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"b64f550e-ffd3-40ca-8b69-5b160dd0aab7","IsCreationKey":false,"Key":11.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"8000c82d-f2ef-4200-a84e-92f1e1266b58","path":"sprites/spr_star_pulse/spr_star_pulse.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"04bd8c72-3118-4ed1-b208-c8ac4880e000","IsCreationKey":false,"Key":12.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"ca7944d4-7f5a-4b40-86ae-0e7f8cf97fc6","path":"sprites/spr_star_pulse/spr_star_pulse.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"4b5ea088-5d42-4613-a0ec-071190cf32ee","IsCreationKey":false,"Key":13.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"568395ee-201e-45aa-9611-258858807004","path":"sprites/spr_star_pulse/spr_star_pulse.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"ecb80c0b-8492-4e25-89f0-a70b67f448b9","IsCreationKey":false,"Key":14.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"39c10657-aea4-44a7-bb34-2dcc25920d7e","path":"sprites/spr_star_pulse/spr_star_pulse.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"70321b1b-d944-482d-80c6-8075c413c313","IsCreationKey":false,"Key":15.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"e0d513c3-981a-4ef2-b197-8ef6de9ae580","path":"sprites/spr_star_pulse/spr_star_pulse.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"a9b0f7b4-8c3f-4227-a8c6-5fa5ac9f7e41","IsCreationKey":false,"Key":16.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"0aade7f8-cffc-45f9-925d-25bd852fb0fb","path":"sprites/spr_star_pulse/spr_star_pulse.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"95ba5536-93a6-444e-b7a9-a3e4b64e7e61","IsCreationKey":false,"Key":17.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"eff16d73-dfd8-4eca-94ac-d7531d111fbb","path":"sprites/spr_star_pulse/spr_star_pulse.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"02a19f5a-045d-4731-9040-e7fff02841bb","IsCreationKey":false,"Key":18.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"b19a9a19-b6a6-4664-ad56-f5fd59c964e5","path":"sprites/spr_star_pulse/spr_star_pulse.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"05b9c39e-3d12-46db-8165-bdbfd2803879","IsCreationKey":false,"Key":19.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"5427b7b0-a5b2-4c6f-9433-a334525b1518","path":"sprites/spr_star_pulse/spr_star_pulse.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"69e1440d-58bd-435d-a21a-aed34aa20da6","IsCreationKey":false,"Key":20.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"d036c9cb-4a41-4864-8113-d520943c398c","path":"sprites/spr_star_pulse/spr_star_pulse.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"d191695b-32c4-4118-966f-df1022efd415","IsCreationKey":false,"Key":21.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"f1981546-9720-4545-a78f-2b6bc11c32f4","path":"sprites/spr_star_pulse/spr_star_pulse.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"5e51ed73-fa84-444e-8685-768804493025","IsCreationKey":false,"Key":22.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"accaf748-55fa-4cd5-9d3a-00256a23ffed","path":"sprites/spr_star_pulse/spr_star_pulse.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"7cfa1d74-7dda-4f30-8473-b912f6ab8527","IsCreationKey":false,"Key":23.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"1b20fd01-2476-4442-8a3c-59bb2b6e251d","path":"sprites/spr_star_pulse/spr_star_pulse.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"a4c44ea2-10a7-4d06-b956-29b9c1590ecc","IsCreationKey":false,"Key":24.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"112097cd-6cb9-419f-bc06-c403bd9c6f77","path":"sprites/spr_star_pulse/spr_star_pulse.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"8d9ef554-3d8e-4ea3-a3f8-f6753696fd68","IsCreationKey":false,"Key":25.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"01c90faf-0ab8-458b-8c6f-01aa222e841d","path":"sprites/spr_star_pulse/spr_star_pulse.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"85f84d1a-91fa-42c5-a570-ede9ac2de9d5","IsCreationKey":false,"Key":26.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"b102ba61-35fb-46bc-8cb4-58bdd86eb7b1","path":"sprites/spr_star_pulse/spr_star_pulse.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"7a83bbd8-53e2-45dc-a8e3-3a44e3d96301","IsCreationKey":false,"Key":27.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"2a0f2afb-00f0-4c5f-95b3-9d06039c8513","path":"sprites/spr_star_pulse/spr_star_pulse.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"0db64db2-476d-48b3-9870-6807a514bc1a","IsCreationKey":false,"Key":28.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"8208d694-5ad2-4bba-aa7c-a457f2a775a9","path":"sprites/spr_star_pulse/spr_star_pulse.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"5ce1af65-e4f0-4527-8b5b-a3950b8fb3e3","IsCreationKey":false,"Key":29.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"896295c8-c0e5-48b8-af68-18eb27b600f2","path":"sprites/spr_star_pulse/spr_star_pulse.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"dc914f29-e38a-4e8c-9882-003d1af471b1","IsCreationKey":false,"Key":30.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"8e03c34c-4131-49d6-b4e7-f1f25042b6c0","path":"sprites/spr_star_pulse/spr_star_pulse.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"7f6977aa-07f2-4021-8442-027421b15871","IsCreationKey":false,"Key":31.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"a6cee4b5-13a3-4de6-9a74-1185a4b63a29","path":"sprites/spr_star_pulse/spr_star_pulse.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"a26c223e-e49e-42e7-a245-8d8cb339920d","IsCreationKey":false,"Key":32.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"4529e739-ef42-43ed-8520-b8702a46b840","path":"sprites/spr_star_pulse/spr_star_pulse.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"dda2b9c8-c8e0-4e78-a9bf-783b63564baa","IsCreationKey":false,"Key":33.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"1cbb1dc0-723e-4686-9958-a5535884d7d8","path":"sprites/spr_star_pulse/spr_star_pulse.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"e4783230-51be-41b8-8b71-a27d32398c5d","IsCreationKey":false,"Key":34.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"a156d4d7-b489-4793-b1dc-69f1046127f4","path":"sprites/spr_star_pulse/spr_star_pulse.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"0b9c0da2-e18b-4a4d-91ea-643fe9c5d9a1","IsCreationKey":false,"Key":35.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":{ diff --git a/sprites/spr_star_screen/spr_star_screen.yy b/sprites/spr_star_screen/spr_star_screen.yy index e048d90e08..a586e372a4 100644 --- a/sprites/spr_star_screen/spr_star_screen.yy +++ b/sprites/spr_star_screen/spr_star_screen.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_star_screen", "bboxMode":0, "bbox_bottom":293, @@ -12,13 +12,13 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"b40bc04c-5756-4025-969a-8000b0e6781c","name":"b40bc04c-5756-4025-969a-8000b0e6781c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"38363157-05ad-48d2-95a0-1566c8e597be","name":"38363157-05ad-48d2-95a0-1566c8e597be","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"525040f2-1ff1-449c-bad6-f578ef258589","name":"525040f2-1ff1-449c-bad6-f578ef258589","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"7d8c7469-cf0c-43f8-8abd-9a9c1c62f51b","name":"7d8c7469-cf0c-43f8-8abd-9a9c1c62f51b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"45dbbde0-3065-4dc4-b203-e27a80367595","name":"45dbbde0-3065-4dc4-b203-e27a80367595","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"3c5567e6-4464-474d-b78f-43a163963db2","name":"3c5567e6-4464-474d-b78f-43a163963db2","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"8247b76b-beb3-4777-9099-01fd1da955ba","name":"8247b76b-beb3-4777-9099-01fd1da955ba","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"b40bc04c-5756-4025-969a-8000b0e6781c","name":"b40bc04c-5756-4025-969a-8000b0e6781c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"38363157-05ad-48d2-95a0-1566c8e597be","name":"38363157-05ad-48d2-95a0-1566c8e597be","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"525040f2-1ff1-449c-bad6-f578ef258589","name":"525040f2-1ff1-449c-bad6-f578ef258589","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"7d8c7469-cf0c-43f8-8abd-9a9c1c62f51b","name":"7d8c7469-cf0c-43f8-8abd-9a9c1c62f51b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"45dbbde0-3065-4dc4-b203-e27a80367595","name":"45dbbde0-3065-4dc4-b203-e27a80367595","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"3c5567e6-4464-474d-b78f-43a163963db2","name":"3c5567e6-4464-474d-b78f-43a163963db2","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"8247b76b-beb3-4777-9099-01fd1da955ba","name":"8247b76b-beb3-4777-9099-01fd1da955ba","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -74,27 +74,13 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"b40bc04c-5756-4025-969a-8000b0e6781c","path":"sprites/spr_star_screen/spr_star_screen.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"c270aba7-52e1-4066-b249-c2e38393c822","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"38363157-05ad-48d2-95a0-1566c8e597be","path":"sprites/spr_star_screen/spr_star_screen.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"1d2a1e23-3854-4b5e-9dc3-07e987869bb0","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"525040f2-1ff1-449c-bad6-f578ef258589","path":"sprites/spr_star_screen/spr_star_screen.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"a6cd1343-e1c9-4304-be44-1657aacb8513","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"7d8c7469-cf0c-43f8-8abd-9a9c1c62f51b","path":"sprites/spr_star_screen/spr_star_screen.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"ad8ca15e-fd60-4c87-a6a3-6451a9a31df2","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"45dbbde0-3065-4dc4-b203-e27a80367595","path":"sprites/spr_star_screen/spr_star_screen.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"7020ba6d-e494-4724-b6ed-3dfb967fb190","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"3c5567e6-4464-474d-b78f-43a163963db2","path":"sprites/spr_star_screen/spr_star_screen.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"8cc9e0c9-e2a0-4261-8c89-fa25331ec4db","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"8247b76b-beb3-4777-9099-01fd1da955ba","path":"sprites/spr_star_screen/spr_star_screen.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"02333eb2-854d-402d-842f-f68af649ee42","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"b40bc04c-5756-4025-969a-8000b0e6781c","path":"sprites/spr_star_screen/spr_star_screen.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"c270aba7-52e1-4066-b249-c2e38393c822","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"38363157-05ad-48d2-95a0-1566c8e597be","path":"sprites/spr_star_screen/spr_star_screen.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"1d2a1e23-3854-4b5e-9dc3-07e987869bb0","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"525040f2-1ff1-449c-bad6-f578ef258589","path":"sprites/spr_star_screen/spr_star_screen.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"a6cd1343-e1c9-4304-be44-1657aacb8513","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"7d8c7469-cf0c-43f8-8abd-9a9c1c62f51b","path":"sprites/spr_star_screen/spr_star_screen.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"ad8ca15e-fd60-4c87-a6a3-6451a9a31df2","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"45dbbde0-3065-4dc4-b203-e27a80367595","path":"sprites/spr_star_screen/spr_star_screen.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"7020ba6d-e494-4724-b6ed-3dfb967fb190","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"3c5567e6-4464-474d-b78f-43a163963db2","path":"sprites/spr_star_screen/spr_star_screen.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"8cc9e0c9-e2a0-4261-8c89-fa25331ec4db","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"8247b76b-beb3-4777-9099-01fd1da955ba","path":"sprites/spr_star_screen/spr_star_screen.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"02333eb2-854d-402d-842f-f68af649ee42","IsCreationKey":false,"Key":6.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_strength_icon/spr_strength_icon.yy b/sprites/spr_strength_icon/spr_strength_icon.yy index c3ecee1bde..8729f1e97a 100644 --- a/sprites/spr_strength_icon/spr_strength_icon.yy +++ b/sprites/spr_strength_icon/spr_strength_icon.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_strength_icon", "bboxMode":0, "bbox_bottom":56, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"5da0d9be-bc73-40ef-98d3-44c7b92a34ac","name":"5da0d9be-bc73-40ef-98d3-44c7b92a34ac","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"5da0d9be-bc73-40ef-98d3-44c7b92a34ac","name":"5da0d9be-bc73-40ef-98d3-44c7b92a34ac","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"5da0d9be-bc73-40ef-98d3-44c7b92a34ac","path":"sprites/spr_strength_icon/spr_strength_icon.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"0f495221-4734-4736-b81f-5356718081ec","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"5da0d9be-bc73-40ef-98d3-44c7b92a34ac","path":"sprites/spr_strength_icon/spr_strength_icon.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"0f495221-4734-4736-b81f-5356718081ec","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_sw_mk5_helm/spr_sw_mk5_helm.yy b/sprites/spr_sw_mk5_helm/spr_sw_mk5_helm.yy index d6cb43692b..4ba89741ec 100644 --- a/sprites/spr_sw_mk5_helm/spr_sw_mk5_helm.yy +++ b/sprites/spr_sw_mk5_helm/spr_sw_mk5_helm.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_sw_mk5_helm", "bboxMode":0, "bbox_bottom":43, @@ -12,8 +12,8 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"b89ece35-f459-4bfe-b4be-3b1eb341cdaa","name":"b89ece35-f459-4bfe-b4be-3b1eb341cdaa","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"8b39094a-4165-436a-b7e9-7abd097e059b","name":"8b39094a-4165-436a-b7e9-7abd097e059b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"b89ece35-f459-4bfe-b4be-3b1eb341cdaa","name":"b89ece35-f459-4bfe-b4be-3b1eb341cdaa","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"8b39094a-4165-436a-b7e9-7abd097e059b","name":"8b39094a-4165-436a-b7e9-7abd097e059b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -69,12 +69,8 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"b89ece35-f459-4bfe-b4be-3b1eb341cdaa","path":"sprites/spr_sw_mk5_helm/spr_sw_mk5_helm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"44c4d073-b234-4412-b6f5-bfc150b3810b","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"8b39094a-4165-436a-b7e9-7abd097e059b","path":"sprites/spr_sw_mk5_helm/spr_sw_mk5_helm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"ee3331fc-28ea-4a9e-b855-5a7083e36d58","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"b89ece35-f459-4bfe-b4be-3b1eb341cdaa","path":"sprites/spr_sw_mk5_helm/spr_sw_mk5_helm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"44c4d073-b234-4412-b6f5-bfc150b3810b","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"8b39094a-4165-436a-b7e9-7abd097e059b","path":"sprites/spr_sw_mk5_helm/spr_sw_mk5_helm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"ee3331fc-28ea-4a9e-b855-5a7083e36d58","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_sw_mk6_helm/spr_sw_mk6_helm.yy b/sprites/spr_sw_mk6_helm/spr_sw_mk6_helm.yy index b084a0a0f6..f20c9b957d 100644 --- a/sprites/spr_sw_mk6_helm/spr_sw_mk6_helm.yy +++ b/sprites/spr_sw_mk6_helm/spr_sw_mk6_helm.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_sw_mk6_helm", "bboxMode":0, "bbox_bottom":47, @@ -12,8 +12,8 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"bb72a259-1e38-4149-8200-f6a5c4b33850","name":"bb72a259-1e38-4149-8200-f6a5c4b33850","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"df704fe9-0607-4d5d-b8c1-fe901cc78768","name":"df704fe9-0607-4d5d-b8c1-fe901cc78768","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"bb72a259-1e38-4149-8200-f6a5c4b33850","name":"bb72a259-1e38-4149-8200-f6a5c4b33850","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"df704fe9-0607-4d5d-b8c1-fe901cc78768","name":"df704fe9-0607-4d5d-b8c1-fe901cc78768","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -69,12 +69,8 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"bb72a259-1e38-4149-8200-f6a5c4b33850","path":"sprites/spr_sw_mk6_helm/spr_sw_mk6_helm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"6c902c7a-223b-4233-9dc3-c191de3e4085","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"df704fe9-0607-4d5d-b8c1-fe901cc78768","path":"sprites/spr_sw_mk6_helm/spr_sw_mk6_helm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"5570e42c-c74a-4c08-854d-b63a2516f277","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"bb72a259-1e38-4149-8200-f6a5c4b33850","path":"sprites/spr_sw_mk6_helm/spr_sw_mk6_helm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"6c902c7a-223b-4233-9dc3-c191de3e4085","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"df704fe9-0607-4d5d-b8c1-fe901cc78768","path":"sprites/spr_sw_mk6_helm/spr_sw_mk6_helm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"5570e42c-c74a-4c08-854d-b63a2516f277","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_sw_mk7_helm/spr_sw_mk7_helm.yy b/sprites/spr_sw_mk7_helm/spr_sw_mk7_helm.yy index a69877a592..927d4c1e75 100644 --- a/sprites/spr_sw_mk7_helm/spr_sw_mk7_helm.yy +++ b/sprites/spr_sw_mk7_helm/spr_sw_mk7_helm.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_sw_mk7_helm", "bboxMode":0, "bbox_bottom":43, @@ -12,8 +12,8 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"189e3236-d097-4322-8122-3e48d302a028","name":"189e3236-d097-4322-8122-3e48d302a028","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"45bc7c5e-ce8c-4ffb-859b-b358a1d5ad37","name":"45bc7c5e-ce8c-4ffb-859b-b358a1d5ad37","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"189e3236-d097-4322-8122-3e48d302a028","name":"189e3236-d097-4322-8122-3e48d302a028","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"45bc7c5e-ce8c-4ffb-859b-b358a1d5ad37","name":"45bc7c5e-ce8c-4ffb-859b-b358a1d5ad37","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -69,12 +69,8 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"189e3236-d097-4322-8122-3e48d302a028","path":"sprites/spr_sw_mk7_helm/spr_sw_mk7_helm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"ca779862-985c-4a3f-9364-35773b53070d","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"45bc7c5e-ce8c-4ffb-859b-b358a1d5ad37","path":"sprites/spr_sw_mk7_helm/spr_sw_mk7_helm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"5de7c416-d037-453b-a42d-7a20173dd605","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"189e3236-d097-4322-8122-3e48d302a028","path":"sprites/spr_sw_mk7_helm/spr_sw_mk7_helm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"ca779862-985c-4a3f-9364-35773b53070d","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"45bc7c5e-ce8c-4ffb-859b-b358a1d5ad37","path":"sprites/spr_sw_mk7_helm/spr_sw_mk7_helm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"5de7c416-d037-453b-a42d-7a20173dd605","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_sword_pendant/spr_sword_pendant.yy b/sprites/spr_sword_pendant/spr_sword_pendant.yy index 929cd8ef53..6fa466365e 100644 --- a/sprites/spr_sword_pendant/spr_sword_pendant.yy +++ b/sprites/spr_sword_pendant/spr_sword_pendant.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_sword_pendant", "bboxMode":0, "bbox_bottom":25, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"0926bad1-dfb3-41bb-b6ee-7732d3036688","name":"0926bad1-dfb3-41bb-b6ee-7732d3036688","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"0926bad1-dfb3-41bb-b6ee-7732d3036688","name":"0926bad1-dfb3-41bb-b6ee-7732d3036688","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -70,9 +70,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"0926bad1-dfb3-41bb-b6ee-7732d3036688","path":"sprites/spr_sword_pendant/spr_sword_pendant.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"fce0aede-094a-47b8-be8e-8f04a9807531","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"0926bad1-dfb3-41bb-b6ee-7732d3036688","path":"sprites/spr_sword_pendant/spr_sword_pendant.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"fce0aede-094a-47b8-be8e-8f04a9807531","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_tartaros2_colors/spr_tartaros2_colors.yy b/sprites/spr_tartaros2_colors/spr_tartaros2_colors.yy index 622844353d..e157dec361 100644 --- a/sprites/spr_tartaros2_colors/spr_tartaros2_colors.yy +++ b/sprites/spr_tartaros2_colors/spr_tartaros2_colors.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_tartaros2_colors", "bboxMode":0, "bbox_bottom":259, @@ -12,17 +12,17 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"3f2bfc4a-6242-4b4f-b23a-1b9f2f6b6238","name":"3f2bfc4a-6242-4b4f-b23a-1b9f2f6b6238","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"ec7335a2-5940-4d44-a57a-6ef2b18a7aa6","name":"ec7335a2-5940-4d44-a57a-6ef2b18a7aa6","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"d19f71d0-9c25-4938-8ff1-6ce05cbbaba0","name":"d19f71d0-9c25-4938-8ff1-6ce05cbbaba0","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"8c4ca248-93ee-410c-b68a-e9ecec54b32d","name":"8c4ca248-93ee-410c-b68a-e9ecec54b32d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"0bcfa324-70be-491f-9c81-e421ae10e401","name":"0bcfa324-70be-491f-9c81-e421ae10e401","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"1d0346f6-0c14-4ba9-810c-e8ee0515c859","name":"1d0346f6-0c14-4ba9-810c-e8ee0515c859","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"1f3656b9-6717-4477-b5d1-05235b9bd903","name":"1f3656b9-6717-4477-b5d1-05235b9bd903","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"543bf910-3b46-44a3-b42d-585dec34b2e9","name":"543bf910-3b46-44a3-b42d-585dec34b2e9","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"c8308dbd-f9c5-4d70-8f5b-3f8a96183706","name":"c8308dbd-f9c5-4d70-8f5b-3f8a96183706","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"87e52bcf-0cde-4bd2-960a-18d56a5e5abf","name":"87e52bcf-0cde-4bd2-960a-18d56a5e5abf","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"40d1b2e1-aad0-465c-9688-32ada947f8ea","name":"40d1b2e1-aad0-465c-9688-32ada947f8ea","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"3f2bfc4a-6242-4b4f-b23a-1b9f2f6b6238","name":"3f2bfc4a-6242-4b4f-b23a-1b9f2f6b6238","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"ec7335a2-5940-4d44-a57a-6ef2b18a7aa6","name":"ec7335a2-5940-4d44-a57a-6ef2b18a7aa6","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"d19f71d0-9c25-4938-8ff1-6ce05cbbaba0","name":"d19f71d0-9c25-4938-8ff1-6ce05cbbaba0","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"8c4ca248-93ee-410c-b68a-e9ecec54b32d","name":"8c4ca248-93ee-410c-b68a-e9ecec54b32d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"0bcfa324-70be-491f-9c81-e421ae10e401","name":"0bcfa324-70be-491f-9c81-e421ae10e401","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"1d0346f6-0c14-4ba9-810c-e8ee0515c859","name":"1d0346f6-0c14-4ba9-810c-e8ee0515c859","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"1f3656b9-6717-4477-b5d1-05235b9bd903","name":"1f3656b9-6717-4477-b5d1-05235b9bd903","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"543bf910-3b46-44a3-b42d-585dec34b2e9","name":"543bf910-3b46-44a3-b42d-585dec34b2e9","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"c8308dbd-f9c5-4d70-8f5b-3f8a96183706","name":"c8308dbd-f9c5-4d70-8f5b-3f8a96183706","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"87e52bcf-0cde-4bd2-960a-18d56a5e5abf","name":"87e52bcf-0cde-4bd2-960a-18d56a5e5abf","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"40d1b2e1-aad0-465c-9688-32ada947f8ea","name":"40d1b2e1-aad0-465c-9688-32ada947f8ea","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -78,39 +78,17 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"3f2bfc4a-6242-4b4f-b23a-1b9f2f6b6238","path":"sprites/spr_tartaros2_colors/spr_tartaros2_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"c41f3900-dc12-4b49-b98b-0d7a170baf03","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"ec7335a2-5940-4d44-a57a-6ef2b18a7aa6","path":"sprites/spr_tartaros2_colors/spr_tartaros2_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"85c89a55-0327-4971-80ce-3366386f4218","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"d19f71d0-9c25-4938-8ff1-6ce05cbbaba0","path":"sprites/spr_tartaros2_colors/spr_tartaros2_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"5acd614e-59ae-470d-801a-c8adbb073f8e","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"8c4ca248-93ee-410c-b68a-e9ecec54b32d","path":"sprites/spr_tartaros2_colors/spr_tartaros2_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"4c086917-1259-4e08-bf38-0ea689d5711c","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"0bcfa324-70be-491f-9c81-e421ae10e401","path":"sprites/spr_tartaros2_colors/spr_tartaros2_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"e364c448-758c-4a68-928f-88638a34ea3f","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"1d0346f6-0c14-4ba9-810c-e8ee0515c859","path":"sprites/spr_tartaros2_colors/spr_tartaros2_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"8419621f-a2f0-42cf-b98d-b404fffaa3f5","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"1f3656b9-6717-4477-b5d1-05235b9bd903","path":"sprites/spr_tartaros2_colors/spr_tartaros2_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"613095cf-4896-472c-93d2-8e788859056d","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"543bf910-3b46-44a3-b42d-585dec34b2e9","path":"sprites/spr_tartaros2_colors/spr_tartaros2_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"67109820-6a6a-4c70-bf3e-d19a71229201","IsCreationKey":false,"Key":7.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"c8308dbd-f9c5-4d70-8f5b-3f8a96183706","path":"sprites/spr_tartaros2_colors/spr_tartaros2_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"ed8a8b8c-e81b-4607-8f51-36a892833bc2","IsCreationKey":false,"Key":8.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"87e52bcf-0cde-4bd2-960a-18d56a5e5abf","path":"sprites/spr_tartaros2_colors/spr_tartaros2_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"7f3cc6f8-a073-4de5-ab24-7c85adbed67c","IsCreationKey":false,"Key":9.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"40d1b2e1-aad0-465c-9688-32ada947f8ea","path":"sprites/spr_tartaros2_colors/spr_tartaros2_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"ee316a3e-0794-43c9-9602-1d5b9a1337cc","IsCreationKey":false,"Key":10.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"3f2bfc4a-6242-4b4f-b23a-1b9f2f6b6238","path":"sprites/spr_tartaros2_colors/spr_tartaros2_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"c41f3900-dc12-4b49-b98b-0d7a170baf03","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"ec7335a2-5940-4d44-a57a-6ef2b18a7aa6","path":"sprites/spr_tartaros2_colors/spr_tartaros2_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"85c89a55-0327-4971-80ce-3366386f4218","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"d19f71d0-9c25-4938-8ff1-6ce05cbbaba0","path":"sprites/spr_tartaros2_colors/spr_tartaros2_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"5acd614e-59ae-470d-801a-c8adbb073f8e","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"8c4ca248-93ee-410c-b68a-e9ecec54b32d","path":"sprites/spr_tartaros2_colors/spr_tartaros2_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"4c086917-1259-4e08-bf38-0ea689d5711c","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"0bcfa324-70be-491f-9c81-e421ae10e401","path":"sprites/spr_tartaros2_colors/spr_tartaros2_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"e364c448-758c-4a68-928f-88638a34ea3f","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"1d0346f6-0c14-4ba9-810c-e8ee0515c859","path":"sprites/spr_tartaros2_colors/spr_tartaros2_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"8419621f-a2f0-42cf-b98d-b404fffaa3f5","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"1f3656b9-6717-4477-b5d1-05235b9bd903","path":"sprites/spr_tartaros2_colors/spr_tartaros2_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"613095cf-4896-472c-93d2-8e788859056d","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"543bf910-3b46-44a3-b42d-585dec34b2e9","path":"sprites/spr_tartaros2_colors/spr_tartaros2_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"67109820-6a6a-4c70-bf3e-d19a71229201","IsCreationKey":false,"Key":7.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"c8308dbd-f9c5-4d70-8f5b-3f8a96183706","path":"sprites/spr_tartaros2_colors/spr_tartaros2_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"ed8a8b8c-e81b-4607-8f51-36a892833bc2","IsCreationKey":false,"Key":8.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"87e52bcf-0cde-4bd2-960a-18d56a5e5abf","path":"sprites/spr_tartaros2_colors/spr_tartaros2_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"7f3cc6f8-a073-4de5-ab24-7c85adbed67c","IsCreationKey":false,"Key":9.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"40d1b2e1-aad0-465c-9688-32ada947f8ea","path":"sprites/spr_tartaros2_colors/spr_tartaros2_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"ee316a3e-0794-43c9-9602-1d5b9a1337cc","IsCreationKey":false,"Key":10.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_tartaros_arms/spr_tartaros_arms.yy b/sprites/spr_tartaros_arms/spr_tartaros_arms.yy index b482e5c5dc..37e43b3451 100644 --- a/sprites/spr_tartaros_arms/spr_tartaros_arms.yy +++ b/sprites/spr_tartaros_arms/spr_tartaros_arms.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_tartaros_arms", "bboxMode":0, "bbox_bottom":178, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"72c8c22c-c531-4432-b060-e05b68525d15","name":"72c8c22c-c531-4432-b060-e05b68525d15","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"72c8c22c-c531-4432-b060-e05b68525d15","name":"72c8c22c-c531-4432-b060-e05b68525d15","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"72c8c22c-c531-4432-b060-e05b68525d15","path":"sprites/spr_tartaros_arms/spr_tartaros_arms.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"e6bb2b66-a648-4395-a38d-c93170a269e2","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"72c8c22c-c531-4432-b060-e05b68525d15","path":"sprites/spr_tartaros_arms/spr_tartaros_arms.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"e6bb2b66-a648-4395-a38d-c93170a269e2","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_tartaros_chest/spr_tartaros_chest.yy b/sprites/spr_tartaros_chest/spr_tartaros_chest.yy index 67c1722d8f..f478936088 100644 --- a/sprites/spr_tartaros_chest/spr_tartaros_chest.yy +++ b/sprites/spr_tartaros_chest/spr_tartaros_chest.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_tartaros_chest", "bboxMode":0, "bbox_bottom":124, @@ -12,11 +12,11 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"8d99f92f-4aac-47e4-a142-c6ea6be47856","name":"8d99f92f-4aac-47e4-a142-c6ea6be47856","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"524957d3-4452-4fba-bc1d-d08e55003395","name":"524957d3-4452-4fba-bc1d-d08e55003395","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"946bdde4-8095-44ad-83a5-1d5c8fe841cc","name":"946bdde4-8095-44ad-83a5-1d5c8fe841cc","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"b7e2c49c-625f-41b2-b038-8e96b289e8ed","name":"b7e2c49c-625f-41b2-b038-8e96b289e8ed","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"c1fba91e-ad9a-43f5-9563-4660af64f354","name":"c1fba91e-ad9a-43f5-9563-4660af64f354","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"8d99f92f-4aac-47e4-a142-c6ea6be47856","name":"8d99f92f-4aac-47e4-a142-c6ea6be47856","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"524957d3-4452-4fba-bc1d-d08e55003395","name":"524957d3-4452-4fba-bc1d-d08e55003395","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"946bdde4-8095-44ad-83a5-1d5c8fe841cc","name":"946bdde4-8095-44ad-83a5-1d5c8fe841cc","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"b7e2c49c-625f-41b2-b038-8e96b289e8ed","name":"b7e2c49c-625f-41b2-b038-8e96b289e8ed","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"c1fba91e-ad9a-43f5-9563-4660af64f354","name":"c1fba91e-ad9a-43f5-9563-4660af64f354","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -72,21 +72,11 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"8d99f92f-4aac-47e4-a142-c6ea6be47856","path":"sprites/spr_tartaros_chest/spr_tartaros_chest.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"614d5587-3f3b-4727-832e-9a4a26b4e261","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"524957d3-4452-4fba-bc1d-d08e55003395","path":"sprites/spr_tartaros_chest/spr_tartaros_chest.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"9fc80f31-12c7-4a2b-8b28-b89867d9f9d7","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"946bdde4-8095-44ad-83a5-1d5c8fe841cc","path":"sprites/spr_tartaros_chest/spr_tartaros_chest.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"226750b9-f6d5-4984-a641-3e83f01f49d5","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"b7e2c49c-625f-41b2-b038-8e96b289e8ed","path":"sprites/spr_tartaros_chest/spr_tartaros_chest.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"4342a328-5f7a-4eb1-9741-993a5add8e13","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"c1fba91e-ad9a-43f5-9563-4660af64f354","path":"sprites/spr_tartaros_chest/spr_tartaros_chest.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"d3b1e77f-e553-4d71-b0d1-17a80320e88e","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"8d99f92f-4aac-47e4-a142-c6ea6be47856","path":"sprites/spr_tartaros_chest/spr_tartaros_chest.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"614d5587-3f3b-4727-832e-9a4a26b4e261","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"524957d3-4452-4fba-bc1d-d08e55003395","path":"sprites/spr_tartaros_chest/spr_tartaros_chest.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"9fc80f31-12c7-4a2b-8b28-b89867d9f9d7","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"946bdde4-8095-44ad-83a5-1d5c8fe841cc","path":"sprites/spr_tartaros_chest/spr_tartaros_chest.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"226750b9-f6d5-4984-a641-3e83f01f49d5","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"b7e2c49c-625f-41b2-b038-8e96b289e8ed","path":"sprites/spr_tartaros_chest/spr_tartaros_chest.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"4342a328-5f7a-4eb1-9741-993a5add8e13","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"c1fba91e-ad9a-43f5-9563-4660af64f354","path":"sprites/spr_tartaros_chest/spr_tartaros_chest.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"d3b1e77f-e553-4d71-b0d1-17a80320e88e","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_tartaros_colors/spr_tartaros_colors.yy b/sprites/spr_tartaros_colors/spr_tartaros_colors.yy index 0b84ec4fd5..566896eba2 100644 --- a/sprites/spr_tartaros_colors/spr_tartaros_colors.yy +++ b/sprites/spr_tartaros_colors/spr_tartaros_colors.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_tartaros_colors", "bboxMode":0, "bbox_bottom":231, @@ -12,16 +12,16 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"ecafdcef-f511-430c-91a8-30ee6580a6a0","name":"ecafdcef-f511-430c-91a8-30ee6580a6a0","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"5426d439-bb49-4082-84f2-452c2d01792d","name":"5426d439-bb49-4082-84f2-452c2d01792d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"9b761b33-b38f-4ca4-b119-c55bc0a2e9e7","name":"9b761b33-b38f-4ca4-b119-c55bc0a2e9e7","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"fcad843f-7d6a-4d7b-bce1-4c936c6d6716","name":"fcad843f-7d6a-4d7b-bce1-4c936c6d6716","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"dfda7d39-c01c-40f5-9586-9eab35c2b6e7","name":"dfda7d39-c01c-40f5-9586-9eab35c2b6e7","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"bf80a677-6b33-4cd5-947e-b85ecaa4fe02","name":"bf80a677-6b33-4cd5-947e-b85ecaa4fe02","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"d19339a9-682c-4ecc-9fc6-75a6c034dea6","name":"d19339a9-682c-4ecc-9fc6-75a6c034dea6","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"532e1c80-fbc6-423b-b4b7-054831518ddb","name":"532e1c80-fbc6-423b-b4b7-054831518ddb","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"f63c7a7a-9ec3-49cd-9f33-a951dfc4c97a","name":"f63c7a7a-9ec3-49cd-9f33-a951dfc4c97a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"d222518e-ee62-4391-ba3b-eaf17a4e8460","name":"d222518e-ee62-4391-ba3b-eaf17a4e8460","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"ecafdcef-f511-430c-91a8-30ee6580a6a0","name":"ecafdcef-f511-430c-91a8-30ee6580a6a0","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"5426d439-bb49-4082-84f2-452c2d01792d","name":"5426d439-bb49-4082-84f2-452c2d01792d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"9b761b33-b38f-4ca4-b119-c55bc0a2e9e7","name":"9b761b33-b38f-4ca4-b119-c55bc0a2e9e7","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"fcad843f-7d6a-4d7b-bce1-4c936c6d6716","name":"fcad843f-7d6a-4d7b-bce1-4c936c6d6716","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"dfda7d39-c01c-40f5-9586-9eab35c2b6e7","name":"dfda7d39-c01c-40f5-9586-9eab35c2b6e7","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"bf80a677-6b33-4cd5-947e-b85ecaa4fe02","name":"bf80a677-6b33-4cd5-947e-b85ecaa4fe02","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"d19339a9-682c-4ecc-9fc6-75a6c034dea6","name":"d19339a9-682c-4ecc-9fc6-75a6c034dea6","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"532e1c80-fbc6-423b-b4b7-054831518ddb","name":"532e1c80-fbc6-423b-b4b7-054831518ddb","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"f63c7a7a-9ec3-49cd-9f33-a951dfc4c97a","name":"f63c7a7a-9ec3-49cd-9f33-a951dfc4c97a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"d222518e-ee62-4391-ba3b-eaf17a4e8460","name":"d222518e-ee62-4391-ba3b-eaf17a4e8460","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -77,36 +77,16 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"ecafdcef-f511-430c-91a8-30ee6580a6a0","path":"sprites/spr_tartaros_colors/spr_tartaros_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"34b77065-59f1-48fd-bbff-25801600d196","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"5426d439-bb49-4082-84f2-452c2d01792d","path":"sprites/spr_tartaros_colors/spr_tartaros_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"53780185-be8b-46ac-912d-7c692f3f010b","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"9b761b33-b38f-4ca4-b119-c55bc0a2e9e7","path":"sprites/spr_tartaros_colors/spr_tartaros_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"1866eb17-5b89-4bd2-828c-3538411f9ad2","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"fcad843f-7d6a-4d7b-bce1-4c936c6d6716","path":"sprites/spr_tartaros_colors/spr_tartaros_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"216105e0-d4c9-4ecc-bdf8-3f2847611871","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"dfda7d39-c01c-40f5-9586-9eab35c2b6e7","path":"sprites/spr_tartaros_colors/spr_tartaros_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"7918b408-3607-4ae0-bdbf-9d8fb59221a2","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"bf80a677-6b33-4cd5-947e-b85ecaa4fe02","path":"sprites/spr_tartaros_colors/spr_tartaros_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"3eca94f8-cb12-4785-b37b-97cf40cac3b9","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"d19339a9-682c-4ecc-9fc6-75a6c034dea6","path":"sprites/spr_tartaros_colors/spr_tartaros_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"7971b6c4-b7bd-4dbc-a538-fcef7c030333","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"532e1c80-fbc6-423b-b4b7-054831518ddb","path":"sprites/spr_tartaros_colors/spr_tartaros_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"788ca99e-a175-4c13-a67c-3588c28d7096","IsCreationKey":false,"Key":7.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"f63c7a7a-9ec3-49cd-9f33-a951dfc4c97a","path":"sprites/spr_tartaros_colors/spr_tartaros_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"1a5c67d6-8638-4da5-9708-42645eca8cc1","IsCreationKey":false,"Key":8.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"d222518e-ee62-4391-ba3b-eaf17a4e8460","path":"sprites/spr_tartaros_colors/spr_tartaros_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"b6d5d89e-ff91-442b-95ca-096f4946bc98","IsCreationKey":false,"Key":9.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"ecafdcef-f511-430c-91a8-30ee6580a6a0","path":"sprites/spr_tartaros_colors/spr_tartaros_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"34b77065-59f1-48fd-bbff-25801600d196","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"5426d439-bb49-4082-84f2-452c2d01792d","path":"sprites/spr_tartaros_colors/spr_tartaros_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"53780185-be8b-46ac-912d-7c692f3f010b","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"9b761b33-b38f-4ca4-b119-c55bc0a2e9e7","path":"sprites/spr_tartaros_colors/spr_tartaros_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"1866eb17-5b89-4bd2-828c-3538411f9ad2","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"fcad843f-7d6a-4d7b-bce1-4c936c6d6716","path":"sprites/spr_tartaros_colors/spr_tartaros_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"216105e0-d4c9-4ecc-bdf8-3f2847611871","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"dfda7d39-c01c-40f5-9586-9eab35c2b6e7","path":"sprites/spr_tartaros_colors/spr_tartaros_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"7918b408-3607-4ae0-bdbf-9d8fb59221a2","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"bf80a677-6b33-4cd5-947e-b85ecaa4fe02","path":"sprites/spr_tartaros_colors/spr_tartaros_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"3eca94f8-cb12-4785-b37b-97cf40cac3b9","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"d19339a9-682c-4ecc-9fc6-75a6c034dea6","path":"sprites/spr_tartaros_colors/spr_tartaros_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"7971b6c4-b7bd-4dbc-a538-fcef7c030333","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"532e1c80-fbc6-423b-b4b7-054831518ddb","path":"sprites/spr_tartaros_colors/spr_tartaros_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"788ca99e-a175-4c13-a67c-3588c28d7096","IsCreationKey":false,"Key":7.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"f63c7a7a-9ec3-49cd-9f33-a951dfc4c97a","path":"sprites/spr_tartaros_colors/spr_tartaros_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"1a5c67d6-8638-4da5-9708-42645eca8cc1","IsCreationKey":false,"Key":8.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"d222518e-ee62-4391-ba3b-eaf17a4e8460","path":"sprites/spr_tartaros_colors/spr_tartaros_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"b6d5d89e-ff91-442b-95ca-096f4946bc98","IsCreationKey":false,"Key":9.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":{ diff --git a/sprites/spr_tartaros_complex/spr_tartaros_complex.yy b/sprites/spr_tartaros_complex/spr_tartaros_complex.yy index cae9cf8490..0bc2a54da2 100644 --- a/sprites/spr_tartaros_complex/spr_tartaros_complex.yy +++ b/sprites/spr_tartaros_complex/spr_tartaros_complex.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_tartaros_complex", "bboxMode":0, "bbox_bottom":204, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"8d99f92f-4aac-47e4-a142-c6ea6be47856","name":"8d99f92f-4aac-47e4-a142-c6ea6be47856","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"8d99f92f-4aac-47e4-a142-c6ea6be47856","name":"8d99f92f-4aac-47e4-a142-c6ea6be47856","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -70,9 +70,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"8d99f92f-4aac-47e4-a142-c6ea6be47856","path":"sprites/spr_tartaros_complex/spr_tartaros_complex.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"200ce5df-a2aa-43be-8768-a74ae1023185","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"8d99f92f-4aac-47e4-a142-c6ea6be47856","path":"sprites/spr_tartaros_complex/spr_tartaros_complex.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"200ce5df-a2aa-43be-8768-a74ae1023185","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_tartaros_faceplate/spr_tartaros_faceplate.yy b/sprites/spr_tartaros_faceplate/spr_tartaros_faceplate.yy index 9816929fd4..5bb2c636b3 100644 --- a/sprites/spr_tartaros_faceplate/spr_tartaros_faceplate.yy +++ b/sprites/spr_tartaros_faceplate/spr_tartaros_faceplate.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_tartaros_faceplate", "bboxMode":0, "bbox_bottom":68, @@ -12,8 +12,8 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"1bbe2e76-e507-418e-8883-0db45afc0631","name":"1bbe2e76-e507-418e-8883-0db45afc0631","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"d2594043-39aa-46d0-b252-cce3b13f1f83","name":"d2594043-39aa-46d0-b252-cce3b13f1f83","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"1bbe2e76-e507-418e-8883-0db45afc0631","name":"1bbe2e76-e507-418e-8883-0db45afc0631","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"d2594043-39aa-46d0-b252-cce3b13f1f83","name":"d2594043-39aa-46d0-b252-cce3b13f1f83","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -69,12 +69,8 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"1bbe2e76-e507-418e-8883-0db45afc0631","path":"sprites/spr_tartaros_faceplate/spr_tartaros_faceplate.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"5ad15b71-232e-4b9e-af97-b93727f87d22","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"d2594043-39aa-46d0-b252-cce3b13f1f83","path":"sprites/spr_tartaros_faceplate/spr_tartaros_faceplate.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"3780d8c2-ec67-452f-99ba-bd70998da1b4","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"1bbe2e76-e507-418e-8883-0db45afc0631","path":"sprites/spr_tartaros_faceplate/spr_tartaros_faceplate.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"5ad15b71-232e-4b9e-af97-b93727f87d22","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"d2594043-39aa-46d0-b252-cce3b13f1f83","path":"sprites/spr_tartaros_faceplate/spr_tartaros_faceplate.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"3780d8c2-ec67-452f-99ba-bd70998da1b4","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_tartaros_gorget/spr_tartaros_gorget.yy b/sprites/spr_tartaros_gorget/spr_tartaros_gorget.yy index d40c80760d..8d992146aa 100644 --- a/sprites/spr_tartaros_gorget/spr_tartaros_gorget.yy +++ b/sprites/spr_tartaros_gorget/spr_tartaros_gorget.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_tartaros_gorget", "bboxMode":0, "bbox_bottom":87, @@ -12,10 +12,10 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"8d99f92f-4aac-47e4-a142-c6ea6be47856","name":"8d99f92f-4aac-47e4-a142-c6ea6be47856","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"7183111f-9020-46b1-8c8d-6f3863650227","name":"7183111f-9020-46b1-8c8d-6f3863650227","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"b5f0e39e-b410-44dc-ab65-854f6d158d85","name":"b5f0e39e-b410-44dc-ab65-854f6d158d85","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"524957d3-4452-4fba-bc1d-d08e55003395","name":"524957d3-4452-4fba-bc1d-d08e55003395","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"8d99f92f-4aac-47e4-a142-c6ea6be47856","name":"8d99f92f-4aac-47e4-a142-c6ea6be47856","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"7183111f-9020-46b1-8c8d-6f3863650227","name":"7183111f-9020-46b1-8c8d-6f3863650227","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"b5f0e39e-b410-44dc-ab65-854f6d158d85","name":"b5f0e39e-b410-44dc-ab65-854f6d158d85","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"524957d3-4452-4fba-bc1d-d08e55003395","name":"524957d3-4452-4fba-bc1d-d08e55003395","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -71,18 +71,10 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"8d99f92f-4aac-47e4-a142-c6ea6be47856","path":"sprites/spr_tartaros_gorget/spr_tartaros_gorget.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"9235ed8a-8884-482b-beb0-ca7bd8d76034","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"7183111f-9020-46b1-8c8d-6f3863650227","path":"sprites/spr_tartaros_gorget/spr_tartaros_gorget.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"239b9ef2-147e-4638-b8bf-9fb260690813","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"b5f0e39e-b410-44dc-ab65-854f6d158d85","path":"sprites/spr_tartaros_gorget/spr_tartaros_gorget.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"060a888c-3c91-4a53-8080-9c7158db2809","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"524957d3-4452-4fba-bc1d-d08e55003395","path":"sprites/spr_tartaros_gorget/spr_tartaros_gorget.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"17f13e4b-ebf1-48e5-a312-bc3f5a8ff078","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"8d99f92f-4aac-47e4-a142-c6ea6be47856","path":"sprites/spr_tartaros_gorget/spr_tartaros_gorget.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"9235ed8a-8884-482b-beb0-ca7bd8d76034","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"7183111f-9020-46b1-8c8d-6f3863650227","path":"sprites/spr_tartaros_gorget/spr_tartaros_gorget.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"239b9ef2-147e-4638-b8bf-9fb260690813","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"b5f0e39e-b410-44dc-ab65-854f6d158d85","path":"sprites/spr_tartaros_gorget/spr_tartaros_gorget.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"060a888c-3c91-4a53-8080-9c7158db2809","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"524957d3-4452-4fba-bc1d-d08e55003395","path":"sprites/spr_tartaros_gorget/spr_tartaros_gorget.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"17f13e4b-ebf1-48e5-a312-bc3f5a8ff078","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_tartaros_head_variants/spr_tartaros_head_variants.yy b/sprites/spr_tartaros_head_variants/spr_tartaros_head_variants.yy index 15f958ab85..9772841dbc 100644 --- a/sprites/spr_tartaros_head_variants/spr_tartaros_head_variants.yy +++ b/sprites/spr_tartaros_head_variants/spr_tartaros_head_variants.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_tartaros_head_variants", "bboxMode":0, "bbox_bottom":68, @@ -12,10 +12,10 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"fd6650e0-331d-4ca5-8853-0b5406c4134d","name":"fd6650e0-331d-4ca5-8853-0b5406c4134d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"40bc99d5-36c6-494f-ac41-97db7b1af50a","name":"40bc99d5-36c6-494f-ac41-97db7b1af50a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"b529fb18-f4ec-47d1-b6b3-ed4a9f174496","name":"b529fb18-f4ec-47d1-b6b3-ed4a9f174496","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"9d5b17e4-eb9a-46c2-a4a7-6dbbfac5dfe3","name":"9d5b17e4-eb9a-46c2-a4a7-6dbbfac5dfe3","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"fd6650e0-331d-4ca5-8853-0b5406c4134d","name":"fd6650e0-331d-4ca5-8853-0b5406c4134d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"40bc99d5-36c6-494f-ac41-97db7b1af50a","name":"40bc99d5-36c6-494f-ac41-97db7b1af50a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"b529fb18-f4ec-47d1-b6b3-ed4a9f174496","name":"b529fb18-f4ec-47d1-b6b3-ed4a9f174496","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"9d5b17e4-eb9a-46c2-a4a7-6dbbfac5dfe3","name":"9d5b17e4-eb9a-46c2-a4a7-6dbbfac5dfe3","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -71,18 +71,10 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"fd6650e0-331d-4ca5-8853-0b5406c4134d","path":"sprites/spr_tartaros_head_variants/spr_tartaros_head_variants.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"1a532018-4897-4836-9f0a-ad6b2a1e1ace","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"40bc99d5-36c6-494f-ac41-97db7b1af50a","path":"sprites/spr_tartaros_head_variants/spr_tartaros_head_variants.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"4519c469-956a-4220-88e4-c3fae75eb452","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"b529fb18-f4ec-47d1-b6b3-ed4a9f174496","path":"sprites/spr_tartaros_head_variants/spr_tartaros_head_variants.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"0b0fd24a-f8f4-4417-9118-843f3e258ebc","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"9d5b17e4-eb9a-46c2-a4a7-6dbbfac5dfe3","path":"sprites/spr_tartaros_head_variants/spr_tartaros_head_variants.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"5d4ff4a0-8f3e-42c8-8e21-60bfc6e311fb","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"fd6650e0-331d-4ca5-8853-0b5406c4134d","path":"sprites/spr_tartaros_head_variants/spr_tartaros_head_variants.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"1a532018-4897-4836-9f0a-ad6b2a1e1ace","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"40bc99d5-36c6-494f-ac41-97db7b1af50a","path":"sprites/spr_tartaros_head_variants/spr_tartaros_head_variants.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"4519c469-956a-4220-88e4-c3fae75eb452","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"b529fb18-f4ec-47d1-b6b3-ed4a9f174496","path":"sprites/spr_tartaros_head_variants/spr_tartaros_head_variants.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"0b0fd24a-f8f4-4417-9118-843f3e258ebc","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"9d5b17e4-eb9a-46c2-a4a7-6dbbfac5dfe3","path":"sprites/spr_tartaros_head_variants/spr_tartaros_head_variants.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"5d4ff4a0-8f3e-42c8-8e21-60bfc6e311fb","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_tartaros_left_arm/spr_tartaros_left_arm.yy b/sprites/spr_tartaros_left_arm/spr_tartaros_left_arm.yy index d98b23c650..e4bb833db9 100644 --- a/sprites/spr_tartaros_left_arm/spr_tartaros_left_arm.yy +++ b/sprites/spr_tartaros_left_arm/spr_tartaros_left_arm.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_tartaros_left_arm", "bboxMode":0, "bbox_bottom":169, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"e3118bae-7ca8-4654-9c4b-7c1f23bab334","name":"e3118bae-7ca8-4654-9c4b-7c1f23bab334","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"e3118bae-7ca8-4654-9c4b-7c1f23bab334","name":"e3118bae-7ca8-4654-9c4b-7c1f23bab334","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"e3118bae-7ca8-4654-9c4b-7c1f23bab334","path":"sprites/spr_tartaros_left_arm/spr_tartaros_left_arm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"b145eebe-c835-41cf-bd87-3c3bea207624","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"e3118bae-7ca8-4654-9c4b-7c1f23bab334","path":"sprites/spr_tartaros_left_arm/spr_tartaros_left_arm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"b145eebe-c835-41cf-bd87-3c3bea207624","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_tartaros_left_leg/spr_tartaros_left_leg.yy b/sprites/spr_tartaros_left_leg/spr_tartaros_left_leg.yy index f71672f665..4f8a51c7ac 100644 --- a/sprites/spr_tartaros_left_leg/spr_tartaros_left_leg.yy +++ b/sprites/spr_tartaros_left_leg/spr_tartaros_left_leg.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_tartaros_left_leg", "bboxMode":0, "bbox_bottom":259, @@ -12,11 +12,11 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"1b0c3505-55a7-478a-a52c-1c5aa3702630","name":"1b0c3505-55a7-478a-a52c-1c5aa3702630","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"03d9ca8d-b461-47ef-abbc-e53ae850d225","name":"03d9ca8d-b461-47ef-abbc-e53ae850d225","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"b9a9cf23-f9c7-4d60-9393-c38dc6b2d0ed","name":"b9a9cf23-f9c7-4d60-9393-c38dc6b2d0ed","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"e9bb0037-8489-4bbd-90a4-43bddaaff972","name":"e9bb0037-8489-4bbd-90a4-43bddaaff972","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"f3b39034-cdc1-41f6-872e-22e6e9d5f55a","name":"f3b39034-cdc1-41f6-872e-22e6e9d5f55a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"1b0c3505-55a7-478a-a52c-1c5aa3702630","name":"1b0c3505-55a7-478a-a52c-1c5aa3702630","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"03d9ca8d-b461-47ef-abbc-e53ae850d225","name":"03d9ca8d-b461-47ef-abbc-e53ae850d225","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"b9a9cf23-f9c7-4d60-9393-c38dc6b2d0ed","name":"b9a9cf23-f9c7-4d60-9393-c38dc6b2d0ed","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"e9bb0037-8489-4bbd-90a4-43bddaaff972","name":"e9bb0037-8489-4bbd-90a4-43bddaaff972","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"f3b39034-cdc1-41f6-872e-22e6e9d5f55a","name":"f3b39034-cdc1-41f6-872e-22e6e9d5f55a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -72,21 +72,11 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"1b0c3505-55a7-478a-a52c-1c5aa3702630","path":"sprites/spr_tartaros_left_leg/spr_tartaros_left_leg.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"653c4b23-ec3f-4d49-ae10-5c7e4e5be38b","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"03d9ca8d-b461-47ef-abbc-e53ae850d225","path":"sprites/spr_tartaros_left_leg/spr_tartaros_left_leg.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"a1883bea-ff73-4dff-b321-2056492825f1","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"b9a9cf23-f9c7-4d60-9393-c38dc6b2d0ed","path":"sprites/spr_tartaros_left_leg/spr_tartaros_left_leg.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"11a92fc7-841a-4ccb-b540-46106925949c","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"e9bb0037-8489-4bbd-90a4-43bddaaff972","path":"sprites/spr_tartaros_left_leg/spr_tartaros_left_leg.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"2b7991bc-e7c7-4705-bc58-08069621d87a","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"f3b39034-cdc1-41f6-872e-22e6e9d5f55a","path":"sprites/spr_tartaros_left_leg/spr_tartaros_left_leg.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"8adf71b2-d631-415c-b16f-a35ad4e63d75","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"1b0c3505-55a7-478a-a52c-1c5aa3702630","path":"sprites/spr_tartaros_left_leg/spr_tartaros_left_leg.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"653c4b23-ec3f-4d49-ae10-5c7e4e5be38b","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"03d9ca8d-b461-47ef-abbc-e53ae850d225","path":"sprites/spr_tartaros_left_leg/spr_tartaros_left_leg.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"a1883bea-ff73-4dff-b321-2056492825f1","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"b9a9cf23-f9c7-4d60-9393-c38dc6b2d0ed","path":"sprites/spr_tartaros_left_leg/spr_tartaros_left_leg.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"11a92fc7-841a-4ccb-b540-46106925949c","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"e9bb0037-8489-4bbd-90a4-43bddaaff972","path":"sprites/spr_tartaros_left_leg/spr_tartaros_left_leg.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"2b7991bc-e7c7-4705-bc58-08069621d87a","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"f3b39034-cdc1-41f6-872e-22e6e9d5f55a","path":"sprites/spr_tartaros_left_leg/spr_tartaros_left_leg.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"8adf71b2-d631-415c-b16f-a35ad4e63d75","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_tartaros_left_trim/spr_tartaros_left_trim.yy b/sprites/spr_tartaros_left_trim/spr_tartaros_left_trim.yy index 371f86a4f8..14b3cdffc5 100644 --- a/sprites/spr_tartaros_left_trim/spr_tartaros_left_trim.yy +++ b/sprites/spr_tartaros_left_trim/spr_tartaros_left_trim.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_tartaros_left_trim", "bboxMode":0, "bbox_bottom":179, @@ -12,12 +12,12 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"9ac0f902-e80a-4de4-b09c-2700ec2dfaf6","name":"9ac0f902-e80a-4de4-b09c-2700ec2dfaf6","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"5defea7d-cb28-4fdc-8073-ce633c560aae","name":"5defea7d-cb28-4fdc-8073-ce633c560aae","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"7d968db5-be75-47d2-9c6a-3cb4f41b09fc","name":"7d968db5-be75-47d2-9c6a-3cb4f41b09fc","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"96a0b084-110c-46b1-b8e4-cde02fa49c20","name":"96a0b084-110c-46b1-b8e4-cde02fa49c20","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"a9a234af-e448-43ae-8540-2e6aebb4cd38","name":"a9a234af-e448-43ae-8540-2e6aebb4cd38","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"00046679-5075-4ad2-8995-2c6c2244ab41","name":"00046679-5075-4ad2-8995-2c6c2244ab41","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"9ac0f902-e80a-4de4-b09c-2700ec2dfaf6","name":"9ac0f902-e80a-4de4-b09c-2700ec2dfaf6","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"5defea7d-cb28-4fdc-8073-ce633c560aae","name":"5defea7d-cb28-4fdc-8073-ce633c560aae","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"7d968db5-be75-47d2-9c6a-3cb4f41b09fc","name":"7d968db5-be75-47d2-9c6a-3cb4f41b09fc","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"96a0b084-110c-46b1-b8e4-cde02fa49c20","name":"96a0b084-110c-46b1-b8e4-cde02fa49c20","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"a9a234af-e448-43ae-8540-2e6aebb4cd38","name":"a9a234af-e448-43ae-8540-2e6aebb4cd38","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"00046679-5075-4ad2-8995-2c6c2244ab41","name":"00046679-5075-4ad2-8995-2c6c2244ab41","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -75,24 +75,12 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"9ac0f902-e80a-4de4-b09c-2700ec2dfaf6","path":"sprites/spr_tartaros_left_trim/spr_tartaros_left_trim.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"87c67940-615a-4e4c-96cf-ace9b6595aec","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"5defea7d-cb28-4fdc-8073-ce633c560aae","path":"sprites/spr_tartaros_left_trim/spr_tartaros_left_trim.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"6512c5fb-4688-450e-910f-44cf16e2beaa","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"7d968db5-be75-47d2-9c6a-3cb4f41b09fc","path":"sprites/spr_tartaros_left_trim/spr_tartaros_left_trim.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"ba4e548a-d091-462f-b13c-22072470a25f","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"96a0b084-110c-46b1-b8e4-cde02fa49c20","path":"sprites/spr_tartaros_left_trim/spr_tartaros_left_trim.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"558d01e7-d386-4e7d-b377-e2a5a8bcf3ad","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"a9a234af-e448-43ae-8540-2e6aebb4cd38","path":"sprites/spr_tartaros_left_trim/spr_tartaros_left_trim.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"e02a6d09-d97e-4137-a1cb-faf4a8a7120d","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"00046679-5075-4ad2-8995-2c6c2244ab41","path":"sprites/spr_tartaros_left_trim/spr_tartaros_left_trim.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"88356a81-e2c1-4885-a67f-5d82110bef59","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"9ac0f902-e80a-4de4-b09c-2700ec2dfaf6","path":"sprites/spr_tartaros_left_trim/spr_tartaros_left_trim.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"87c67940-615a-4e4c-96cf-ace9b6595aec","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"5defea7d-cb28-4fdc-8073-ce633c560aae","path":"sprites/spr_tartaros_left_trim/spr_tartaros_left_trim.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"6512c5fb-4688-450e-910f-44cf16e2beaa","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"7d968db5-be75-47d2-9c6a-3cb4f41b09fc","path":"sprites/spr_tartaros_left_trim/spr_tartaros_left_trim.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"ba4e548a-d091-462f-b13c-22072470a25f","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"96a0b084-110c-46b1-b8e4-cde02fa49c20","path":"sprites/spr_tartaros_left_trim/spr_tartaros_left_trim.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"558d01e7-d386-4e7d-b377-e2a5a8bcf3ad","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"a9a234af-e448-43ae-8540-2e6aebb4cd38","path":"sprites/spr_tartaros_left_trim/spr_tartaros_left_trim.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"e02a6d09-d97e-4137-a1cb-faf4a8a7120d","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"00046679-5075-4ad2-8995-2c6c2244ab41","path":"sprites/spr_tartaros_left_trim/spr_tartaros_left_trim.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"88356a81-e2c1-4885-a67f-5d82110bef59","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_tartaros_right_arm/spr_tartaros_right_arm.yy b/sprites/spr_tartaros_right_arm/spr_tartaros_right_arm.yy index 2a33d0c455..1e03b05d9b 100644 --- a/sprites/spr_tartaros_right_arm/spr_tartaros_right_arm.yy +++ b/sprites/spr_tartaros_right_arm/spr_tartaros_right_arm.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_tartaros_right_arm", "bboxMode":0, "bbox_bottom":169, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"87c9365b-ef0b-48e1-a764-b2b2b8937c67","name":"87c9365b-ef0b-48e1-a764-b2b2b8937c67","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"87c9365b-ef0b-48e1-a764-b2b2b8937c67","name":"87c9365b-ef0b-48e1-a764-b2b2b8937c67","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"87c9365b-ef0b-48e1-a764-b2b2b8937c67","path":"sprites/spr_tartaros_right_arm/spr_tartaros_right_arm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"f9665fe9-f2cc-4a6a-9121-57006f1160f8","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"87c9365b-ef0b-48e1-a764-b2b2b8937c67","path":"sprites/spr_tartaros_right_arm/spr_tartaros_right_arm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"f9665fe9-f2cc-4a6a-9121-57006f1160f8","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_tartaros_right_leg/spr_tartaros_right_leg.yy b/sprites/spr_tartaros_right_leg/spr_tartaros_right_leg.yy index db9ca928b9..7715afa3be 100644 --- a/sprites/spr_tartaros_right_leg/spr_tartaros_right_leg.yy +++ b/sprites/spr_tartaros_right_leg/spr_tartaros_right_leg.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_tartaros_right_leg", "bboxMode":0, "bbox_bottom":259, @@ -12,11 +12,11 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"8d99f92f-4aac-47e4-a142-c6ea6be47856","name":"8d99f92f-4aac-47e4-a142-c6ea6be47856","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"b89831c0-4b54-41e5-ad80-4d838fe31550","name":"b89831c0-4b54-41e5-ad80-4d838fe31550","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"392ae0b5-e73f-4011-a77c-8cf14df79212","name":"392ae0b5-e73f-4011-a77c-8cf14df79212","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"f31258fb-8e42-40fa-9abe-d50ce4077249","name":"f31258fb-8e42-40fa-9abe-d50ce4077249","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"b53b7c9e-26af-4c4b-9b89-a15af4f7296c","name":"b53b7c9e-26af-4c4b-9b89-a15af4f7296c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"8d99f92f-4aac-47e4-a142-c6ea6be47856","name":"8d99f92f-4aac-47e4-a142-c6ea6be47856","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"b89831c0-4b54-41e5-ad80-4d838fe31550","name":"b89831c0-4b54-41e5-ad80-4d838fe31550","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"392ae0b5-e73f-4011-a77c-8cf14df79212","name":"392ae0b5-e73f-4011-a77c-8cf14df79212","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"f31258fb-8e42-40fa-9abe-d50ce4077249","name":"f31258fb-8e42-40fa-9abe-d50ce4077249","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"b53b7c9e-26af-4c4b-9b89-a15af4f7296c","name":"b53b7c9e-26af-4c4b-9b89-a15af4f7296c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -72,21 +72,11 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"8d99f92f-4aac-47e4-a142-c6ea6be47856","path":"sprites/spr_tartaros_right_leg/spr_tartaros_right_leg.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"33b4a69d-c4a8-4d97-b35c-86e75a42672f","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"b89831c0-4b54-41e5-ad80-4d838fe31550","path":"sprites/spr_tartaros_right_leg/spr_tartaros_right_leg.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"4aa238e1-d30d-41d0-8a60-6f15dbe70cd1","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"392ae0b5-e73f-4011-a77c-8cf14df79212","path":"sprites/spr_tartaros_right_leg/spr_tartaros_right_leg.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"93472bf0-431a-46f8-ad3c-040210e0bd9e","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"f31258fb-8e42-40fa-9abe-d50ce4077249","path":"sprites/spr_tartaros_right_leg/spr_tartaros_right_leg.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"b458f2e1-0c00-407a-bf09-7a64ef6bf3e0","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"b53b7c9e-26af-4c4b-9b89-a15af4f7296c","path":"sprites/spr_tartaros_right_leg/spr_tartaros_right_leg.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"6b8fc32b-fe8a-41b2-8970-72f6bd2a6892","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"8d99f92f-4aac-47e4-a142-c6ea6be47856","path":"sprites/spr_tartaros_right_leg/spr_tartaros_right_leg.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"33b4a69d-c4a8-4d97-b35c-86e75a42672f","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"b89831c0-4b54-41e5-ad80-4d838fe31550","path":"sprites/spr_tartaros_right_leg/spr_tartaros_right_leg.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"4aa238e1-d30d-41d0-8a60-6f15dbe70cd1","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"392ae0b5-e73f-4011-a77c-8cf14df79212","path":"sprites/spr_tartaros_right_leg/spr_tartaros_right_leg.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"93472bf0-431a-46f8-ad3c-040210e0bd9e","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"f31258fb-8e42-40fa-9abe-d50ce4077249","path":"sprites/spr_tartaros_right_leg/spr_tartaros_right_leg.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"b458f2e1-0c00-407a-bf09-7a64ef6bf3e0","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"b53b7c9e-26af-4c4b-9b89-a15af4f7296c","path":"sprites/spr_tartaros_right_leg/spr_tartaros_right_leg.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"6b8fc32b-fe8a-41b2-8970-72f6bd2a6892","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_tartaros_right_trim/spr_tartaros_right_trim.yy b/sprites/spr_tartaros_right_trim/spr_tartaros_right_trim.yy index c4056ee666..db1811217f 100644 --- a/sprites/spr_tartaros_right_trim/spr_tartaros_right_trim.yy +++ b/sprites/spr_tartaros_right_trim/spr_tartaros_right_trim.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_tartaros_right_trim", "bboxMode":0, "bbox_bottom":179, @@ -12,12 +12,12 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"9ac0f902-e80a-4de4-b09c-2700ec2dfaf6","name":"9ac0f902-e80a-4de4-b09c-2700ec2dfaf6","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"5defea7d-cb28-4fdc-8073-ce633c560aae","name":"5defea7d-cb28-4fdc-8073-ce633c560aae","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"7d968db5-be75-47d2-9c6a-3cb4f41b09fc","name":"7d968db5-be75-47d2-9c6a-3cb4f41b09fc","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"96a0b084-110c-46b1-b8e4-cde02fa49c20","name":"96a0b084-110c-46b1-b8e4-cde02fa49c20","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"a9a234af-e448-43ae-8540-2e6aebb4cd38","name":"a9a234af-e448-43ae-8540-2e6aebb4cd38","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"00046679-5075-4ad2-8995-2c6c2244ab41","name":"00046679-5075-4ad2-8995-2c6c2244ab41","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"9ac0f902-e80a-4de4-b09c-2700ec2dfaf6","name":"9ac0f902-e80a-4de4-b09c-2700ec2dfaf6","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"5defea7d-cb28-4fdc-8073-ce633c560aae","name":"5defea7d-cb28-4fdc-8073-ce633c560aae","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"7d968db5-be75-47d2-9c6a-3cb4f41b09fc","name":"7d968db5-be75-47d2-9c6a-3cb4f41b09fc","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"96a0b084-110c-46b1-b8e4-cde02fa49c20","name":"96a0b084-110c-46b1-b8e4-cde02fa49c20","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"a9a234af-e448-43ae-8540-2e6aebb4cd38","name":"a9a234af-e448-43ae-8540-2e6aebb4cd38","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"00046679-5075-4ad2-8995-2c6c2244ab41","name":"00046679-5075-4ad2-8995-2c6c2244ab41","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -73,24 +73,12 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"9ac0f902-e80a-4de4-b09c-2700ec2dfaf6","path":"sprites/spr_tartaros_right_trim/spr_tartaros_right_trim.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"76deae19-d9fc-4802-8db5-0ee21731ef01","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"5defea7d-cb28-4fdc-8073-ce633c560aae","path":"sprites/spr_tartaros_right_trim/spr_tartaros_right_trim.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"c445da5a-43c3-45e6-b38d-aca5f22fd53b","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"7d968db5-be75-47d2-9c6a-3cb4f41b09fc","path":"sprites/spr_tartaros_right_trim/spr_tartaros_right_trim.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"10585c1e-d18e-4e00-9ea7-0ba35ccfd87c","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"96a0b084-110c-46b1-b8e4-cde02fa49c20","path":"sprites/spr_tartaros_right_trim/spr_tartaros_right_trim.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"bc5d7569-0411-4194-845d-954de995277f","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"a9a234af-e448-43ae-8540-2e6aebb4cd38","path":"sprites/spr_tartaros_right_trim/spr_tartaros_right_trim.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"0423a612-f90c-42e1-8c56-e4dbe243a6fb","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"00046679-5075-4ad2-8995-2c6c2244ab41","path":"sprites/spr_tartaros_right_trim/spr_tartaros_right_trim.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"4a280a15-1721-43d4-a285-202541575345","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"9ac0f902-e80a-4de4-b09c-2700ec2dfaf6","path":"sprites/spr_tartaros_right_trim/spr_tartaros_right_trim.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"76deae19-d9fc-4802-8db5-0ee21731ef01","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"5defea7d-cb28-4fdc-8073-ce633c560aae","path":"sprites/spr_tartaros_right_trim/spr_tartaros_right_trim.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"c445da5a-43c3-45e6-b38d-aca5f22fd53b","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"7d968db5-be75-47d2-9c6a-3cb4f41b09fc","path":"sprites/spr_tartaros_right_trim/spr_tartaros_right_trim.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"10585c1e-d18e-4e00-9ea7-0ba35ccfd87c","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"96a0b084-110c-46b1-b8e4-cde02fa49c20","path":"sprites/spr_tartaros_right_trim/spr_tartaros_right_trim.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"bc5d7569-0411-4194-845d-954de995277f","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"a9a234af-e448-43ae-8540-2e6aebb4cd38","path":"sprites/spr_tartaros_right_trim/spr_tartaros_right_trim.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"0423a612-f90c-42e1-8c56-e4dbe243a6fb","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"00046679-5075-4ad2-8995-2c6c2244ab41","path":"sprites/spr_tartaros_right_trim/spr_tartaros_right_trim.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"4a280a15-1721-43d4-a285-202541575345","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_tartaros_wep_fix/spr_tartaros_wep_fix.yy b/sprites/spr_tartaros_wep_fix/spr_tartaros_wep_fix.yy index 59d048a09b..3c612bd174 100644 --- a/sprites/spr_tartaros_wep_fix/spr_tartaros_wep_fix.yy +++ b/sprites/spr_tartaros_wep_fix/spr_tartaros_wep_fix.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_tartaros_wep_fix", "bboxMode":0, "bbox_bottom":121, @@ -12,14 +12,14 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"8a5005ac-6216-44bc-b706-2bd323adfdca","name":"8a5005ac-6216-44bc-b706-2bd323adfdca","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"0e289447-ea02-402e-bbb6-93bf479dd88b","name":"0e289447-ea02-402e-bbb6-93bf479dd88b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"fc96bc38-34b5-4115-974e-6be49247a8d8","name":"fc96bc38-34b5-4115-974e-6be49247a8d8","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"eafd1478-fad7-40fe-87b6-a72eeddaadd7","name":"eafd1478-fad7-40fe-87b6-a72eeddaadd7","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"dabfefca-b76d-4d72-911a-69234fe7e85e","name":"dabfefca-b76d-4d72-911a-69234fe7e85e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"08a3520b-2f42-4a1e-bc25-4e4c42c4ddd7","name":"08a3520b-2f42-4a1e-bc25-4e4c42c4ddd7","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"366cf225-a6ef-410a-822d-f0af9092e681","name":"366cf225-a6ef-410a-822d-f0af9092e681","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"349e147a-6dce-4007-a48c-60232e9137bf","name":"349e147a-6dce-4007-a48c-60232e9137bf","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"8a5005ac-6216-44bc-b706-2bd323adfdca","name":"8a5005ac-6216-44bc-b706-2bd323adfdca","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"0e289447-ea02-402e-bbb6-93bf479dd88b","name":"0e289447-ea02-402e-bbb6-93bf479dd88b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"fc96bc38-34b5-4115-974e-6be49247a8d8","name":"fc96bc38-34b5-4115-974e-6be49247a8d8","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"eafd1478-fad7-40fe-87b6-a72eeddaadd7","name":"eafd1478-fad7-40fe-87b6-a72eeddaadd7","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"dabfefca-b76d-4d72-911a-69234fe7e85e","name":"dabfefca-b76d-4d72-911a-69234fe7e85e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"08a3520b-2f42-4a1e-bc25-4e4c42c4ddd7","name":"08a3520b-2f42-4a1e-bc25-4e4c42c4ddd7","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"366cf225-a6ef-410a-822d-f0af9092e681","name":"366cf225-a6ef-410a-822d-f0af9092e681","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"349e147a-6dce-4007-a48c-60232e9137bf","name":"349e147a-6dce-4007-a48c-60232e9137bf","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -75,30 +75,14 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"8a5005ac-6216-44bc-b706-2bd323adfdca","path":"sprites/spr_tartaros_wep_fix/spr_tartaros_wep_fix.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"ed85afa1-11fe-436b-a3ae-3497b17b914f","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"0e289447-ea02-402e-bbb6-93bf479dd88b","path":"sprites/spr_tartaros_wep_fix/spr_tartaros_wep_fix.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"fc128896-cc76-4c73-bf7f-f66d2d6a761c","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"fc96bc38-34b5-4115-974e-6be49247a8d8","path":"sprites/spr_tartaros_wep_fix/spr_tartaros_wep_fix.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"4d757176-73e1-41d5-a3c2-5416efd47f06","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"eafd1478-fad7-40fe-87b6-a72eeddaadd7","path":"sprites/spr_tartaros_wep_fix/spr_tartaros_wep_fix.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"d6abe1c9-0906-41c5-8e32-137ad16cd932","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"dabfefca-b76d-4d72-911a-69234fe7e85e","path":"sprites/spr_tartaros_wep_fix/spr_tartaros_wep_fix.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"b60fe942-8a18-4ece-9d11-8eb0cdaade49","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"08a3520b-2f42-4a1e-bc25-4e4c42c4ddd7","path":"sprites/spr_tartaros_wep_fix/spr_tartaros_wep_fix.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"bac48702-3627-4115-a9ee-84a4eefee624","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"366cf225-a6ef-410a-822d-f0af9092e681","path":"sprites/spr_tartaros_wep_fix/spr_tartaros_wep_fix.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"1b7cfa11-bce0-489d-93a7-5f40c6aa9e14","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"349e147a-6dce-4007-a48c-60232e9137bf","path":"sprites/spr_tartaros_wep_fix/spr_tartaros_wep_fix.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"cd7d60f6-9862-4cdc-8a31-e4df4f1905cf","IsCreationKey":false,"Key":7.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"8a5005ac-6216-44bc-b706-2bd323adfdca","path":"sprites/spr_tartaros_wep_fix/spr_tartaros_wep_fix.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"ed85afa1-11fe-436b-a3ae-3497b17b914f","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"0e289447-ea02-402e-bbb6-93bf479dd88b","path":"sprites/spr_tartaros_wep_fix/spr_tartaros_wep_fix.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"fc128896-cc76-4c73-bf7f-f66d2d6a761c","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"fc96bc38-34b5-4115-974e-6be49247a8d8","path":"sprites/spr_tartaros_wep_fix/spr_tartaros_wep_fix.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"4d757176-73e1-41d5-a3c2-5416efd47f06","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"eafd1478-fad7-40fe-87b6-a72eeddaadd7","path":"sprites/spr_tartaros_wep_fix/spr_tartaros_wep_fix.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"d6abe1c9-0906-41c5-8e32-137ad16cd932","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"dabfefca-b76d-4d72-911a-69234fe7e85e","path":"sprites/spr_tartaros_wep_fix/spr_tartaros_wep_fix.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"b60fe942-8a18-4ece-9d11-8eb0cdaade49","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"08a3520b-2f42-4a1e-bc25-4e4c42c4ddd7","path":"sprites/spr_tartaros_wep_fix/spr_tartaros_wep_fix.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"bac48702-3627-4115-a9ee-84a4eefee624","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"366cf225-a6ef-410a-822d-f0af9092e681","path":"sprites/spr_tartaros_wep_fix/spr_tartaros_wep_fix.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"1b7cfa11-bce0-489d-93a7-5f40c6aa9e14","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"349e147a-6dce-4007-a48c-60232e9137bf","path":"sprites/spr_tartaros_wep_fix/spr_tartaros_wep_fix.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"cd7d60f6-9862-4cdc-8a31-e4df4f1905cf","IsCreationKey":false,"Key":7.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_tech_area_pad/spr_tech_area_pad.yy b/sprites/spr_tech_area_pad/spr_tech_area_pad.yy index 7236c43e8b..ff49f92fe1 100644 --- a/sprites/spr_tech_area_pad/spr_tech_area_pad.yy +++ b/sprites/spr_tech_area_pad/spr_tech_area_pad.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_tech_area_pad", "bboxMode":0, "bbox_bottom":157, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"51e26b33-bfb7-4894-bec1-aaa1490e5412","name":"51e26b33-bfb7-4894-bec1-aaa1490e5412","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"51e26b33-bfb7-4894-bec1-aaa1490e5412","name":"51e26b33-bfb7-4894-bec1-aaa1490e5412","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"51e26b33-bfb7-4894-bec1-aaa1490e5412","path":"sprites/spr_tech_area_pad/spr_tech_area_pad.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"8cc6ac14-847e-4e48-85ea-c50a7d853055","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"51e26b33-bfb7-4894-bec1-aaa1490e5412","path":"sprites/spr_tech_area_pad/spr_tech_area_pad.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"8cc6ac14-847e-4e48-85ea-c50a7d853055","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_tech_belt/spr_tech_belt.yy b/sprites/spr_tech_belt/spr_tech_belt.yy index b18d5a194c..6b5e6d0613 100644 --- a/sprites/spr_tech_belt/spr_tech_belt.yy +++ b/sprites/spr_tech_belt/spr_tech_belt.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_tech_belt", "bboxMode":0, "bbox_bottom":113, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"6f5f8280-1432-4189-ba71-5cb47411b603","name":"6f5f8280-1432-4189-ba71-5cb47411b603","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"6f5f8280-1432-4189-ba71-5cb47411b603","name":"6f5f8280-1432-4189-ba71-5cb47411b603","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"6f5f8280-1432-4189-ba71-5cb47411b603","path":"sprites/spr_tech_belt/spr_tech_belt.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"e80f57ce-b07a-4131-bc96-09b91013c0e2","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"6f5f8280-1432-4189-ba71-5cb47411b603","path":"sprites/spr_tech_belt/spr_tech_belt.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"e80f57ce-b07a-4131-bc96-09b91013c0e2","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_tech_face_plate/spr_tech_face_plate.yy b/sprites/spr_tech_face_plate/spr_tech_face_plate.yy index 1b08313cfe..6be78c0241 100644 --- a/sprites/spr_tech_face_plate/spr_tech_face_plate.yy +++ b/sprites/spr_tech_face_plate/spr_tech_face_plate.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_tech_face_plate", "bboxMode":0, "bbox_bottom":44, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"6f5f8280-1432-4189-ba71-5cb47411b603","name":"6f5f8280-1432-4189-ba71-5cb47411b603","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"6f5f8280-1432-4189-ba71-5cb47411b603","name":"6f5f8280-1432-4189-ba71-5cb47411b603","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"6f5f8280-1432-4189-ba71-5cb47411b603","path":"sprites/spr_tech_face_plate/spr_tech_face_plate.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"3a68cfe1-8533-4723-9fc1-c27fb8484d51","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"6f5f8280-1432-4189-ba71-5cb47411b603","path":"sprites/spr_tech_face_plate/spr_tech_face_plate.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"3a68cfe1-8533-4723-9fc1-c27fb8484d51","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_techmarine_chest/spr_techmarine_chest.yy b/sprites/spr_techmarine_chest/spr_techmarine_chest.yy index 0a7491f813..21fcfce3b8 100644 --- a/sprites/spr_techmarine_chest/spr_techmarine_chest.yy +++ b/sprites/spr_techmarine_chest/spr_techmarine_chest.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_techmarine_chest", "bboxMode":0, "bbox_bottom":89, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"b569e059-78e5-4c50-b871-22eb94b0b506","name":"b569e059-78e5-4c50-b871-22eb94b0b506","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"b569e059-78e5-4c50-b871-22eb94b0b506","name":"b569e059-78e5-4c50-b871-22eb94b0b506","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"b569e059-78e5-4c50-b871-22eb94b0b506","path":"sprites/spr_techmarine_chest/spr_techmarine_chest.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"8491130e-91ef-40e6-b272-88bbff923f67","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"b569e059-78e5-4c50-b871-22eb94b0b506","path":"sprites/spr_techmarine_chest/spr_techmarine_chest.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"8491130e-91ef-40e6-b272-88bbff923f67","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_techmarine_complex/spr_techmarine_complex.yy b/sprites/spr_techmarine_complex/spr_techmarine_complex.yy index 4cc15edf0d..7f737e710c 100644 --- a/sprites/spr_techmarine_complex/spr_techmarine_complex.yy +++ b/sprites/spr_techmarine_complex/spr_techmarine_complex.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_techmarine_complex", "bboxMode":0, "bbox_bottom":220, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"6f5f8280-1432-4189-ba71-5cb47411b603","name":"6f5f8280-1432-4189-ba71-5cb47411b603","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"6f5f8280-1432-4189-ba71-5cb47411b603","name":"6f5f8280-1432-4189-ba71-5cb47411b603","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"6f5f8280-1432-4189-ba71-5cb47411b603","path":"sprites/spr_techmarine_complex/spr_techmarine_complex.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"4ae9f309-78c6-4606-92b1-e0f1c674862b","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"6f5f8280-1432-4189-ba71-5cb47411b603","path":"sprites/spr_techmarine_complex/spr_techmarine_complex.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"4ae9f309-78c6-4606-92b1-e0f1c674862b","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_techmarine_core/spr_techmarine_core.yy b/sprites/spr_techmarine_core/spr_techmarine_core.yy index 78bb655f5f..44aa41efcf 100644 --- a/sprites/spr_techmarine_core/spr_techmarine_core.yy +++ b/sprites/spr_techmarine_core/spr_techmarine_core.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_techmarine_core", "bboxMode":0, "bbox_bottom":259, @@ -12,16 +12,16 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"d6fd5b26-5a16-4837-83e7-762349cad0fe","name":"d6fd5b26-5a16-4837-83e7-762349cad0fe","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"1952fa2a-5957-4a85-9c65-f7e12109ff46","name":"1952fa2a-5957-4a85-9c65-f7e12109ff46","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"0d3ae218-098c-4af6-af9e-9fa85eda6b9f","name":"0d3ae218-098c-4af6-af9e-9fa85eda6b9f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"d51b2fb6-4915-4181-8c98-cae57deb4866","name":"d51b2fb6-4915-4181-8c98-cae57deb4866","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"3d110598-0228-4efe-ba5e-08cf667ed23b","name":"3d110598-0228-4efe-ba5e-08cf667ed23b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"41baa262-b761-43e7-85eb-08b7824a9899","name":"41baa262-b761-43e7-85eb-08b7824a9899","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"7ee93fc8-dd78-44d7-bb05-85445635e575","name":"7ee93fc8-dd78-44d7-bb05-85445635e575","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"26fe8275-a7d5-4ab8-9cfc-53c852839746","name":"26fe8275-a7d5-4ab8-9cfc-53c852839746","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"a5226976-0539-4c1e-9467-9092d8ec7697","name":"a5226976-0539-4c1e-9467-9092d8ec7697","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"a5a5bb6b-2ee7-474c-b749-bde2db13ad9f","name":"a5a5bb6b-2ee7-474c-b749-bde2db13ad9f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"d6fd5b26-5a16-4837-83e7-762349cad0fe","name":"d6fd5b26-5a16-4837-83e7-762349cad0fe","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"1952fa2a-5957-4a85-9c65-f7e12109ff46","name":"1952fa2a-5957-4a85-9c65-f7e12109ff46","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"0d3ae218-098c-4af6-af9e-9fa85eda6b9f","name":"0d3ae218-098c-4af6-af9e-9fa85eda6b9f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"d51b2fb6-4915-4181-8c98-cae57deb4866","name":"d51b2fb6-4915-4181-8c98-cae57deb4866","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"3d110598-0228-4efe-ba5e-08cf667ed23b","name":"3d110598-0228-4efe-ba5e-08cf667ed23b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"41baa262-b761-43e7-85eb-08b7824a9899","name":"41baa262-b761-43e7-85eb-08b7824a9899","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"7ee93fc8-dd78-44d7-bb05-85445635e575","name":"7ee93fc8-dd78-44d7-bb05-85445635e575","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"26fe8275-a7d5-4ab8-9cfc-53c852839746","name":"26fe8275-a7d5-4ab8-9cfc-53c852839746","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"a5226976-0539-4c1e-9467-9092d8ec7697","name":"a5226976-0539-4c1e-9467-9092d8ec7697","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"a5a5bb6b-2ee7-474c-b749-bde2db13ad9f","name":"a5a5bb6b-2ee7-474c-b749-bde2db13ad9f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -77,36 +77,16 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"d6fd5b26-5a16-4837-83e7-762349cad0fe","path":"sprites/spr_techmarine_core/spr_techmarine_core.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"25cc4882-27cd-4eb3-8927-46d566e0e7b4","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"1952fa2a-5957-4a85-9c65-f7e12109ff46","path":"sprites/spr_techmarine_core/spr_techmarine_core.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"3a8a1299-9aee-4121-ba72-9229b4164ae5","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"0d3ae218-098c-4af6-af9e-9fa85eda6b9f","path":"sprites/spr_techmarine_core/spr_techmarine_core.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"9f6d611a-eeda-4ef8-b7d9-7d86184ba07b","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"d51b2fb6-4915-4181-8c98-cae57deb4866","path":"sprites/spr_techmarine_core/spr_techmarine_core.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"4ba5f3d8-f4b7-45d7-85fb-9fcb7142ee9c","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"3d110598-0228-4efe-ba5e-08cf667ed23b","path":"sprites/spr_techmarine_core/spr_techmarine_core.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"69e3269e-2975-42ee-95c9-20f36bd86568","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"41baa262-b761-43e7-85eb-08b7824a9899","path":"sprites/spr_techmarine_core/spr_techmarine_core.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"c92658c8-d4d4-4317-b200-9c8575a2bd45","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"7ee93fc8-dd78-44d7-bb05-85445635e575","path":"sprites/spr_techmarine_core/spr_techmarine_core.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"e75b9c32-73ee-4045-81ac-fbbdf654ab9b","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"26fe8275-a7d5-4ab8-9cfc-53c852839746","path":"sprites/spr_techmarine_core/spr_techmarine_core.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"4bd41038-2b15-43a9-a241-2531898b6533","IsCreationKey":false,"Key":7.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"a5226976-0539-4c1e-9467-9092d8ec7697","path":"sprites/spr_techmarine_core/spr_techmarine_core.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"2341b86a-9533-41e8-be8a-23eec3ef15de","IsCreationKey":false,"Key":8.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"a5a5bb6b-2ee7-474c-b749-bde2db13ad9f","path":"sprites/spr_techmarine_core/spr_techmarine_core.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"ca8c5988-e83e-45e8-80cd-806e8a04b657","IsCreationKey":false,"Key":9.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"d6fd5b26-5a16-4837-83e7-762349cad0fe","path":"sprites/spr_techmarine_core/spr_techmarine_core.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"25cc4882-27cd-4eb3-8927-46d566e0e7b4","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"1952fa2a-5957-4a85-9c65-f7e12109ff46","path":"sprites/spr_techmarine_core/spr_techmarine_core.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"3a8a1299-9aee-4121-ba72-9229b4164ae5","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"0d3ae218-098c-4af6-af9e-9fa85eda6b9f","path":"sprites/spr_techmarine_core/spr_techmarine_core.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"9f6d611a-eeda-4ef8-b7d9-7d86184ba07b","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"d51b2fb6-4915-4181-8c98-cae57deb4866","path":"sprites/spr_techmarine_core/spr_techmarine_core.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"4ba5f3d8-f4b7-45d7-85fb-9fcb7142ee9c","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"3d110598-0228-4efe-ba5e-08cf667ed23b","path":"sprites/spr_techmarine_core/spr_techmarine_core.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"69e3269e-2975-42ee-95c9-20f36bd86568","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"41baa262-b761-43e7-85eb-08b7824a9899","path":"sprites/spr_techmarine_core/spr_techmarine_core.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"c92658c8-d4d4-4317-b200-9c8575a2bd45","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"7ee93fc8-dd78-44d7-bb05-85445635e575","path":"sprites/spr_techmarine_core/spr_techmarine_core.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"e75b9c32-73ee-4045-81ac-fbbdf654ab9b","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"26fe8275-a7d5-4ab8-9cfc-53c852839746","path":"sprites/spr_techmarine_core/spr_techmarine_core.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"4bd41038-2b15-43a9-a241-2531898b6533","IsCreationKey":false,"Key":7.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"a5226976-0539-4c1e-9467-9092d8ec7697","path":"sprites/spr_techmarine_core/spr_techmarine_core.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"2341b86a-9533-41e8-be8a-23eec3ef15de","IsCreationKey":false,"Key":8.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"a5a5bb6b-2ee7-474c-b749-bde2db13ad9f","path":"sprites/spr_techmarine_core/spr_techmarine_core.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"ca8c5988-e83e-45e8-80cd-806e8a04b657","IsCreationKey":false,"Key":9.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_techmarine_head/spr_techmarine_head.yy b/sprites/spr_techmarine_head/spr_techmarine_head.yy index 2547bee8db..a576cfa1d5 100644 --- a/sprites/spr_techmarine_head/spr_techmarine_head.yy +++ b/sprites/spr_techmarine_head/spr_techmarine_head.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_techmarine_head", "bboxMode":0, "bbox_bottom":46, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"166553ae-f0f5-4307-94a0-6ec02a14a5c7","name":"166553ae-f0f5-4307-94a0-6ec02a14a5c7","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"166553ae-f0f5-4307-94a0-6ec02a14a5c7","name":"166553ae-f0f5-4307-94a0-6ec02a14a5c7","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"166553ae-f0f5-4307-94a0-6ec02a14a5c7","path":"sprites/spr_techmarine_head/spr_techmarine_head.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"4f17da9e-e4d9-4a1a-9efa-95332a851900","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"166553ae-f0f5-4307-94a0-6ec02a14a5c7","path":"sprites/spr_techmarine_head/spr_techmarine_head.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"4f17da9e-e4d9-4a1a-9efa-95332a851900","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_techmarine_left_leg/spr_techmarine_left_leg.yy b/sprites/spr_techmarine_left_leg/spr_techmarine_left_leg.yy index e20b77191d..5ac39ed748 100644 --- a/sprites/spr_techmarine_left_leg/spr_techmarine_left_leg.yy +++ b/sprites/spr_techmarine_left_leg/spr_techmarine_left_leg.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_techmarine_left_leg", "bboxMode":0, "bbox_bottom":220, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"22c1fc63-eee0-48f2-842f-3bb5727ed6bc","name":"22c1fc63-eee0-48f2-842f-3bb5727ed6bc","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"22c1fc63-eee0-48f2-842f-3bb5727ed6bc","name":"22c1fc63-eee0-48f2-842f-3bb5727ed6bc","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"22c1fc63-eee0-48f2-842f-3bb5727ed6bc","path":"sprites/spr_techmarine_left_leg/spr_techmarine_left_leg.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"e1a391d8-2716-4aea-9397-eb2bc0265424","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"22c1fc63-eee0-48f2-842f-3bb5727ed6bc","path":"sprites/spr_techmarine_left_leg/spr_techmarine_left_leg.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"e1a391d8-2716-4aea-9397-eb2bc0265424","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_techmarine_left_trim/spr_techmarine_left_trim.yy b/sprites/spr_techmarine_left_trim/spr_techmarine_left_trim.yy index 5a19a5f656..a192ea3494 100644 --- a/sprites/spr_techmarine_left_trim/spr_techmarine_left_trim.yy +++ b/sprites/spr_techmarine_left_trim/spr_techmarine_left_trim.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_techmarine_left_trim", "bboxMode":0, "bbox_bottom":80, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"7dcc7f70-2bb6-483b-8ab5-6f567496472f","name":"7dcc7f70-2bb6-483b-8ab5-6f567496472f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"7dcc7f70-2bb6-483b-8ab5-6f567496472f","name":"7dcc7f70-2bb6-483b-8ab5-6f567496472f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"7dcc7f70-2bb6-483b-8ab5-6f567496472f","path":"sprites/spr_techmarine_left_trim/spr_techmarine_left_trim.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"f8610019-e23e-458a-aa65-2af7f50f6808","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"7dcc7f70-2bb6-483b-8ab5-6f567496472f","path":"sprites/spr_techmarine_left_trim/spr_techmarine_left_trim.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"f8610019-e23e-458a-aa65-2af7f50f6808","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_techmarine_right_leg/spr_techmarine_right_leg.yy b/sprites/spr_techmarine_right_leg/spr_techmarine_right_leg.yy index c4edf5534c..841ed18538 100644 --- a/sprites/spr_techmarine_right_leg/spr_techmarine_right_leg.yy +++ b/sprites/spr_techmarine_right_leg/spr_techmarine_right_leg.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_techmarine_right_leg", "bboxMode":0, "bbox_bottom":220, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"22c1fc63-eee0-48f2-842f-3bb5727ed6bc","name":"22c1fc63-eee0-48f2-842f-3bb5727ed6bc","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"22c1fc63-eee0-48f2-842f-3bb5727ed6bc","name":"22c1fc63-eee0-48f2-842f-3bb5727ed6bc","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"22c1fc63-eee0-48f2-842f-3bb5727ed6bc","path":"sprites/spr_techmarine_right_leg/spr_techmarine_right_leg.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"0fa489e4-21d5-4860-b8a0-45f9bc4cfbe3","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"22c1fc63-eee0-48f2-842f-3bb5727ed6bc","path":"sprites/spr_techmarine_right_leg/spr_techmarine_right_leg.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"0fa489e4-21d5-4860-b8a0-45f9bc4cfbe3","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_techmarine_right_trim/spr_techmarine_right_trim.yy b/sprites/spr_techmarine_right_trim/spr_techmarine_right_trim.yy index 38c87de4ff..509ba39940 100644 --- a/sprites/spr_techmarine_right_trim/spr_techmarine_right_trim.yy +++ b/sprites/spr_techmarine_right_trim/spr_techmarine_right_trim.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_techmarine_right_trim", "bboxMode":0, "bbox_bottom":81, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"7dcc7f70-2bb6-483b-8ab5-6f567496472f","name":"7dcc7f70-2bb6-483b-8ab5-6f567496472f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"7dcc7f70-2bb6-483b-8ab5-6f567496472f","name":"7dcc7f70-2bb6-483b-8ab5-6f567496472f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"7dcc7f70-2bb6-483b-8ab5-6f567496472f","path":"sprites/spr_techmarine_right_trim/spr_techmarine_right_trim.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"38b42a12-0577-49fd-862f-87f307212a9e","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"7dcc7f70-2bb6-483b-8ab5-6f567496472f","path":"sprites/spr_techmarine_right_trim/spr_techmarine_right_trim.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"38b42a12-0577-49fd-862f-87f307212a9e","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_technology_icon/spr_technology_icon.yy b/sprites/spr_technology_icon/spr_technology_icon.yy index 7621b61176..3a3654385d 100644 --- a/sprites/spr_technology_icon/spr_technology_icon.yy +++ b/sprites/spr_technology_icon/spr_technology_icon.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_technology_icon", "bboxMode":0, "bbox_bottom":56, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"fb6ec02b-e2c8-41fa-93d0-58242851a5d2","name":"fb6ec02b-e2c8-41fa-93d0-58242851a5d2","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"fb6ec02b-e2c8-41fa-93d0-58242851a5d2","name":"fb6ec02b-e2c8-41fa-93d0-58242851a5d2","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"fb6ec02b-e2c8-41fa-93d0-58242851a5d2","path":"sprites/spr_technology_icon/spr_technology_icon.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"c875136c-f820-405d-bbe3-72fa5365a15c","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"fb6ec02b-e2c8-41fa-93d0-58242851a5d2","path":"sprites/spr_technology_icon/spr_technology_icon.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"c875136c-f820-405d-bbe3-72fa5365a15c","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_techpriest/spr_techpriest.yy b/sprites/spr_techpriest/spr_techpriest.yy index 591f980331..1d583891a9 100644 --- a/sprites/spr_techpriest/spr_techpriest.yy +++ b/sprites/spr_techpriest/spr_techpriest.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_techpriest", "bboxMode":0, "bbox_bottom":230, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"15cd6a2d-e361-4e25-861e-4d350855c408","name":"15cd6a2d-e361-4e25-861e-4d350855c408","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"15cd6a2d-e361-4e25-861e-4d350855c408","name":"15cd6a2d-e361-4e25-861e-4d350855c408","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -70,9 +70,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"15cd6a2d-e361-4e25-861e-4d350855c408","path":"sprites/spr_techpriest/spr_techpriest.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"cf5066ba-7cb7-42ea-8018-8d5ef42ff4ba","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"15cd6a2d-e361-4e25-861e-4d350855c408","path":"sprites/spr_techpriest/spr_techpriest.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"cf5066ba-7cb7-42ea-8018-8d5ef42ff4ba","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_teeth/spr_teeth.yy b/sprites/spr_teeth/spr_teeth.yy index 313e1556a2..4824b7a8dd 100644 --- a/sprites/spr_teeth/spr_teeth.yy +++ b/sprites/spr_teeth/spr_teeth.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_teeth", "bboxMode":0, "bbox_bottom":36, @@ -12,8 +12,8 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"9e2e4772-e0b4-40d5-93de-3eeb449e4cc3","name":"9e2e4772-e0b4-40d5-93de-3eeb449e4cc3","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"0314e59f-510c-49f1-aa68-e46181aa4b51","name":"0314e59f-510c-49f1-aa68-e46181aa4b51","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"9e2e4772-e0b4-40d5-93de-3eeb449e4cc3","name":"9e2e4772-e0b4-40d5-93de-3eeb449e4cc3","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"0314e59f-510c-49f1-aa68-e46181aa4b51","name":"0314e59f-510c-49f1-aa68-e46181aa4b51","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -69,12 +69,8 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"9e2e4772-e0b4-40d5-93de-3eeb449e4cc3","path":"sprites/spr_teeth/spr_teeth.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"e66df479-4ca7-4bf7-822b-3fc0248a8aa3","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"0314e59f-510c-49f1-aa68-e46181aa4b51","path":"sprites/spr_teeth/spr_teeth.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"69b23246-750d-4901-9bbc-be89ea989385","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"9e2e4772-e0b4-40d5-93de-3eeb449e4cc3","path":"sprites/spr_teeth/spr_teeth.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"e66df479-4ca7-4bf7-822b-3fc0248a8aa3","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"0314e59f-510c-49f1-aa68-e46181aa4b51","path":"sprites/spr_teeth/spr_teeth.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"69b23246-750d-4901-9bbc-be89ea989385","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_term_left_fur_hanging/spr_term_left_fur_hanging.yy b/sprites/spr_term_left_fur_hanging/spr_term_left_fur_hanging.yy index 468798dcd4..fdb2b346fb 100644 --- a/sprites/spr_term_left_fur_hanging/spr_term_left_fur_hanging.yy +++ b/sprites/spr_term_left_fur_hanging/spr_term_left_fur_hanging.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_term_left_fur_hanging", "bboxMode":0, "bbox_bottom":155, @@ -12,10 +12,10 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"8d99f92f-4aac-47e4-a142-c6ea6be47856","name":"8d99f92f-4aac-47e4-a142-c6ea6be47856","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"774a5c3b-bdbb-4b1c-a5dc-59f4a285f096","name":"774a5c3b-bdbb-4b1c-a5dc-59f4a285f096","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"74192f69-3886-451a-a93e-9abf268c1261","name":"74192f69-3886-451a-a93e-9abf268c1261","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"893636fd-19a3-4e79-adaf-0dac89d583cc","name":"893636fd-19a3-4e79-adaf-0dac89d583cc","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"8d99f92f-4aac-47e4-a142-c6ea6be47856","name":"8d99f92f-4aac-47e4-a142-c6ea6be47856","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"774a5c3b-bdbb-4b1c-a5dc-59f4a285f096","name":"774a5c3b-bdbb-4b1c-a5dc-59f4a285f096","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"74192f69-3886-451a-a93e-9abf268c1261","name":"74192f69-3886-451a-a93e-9abf268c1261","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"893636fd-19a3-4e79-adaf-0dac89d583cc","name":"893636fd-19a3-4e79-adaf-0dac89d583cc","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -73,18 +73,10 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"8d99f92f-4aac-47e4-a142-c6ea6be47856","path":"sprites/spr_term_left_fur_hanging/spr_term_left_fur_hanging.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"97633e3e-4ebd-40db-8025-98da3c2b143c","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"774a5c3b-bdbb-4b1c-a5dc-59f4a285f096","path":"sprites/spr_term_left_fur_hanging/spr_term_left_fur_hanging.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"cedac6a9-8433-4874-9826-4e74be9a9e2b","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"74192f69-3886-451a-a93e-9abf268c1261","path":"sprites/spr_term_left_fur_hanging/spr_term_left_fur_hanging.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"a1b564d7-57a3-40f7-923e-4160b723d7d6","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"893636fd-19a3-4e79-adaf-0dac89d583cc","path":"sprites/spr_term_left_fur_hanging/spr_term_left_fur_hanging.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"f6f50b1f-956f-44e6-9523-5db8a5e3256b","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"8d99f92f-4aac-47e4-a142-c6ea6be47856","path":"sprites/spr_term_left_fur_hanging/spr_term_left_fur_hanging.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"97633e3e-4ebd-40db-8025-98da3c2b143c","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"774a5c3b-bdbb-4b1c-a5dc-59f4a285f096","path":"sprites/spr_term_left_fur_hanging/spr_term_left_fur_hanging.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"cedac6a9-8433-4874-9826-4e74be9a9e2b","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"74192f69-3886-451a-a93e-9abf268c1261","path":"sprites/spr_term_left_fur_hanging/spr_term_left_fur_hanging.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"a1b564d7-57a3-40f7-923e-4160b723d7d6","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"893636fd-19a3-4e79-adaf-0dac89d583cc","path":"sprites/spr_term_left_fur_hanging/spr_term_left_fur_hanging.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"f6f50b1f-956f-44e6-9523-5db8a5e3256b","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_term_right_fur_hanging/spr_term_right_fur_hanging.yy b/sprites/spr_term_right_fur_hanging/spr_term_right_fur_hanging.yy index 0df527690b..6008420f7c 100644 --- a/sprites/spr_term_right_fur_hanging/spr_term_right_fur_hanging.yy +++ b/sprites/spr_term_right_fur_hanging/spr_term_right_fur_hanging.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_term_right_fur_hanging", "bboxMode":0, "bbox_bottom":155, @@ -12,10 +12,10 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"8d99f92f-4aac-47e4-a142-c6ea6be47856","name":"8d99f92f-4aac-47e4-a142-c6ea6be47856","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"774a5c3b-bdbb-4b1c-a5dc-59f4a285f096","name":"774a5c3b-bdbb-4b1c-a5dc-59f4a285f096","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"74192f69-3886-451a-a93e-9abf268c1261","name":"74192f69-3886-451a-a93e-9abf268c1261","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"893636fd-19a3-4e79-adaf-0dac89d583cc","name":"893636fd-19a3-4e79-adaf-0dac89d583cc","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"8d99f92f-4aac-47e4-a142-c6ea6be47856","name":"8d99f92f-4aac-47e4-a142-c6ea6be47856","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"774a5c3b-bdbb-4b1c-a5dc-59f4a285f096","name":"774a5c3b-bdbb-4b1c-a5dc-59f4a285f096","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"74192f69-3886-451a-a93e-9abf268c1261","name":"74192f69-3886-451a-a93e-9abf268c1261","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"893636fd-19a3-4e79-adaf-0dac89d583cc","name":"893636fd-19a3-4e79-adaf-0dac89d583cc","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -73,18 +73,10 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"8d99f92f-4aac-47e4-a142-c6ea6be47856","path":"sprites/spr_term_right_fur_hanging/spr_term_right_fur_hanging.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"47ed6b6a-ba69-4655-b4b6-17efb8e432a3","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"774a5c3b-bdbb-4b1c-a5dc-59f4a285f096","path":"sprites/spr_term_right_fur_hanging/spr_term_right_fur_hanging.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"26bb37d5-04d2-4575-9670-987d78702f28","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"74192f69-3886-451a-a93e-9abf268c1261","path":"sprites/spr_term_right_fur_hanging/spr_term_right_fur_hanging.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"7e197228-ad48-480d-90c7-2072036bcf55","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"893636fd-19a3-4e79-adaf-0dac89d583cc","path":"sprites/spr_term_right_fur_hanging/spr_term_right_fur_hanging.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"59b70244-1420-4cad-89ef-a92f6b074fd2","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"8d99f92f-4aac-47e4-a142-c6ea6be47856","path":"sprites/spr_term_right_fur_hanging/spr_term_right_fur_hanging.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"47ed6b6a-ba69-4655-b4b6-17efb8e432a3","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"774a5c3b-bdbb-4b1c-a5dc-59f4a285f096","path":"sprites/spr_term_right_fur_hanging/spr_term_right_fur_hanging.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"26bb37d5-04d2-4575-9670-987d78702f28","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"74192f69-3886-451a-a93e-9abf268c1261","path":"sprites/spr_term_right_fur_hanging/spr_term_right_fur_hanging.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"7e197228-ad48-480d-90c7-2072036bcf55","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"893636fd-19a3-4e79-adaf-0dac89d583cc","path":"sprites/spr_term_right_fur_hanging/spr_term_right_fur_hanging.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"59b70244-1420-4cad-89ef-a92f6b074fd2","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_termi_wep_fix/spr_termi_wep_fix.yy b/sprites/spr_termi_wep_fix/spr_termi_wep_fix.yy index 339bba7996..867ecfa1a7 100644 --- a/sprites/spr_termi_wep_fix/spr_termi_wep_fix.yy +++ b/sprites/spr_termi_wep_fix/spr_termi_wep_fix.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_termi_wep_fix", "bboxMode":0, "bbox_bottom":139, @@ -12,14 +12,14 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"7b2081b0-946f-4804-b87c-fbc39e60f0f9","name":"7b2081b0-946f-4804-b87c-fbc39e60f0f9","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"361b46bb-fdae-41f5-91b1-79b798fa3fe4","name":"361b46bb-fdae-41f5-91b1-79b798fa3fe4","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"76ca9422-3f5c-4b17-8948-15e41c41ff18","name":"76ca9422-3f5c-4b17-8948-15e41c41ff18","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"db1f3dfd-acef-4c04-ac9e-35477823aa2a","name":"db1f3dfd-acef-4c04-ac9e-35477823aa2a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"c9be93fb-8a44-449a-9b86-8579b9a9f1b7","name":"c9be93fb-8a44-449a-9b86-8579b9a9f1b7","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"40eaad45-da50-4f29-b260-ed0ef85dadb7","name":"40eaad45-da50-4f29-b260-ed0ef85dadb7","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"fb8574cd-c10b-4e81-ac18-bad9f72369dc","name":"fb8574cd-c10b-4e81-ac18-bad9f72369dc","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"c1c9bde6-ad3a-4ec0-9664-abae066ad480","name":"c1c9bde6-ad3a-4ec0-9664-abae066ad480","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"7b2081b0-946f-4804-b87c-fbc39e60f0f9","name":"7b2081b0-946f-4804-b87c-fbc39e60f0f9","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"361b46bb-fdae-41f5-91b1-79b798fa3fe4","name":"361b46bb-fdae-41f5-91b1-79b798fa3fe4","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"76ca9422-3f5c-4b17-8948-15e41c41ff18","name":"76ca9422-3f5c-4b17-8948-15e41c41ff18","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"db1f3dfd-acef-4c04-ac9e-35477823aa2a","name":"db1f3dfd-acef-4c04-ac9e-35477823aa2a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"c9be93fb-8a44-449a-9b86-8579b9a9f1b7","name":"c9be93fb-8a44-449a-9b86-8579b9a9f1b7","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"40eaad45-da50-4f29-b260-ed0ef85dadb7","name":"40eaad45-da50-4f29-b260-ed0ef85dadb7","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"fb8574cd-c10b-4e81-ac18-bad9f72369dc","name":"fb8574cd-c10b-4e81-ac18-bad9f72369dc","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"c1c9bde6-ad3a-4ec0-9664-abae066ad480","name":"c1c9bde6-ad3a-4ec0-9664-abae066ad480","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -75,30 +75,14 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"7b2081b0-946f-4804-b87c-fbc39e60f0f9","path":"sprites/spr_termi_wep_fix/spr_termi_wep_fix.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"c7f5060d-befd-419e-978e-26f94b09df6d","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"361b46bb-fdae-41f5-91b1-79b798fa3fe4","path":"sprites/spr_termi_wep_fix/spr_termi_wep_fix.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"5087a9dd-196d-445f-9d19-3b9102cea74f","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"76ca9422-3f5c-4b17-8948-15e41c41ff18","path":"sprites/spr_termi_wep_fix/spr_termi_wep_fix.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"39ae0826-1777-409f-9b0c-762605a42bcd","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"db1f3dfd-acef-4c04-ac9e-35477823aa2a","path":"sprites/spr_termi_wep_fix/spr_termi_wep_fix.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"24f060a5-653f-4c12-b358-84f0e969b4b1","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"c9be93fb-8a44-449a-9b86-8579b9a9f1b7","path":"sprites/spr_termi_wep_fix/spr_termi_wep_fix.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"eef702d1-4ab0-489b-9e99-97967d25ae95","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"40eaad45-da50-4f29-b260-ed0ef85dadb7","path":"sprites/spr_termi_wep_fix/spr_termi_wep_fix.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"01f21f77-4c70-4a7c-a6fa-92ec378523e4","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"fb8574cd-c10b-4e81-ac18-bad9f72369dc","path":"sprites/spr_termi_wep_fix/spr_termi_wep_fix.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"33828376-57c0-46da-89d5-bae01389c0ab","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"c1c9bde6-ad3a-4ec0-9664-abae066ad480","path":"sprites/spr_termi_wep_fix/spr_termi_wep_fix.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"beb051e3-4f2f-473c-b6d4-25240a448170","IsCreationKey":false,"Key":7.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"7b2081b0-946f-4804-b87c-fbc39e60f0f9","path":"sprites/spr_termi_wep_fix/spr_termi_wep_fix.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"c7f5060d-befd-419e-978e-26f94b09df6d","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"361b46bb-fdae-41f5-91b1-79b798fa3fe4","path":"sprites/spr_termi_wep_fix/spr_termi_wep_fix.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"5087a9dd-196d-445f-9d19-3b9102cea74f","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"76ca9422-3f5c-4b17-8948-15e41c41ff18","path":"sprites/spr_termi_wep_fix/spr_termi_wep_fix.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"39ae0826-1777-409f-9b0c-762605a42bcd","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"db1f3dfd-acef-4c04-ac9e-35477823aa2a","path":"sprites/spr_termi_wep_fix/spr_termi_wep_fix.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"24f060a5-653f-4c12-b358-84f0e969b4b1","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"c9be93fb-8a44-449a-9b86-8579b9a9f1b7","path":"sprites/spr_termi_wep_fix/spr_termi_wep_fix.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"eef702d1-4ab0-489b-9e99-97967d25ae95","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"40eaad45-da50-4f29-b260-ed0ef85dadb7","path":"sprites/spr_termi_wep_fix/spr_termi_wep_fix.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"01f21f77-4c70-4a7c-a6fa-92ec378523e4","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"fb8574cd-c10b-4e81-ac18-bad9f72369dc","path":"sprites/spr_termi_wep_fix/spr_termi_wep_fix.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"33828376-57c0-46da-89d5-bae01389c0ab","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"c1c9bde6-ad3a-4ec0-9664-abae066ad480","path":"sprites/spr_termi_wep_fix/spr_termi_wep_fix.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"beb051e3-4f2f-473c-b6d4-25240a448170","IsCreationKey":false,"Key":7.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_terminator2_colors/spr_terminator2_colors.yy b/sprites/spr_terminator2_colors/spr_terminator2_colors.yy index 4362f1ca99..e81fa73bb9 100644 --- a/sprites/spr_terminator2_colors/spr_terminator2_colors.yy +++ b/sprites/spr_terminator2_colors/spr_terminator2_colors.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_terminator2_colors", "bboxMode":0, "bbox_bottom":231, @@ -12,18 +12,18 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"d9376330-15f7-4f2d-8eaf-98953ffc1010","name":"d9376330-15f7-4f2d-8eaf-98953ffc1010","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"2cbce1c2-d21a-4ad6-8ac0-b4a14c138991","name":"2cbce1c2-d21a-4ad6-8ac0-b4a14c138991","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"0a77b2a2-ba69-417c-95ff-5efbc54ea115","name":"0a77b2a2-ba69-417c-95ff-5efbc54ea115","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"333055d8-0c87-403d-94cb-ee0b6b5dbfd1","name":"333055d8-0c87-403d-94cb-ee0b6b5dbfd1","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"dea64601-3301-4a88-8591-c05858f4ec64","name":"dea64601-3301-4a88-8591-c05858f4ec64","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"87a78cdd-01d7-45c0-b3e5-26fa1e9871c6","name":"87a78cdd-01d7-45c0-b3e5-26fa1e9871c6","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"8d5f69ea-c8b4-48b8-8ba4-8a11ce8e72e2","name":"8d5f69ea-c8b4-48b8-8ba4-8a11ce8e72e2","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"6e270d34-f629-4db1-b875-a3c1808f6f05","name":"6e270d34-f629-4db1-b875-a3c1808f6f05","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"f7fe6bc8-5e13-48dc-99f8-fa8279af6138","name":"f7fe6bc8-5e13-48dc-99f8-fa8279af6138","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"4008e6a5-0c0b-42ba-ab53-6a1aa5a32ada","name":"4008e6a5-0c0b-42ba-ab53-6a1aa5a32ada","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"8b300ea3-053a-4c9f-9251-851dbd6d1d37","name":"8b300ea3-053a-4c9f-9251-851dbd6d1d37","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"be251def-f87a-4059-94ba-a09de050afdc","name":"be251def-f87a-4059-94ba-a09de050afdc","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"d9376330-15f7-4f2d-8eaf-98953ffc1010","name":"d9376330-15f7-4f2d-8eaf-98953ffc1010","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"2cbce1c2-d21a-4ad6-8ac0-b4a14c138991","name":"2cbce1c2-d21a-4ad6-8ac0-b4a14c138991","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"0a77b2a2-ba69-417c-95ff-5efbc54ea115","name":"0a77b2a2-ba69-417c-95ff-5efbc54ea115","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"333055d8-0c87-403d-94cb-ee0b6b5dbfd1","name":"333055d8-0c87-403d-94cb-ee0b6b5dbfd1","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"dea64601-3301-4a88-8591-c05858f4ec64","name":"dea64601-3301-4a88-8591-c05858f4ec64","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"87a78cdd-01d7-45c0-b3e5-26fa1e9871c6","name":"87a78cdd-01d7-45c0-b3e5-26fa1e9871c6","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"8d5f69ea-c8b4-48b8-8ba4-8a11ce8e72e2","name":"8d5f69ea-c8b4-48b8-8ba4-8a11ce8e72e2","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"6e270d34-f629-4db1-b875-a3c1808f6f05","name":"6e270d34-f629-4db1-b875-a3c1808f6f05","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"f7fe6bc8-5e13-48dc-99f8-fa8279af6138","name":"f7fe6bc8-5e13-48dc-99f8-fa8279af6138","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"4008e6a5-0c0b-42ba-ab53-6a1aa5a32ada","name":"4008e6a5-0c0b-42ba-ab53-6a1aa5a32ada","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"8b300ea3-053a-4c9f-9251-851dbd6d1d37","name":"8b300ea3-053a-4c9f-9251-851dbd6d1d37","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"be251def-f87a-4059-94ba-a09de050afdc","name":"be251def-f87a-4059-94ba-a09de050afdc","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -79,42 +79,18 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"d9376330-15f7-4f2d-8eaf-98953ffc1010","path":"sprites/spr_terminator2_colors/spr_terminator2_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"15d6e70e-8247-486a-8771-f55c9188252c","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"2cbce1c2-d21a-4ad6-8ac0-b4a14c138991","path":"sprites/spr_terminator2_colors/spr_terminator2_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"333955e2-646a-4678-90de-02bdb66acbae","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"0a77b2a2-ba69-417c-95ff-5efbc54ea115","path":"sprites/spr_terminator2_colors/spr_terminator2_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"758eda71-efce-4d1f-86b0-7c09df9b3aea","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"333055d8-0c87-403d-94cb-ee0b6b5dbfd1","path":"sprites/spr_terminator2_colors/spr_terminator2_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"351d45da-f5a1-42b3-a9b7-2ce5b4d193eb","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"dea64601-3301-4a88-8591-c05858f4ec64","path":"sprites/spr_terminator2_colors/spr_terminator2_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"a3c46260-ff1e-4bf1-85f7-c7903dbf8513","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"87a78cdd-01d7-45c0-b3e5-26fa1e9871c6","path":"sprites/spr_terminator2_colors/spr_terminator2_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"2619edd9-345d-453f-a40c-71ad1c64b88b","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"8d5f69ea-c8b4-48b8-8ba4-8a11ce8e72e2","path":"sprites/spr_terminator2_colors/spr_terminator2_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"30c72042-f5e7-4073-a52f-925da8c7edf2","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"6e270d34-f629-4db1-b875-a3c1808f6f05","path":"sprites/spr_terminator2_colors/spr_terminator2_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"14ac3aed-c026-47e2-8c23-dcd2ae00b98c","IsCreationKey":false,"Key":7.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"f7fe6bc8-5e13-48dc-99f8-fa8279af6138","path":"sprites/spr_terminator2_colors/spr_terminator2_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"cb57dc31-66bb-42b4-b17d-7d02635b9562","IsCreationKey":false,"Key":8.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"4008e6a5-0c0b-42ba-ab53-6a1aa5a32ada","path":"sprites/spr_terminator2_colors/spr_terminator2_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"8cdf5e5c-fc40-4b60-b9cb-c120abb54761","IsCreationKey":false,"Key":9.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"8b300ea3-053a-4c9f-9251-851dbd6d1d37","path":"sprites/spr_terminator2_colors/spr_terminator2_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"b6fcb211-2e05-4940-8086-0bd3b0be05ed","IsCreationKey":false,"Key":10.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"be251def-f87a-4059-94ba-a09de050afdc","path":"sprites/spr_terminator2_colors/spr_terminator2_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"33f97624-918b-460c-bfe4-b461a4e66276","IsCreationKey":false,"Key":11.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"d9376330-15f7-4f2d-8eaf-98953ffc1010","path":"sprites/spr_terminator2_colors/spr_terminator2_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"15d6e70e-8247-486a-8771-f55c9188252c","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"2cbce1c2-d21a-4ad6-8ac0-b4a14c138991","path":"sprites/spr_terminator2_colors/spr_terminator2_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"333955e2-646a-4678-90de-02bdb66acbae","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"0a77b2a2-ba69-417c-95ff-5efbc54ea115","path":"sprites/spr_terminator2_colors/spr_terminator2_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"758eda71-efce-4d1f-86b0-7c09df9b3aea","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"333055d8-0c87-403d-94cb-ee0b6b5dbfd1","path":"sprites/spr_terminator2_colors/spr_terminator2_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"351d45da-f5a1-42b3-a9b7-2ce5b4d193eb","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"dea64601-3301-4a88-8591-c05858f4ec64","path":"sprites/spr_terminator2_colors/spr_terminator2_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"a3c46260-ff1e-4bf1-85f7-c7903dbf8513","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"87a78cdd-01d7-45c0-b3e5-26fa1e9871c6","path":"sprites/spr_terminator2_colors/spr_terminator2_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"2619edd9-345d-453f-a40c-71ad1c64b88b","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"8d5f69ea-c8b4-48b8-8ba4-8a11ce8e72e2","path":"sprites/spr_terminator2_colors/spr_terminator2_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"30c72042-f5e7-4073-a52f-925da8c7edf2","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"6e270d34-f629-4db1-b875-a3c1808f6f05","path":"sprites/spr_terminator2_colors/spr_terminator2_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"14ac3aed-c026-47e2-8c23-dcd2ae00b98c","IsCreationKey":false,"Key":7.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"f7fe6bc8-5e13-48dc-99f8-fa8279af6138","path":"sprites/spr_terminator2_colors/spr_terminator2_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"cb57dc31-66bb-42b4-b17d-7d02635b9562","IsCreationKey":false,"Key":8.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"4008e6a5-0c0b-42ba-ab53-6a1aa5a32ada","path":"sprites/spr_terminator2_colors/spr_terminator2_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"8cdf5e5c-fc40-4b60-b9cb-c120abb54761","IsCreationKey":false,"Key":9.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"8b300ea3-053a-4c9f-9251-851dbd6d1d37","path":"sprites/spr_terminator2_colors/spr_terminator2_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"b6fcb211-2e05-4940-8086-0bd3b0be05ed","IsCreationKey":false,"Key":10.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"be251def-f87a-4059-94ba-a09de050afdc","path":"sprites/spr_terminator2_colors/spr_terminator2_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"33f97624-918b-460c-bfe4-b461a4e66276","IsCreationKey":false,"Key":11.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_terminator3_colors/spr_terminator3_colors.yy b/sprites/spr_terminator3_colors/spr_terminator3_colors.yy index 38fceee5e5..e87e378d0a 100644 --- a/sprites/spr_terminator3_colors/spr_terminator3_colors.yy +++ b/sprites/spr_terminator3_colors/spr_terminator3_colors.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_terminator3_colors", "bboxMode":0, "bbox_bottom":259, @@ -12,16 +12,16 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"8cb6d9eb-f4d0-4e70-8a60-33dd017f0b50","name":"8cb6d9eb-f4d0-4e70-8a60-33dd017f0b50","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"8c839fec-817d-4ad9-ace8-1447ac216a20","name":"8c839fec-817d-4ad9-ace8-1447ac216a20","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"49d3f799-75d7-4265-8808-dda0f3c715b2","name":"49d3f799-75d7-4265-8808-dda0f3c715b2","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"2efb5d92-2428-42cd-89e7-be4069186f6b","name":"2efb5d92-2428-42cd-89e7-be4069186f6b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"613ba06e-d34f-431d-b4d6-5d3fcc290338","name":"613ba06e-d34f-431d-b4d6-5d3fcc290338","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"0d8b94b8-297f-427c-9561-544ca75f5f93","name":"0d8b94b8-297f-427c-9561-544ca75f5f93","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"f485d637-9734-449b-b878-674a7bf45002","name":"f485d637-9734-449b-b878-674a7bf45002","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"bb04902e-b65b-4002-af27-3bf803bac80a","name":"bb04902e-b65b-4002-af27-3bf803bac80a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"66a3a618-8916-41e7-8773-6f81850bf428","name":"66a3a618-8916-41e7-8773-6f81850bf428","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"55e4eb93-91e3-4251-a610-7a88ef44e295","name":"55e4eb93-91e3-4251-a610-7a88ef44e295","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"8cb6d9eb-f4d0-4e70-8a60-33dd017f0b50","name":"8cb6d9eb-f4d0-4e70-8a60-33dd017f0b50","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"8c839fec-817d-4ad9-ace8-1447ac216a20","name":"8c839fec-817d-4ad9-ace8-1447ac216a20","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"49d3f799-75d7-4265-8808-dda0f3c715b2","name":"49d3f799-75d7-4265-8808-dda0f3c715b2","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"2efb5d92-2428-42cd-89e7-be4069186f6b","name":"2efb5d92-2428-42cd-89e7-be4069186f6b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"613ba06e-d34f-431d-b4d6-5d3fcc290338","name":"613ba06e-d34f-431d-b4d6-5d3fcc290338","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"0d8b94b8-297f-427c-9561-544ca75f5f93","name":"0d8b94b8-297f-427c-9561-544ca75f5f93","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"f485d637-9734-449b-b878-674a7bf45002","name":"f485d637-9734-449b-b878-674a7bf45002","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"bb04902e-b65b-4002-af27-3bf803bac80a","name":"bb04902e-b65b-4002-af27-3bf803bac80a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"66a3a618-8916-41e7-8773-6f81850bf428","name":"66a3a618-8916-41e7-8773-6f81850bf428","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"55e4eb93-91e3-4251-a610-7a88ef44e295","name":"55e4eb93-91e3-4251-a610-7a88ef44e295","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -79,36 +79,16 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"8cb6d9eb-f4d0-4e70-8a60-33dd017f0b50","path":"sprites/spr_terminator3_colors/spr_terminator3_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"568febcf-ab7f-4a87-b5c0-735a58b1b9d4","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"8c839fec-817d-4ad9-ace8-1447ac216a20","path":"sprites/spr_terminator3_colors/spr_terminator3_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"846e9905-1def-45d8-bb7c-5fdb5825102e","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"49d3f799-75d7-4265-8808-dda0f3c715b2","path":"sprites/spr_terminator3_colors/spr_terminator3_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"eafd5b88-2fb5-44b7-9676-b8ff110d59ba","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"2efb5d92-2428-42cd-89e7-be4069186f6b","path":"sprites/spr_terminator3_colors/spr_terminator3_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"e21150b8-8296-4101-b8cb-41c1afd8bbfc","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"613ba06e-d34f-431d-b4d6-5d3fcc290338","path":"sprites/spr_terminator3_colors/spr_terminator3_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"6084a88b-01b6-41fd-91bf-3aea97f8d78c","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"0d8b94b8-297f-427c-9561-544ca75f5f93","path":"sprites/spr_terminator3_colors/spr_terminator3_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"06ebf596-560c-48c8-ac9c-ecacf45b2cee","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"f485d637-9734-449b-b878-674a7bf45002","path":"sprites/spr_terminator3_colors/spr_terminator3_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"fd1adfdd-e046-4734-9496-5123b9733a3e","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"bb04902e-b65b-4002-af27-3bf803bac80a","path":"sprites/spr_terminator3_colors/spr_terminator3_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"8a651216-c6e5-41d6-aca8-a9c5e3f6090c","IsCreationKey":false,"Key":7.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"66a3a618-8916-41e7-8773-6f81850bf428","path":"sprites/spr_terminator3_colors/spr_terminator3_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"a089cf52-ca81-41d6-97ae-9599874de3bd","IsCreationKey":false,"Key":8.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"55e4eb93-91e3-4251-a610-7a88ef44e295","path":"sprites/spr_terminator3_colors/spr_terminator3_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"3c54f96e-b78f-4a27-ac45-b600d7239fea","IsCreationKey":false,"Key":9.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"8cb6d9eb-f4d0-4e70-8a60-33dd017f0b50","path":"sprites/spr_terminator3_colors/spr_terminator3_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"568febcf-ab7f-4a87-b5c0-735a58b1b9d4","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"8c839fec-817d-4ad9-ace8-1447ac216a20","path":"sprites/spr_terminator3_colors/spr_terminator3_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"846e9905-1def-45d8-bb7c-5fdb5825102e","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"49d3f799-75d7-4265-8808-dda0f3c715b2","path":"sprites/spr_terminator3_colors/spr_terminator3_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"eafd5b88-2fb5-44b7-9676-b8ff110d59ba","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"2efb5d92-2428-42cd-89e7-be4069186f6b","path":"sprites/spr_terminator3_colors/spr_terminator3_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"e21150b8-8296-4101-b8cb-41c1afd8bbfc","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"613ba06e-d34f-431d-b4d6-5d3fcc290338","path":"sprites/spr_terminator3_colors/spr_terminator3_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"6084a88b-01b6-41fd-91bf-3aea97f8d78c","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"0d8b94b8-297f-427c-9561-544ca75f5f93","path":"sprites/spr_terminator3_colors/spr_terminator3_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"06ebf596-560c-48c8-ac9c-ecacf45b2cee","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"f485d637-9734-449b-b878-674a7bf45002","path":"sprites/spr_terminator3_colors/spr_terminator3_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"fd1adfdd-e046-4734-9496-5123b9733a3e","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"bb04902e-b65b-4002-af27-3bf803bac80a","path":"sprites/spr_terminator3_colors/spr_terminator3_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"8a651216-c6e5-41d6-aca8-a9c5e3f6090c","IsCreationKey":false,"Key":7.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"66a3a618-8916-41e7-8773-6f81850bf428","path":"sprites/spr_terminator3_colors/spr_terminator3_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"a089cf52-ca81-41d6-97ae-9599874de3bd","IsCreationKey":false,"Key":8.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"55e4eb93-91e3-4251-a610-7a88ef44e295","path":"sprites/spr_terminator3_colors/spr_terminator3_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"3c54f96e-b78f-4a27-ac45-b600d7239fea","IsCreationKey":false,"Key":9.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_terminator_arms/spr_terminator_arms.yy b/sprites/spr_terminator_arms/spr_terminator_arms.yy index b512d6092a..b43aa11ab9 100644 --- a/sprites/spr_terminator_arms/spr_terminator_arms.yy +++ b/sprites/spr_terminator_arms/spr_terminator_arms.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_terminator_arms", "bboxMode":0, "bbox_bottom":170, @@ -12,12 +12,12 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"c9be93fb-8a44-449a-9b86-8579b9a9f1b7","name":"c9be93fb-8a44-449a-9b86-8579b9a9f1b7","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"5bf1d95d-31c3-4092-99f8-fe6b18cc077d","name":"5bf1d95d-31c3-4092-99f8-fe6b18cc077d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"26935846-dc87-49ea-95f0-8d93e784b6b3","name":"26935846-dc87-49ea-95f0-8d93e784b6b3","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"8e9f5065-f35e-4408-835f-e8fbfcd63878","name":"8e9f5065-f35e-4408-835f-e8fbfcd63878","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"213953e7-d335-4a83-a9b8-496335dda7be","name":"213953e7-d335-4a83-a9b8-496335dda7be","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"daf2e325-3fef-4afd-8c05-47a593d56b46","name":"daf2e325-3fef-4afd-8c05-47a593d56b46","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"c9be93fb-8a44-449a-9b86-8579b9a9f1b7","name":"c9be93fb-8a44-449a-9b86-8579b9a9f1b7","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"5bf1d95d-31c3-4092-99f8-fe6b18cc077d","name":"5bf1d95d-31c3-4092-99f8-fe6b18cc077d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"26935846-dc87-49ea-95f0-8d93e784b6b3","name":"26935846-dc87-49ea-95f0-8d93e784b6b3","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"8e9f5065-f35e-4408-835f-e8fbfcd63878","name":"8e9f5065-f35e-4408-835f-e8fbfcd63878","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"213953e7-d335-4a83-a9b8-496335dda7be","name":"213953e7-d335-4a83-a9b8-496335dda7be","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"daf2e325-3fef-4afd-8c05-47a593d56b46","name":"daf2e325-3fef-4afd-8c05-47a593d56b46","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -74,24 +74,12 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"c9be93fb-8a44-449a-9b86-8579b9a9f1b7","path":"sprites/spr_terminator_arms/spr_terminator_arms.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"cae7e18c-f5e7-4d50-8455-689d9f07259e","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"5bf1d95d-31c3-4092-99f8-fe6b18cc077d","path":"sprites/spr_terminator_arms/spr_terminator_arms.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"f758ccb5-a5a2-4ba8-826a-d935358c0750","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"26935846-dc87-49ea-95f0-8d93e784b6b3","path":"sprites/spr_terminator_arms/spr_terminator_arms.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"97dafcc0-9581-43e8-9b5a-3b85dcce74b7","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"8e9f5065-f35e-4408-835f-e8fbfcd63878","path":"sprites/spr_terminator_arms/spr_terminator_arms.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"33ca7639-cb77-432a-983c-83471f91f6ad","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"213953e7-d335-4a83-a9b8-496335dda7be","path":"sprites/spr_terminator_arms/spr_terminator_arms.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"7d6d9eef-0cb3-4ce9-b9be-cb53d0a55eac","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"daf2e325-3fef-4afd-8c05-47a593d56b46","path":"sprites/spr_terminator_arms/spr_terminator_arms.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"8f618068-e910-457d-a3f3-bb9b274821f5","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"c9be93fb-8a44-449a-9b86-8579b9a9f1b7","path":"sprites/spr_terminator_arms/spr_terminator_arms.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"cae7e18c-f5e7-4d50-8455-689d9f07259e","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"5bf1d95d-31c3-4092-99f8-fe6b18cc077d","path":"sprites/spr_terminator_arms/spr_terminator_arms.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"f758ccb5-a5a2-4ba8-826a-d935358c0750","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"26935846-dc87-49ea-95f0-8d93e784b6b3","path":"sprites/spr_terminator_arms/spr_terminator_arms.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"97dafcc0-9581-43e8-9b5a-3b85dcce74b7","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"8e9f5065-f35e-4408-835f-e8fbfcd63878","path":"sprites/spr_terminator_arms/spr_terminator_arms.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"33ca7639-cb77-432a-983c-83471f91f6ad","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"213953e7-d335-4a83-a9b8-496335dda7be","path":"sprites/spr_terminator_arms/spr_terminator_arms.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"7d6d9eef-0cb3-4ce9-b9be-cb53d0a55eac","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"daf2e325-3fef-4afd-8c05-47a593d56b46","path":"sprites/spr_terminator_arms/spr_terminator_arms.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"8f618068-e910-457d-a3f3-bb9b274821f5","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_terminator_chap/spr_terminator_chap.yy b/sprites/spr_terminator_chap/spr_terminator_chap.yy index e1a0fdf32a..62042c56bf 100644 --- a/sprites/spr_terminator_chap/spr_terminator_chap.yy +++ b/sprites/spr_terminator_chap/spr_terminator_chap.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_terminator_chap", "bboxMode":0, "bbox_bottom":231, @@ -12,18 +12,18 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"d9376330-15f7-4f2d-8eaf-98953ffc1010","name":"d9376330-15f7-4f2d-8eaf-98953ffc1010","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"2cbce1c2-d21a-4ad6-8ac0-b4a14c138991","name":"2cbce1c2-d21a-4ad6-8ac0-b4a14c138991","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"0a77b2a2-ba69-417c-95ff-5efbc54ea115","name":"0a77b2a2-ba69-417c-95ff-5efbc54ea115","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"333055d8-0c87-403d-94cb-ee0b6b5dbfd1","name":"333055d8-0c87-403d-94cb-ee0b6b5dbfd1","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"dea64601-3301-4a88-8591-c05858f4ec64","name":"dea64601-3301-4a88-8591-c05858f4ec64","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"87a78cdd-01d7-45c0-b3e5-26fa1e9871c6","name":"87a78cdd-01d7-45c0-b3e5-26fa1e9871c6","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"8d5f69ea-c8b4-48b8-8ba4-8a11ce8e72e2","name":"8d5f69ea-c8b4-48b8-8ba4-8a11ce8e72e2","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"6e270d34-f629-4db1-b875-a3c1808f6f05","name":"6e270d34-f629-4db1-b875-a3c1808f6f05","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"f7fe6bc8-5e13-48dc-99f8-fa8279af6138","name":"f7fe6bc8-5e13-48dc-99f8-fa8279af6138","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"4008e6a5-0c0b-42ba-ab53-6a1aa5a32ada","name":"4008e6a5-0c0b-42ba-ab53-6a1aa5a32ada","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"8b300ea3-053a-4c9f-9251-851dbd6d1d37","name":"8b300ea3-053a-4c9f-9251-851dbd6d1d37","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"be251def-f87a-4059-94ba-a09de050afdc","name":"be251def-f87a-4059-94ba-a09de050afdc","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"d9376330-15f7-4f2d-8eaf-98953ffc1010","name":"d9376330-15f7-4f2d-8eaf-98953ffc1010","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"2cbce1c2-d21a-4ad6-8ac0-b4a14c138991","name":"2cbce1c2-d21a-4ad6-8ac0-b4a14c138991","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"0a77b2a2-ba69-417c-95ff-5efbc54ea115","name":"0a77b2a2-ba69-417c-95ff-5efbc54ea115","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"333055d8-0c87-403d-94cb-ee0b6b5dbfd1","name":"333055d8-0c87-403d-94cb-ee0b6b5dbfd1","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"dea64601-3301-4a88-8591-c05858f4ec64","name":"dea64601-3301-4a88-8591-c05858f4ec64","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"87a78cdd-01d7-45c0-b3e5-26fa1e9871c6","name":"87a78cdd-01d7-45c0-b3e5-26fa1e9871c6","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"8d5f69ea-c8b4-48b8-8ba4-8a11ce8e72e2","name":"8d5f69ea-c8b4-48b8-8ba4-8a11ce8e72e2","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"6e270d34-f629-4db1-b875-a3c1808f6f05","name":"6e270d34-f629-4db1-b875-a3c1808f6f05","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"f7fe6bc8-5e13-48dc-99f8-fa8279af6138","name":"f7fe6bc8-5e13-48dc-99f8-fa8279af6138","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"4008e6a5-0c0b-42ba-ab53-6a1aa5a32ada","name":"4008e6a5-0c0b-42ba-ab53-6a1aa5a32ada","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"8b300ea3-053a-4c9f-9251-851dbd6d1d37","name":"8b300ea3-053a-4c9f-9251-851dbd6d1d37","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"be251def-f87a-4059-94ba-a09de050afdc","name":"be251def-f87a-4059-94ba-a09de050afdc","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -79,42 +79,18 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"d9376330-15f7-4f2d-8eaf-98953ffc1010","path":"sprites/spr_terminator_chap/spr_terminator_chap.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"230c632b-8b24-4edd-be9b-3b70311fede3","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"2cbce1c2-d21a-4ad6-8ac0-b4a14c138991","path":"sprites/spr_terminator_chap/spr_terminator_chap.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"e30d48bc-b249-4c2c-8797-ac883a14cfa1","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"0a77b2a2-ba69-417c-95ff-5efbc54ea115","path":"sprites/spr_terminator_chap/spr_terminator_chap.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"92ef3eef-ea36-4c59-bcb2-61ce66d885c1","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"333055d8-0c87-403d-94cb-ee0b6b5dbfd1","path":"sprites/spr_terminator_chap/spr_terminator_chap.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"d3ff366b-1d0a-45c4-a250-955c5934a1f1","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"dea64601-3301-4a88-8591-c05858f4ec64","path":"sprites/spr_terminator_chap/spr_terminator_chap.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"83303542-6444-4807-b269-79920c8d5df9","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"87a78cdd-01d7-45c0-b3e5-26fa1e9871c6","path":"sprites/spr_terminator_chap/spr_terminator_chap.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"66d85fca-2193-4a3a-8f67-de3d3f8922dd","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"8d5f69ea-c8b4-48b8-8ba4-8a11ce8e72e2","path":"sprites/spr_terminator_chap/spr_terminator_chap.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"ea0f1fe6-fe3d-4ec0-b0f6-73fa978ed634","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"6e270d34-f629-4db1-b875-a3c1808f6f05","path":"sprites/spr_terminator_chap/spr_terminator_chap.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"2cc2aa60-cff6-47b5-aa55-58f9710ba1ed","IsCreationKey":false,"Key":7.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"f7fe6bc8-5e13-48dc-99f8-fa8279af6138","path":"sprites/spr_terminator_chap/spr_terminator_chap.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"b44f8488-ca89-4feb-8ecb-da711bef2914","IsCreationKey":false,"Key":8.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"4008e6a5-0c0b-42ba-ab53-6a1aa5a32ada","path":"sprites/spr_terminator_chap/spr_terminator_chap.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"c014eae2-8bcb-4344-9475-1ef52c9b4dc4","IsCreationKey":false,"Key":9.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"8b300ea3-053a-4c9f-9251-851dbd6d1d37","path":"sprites/spr_terminator_chap/spr_terminator_chap.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"f4a840c4-e82f-4893-9b83-03cc66741b24","IsCreationKey":false,"Key":10.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"be251def-f87a-4059-94ba-a09de050afdc","path":"sprites/spr_terminator_chap/spr_terminator_chap.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"6c711e59-d9af-4da6-a07d-12138197879b","IsCreationKey":false,"Key":11.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"d9376330-15f7-4f2d-8eaf-98953ffc1010","path":"sprites/spr_terminator_chap/spr_terminator_chap.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"230c632b-8b24-4edd-be9b-3b70311fede3","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"2cbce1c2-d21a-4ad6-8ac0-b4a14c138991","path":"sprites/spr_terminator_chap/spr_terminator_chap.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"e30d48bc-b249-4c2c-8797-ac883a14cfa1","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"0a77b2a2-ba69-417c-95ff-5efbc54ea115","path":"sprites/spr_terminator_chap/spr_terminator_chap.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"92ef3eef-ea36-4c59-bcb2-61ce66d885c1","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"333055d8-0c87-403d-94cb-ee0b6b5dbfd1","path":"sprites/spr_terminator_chap/spr_terminator_chap.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"d3ff366b-1d0a-45c4-a250-955c5934a1f1","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"dea64601-3301-4a88-8591-c05858f4ec64","path":"sprites/spr_terminator_chap/spr_terminator_chap.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"83303542-6444-4807-b269-79920c8d5df9","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"87a78cdd-01d7-45c0-b3e5-26fa1e9871c6","path":"sprites/spr_terminator_chap/spr_terminator_chap.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"66d85fca-2193-4a3a-8f67-de3d3f8922dd","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"8d5f69ea-c8b4-48b8-8ba4-8a11ce8e72e2","path":"sprites/spr_terminator_chap/spr_terminator_chap.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"ea0f1fe6-fe3d-4ec0-b0f6-73fa978ed634","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"6e270d34-f629-4db1-b875-a3c1808f6f05","path":"sprites/spr_terminator_chap/spr_terminator_chap.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"2cc2aa60-cff6-47b5-aa55-58f9710ba1ed","IsCreationKey":false,"Key":7.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"f7fe6bc8-5e13-48dc-99f8-fa8279af6138","path":"sprites/spr_terminator_chap/spr_terminator_chap.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"b44f8488-ca89-4feb-8ecb-da711bef2914","IsCreationKey":false,"Key":8.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"4008e6a5-0c0b-42ba-ab53-6a1aa5a32ada","path":"sprites/spr_terminator_chap/spr_terminator_chap.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"c014eae2-8bcb-4344-9475-1ef52c9b4dc4","IsCreationKey":false,"Key":9.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"8b300ea3-053a-4c9f-9251-851dbd6d1d37","path":"sprites/spr_terminator_chap/spr_terminator_chap.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"f4a840c4-e82f-4893-9b83-03cc66741b24","IsCreationKey":false,"Key":10.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"be251def-f87a-4059-94ba-a09de050afdc","path":"sprites/spr_terminator_chap/spr_terminator_chap.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"6c711e59-d9af-4da6-a07d-12138197879b","IsCreationKey":false,"Key":11.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_terminator_colors/spr_terminator_colors.yy b/sprites/spr_terminator_colors/spr_terminator_colors.yy index 57ce5b8168..2874cfee78 100644 --- a/sprites/spr_terminator_colors/spr_terminator_colors.yy +++ b/sprites/spr_terminator_colors/spr_terminator_colors.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_terminator_colors", "bboxMode":0, "bbox_bottom":231, @@ -12,16 +12,16 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"fcaca781-a900-4083-84c4-7f2a75eac321","name":"fcaca781-a900-4083-84c4-7f2a75eac321","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"808a543b-f546-43fd-8c27-2819a37091e4","name":"808a543b-f546-43fd-8c27-2819a37091e4","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"3b803a6b-b887-4855-bf65-c4b658859507","name":"3b803a6b-b887-4855-bf65-c4b658859507","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"ad1367f6-3787-419c-afa0-72a8892b8b60","name":"ad1367f6-3787-419c-afa0-72a8892b8b60","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"b2b44691-5048-4d17-a254-0346bf451baa","name":"b2b44691-5048-4d17-a254-0346bf451baa","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"24589d5c-b88d-4827-923f-ec967cf9be73","name":"24589d5c-b88d-4827-923f-ec967cf9be73","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"af3947b7-9b4a-4772-89ae-4c5fbeb2addc","name":"af3947b7-9b4a-4772-89ae-4c5fbeb2addc","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"d48d753f-bbf1-4967-894d-5d7c23f5c16d","name":"d48d753f-bbf1-4967-894d-5d7c23f5c16d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"4f9f3dd8-6abd-4d43-8588-e98d1b703138","name":"4f9f3dd8-6abd-4d43-8588-e98d1b703138","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"d35811e0-8a35-4516-9c17-df5e3a4e8d2c","name":"d35811e0-8a35-4516-9c17-df5e3a4e8d2c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"fcaca781-a900-4083-84c4-7f2a75eac321","name":"fcaca781-a900-4083-84c4-7f2a75eac321","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"808a543b-f546-43fd-8c27-2819a37091e4","name":"808a543b-f546-43fd-8c27-2819a37091e4","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"3b803a6b-b887-4855-bf65-c4b658859507","name":"3b803a6b-b887-4855-bf65-c4b658859507","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"ad1367f6-3787-419c-afa0-72a8892b8b60","name":"ad1367f6-3787-419c-afa0-72a8892b8b60","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"b2b44691-5048-4d17-a254-0346bf451baa","name":"b2b44691-5048-4d17-a254-0346bf451baa","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"24589d5c-b88d-4827-923f-ec967cf9be73","name":"24589d5c-b88d-4827-923f-ec967cf9be73","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"af3947b7-9b4a-4772-89ae-4c5fbeb2addc","name":"af3947b7-9b4a-4772-89ae-4c5fbeb2addc","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"d48d753f-bbf1-4967-894d-5d7c23f5c16d","name":"d48d753f-bbf1-4967-894d-5d7c23f5c16d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"4f9f3dd8-6abd-4d43-8588-e98d1b703138","name":"4f9f3dd8-6abd-4d43-8588-e98d1b703138","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"d35811e0-8a35-4516-9c17-df5e3a4e8d2c","name":"d35811e0-8a35-4516-9c17-df5e3a4e8d2c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -77,36 +77,16 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"fcaca781-a900-4083-84c4-7f2a75eac321","path":"sprites/spr_terminator_colors/spr_terminator_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"bfe7026a-90f3-4a8f-bb25-41c7fba9dc0b","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"808a543b-f546-43fd-8c27-2819a37091e4","path":"sprites/spr_terminator_colors/spr_terminator_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"0ae4b2fa-fb4f-4166-97c3-11383620af61","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"3b803a6b-b887-4855-bf65-c4b658859507","path":"sprites/spr_terminator_colors/spr_terminator_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"61289444-32c6-413b-9141-4c5f2e798dc3","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"ad1367f6-3787-419c-afa0-72a8892b8b60","path":"sprites/spr_terminator_colors/spr_terminator_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"1f2f4c8a-388a-4719-b904-8d7d0624cd3b","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"b2b44691-5048-4d17-a254-0346bf451baa","path":"sprites/spr_terminator_colors/spr_terminator_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"c818b3bc-0a48-4247-b3c7-e0a3051361a3","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"24589d5c-b88d-4827-923f-ec967cf9be73","path":"sprites/spr_terminator_colors/spr_terminator_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"ec550e3a-2927-4fcc-bfa9-65c11f93f979","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"af3947b7-9b4a-4772-89ae-4c5fbeb2addc","path":"sprites/spr_terminator_colors/spr_terminator_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"47150cad-f2df-4feb-bf6e-93583cafaae5","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"d48d753f-bbf1-4967-894d-5d7c23f5c16d","path":"sprites/spr_terminator_colors/spr_terminator_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"4c1fa22b-94ff-4bcb-a006-d1ace0cea132","IsCreationKey":false,"Key":7.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"4f9f3dd8-6abd-4d43-8588-e98d1b703138","path":"sprites/spr_terminator_colors/spr_terminator_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"1590e362-11fa-4259-b686-c4b8aaf76429","IsCreationKey":false,"Key":8.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"d35811e0-8a35-4516-9c17-df5e3a4e8d2c","path":"sprites/spr_terminator_colors/spr_terminator_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"37a23ee8-2217-45cf-856e-ccc2de0266ea","IsCreationKey":false,"Key":9.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"fcaca781-a900-4083-84c4-7f2a75eac321","path":"sprites/spr_terminator_colors/spr_terminator_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"bfe7026a-90f3-4a8f-bb25-41c7fba9dc0b","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"808a543b-f546-43fd-8c27-2819a37091e4","path":"sprites/spr_terminator_colors/spr_terminator_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"0ae4b2fa-fb4f-4166-97c3-11383620af61","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"3b803a6b-b887-4855-bf65-c4b658859507","path":"sprites/spr_terminator_colors/spr_terminator_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"61289444-32c6-413b-9141-4c5f2e798dc3","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"ad1367f6-3787-419c-afa0-72a8892b8b60","path":"sprites/spr_terminator_colors/spr_terminator_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"1f2f4c8a-388a-4719-b904-8d7d0624cd3b","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"b2b44691-5048-4d17-a254-0346bf451baa","path":"sprites/spr_terminator_colors/spr_terminator_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"c818b3bc-0a48-4247-b3c7-e0a3051361a3","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"24589d5c-b88d-4827-923f-ec967cf9be73","path":"sprites/spr_terminator_colors/spr_terminator_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"ec550e3a-2927-4fcc-bfa9-65c11f93f979","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"af3947b7-9b4a-4772-89ae-4c5fbeb2addc","path":"sprites/spr_terminator_colors/spr_terminator_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"47150cad-f2df-4feb-bf6e-93583cafaae5","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"d48d753f-bbf1-4967-894d-5d7c23f5c16d","path":"sprites/spr_terminator_colors/spr_terminator_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"4c1fa22b-94ff-4bcb-a006-d1ace0cea132","IsCreationKey":false,"Key":7.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"4f9f3dd8-6abd-4d43-8588-e98d1b703138","path":"sprites/spr_terminator_colors/spr_terminator_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"1590e362-11fa-4259-b686-c4b8aaf76429","IsCreationKey":false,"Key":8.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"d35811e0-8a35-4516-9c17-df5e3a4e8d2c","path":"sprites/spr_terminator_colors/spr_terminator_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"37a23ee8-2217-45cf-856e-ccc2de0266ea","IsCreationKey":false,"Key":9.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_terminator_complex_arm_hidden_left/spr_terminator_complex_arm_hidden_left.yy b/sprites/spr_terminator_complex_arm_hidden_left/spr_terminator_complex_arm_hidden_left.yy index f01c241b5a..d84f269ab1 100644 --- a/sprites/spr_terminator_complex_arm_hidden_left/spr_terminator_complex_arm_hidden_left.yy +++ b/sprites/spr_terminator_complex_arm_hidden_left/spr_terminator_complex_arm_hidden_left.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_terminator_complex_arm_hidden_left", "bboxMode":0, "bbox_bottom":111, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"213953e7-d335-4a83-a9b8-496335dda7be","name":"213953e7-d335-4a83-a9b8-496335dda7be","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"213953e7-d335-4a83-a9b8-496335dda7be","name":"213953e7-d335-4a83-a9b8-496335dda7be","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -69,9 +69,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"213953e7-d335-4a83-a9b8-496335dda7be","path":"sprites/spr_terminator_complex_arm_hidden_left/spr_terminator_complex_arm_hidden_left.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"cf842654-6328-43ef-8ca1-e08413ff4d7f","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"213953e7-d335-4a83-a9b8-496335dda7be","path":"sprites/spr_terminator_complex_arm_hidden_left/spr_terminator_complex_arm_hidden_left.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"cf842654-6328-43ef-8ca1-e08413ff4d7f","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_terminator_complex_arm_hidden_right/spr_terminator_complex_arm_hidden_right.yy b/sprites/spr_terminator_complex_arm_hidden_right/spr_terminator_complex_arm_hidden_right.yy index e23fd435ce..9477551e70 100644 --- a/sprites/spr_terminator_complex_arm_hidden_right/spr_terminator_complex_arm_hidden_right.yy +++ b/sprites/spr_terminator_complex_arm_hidden_right/spr_terminator_complex_arm_hidden_right.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_terminator_complex_arm_hidden_right", "bboxMode":0, "bbox_bottom":111, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"213953e7-d335-4a83-a9b8-496335dda7be","name":"213953e7-d335-4a83-a9b8-496335dda7be","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"213953e7-d335-4a83-a9b8-496335dda7be","name":"213953e7-d335-4a83-a9b8-496335dda7be","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -69,9 +69,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"213953e7-d335-4a83-a9b8-496335dda7be","path":"sprites/spr_terminator_complex_arm_hidden_right/spr_terminator_complex_arm_hidden_right.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"94ffb408-3cda-47a2-a578-63fe4f6cbb8c","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"213953e7-d335-4a83-a9b8-496335dda7be","path":"sprites/spr_terminator_complex_arm_hidden_right/spr_terminator_complex_arm_hidden_right.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"94ffb408-3cda-47a2-a578-63fe4f6cbb8c","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_terminator_complex_arms_upper_left/spr_terminator_complex_arms_upper_left.yy b/sprites/spr_terminator_complex_arms_upper_left/spr_terminator_complex_arms_upper_left.yy index dc09c6f962..cb639298fa 100644 --- a/sprites/spr_terminator_complex_arms_upper_left/spr_terminator_complex_arms_upper_left.yy +++ b/sprites/spr_terminator_complex_arms_upper_left/spr_terminator_complex_arms_upper_left.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_terminator_complex_arms_upper_left", "bboxMode":0, "bbox_bottom":119, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"26935846-dc87-49ea-95f0-8d93e784b6b3","name":"26935846-dc87-49ea-95f0-8d93e784b6b3","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"26935846-dc87-49ea-95f0-8d93e784b6b3","name":"26935846-dc87-49ea-95f0-8d93e784b6b3","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -69,9 +69,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"26935846-dc87-49ea-95f0-8d93e784b6b3","path":"sprites/spr_terminator_complex_arms_upper_left/spr_terminator_complex_arms_upper_left.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"164674aa-5a00-48ec-8be0-d61e90a3902e","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"26935846-dc87-49ea-95f0-8d93e784b6b3","path":"sprites/spr_terminator_complex_arms_upper_left/spr_terminator_complex_arms_upper_left.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"164674aa-5a00-48ec-8be0-d61e90a3902e","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_terminator_complex_arms_upper_right/spr_terminator_complex_arms_upper_right.yy b/sprites/spr_terminator_complex_arms_upper_right/spr_terminator_complex_arms_upper_right.yy index 813a485f4f..f2cb3f7f68 100644 --- a/sprites/spr_terminator_complex_arms_upper_right/spr_terminator_complex_arms_upper_right.yy +++ b/sprites/spr_terminator_complex_arms_upper_right/spr_terminator_complex_arms_upper_right.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_terminator_complex_arms_upper_right", "bboxMode":0, "bbox_bottom":119, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"26935846-dc87-49ea-95f0-8d93e784b6b3","name":"26935846-dc87-49ea-95f0-8d93e784b6b3","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"26935846-dc87-49ea-95f0-8d93e784b6b3","name":"26935846-dc87-49ea-95f0-8d93e784b6b3","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -69,9 +69,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"26935846-dc87-49ea-95f0-8d93e784b6b3","path":"sprites/spr_terminator_complex_arms_upper_right/spr_terminator_complex_arms_upper_right.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"3b4c9688-dfe5-4837-b62a-be5562d846e3","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"26935846-dc87-49ea-95f0-8d93e784b6b3","path":"sprites/spr_terminator_complex_arms_upper_right/spr_terminator_complex_arms_upper_right.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"3b4c9688-dfe5-4837-b62a-be5562d846e3","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_terminator_hands/spr_terminator_hands.yy b/sprites/spr_terminator_hands/spr_terminator_hands.yy index a6291464cf..e3f8761e1b 100644 --- a/sprites/spr_terminator_hands/spr_terminator_hands.yy +++ b/sprites/spr_terminator_hands/spr_terminator_hands.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_terminator_hands", "bboxMode":0, "bbox_bottom":170, @@ -12,18 +12,18 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"e7f88754-373e-4c98-b38b-01592d149b7f","name":"e7f88754-373e-4c98-b38b-01592d149b7f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"2d84098c-5069-4226-bf10-452f97e7bc36","name":"2d84098c-5069-4226-bf10-452f97e7bc36","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"c9be93fb-8a44-449a-9b86-8579b9a9f1b7","name":"c9be93fb-8a44-449a-9b86-8579b9a9f1b7","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"a27c954e-44c1-40a3-bcf2-5aacdd344336","name":"a27c954e-44c1-40a3-bcf2-5aacdd344336","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"1a8d1d83-1727-4de5-9a03-b0dbea5bd2ba","name":"1a8d1d83-1727-4de5-9a03-b0dbea5bd2ba","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"f69d1ae6-a10b-417d-8b85-05d7bc54cd18","name":"f69d1ae6-a10b-417d-8b85-05d7bc54cd18","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"f139d01c-05ed-4a48-a7c8-d338729ebbe1","name":"f139d01c-05ed-4a48-a7c8-d338729ebbe1","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"f25745b4-f637-4dc0-b247-5ed451b3d993","name":"f25745b4-f637-4dc0-b247-5ed451b3d993","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"5a8fd4c1-6d5a-456e-a53f-943fb521fa31","name":"5a8fd4c1-6d5a-456e-a53f-943fb521fa31","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"d226d814-c4b6-4e08-a965-e240faedfb37","name":"d226d814-c4b6-4e08-a965-e240faedfb37","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"261d6f69-5b51-4493-84f5-5d0a6adfe813","name":"261d6f69-5b51-4493-84f5-5d0a6adfe813","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"60a62808-3182-4af9-8fd4-270907296914","name":"60a62808-3182-4af9-8fd4-270907296914","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"e7f88754-373e-4c98-b38b-01592d149b7f","name":"e7f88754-373e-4c98-b38b-01592d149b7f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"2d84098c-5069-4226-bf10-452f97e7bc36","name":"2d84098c-5069-4226-bf10-452f97e7bc36","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"c9be93fb-8a44-449a-9b86-8579b9a9f1b7","name":"c9be93fb-8a44-449a-9b86-8579b9a9f1b7","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"a27c954e-44c1-40a3-bcf2-5aacdd344336","name":"a27c954e-44c1-40a3-bcf2-5aacdd344336","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"1a8d1d83-1727-4de5-9a03-b0dbea5bd2ba","name":"1a8d1d83-1727-4de5-9a03-b0dbea5bd2ba","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"f69d1ae6-a10b-417d-8b85-05d7bc54cd18","name":"f69d1ae6-a10b-417d-8b85-05d7bc54cd18","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"f139d01c-05ed-4a48-a7c8-d338729ebbe1","name":"f139d01c-05ed-4a48-a7c8-d338729ebbe1","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"f25745b4-f637-4dc0-b247-5ed451b3d993","name":"f25745b4-f637-4dc0-b247-5ed451b3d993","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"5a8fd4c1-6d5a-456e-a53f-943fb521fa31","name":"5a8fd4c1-6d5a-456e-a53f-943fb521fa31","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"d226d814-c4b6-4e08-a965-e240faedfb37","name":"d226d814-c4b6-4e08-a965-e240faedfb37","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"261d6f69-5b51-4493-84f5-5d0a6adfe813","name":"261d6f69-5b51-4493-84f5-5d0a6adfe813","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"60a62808-3182-4af9-8fd4-270907296914","name":"60a62808-3182-4af9-8fd4-270907296914","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -79,42 +79,18 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"e7f88754-373e-4c98-b38b-01592d149b7f","path":"sprites/spr_terminator_hands/spr_terminator_hands.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"ffaa650d-4969-43f0-9503-b08d22a74013","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"2d84098c-5069-4226-bf10-452f97e7bc36","path":"sprites/spr_terminator_hands/spr_terminator_hands.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"6d2a749b-6f7e-47c5-830f-569d5c64dc0f","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"c9be93fb-8a44-449a-9b86-8579b9a9f1b7","path":"sprites/spr_terminator_hands/spr_terminator_hands.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"c65edbe1-4212-4661-9faf-d1270db576cc","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"a27c954e-44c1-40a3-bcf2-5aacdd344336","path":"sprites/spr_terminator_hands/spr_terminator_hands.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"2964c64c-a1e2-4763-bba6-a3ef3f32e6e0","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"1a8d1d83-1727-4de5-9a03-b0dbea5bd2ba","path":"sprites/spr_terminator_hands/spr_terminator_hands.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"78f97633-afc9-4c33-856e-6659dbc7c6e5","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"f69d1ae6-a10b-417d-8b85-05d7bc54cd18","path":"sprites/spr_terminator_hands/spr_terminator_hands.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"7c7bd0a8-2f7e-4d98-ac98-7647b7d675f7","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"f139d01c-05ed-4a48-a7c8-d338729ebbe1","path":"sprites/spr_terminator_hands/spr_terminator_hands.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"a944bf98-a036-4ecc-afd7-1987e62f78f3","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"f25745b4-f637-4dc0-b247-5ed451b3d993","path":"sprites/spr_terminator_hands/spr_terminator_hands.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"653d9ae6-2cdb-411f-b2fd-47e04abfe186","IsCreationKey":false,"Key":7.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"5a8fd4c1-6d5a-456e-a53f-943fb521fa31","path":"sprites/spr_terminator_hands/spr_terminator_hands.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"67ab9298-07a3-42f3-a2d7-5a59455df6b2","IsCreationKey":false,"Key":8.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"d226d814-c4b6-4e08-a965-e240faedfb37","path":"sprites/spr_terminator_hands/spr_terminator_hands.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"cc7a3a36-b779-40d6-b240-3a38616306ca","IsCreationKey":false,"Key":9.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"261d6f69-5b51-4493-84f5-5d0a6adfe813","path":"sprites/spr_terminator_hands/spr_terminator_hands.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"de1cf54a-f77d-4692-9d6e-a84c4af4b970","IsCreationKey":false,"Key":10.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"60a62808-3182-4af9-8fd4-270907296914","path":"sprites/spr_terminator_hands/spr_terminator_hands.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"29910d4b-d509-441b-ac03-d6940e4c88e3","IsCreationKey":false,"Key":11.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"e7f88754-373e-4c98-b38b-01592d149b7f","path":"sprites/spr_terminator_hands/spr_terminator_hands.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"ffaa650d-4969-43f0-9503-b08d22a74013","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"2d84098c-5069-4226-bf10-452f97e7bc36","path":"sprites/spr_terminator_hands/spr_terminator_hands.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"6d2a749b-6f7e-47c5-830f-569d5c64dc0f","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"c9be93fb-8a44-449a-9b86-8579b9a9f1b7","path":"sprites/spr_terminator_hands/spr_terminator_hands.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"c65edbe1-4212-4661-9faf-d1270db576cc","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"a27c954e-44c1-40a3-bcf2-5aacdd344336","path":"sprites/spr_terminator_hands/spr_terminator_hands.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"2964c64c-a1e2-4763-bba6-a3ef3f32e6e0","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"1a8d1d83-1727-4de5-9a03-b0dbea5bd2ba","path":"sprites/spr_terminator_hands/spr_terminator_hands.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"78f97633-afc9-4c33-856e-6659dbc7c6e5","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"f69d1ae6-a10b-417d-8b85-05d7bc54cd18","path":"sprites/spr_terminator_hands/spr_terminator_hands.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"7c7bd0a8-2f7e-4d98-ac98-7647b7d675f7","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"f139d01c-05ed-4a48-a7c8-d338729ebbe1","path":"sprites/spr_terminator_hands/spr_terminator_hands.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"a944bf98-a036-4ecc-afd7-1987e62f78f3","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"f25745b4-f637-4dc0-b247-5ed451b3d993","path":"sprites/spr_terminator_hands/spr_terminator_hands.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"653d9ae6-2cdb-411f-b2fd-47e04abfe186","IsCreationKey":false,"Key":7.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"5a8fd4c1-6d5a-456e-a53f-943fb521fa31","path":"sprites/spr_terminator_hands/spr_terminator_hands.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"67ab9298-07a3-42f3-a2d7-5a59455df6b2","IsCreationKey":false,"Key":8.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"d226d814-c4b6-4e08-a965-e240faedfb37","path":"sprites/spr_terminator_hands/spr_terminator_hands.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"cc7a3a36-b779-40d6-b240-3a38616306ca","IsCreationKey":false,"Key":9.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"261d6f69-5b51-4493-84f5-5d0a6adfe813","path":"sprites/spr_terminator_hands/spr_terminator_hands.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"de1cf54a-f77d-4692-9d6e-a84c4af4b970","IsCreationKey":false,"Key":10.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"60a62808-3182-4af9-8fd4-270907296914","path":"sprites/spr_terminator_hands/spr_terminator_hands.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"29910d4b-d509-441b-ac03-d6940e4c88e3","IsCreationKey":false,"Key":11.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_terminator_laurel/spr_terminator_laurel.yy b/sprites/spr_terminator_laurel/spr_terminator_laurel.yy index 50e954824c..d6d59991e4 100644 --- a/sprites/spr_terminator_laurel/spr_terminator_laurel.yy +++ b/sprites/spr_terminator_laurel/spr_terminator_laurel.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_terminator_laurel", "bboxMode":0, "bbox_bottom":57, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"61531cde-cd44-4806-ae39-3c63f51d65de","name":"61531cde-cd44-4806-ae39-3c63f51d65de","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"61531cde-cd44-4806-ae39-3c63f51d65de","name":"61531cde-cd44-4806-ae39-3c63f51d65de","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "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_terminator_metal_tabbard/spr_terminator_metal_tabbard.yy b/sprites/spr_terminator_metal_tabbard/spr_terminator_metal_tabbard.yy index 594cb01199..a7b34a35d9 100644 --- a/sprites/spr_terminator_metal_tabbard/spr_terminator_metal_tabbard.yy +++ b/sprites/spr_terminator_metal_tabbard/spr_terminator_metal_tabbard.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_terminator_metal_tabbard", "bboxMode":0, "bbox_bottom":242, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"2d32fdf3-ec18-40a7-85c8-10ec10ae01b8","name":"2d32fdf3-ec18-40a7-85c8-10ec10ae01b8","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"2d32fdf3-ec18-40a7-85c8-10ec10ae01b8","name":"2d32fdf3-ec18-40a7-85c8-10ec10ae01b8","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"2d32fdf3-ec18-40a7-85c8-10ec10ae01b8","path":"sprites/spr_terminator_metal_tabbard/spr_terminator_metal_tabbard.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"1b74fa8a-8bb3-4e09-9855-486e46b09445","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"2d32fdf3-ec18-40a7-85c8-10ec10ae01b8","path":"sprites/spr_terminator_metal_tabbard/spr_terminator_metal_tabbard.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"1b74fa8a-8bb3-4e09-9855-486e46b09445","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_tooltip1/spr_tooltip1.yy b/sprites/spr_tooltip1/spr_tooltip1.yy index 73347d0f66..b4f5bb6cd9 100644 --- a/sprites/spr_tooltip1/spr_tooltip1.yy +++ b/sprites/spr_tooltip1/spr_tooltip1.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_tooltip1", "bboxMode":0, "bbox_bottom":131, @@ -12,8 +12,8 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"5f227bbe-a460-4056-9458-870160c7d5c8","name":"5f227bbe-a460-4056-9458-870160c7d5c8","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"db95f5e8-ecd5-41bb-814d-1689bdd311ae","name":"db95f5e8-ecd5-41bb-814d-1689bdd311ae","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"5f227bbe-a460-4056-9458-870160c7d5c8","name":"5f227bbe-a460-4056-9458-870160c7d5c8","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"db95f5e8-ecd5-41bb-814d-1689bdd311ae","name":"db95f5e8-ecd5-41bb-814d-1689bdd311ae","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -69,12 +69,8 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"5f227bbe-a460-4056-9458-870160c7d5c8","path":"sprites/spr_tooltip1/spr_tooltip1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"4d4cb579-532d-443e-a19e-68eccd123a6b","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"db95f5e8-ecd5-41bb-814d-1689bdd311ae","path":"sprites/spr_tooltip1/spr_tooltip1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"89661a80-ab67-4782-a17c-0375bbaf582d","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"5f227bbe-a460-4056-9458-870160c7d5c8","path":"sprites/spr_tooltip1/spr_tooltip1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"4d4cb579-532d-443e-a19e-68eccd123a6b","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"db95f5e8-ecd5-41bb-814d-1689bdd311ae","path":"sprites/spr_tooltip1/spr_tooltip1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"89661a80-ab67-4782-a17c-0375bbaf582d","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_torpedo/spr_torpedo.yy b/sprites/spr_torpedo/spr_torpedo.yy index ec01c2c2b5..a524800ffa 100644 --- a/sprites/spr_torpedo/spr_torpedo.yy +++ b/sprites/spr_torpedo/spr_torpedo.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_torpedo", "bboxMode":0, "bbox_bottom":7, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"6871a763-b22c-4883-89d4-c6acba0cf229","name":"6871a763-b22c-4883-89d4-c6acba0cf229","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"6871a763-b22c-4883-89d4-c6acba0cf229","name":"6871a763-b22c-4883-89d4-c6acba0cf229","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"6871a763-b22c-4883-89d4-c6acba0cf229","path":"sprites/spr_torpedo/spr_torpedo.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"3db329f9-e41b-4f3a-81f9-53caee66e1f7","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"6871a763-b22c-4883-89d4-c6acba0cf229","path":"sprites/spr_torpedo/spr_torpedo.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"3db329f9-e41b-4f3a-81f9-53caee66e1f7","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":{ diff --git a/sprites/spr_torpedo_board/spr_torpedo_board.yy b/sprites/spr_torpedo_board/spr_torpedo_board.yy index 9880d05dd2..31f08c49fd 100644 --- a/sprites/spr_torpedo_board/spr_torpedo_board.yy +++ b/sprites/spr_torpedo_board/spr_torpedo_board.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_torpedo_board", "bboxMode":0, "bbox_bottom":11, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"dfa16445-7acd-4ae3-8091-96d05ce59546","name":"dfa16445-7acd-4ae3-8091-96d05ce59546","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"dfa16445-7acd-4ae3-8091-96d05ce59546","name":"dfa16445-7acd-4ae3-8091-96d05ce59546","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"dfa16445-7acd-4ae3-8091-96d05ce59546","path":"sprites/spr_torpedo_board/spr_torpedo_board.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"13fc9487-2cf1-4cc6-b4fe-155e29ad4ca9","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"dfa16445-7acd-4ae3-8091-96d05ce59546","path":"sprites/spr_torpedo_board/spr_torpedo_board.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"13fc9487-2cf1-4cc6-b4fe-155e29ad4ca9","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":{ diff --git a/sprites/spr_ui_but_1/spr_ui_but_1.yy b/sprites/spr_ui_but_1/spr_ui_but_1.yy index 71432ef41d..b4627f3501 100644 --- a/sprites/spr_ui_but_1/spr_ui_but_1.yy +++ b/sprites/spr_ui_but_1/spr_ui_but_1.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_ui_but_1", "bboxMode":0, "bbox_bottom":42, @@ -12,31 +12,31 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"adada15b-9e9b-4a92-88b9-7418b297a89f","name":"adada15b-9e9b-4a92-88b9-7418b297a89f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"607f6aa9-11a4-4a5a-9e6c-dff591594cd6","name":"607f6aa9-11a4-4a5a-9e6c-dff591594cd6","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"54c75ea1-53a2-4903-b512-cadd4950cb27","name":"54c75ea1-53a2-4903-b512-cadd4950cb27","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"3af7d883-39a3-415f-bd13-2bda3e760c66","name":"3af7d883-39a3-415f-bd13-2bda3e760c66","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"5469ed7b-3506-4131-a1ff-23d0901c9dba","name":"5469ed7b-3506-4131-a1ff-23d0901c9dba","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"7215913e-e4f6-4660-b2a4-3e3cd3232ce3","name":"7215913e-e4f6-4660-b2a4-3e3cd3232ce3","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"a7baf71a-58d9-463d-830f-bdee29d45ff0","name":"a7baf71a-58d9-463d-830f-bdee29d45ff0","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"f4999508-ec82-4b20-bb80-c76f281711fb","name":"f4999508-ec82-4b20-bb80-c76f281711fb","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"0a8768b0-ccc3-49c6-80b1-0fd1cdd28b7b","name":"0a8768b0-ccc3-49c6-80b1-0fd1cdd28b7b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"21434961-aaa1-416e-8888-0757f0f6ddae","name":"21434961-aaa1-416e-8888-0757f0f6ddae","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"d4b8a203-a6df-4bd2-a69a-94de0dd85370","name":"d4b8a203-a6df-4bd2-a69a-94de0dd85370","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"97d12877-7427-4885-a031-30f4f30017be","name":"97d12877-7427-4885-a031-30f4f30017be","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"e128c96e-d1ed-4894-a53a-aae834b9d903","name":"e128c96e-d1ed-4894-a53a-aae834b9d903","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"9909c3c8-1249-421a-9f37-e54a6276e0df","name":"9909c3c8-1249-421a-9f37-e54a6276e0df","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"68b34ed1-1f6a-4cd6-86db-96eca4842cca","name":"68b34ed1-1f6a-4cd6-86db-96eca4842cca","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"1ec4fd85-b79f-4953-9e24-28a4a0f913e9","name":"1ec4fd85-b79f-4953-9e24-28a4a0f913e9","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"b0fc16c7-ffd1-49e3-b7d6-5a891a3e3bc2","name":"b0fc16c7-ffd1-49e3-b7d6-5a891a3e3bc2","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"d23878c9-1647-4718-944c-21aa313bc7e1","name":"d23878c9-1647-4718-944c-21aa313bc7e1","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"40ba564b-330b-4ff2-afd2-8434cc00fd83","name":"40ba564b-330b-4ff2-afd2-8434cc00fd83","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"e0fef5db-974e-492e-8780-db5188a55a08","name":"e0fef5db-974e-492e-8780-db5188a55a08","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"7962988f-ba97-4ab0-854e-014da9ad5acd","name":"7962988f-ba97-4ab0-854e-014da9ad5acd","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"b7515219-dffa-4275-bb96-170d3f9c727c","name":"b7515219-dffa-4275-bb96-170d3f9c727c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"d003a3a0-d06b-4fe3-9f46-e6c394243fee","name":"d003a3a0-d06b-4fe3-9f46-e6c394243fee","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"1628e434-61cb-4106-8789-9f3c47db7a90","name":"1628e434-61cb-4106-8789-9f3c47db7a90","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"5a5c683d-34b6-459b-bfe7-7bfc415b529b","name":"5a5c683d-34b6-459b-bfe7-7bfc415b529b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"adada15b-9e9b-4a92-88b9-7418b297a89f","name":"adada15b-9e9b-4a92-88b9-7418b297a89f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"607f6aa9-11a4-4a5a-9e6c-dff591594cd6","name":"607f6aa9-11a4-4a5a-9e6c-dff591594cd6","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"54c75ea1-53a2-4903-b512-cadd4950cb27","name":"54c75ea1-53a2-4903-b512-cadd4950cb27","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"3af7d883-39a3-415f-bd13-2bda3e760c66","name":"3af7d883-39a3-415f-bd13-2bda3e760c66","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"5469ed7b-3506-4131-a1ff-23d0901c9dba","name":"5469ed7b-3506-4131-a1ff-23d0901c9dba","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"7215913e-e4f6-4660-b2a4-3e3cd3232ce3","name":"7215913e-e4f6-4660-b2a4-3e3cd3232ce3","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"a7baf71a-58d9-463d-830f-bdee29d45ff0","name":"a7baf71a-58d9-463d-830f-bdee29d45ff0","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"f4999508-ec82-4b20-bb80-c76f281711fb","name":"f4999508-ec82-4b20-bb80-c76f281711fb","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"0a8768b0-ccc3-49c6-80b1-0fd1cdd28b7b","name":"0a8768b0-ccc3-49c6-80b1-0fd1cdd28b7b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"21434961-aaa1-416e-8888-0757f0f6ddae","name":"21434961-aaa1-416e-8888-0757f0f6ddae","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"d4b8a203-a6df-4bd2-a69a-94de0dd85370","name":"d4b8a203-a6df-4bd2-a69a-94de0dd85370","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"97d12877-7427-4885-a031-30f4f30017be","name":"97d12877-7427-4885-a031-30f4f30017be","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"e128c96e-d1ed-4894-a53a-aae834b9d903","name":"e128c96e-d1ed-4894-a53a-aae834b9d903","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"9909c3c8-1249-421a-9f37-e54a6276e0df","name":"9909c3c8-1249-421a-9f37-e54a6276e0df","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"68b34ed1-1f6a-4cd6-86db-96eca4842cca","name":"68b34ed1-1f6a-4cd6-86db-96eca4842cca","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"1ec4fd85-b79f-4953-9e24-28a4a0f913e9","name":"1ec4fd85-b79f-4953-9e24-28a4a0f913e9","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"b0fc16c7-ffd1-49e3-b7d6-5a891a3e3bc2","name":"b0fc16c7-ffd1-49e3-b7d6-5a891a3e3bc2","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"d23878c9-1647-4718-944c-21aa313bc7e1","name":"d23878c9-1647-4718-944c-21aa313bc7e1","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"40ba564b-330b-4ff2-afd2-8434cc00fd83","name":"40ba564b-330b-4ff2-afd2-8434cc00fd83","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"e0fef5db-974e-492e-8780-db5188a55a08","name":"e0fef5db-974e-492e-8780-db5188a55a08","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"7962988f-ba97-4ab0-854e-014da9ad5acd","name":"7962988f-ba97-4ab0-854e-014da9ad5acd","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"b7515219-dffa-4275-bb96-170d3f9c727c","name":"b7515219-dffa-4275-bb96-170d3f9c727c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"d003a3a0-d06b-4fe3-9f46-e6c394243fee","name":"d003a3a0-d06b-4fe3-9f46-e6c394243fee","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"1628e434-61cb-4106-8789-9f3c47db7a90","name":"1628e434-61cb-4106-8789-9f3c47db7a90","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"5a5c683d-34b6-459b-bfe7-7bfc415b529b","name":"5a5c683d-34b6-459b-bfe7-7bfc415b529b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -92,81 +92,31 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"adada15b-9e9b-4a92-88b9-7418b297a89f","path":"sprites/spr_ui_but_1/spr_ui_but_1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"080ebb22-a2ff-4ebe-a0d4-6043111e28ed","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"607f6aa9-11a4-4a5a-9e6c-dff591594cd6","path":"sprites/spr_ui_but_1/spr_ui_but_1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"3c124125-0489-4f4f-b8c4-71ff09d9b1c4","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"54c75ea1-53a2-4903-b512-cadd4950cb27","path":"sprites/spr_ui_but_1/spr_ui_but_1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"5317e36a-0b7c-42f7-b0c9-06cf928260e4","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"3af7d883-39a3-415f-bd13-2bda3e760c66","path":"sprites/spr_ui_but_1/spr_ui_but_1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"c80677e6-1d14-441c-b6d2-e74a13309d69","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"5469ed7b-3506-4131-a1ff-23d0901c9dba","path":"sprites/spr_ui_but_1/spr_ui_but_1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"387a500e-d698-46ae-bcc4-04a5a69fda99","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"7215913e-e4f6-4660-b2a4-3e3cd3232ce3","path":"sprites/spr_ui_but_1/spr_ui_but_1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"15c75a0f-f0f2-40b0-8811-999fe25f18a4","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"a7baf71a-58d9-463d-830f-bdee29d45ff0","path":"sprites/spr_ui_but_1/spr_ui_but_1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"4fcd619f-8e03-4075-809d-60865a3596c5","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"f4999508-ec82-4b20-bb80-c76f281711fb","path":"sprites/spr_ui_but_1/spr_ui_but_1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"6d7c65fe-a6f0-4873-b563-03f38fd2f0eb","IsCreationKey":false,"Key":7.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"0a8768b0-ccc3-49c6-80b1-0fd1cdd28b7b","path":"sprites/spr_ui_but_1/spr_ui_but_1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"19fd6272-d87c-4085-b34c-15c903ffbf03","IsCreationKey":false,"Key":8.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"21434961-aaa1-416e-8888-0757f0f6ddae","path":"sprites/spr_ui_but_1/spr_ui_but_1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"ef51cec7-852f-476f-97ab-c9d03f9e9302","IsCreationKey":false,"Key":9.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"d4b8a203-a6df-4bd2-a69a-94de0dd85370","path":"sprites/spr_ui_but_1/spr_ui_but_1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"6a9cd7e9-eccc-4434-bf6e-fe014ef69ece","IsCreationKey":false,"Key":10.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"97d12877-7427-4885-a031-30f4f30017be","path":"sprites/spr_ui_but_1/spr_ui_but_1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"0a01148f-6b67-4401-95ff-f995408bc13f","IsCreationKey":false,"Key":11.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"e128c96e-d1ed-4894-a53a-aae834b9d903","path":"sprites/spr_ui_but_1/spr_ui_but_1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"3a34b877-55d0-4c94-a5a2-151beac5369d","IsCreationKey":false,"Key":12.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"9909c3c8-1249-421a-9f37-e54a6276e0df","path":"sprites/spr_ui_but_1/spr_ui_but_1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"ff37e96d-ca69-4ad8-84ef-6b5d57497e71","IsCreationKey":false,"Key":13.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"68b34ed1-1f6a-4cd6-86db-96eca4842cca","path":"sprites/spr_ui_but_1/spr_ui_but_1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"d9e8f02a-6474-4434-ab59-3a08395d9477","IsCreationKey":false,"Key":14.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"1ec4fd85-b79f-4953-9e24-28a4a0f913e9","path":"sprites/spr_ui_but_1/spr_ui_but_1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"baab1585-3631-442d-96a9-c5fe07c43fd5","IsCreationKey":false,"Key":15.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"b0fc16c7-ffd1-49e3-b7d6-5a891a3e3bc2","path":"sprites/spr_ui_but_1/spr_ui_but_1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"96085a69-cce7-4af0-8f77-2d805ebe24e8","IsCreationKey":false,"Key":16.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"d23878c9-1647-4718-944c-21aa313bc7e1","path":"sprites/spr_ui_but_1/spr_ui_but_1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"f448b033-1869-4141-8113-339a55a01fe7","IsCreationKey":false,"Key":17.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"40ba564b-330b-4ff2-afd2-8434cc00fd83","path":"sprites/spr_ui_but_1/spr_ui_but_1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"39eafe35-924a-4608-8d94-e2c82159a660","IsCreationKey":false,"Key":18.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"e0fef5db-974e-492e-8780-db5188a55a08","path":"sprites/spr_ui_but_1/spr_ui_but_1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"4c7f71d9-9d4a-4de8-8ab3-34557dc0fcef","IsCreationKey":false,"Key":19.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"7962988f-ba97-4ab0-854e-014da9ad5acd","path":"sprites/spr_ui_but_1/spr_ui_but_1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"3125b75e-2216-418d-913e-3ad58c1c3647","IsCreationKey":false,"Key":20.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"b7515219-dffa-4275-bb96-170d3f9c727c","path":"sprites/spr_ui_but_1/spr_ui_but_1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"0d222029-c724-4c2c-9965-0d1af3e85e3a","IsCreationKey":false,"Key":21.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"d003a3a0-d06b-4fe3-9f46-e6c394243fee","path":"sprites/spr_ui_but_1/spr_ui_but_1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"97644162-9a37-471f-8679-8e87deac23db","IsCreationKey":false,"Key":22.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"1628e434-61cb-4106-8789-9f3c47db7a90","path":"sprites/spr_ui_but_1/spr_ui_but_1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"89472afa-526e-45a2-b2ec-777729447035","IsCreationKey":false,"Key":23.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"5a5c683d-34b6-459b-bfe7-7bfc415b529b","path":"sprites/spr_ui_but_1/spr_ui_but_1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"9f422d94-9d62-4e97-902f-10ebdf436c36","IsCreationKey":false,"Key":24.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"adada15b-9e9b-4a92-88b9-7418b297a89f","path":"sprites/spr_ui_but_1/spr_ui_but_1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"080ebb22-a2ff-4ebe-a0d4-6043111e28ed","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"607f6aa9-11a4-4a5a-9e6c-dff591594cd6","path":"sprites/spr_ui_but_1/spr_ui_but_1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"3c124125-0489-4f4f-b8c4-71ff09d9b1c4","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"54c75ea1-53a2-4903-b512-cadd4950cb27","path":"sprites/spr_ui_but_1/spr_ui_but_1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"5317e36a-0b7c-42f7-b0c9-06cf928260e4","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"3af7d883-39a3-415f-bd13-2bda3e760c66","path":"sprites/spr_ui_but_1/spr_ui_but_1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"c80677e6-1d14-441c-b6d2-e74a13309d69","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"5469ed7b-3506-4131-a1ff-23d0901c9dba","path":"sprites/spr_ui_but_1/spr_ui_but_1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"387a500e-d698-46ae-bcc4-04a5a69fda99","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"7215913e-e4f6-4660-b2a4-3e3cd3232ce3","path":"sprites/spr_ui_but_1/spr_ui_but_1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"15c75a0f-f0f2-40b0-8811-999fe25f18a4","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"a7baf71a-58d9-463d-830f-bdee29d45ff0","path":"sprites/spr_ui_but_1/spr_ui_but_1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"4fcd619f-8e03-4075-809d-60865a3596c5","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"f4999508-ec82-4b20-bb80-c76f281711fb","path":"sprites/spr_ui_but_1/spr_ui_but_1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"6d7c65fe-a6f0-4873-b563-03f38fd2f0eb","IsCreationKey":false,"Key":7.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"0a8768b0-ccc3-49c6-80b1-0fd1cdd28b7b","path":"sprites/spr_ui_but_1/spr_ui_but_1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"19fd6272-d87c-4085-b34c-15c903ffbf03","IsCreationKey":false,"Key":8.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"21434961-aaa1-416e-8888-0757f0f6ddae","path":"sprites/spr_ui_but_1/spr_ui_but_1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"ef51cec7-852f-476f-97ab-c9d03f9e9302","IsCreationKey":false,"Key":9.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"d4b8a203-a6df-4bd2-a69a-94de0dd85370","path":"sprites/spr_ui_but_1/spr_ui_but_1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"6a9cd7e9-eccc-4434-bf6e-fe014ef69ece","IsCreationKey":false,"Key":10.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"97d12877-7427-4885-a031-30f4f30017be","path":"sprites/spr_ui_but_1/spr_ui_but_1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"0a01148f-6b67-4401-95ff-f995408bc13f","IsCreationKey":false,"Key":11.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"e128c96e-d1ed-4894-a53a-aae834b9d903","path":"sprites/spr_ui_but_1/spr_ui_but_1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"3a34b877-55d0-4c94-a5a2-151beac5369d","IsCreationKey":false,"Key":12.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"9909c3c8-1249-421a-9f37-e54a6276e0df","path":"sprites/spr_ui_but_1/spr_ui_but_1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"ff37e96d-ca69-4ad8-84ef-6b5d57497e71","IsCreationKey":false,"Key":13.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"68b34ed1-1f6a-4cd6-86db-96eca4842cca","path":"sprites/spr_ui_but_1/spr_ui_but_1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"d9e8f02a-6474-4434-ab59-3a08395d9477","IsCreationKey":false,"Key":14.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"1ec4fd85-b79f-4953-9e24-28a4a0f913e9","path":"sprites/spr_ui_but_1/spr_ui_but_1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"baab1585-3631-442d-96a9-c5fe07c43fd5","IsCreationKey":false,"Key":15.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"b0fc16c7-ffd1-49e3-b7d6-5a891a3e3bc2","path":"sprites/spr_ui_but_1/spr_ui_but_1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"96085a69-cce7-4af0-8f77-2d805ebe24e8","IsCreationKey":false,"Key":16.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"d23878c9-1647-4718-944c-21aa313bc7e1","path":"sprites/spr_ui_but_1/spr_ui_but_1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"f448b033-1869-4141-8113-339a55a01fe7","IsCreationKey":false,"Key":17.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"40ba564b-330b-4ff2-afd2-8434cc00fd83","path":"sprites/spr_ui_but_1/spr_ui_but_1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"39eafe35-924a-4608-8d94-e2c82159a660","IsCreationKey":false,"Key":18.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"e0fef5db-974e-492e-8780-db5188a55a08","path":"sprites/spr_ui_but_1/spr_ui_but_1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"4c7f71d9-9d4a-4de8-8ab3-34557dc0fcef","IsCreationKey":false,"Key":19.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"7962988f-ba97-4ab0-854e-014da9ad5acd","path":"sprites/spr_ui_but_1/spr_ui_but_1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"3125b75e-2216-418d-913e-3ad58c1c3647","IsCreationKey":false,"Key":20.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"b7515219-dffa-4275-bb96-170d3f9c727c","path":"sprites/spr_ui_but_1/spr_ui_but_1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"0d222029-c724-4c2c-9965-0d1af3e85e3a","IsCreationKey":false,"Key":21.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"d003a3a0-d06b-4fe3-9f46-e6c394243fee","path":"sprites/spr_ui_but_1/spr_ui_but_1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"97644162-9a37-471f-8679-8e87deac23db","IsCreationKey":false,"Key":22.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"1628e434-61cb-4106-8789-9f3c47db7a90","path":"sprites/spr_ui_but_1/spr_ui_but_1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"89472afa-526e-45a2-b2ec-777729447035","IsCreationKey":false,"Key":23.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"5a5c683d-34b6-459b-bfe7-7bfc415b529b","path":"sprites/spr_ui_but_1/spr_ui_but_1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"9f422d94-9d62-4e97-902f-10ebdf436c36","IsCreationKey":false,"Key":24.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_ui_but_2/spr_ui_but_2.yy b/sprites/spr_ui_but_2/spr_ui_but_2.yy index 44132ab460..15c27c0740 100644 --- a/sprites/spr_ui_but_2/spr_ui_but_2.yy +++ b/sprites/spr_ui_but_2/spr_ui_but_2.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_ui_but_2", "bboxMode":0, "bbox_bottom":42, @@ -12,31 +12,31 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"cccd3204-9ed5-43d4-ba20-c31e029caa9f","name":"cccd3204-9ed5-43d4-ba20-c31e029caa9f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"4ea10bc0-d23c-4423-98d6-c7f84609f712","name":"4ea10bc0-d23c-4423-98d6-c7f84609f712","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"0aa9b148-e83f-47ac-a6e1-62e8c14fc071","name":"0aa9b148-e83f-47ac-a6e1-62e8c14fc071","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"c0cce997-da2e-43c1-89ee-8e6eca9549c3","name":"c0cce997-da2e-43c1-89ee-8e6eca9549c3","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"37bcdb41-c3a2-4dae-9cb4-91f598a14ca5","name":"37bcdb41-c3a2-4dae-9cb4-91f598a14ca5","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"1ee7b0d9-9f05-4351-8fc3-5011036b92d3","name":"1ee7b0d9-9f05-4351-8fc3-5011036b92d3","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"8934fb74-73bd-475b-861c-676b2d824e46","name":"8934fb74-73bd-475b-861c-676b2d824e46","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"d3df87c9-95ec-4c6e-b4bc-581c5d32476c","name":"d3df87c9-95ec-4c6e-b4bc-581c5d32476c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"d6f5378a-34c2-4d27-8d99-cb731dd9a138","name":"d6f5378a-34c2-4d27-8d99-cb731dd9a138","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"d5c7d655-ff6c-42ed-83fb-53aa2a9f67f6","name":"d5c7d655-ff6c-42ed-83fb-53aa2a9f67f6","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"7961d161-e69c-4ac0-a866-ab2a984bde10","name":"7961d161-e69c-4ac0-a866-ab2a984bde10","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"46efdad8-ef3b-41aa-8215-0108e296e3a2","name":"46efdad8-ef3b-41aa-8215-0108e296e3a2","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"571878b9-29aa-47d6-b8df-932284191e73","name":"571878b9-29aa-47d6-b8df-932284191e73","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"3eca5a29-d1cd-4ab2-9d95-7ac9cdde93ed","name":"3eca5a29-d1cd-4ab2-9d95-7ac9cdde93ed","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"9983ba7c-f2d3-4251-b544-963e79996dde","name":"9983ba7c-f2d3-4251-b544-963e79996dde","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"4ea5fc36-4111-4fe7-abfa-2738146e71e7","name":"4ea5fc36-4111-4fe7-abfa-2738146e71e7","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"3e144b78-28e5-48e6-8de3-912b34723b01","name":"3e144b78-28e5-48e6-8de3-912b34723b01","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"eded6056-0881-483a-88f3-7b96675b4b25","name":"eded6056-0881-483a-88f3-7b96675b4b25","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"75fc782d-8ba7-40cf-96b6-df6c376b9e5b","name":"75fc782d-8ba7-40cf-96b6-df6c376b9e5b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"57217e6c-a521-4c47-bc25-445da6c139ad","name":"57217e6c-a521-4c47-bc25-445da6c139ad","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"3975b47a-b5f7-4655-b87f-befe9792e54a","name":"3975b47a-b5f7-4655-b87f-befe9792e54a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"b31b0fb5-db84-404b-a44d-b79c6335e558","name":"b31b0fb5-db84-404b-a44d-b79c6335e558","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"0d7ab904-07a4-4ac6-b92f-2f317b5b0577","name":"0d7ab904-07a4-4ac6-b92f-2f317b5b0577","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"ea02ef7e-060f-406f-8dc2-c4eb992d6094","name":"ea02ef7e-060f-406f-8dc2-c4eb992d6094","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"e6f427d2-b9c5-4a15-beb5-1e4bf54cf93d","name":"e6f427d2-b9c5-4a15-beb5-1e4bf54cf93d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"cccd3204-9ed5-43d4-ba20-c31e029caa9f","name":"cccd3204-9ed5-43d4-ba20-c31e029caa9f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"4ea10bc0-d23c-4423-98d6-c7f84609f712","name":"4ea10bc0-d23c-4423-98d6-c7f84609f712","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"0aa9b148-e83f-47ac-a6e1-62e8c14fc071","name":"0aa9b148-e83f-47ac-a6e1-62e8c14fc071","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"c0cce997-da2e-43c1-89ee-8e6eca9549c3","name":"c0cce997-da2e-43c1-89ee-8e6eca9549c3","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"37bcdb41-c3a2-4dae-9cb4-91f598a14ca5","name":"37bcdb41-c3a2-4dae-9cb4-91f598a14ca5","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"1ee7b0d9-9f05-4351-8fc3-5011036b92d3","name":"1ee7b0d9-9f05-4351-8fc3-5011036b92d3","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"8934fb74-73bd-475b-861c-676b2d824e46","name":"8934fb74-73bd-475b-861c-676b2d824e46","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"d3df87c9-95ec-4c6e-b4bc-581c5d32476c","name":"d3df87c9-95ec-4c6e-b4bc-581c5d32476c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"d6f5378a-34c2-4d27-8d99-cb731dd9a138","name":"d6f5378a-34c2-4d27-8d99-cb731dd9a138","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"d5c7d655-ff6c-42ed-83fb-53aa2a9f67f6","name":"d5c7d655-ff6c-42ed-83fb-53aa2a9f67f6","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"7961d161-e69c-4ac0-a866-ab2a984bde10","name":"7961d161-e69c-4ac0-a866-ab2a984bde10","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"46efdad8-ef3b-41aa-8215-0108e296e3a2","name":"46efdad8-ef3b-41aa-8215-0108e296e3a2","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"571878b9-29aa-47d6-b8df-932284191e73","name":"571878b9-29aa-47d6-b8df-932284191e73","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"3eca5a29-d1cd-4ab2-9d95-7ac9cdde93ed","name":"3eca5a29-d1cd-4ab2-9d95-7ac9cdde93ed","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"9983ba7c-f2d3-4251-b544-963e79996dde","name":"9983ba7c-f2d3-4251-b544-963e79996dde","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"4ea5fc36-4111-4fe7-abfa-2738146e71e7","name":"4ea5fc36-4111-4fe7-abfa-2738146e71e7","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"3e144b78-28e5-48e6-8de3-912b34723b01","name":"3e144b78-28e5-48e6-8de3-912b34723b01","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"eded6056-0881-483a-88f3-7b96675b4b25","name":"eded6056-0881-483a-88f3-7b96675b4b25","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"75fc782d-8ba7-40cf-96b6-df6c376b9e5b","name":"75fc782d-8ba7-40cf-96b6-df6c376b9e5b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"57217e6c-a521-4c47-bc25-445da6c139ad","name":"57217e6c-a521-4c47-bc25-445da6c139ad","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"3975b47a-b5f7-4655-b87f-befe9792e54a","name":"3975b47a-b5f7-4655-b87f-befe9792e54a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"b31b0fb5-db84-404b-a44d-b79c6335e558","name":"b31b0fb5-db84-404b-a44d-b79c6335e558","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"0d7ab904-07a4-4ac6-b92f-2f317b5b0577","name":"0d7ab904-07a4-4ac6-b92f-2f317b5b0577","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"ea02ef7e-060f-406f-8dc2-c4eb992d6094","name":"ea02ef7e-060f-406f-8dc2-c4eb992d6094","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"e6f427d2-b9c5-4a15-beb5-1e4bf54cf93d","name":"e6f427d2-b9c5-4a15-beb5-1e4bf54cf93d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -92,81 +92,31 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"cccd3204-9ed5-43d4-ba20-c31e029caa9f","path":"sprites/spr_ui_but_2/spr_ui_but_2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"bd9d7c36-60e2-4bd3-be78-b67018db5d9c","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"4ea10bc0-d23c-4423-98d6-c7f84609f712","path":"sprites/spr_ui_but_2/spr_ui_but_2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"b2b5e04f-52a3-484c-a3f0-e6248e39e813","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"0aa9b148-e83f-47ac-a6e1-62e8c14fc071","path":"sprites/spr_ui_but_2/spr_ui_but_2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"924a4af9-4c80-41a0-b53d-269d9796df02","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"c0cce997-da2e-43c1-89ee-8e6eca9549c3","path":"sprites/spr_ui_but_2/spr_ui_but_2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"8ef31f9c-031d-45a0-9c1e-0a6114bbf70e","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"37bcdb41-c3a2-4dae-9cb4-91f598a14ca5","path":"sprites/spr_ui_but_2/spr_ui_but_2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"f4161c65-77b3-4556-9c62-2d5ee9f4a274","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"1ee7b0d9-9f05-4351-8fc3-5011036b92d3","path":"sprites/spr_ui_but_2/spr_ui_but_2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"e90cf8ec-2c8f-4040-8533-1e43a1942caf","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"8934fb74-73bd-475b-861c-676b2d824e46","path":"sprites/spr_ui_but_2/spr_ui_but_2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"2b3aed46-abd7-4417-a706-e9b7d1ecf67d","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"d3df87c9-95ec-4c6e-b4bc-581c5d32476c","path":"sprites/spr_ui_but_2/spr_ui_but_2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"3d7b27dc-edab-4fbe-ad50-b1e370e70dde","IsCreationKey":false,"Key":7.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"d6f5378a-34c2-4d27-8d99-cb731dd9a138","path":"sprites/spr_ui_but_2/spr_ui_but_2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"f042eddf-f0a8-4180-8737-b9e1ebe614a0","IsCreationKey":false,"Key":8.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"d5c7d655-ff6c-42ed-83fb-53aa2a9f67f6","path":"sprites/spr_ui_but_2/spr_ui_but_2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"dc3600a6-1d5e-44f3-ba63-ac970d1fea3c","IsCreationKey":false,"Key":9.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"7961d161-e69c-4ac0-a866-ab2a984bde10","path":"sprites/spr_ui_but_2/spr_ui_but_2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"db4ef68c-62f0-4933-9862-cbef7d042477","IsCreationKey":false,"Key":10.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"46efdad8-ef3b-41aa-8215-0108e296e3a2","path":"sprites/spr_ui_but_2/spr_ui_but_2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"ac1759c6-e84c-4c55-b545-92e2927a1ebe","IsCreationKey":false,"Key":11.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"571878b9-29aa-47d6-b8df-932284191e73","path":"sprites/spr_ui_but_2/spr_ui_but_2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"7480413c-78e0-45aa-8638-58a4d121a5d8","IsCreationKey":false,"Key":12.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"3eca5a29-d1cd-4ab2-9d95-7ac9cdde93ed","path":"sprites/spr_ui_but_2/spr_ui_but_2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"57971459-6928-41cb-8b9b-31aa3fd9d766","IsCreationKey":false,"Key":13.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"9983ba7c-f2d3-4251-b544-963e79996dde","path":"sprites/spr_ui_but_2/spr_ui_but_2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"fe199c40-a75c-472d-876b-8e544bfec907","IsCreationKey":false,"Key":14.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"4ea5fc36-4111-4fe7-abfa-2738146e71e7","path":"sprites/spr_ui_but_2/spr_ui_but_2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"d018fda9-188b-401c-bbbd-b7ea3121d3fc","IsCreationKey":false,"Key":15.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"3e144b78-28e5-48e6-8de3-912b34723b01","path":"sprites/spr_ui_but_2/spr_ui_but_2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"eea97408-c808-4495-a31e-9d40bf72985d","IsCreationKey":false,"Key":16.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"eded6056-0881-483a-88f3-7b96675b4b25","path":"sprites/spr_ui_but_2/spr_ui_but_2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"19820bcd-6fbc-43a0-9804-cbaf52f76eaa","IsCreationKey":false,"Key":17.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"75fc782d-8ba7-40cf-96b6-df6c376b9e5b","path":"sprites/spr_ui_but_2/spr_ui_but_2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"a54e2959-e2d1-446d-bac5-1cb762394580","IsCreationKey":false,"Key":18.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"57217e6c-a521-4c47-bc25-445da6c139ad","path":"sprites/spr_ui_but_2/spr_ui_but_2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"6942a962-7fc6-4ffb-9a52-0aa8c4900f2d","IsCreationKey":false,"Key":19.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"3975b47a-b5f7-4655-b87f-befe9792e54a","path":"sprites/spr_ui_but_2/spr_ui_but_2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"282e4378-7cd1-460d-92b9-73077dd0e036","IsCreationKey":false,"Key":20.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"b31b0fb5-db84-404b-a44d-b79c6335e558","path":"sprites/spr_ui_but_2/spr_ui_but_2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"447a9809-421a-44dd-a408-7b293f9360ee","IsCreationKey":false,"Key":21.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"0d7ab904-07a4-4ac6-b92f-2f317b5b0577","path":"sprites/spr_ui_but_2/spr_ui_but_2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"e39939f5-f1e1-477d-90b3-72625a9ffa3c","IsCreationKey":false,"Key":22.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"ea02ef7e-060f-406f-8dc2-c4eb992d6094","path":"sprites/spr_ui_but_2/spr_ui_but_2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"f8444770-1893-4ada-a497-251014444a65","IsCreationKey":false,"Key":23.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"e6f427d2-b9c5-4a15-beb5-1e4bf54cf93d","path":"sprites/spr_ui_but_2/spr_ui_but_2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"d8f7b482-fca6-443f-9aa9-610217617d22","IsCreationKey":false,"Key":24.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"cccd3204-9ed5-43d4-ba20-c31e029caa9f","path":"sprites/spr_ui_but_2/spr_ui_but_2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"bd9d7c36-60e2-4bd3-be78-b67018db5d9c","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"4ea10bc0-d23c-4423-98d6-c7f84609f712","path":"sprites/spr_ui_but_2/spr_ui_but_2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"b2b5e04f-52a3-484c-a3f0-e6248e39e813","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"0aa9b148-e83f-47ac-a6e1-62e8c14fc071","path":"sprites/spr_ui_but_2/spr_ui_but_2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"924a4af9-4c80-41a0-b53d-269d9796df02","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"c0cce997-da2e-43c1-89ee-8e6eca9549c3","path":"sprites/spr_ui_but_2/spr_ui_but_2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"8ef31f9c-031d-45a0-9c1e-0a6114bbf70e","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"37bcdb41-c3a2-4dae-9cb4-91f598a14ca5","path":"sprites/spr_ui_but_2/spr_ui_but_2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"f4161c65-77b3-4556-9c62-2d5ee9f4a274","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"1ee7b0d9-9f05-4351-8fc3-5011036b92d3","path":"sprites/spr_ui_but_2/spr_ui_but_2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"e90cf8ec-2c8f-4040-8533-1e43a1942caf","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"8934fb74-73bd-475b-861c-676b2d824e46","path":"sprites/spr_ui_but_2/spr_ui_but_2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"2b3aed46-abd7-4417-a706-e9b7d1ecf67d","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"d3df87c9-95ec-4c6e-b4bc-581c5d32476c","path":"sprites/spr_ui_but_2/spr_ui_but_2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"3d7b27dc-edab-4fbe-ad50-b1e370e70dde","IsCreationKey":false,"Key":7.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"d6f5378a-34c2-4d27-8d99-cb731dd9a138","path":"sprites/spr_ui_but_2/spr_ui_but_2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"f042eddf-f0a8-4180-8737-b9e1ebe614a0","IsCreationKey":false,"Key":8.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"d5c7d655-ff6c-42ed-83fb-53aa2a9f67f6","path":"sprites/spr_ui_but_2/spr_ui_but_2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"dc3600a6-1d5e-44f3-ba63-ac970d1fea3c","IsCreationKey":false,"Key":9.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"7961d161-e69c-4ac0-a866-ab2a984bde10","path":"sprites/spr_ui_but_2/spr_ui_but_2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"db4ef68c-62f0-4933-9862-cbef7d042477","IsCreationKey":false,"Key":10.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"46efdad8-ef3b-41aa-8215-0108e296e3a2","path":"sprites/spr_ui_but_2/spr_ui_but_2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"ac1759c6-e84c-4c55-b545-92e2927a1ebe","IsCreationKey":false,"Key":11.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"571878b9-29aa-47d6-b8df-932284191e73","path":"sprites/spr_ui_but_2/spr_ui_but_2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"7480413c-78e0-45aa-8638-58a4d121a5d8","IsCreationKey":false,"Key":12.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"3eca5a29-d1cd-4ab2-9d95-7ac9cdde93ed","path":"sprites/spr_ui_but_2/spr_ui_but_2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"57971459-6928-41cb-8b9b-31aa3fd9d766","IsCreationKey":false,"Key":13.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"9983ba7c-f2d3-4251-b544-963e79996dde","path":"sprites/spr_ui_but_2/spr_ui_but_2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"fe199c40-a75c-472d-876b-8e544bfec907","IsCreationKey":false,"Key":14.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"4ea5fc36-4111-4fe7-abfa-2738146e71e7","path":"sprites/spr_ui_but_2/spr_ui_but_2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"d018fda9-188b-401c-bbbd-b7ea3121d3fc","IsCreationKey":false,"Key":15.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"3e144b78-28e5-48e6-8de3-912b34723b01","path":"sprites/spr_ui_but_2/spr_ui_but_2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"eea97408-c808-4495-a31e-9d40bf72985d","IsCreationKey":false,"Key":16.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"eded6056-0881-483a-88f3-7b96675b4b25","path":"sprites/spr_ui_but_2/spr_ui_but_2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"19820bcd-6fbc-43a0-9804-cbaf52f76eaa","IsCreationKey":false,"Key":17.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"75fc782d-8ba7-40cf-96b6-df6c376b9e5b","path":"sprites/spr_ui_but_2/spr_ui_but_2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"a54e2959-e2d1-446d-bac5-1cb762394580","IsCreationKey":false,"Key":18.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"57217e6c-a521-4c47-bc25-445da6c139ad","path":"sprites/spr_ui_but_2/spr_ui_but_2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"6942a962-7fc6-4ffb-9a52-0aa8c4900f2d","IsCreationKey":false,"Key":19.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"3975b47a-b5f7-4655-b87f-befe9792e54a","path":"sprites/spr_ui_but_2/spr_ui_but_2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"282e4378-7cd1-460d-92b9-73077dd0e036","IsCreationKey":false,"Key":20.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"b31b0fb5-db84-404b-a44d-b79c6335e558","path":"sprites/spr_ui_but_2/spr_ui_but_2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"447a9809-421a-44dd-a408-7b293f9360ee","IsCreationKey":false,"Key":21.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"0d7ab904-07a4-4ac6-b92f-2f317b5b0577","path":"sprites/spr_ui_but_2/spr_ui_but_2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"e39939f5-f1e1-477d-90b3-72625a9ffa3c","IsCreationKey":false,"Key":22.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"ea02ef7e-060f-406f-8dc2-c4eb992d6094","path":"sprites/spr_ui_but_2/spr_ui_but_2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"f8444770-1893-4ada-a497-251014444a65","IsCreationKey":false,"Key":23.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"e6f427d2-b9c5-4a15-beb5-1e4bf54cf93d","path":"sprites/spr_ui_but_2/spr_ui_but_2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"d8f7b482-fca6-443f-9aa9-610217617d22","IsCreationKey":false,"Key":24.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_ui_but_3/spr_ui_but_3.yy b/sprites/spr_ui_but_3/spr_ui_but_3.yy index ff2c5f5737..32d0e16aa3 100644 --- a/sprites/spr_ui_but_3/spr_ui_but_3.yy +++ b/sprites/spr_ui_but_3/spr_ui_but_3.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_ui_but_3", "bboxMode":0, "bbox_bottom":42, @@ -12,31 +12,31 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"350ad62b-e5b8-4594-b2b6-e24a2b0da025","name":"350ad62b-e5b8-4594-b2b6-e24a2b0da025","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"76c49802-aae4-4cf2-89e2-f16d003e6cde","name":"76c49802-aae4-4cf2-89e2-f16d003e6cde","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"b19c1bfa-e650-45a0-952b-5bc202e55225","name":"b19c1bfa-e650-45a0-952b-5bc202e55225","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"67ec2a03-0c41-4925-b069-d58f70fd8a34","name":"67ec2a03-0c41-4925-b069-d58f70fd8a34","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"dd82b965-6df6-46d3-9a66-859a2456e495","name":"dd82b965-6df6-46d3-9a66-859a2456e495","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"9a8bff66-e1fe-4372-857b-af4c482695a0","name":"9a8bff66-e1fe-4372-857b-af4c482695a0","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"cf4461ea-6979-4ce1-a17f-707abfba8624","name":"cf4461ea-6979-4ce1-a17f-707abfba8624","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"5126edfc-1ae5-4667-a5f9-de745b787f6c","name":"5126edfc-1ae5-4667-a5f9-de745b787f6c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"87004b16-4dc1-4a80-b5a6-cf1089f6569a","name":"87004b16-4dc1-4a80-b5a6-cf1089f6569a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"8d587773-f96a-4919-b748-8cf7e449442f","name":"8d587773-f96a-4919-b748-8cf7e449442f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"62fd7750-714b-4738-a2af-d1d703c4a01e","name":"62fd7750-714b-4738-a2af-d1d703c4a01e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"cae631bf-8006-40ac-a71a-3057c3db5a25","name":"cae631bf-8006-40ac-a71a-3057c3db5a25","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"13daf569-0fcb-4609-97c0-e08b74ed424e","name":"13daf569-0fcb-4609-97c0-e08b74ed424e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"d4748ed9-14e2-4d8b-81cb-5675c62b8cdc","name":"d4748ed9-14e2-4d8b-81cb-5675c62b8cdc","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"037906f6-019f-4e8a-9813-2677c37e344e","name":"037906f6-019f-4e8a-9813-2677c37e344e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"c2481719-724d-4920-9dd2-6c0fe0bf23ef","name":"c2481719-724d-4920-9dd2-6c0fe0bf23ef","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"e03fd35f-3183-40eb-81ff-0dfd8fbb92c4","name":"e03fd35f-3183-40eb-81ff-0dfd8fbb92c4","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"e1ef6c03-9172-4d98-bfcc-afdf7e46747a","name":"e1ef6c03-9172-4d98-bfcc-afdf7e46747a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"a485b00d-a08c-4159-945f-c0eebba537e9","name":"a485b00d-a08c-4159-945f-c0eebba537e9","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"19099c5b-0325-4b4b-9e16-5a79c66fd564","name":"19099c5b-0325-4b4b-9e16-5a79c66fd564","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"aa7adb15-3dfc-4fdc-9fbe-db2524c8bf72","name":"aa7adb15-3dfc-4fdc-9fbe-db2524c8bf72","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"61663474-1b43-4f7b-b61a-cf3b8f161094","name":"61663474-1b43-4f7b-b61a-cf3b8f161094","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"a3608284-8d42-45d8-b55f-2478c344446a","name":"a3608284-8d42-45d8-b55f-2478c344446a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"9d2a174c-84ab-4de9-acab-903b907a162e","name":"9d2a174c-84ab-4de9-acab-903b907a162e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"d9e46016-1374-4d24-9c62-4d58e3fa875c","name":"d9e46016-1374-4d24-9c62-4d58e3fa875c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"350ad62b-e5b8-4594-b2b6-e24a2b0da025","name":"350ad62b-e5b8-4594-b2b6-e24a2b0da025","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"76c49802-aae4-4cf2-89e2-f16d003e6cde","name":"76c49802-aae4-4cf2-89e2-f16d003e6cde","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"b19c1bfa-e650-45a0-952b-5bc202e55225","name":"b19c1bfa-e650-45a0-952b-5bc202e55225","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"67ec2a03-0c41-4925-b069-d58f70fd8a34","name":"67ec2a03-0c41-4925-b069-d58f70fd8a34","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"dd82b965-6df6-46d3-9a66-859a2456e495","name":"dd82b965-6df6-46d3-9a66-859a2456e495","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"9a8bff66-e1fe-4372-857b-af4c482695a0","name":"9a8bff66-e1fe-4372-857b-af4c482695a0","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"cf4461ea-6979-4ce1-a17f-707abfba8624","name":"cf4461ea-6979-4ce1-a17f-707abfba8624","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"5126edfc-1ae5-4667-a5f9-de745b787f6c","name":"5126edfc-1ae5-4667-a5f9-de745b787f6c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"87004b16-4dc1-4a80-b5a6-cf1089f6569a","name":"87004b16-4dc1-4a80-b5a6-cf1089f6569a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"8d587773-f96a-4919-b748-8cf7e449442f","name":"8d587773-f96a-4919-b748-8cf7e449442f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"62fd7750-714b-4738-a2af-d1d703c4a01e","name":"62fd7750-714b-4738-a2af-d1d703c4a01e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"cae631bf-8006-40ac-a71a-3057c3db5a25","name":"cae631bf-8006-40ac-a71a-3057c3db5a25","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"13daf569-0fcb-4609-97c0-e08b74ed424e","name":"13daf569-0fcb-4609-97c0-e08b74ed424e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"d4748ed9-14e2-4d8b-81cb-5675c62b8cdc","name":"d4748ed9-14e2-4d8b-81cb-5675c62b8cdc","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"037906f6-019f-4e8a-9813-2677c37e344e","name":"037906f6-019f-4e8a-9813-2677c37e344e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"c2481719-724d-4920-9dd2-6c0fe0bf23ef","name":"c2481719-724d-4920-9dd2-6c0fe0bf23ef","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"e03fd35f-3183-40eb-81ff-0dfd8fbb92c4","name":"e03fd35f-3183-40eb-81ff-0dfd8fbb92c4","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"e1ef6c03-9172-4d98-bfcc-afdf7e46747a","name":"e1ef6c03-9172-4d98-bfcc-afdf7e46747a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"a485b00d-a08c-4159-945f-c0eebba537e9","name":"a485b00d-a08c-4159-945f-c0eebba537e9","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"19099c5b-0325-4b4b-9e16-5a79c66fd564","name":"19099c5b-0325-4b4b-9e16-5a79c66fd564","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"aa7adb15-3dfc-4fdc-9fbe-db2524c8bf72","name":"aa7adb15-3dfc-4fdc-9fbe-db2524c8bf72","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"61663474-1b43-4f7b-b61a-cf3b8f161094","name":"61663474-1b43-4f7b-b61a-cf3b8f161094","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"a3608284-8d42-45d8-b55f-2478c344446a","name":"a3608284-8d42-45d8-b55f-2478c344446a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"9d2a174c-84ab-4de9-acab-903b907a162e","name":"9d2a174c-84ab-4de9-acab-903b907a162e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"d9e46016-1374-4d24-9c62-4d58e3fa875c","name":"d9e46016-1374-4d24-9c62-4d58e3fa875c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -92,81 +92,31 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"350ad62b-e5b8-4594-b2b6-e24a2b0da025","path":"sprites/spr_ui_but_3/spr_ui_but_3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"7197cc09-b4e2-45c8-b193-db10e25a1c6c","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"76c49802-aae4-4cf2-89e2-f16d003e6cde","path":"sprites/spr_ui_but_3/spr_ui_but_3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"6bac2a03-c27e-4f03-ae42-2f3f3a3a6a06","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"b19c1bfa-e650-45a0-952b-5bc202e55225","path":"sprites/spr_ui_but_3/spr_ui_but_3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"5d5decf9-eee2-4b1c-8203-038116df0f88","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"67ec2a03-0c41-4925-b069-d58f70fd8a34","path":"sprites/spr_ui_but_3/spr_ui_but_3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"8bc2842a-946b-4461-85ad-9472e1eec1f6","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"dd82b965-6df6-46d3-9a66-859a2456e495","path":"sprites/spr_ui_but_3/spr_ui_but_3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"ec1a80bf-faf4-481a-aa21-7841856b7162","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"9a8bff66-e1fe-4372-857b-af4c482695a0","path":"sprites/spr_ui_but_3/spr_ui_but_3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"484943a7-f851-4366-8f11-50dd26c77e0d","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"cf4461ea-6979-4ce1-a17f-707abfba8624","path":"sprites/spr_ui_but_3/spr_ui_but_3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"26a52af6-802b-4cad-80d7-76fb09994b88","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"5126edfc-1ae5-4667-a5f9-de745b787f6c","path":"sprites/spr_ui_but_3/spr_ui_but_3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"5f5ae753-0dbc-47a8-940b-b175b269f2a0","IsCreationKey":false,"Key":7.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"87004b16-4dc1-4a80-b5a6-cf1089f6569a","path":"sprites/spr_ui_but_3/spr_ui_but_3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"3e40f725-c0e0-453e-9590-2dfc6afcf51e","IsCreationKey":false,"Key":8.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"8d587773-f96a-4919-b748-8cf7e449442f","path":"sprites/spr_ui_but_3/spr_ui_but_3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"5f634dde-74b5-4f03-85d2-e74c0e67e21b","IsCreationKey":false,"Key":9.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"62fd7750-714b-4738-a2af-d1d703c4a01e","path":"sprites/spr_ui_but_3/spr_ui_but_3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"300f25a6-06d8-458c-998c-78886def1d25","IsCreationKey":false,"Key":10.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"cae631bf-8006-40ac-a71a-3057c3db5a25","path":"sprites/spr_ui_but_3/spr_ui_but_3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"9a461f15-a50a-4068-afda-a4411fb8a7ee","IsCreationKey":false,"Key":11.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"13daf569-0fcb-4609-97c0-e08b74ed424e","path":"sprites/spr_ui_but_3/spr_ui_but_3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"e37b8a3c-0740-49fa-9f21-fc0e073c281e","IsCreationKey":false,"Key":12.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"d4748ed9-14e2-4d8b-81cb-5675c62b8cdc","path":"sprites/spr_ui_but_3/spr_ui_but_3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"57ddaaf6-a52a-4776-8e6c-f8ee6fe03d13","IsCreationKey":false,"Key":13.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"037906f6-019f-4e8a-9813-2677c37e344e","path":"sprites/spr_ui_but_3/spr_ui_but_3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"e9a03f7c-6d9e-416b-99f0-db6bd007e5fb","IsCreationKey":false,"Key":14.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"c2481719-724d-4920-9dd2-6c0fe0bf23ef","path":"sprites/spr_ui_but_3/spr_ui_but_3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"3d833322-7d0f-4548-91e6-ca8c2f1da2c8","IsCreationKey":false,"Key":15.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"e03fd35f-3183-40eb-81ff-0dfd8fbb92c4","path":"sprites/spr_ui_but_3/spr_ui_but_3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"788e8986-a7ce-4358-ba9e-446326b0ee2f","IsCreationKey":false,"Key":16.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"e1ef6c03-9172-4d98-bfcc-afdf7e46747a","path":"sprites/spr_ui_but_3/spr_ui_but_3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"c8da750b-a83c-4bfa-a62a-27a2fb4449bf","IsCreationKey":false,"Key":17.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"a485b00d-a08c-4159-945f-c0eebba537e9","path":"sprites/spr_ui_but_3/spr_ui_but_3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"669b4f36-62bc-442e-8603-c13a8092b880","IsCreationKey":false,"Key":18.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"19099c5b-0325-4b4b-9e16-5a79c66fd564","path":"sprites/spr_ui_but_3/spr_ui_but_3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"3bc03858-9781-4b26-8124-ceb72e85f05a","IsCreationKey":false,"Key":19.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"aa7adb15-3dfc-4fdc-9fbe-db2524c8bf72","path":"sprites/spr_ui_but_3/spr_ui_but_3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"08c2532c-f0de-4494-b15c-f6a37c82af09","IsCreationKey":false,"Key":20.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"61663474-1b43-4f7b-b61a-cf3b8f161094","path":"sprites/spr_ui_but_3/spr_ui_but_3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"88aaa8b6-49f3-4ec7-bbca-324de3244128","IsCreationKey":false,"Key":21.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"a3608284-8d42-45d8-b55f-2478c344446a","path":"sprites/spr_ui_but_3/spr_ui_but_3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"63a06827-b3ad-48cb-bab0-700b21d29b5f","IsCreationKey":false,"Key":22.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"9d2a174c-84ab-4de9-acab-903b907a162e","path":"sprites/spr_ui_but_3/spr_ui_but_3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"d7bbbb64-9be2-40ea-bd5b-37220eb1b71b","IsCreationKey":false,"Key":23.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"d9e46016-1374-4d24-9c62-4d58e3fa875c","path":"sprites/spr_ui_but_3/spr_ui_but_3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"d6651953-2d6f-4025-9383-a3b639dafe8f","IsCreationKey":false,"Key":24.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"350ad62b-e5b8-4594-b2b6-e24a2b0da025","path":"sprites/spr_ui_but_3/spr_ui_but_3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"7197cc09-b4e2-45c8-b193-db10e25a1c6c","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"76c49802-aae4-4cf2-89e2-f16d003e6cde","path":"sprites/spr_ui_but_3/spr_ui_but_3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"6bac2a03-c27e-4f03-ae42-2f3f3a3a6a06","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"b19c1bfa-e650-45a0-952b-5bc202e55225","path":"sprites/spr_ui_but_3/spr_ui_but_3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"5d5decf9-eee2-4b1c-8203-038116df0f88","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"67ec2a03-0c41-4925-b069-d58f70fd8a34","path":"sprites/spr_ui_but_3/spr_ui_but_3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"8bc2842a-946b-4461-85ad-9472e1eec1f6","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"dd82b965-6df6-46d3-9a66-859a2456e495","path":"sprites/spr_ui_but_3/spr_ui_but_3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"ec1a80bf-faf4-481a-aa21-7841856b7162","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"9a8bff66-e1fe-4372-857b-af4c482695a0","path":"sprites/spr_ui_but_3/spr_ui_but_3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"484943a7-f851-4366-8f11-50dd26c77e0d","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"cf4461ea-6979-4ce1-a17f-707abfba8624","path":"sprites/spr_ui_but_3/spr_ui_but_3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"26a52af6-802b-4cad-80d7-76fb09994b88","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"5126edfc-1ae5-4667-a5f9-de745b787f6c","path":"sprites/spr_ui_but_3/spr_ui_but_3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"5f5ae753-0dbc-47a8-940b-b175b269f2a0","IsCreationKey":false,"Key":7.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"87004b16-4dc1-4a80-b5a6-cf1089f6569a","path":"sprites/spr_ui_but_3/spr_ui_but_3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"3e40f725-c0e0-453e-9590-2dfc6afcf51e","IsCreationKey":false,"Key":8.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"8d587773-f96a-4919-b748-8cf7e449442f","path":"sprites/spr_ui_but_3/spr_ui_but_3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"5f634dde-74b5-4f03-85d2-e74c0e67e21b","IsCreationKey":false,"Key":9.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"62fd7750-714b-4738-a2af-d1d703c4a01e","path":"sprites/spr_ui_but_3/spr_ui_but_3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"300f25a6-06d8-458c-998c-78886def1d25","IsCreationKey":false,"Key":10.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"cae631bf-8006-40ac-a71a-3057c3db5a25","path":"sprites/spr_ui_but_3/spr_ui_but_3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"9a461f15-a50a-4068-afda-a4411fb8a7ee","IsCreationKey":false,"Key":11.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"13daf569-0fcb-4609-97c0-e08b74ed424e","path":"sprites/spr_ui_but_3/spr_ui_but_3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"e37b8a3c-0740-49fa-9f21-fc0e073c281e","IsCreationKey":false,"Key":12.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"d4748ed9-14e2-4d8b-81cb-5675c62b8cdc","path":"sprites/spr_ui_but_3/spr_ui_but_3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"57ddaaf6-a52a-4776-8e6c-f8ee6fe03d13","IsCreationKey":false,"Key":13.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"037906f6-019f-4e8a-9813-2677c37e344e","path":"sprites/spr_ui_but_3/spr_ui_but_3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"e9a03f7c-6d9e-416b-99f0-db6bd007e5fb","IsCreationKey":false,"Key":14.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"c2481719-724d-4920-9dd2-6c0fe0bf23ef","path":"sprites/spr_ui_but_3/spr_ui_but_3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"3d833322-7d0f-4548-91e6-ca8c2f1da2c8","IsCreationKey":false,"Key":15.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"e03fd35f-3183-40eb-81ff-0dfd8fbb92c4","path":"sprites/spr_ui_but_3/spr_ui_but_3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"788e8986-a7ce-4358-ba9e-446326b0ee2f","IsCreationKey":false,"Key":16.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"e1ef6c03-9172-4d98-bfcc-afdf7e46747a","path":"sprites/spr_ui_but_3/spr_ui_but_3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"c8da750b-a83c-4bfa-a62a-27a2fb4449bf","IsCreationKey":false,"Key":17.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"a485b00d-a08c-4159-945f-c0eebba537e9","path":"sprites/spr_ui_but_3/spr_ui_but_3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"669b4f36-62bc-442e-8603-c13a8092b880","IsCreationKey":false,"Key":18.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"19099c5b-0325-4b4b-9e16-5a79c66fd564","path":"sprites/spr_ui_but_3/spr_ui_but_3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"3bc03858-9781-4b26-8124-ceb72e85f05a","IsCreationKey":false,"Key":19.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"aa7adb15-3dfc-4fdc-9fbe-db2524c8bf72","path":"sprites/spr_ui_but_3/spr_ui_but_3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"08c2532c-f0de-4494-b15c-f6a37c82af09","IsCreationKey":false,"Key":20.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"61663474-1b43-4f7b-b61a-cf3b8f161094","path":"sprites/spr_ui_but_3/spr_ui_but_3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"88aaa8b6-49f3-4ec7-bbca-324de3244128","IsCreationKey":false,"Key":21.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"a3608284-8d42-45d8-b55f-2478c344446a","path":"sprites/spr_ui_but_3/spr_ui_but_3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"63a06827-b3ad-48cb-bab0-700b21d29b5f","IsCreationKey":false,"Key":22.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"9d2a174c-84ab-4de9-acab-903b907a162e","path":"sprites/spr_ui_but_3/spr_ui_but_3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"d7bbbb64-9be2-40ea-bd5b-37220eb1b71b","IsCreationKey":false,"Key":23.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"d9e46016-1374-4d24-9c62-4d58e3fa875c","path":"sprites/spr_ui_but_3/spr_ui_but_3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"d6651953-2d6f-4025-9383-a3b639dafe8f","IsCreationKey":false,"Key":24.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_ui_but_4/spr_ui_but_4.yy b/sprites/spr_ui_but_4/spr_ui_but_4.yy index 9e7f73fc15..874ada82d1 100644 --- a/sprites/spr_ui_but_4/spr_ui_but_4.yy +++ b/sprites/spr_ui_but_4/spr_ui_but_4.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_ui_but_4", "bboxMode":0, "bbox_bottom":41, @@ -12,31 +12,31 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"8c008ff9-0d27-4c52-b93f-f9e077f7226a","name":"8c008ff9-0d27-4c52-b93f-f9e077f7226a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"3257fe5d-b59c-4c84-aa13-f1f069dcc25f","name":"3257fe5d-b59c-4c84-aa13-f1f069dcc25f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"b3adf45c-b672-4f22-8b5d-ed9c2eea38da","name":"b3adf45c-b672-4f22-8b5d-ed9c2eea38da","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"878ebbd7-11dc-40f7-aaee-e16bd8b91172","name":"878ebbd7-11dc-40f7-aaee-e16bd8b91172","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"6b06cfff-b6d2-4974-be71-68067158ef33","name":"6b06cfff-b6d2-4974-be71-68067158ef33","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"680abfbe-e0fe-4109-9f11-16f3c1785d11","name":"680abfbe-e0fe-4109-9f11-16f3c1785d11","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"3a2ae2bd-e045-4557-8327-36f557c329aa","name":"3a2ae2bd-e045-4557-8327-36f557c329aa","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"7f3cfe30-a3f9-498a-94de-82f115c28652","name":"7f3cfe30-a3f9-498a-94de-82f115c28652","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"f7e2e91b-d7cf-4e1f-877f-6a7e95c12a14","name":"f7e2e91b-d7cf-4e1f-877f-6a7e95c12a14","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"f52a5ab5-a140-41e6-9a01-9928e1acba57","name":"f52a5ab5-a140-41e6-9a01-9928e1acba57","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"124dd8de-1a4a-47a2-9696-e4c05204c065","name":"124dd8de-1a4a-47a2-9696-e4c05204c065","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"40d4918d-d5d7-446c-8bc2-90332e7ec739","name":"40d4918d-d5d7-446c-8bc2-90332e7ec739","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"d0d4dd0c-f9f4-4306-a724-b96561d145d1","name":"d0d4dd0c-f9f4-4306-a724-b96561d145d1","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"bc4bc30c-179d-4671-b776-19e72103d392","name":"bc4bc30c-179d-4671-b776-19e72103d392","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"9274ee8e-3af5-44a7-a86c-be4cfa7fde6f","name":"9274ee8e-3af5-44a7-a86c-be4cfa7fde6f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"90c2a1f1-228b-4ee2-bc08-e857db16188f","name":"90c2a1f1-228b-4ee2-bc08-e857db16188f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"7888771d-9a42-4932-aed2-90f3bf880b2d","name":"7888771d-9a42-4932-aed2-90f3bf880b2d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"06fd6b35-2b99-4f38-8df4-7f82f27b5fab","name":"06fd6b35-2b99-4f38-8df4-7f82f27b5fab","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"2e50159e-2391-44fa-a0d9-15767963df6f","name":"2e50159e-2391-44fa-a0d9-15767963df6f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"01f0604a-68c1-4941-b6c7-a164010680ca","name":"01f0604a-68c1-4941-b6c7-a164010680ca","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"ee84364d-3744-4b90-94b8-c8282ddcaa66","name":"ee84364d-3744-4b90-94b8-c8282ddcaa66","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"0b57cf88-36c6-4b37-afa7-394b56e0e889","name":"0b57cf88-36c6-4b37-afa7-394b56e0e889","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"492a7f2b-78df-4812-8216-cb9d7d5a8692","name":"492a7f2b-78df-4812-8216-cb9d7d5a8692","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"65b176bb-5474-4930-b447-8832faf16571","name":"65b176bb-5474-4930-b447-8832faf16571","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"e211daf3-d0eb-4a0e-8783-6684ad819022","name":"e211daf3-d0eb-4a0e-8783-6684ad819022","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"8c008ff9-0d27-4c52-b93f-f9e077f7226a","name":"8c008ff9-0d27-4c52-b93f-f9e077f7226a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"3257fe5d-b59c-4c84-aa13-f1f069dcc25f","name":"3257fe5d-b59c-4c84-aa13-f1f069dcc25f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"b3adf45c-b672-4f22-8b5d-ed9c2eea38da","name":"b3adf45c-b672-4f22-8b5d-ed9c2eea38da","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"878ebbd7-11dc-40f7-aaee-e16bd8b91172","name":"878ebbd7-11dc-40f7-aaee-e16bd8b91172","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"6b06cfff-b6d2-4974-be71-68067158ef33","name":"6b06cfff-b6d2-4974-be71-68067158ef33","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"680abfbe-e0fe-4109-9f11-16f3c1785d11","name":"680abfbe-e0fe-4109-9f11-16f3c1785d11","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"3a2ae2bd-e045-4557-8327-36f557c329aa","name":"3a2ae2bd-e045-4557-8327-36f557c329aa","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"7f3cfe30-a3f9-498a-94de-82f115c28652","name":"7f3cfe30-a3f9-498a-94de-82f115c28652","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"f7e2e91b-d7cf-4e1f-877f-6a7e95c12a14","name":"f7e2e91b-d7cf-4e1f-877f-6a7e95c12a14","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"f52a5ab5-a140-41e6-9a01-9928e1acba57","name":"f52a5ab5-a140-41e6-9a01-9928e1acba57","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"124dd8de-1a4a-47a2-9696-e4c05204c065","name":"124dd8de-1a4a-47a2-9696-e4c05204c065","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"40d4918d-d5d7-446c-8bc2-90332e7ec739","name":"40d4918d-d5d7-446c-8bc2-90332e7ec739","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"d0d4dd0c-f9f4-4306-a724-b96561d145d1","name":"d0d4dd0c-f9f4-4306-a724-b96561d145d1","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"bc4bc30c-179d-4671-b776-19e72103d392","name":"bc4bc30c-179d-4671-b776-19e72103d392","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"9274ee8e-3af5-44a7-a86c-be4cfa7fde6f","name":"9274ee8e-3af5-44a7-a86c-be4cfa7fde6f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"90c2a1f1-228b-4ee2-bc08-e857db16188f","name":"90c2a1f1-228b-4ee2-bc08-e857db16188f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"7888771d-9a42-4932-aed2-90f3bf880b2d","name":"7888771d-9a42-4932-aed2-90f3bf880b2d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"06fd6b35-2b99-4f38-8df4-7f82f27b5fab","name":"06fd6b35-2b99-4f38-8df4-7f82f27b5fab","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"2e50159e-2391-44fa-a0d9-15767963df6f","name":"2e50159e-2391-44fa-a0d9-15767963df6f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"01f0604a-68c1-4941-b6c7-a164010680ca","name":"01f0604a-68c1-4941-b6c7-a164010680ca","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"ee84364d-3744-4b90-94b8-c8282ddcaa66","name":"ee84364d-3744-4b90-94b8-c8282ddcaa66","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"0b57cf88-36c6-4b37-afa7-394b56e0e889","name":"0b57cf88-36c6-4b37-afa7-394b56e0e889","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"492a7f2b-78df-4812-8216-cb9d7d5a8692","name":"492a7f2b-78df-4812-8216-cb9d7d5a8692","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"65b176bb-5474-4930-b447-8832faf16571","name":"65b176bb-5474-4930-b447-8832faf16571","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"e211daf3-d0eb-4a0e-8783-6684ad819022","name":"e211daf3-d0eb-4a0e-8783-6684ad819022","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -92,81 +92,31 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"8c008ff9-0d27-4c52-b93f-f9e077f7226a","path":"sprites/spr_ui_but_4/spr_ui_but_4.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"411f19cb-ce7b-482f-96b9-31835411993a","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"3257fe5d-b59c-4c84-aa13-f1f069dcc25f","path":"sprites/spr_ui_but_4/spr_ui_but_4.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"daa8a33a-c566-40e2-a1a4-bb7c88a424dd","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"b3adf45c-b672-4f22-8b5d-ed9c2eea38da","path":"sprites/spr_ui_but_4/spr_ui_but_4.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"3efbd178-cde1-413f-a6f5-5a144c592311","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"878ebbd7-11dc-40f7-aaee-e16bd8b91172","path":"sprites/spr_ui_but_4/spr_ui_but_4.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"4c62d52d-4378-4e1e-992f-6a5176a62c55","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"6b06cfff-b6d2-4974-be71-68067158ef33","path":"sprites/spr_ui_but_4/spr_ui_but_4.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"58092874-4226-475c-b084-de7983bba446","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"680abfbe-e0fe-4109-9f11-16f3c1785d11","path":"sprites/spr_ui_but_4/spr_ui_but_4.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"80959158-4fb7-4724-948a-1b44e36df2b9","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"3a2ae2bd-e045-4557-8327-36f557c329aa","path":"sprites/spr_ui_but_4/spr_ui_but_4.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"a928b0f6-11f0-4132-b09c-eeb528d8ce3a","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"7f3cfe30-a3f9-498a-94de-82f115c28652","path":"sprites/spr_ui_but_4/spr_ui_but_4.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"06d4e678-f2b1-47f9-99ad-5b49bb44aaf3","IsCreationKey":false,"Key":7.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"f7e2e91b-d7cf-4e1f-877f-6a7e95c12a14","path":"sprites/spr_ui_but_4/spr_ui_but_4.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"609f9913-5913-48f5-a8a3-984e074c1e4d","IsCreationKey":false,"Key":8.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"f52a5ab5-a140-41e6-9a01-9928e1acba57","path":"sprites/spr_ui_but_4/spr_ui_but_4.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"0c00d552-9c3b-4b72-96ef-db5722628b56","IsCreationKey":false,"Key":9.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"124dd8de-1a4a-47a2-9696-e4c05204c065","path":"sprites/spr_ui_but_4/spr_ui_but_4.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"38150b07-3784-4397-bb1f-89c4a55b7cfb","IsCreationKey":false,"Key":10.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"40d4918d-d5d7-446c-8bc2-90332e7ec739","path":"sprites/spr_ui_but_4/spr_ui_but_4.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"ee750f0c-dc38-4cba-be12-458c3e2cfc70","IsCreationKey":false,"Key":11.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"d0d4dd0c-f9f4-4306-a724-b96561d145d1","path":"sprites/spr_ui_but_4/spr_ui_but_4.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"6ba36882-78b9-4fd8-ac93-a1e0effbec9c","IsCreationKey":false,"Key":12.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"bc4bc30c-179d-4671-b776-19e72103d392","path":"sprites/spr_ui_but_4/spr_ui_but_4.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"520923c2-217a-4510-b30f-f65b4b1e3b13","IsCreationKey":false,"Key":13.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"9274ee8e-3af5-44a7-a86c-be4cfa7fde6f","path":"sprites/spr_ui_but_4/spr_ui_but_4.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"c0d87ff7-6e0e-4ac3-9146-de27c2995580","IsCreationKey":false,"Key":14.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"90c2a1f1-228b-4ee2-bc08-e857db16188f","path":"sprites/spr_ui_but_4/spr_ui_but_4.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"06cdef33-822e-4d79-9238-279fbba5edfe","IsCreationKey":false,"Key":15.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"7888771d-9a42-4932-aed2-90f3bf880b2d","path":"sprites/spr_ui_but_4/spr_ui_but_4.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"27f5ee17-b1d8-4220-b643-42ed7e70817c","IsCreationKey":false,"Key":16.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"06fd6b35-2b99-4f38-8df4-7f82f27b5fab","path":"sprites/spr_ui_but_4/spr_ui_but_4.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"df181df8-d7d3-4786-bedd-5142b4f0c90c","IsCreationKey":false,"Key":17.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"2e50159e-2391-44fa-a0d9-15767963df6f","path":"sprites/spr_ui_but_4/spr_ui_but_4.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"b8faa552-bb10-4f2b-9913-75f20518a305","IsCreationKey":false,"Key":18.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"01f0604a-68c1-4941-b6c7-a164010680ca","path":"sprites/spr_ui_but_4/spr_ui_but_4.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"a0f71e53-9dc3-440b-b3c5-dc3da4aaf80d","IsCreationKey":false,"Key":19.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"ee84364d-3744-4b90-94b8-c8282ddcaa66","path":"sprites/spr_ui_but_4/spr_ui_but_4.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"6f0c56f4-2c53-4bce-9692-b7491176547c","IsCreationKey":false,"Key":20.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"0b57cf88-36c6-4b37-afa7-394b56e0e889","path":"sprites/spr_ui_but_4/spr_ui_but_4.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"7f695d0d-cc52-4c54-aa8f-cbc52ec0d1a4","IsCreationKey":false,"Key":21.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"492a7f2b-78df-4812-8216-cb9d7d5a8692","path":"sprites/spr_ui_but_4/spr_ui_but_4.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"abcd421f-5a21-47ec-a3ff-44abe4458df8","IsCreationKey":false,"Key":22.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"65b176bb-5474-4930-b447-8832faf16571","path":"sprites/spr_ui_but_4/spr_ui_but_4.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"81b935b7-128d-4eee-9353-e124f71cc21a","IsCreationKey":false,"Key":23.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"e211daf3-d0eb-4a0e-8783-6684ad819022","path":"sprites/spr_ui_but_4/spr_ui_but_4.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"5d5f929b-9a02-4aad-9973-00fa19030d75","IsCreationKey":false,"Key":24.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"8c008ff9-0d27-4c52-b93f-f9e077f7226a","path":"sprites/spr_ui_but_4/spr_ui_but_4.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"411f19cb-ce7b-482f-96b9-31835411993a","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"3257fe5d-b59c-4c84-aa13-f1f069dcc25f","path":"sprites/spr_ui_but_4/spr_ui_but_4.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"daa8a33a-c566-40e2-a1a4-bb7c88a424dd","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"b3adf45c-b672-4f22-8b5d-ed9c2eea38da","path":"sprites/spr_ui_but_4/spr_ui_but_4.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"3efbd178-cde1-413f-a6f5-5a144c592311","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"878ebbd7-11dc-40f7-aaee-e16bd8b91172","path":"sprites/spr_ui_but_4/spr_ui_but_4.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"4c62d52d-4378-4e1e-992f-6a5176a62c55","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"6b06cfff-b6d2-4974-be71-68067158ef33","path":"sprites/spr_ui_but_4/spr_ui_but_4.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"58092874-4226-475c-b084-de7983bba446","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"680abfbe-e0fe-4109-9f11-16f3c1785d11","path":"sprites/spr_ui_but_4/spr_ui_but_4.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"80959158-4fb7-4724-948a-1b44e36df2b9","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"3a2ae2bd-e045-4557-8327-36f557c329aa","path":"sprites/spr_ui_but_4/spr_ui_but_4.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"a928b0f6-11f0-4132-b09c-eeb528d8ce3a","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"7f3cfe30-a3f9-498a-94de-82f115c28652","path":"sprites/spr_ui_but_4/spr_ui_but_4.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"06d4e678-f2b1-47f9-99ad-5b49bb44aaf3","IsCreationKey":false,"Key":7.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"f7e2e91b-d7cf-4e1f-877f-6a7e95c12a14","path":"sprites/spr_ui_but_4/spr_ui_but_4.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"609f9913-5913-48f5-a8a3-984e074c1e4d","IsCreationKey":false,"Key":8.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"f52a5ab5-a140-41e6-9a01-9928e1acba57","path":"sprites/spr_ui_but_4/spr_ui_but_4.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"0c00d552-9c3b-4b72-96ef-db5722628b56","IsCreationKey":false,"Key":9.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"124dd8de-1a4a-47a2-9696-e4c05204c065","path":"sprites/spr_ui_but_4/spr_ui_but_4.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"38150b07-3784-4397-bb1f-89c4a55b7cfb","IsCreationKey":false,"Key":10.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"40d4918d-d5d7-446c-8bc2-90332e7ec739","path":"sprites/spr_ui_but_4/spr_ui_but_4.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"ee750f0c-dc38-4cba-be12-458c3e2cfc70","IsCreationKey":false,"Key":11.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"d0d4dd0c-f9f4-4306-a724-b96561d145d1","path":"sprites/spr_ui_but_4/spr_ui_but_4.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"6ba36882-78b9-4fd8-ac93-a1e0effbec9c","IsCreationKey":false,"Key":12.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"bc4bc30c-179d-4671-b776-19e72103d392","path":"sprites/spr_ui_but_4/spr_ui_but_4.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"520923c2-217a-4510-b30f-f65b4b1e3b13","IsCreationKey":false,"Key":13.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"9274ee8e-3af5-44a7-a86c-be4cfa7fde6f","path":"sprites/spr_ui_but_4/spr_ui_but_4.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"c0d87ff7-6e0e-4ac3-9146-de27c2995580","IsCreationKey":false,"Key":14.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"90c2a1f1-228b-4ee2-bc08-e857db16188f","path":"sprites/spr_ui_but_4/spr_ui_but_4.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"06cdef33-822e-4d79-9238-279fbba5edfe","IsCreationKey":false,"Key":15.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"7888771d-9a42-4932-aed2-90f3bf880b2d","path":"sprites/spr_ui_but_4/spr_ui_but_4.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"27f5ee17-b1d8-4220-b643-42ed7e70817c","IsCreationKey":false,"Key":16.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"06fd6b35-2b99-4f38-8df4-7f82f27b5fab","path":"sprites/spr_ui_but_4/spr_ui_but_4.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"df181df8-d7d3-4786-bedd-5142b4f0c90c","IsCreationKey":false,"Key":17.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"2e50159e-2391-44fa-a0d9-15767963df6f","path":"sprites/spr_ui_but_4/spr_ui_but_4.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"b8faa552-bb10-4f2b-9913-75f20518a305","IsCreationKey":false,"Key":18.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"01f0604a-68c1-4941-b6c7-a164010680ca","path":"sprites/spr_ui_but_4/spr_ui_but_4.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"a0f71e53-9dc3-440b-b3c5-dc3da4aaf80d","IsCreationKey":false,"Key":19.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"ee84364d-3744-4b90-94b8-c8282ddcaa66","path":"sprites/spr_ui_but_4/spr_ui_but_4.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"6f0c56f4-2c53-4bce-9692-b7491176547c","IsCreationKey":false,"Key":20.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"0b57cf88-36c6-4b37-afa7-394b56e0e889","path":"sprites/spr_ui_but_4/spr_ui_but_4.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"7f695d0d-cc52-4c54-aa8f-cbc52ec0d1a4","IsCreationKey":false,"Key":21.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"492a7f2b-78df-4812-8216-cb9d7d5a8692","path":"sprites/spr_ui_but_4/spr_ui_but_4.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"abcd421f-5a21-47ec-a3ff-44abe4458df8","IsCreationKey":false,"Key":22.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"65b176bb-5474-4930-b447-8832faf16571","path":"sprites/spr_ui_but_4/spr_ui_but_4.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"81b935b7-128d-4eee-9353-e124f71cc21a","IsCreationKey":false,"Key":23.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"e211daf3-d0eb-4a0e-8783-6684ad819022","path":"sprites/spr_ui_but_4/spr_ui_but_4.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"5d5f929b-9a02-4aad-9973-00fa19030d75","IsCreationKey":false,"Key":24.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_ui_hov_1/spr_ui_hov_1.yy b/sprites/spr_ui_hov_1/spr_ui_hov_1.yy index b9750d56e1..88ff0507ed 100644 --- a/sprites/spr_ui_hov_1/spr_ui_hov_1.yy +++ b/sprites/spr_ui_hov_1/spr_ui_hov_1.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_ui_hov_1", "bboxMode":0, "bbox_bottom":41, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"c3d25c08-9726-4ae3-b43a-7ceaac22d706","name":"c3d25c08-9726-4ae3-b43a-7ceaac22d706","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"c3d25c08-9726-4ae3-b43a-7ceaac22d706","name":"c3d25c08-9726-4ae3-b43a-7ceaac22d706","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"c3d25c08-9726-4ae3-b43a-7ceaac22d706","path":"sprites/spr_ui_hov_1/spr_ui_hov_1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"26cb05a6-2933-4a19-be70-e7d873a80e52","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"c3d25c08-9726-4ae3-b43a-7ceaac22d706","path":"sprites/spr_ui_hov_1/spr_ui_hov_1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"26cb05a6-2933-4a19-be70-e7d873a80e52","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_ui_hov_2/spr_ui_hov_2.yy b/sprites/spr_ui_hov_2/spr_ui_hov_2.yy index 96db48963a..f039921690 100644 --- a/sprites/spr_ui_hov_2/spr_ui_hov_2.yy +++ b/sprites/spr_ui_hov_2/spr_ui_hov_2.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_ui_hov_2", "bboxMode":0, "bbox_bottom":40, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"e370036d-36fe-4307-b289-976fd9062928","name":"e370036d-36fe-4307-b289-976fd9062928","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"e370036d-36fe-4307-b289-976fd9062928","name":"e370036d-36fe-4307-b289-976fd9062928","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"e370036d-36fe-4307-b289-976fd9062928","path":"sprites/spr_ui_hov_2/spr_ui_hov_2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"3334c5e1-3e66-4ea4-8778-d7165ffb448c","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"e370036d-36fe-4307-b289-976fd9062928","path":"sprites/spr_ui_hov_2/spr_ui_hov_2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"3334c5e1-3e66-4ea4-8778-d7165ffb448c","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_ui_hov_3/spr_ui_hov_3.yy b/sprites/spr_ui_hov_3/spr_ui_hov_3.yy index ba4a361dd9..7bec610aa5 100644 --- a/sprites/spr_ui_hov_3/spr_ui_hov_3.yy +++ b/sprites/spr_ui_hov_3/spr_ui_hov_3.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_ui_hov_3", "bboxMode":0, "bbox_bottom":41, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"40ad52a6-de6d-468c-bd75-b23a6e706c9e","name":"40ad52a6-de6d-468c-bd75-b23a6e706c9e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"40ad52a6-de6d-468c-bd75-b23a6e706c9e","name":"40ad52a6-de6d-468c-bd75-b23a6e706c9e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"40ad52a6-de6d-468c-bd75-b23a6e706c9e","path":"sprites/spr_ui_hov_3/spr_ui_hov_3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"ff8a594e-c2e7-464e-b33f-aaf90999c6ab","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"40ad52a6-de6d-468c-bd75-b23a6e706c9e","path":"sprites/spr_ui_hov_3/spr_ui_hov_3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"ff8a594e-c2e7-464e-b33f-aaf90999c6ab","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":{ diff --git a/sprites/spr_ui_hov_4/spr_ui_hov_4.yy b/sprites/spr_ui_hov_4/spr_ui_hov_4.yy index 8518f36e4e..01ecf23b1f 100644 --- a/sprites/spr_ui_hov_4/spr_ui_hov_4.yy +++ b/sprites/spr_ui_hov_4/spr_ui_hov_4.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_ui_hov_4", "bboxMode":0, "bbox_bottom":41, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"f00dbe29-b1d3-4801-a8de-89465a852ed6","name":"f00dbe29-b1d3-4801-a8de-89465a852ed6","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"f00dbe29-b1d3-4801-a8de-89465a852ed6","name":"f00dbe29-b1d3-4801-a8de-89465a852ed6","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"f00dbe29-b1d3-4801-a8de-89465a852ed6","path":"sprites/spr_ui_hov_4/spr_ui_hov_4.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"61089074-401d-4028-bc16-4e504e1a2eb6","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"f00dbe29-b1d3-4801-a8de-89465a852ed6","path":"sprites/spr_ui_hov_4/spr_ui_hov_4.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"61089074-401d-4028-bc16-4e504e1a2eb6","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":{ diff --git a/sprites/spr_ultra_backpack/spr_ultra_backpack.yy b/sprites/spr_ultra_backpack/spr_ultra_backpack.yy index 9799674a26..c91080a28d 100644 --- a/sprites/spr_ultra_backpack/spr_ultra_backpack.yy +++ b/sprites/spr_ultra_backpack/spr_ultra_backpack.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_ultra_backpack", "bboxMode":0, "bbox_bottom":37, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"8e269d92-a1bd-4360-9ab3-d9310feae634","name":"8e269d92-a1bd-4360-9ab3-d9310feae634","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"8e269d92-a1bd-4360-9ab3-d9310feae634","name":"8e269d92-a1bd-4360-9ab3-d9310feae634","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -70,9 +70,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"8e269d92-a1bd-4360-9ab3-d9310feae634","path":"sprites/spr_ultra_backpack/spr_ultra_backpack.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"0b49ae84-efc3-48ec-9248-151c7c19f24c","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"8e269d92-a1bd-4360-9ab3-d9310feae634","path":"sprites/spr_ultra_backpack/spr_ultra_backpack.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"0b49ae84-efc3-48ec-9248-151c7c19f24c","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_ultra_belt/spr_ultra_belt.yy b/sprites/spr_ultra_belt/spr_ultra_belt.yy index 78a2cdf309..0a502588e5 100644 --- a/sprites/spr_ultra_belt/spr_ultra_belt.yy +++ b/sprites/spr_ultra_belt/spr_ultra_belt.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_ultra_belt", "bboxMode":0, "bbox_bottom":164, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"8a2b3d9f-db94-4f5a-8b6c-c14863b33cb4","name":"8a2b3d9f-db94-4f5a-8b6c-c14863b33cb4","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"8a2b3d9f-db94-4f5a-8b6c-c14863b33cb4","name":"8a2b3d9f-db94-4f5a-8b6c-c14863b33cb4","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "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_ultra_belt/spr_ultra_belt.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,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"8a2b3d9f-db94-4f5a-8b6c-c14863b33cb4","path":"sprites/spr_ultra_belt/spr_ultra_belt.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, diff --git a/sprites/spr_ultra_honor_guard/spr_ultra_honor_guard.yy b/sprites/spr_ultra_honor_guard/spr_ultra_honor_guard.yy index f67b24f5af..582a6b9bb7 100644 --- a/sprites/spr_ultra_honor_guard/spr_ultra_honor_guard.yy +++ b/sprites/spr_ultra_honor_guard/spr_ultra_honor_guard.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_ultra_honor_guard", "bboxMode":0, "bbox_bottom":220, @@ -12,9 +12,9 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"88b996d0-3ce9-4c6f-bc17-518446f0995d","name":"88b996d0-3ce9-4c6f-bc17-518446f0995d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"8a2b3d9f-db94-4f5a-8b6c-c14863b33cb4","name":"8a2b3d9f-db94-4f5a-8b6c-c14863b33cb4","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"a480dd5e-cfcb-474b-a59c-731ac71985a6","name":"a480dd5e-cfcb-474b-a59c-731ac71985a6","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"88b996d0-3ce9-4c6f-bc17-518446f0995d","name":"88b996d0-3ce9-4c6f-bc17-518446f0995d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"8a2b3d9f-db94-4f5a-8b6c-c14863b33cb4","name":"8a2b3d9f-db94-4f5a-8b6c-c14863b33cb4","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"a480dd5e-cfcb-474b-a59c-731ac71985a6","name":"a480dd5e-cfcb-474b-a59c-731ac71985a6","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -70,15 +70,9 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"88b996d0-3ce9-4c6f-bc17-518446f0995d","path":"sprites/spr_ultra_honor_guard/spr_ultra_honor_guard.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"4c90a81d-cb09-420f-9d3e-a2717d044ee8","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"8a2b3d9f-db94-4f5a-8b6c-c14863b33cb4","path":"sprites/spr_ultra_honor_guard/spr_ultra_honor_guard.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"da164d7e-dcc6-41fb-890d-2599cfa5ddf8","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"a480dd5e-cfcb-474b-a59c-731ac71985a6","path":"sprites/spr_ultra_honor_guard/spr_ultra_honor_guard.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"31138557-a4ef-465c-99bd-789c14b16264","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"88b996d0-3ce9-4c6f-bc17-518446f0995d","path":"sprites/spr_ultra_honor_guard/spr_ultra_honor_guard.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"4c90a81d-cb09-420f-9d3e-a2717d044ee8","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"8a2b3d9f-db94-4f5a-8b6c-c14863b33cb4","path":"sprites/spr_ultra_honor_guard/spr_ultra_honor_guard.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"da164d7e-dcc6-41fb-890d-2599cfa5ddf8","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"a480dd5e-cfcb-474b-a59c-731ac71985a6","path":"sprites/spr_ultra_honor_guard/spr_ultra_honor_guard.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"31138557-a4ef-465c-99bd-789c14b16264","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_ultra_honor_guard2/spr_ultra_honor_guard2.yy b/sprites/spr_ultra_honor_guard2/spr_ultra_honor_guard2.yy index 5162c3dee2..df4b1772fa 100644 --- a/sprites/spr_ultra_honor_guard2/spr_ultra_honor_guard2.yy +++ b/sprites/spr_ultra_honor_guard2/spr_ultra_honor_guard2.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_ultra_honor_guard2", "bboxMode":0, "bbox_bottom":220, @@ -12,9 +12,9 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"f40bb243-5f2e-4891-8cb0-e9ef181276bf","name":"f40bb243-5f2e-4891-8cb0-e9ef181276bf","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"2991de12-c521-4ae7-b522-93889e9d98df","name":"2991de12-c521-4ae7-b522-93889e9d98df","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"a480dd5e-cfcb-474b-a59c-731ac71985a6","name":"a480dd5e-cfcb-474b-a59c-731ac71985a6","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"f40bb243-5f2e-4891-8cb0-e9ef181276bf","name":"f40bb243-5f2e-4891-8cb0-e9ef181276bf","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"2991de12-c521-4ae7-b522-93889e9d98df","name":"2991de12-c521-4ae7-b522-93889e9d98df","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"a480dd5e-cfcb-474b-a59c-731ac71985a6","name":"a480dd5e-cfcb-474b-a59c-731ac71985a6","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -77,15 +77,9 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"f40bb243-5f2e-4891-8cb0-e9ef181276bf","path":"sprites/spr_ultra_honor_guard2/spr_ultra_honor_guard2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"0c034e8b-987f-41d4-af0c-8aa2e09e5602","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"2991de12-c521-4ae7-b522-93889e9d98df","path":"sprites/spr_ultra_honor_guard2/spr_ultra_honor_guard2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"131b933f-5eb2-468c-ab2d-c38317e7486f","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"a480dd5e-cfcb-474b-a59c-731ac71985a6","path":"sprites/spr_ultra_honor_guard2/spr_ultra_honor_guard2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"be563dc1-21f3-489a-94ce-944fa3185a0f","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"f40bb243-5f2e-4891-8cb0-e9ef181276bf","path":"sprites/spr_ultra_honor_guard2/spr_ultra_honor_guard2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"0c034e8b-987f-41d4-af0c-8aa2e09e5602","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"2991de12-c521-4ae7-b522-93889e9d98df","path":"sprites/spr_ultra_honor_guard2/spr_ultra_honor_guard2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"131b933f-5eb2-468c-ab2d-c38317e7486f","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"a480dd5e-cfcb-474b-a59c-731ac71985a6","path":"sprites/spr_ultra_honor_guard2/spr_ultra_honor_guard2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"be563dc1-21f3-489a-94ce-944fa3185a0f","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_ultra_right_shoulder_hanging/spr_ultra_right_shoulder_hanging.yy b/sprites/spr_ultra_right_shoulder_hanging/spr_ultra_right_shoulder_hanging.yy index 9bd8ce6e12..456cc70939 100644 --- a/sprites/spr_ultra_right_shoulder_hanging/spr_ultra_right_shoulder_hanging.yy +++ b/sprites/spr_ultra_right_shoulder_hanging/spr_ultra_right_shoulder_hanging.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_ultra_right_shoulder_hanging", "bboxMode":0, "bbox_bottom":73, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"88b996d0-3ce9-4c6f-bc17-518446f0995d","name":"88b996d0-3ce9-4c6f-bc17-518446f0995d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"88b996d0-3ce9-4c6f-bc17-518446f0995d","name":"88b996d0-3ce9-4c6f-bc17-518446f0995d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"88b996d0-3ce9-4c6f-bc17-518446f0995d","path":"sprites/spr_ultra_right_shoulder_hanging/spr_ultra_right_shoulder_hanging.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"b9642de9-3f72-4a7c-b92b-bbb1da41f352","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"88b996d0-3ce9-4c6f-bc17-518446f0995d","path":"sprites/spr_ultra_right_shoulder_hanging/spr_ultra_right_shoulder_hanging.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"b9642de9-3f72-4a7c-b92b-bbb1da41f352","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_ultra_tassels/spr_ultra_tassels.yy b/sprites/spr_ultra_tassels/spr_ultra_tassels.yy index c49ae9c078..79dca46634 100644 --- a/sprites/spr_ultra_tassels/spr_ultra_tassels.yy +++ b/sprites/spr_ultra_tassels/spr_ultra_tassels.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_ultra_tassels", "bboxMode":0, "bbox_bottom":23, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"f40bb243-5f2e-4891-8cb0-e9ef181276bf","name":"f40bb243-5f2e-4891-8cb0-e9ef181276bf","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"f40bb243-5f2e-4891-8cb0-e9ef181276bf","name":"f40bb243-5f2e-4891-8cb0-e9ef181276bf","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -69,9 +69,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"f40bb243-5f2e-4891-8cb0-e9ef181276bf","path":"sprites/spr_ultra_tassels/spr_ultra_tassels.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"3b63153c-72b6-4b61-a54e-91c447e89091","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"f40bb243-5f2e-4891-8cb0-e9ef181276bf","path":"sprites/spr_ultra_tassels/spr_ultra_tassels.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"3b63153c-72b6-4b61-a54e-91c447e89091","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_um_mk5_helm/spr_um_mk5_helm.yy b/sprites/spr_um_mk5_helm/spr_um_mk5_helm.yy index 39f772fcca..f57da1db34 100644 --- a/sprites/spr_um_mk5_helm/spr_um_mk5_helm.yy +++ b/sprites/spr_um_mk5_helm/spr_um_mk5_helm.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_um_mk5_helm", "bboxMode":0, "bbox_bottom":43, @@ -12,8 +12,8 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"a34a5a7c-0087-4f88-9e1b-1f6b0de26c98","name":"a34a5a7c-0087-4f88-9e1b-1f6b0de26c98","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"dbbaa29f-f078-4bb6-b016-3dea79733535","name":"dbbaa29f-f078-4bb6-b016-3dea79733535","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"a34a5a7c-0087-4f88-9e1b-1f6b0de26c98","name":"a34a5a7c-0087-4f88-9e1b-1f6b0de26c98","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"dbbaa29f-f078-4bb6-b016-3dea79733535","name":"dbbaa29f-f078-4bb6-b016-3dea79733535","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -69,12 +69,8 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"a34a5a7c-0087-4f88-9e1b-1f6b0de26c98","path":"sprites/spr_um_mk5_helm/spr_um_mk5_helm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"cd995780-905a-4fd2-994a-da7c0e54abf5","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"dbbaa29f-f078-4bb6-b016-3dea79733535","path":"sprites/spr_um_mk5_helm/spr_um_mk5_helm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"1803705e-b04d-49c6-8502-f2e093464157","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"a34a5a7c-0087-4f88-9e1b-1f6b0de26c98","path":"sprites/spr_um_mk5_helm/spr_um_mk5_helm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"cd995780-905a-4fd2-994a-da7c0e54abf5","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"dbbaa29f-f078-4bb6-b016-3dea79733535","path":"sprites/spr_um_mk5_helm/spr_um_mk5_helm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"1803705e-b04d-49c6-8502-f2e093464157","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_um_mk6_helm/spr_um_mk6_helm.yy b/sprites/spr_um_mk6_helm/spr_um_mk6_helm.yy index cbf616c1e8..207c229307 100644 --- a/sprites/spr_um_mk6_helm/spr_um_mk6_helm.yy +++ b/sprites/spr_um_mk6_helm/spr_um_mk6_helm.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_um_mk6_helm", "bboxMode":0, "bbox_bottom":47, @@ -12,8 +12,8 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"d2a2dc43-d898-4e23-bf95-47e59674c1ae","name":"d2a2dc43-d898-4e23-bf95-47e59674c1ae","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"123e63f4-8786-4da9-80c0-eed2c2787aee","name":"123e63f4-8786-4da9-80c0-eed2c2787aee","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"d2a2dc43-d898-4e23-bf95-47e59674c1ae","name":"d2a2dc43-d898-4e23-bf95-47e59674c1ae","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"123e63f4-8786-4da9-80c0-eed2c2787aee","name":"123e63f4-8786-4da9-80c0-eed2c2787aee","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -69,12 +69,8 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"d2a2dc43-d898-4e23-bf95-47e59674c1ae","path":"sprites/spr_um_mk6_helm/spr_um_mk6_helm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"5891a35a-57e8-4258-8689-2ad35315f960","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"123e63f4-8786-4da9-80c0-eed2c2787aee","path":"sprites/spr_um_mk6_helm/spr_um_mk6_helm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"334c5b1d-c7e3-4507-8389-bfc24b3f72bd","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"d2a2dc43-d898-4e23-bf95-47e59674c1ae","path":"sprites/spr_um_mk6_helm/spr_um_mk6_helm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"5891a35a-57e8-4258-8689-2ad35315f960","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"123e63f4-8786-4da9-80c0-eed2c2787aee","path":"sprites/spr_um_mk6_helm/spr_um_mk6_helm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"334c5b1d-c7e3-4507-8389-bfc24b3f72bd","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_um_mk7_helm/spr_um_mk7_helm.yy b/sprites/spr_um_mk7_helm/spr_um_mk7_helm.yy index 65070b033b..b50b3637b1 100644 --- a/sprites/spr_um_mk7_helm/spr_um_mk7_helm.yy +++ b/sprites/spr_um_mk7_helm/spr_um_mk7_helm.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_um_mk7_helm", "bboxMode":0, "bbox_bottom":43, @@ -12,8 +12,8 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"6b9a8c79-6936-465c-8cb4-6f189dcc7b56","name":"6b9a8c79-6936-465c-8cb4-6f189dcc7b56","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"95af43b6-33c2-4b19-acf4-ecbfec47cfb2","name":"95af43b6-33c2-4b19-acf4-ecbfec47cfb2","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"6b9a8c79-6936-465c-8cb4-6f189dcc7b56","name":"6b9a8c79-6936-465c-8cb4-6f189dcc7b56","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"95af43b6-33c2-4b19-acf4-ecbfec47cfb2","name":"95af43b6-33c2-4b19-acf4-ecbfec47cfb2","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -69,12 +69,8 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"6b9a8c79-6936-465c-8cb4-6f189dcc7b56","path":"sprites/spr_um_mk7_helm/spr_um_mk7_helm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"35cad202-64b0-4c42-9e1b-8e0763a24590","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"95af43b6-33c2-4b19-acf4-ecbfec47cfb2","path":"sprites/spr_um_mk7_helm/spr_um_mk7_helm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"046ff00a-8c12-467b-809f-e646aa3cd3a3","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"6b9a8c79-6936-465c-8cb4-6f189dcc7b56","path":"sprites/spr_um_mk7_helm/spr_um_mk7_helm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"35cad202-64b0-4c42-9e1b-8e0763a24590","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"95af43b6-33c2-4b19-acf4-ecbfec47cfb2","path":"sprites/spr_um_mk7_helm/spr_um_mk7_helm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"046ff00a-8c12-467b-809f-e646aa3cd3a3","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_view_small/spr_view_small.yy b/sprites/spr_view_small/spr_view_small.yy index 64c9edaca1..0d10cf3803 100644 --- a/sprites/spr_view_small/spr_view_small.yy +++ b/sprites/spr_view_small/spr_view_small.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_view_small", "bboxMode":0, "bbox_bottom":9, @@ -12,8 +12,8 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"044440c9-d329-4c30-ba70-5a2c9f23292a","name":"044440c9-d329-4c30-ba70-5a2c9f23292a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"e73e39b8-5523-45a3-b6d6-1c516f84aa03","name":"e73e39b8-5523-45a3-b6d6-1c516f84aa03","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"044440c9-d329-4c30-ba70-5a2c9f23292a","name":"044440c9-d329-4c30-ba70-5a2c9f23292a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"e73e39b8-5523-45a3-b6d6-1c516f84aa03","name":"e73e39b8-5523-45a3-b6d6-1c516f84aa03","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -69,12 +69,8 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"044440c9-d329-4c30-ba70-5a2c9f23292a","path":"sprites/spr_view_small/spr_view_small.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"c3202c5a-6b87-4d2b-a168-f5cf52f95634","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"e73e39b8-5523-45a3-b6d6-1c516f84aa03","path":"sprites/spr_view_small/spr_view_small.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"0e4933e1-4e75-431e-bf92-5aad96fc0535","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"044440c9-d329-4c30-ba70-5a2c9f23292a","path":"sprites/spr_view_small/spr_view_small.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"c3202c5a-6b87-4d2b-a168-f5cf52f95634","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"e73e39b8-5523-45a3-b6d6-1c516f84aa03","path":"sprites/spr_view_small/spr_view_small.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"0e4933e1-4e75-431e-bf92-5aad96fc0535","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":{ diff --git a/sprites/spr_warp_level_icon/spr_warp_level_icon.yy b/sprites/spr_warp_level_icon/spr_warp_level_icon.yy index 4293e5972e..19f698600a 100644 --- a/sprites/spr_warp_level_icon/spr_warp_level_icon.yy +++ b/sprites/spr_warp_level_icon/spr_warp_level_icon.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_warp_level_icon", "bboxMode":0, "bbox_bottom":62, @@ -12,10 +12,10 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"1ac1c13e-8fe0-4857-964b-4a822f33a1ba","name":"1ac1c13e-8fe0-4857-964b-4a822f33a1ba","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"bf4eeb68-da62-40ff-b77e-5f1be70badf6","name":"bf4eeb68-da62-40ff-b77e-5f1be70badf6","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"30ae56f9-3afc-4604-9923-40e8ff1f399a","name":"30ae56f9-3afc-4604-9923-40e8ff1f399a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"2adee574-b7ac-4be9-ac02-15eb6bc9c7df","name":"2adee574-b7ac-4be9-ac02-15eb6bc9c7df","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"1ac1c13e-8fe0-4857-964b-4a822f33a1ba","name":"1ac1c13e-8fe0-4857-964b-4a822f33a1ba","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"bf4eeb68-da62-40ff-b77e-5f1be70badf6","name":"bf4eeb68-da62-40ff-b77e-5f1be70badf6","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"30ae56f9-3afc-4604-9923-40e8ff1f399a","name":"30ae56f9-3afc-4604-9923-40e8ff1f399a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"2adee574-b7ac-4be9-ac02-15eb6bc9c7df","name":"2adee574-b7ac-4be9-ac02-15eb6bc9c7df","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -71,18 +71,10 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"1ac1c13e-8fe0-4857-964b-4a822f33a1ba","path":"sprites/spr_warp_level_icon/spr_warp_level_icon.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"89ce9d96-cb84-4577-9b51-09f273069236","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"bf4eeb68-da62-40ff-b77e-5f1be70badf6","path":"sprites/spr_warp_level_icon/spr_warp_level_icon.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"adaedfb1-be72-4784-9929-7a52ad3f6807","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"30ae56f9-3afc-4604-9923-40e8ff1f399a","path":"sprites/spr_warp_level_icon/spr_warp_level_icon.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"fb3df69a-aa7e-408b-bfef-1dc28a7406cf","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"2adee574-b7ac-4be9-ac02-15eb6bc9c7df","path":"sprites/spr_warp_level_icon/spr_warp_level_icon.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"ee80c0e6-271a-41bc-ac1c-aae420931a80","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"1ac1c13e-8fe0-4857-964b-4a822f33a1ba","path":"sprites/spr_warp_level_icon/spr_warp_level_icon.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"89ce9d96-cb84-4577-9b51-09f273069236","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"bf4eeb68-da62-40ff-b77e-5f1be70badf6","path":"sprites/spr_warp_level_icon/spr_warp_level_icon.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"adaedfb1-be72-4784-9929-7a52ad3f6807","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"30ae56f9-3afc-4604-9923-40e8ff1f399a","path":"sprites/spr_warp_level_icon/spr_warp_level_icon.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"fb3df69a-aa7e-408b-bfef-1dc28a7406cf","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"2adee574-b7ac-4be9-ac02-15eb6bc9c7df","path":"sprites/spr_warp_level_icon/spr_warp_level_icon.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"ee80c0e6-271a-41bc-ac1c-aae420931a80","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_warp_storm/spr_warp_storm.yy b/sprites/spr_warp_storm/spr_warp_storm.yy index b7e23e0631..9d61e5085f 100644 --- a/sprites/spr_warp_storm/spr_warp_storm.yy +++ b/sprites/spr_warp_storm/spr_warp_storm.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_warp_storm", "bboxMode":0, "bbox_bottom":89, @@ -12,63 +12,63 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"001dd472-8ab4-44d2-857c-71cf6472fadd","name":"001dd472-8ab4-44d2-857c-71cf6472fadd","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"b7812180-2591-44d2-a367-4a4e5159130d","name":"b7812180-2591-44d2-a367-4a4e5159130d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"5fe9664e-69ca-4c3e-b5bc-1e71a131c83e","name":"5fe9664e-69ca-4c3e-b5bc-1e71a131c83e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"8f7034b6-35b1-487a-bc58-bf84f7ac2ce9","name":"8f7034b6-35b1-487a-bc58-bf84f7ac2ce9","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"15800b58-edc0-496c-8195-459145884aed","name":"15800b58-edc0-496c-8195-459145884aed","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"cd13b7b8-ae5a-4c9a-b596-f5e78de151ab","name":"cd13b7b8-ae5a-4c9a-b596-f5e78de151ab","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"47f748bd-33d0-49da-9208-46164b6aa6cb","name":"47f748bd-33d0-49da-9208-46164b6aa6cb","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"fbb75ad3-480f-4c3e-a1b0-234a28c9e258","name":"fbb75ad3-480f-4c3e-a1b0-234a28c9e258","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"6843e0dd-a564-4504-906f-4e4d1e6447b6","name":"6843e0dd-a564-4504-906f-4e4d1e6447b6","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"cad9e2ca-cd8e-4207-a85c-dec58569fedb","name":"cad9e2ca-cd8e-4207-a85c-dec58569fedb","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"1461ee31-e5fa-4ea7-a8b0-a55491c8da6b","name":"1461ee31-e5fa-4ea7-a8b0-a55491c8da6b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"92a96d16-ea6a-485e-b6eb-ff9f66f95a0c","name":"92a96d16-ea6a-485e-b6eb-ff9f66f95a0c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"e581d13e-93fb-40ae-b19e-16d38a3217df","name":"e581d13e-93fb-40ae-b19e-16d38a3217df","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"80eee4c3-0717-4b6e-b919-97aa47b0a103","name":"80eee4c3-0717-4b6e-b919-97aa47b0a103","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"303f19a6-a0cf-48c9-85a6-046ce33e2399","name":"303f19a6-a0cf-48c9-85a6-046ce33e2399","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"39d631c4-756c-49fc-8ce9-af1c3231c3f8","name":"39d631c4-756c-49fc-8ce9-af1c3231c3f8","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"121911da-5579-46f2-b971-a6cc9da0a7b2","name":"121911da-5579-46f2-b971-a6cc9da0a7b2","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"5f4f938e-8cf8-449f-b4e7-8c421b415453","name":"5f4f938e-8cf8-449f-b4e7-8c421b415453","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"55e57ab6-5985-4329-9d0d-32a05dde7774","name":"55e57ab6-5985-4329-9d0d-32a05dde7774","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"6ec68ea6-1b16-4887-b804-10cd74d6b55b","name":"6ec68ea6-1b16-4887-b804-10cd74d6b55b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"e4ef10a7-d448-47a0-be37-03caef13d8e6","name":"e4ef10a7-d448-47a0-be37-03caef13d8e6","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"661f3ddd-9963-417c-81e1-794259b20aaa","name":"661f3ddd-9963-417c-81e1-794259b20aaa","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"26774b20-a68d-4c3d-9c53-d15c97c155cd","name":"26774b20-a68d-4c3d-9c53-d15c97c155cd","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"35bb266c-48a5-498b-8386-866a264b4397","name":"35bb266c-48a5-498b-8386-866a264b4397","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"1b9c7128-f748-48de-b091-803704177c56","name":"1b9c7128-f748-48de-b091-803704177c56","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"e3879639-cd44-49bf-aac7-57c56e75f00a","name":"e3879639-cd44-49bf-aac7-57c56e75f00a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"4b72d7ea-628b-44cf-ac6a-3b4172ad57fe","name":"4b72d7ea-628b-44cf-ac6a-3b4172ad57fe","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"fd2a9e9c-5615-4b9e-ab22-cf01174a5bbe","name":"fd2a9e9c-5615-4b9e-ab22-cf01174a5bbe","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"18be2b45-1a9a-45df-9262-6a56d53bbb0a","name":"18be2b45-1a9a-45df-9262-6a56d53bbb0a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"0ccbcee6-b55b-4539-b54b-d9f637a48eb7","name":"0ccbcee6-b55b-4539-b54b-d9f637a48eb7","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"cd7ede87-197b-4d41-9eea-5a3b95dd8a84","name":"cd7ede87-197b-4d41-9eea-5a3b95dd8a84","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"35b09eed-ac7f-4524-b585-4cf7bcfc98cb","name":"35b09eed-ac7f-4524-b585-4cf7bcfc98cb","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"f1c63c53-94e1-4d93-bded-e1ae682060ec","name":"f1c63c53-94e1-4d93-bded-e1ae682060ec","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"5ac3c194-9e9d-4297-a7dd-9278ea9cd0a8","name":"5ac3c194-9e9d-4297-a7dd-9278ea9cd0a8","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"d7274cf6-c9f9-4622-8690-b8934364bc08","name":"d7274cf6-c9f9-4622-8690-b8934364bc08","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"067d2cb3-7817-4e1b-92bb-44c36ee68ce8","name":"067d2cb3-7817-4e1b-92bb-44c36ee68ce8","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"6488d0f3-2239-435a-8cd8-41c1f7a89594","name":"6488d0f3-2239-435a-8cd8-41c1f7a89594","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"e096e0cb-49ca-489a-822d-adb750e9f30a","name":"e096e0cb-49ca-489a-822d-adb750e9f30a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"ab90fdde-6786-422a-8ac9-f0d893554b1d","name":"ab90fdde-6786-422a-8ac9-f0d893554b1d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"64be9c1a-01d5-43f6-95ab-eba1a35ea61a","name":"64be9c1a-01d5-43f6-95ab-eba1a35ea61a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"1ca4762c-fa6c-41f9-b365-78f92b122102","name":"1ca4762c-fa6c-41f9-b365-78f92b122102","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"dfedc27a-a776-448b-9370-0ce0dc899e44","name":"dfedc27a-a776-448b-9370-0ce0dc899e44","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"90f1bc52-4b49-4104-b25b-192ba372a072","name":"90f1bc52-4b49-4104-b25b-192ba372a072","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"69756b5f-11ee-4f6e-9dfc-bbf3f8a2b40d","name":"69756b5f-11ee-4f6e-9dfc-bbf3f8a2b40d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"a3b4b5e6-9afd-4890-b3e9-0e36c74d14fd","name":"a3b4b5e6-9afd-4890-b3e9-0e36c74d14fd","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"c7ca78fa-2f27-433e-a97f-1d0095b44faf","name":"c7ca78fa-2f27-433e-a97f-1d0095b44faf","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"4562253a-7206-4cb2-ae4e-9d9926e4cf15","name":"4562253a-7206-4cb2-ae4e-9d9926e4cf15","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"509b9c29-630b-4c5f-b019-fb14d550d8a9","name":"509b9c29-630b-4c5f-b019-fb14d550d8a9","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"0b9fe318-5f8a-4626-aafa-cb25f8e6a34f","name":"0b9fe318-5f8a-4626-aafa-cb25f8e6a34f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"f99542a3-b3aa-4e38-9bd8-c5d8c3fbf992","name":"f99542a3-b3aa-4e38-9bd8-c5d8c3fbf992","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"39edf8d3-2669-4256-8150-4c784b28c518","name":"39edf8d3-2669-4256-8150-4c784b28c518","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"6afb60f5-0470-4681-86c3-256940a372a7","name":"6afb60f5-0470-4681-86c3-256940a372a7","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"16695788-3b0d-4ad8-87e1-d537b0ec3373","name":"16695788-3b0d-4ad8-87e1-d537b0ec3373","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"823b1414-4a78-4745-9234-0f5df53e74cc","name":"823b1414-4a78-4745-9234-0f5df53e74cc","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"83fb8bf3-a467-4679-be90-6f5833b64f26","name":"83fb8bf3-a467-4679-be90-6f5833b64f26","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"b76958d1-6360-41df-8352-7cb6850d1100","name":"b76958d1-6360-41df-8352-7cb6850d1100","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"a025e794-d660-4430-a914-cd4b735734db","name":"a025e794-d660-4430-a914-cd4b735734db","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"001dd472-8ab4-44d2-857c-71cf6472fadd","name":"001dd472-8ab4-44d2-857c-71cf6472fadd","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"b7812180-2591-44d2-a367-4a4e5159130d","name":"b7812180-2591-44d2-a367-4a4e5159130d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"5fe9664e-69ca-4c3e-b5bc-1e71a131c83e","name":"5fe9664e-69ca-4c3e-b5bc-1e71a131c83e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"8f7034b6-35b1-487a-bc58-bf84f7ac2ce9","name":"8f7034b6-35b1-487a-bc58-bf84f7ac2ce9","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"15800b58-edc0-496c-8195-459145884aed","name":"15800b58-edc0-496c-8195-459145884aed","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"cd13b7b8-ae5a-4c9a-b596-f5e78de151ab","name":"cd13b7b8-ae5a-4c9a-b596-f5e78de151ab","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"47f748bd-33d0-49da-9208-46164b6aa6cb","name":"47f748bd-33d0-49da-9208-46164b6aa6cb","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"fbb75ad3-480f-4c3e-a1b0-234a28c9e258","name":"fbb75ad3-480f-4c3e-a1b0-234a28c9e258","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"6843e0dd-a564-4504-906f-4e4d1e6447b6","name":"6843e0dd-a564-4504-906f-4e4d1e6447b6","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"cad9e2ca-cd8e-4207-a85c-dec58569fedb","name":"cad9e2ca-cd8e-4207-a85c-dec58569fedb","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"1461ee31-e5fa-4ea7-a8b0-a55491c8da6b","name":"1461ee31-e5fa-4ea7-a8b0-a55491c8da6b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"92a96d16-ea6a-485e-b6eb-ff9f66f95a0c","name":"92a96d16-ea6a-485e-b6eb-ff9f66f95a0c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"e581d13e-93fb-40ae-b19e-16d38a3217df","name":"e581d13e-93fb-40ae-b19e-16d38a3217df","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"80eee4c3-0717-4b6e-b919-97aa47b0a103","name":"80eee4c3-0717-4b6e-b919-97aa47b0a103","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"303f19a6-a0cf-48c9-85a6-046ce33e2399","name":"303f19a6-a0cf-48c9-85a6-046ce33e2399","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"39d631c4-756c-49fc-8ce9-af1c3231c3f8","name":"39d631c4-756c-49fc-8ce9-af1c3231c3f8","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"121911da-5579-46f2-b971-a6cc9da0a7b2","name":"121911da-5579-46f2-b971-a6cc9da0a7b2","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"5f4f938e-8cf8-449f-b4e7-8c421b415453","name":"5f4f938e-8cf8-449f-b4e7-8c421b415453","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"55e57ab6-5985-4329-9d0d-32a05dde7774","name":"55e57ab6-5985-4329-9d0d-32a05dde7774","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"6ec68ea6-1b16-4887-b804-10cd74d6b55b","name":"6ec68ea6-1b16-4887-b804-10cd74d6b55b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"e4ef10a7-d448-47a0-be37-03caef13d8e6","name":"e4ef10a7-d448-47a0-be37-03caef13d8e6","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"661f3ddd-9963-417c-81e1-794259b20aaa","name":"661f3ddd-9963-417c-81e1-794259b20aaa","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"26774b20-a68d-4c3d-9c53-d15c97c155cd","name":"26774b20-a68d-4c3d-9c53-d15c97c155cd","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"35bb266c-48a5-498b-8386-866a264b4397","name":"35bb266c-48a5-498b-8386-866a264b4397","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"1b9c7128-f748-48de-b091-803704177c56","name":"1b9c7128-f748-48de-b091-803704177c56","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"e3879639-cd44-49bf-aac7-57c56e75f00a","name":"e3879639-cd44-49bf-aac7-57c56e75f00a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"4b72d7ea-628b-44cf-ac6a-3b4172ad57fe","name":"4b72d7ea-628b-44cf-ac6a-3b4172ad57fe","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"fd2a9e9c-5615-4b9e-ab22-cf01174a5bbe","name":"fd2a9e9c-5615-4b9e-ab22-cf01174a5bbe","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"18be2b45-1a9a-45df-9262-6a56d53bbb0a","name":"18be2b45-1a9a-45df-9262-6a56d53bbb0a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"0ccbcee6-b55b-4539-b54b-d9f637a48eb7","name":"0ccbcee6-b55b-4539-b54b-d9f637a48eb7","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"cd7ede87-197b-4d41-9eea-5a3b95dd8a84","name":"cd7ede87-197b-4d41-9eea-5a3b95dd8a84","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"35b09eed-ac7f-4524-b585-4cf7bcfc98cb","name":"35b09eed-ac7f-4524-b585-4cf7bcfc98cb","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"f1c63c53-94e1-4d93-bded-e1ae682060ec","name":"f1c63c53-94e1-4d93-bded-e1ae682060ec","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"5ac3c194-9e9d-4297-a7dd-9278ea9cd0a8","name":"5ac3c194-9e9d-4297-a7dd-9278ea9cd0a8","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"d7274cf6-c9f9-4622-8690-b8934364bc08","name":"d7274cf6-c9f9-4622-8690-b8934364bc08","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"067d2cb3-7817-4e1b-92bb-44c36ee68ce8","name":"067d2cb3-7817-4e1b-92bb-44c36ee68ce8","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"6488d0f3-2239-435a-8cd8-41c1f7a89594","name":"6488d0f3-2239-435a-8cd8-41c1f7a89594","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"e096e0cb-49ca-489a-822d-adb750e9f30a","name":"e096e0cb-49ca-489a-822d-adb750e9f30a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"ab90fdde-6786-422a-8ac9-f0d893554b1d","name":"ab90fdde-6786-422a-8ac9-f0d893554b1d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"64be9c1a-01d5-43f6-95ab-eba1a35ea61a","name":"64be9c1a-01d5-43f6-95ab-eba1a35ea61a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"1ca4762c-fa6c-41f9-b365-78f92b122102","name":"1ca4762c-fa6c-41f9-b365-78f92b122102","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"dfedc27a-a776-448b-9370-0ce0dc899e44","name":"dfedc27a-a776-448b-9370-0ce0dc899e44","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"90f1bc52-4b49-4104-b25b-192ba372a072","name":"90f1bc52-4b49-4104-b25b-192ba372a072","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"69756b5f-11ee-4f6e-9dfc-bbf3f8a2b40d","name":"69756b5f-11ee-4f6e-9dfc-bbf3f8a2b40d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"a3b4b5e6-9afd-4890-b3e9-0e36c74d14fd","name":"a3b4b5e6-9afd-4890-b3e9-0e36c74d14fd","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"c7ca78fa-2f27-433e-a97f-1d0095b44faf","name":"c7ca78fa-2f27-433e-a97f-1d0095b44faf","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"4562253a-7206-4cb2-ae4e-9d9926e4cf15","name":"4562253a-7206-4cb2-ae4e-9d9926e4cf15","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"509b9c29-630b-4c5f-b019-fb14d550d8a9","name":"509b9c29-630b-4c5f-b019-fb14d550d8a9","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"0b9fe318-5f8a-4626-aafa-cb25f8e6a34f","name":"0b9fe318-5f8a-4626-aafa-cb25f8e6a34f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"f99542a3-b3aa-4e38-9bd8-c5d8c3fbf992","name":"f99542a3-b3aa-4e38-9bd8-c5d8c3fbf992","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"39edf8d3-2669-4256-8150-4c784b28c518","name":"39edf8d3-2669-4256-8150-4c784b28c518","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"6afb60f5-0470-4681-86c3-256940a372a7","name":"6afb60f5-0470-4681-86c3-256940a372a7","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"16695788-3b0d-4ad8-87e1-d537b0ec3373","name":"16695788-3b0d-4ad8-87e1-d537b0ec3373","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"823b1414-4a78-4745-9234-0f5df53e74cc","name":"823b1414-4a78-4745-9234-0f5df53e74cc","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"83fb8bf3-a467-4679-be90-6f5833b64f26","name":"83fb8bf3-a467-4679-be90-6f5833b64f26","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"b76958d1-6360-41df-8352-7cb6850d1100","name":"b76958d1-6360-41df-8352-7cb6850d1100","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"a025e794-d660-4430-a914-cd4b735734db","name":"a025e794-d660-4430-a914-cd4b735734db","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -124,177 +124,63 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"001dd472-8ab4-44d2-857c-71cf6472fadd","path":"sprites/spr_warp_storm/spr_warp_storm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"bc0213e9-0f07-4f37-bcc0-59d734fcc547","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"b7812180-2591-44d2-a367-4a4e5159130d","path":"sprites/spr_warp_storm/spr_warp_storm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"e9c16fe8-62b2-480f-bb59-23522e6c9155","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"5fe9664e-69ca-4c3e-b5bc-1e71a131c83e","path":"sprites/spr_warp_storm/spr_warp_storm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"82ba1773-23d9-482c-a199-1d042d22b8a2","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"8f7034b6-35b1-487a-bc58-bf84f7ac2ce9","path":"sprites/spr_warp_storm/spr_warp_storm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"c22a8424-dbc7-47b9-832d-e4a7d7e6c0cb","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"15800b58-edc0-496c-8195-459145884aed","path":"sprites/spr_warp_storm/spr_warp_storm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"cfed53ee-1707-4303-80aa-334236fbff87","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"cd13b7b8-ae5a-4c9a-b596-f5e78de151ab","path":"sprites/spr_warp_storm/spr_warp_storm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"ddbc2049-164d-4c14-8f1a-fffe11f83710","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"47f748bd-33d0-49da-9208-46164b6aa6cb","path":"sprites/spr_warp_storm/spr_warp_storm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"de342073-23a5-4a54-a0fd-52288c702a2d","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"fbb75ad3-480f-4c3e-a1b0-234a28c9e258","path":"sprites/spr_warp_storm/spr_warp_storm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"ff42abb4-2dc9-4d5c-8748-7e65b61ed85d","IsCreationKey":false,"Key":7.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"6843e0dd-a564-4504-906f-4e4d1e6447b6","path":"sprites/spr_warp_storm/spr_warp_storm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"4f6777da-2fa6-4f33-b6f2-6ad9f8e0b5b2","IsCreationKey":false,"Key":8.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"cad9e2ca-cd8e-4207-a85c-dec58569fedb","path":"sprites/spr_warp_storm/spr_warp_storm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"e1681c32-37d4-4c3f-b957-b1d96a110dac","IsCreationKey":false,"Key":9.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"1461ee31-e5fa-4ea7-a8b0-a55491c8da6b","path":"sprites/spr_warp_storm/spr_warp_storm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"7bb3c0f0-1e42-4e91-8698-493bde9659d1","IsCreationKey":false,"Key":10.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"92a96d16-ea6a-485e-b6eb-ff9f66f95a0c","path":"sprites/spr_warp_storm/spr_warp_storm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"70559650-b60d-4cb3-8348-2bd34811ab23","IsCreationKey":false,"Key":11.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"e581d13e-93fb-40ae-b19e-16d38a3217df","path":"sprites/spr_warp_storm/spr_warp_storm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"5654832b-c20d-45ac-a0a8-6f5639238060","IsCreationKey":false,"Key":12.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"80eee4c3-0717-4b6e-b919-97aa47b0a103","path":"sprites/spr_warp_storm/spr_warp_storm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"516921ed-fc1f-401f-9cc4-a8b101d332ee","IsCreationKey":false,"Key":13.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"303f19a6-a0cf-48c9-85a6-046ce33e2399","path":"sprites/spr_warp_storm/spr_warp_storm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"9821bcb1-27ba-4391-a995-993c20bb45bd","IsCreationKey":false,"Key":14.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"39d631c4-756c-49fc-8ce9-af1c3231c3f8","path":"sprites/spr_warp_storm/spr_warp_storm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"1d1f5ba6-9212-4283-970b-88c2cf1031b0","IsCreationKey":false,"Key":15.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"121911da-5579-46f2-b971-a6cc9da0a7b2","path":"sprites/spr_warp_storm/spr_warp_storm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"a16c0ec9-5a5e-4847-a3b9-55195e11e22d","IsCreationKey":false,"Key":16.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"5f4f938e-8cf8-449f-b4e7-8c421b415453","path":"sprites/spr_warp_storm/spr_warp_storm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"85f3e091-2afa-4213-baa2-765dc2453c24","IsCreationKey":false,"Key":17.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"55e57ab6-5985-4329-9d0d-32a05dde7774","path":"sprites/spr_warp_storm/spr_warp_storm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"9e9c3f45-7582-455d-9e6e-a1b2242a2c13","IsCreationKey":false,"Key":18.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"6ec68ea6-1b16-4887-b804-10cd74d6b55b","path":"sprites/spr_warp_storm/spr_warp_storm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"ffb6cacf-c077-445a-aefc-b9c843d1b7e8","IsCreationKey":false,"Key":19.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"e4ef10a7-d448-47a0-be37-03caef13d8e6","path":"sprites/spr_warp_storm/spr_warp_storm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"7ee80225-8f0d-4f9e-bca0-c6a5f8e9c290","IsCreationKey":false,"Key":20.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"661f3ddd-9963-417c-81e1-794259b20aaa","path":"sprites/spr_warp_storm/spr_warp_storm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"bee71346-7830-4757-8201-8a7eef780e20","IsCreationKey":false,"Key":21.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"26774b20-a68d-4c3d-9c53-d15c97c155cd","path":"sprites/spr_warp_storm/spr_warp_storm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"47e8acd1-546e-4481-bda0-49c2c7637c94","IsCreationKey":false,"Key":22.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"35bb266c-48a5-498b-8386-866a264b4397","path":"sprites/spr_warp_storm/spr_warp_storm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"06791d29-0924-4ebd-8dcb-840e31b8e679","IsCreationKey":false,"Key":23.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"1b9c7128-f748-48de-b091-803704177c56","path":"sprites/spr_warp_storm/spr_warp_storm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"a49d31e5-e7db-4323-bc62-c30f7d1a6a15","IsCreationKey":false,"Key":24.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"e3879639-cd44-49bf-aac7-57c56e75f00a","path":"sprites/spr_warp_storm/spr_warp_storm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"222cd3d0-81f1-4200-94ec-804f7cb67c97","IsCreationKey":false,"Key":25.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"4b72d7ea-628b-44cf-ac6a-3b4172ad57fe","path":"sprites/spr_warp_storm/spr_warp_storm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"1e3c5b8a-db72-44e2-8aee-028dc208f855","IsCreationKey":false,"Key":26.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"fd2a9e9c-5615-4b9e-ab22-cf01174a5bbe","path":"sprites/spr_warp_storm/spr_warp_storm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"938b0f67-9fe6-4514-82be-e8a8aa1ba1a3","IsCreationKey":false,"Key":27.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"18be2b45-1a9a-45df-9262-6a56d53bbb0a","path":"sprites/spr_warp_storm/spr_warp_storm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"85d58801-0661-44d8-9385-a2a9269f833f","IsCreationKey":false,"Key":28.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"0ccbcee6-b55b-4539-b54b-d9f637a48eb7","path":"sprites/spr_warp_storm/spr_warp_storm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"cd615b80-86de-453e-a55f-902d5a7e79ec","IsCreationKey":false,"Key":29.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"cd7ede87-197b-4d41-9eea-5a3b95dd8a84","path":"sprites/spr_warp_storm/spr_warp_storm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"04964e4b-5fc5-4052-86e1-449e86854587","IsCreationKey":false,"Key":30.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"35b09eed-ac7f-4524-b585-4cf7bcfc98cb","path":"sprites/spr_warp_storm/spr_warp_storm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"cc7bbb99-44a3-4101-9d14-1fc6fa70944d","IsCreationKey":false,"Key":31.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"f1c63c53-94e1-4d93-bded-e1ae682060ec","path":"sprites/spr_warp_storm/spr_warp_storm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"fea695af-8be0-4e93-979f-44179b4bd03c","IsCreationKey":false,"Key":32.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"5ac3c194-9e9d-4297-a7dd-9278ea9cd0a8","path":"sprites/spr_warp_storm/spr_warp_storm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"b6f2012f-cb6b-48ba-a217-e9eb61564848","IsCreationKey":false,"Key":33.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"d7274cf6-c9f9-4622-8690-b8934364bc08","path":"sprites/spr_warp_storm/spr_warp_storm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"5d335ee2-98b4-4c47-8010-68f24ba1998a","IsCreationKey":false,"Key":34.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"067d2cb3-7817-4e1b-92bb-44c36ee68ce8","path":"sprites/spr_warp_storm/spr_warp_storm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"2e1e5bd2-a0c2-4e7a-905e-6281a1ad8443","IsCreationKey":false,"Key":35.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"6488d0f3-2239-435a-8cd8-41c1f7a89594","path":"sprites/spr_warp_storm/spr_warp_storm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"b4eb452a-1654-4cd3-bd9b-3fea7dfa9e3e","IsCreationKey":false,"Key":36.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"e096e0cb-49ca-489a-822d-adb750e9f30a","path":"sprites/spr_warp_storm/spr_warp_storm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"94f8b21e-3f7c-440a-acf2-feac47ae2440","IsCreationKey":false,"Key":37.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"ab90fdde-6786-422a-8ac9-f0d893554b1d","path":"sprites/spr_warp_storm/spr_warp_storm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"6f618c26-b531-489d-88ff-9f512843fabc","IsCreationKey":false,"Key":38.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"64be9c1a-01d5-43f6-95ab-eba1a35ea61a","path":"sprites/spr_warp_storm/spr_warp_storm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"c774f978-8b5b-46a3-9792-e7b689aa0876","IsCreationKey":false,"Key":39.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"1ca4762c-fa6c-41f9-b365-78f92b122102","path":"sprites/spr_warp_storm/spr_warp_storm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"2236f732-976a-48a1-8ac7-4b0ec0a0b011","IsCreationKey":false,"Key":40.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"dfedc27a-a776-448b-9370-0ce0dc899e44","path":"sprites/spr_warp_storm/spr_warp_storm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"33d60de5-7b19-429e-a2a9-a3766e7b6c37","IsCreationKey":false,"Key":41.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"90f1bc52-4b49-4104-b25b-192ba372a072","path":"sprites/spr_warp_storm/spr_warp_storm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"8477deb9-517b-496e-91cd-3bceb9508b29","IsCreationKey":false,"Key":42.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"69756b5f-11ee-4f6e-9dfc-bbf3f8a2b40d","path":"sprites/spr_warp_storm/spr_warp_storm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"757787a7-2519-45c0-b048-b58ac607cafd","IsCreationKey":false,"Key":43.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"a3b4b5e6-9afd-4890-b3e9-0e36c74d14fd","path":"sprites/spr_warp_storm/spr_warp_storm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"98c8fb73-a99d-4ab2-8c4a-8f41505916d8","IsCreationKey":false,"Key":44.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"c7ca78fa-2f27-433e-a97f-1d0095b44faf","path":"sprites/spr_warp_storm/spr_warp_storm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"6319c0d3-7730-4f13-8117-29bf1d8863c2","IsCreationKey":false,"Key":45.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"4562253a-7206-4cb2-ae4e-9d9926e4cf15","path":"sprites/spr_warp_storm/spr_warp_storm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"41baf1dc-d4d9-425f-844e-9587420504bb","IsCreationKey":false,"Key":46.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"509b9c29-630b-4c5f-b019-fb14d550d8a9","path":"sprites/spr_warp_storm/spr_warp_storm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"45cd24f6-6851-4042-a0b9-c6b268fef1f0","IsCreationKey":false,"Key":47.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"0b9fe318-5f8a-4626-aafa-cb25f8e6a34f","path":"sprites/spr_warp_storm/spr_warp_storm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"bb5399b0-9447-4211-b852-b735a0fe43f9","IsCreationKey":false,"Key":48.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"f99542a3-b3aa-4e38-9bd8-c5d8c3fbf992","path":"sprites/spr_warp_storm/spr_warp_storm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"f919bf3f-c9fc-40c8-a568-537a6dc1a476","IsCreationKey":false,"Key":49.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"39edf8d3-2669-4256-8150-4c784b28c518","path":"sprites/spr_warp_storm/spr_warp_storm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"fe5c46b8-8e03-43a0-9355-1d3d9d22809c","IsCreationKey":false,"Key":50.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"6afb60f5-0470-4681-86c3-256940a372a7","path":"sprites/spr_warp_storm/spr_warp_storm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"545913ed-e73c-4262-b149-932369ff4b33","IsCreationKey":false,"Key":51.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"16695788-3b0d-4ad8-87e1-d537b0ec3373","path":"sprites/spr_warp_storm/spr_warp_storm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"6e5590cf-7d4b-488d-beea-6906b5ad8381","IsCreationKey":false,"Key":52.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"823b1414-4a78-4745-9234-0f5df53e74cc","path":"sprites/spr_warp_storm/spr_warp_storm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"4b196899-8812-4c1e-85ec-d93ee27fdef6","IsCreationKey":false,"Key":53.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"83fb8bf3-a467-4679-be90-6f5833b64f26","path":"sprites/spr_warp_storm/spr_warp_storm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"f0f6cc36-a783-4220-ac9f-e02df0d5e39d","IsCreationKey":false,"Key":54.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"b76958d1-6360-41df-8352-7cb6850d1100","path":"sprites/spr_warp_storm/spr_warp_storm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"057783d5-4726-41c2-9bf3-203247453f94","IsCreationKey":false,"Key":55.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"a025e794-d660-4430-a914-cd4b735734db","path":"sprites/spr_warp_storm/spr_warp_storm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"7e000970-be30-436b-a58d-b6ad3bfc468d","IsCreationKey":false,"Key":56.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"001dd472-8ab4-44d2-857c-71cf6472fadd","path":"sprites/spr_warp_storm/spr_warp_storm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"bc0213e9-0f07-4f37-bcc0-59d734fcc547","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"b7812180-2591-44d2-a367-4a4e5159130d","path":"sprites/spr_warp_storm/spr_warp_storm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"e9c16fe8-62b2-480f-bb59-23522e6c9155","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"5fe9664e-69ca-4c3e-b5bc-1e71a131c83e","path":"sprites/spr_warp_storm/spr_warp_storm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"82ba1773-23d9-482c-a199-1d042d22b8a2","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"8f7034b6-35b1-487a-bc58-bf84f7ac2ce9","path":"sprites/spr_warp_storm/spr_warp_storm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"c22a8424-dbc7-47b9-832d-e4a7d7e6c0cb","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"15800b58-edc0-496c-8195-459145884aed","path":"sprites/spr_warp_storm/spr_warp_storm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"cfed53ee-1707-4303-80aa-334236fbff87","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"cd13b7b8-ae5a-4c9a-b596-f5e78de151ab","path":"sprites/spr_warp_storm/spr_warp_storm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"ddbc2049-164d-4c14-8f1a-fffe11f83710","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"47f748bd-33d0-49da-9208-46164b6aa6cb","path":"sprites/spr_warp_storm/spr_warp_storm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"de342073-23a5-4a54-a0fd-52288c702a2d","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"fbb75ad3-480f-4c3e-a1b0-234a28c9e258","path":"sprites/spr_warp_storm/spr_warp_storm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"ff42abb4-2dc9-4d5c-8748-7e65b61ed85d","IsCreationKey":false,"Key":7.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"6843e0dd-a564-4504-906f-4e4d1e6447b6","path":"sprites/spr_warp_storm/spr_warp_storm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"4f6777da-2fa6-4f33-b6f2-6ad9f8e0b5b2","IsCreationKey":false,"Key":8.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"cad9e2ca-cd8e-4207-a85c-dec58569fedb","path":"sprites/spr_warp_storm/spr_warp_storm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"e1681c32-37d4-4c3f-b957-b1d96a110dac","IsCreationKey":false,"Key":9.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"1461ee31-e5fa-4ea7-a8b0-a55491c8da6b","path":"sprites/spr_warp_storm/spr_warp_storm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"7bb3c0f0-1e42-4e91-8698-493bde9659d1","IsCreationKey":false,"Key":10.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"92a96d16-ea6a-485e-b6eb-ff9f66f95a0c","path":"sprites/spr_warp_storm/spr_warp_storm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"70559650-b60d-4cb3-8348-2bd34811ab23","IsCreationKey":false,"Key":11.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"e581d13e-93fb-40ae-b19e-16d38a3217df","path":"sprites/spr_warp_storm/spr_warp_storm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"5654832b-c20d-45ac-a0a8-6f5639238060","IsCreationKey":false,"Key":12.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"80eee4c3-0717-4b6e-b919-97aa47b0a103","path":"sprites/spr_warp_storm/spr_warp_storm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"516921ed-fc1f-401f-9cc4-a8b101d332ee","IsCreationKey":false,"Key":13.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"303f19a6-a0cf-48c9-85a6-046ce33e2399","path":"sprites/spr_warp_storm/spr_warp_storm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"9821bcb1-27ba-4391-a995-993c20bb45bd","IsCreationKey":false,"Key":14.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"39d631c4-756c-49fc-8ce9-af1c3231c3f8","path":"sprites/spr_warp_storm/spr_warp_storm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"1d1f5ba6-9212-4283-970b-88c2cf1031b0","IsCreationKey":false,"Key":15.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"121911da-5579-46f2-b971-a6cc9da0a7b2","path":"sprites/spr_warp_storm/spr_warp_storm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"a16c0ec9-5a5e-4847-a3b9-55195e11e22d","IsCreationKey":false,"Key":16.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"5f4f938e-8cf8-449f-b4e7-8c421b415453","path":"sprites/spr_warp_storm/spr_warp_storm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"85f3e091-2afa-4213-baa2-765dc2453c24","IsCreationKey":false,"Key":17.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"55e57ab6-5985-4329-9d0d-32a05dde7774","path":"sprites/spr_warp_storm/spr_warp_storm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"9e9c3f45-7582-455d-9e6e-a1b2242a2c13","IsCreationKey":false,"Key":18.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"6ec68ea6-1b16-4887-b804-10cd74d6b55b","path":"sprites/spr_warp_storm/spr_warp_storm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"ffb6cacf-c077-445a-aefc-b9c843d1b7e8","IsCreationKey":false,"Key":19.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"e4ef10a7-d448-47a0-be37-03caef13d8e6","path":"sprites/spr_warp_storm/spr_warp_storm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"7ee80225-8f0d-4f9e-bca0-c6a5f8e9c290","IsCreationKey":false,"Key":20.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"661f3ddd-9963-417c-81e1-794259b20aaa","path":"sprites/spr_warp_storm/spr_warp_storm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"bee71346-7830-4757-8201-8a7eef780e20","IsCreationKey":false,"Key":21.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"26774b20-a68d-4c3d-9c53-d15c97c155cd","path":"sprites/spr_warp_storm/spr_warp_storm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"47e8acd1-546e-4481-bda0-49c2c7637c94","IsCreationKey":false,"Key":22.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"35bb266c-48a5-498b-8386-866a264b4397","path":"sprites/spr_warp_storm/spr_warp_storm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"06791d29-0924-4ebd-8dcb-840e31b8e679","IsCreationKey":false,"Key":23.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"1b9c7128-f748-48de-b091-803704177c56","path":"sprites/spr_warp_storm/spr_warp_storm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"a49d31e5-e7db-4323-bc62-c30f7d1a6a15","IsCreationKey":false,"Key":24.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"e3879639-cd44-49bf-aac7-57c56e75f00a","path":"sprites/spr_warp_storm/spr_warp_storm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"222cd3d0-81f1-4200-94ec-804f7cb67c97","IsCreationKey":false,"Key":25.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"4b72d7ea-628b-44cf-ac6a-3b4172ad57fe","path":"sprites/spr_warp_storm/spr_warp_storm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"1e3c5b8a-db72-44e2-8aee-028dc208f855","IsCreationKey":false,"Key":26.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"fd2a9e9c-5615-4b9e-ab22-cf01174a5bbe","path":"sprites/spr_warp_storm/spr_warp_storm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"938b0f67-9fe6-4514-82be-e8a8aa1ba1a3","IsCreationKey":false,"Key":27.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"18be2b45-1a9a-45df-9262-6a56d53bbb0a","path":"sprites/spr_warp_storm/spr_warp_storm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"85d58801-0661-44d8-9385-a2a9269f833f","IsCreationKey":false,"Key":28.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"0ccbcee6-b55b-4539-b54b-d9f637a48eb7","path":"sprites/spr_warp_storm/spr_warp_storm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"cd615b80-86de-453e-a55f-902d5a7e79ec","IsCreationKey":false,"Key":29.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"cd7ede87-197b-4d41-9eea-5a3b95dd8a84","path":"sprites/spr_warp_storm/spr_warp_storm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"04964e4b-5fc5-4052-86e1-449e86854587","IsCreationKey":false,"Key":30.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"35b09eed-ac7f-4524-b585-4cf7bcfc98cb","path":"sprites/spr_warp_storm/spr_warp_storm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"cc7bbb99-44a3-4101-9d14-1fc6fa70944d","IsCreationKey":false,"Key":31.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"f1c63c53-94e1-4d93-bded-e1ae682060ec","path":"sprites/spr_warp_storm/spr_warp_storm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"fea695af-8be0-4e93-979f-44179b4bd03c","IsCreationKey":false,"Key":32.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"5ac3c194-9e9d-4297-a7dd-9278ea9cd0a8","path":"sprites/spr_warp_storm/spr_warp_storm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"b6f2012f-cb6b-48ba-a217-e9eb61564848","IsCreationKey":false,"Key":33.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"d7274cf6-c9f9-4622-8690-b8934364bc08","path":"sprites/spr_warp_storm/spr_warp_storm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"5d335ee2-98b4-4c47-8010-68f24ba1998a","IsCreationKey":false,"Key":34.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"067d2cb3-7817-4e1b-92bb-44c36ee68ce8","path":"sprites/spr_warp_storm/spr_warp_storm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"2e1e5bd2-a0c2-4e7a-905e-6281a1ad8443","IsCreationKey":false,"Key":35.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"6488d0f3-2239-435a-8cd8-41c1f7a89594","path":"sprites/spr_warp_storm/spr_warp_storm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"b4eb452a-1654-4cd3-bd9b-3fea7dfa9e3e","IsCreationKey":false,"Key":36.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"e096e0cb-49ca-489a-822d-adb750e9f30a","path":"sprites/spr_warp_storm/spr_warp_storm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"94f8b21e-3f7c-440a-acf2-feac47ae2440","IsCreationKey":false,"Key":37.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"ab90fdde-6786-422a-8ac9-f0d893554b1d","path":"sprites/spr_warp_storm/spr_warp_storm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"6f618c26-b531-489d-88ff-9f512843fabc","IsCreationKey":false,"Key":38.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"64be9c1a-01d5-43f6-95ab-eba1a35ea61a","path":"sprites/spr_warp_storm/spr_warp_storm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"c774f978-8b5b-46a3-9792-e7b689aa0876","IsCreationKey":false,"Key":39.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"1ca4762c-fa6c-41f9-b365-78f92b122102","path":"sprites/spr_warp_storm/spr_warp_storm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"2236f732-976a-48a1-8ac7-4b0ec0a0b011","IsCreationKey":false,"Key":40.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"dfedc27a-a776-448b-9370-0ce0dc899e44","path":"sprites/spr_warp_storm/spr_warp_storm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"33d60de5-7b19-429e-a2a9-a3766e7b6c37","IsCreationKey":false,"Key":41.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"90f1bc52-4b49-4104-b25b-192ba372a072","path":"sprites/spr_warp_storm/spr_warp_storm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"8477deb9-517b-496e-91cd-3bceb9508b29","IsCreationKey":false,"Key":42.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"69756b5f-11ee-4f6e-9dfc-bbf3f8a2b40d","path":"sprites/spr_warp_storm/spr_warp_storm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"757787a7-2519-45c0-b048-b58ac607cafd","IsCreationKey":false,"Key":43.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"a3b4b5e6-9afd-4890-b3e9-0e36c74d14fd","path":"sprites/spr_warp_storm/spr_warp_storm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"98c8fb73-a99d-4ab2-8c4a-8f41505916d8","IsCreationKey":false,"Key":44.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"c7ca78fa-2f27-433e-a97f-1d0095b44faf","path":"sprites/spr_warp_storm/spr_warp_storm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"6319c0d3-7730-4f13-8117-29bf1d8863c2","IsCreationKey":false,"Key":45.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"4562253a-7206-4cb2-ae4e-9d9926e4cf15","path":"sprites/spr_warp_storm/spr_warp_storm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"41baf1dc-d4d9-425f-844e-9587420504bb","IsCreationKey":false,"Key":46.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"509b9c29-630b-4c5f-b019-fb14d550d8a9","path":"sprites/spr_warp_storm/spr_warp_storm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"45cd24f6-6851-4042-a0b9-c6b268fef1f0","IsCreationKey":false,"Key":47.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"0b9fe318-5f8a-4626-aafa-cb25f8e6a34f","path":"sprites/spr_warp_storm/spr_warp_storm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"bb5399b0-9447-4211-b852-b735a0fe43f9","IsCreationKey":false,"Key":48.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"f99542a3-b3aa-4e38-9bd8-c5d8c3fbf992","path":"sprites/spr_warp_storm/spr_warp_storm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"f919bf3f-c9fc-40c8-a568-537a6dc1a476","IsCreationKey":false,"Key":49.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"39edf8d3-2669-4256-8150-4c784b28c518","path":"sprites/spr_warp_storm/spr_warp_storm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"fe5c46b8-8e03-43a0-9355-1d3d9d22809c","IsCreationKey":false,"Key":50.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"6afb60f5-0470-4681-86c3-256940a372a7","path":"sprites/spr_warp_storm/spr_warp_storm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"545913ed-e73c-4262-b149-932369ff4b33","IsCreationKey":false,"Key":51.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"16695788-3b0d-4ad8-87e1-d537b0ec3373","path":"sprites/spr_warp_storm/spr_warp_storm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"6e5590cf-7d4b-488d-beea-6906b5ad8381","IsCreationKey":false,"Key":52.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"823b1414-4a78-4745-9234-0f5df53e74cc","path":"sprites/spr_warp_storm/spr_warp_storm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"4b196899-8812-4c1e-85ec-d93ee27fdef6","IsCreationKey":false,"Key":53.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"83fb8bf3-a467-4679-be90-6f5833b64f26","path":"sprites/spr_warp_storm/spr_warp_storm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"f0f6cc36-a783-4220-ac9f-e02df0d5e39d","IsCreationKey":false,"Key":54.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"b76958d1-6360-41df-8352-7cb6850d1100","path":"sprites/spr_warp_storm/spr_warp_storm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"057783d5-4726-41c2-9bf3-203247453f94","IsCreationKey":false,"Key":55.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"a025e794-d660-4430-a914-cd4b735734db","path":"sprites/spr_warp_storm/spr_warp_storm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"7e000970-be30-436b-a58d-b6ad3bfc468d","IsCreationKey":false,"Key":56.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_weapon_assca/spr_weapon_assca.yy b/sprites/spr_weapon_assca/spr_weapon_assca.yy index ef8f28aafa..03789cc90e 100644 --- a/sprites/spr_weapon_assca/spr_weapon_assca.yy +++ b/sprites/spr_weapon_assca/spr_weapon_assca.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_weapon_assca", "bboxMode":0, "bbox_bottom":181, @@ -12,8 +12,8 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"a881943a-e7b3-4a2d-aa8e-4482d90446bf","name":"a881943a-e7b3-4a2d-aa8e-4482d90446bf","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"21efedf4-9277-4473-97ad-ebd8ccfaaf83","name":"21efedf4-9277-4473-97ad-ebd8ccfaaf83","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"a881943a-e7b3-4a2d-aa8e-4482d90446bf","name":"a881943a-e7b3-4a2d-aa8e-4482d90446bf","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"21efedf4-9277-4473-97ad-ebd8ccfaaf83","name":"21efedf4-9277-4473-97ad-ebd8ccfaaf83","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -69,12 +69,8 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"a881943a-e7b3-4a2d-aa8e-4482d90446bf","path":"sprites/spr_weapon_assca/spr_weapon_assca.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"a70e668f-46f5-4a71-adcd-b6ccda209baf","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"21efedf4-9277-4473-97ad-ebd8ccfaaf83","path":"sprites/spr_weapon_assca/spr_weapon_assca.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"904595b0-7b9a-4da8-81d1-1f2b0191245c","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"a881943a-e7b3-4a2d-aa8e-4482d90446bf","path":"sprites/spr_weapon_assca/spr_weapon_assca.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"a70e668f-46f5-4a71-adcd-b6ccda209baf","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"21efedf4-9277-4473-97ad-ebd8ccfaaf83","path":"sprites/spr_weapon_assca/spr_weapon_assca.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"904595b0-7b9a-4da8-81d1-1f2b0191245c","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_weapon_autocannon/spr_weapon_autocannon.yy b/sprites/spr_weapon_autocannon/spr_weapon_autocannon.yy index 82919e06e6..1ddf815fef 100644 --- a/sprites/spr_weapon_autocannon/spr_weapon_autocannon.yy +++ b/sprites/spr_weapon_autocannon/spr_weapon_autocannon.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_weapon_autocannon", "bboxMode":0, "bbox_bottom":188, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"2ed06758-6cd0-4527-9927-973e6e725413","name":"2ed06758-6cd0-4527-9927-973e6e725413","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"2ed06758-6cd0-4527-9927-973e6e725413","name":"2ed06758-6cd0-4527-9927-973e6e725413","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -69,9 +69,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"2ed06758-6cd0-4527-9927-973e6e725413","path":"sprites/spr_weapon_autocannon/spr_weapon_autocannon.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"f9022dec-ead4-4be3-bd89-24d1a6fa9782","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"2ed06758-6cd0-4527-9927-973e6e725413","path":"sprites/spr_weapon_autocannon/spr_weapon_autocannon.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"f9022dec-ead4-4be3-bd89-24d1a6fa9782","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_weapon_autocannon2/spr_weapon_autocannon2.yy b/sprites/spr_weapon_autocannon2/spr_weapon_autocannon2.yy index 512595a5b8..d720811d75 100644 --- a/sprites/spr_weapon_autocannon2/spr_weapon_autocannon2.yy +++ b/sprites/spr_weapon_autocannon2/spr_weapon_autocannon2.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_weapon_autocannon2", "bboxMode":0, "bbox_bottom":269, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"49d770e0-45f5-4f6a-932b-88984416b02a","name":"49d770e0-45f5-4f6a-932b-88984416b02a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"49d770e0-45f5-4f6a-932b-88984416b02a","name":"49d770e0-45f5-4f6a-932b-88984416b02a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"49d770e0-45f5-4f6a-932b-88984416b02a","path":"sprites/spr_weapon_autocannon2/spr_weapon_autocannon2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"55f330f1-2ff0-4f47-b37b-c68126f5ee37","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"49d770e0-45f5-4f6a-932b-88984416b02a","path":"sprites/spr_weapon_autocannon2/spr_weapon_autocannon2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"55f330f1-2ff0-4f47-b37b-c68126f5ee37","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_weapon_blank/spr_weapon_blank.yy b/sprites/spr_weapon_blank/spr_weapon_blank.yy index cafa8b7e9c..17a7680e33 100644 --- a/sprites/spr_weapon_blank/spr_weapon_blank.yy +++ b/sprites/spr_weapon_blank/spr_weapon_blank.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_weapon_blank", "bboxMode":0, "bbox_bottom":0, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"95a59f16-a359-4576-b23d-15ce21d9c9b4","name":"95a59f16-a359-4576-b23d-15ce21d9c9b4","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"95a59f16-a359-4576-b23d-15ce21d9c9b4","name":"95a59f16-a359-4576-b23d-15ce21d9c9b4","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"95a59f16-a359-4576-b23d-15ce21d9c9b4","path":"sprites/spr_weapon_blank/spr_weapon_blank.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"637be8ff-668a-4e8e-b6bb-0ad812ba2aea","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"95a59f16-a359-4576-b23d-15ce21d9c9b4","path":"sprites/spr_weapon_blank/spr_weapon_blank.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"637be8ff-668a-4e8e-b6bb-0ad812ba2aea","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_weapon_boarding/spr_weapon_boarding.yy b/sprites/spr_weapon_boarding/spr_weapon_boarding.yy index b0885c72f6..7cb589803d 100644 --- a/sprites/spr_weapon_boarding/spr_weapon_boarding.yy +++ b/sprites/spr_weapon_boarding/spr_weapon_boarding.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_weapon_boarding", "bboxMode":0, "bbox_bottom":221, @@ -12,10 +12,10 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"daea238a-4d48-48a6-be27-b0685c438110","name":"daea238a-4d48-48a6-be27-b0685c438110","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"8c633911-5e02-436d-a544-2990dee696c7","name":"8c633911-5e02-436d-a544-2990dee696c7","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"78efcc98-51d3-4128-bf26-28a0f57243ea","name":"78efcc98-51d3-4128-bf26-28a0f57243ea","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"2e3e4782-27f6-4bba-b0c4-7307106ef862","name":"2e3e4782-27f6-4bba-b0c4-7307106ef862","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"daea238a-4d48-48a6-be27-b0685c438110","name":"daea238a-4d48-48a6-be27-b0685c438110","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"8c633911-5e02-436d-a544-2990dee696c7","name":"8c633911-5e02-436d-a544-2990dee696c7","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"78efcc98-51d3-4128-bf26-28a0f57243ea","name":"78efcc98-51d3-4128-bf26-28a0f57243ea","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"2e3e4782-27f6-4bba-b0c4-7307106ef862","name":"2e3e4782-27f6-4bba-b0c4-7307106ef862","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -71,18 +71,10 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"daea238a-4d48-48a6-be27-b0685c438110","path":"sprites/spr_weapon_boarding/spr_weapon_boarding.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"511cc112-62e5-435d-aaf5-1cf7d8c9f862","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"8c633911-5e02-436d-a544-2990dee696c7","path":"sprites/spr_weapon_boarding/spr_weapon_boarding.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"b0869fef-9abb-49aa-bc3e-10c9f6f85865","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"78efcc98-51d3-4128-bf26-28a0f57243ea","path":"sprites/spr_weapon_boarding/spr_weapon_boarding.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"0bd72083-8186-40fb-a39d-e2816ed306fa","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"2e3e4782-27f6-4bba-b0c4-7307106ef862","path":"sprites/spr_weapon_boarding/spr_weapon_boarding.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"5596390f-1d0c-49a4-8c8d-073828523967","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"daea238a-4d48-48a6-be27-b0685c438110","path":"sprites/spr_weapon_boarding/spr_weapon_boarding.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"511cc112-62e5-435d-aaf5-1cf7d8c9f862","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"8c633911-5e02-436d-a544-2990dee696c7","path":"sprites/spr_weapon_boarding/spr_weapon_boarding.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"b0869fef-9abb-49aa-bc3e-10c9f6f85865","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"78efcc98-51d3-4128-bf26-28a0f57243ea","path":"sprites/spr_weapon_boarding/spr_weapon_boarding.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"0bd72083-8186-40fb-a39d-e2816ed306fa","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"2e3e4782-27f6-4bba-b0c4-7307106ef862","path":"sprites/spr_weapon_boarding/spr_weapon_boarding.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"5596390f-1d0c-49a4-8c8d-073828523967","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_weapon_bolter/spr_weapon_bolter.yy b/sprites/spr_weapon_bolter/spr_weapon_bolter.yy index 03522382e3..0c06d42df1 100644 --- a/sprites/spr_weapon_bolter/spr_weapon_bolter.yy +++ b/sprites/spr_weapon_bolter/spr_weapon_bolter.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_weapon_bolter", "bboxMode":0, "bbox_bottom":186, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"ed54fad2-a39b-4f07-9737-5b8f916bee92","name":"ed54fad2-a39b-4f07-9737-5b8f916bee92","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"ed54fad2-a39b-4f07-9737-5b8f916bee92","name":"ed54fad2-a39b-4f07-9737-5b8f916bee92","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -33,13 +33,7 @@ "resourceType":"GMNineSliceData", "resourceVersion":"2.0", "right":0, - "tileMode":[ - 0, - 0, - 0, - 0, - 0, - ], + "tileMode":[0,0,0,0,0,], "top":0, }, "origin":0, @@ -87,9 +81,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"ed54fad2-a39b-4f07-9737-5b8f916bee92","path":"sprites/spr_weapon_bolter/spr_weapon_bolter.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"1f0fec53-317a-4842-bc53-a72fcbb31466","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"ed54fad2-a39b-4f07-9737-5b8f916bee92","path":"sprites/spr_weapon_bolter/spr_weapon_bolter.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"1f0fec53-317a-4842-bc53-a72fcbb31466","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_weapon_boltpis/spr_weapon_boltpis.yy b/sprites/spr_weapon_boltpis/spr_weapon_boltpis.yy index ca61f285fe..6dc78e478f 100644 --- a/sprites/spr_weapon_boltpis/spr_weapon_boltpis.yy +++ b/sprites/spr_weapon_boltpis/spr_weapon_boltpis.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_weapon_boltpis", "bboxMode":0, "bbox_bottom":157, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"dd687c2e-3025-40e4-a63d-1de5355c1cb7","name":"dd687c2e-3025-40e4-a63d-1de5355c1cb7","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"dd687c2e-3025-40e4-a63d-1de5355c1cb7","name":"dd687c2e-3025-40e4-a63d-1de5355c1cb7","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -70,9 +70,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"dd687c2e-3025-40e4-a63d-1de5355c1cb7","path":"sprites/spr_weapon_boltpis/spr_weapon_boltpis.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"0c722af6-a209-4472-8eb0-1060349ba7d3","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"dd687c2e-3025-40e4-a63d-1de5355c1cb7","path":"sprites/spr_weapon_boltpis/spr_weapon_boltpis.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"0c722af6-a209-4472-8eb0-1060349ba7d3","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_weapon_boltstorm_gauntlet/spr_weapon_boltstorm_gauntlet.yy b/sprites/spr_weapon_boltstorm_gauntlet/spr_weapon_boltstorm_gauntlet.yy index 4a46b0a0ad..8efd6f9373 100644 --- a/sprites/spr_weapon_boltstorm_gauntlet/spr_weapon_boltstorm_gauntlet.yy +++ b/sprites/spr_weapon_boltstorm_gauntlet/spr_weapon_boltstorm_gauntlet.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_weapon_boltstorm_gauntlet", "bboxMode":0, "bbox_bottom":188, @@ -12,8 +12,8 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"de3dcbc3-1a69-4b3c-ad1b-9c3dbaae504c","name":"de3dcbc3-1a69-4b3c-ad1b-9c3dbaae504c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"8e090f2a-a77c-4b20-b80c-d231322ff1f1","name":"8e090f2a-a77c-4b20-b80c-d231322ff1f1","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"de3dcbc3-1a69-4b3c-ad1b-9c3dbaae504c","name":"de3dcbc3-1a69-4b3c-ad1b-9c3dbaae504c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"8e090f2a-a77c-4b20-b80c-d231322ff1f1","name":"8e090f2a-a77c-4b20-b80c-d231322ff1f1","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -70,12 +70,8 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"de3dcbc3-1a69-4b3c-ad1b-9c3dbaae504c","path":"sprites/spr_weapon_boltstorm_gauntlet/spr_weapon_boltstorm_gauntlet.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"c2388d3e-d30e-46b1-a568-dd53914a27be","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"8e090f2a-a77c-4b20-b80c-d231322ff1f1","path":"sprites/spr_weapon_boltstorm_gauntlet/spr_weapon_boltstorm_gauntlet.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"97a52d30-b572-4541-8f4c-46d0ee48254e","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"de3dcbc3-1a69-4b3c-ad1b-9c3dbaae504c","path":"sprites/spr_weapon_boltstorm_gauntlet/spr_weapon_boltstorm_gauntlet.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"c2388d3e-d30e-46b1-a568-dd53914a27be","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"8e090f2a-a77c-4b20-b80c-d231322ff1f1","path":"sprites/spr_weapon_boltstorm_gauntlet/spr_weapon_boltstorm_gauntlet.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"97a52d30-b572-4541-8f4c-46d0ee48254e","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_weapon_boltstorm_gauntlet_small/spr_weapon_boltstorm_gauntlet_small.yy b/sprites/spr_weapon_boltstorm_gauntlet_small/spr_weapon_boltstorm_gauntlet_small.yy index 4939741bd6..707c2bfb55 100644 --- a/sprites/spr_weapon_boltstorm_gauntlet_small/spr_weapon_boltstorm_gauntlet_small.yy +++ b/sprites/spr_weapon_boltstorm_gauntlet_small/spr_weapon_boltstorm_gauntlet_small.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_weapon_boltstorm_gauntlet_small", "bboxMode":0, "bbox_bottom":182, @@ -12,8 +12,8 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"b72324e5-1184-447b-810f-30d301bb38bd","name":"b72324e5-1184-447b-810f-30d301bb38bd","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"67a93404-3327-48e0-b33e-42e8aae7cf9e","name":"67a93404-3327-48e0-b33e-42e8aae7cf9e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"b72324e5-1184-447b-810f-30d301bb38bd","name":"b72324e5-1184-447b-810f-30d301bb38bd","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"67a93404-3327-48e0-b33e-42e8aae7cf9e","name":"67a93404-3327-48e0-b33e-42e8aae7cf9e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -70,12 +70,8 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"b72324e5-1184-447b-810f-30d301bb38bd","path":"sprites/spr_weapon_boltstorm_gauntlet_small/spr_weapon_boltstorm_gauntlet_small.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"a9997dd8-c5ac-4a1a-817d-9fd94e568823","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"67a93404-3327-48e0-b33e-42e8aae7cf9e","path":"sprites/spr_weapon_boltstorm_gauntlet_small/spr_weapon_boltstorm_gauntlet_small.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"ed24bd0a-4896-40c9-838c-cc10b1e39025","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"b72324e5-1184-447b-810f-30d301bb38bd","path":"sprites/spr_weapon_boltstorm_gauntlet_small/spr_weapon_boltstorm_gauntlet_small.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"a9997dd8-c5ac-4a1a-817d-9fd94e568823","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"67a93404-3327-48e0-b33e-42e8aae7cf9e","path":"sprites/spr_weapon_boltstorm_gauntlet_small/spr_weapon_boltstorm_gauntlet_small.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"ed24bd0a-4896-40c9-838c-cc10b1e39025","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_weapon_chainfist/spr_weapon_chainfist.yy b/sprites/spr_weapon_chainfist/spr_weapon_chainfist.yy index 6acc547264..43f7308d14 100644 --- a/sprites/spr_weapon_chainfist/spr_weapon_chainfist.yy +++ b/sprites/spr_weapon_chainfist/spr_weapon_chainfist.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_weapon_chainfist", "bboxMode":0, "bbox_bottom":238, @@ -12,8 +12,8 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"33dc232c-077a-436b-a8c8-a0f1d5790709","name":"33dc232c-077a-436b-a8c8-a0f1d5790709","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"14f21d91-8b62-4ba2-8899-49d496bd87a1","name":"14f21d91-8b62-4ba2-8899-49d496bd87a1","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"33dc232c-077a-436b-a8c8-a0f1d5790709","name":"33dc232c-077a-436b-a8c8-a0f1d5790709","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"14f21d91-8b62-4ba2-8899-49d496bd87a1","name":"14f21d91-8b62-4ba2-8899-49d496bd87a1","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -70,12 +70,8 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"33dc232c-077a-436b-a8c8-a0f1d5790709","path":"sprites/spr_weapon_chainfist/spr_weapon_chainfist.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"2aca1500-1e46-48ba-8d39-8832199ad865","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"14f21d91-8b62-4ba2-8899-49d496bd87a1","path":"sprites/spr_weapon_chainfist/spr_weapon_chainfist.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"ad3078d7-4d64-4c24-b5db-17c175c043d1","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"33dc232c-077a-436b-a8c8-a0f1d5790709","path":"sprites/spr_weapon_chainfist/spr_weapon_chainfist.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"2aca1500-1e46-48ba-8d39-8832199ad865","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"14f21d91-8b62-4ba2-8899-49d496bd87a1","path":"sprites/spr_weapon_chainfist/spr_weapon_chainfist.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"ad3078d7-4d64-4c24-b5db-17c175c043d1","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_weapon_chainfist_small/spr_weapon_chainfist_small.yy b/sprites/spr_weapon_chainfist_small/spr_weapon_chainfist_small.yy index 0e5097c879..a951407ccf 100644 --- a/sprites/spr_weapon_chainfist_small/spr_weapon_chainfist_small.yy +++ b/sprites/spr_weapon_chainfist_small/spr_weapon_chainfist_small.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_weapon_chainfist_small", "bboxMode":0, "bbox_bottom":231, @@ -12,8 +12,8 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"b72324e5-1184-447b-810f-30d301bb38bd","name":"b72324e5-1184-447b-810f-30d301bb38bd","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"ed640cbb-a482-497a-8c41-5bf4ef9883ae","name":"ed640cbb-a482-497a-8c41-5bf4ef9883ae","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"b72324e5-1184-447b-810f-30d301bb38bd","name":"b72324e5-1184-447b-810f-30d301bb38bd","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"ed640cbb-a482-497a-8c41-5bf4ef9883ae","name":"ed640cbb-a482-497a-8c41-5bf4ef9883ae","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -70,12 +70,8 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"b72324e5-1184-447b-810f-30d301bb38bd","path":"sprites/spr_weapon_chainfist_small/spr_weapon_chainfist_small.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"64a7d678-a244-456b-b317-31f452cd6459","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"ed640cbb-a482-497a-8c41-5bf4ef9883ae","path":"sprites/spr_weapon_chainfist_small/spr_weapon_chainfist_small.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"7eb962ec-d2a6-41ba-b53d-b74c98fa6374","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"b72324e5-1184-447b-810f-30d301bb38bd","path":"sprites/spr_weapon_chainfist_small/spr_weapon_chainfist_small.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"64a7d678-a244-456b-b317-31f452cd6459","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"ed640cbb-a482-497a-8c41-5bf4ef9883ae","path":"sprites/spr_weapon_chainfist_small/spr_weapon_chainfist_small.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"7eb962ec-d2a6-41ba-b53d-b74c98fa6374","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_weapon_chaxe/spr_weapon_chaxe.yy b/sprites/spr_weapon_chaxe/spr_weapon_chaxe.yy index 20751a496b..8d4b35744d 100644 --- a/sprites/spr_weapon_chaxe/spr_weapon_chaxe.yy +++ b/sprites/spr_weapon_chaxe/spr_weapon_chaxe.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_weapon_chaxe", "bboxMode":0, "bbox_bottom":218, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"53399b32-65ae-42fe-aeba-a917fde0dbe8","name":"53399b32-65ae-42fe-aeba-a917fde0dbe8","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"53399b32-65ae-42fe-aeba-a917fde0dbe8","name":"53399b32-65ae-42fe-aeba-a917fde0dbe8","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"53399b32-65ae-42fe-aeba-a917fde0dbe8","path":"sprites/spr_weapon_chaxe/spr_weapon_chaxe.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"3c650843-7b9c-42f1-a8b5-86dfe07f4222","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"53399b32-65ae-42fe-aeba-a917fde0dbe8","path":"sprites/spr_weapon_chaxe/spr_weapon_chaxe.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"3c650843-7b9c-42f1-a8b5-86dfe07f4222","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_weapon_chsword/spr_weapon_chsword.yy b/sprites/spr_weapon_chsword/spr_weapon_chsword.yy index 9b4e4d5827..946b1ce5d3 100644 --- a/sprites/spr_weapon_chsword/spr_weapon_chsword.yy +++ b/sprites/spr_weapon_chsword/spr_weapon_chsword.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_weapon_chsword", "bboxMode":0, "bbox_bottom":222, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"cf403b7b-a831-4dd7-94fc-490b330d9a3b","name":"cf403b7b-a831-4dd7-94fc-490b330d9a3b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"cf403b7b-a831-4dd7-94fc-490b330d9a3b","name":"cf403b7b-a831-4dd7-94fc-490b330d9a3b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"cf403b7b-a831-4dd7-94fc-490b330d9a3b","path":"sprites/spr_weapon_chsword/spr_weapon_chsword.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"877d958c-0ba3-4cf7-b6c6-61d21827c596","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"cf403b7b-a831-4dd7-94fc-490b330d9a3b","path":"sprites/spr_weapon_chsword/spr_weapon_chsword.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"877d958c-0ba3-4cf7-b6c6-61d21827c596","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_weapon_colors/spr_weapon_colors.yy b/sprites/spr_weapon_colors/spr_weapon_colors.yy index bf5dbf26ce..121ad35f6b 100644 --- a/sprites/spr_weapon_colors/spr_weapon_colors.yy +++ b/sprites/spr_weapon_colors/spr_weapon_colors.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_weapon_colors", "bboxMode":0, "bbox_bottom":230, @@ -12,9 +12,9 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"29c7b8be-ce2a-48e9-b580-b0dec2cc9125","name":"29c7b8be-ce2a-48e9-b580-b0dec2cc9125","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"50502d0a-b361-459e-8c5b-7430a68f0599","name":"50502d0a-b361-459e-8c5b-7430a68f0599","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"8420bbe7-ec74-473b-b6d8-775b6c217447","name":"8420bbe7-ec74-473b-b6d8-775b6c217447","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"29c7b8be-ce2a-48e9-b580-b0dec2cc9125","name":"29c7b8be-ce2a-48e9-b580-b0dec2cc9125","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"50502d0a-b361-459e-8c5b-7430a68f0599","name":"50502d0a-b361-459e-8c5b-7430a68f0599","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"8420bbe7-ec74-473b-b6d8-775b6c217447","name":"8420bbe7-ec74-473b-b6d8-775b6c217447","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -70,15 +70,9 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"29c7b8be-ce2a-48e9-b580-b0dec2cc9125","path":"sprites/spr_weapon_colors/spr_weapon_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"e5a82c97-521e-49f1-ae7d-1c6cdc38c3fd","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"50502d0a-b361-459e-8c5b-7430a68f0599","path":"sprites/spr_weapon_colors/spr_weapon_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"a6fbbe5d-1522-44ee-8aeb-a63323355a15","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"8420bbe7-ec74-473b-b6d8-775b6c217447","path":"sprites/spr_weapon_colors/spr_weapon_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"41137b6f-df33-45c8-b42e-8e28dd5fd26d","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"29c7b8be-ce2a-48e9-b580-b0dec2cc9125","path":"sprites/spr_weapon_colors/spr_weapon_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"e5a82c97-521e-49f1-ae7d-1c6cdc38c3fd","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"50502d0a-b361-459e-8c5b-7430a68f0599","path":"sprites/spr_weapon_colors/spr_weapon_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"a6fbbe5d-1522-44ee-8aeb-a63323355a15","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"8420bbe7-ec74-473b-b6d8-775b6c217447","path":"sprites/spr_weapon_colors/spr_weapon_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"41137b6f-df33-45c8-b42e-8e28dd5fd26d","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_weapon_comflamer/spr_weapon_comflamer.yy b/sprites/spr_weapon_comflamer/spr_weapon_comflamer.yy index dcfc7e4c3d..25f684f289 100644 --- a/sprites/spr_weapon_comflamer/spr_weapon_comflamer.yy +++ b/sprites/spr_weapon_comflamer/spr_weapon_comflamer.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_weapon_comflamer", "bboxMode":0, "bbox_bottom":214, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"8d182e05-2b04-4c1a-8e51-95230a7b0ce0","name":"8d182e05-2b04-4c1a-8e51-95230a7b0ce0","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"8d182e05-2b04-4c1a-8e51-95230a7b0ce0","name":"8d182e05-2b04-4c1a-8e51-95230a7b0ce0","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"8d182e05-2b04-4c1a-8e51-95230a7b0ce0","path":"sprites/spr_weapon_comflamer/spr_weapon_comflamer.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"7b484c45-0fb4-4a0e-9361-40cc333730bb","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"8d182e05-2b04-4c1a-8e51-95230a7b0ce0","path":"sprites/spr_weapon_comflamer/spr_weapon_comflamer.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"7b484c45-0fb4-4a0e-9361-40cc333730bb","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_weapon_comgrav/spr_weapon_comgrav.yy b/sprites/spr_weapon_comgrav/spr_weapon_comgrav.yy index c5905aa976..dbae71492f 100644 --- a/sprites/spr_weapon_comgrav/spr_weapon_comgrav.yy +++ b/sprites/spr_weapon_comgrav/spr_weapon_comgrav.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_weapon_comgrav", "bboxMode":0, "bbox_bottom":190, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"8d182e05-2b04-4c1a-8e51-95230a7b0ce0","name":"8d182e05-2b04-4c1a-8e51-95230a7b0ce0","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"8d182e05-2b04-4c1a-8e51-95230a7b0ce0","name":"8d182e05-2b04-4c1a-8e51-95230a7b0ce0","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"8d182e05-2b04-4c1a-8e51-95230a7b0ce0","path":"sprites/spr_weapon_comgrav/spr_weapon_comgrav.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"fa3e98b7-e1af-483f-a0e2-4bb9b2eaa6a3","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"8d182e05-2b04-4c1a-8e51-95230a7b0ce0","path":"sprites/spr_weapon_comgrav/spr_weapon_comgrav.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"fa3e98b7-e1af-483f-a0e2-4bb9b2eaa6a3","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_weapon_commelta/spr_weapon_commelta.yy b/sprites/spr_weapon_commelta/spr_weapon_commelta.yy index 6c995b7646..bb1f2b882c 100644 --- a/sprites/spr_weapon_commelta/spr_weapon_commelta.yy +++ b/sprites/spr_weapon_commelta/spr_weapon_commelta.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_weapon_commelta", "bboxMode":0, "bbox_bottom":193, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"8d182e05-2b04-4c1a-8e51-95230a7b0ce0","name":"8d182e05-2b04-4c1a-8e51-95230a7b0ce0","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"8d182e05-2b04-4c1a-8e51-95230a7b0ce0","name":"8d182e05-2b04-4c1a-8e51-95230a7b0ce0","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"8d182e05-2b04-4c1a-8e51-95230a7b0ce0","path":"sprites/spr_weapon_commelta/spr_weapon_commelta.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"46d36c12-1869-4661-9233-2359ea03459a","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"8d182e05-2b04-4c1a-8e51-95230a7b0ce0","path":"sprites/spr_weapon_commelta/spr_weapon_commelta.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"46d36c12-1869-4661-9233-2359ea03459a","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_weapon_complas/spr_weapon_complas.yy b/sprites/spr_weapon_complas/spr_weapon_complas.yy index a2d32dd693..823e0f07a0 100644 --- a/sprites/spr_weapon_complas/spr_weapon_complas.yy +++ b/sprites/spr_weapon_complas/spr_weapon_complas.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_weapon_complas", "bboxMode":0, "bbox_bottom":188, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"8d182e05-2b04-4c1a-8e51-95230a7b0ce0","name":"8d182e05-2b04-4c1a-8e51-95230a7b0ce0","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"8d182e05-2b04-4c1a-8e51-95230a7b0ce0","name":"8d182e05-2b04-4c1a-8e51-95230a7b0ce0","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"8d182e05-2b04-4c1a-8e51-95230a7b0ce0","path":"sprites/spr_weapon_complas/spr_weapon_complas.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"0e5740de-eb74-4f25-9419-097f6d429f97","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"8d182e05-2b04-4c1a-8e51-95230a7b0ce0","path":"sprites/spr_weapon_complas/spr_weapon_complas.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"0e5740de-eb74-4f25-9419-097f6d429f97","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_weapon_crozarc/spr_weapon_crozarc.yy b/sprites/spr_weapon_crozarc/spr_weapon_crozarc.yy index c7ab92734a..314a1a2410 100644 --- a/sprites/spr_weapon_crozarc/spr_weapon_crozarc.yy +++ b/sprites/spr_weapon_crozarc/spr_weapon_crozarc.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_weapon_crozarc", "bboxMode":0, "bbox_bottom":216, @@ -12,8 +12,8 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"ff8f3b8f-e6d3-4ab5-9964-7d942b49dc26","name":"ff8f3b8f-e6d3-4ab5-9964-7d942b49dc26","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"dc91fe9c-4af9-4355-9a5b-8026131bffcb","name":"dc91fe9c-4af9-4355-9a5b-8026131bffcb","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"ff8f3b8f-e6d3-4ab5-9964-7d942b49dc26","name":"ff8f3b8f-e6d3-4ab5-9964-7d942b49dc26","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"dc91fe9c-4af9-4355-9a5b-8026131bffcb","name":"dc91fe9c-4af9-4355-9a5b-8026131bffcb","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -69,12 +69,8 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"ff8f3b8f-e6d3-4ab5-9964-7d942b49dc26","path":"sprites/spr_weapon_crozarc/spr_weapon_crozarc.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"9eab9f74-15b4-456c-8c7c-ae59842340a8","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"dc91fe9c-4af9-4355-9a5b-8026131bffcb","path":"sprites/spr_weapon_crozarc/spr_weapon_crozarc.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"24773002-9e70-4bb6-8e4e-25af34700cd4","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"ff8f3b8f-e6d3-4ab5-9964-7d942b49dc26","path":"sprites/spr_weapon_crozarc/spr_weapon_crozarc.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"9eab9f74-15b4-456c-8c7c-ae59842340a8","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"dc91fe9c-4af9-4355-9a5b-8026131bffcb","path":"sprites/spr_weapon_crozarc/spr_weapon_crozarc.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"24773002-9e70-4bb6-8e4e-25af34700cd4","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_weapon_eldsword/spr_weapon_eldsword.yy b/sprites/spr_weapon_eldsword/spr_weapon_eldsword.yy index 9cea05b3ce..511a4b8061 100644 --- a/sprites/spr_weapon_eldsword/spr_weapon_eldsword.yy +++ b/sprites/spr_weapon_eldsword/spr_weapon_eldsword.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_weapon_eldsword", "bboxMode":0, "bbox_bottom":211, @@ -12,8 +12,8 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"75b84618-33d2-48de-be45-cbf2383a7323","name":"75b84618-33d2-48de-be45-cbf2383a7323","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"27510bd8-a89a-4cd8-abc9-d39b1f92f0ff","name":"27510bd8-a89a-4cd8-abc9-d39b1f92f0ff","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"75b84618-33d2-48de-be45-cbf2383a7323","name":"75b84618-33d2-48de-be45-cbf2383a7323","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"27510bd8-a89a-4cd8-abc9-d39b1f92f0ff","name":"27510bd8-a89a-4cd8-abc9-d39b1f92f0ff","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -69,12 +69,8 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"75b84618-33d2-48de-be45-cbf2383a7323","path":"sprites/spr_weapon_eldsword/spr_weapon_eldsword.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"15ac1141-71a9-490d-ab55-2df178b0cd36","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"27510bd8-a89a-4cd8-abc9-d39b1f92f0ff","path":"sprites/spr_weapon_eldsword/spr_weapon_eldsword.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"0cdb8b25-52a3-4a26-8d12-8518e68d6995","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"75b84618-33d2-48de-be45-cbf2383a7323","path":"sprites/spr_weapon_eldsword/spr_weapon_eldsword.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"15ac1141-71a9-490d-ab55-2df178b0cd36","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"27510bd8-a89a-4cd8-abc9-d39b1f92f0ff","path":"sprites/spr_weapon_eldsword/spr_weapon_eldsword.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"0cdb8b25-52a3-4a26-8d12-8518e68d6995","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_weapon_evisc/spr_weapon_evisc.yy b/sprites/spr_weapon_evisc/spr_weapon_evisc.yy index a31d464f18..a4a001d7dc 100644 --- a/sprites/spr_weapon_evisc/spr_weapon_evisc.yy +++ b/sprites/spr_weapon_evisc/spr_weapon_evisc.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_weapon_evisc", "bboxMode":0, "bbox_bottom":271, @@ -12,8 +12,8 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"774b09dd-5c0c-4e15-8357-7f2df7fe94b8","name":"774b09dd-5c0c-4e15-8357-7f2df7fe94b8","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"f1061812-3385-46d3-abc9-570c9b907700","name":"f1061812-3385-46d3-abc9-570c9b907700","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"774b09dd-5c0c-4e15-8357-7f2df7fe94b8","name":"774b09dd-5c0c-4e15-8357-7f2df7fe94b8","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"f1061812-3385-46d3-abc9-570c9b907700","name":"f1061812-3385-46d3-abc9-570c9b907700","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -70,12 +70,8 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"774b09dd-5c0c-4e15-8357-7f2df7fe94b8","path":"sprites/spr_weapon_evisc/spr_weapon_evisc.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"7f876b66-bcbd-438b-9b39-fa9f9f01e467","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"f1061812-3385-46d3-abc9-570c9b907700","path":"sprites/spr_weapon_evisc/spr_weapon_evisc.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"baceab3d-6c5a-4e6b-8c47-dfc2f19f8899","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"774b09dd-5c0c-4e15-8357-7f2df7fe94b8","path":"sprites/spr_weapon_evisc/spr_weapon_evisc.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"7f876b66-bcbd-438b-9b39-fa9f9f01e467","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"f1061812-3385-46d3-abc9-570c9b907700","path":"sprites/spr_weapon_evisc/spr_weapon_evisc.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"baceab3d-6c5a-4e6b-8c47-dfc2f19f8899","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_weapon_flamer/spr_weapon_flamer.yy b/sprites/spr_weapon_flamer/spr_weapon_flamer.yy index f64483d9eb..418f7970ab 100644 --- a/sprites/spr_weapon_flamer/spr_weapon_flamer.yy +++ b/sprites/spr_weapon_flamer/spr_weapon_flamer.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_weapon_flamer", "bboxMode":0, "bbox_bottom":217, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"64e8679b-d5d0-4274-a174-32724ce1f8ec","name":"64e8679b-d5d0-4274-a174-32724ce1f8ec","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"64e8679b-d5d0-4274-a174-32724ce1f8ec","name":"64e8679b-d5d0-4274-a174-32724ce1f8ec","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"64e8679b-d5d0-4274-a174-32724ce1f8ec","path":"sprites/spr_weapon_flamer/spr_weapon_flamer.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"51e2ff14-868a-47ef-a428-a84bd622c9df","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"64e8679b-d5d0-4274-a174-32724ce1f8ec","path":"sprites/spr_weapon_flamer/spr_weapon_flamer.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"51e2ff14-868a-47ef-a428-a84bd622c9df","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_weapon_frcaxe/spr_weapon_frcaxe.yy b/sprites/spr_weapon_frcaxe/spr_weapon_frcaxe.yy index eb43e5f7dd..b3fc93c629 100644 --- a/sprites/spr_weapon_frcaxe/spr_weapon_frcaxe.yy +++ b/sprites/spr_weapon_frcaxe/spr_weapon_frcaxe.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_weapon_frcaxe", "bboxMode":0, "bbox_bottom":220, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"7e323b40-4d75-4c0f-9c71-ade5cce4038e","name":"7e323b40-4d75-4c0f-9c71-ade5cce4038e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"7e323b40-4d75-4c0f-9c71-ade5cce4038e","name":"7e323b40-4d75-4c0f-9c71-ade5cce4038e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -70,9 +70,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"7e323b40-4d75-4c0f-9c71-ade5cce4038e","path":"sprites/spr_weapon_frcaxe/spr_weapon_frcaxe.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"d1cbf5d8-ad42-4a35-b45b-c36bbcb08988","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"7e323b40-4d75-4c0f-9c71-ade5cce4038e","path":"sprites/spr_weapon_frcaxe/spr_weapon_frcaxe.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"d1cbf5d8-ad42-4a35-b45b-c36bbcb08988","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_weapon_frcstaff/spr_weapon_frcstaff.yy b/sprites/spr_weapon_frcstaff/spr_weapon_frcstaff.yy index 0379a1a5f3..66d06787bd 100644 --- a/sprites/spr_weapon_frcstaff/spr_weapon_frcstaff.yy +++ b/sprites/spr_weapon_frcstaff/spr_weapon_frcstaff.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_weapon_frcstaff", "bboxMode":0, "bbox_bottom":271, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"a09fc4ff-b696-45c3-b5ae-6b73250622a7","name":"a09fc4ff-b696-45c3-b5ae-6b73250622a7","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"a09fc4ff-b696-45c3-b5ae-6b73250622a7","name":"a09fc4ff-b696-45c3-b5ae-6b73250622a7","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"a09fc4ff-b696-45c3-b5ae-6b73250622a7","path":"sprites/spr_weapon_frcstaff/spr_weapon_frcstaff.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"8bf4c274-3780-4000-a5da-baf166ccb705","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"a09fc4ff-b696-45c3-b5ae-6b73250622a7","path":"sprites/spr_weapon_frcstaff/spr_weapon_frcstaff.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"8bf4c274-3780-4000-a5da-baf166ccb705","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_weapon_grav_cannon/spr_weapon_grav_cannon.yy b/sprites/spr_weapon_grav_cannon/spr_weapon_grav_cannon.yy index 8262a09698..851543cd8a 100644 --- a/sprites/spr_weapon_grav_cannon/spr_weapon_grav_cannon.yy +++ b/sprites/spr_weapon_grav_cannon/spr_weapon_grav_cannon.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_weapon_grav_cannon", "bboxMode":0, "bbox_bottom":173, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"cbb0ffd1-9108-4578-8690-2b8c6fc3c0be","name":"cbb0ffd1-9108-4578-8690-2b8c6fc3c0be","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"cbb0ffd1-9108-4578-8690-2b8c6fc3c0be","name":"cbb0ffd1-9108-4578-8690-2b8c6fc3c0be","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -72,9 +72,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"cbb0ffd1-9108-4578-8690-2b8c6fc3c0be","path":"sprites/spr_weapon_grav_cannon/spr_weapon_grav_cannon.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"ae74c7da-b7f7-4015-941e-562f4bc25c9a","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"cbb0ffd1-9108-4578-8690-2b8c6fc3c0be","path":"sprites/spr_weapon_grav_cannon/spr_weapon_grav_cannon.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"ae74c7da-b7f7-4015-941e-562f4bc25c9a","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_weapon_grav_gun/spr_weapon_grav_gun.yy b/sprites/spr_weapon_grav_gun/spr_weapon_grav_gun.yy index 5e18270c50..f4501210ce 100644 --- a/sprites/spr_weapon_grav_gun/spr_weapon_grav_gun.yy +++ b/sprites/spr_weapon_grav_gun/spr_weapon_grav_gun.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_weapon_grav_gun", "bboxMode":0, "bbox_bottom":213, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"d2fab1ed-1a51-46c1-b8ed-f95498960735","name":"d2fab1ed-1a51-46c1-b8ed-f95498960735","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"d2fab1ed-1a51-46c1-b8ed-f95498960735","name":"d2fab1ed-1a51-46c1-b8ed-f95498960735","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -33,13 +33,7 @@ "resourceType":"GMNineSliceData", "resourceVersion":"2.0", "right":0, - "tileMode":[ - 0, - 0, - 0, - 0, - 0, - ], + "tileMode":[0,0,0,0,0,], "top":0, }, "origin":0, @@ -87,9 +81,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"d2fab1ed-1a51-46c1-b8ed-f95498960735","path":"sprites/spr_weapon_grav_gun/spr_weapon_grav_gun.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"be6c4d78-c251-45e2-8172-2dc6160772eb","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"d2fab1ed-1a51-46c1-b8ed-f95498960735","path":"sprites/spr_weapon_grav_gun/spr_weapon_grav_gun.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"be6c4d78-c251-45e2-8172-2dc6160772eb","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_weapon_grav_pistol/spr_weapon_grav_pistol.yy b/sprites/spr_weapon_grav_pistol/spr_weapon_grav_pistol.yy index 6f4ca9aeae..6f4e55081e 100644 --- a/sprites/spr_weapon_grav_pistol/spr_weapon_grav_pistol.yy +++ b/sprites/spr_weapon_grav_pistol/spr_weapon_grav_pistol.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_weapon_grav_pistol", "bboxMode":0, "bbox_bottom":166, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"1d11b11a-02d6-47f8-87c7-87206d0c9588","name":"1d11b11a-02d6-47f8-87c7-87206d0c9588","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"1d11b11a-02d6-47f8-87c7-87206d0c9588","name":"1d11b11a-02d6-47f8-87c7-87206d0c9588","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -33,13 +33,7 @@ "resourceType":"GMNineSliceData", "resourceVersion":"2.0", "right":0, - "tileMode":[ - 0, - 0, - 0, - 0, - 0, - ], + "tileMode":[0,0,0,0,0,], "top":0, }, "origin":0, @@ -87,9 +81,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"1d11b11a-02d6-47f8-87c7-87206d0c9588","path":"sprites/spr_weapon_grav_pistol/spr_weapon_grav_pistol.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"020a30d9-3988-4c55-91ae-54f299601401","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"1d11b11a-02d6-47f8-87c7-87206d0c9588","path":"sprites/spr_weapon_grav_pistol/spr_weapon_grav_pistol.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"020a30d9-3988-4c55-91ae-54f299601401","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_weapon_hand_flamer/spr_weapon_hand_flamer.yy b/sprites/spr_weapon_hand_flamer/spr_weapon_hand_flamer.yy index f11fb5b43f..13ec0a9846 100644 --- a/sprites/spr_weapon_hand_flamer/spr_weapon_hand_flamer.yy +++ b/sprites/spr_weapon_hand_flamer/spr_weapon_hand_flamer.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_weapon_hand_flamer", "bboxMode":0, "bbox_bottom":178, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"1d11b11a-02d6-47f8-87c7-87206d0c9588","name":"1d11b11a-02d6-47f8-87c7-87206d0c9588","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"1d11b11a-02d6-47f8-87c7-87206d0c9588","name":"1d11b11a-02d6-47f8-87c7-87206d0c9588","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -33,13 +33,7 @@ "resourceType":"GMNineSliceData", "resourceVersion":"2.0", "right":0, - "tileMode":[ - 0, - 0, - 0, - 0, - 0, - ], + "tileMode":[0,0,0,0,0,], "top":0, }, "origin":0, @@ -87,9 +81,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"1d11b11a-02d6-47f8-87c7-87206d0c9588","path":"sprites/spr_weapon_hand_flamer/spr_weapon_hand_flamer.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"b33db15d-4ea7-4f57-85fd-d001d7688cfa","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"1d11b11a-02d6-47f8-87c7-87206d0c9588","path":"sprites/spr_weapon_hand_flamer/spr_weapon_hand_flamer.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"b33db15d-4ea7-4f57-85fd-d001d7688cfa","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_weapon_hbolt/spr_weapon_hbolt.yy b/sprites/spr_weapon_hbolt/spr_weapon_hbolt.yy index 5290d28052..50ceca4194 100644 --- a/sprites/spr_weapon_hbolt/spr_weapon_hbolt.yy +++ b/sprites/spr_weapon_hbolt/spr_weapon_hbolt.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_weapon_hbolt", "bboxMode":0, "bbox_bottom":133, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"ed216edf-c023-4a02-94fb-993a99341d45","name":"ed216edf-c023-4a02-94fb-993a99341d45","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"ed216edf-c023-4a02-94fb-993a99341d45","name":"ed216edf-c023-4a02-94fb-993a99341d45","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -70,9 +70,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"ed216edf-c023-4a02-94fb-993a99341d45","path":"sprites/spr_weapon_hbolt/spr_weapon_hbolt.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"35c065d1-b902-4e0f-857d-f95192fa3239","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"ed216edf-c023-4a02-94fb-993a99341d45","path":"sprites/spr_weapon_hbolt/spr_weapon_hbolt.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"35c065d1-b902-4e0f-857d-f95192fa3239","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_weapon_hflamer/spr_weapon_hflamer.yy b/sprites/spr_weapon_hflamer/spr_weapon_hflamer.yy index 03211ae8d9..59fb59583e 100644 --- a/sprites/spr_weapon_hflamer/spr_weapon_hflamer.yy +++ b/sprites/spr_weapon_hflamer/spr_weapon_hflamer.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_weapon_hflamer", "bboxMode":0, "bbox_bottom":136, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"f0be8474-9bc1-498a-b91d-326ea3104fd1","name":"f0be8474-9bc1-498a-b91d-326ea3104fd1","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"f0be8474-9bc1-498a-b91d-326ea3104fd1","name":"f0be8474-9bc1-498a-b91d-326ea3104fd1","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -71,9 +71,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"f0be8474-9bc1-498a-b91d-326ea3104fd1","path":"sprites/spr_weapon_hflamer/spr_weapon_hflamer.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"ecc17719-e804-4983-9e75-9919e5f62d17","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"f0be8474-9bc1-498a-b91d-326ea3104fd1","path":"sprites/spr_weapon_hflamer/spr_weapon_hflamer.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"ecc17719-e804-4983-9e75-9919e5f62d17","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_weapon_hflamer_term/spr_weapon_hflamer_term.yy b/sprites/spr_weapon_hflamer_term/spr_weapon_hflamer_term.yy index 338cf648b7..a18dfcd960 100644 --- a/sprites/spr_weapon_hflamer_term/spr_weapon_hflamer_term.yy +++ b/sprites/spr_weapon_hflamer_term/spr_weapon_hflamer_term.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_weapon_hflamer_term", "bboxMode":0, "bbox_bottom":194, @@ -12,8 +12,8 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"a881943a-e7b3-4a2d-aa8e-4482d90446bf","name":"a881943a-e7b3-4a2d-aa8e-4482d90446bf","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"3458bbca-83b5-4d11-82fc-4c5ec0ec0153","name":"3458bbca-83b5-4d11-82fc-4c5ec0ec0153","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"a881943a-e7b3-4a2d-aa8e-4482d90446bf","name":"a881943a-e7b3-4a2d-aa8e-4482d90446bf","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"3458bbca-83b5-4d11-82fc-4c5ec0ec0153","name":"3458bbca-83b5-4d11-82fc-4c5ec0ec0153","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -71,12 +71,8 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"a881943a-e7b3-4a2d-aa8e-4482d90446bf","path":"sprites/spr_weapon_hflamer_term/spr_weapon_hflamer_term.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"44d8813a-3fb2-4aac-b6c2-003670c82a97","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"3458bbca-83b5-4d11-82fc-4c5ec0ec0153","path":"sprites/spr_weapon_hflamer_term/spr_weapon_hflamer_term.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"7eec815d-8d91-4478-bd93-cffb5873d8a6","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"a881943a-e7b3-4a2d-aa8e-4482d90446bf","path":"sprites/spr_weapon_hflamer_term/spr_weapon_hflamer_term.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"44d8813a-3fb2-4aac-b6c2-003670c82a97","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"3458bbca-83b5-4d11-82fc-4c5ec0ec0153","path":"sprites/spr_weapon_hflamer_term/spr_weapon_hflamer_term.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"7eec815d-8d91-4478-bd93-cffb5873d8a6","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_weapon_hthhammer/spr_weapon_hthhammer.yy b/sprites/spr_weapon_hthhammer/spr_weapon_hthhammer.yy index 451edf57cf..41e972b387 100644 --- a/sprites/spr_weapon_hthhammer/spr_weapon_hthhammer.yy +++ b/sprites/spr_weapon_hthhammer/spr_weapon_hthhammer.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_weapon_hthhammer", "bboxMode":0, "bbox_bottom":162, @@ -12,8 +12,8 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"2a817a4a-7cab-4ff8-88f6-251cd37fca3a","name":"2a817a4a-7cab-4ff8-88f6-251cd37fca3a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"68979b3b-c9d1-41ce-aac2-210269b23c45","name":"68979b3b-c9d1-41ce-aac2-210269b23c45","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"2a817a4a-7cab-4ff8-88f6-251cd37fca3a","name":"2a817a4a-7cab-4ff8-88f6-251cd37fca3a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"68979b3b-c9d1-41ce-aac2-210269b23c45","name":"68979b3b-c9d1-41ce-aac2-210269b23c45","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -69,12 +69,8 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"2a817a4a-7cab-4ff8-88f6-251cd37fca3a","path":"sprites/spr_weapon_hthhammer/spr_weapon_hthhammer.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"0926682d-beb3-42a1-b68c-fa3b9bb08a8a","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"68979b3b-c9d1-41ce-aac2-210269b23c45","path":"sprites/spr_weapon_hthhammer/spr_weapon_hthhammer.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"fd4cffd8-3ff0-40de-8f00-829015b1349a","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"2a817a4a-7cab-4ff8-88f6-251cd37fca3a","path":"sprites/spr_weapon_hthhammer/spr_weapon_hthhammer.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"0926682d-beb3-42a1-b68c-fa3b9bb08a8a","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"68979b3b-c9d1-41ce-aac2-210269b23c45","path":"sprites/spr_weapon_hthhammer/spr_weapon_hthhammer.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"fd4cffd8-3ff0-40de-8f00-829015b1349a","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_weapon_inferno/spr_weapon_inferno.yy b/sprites/spr_weapon_inferno/spr_weapon_inferno.yy index 176d41e34b..5462bbcfff 100644 --- a/sprites/spr_weapon_inferno/spr_weapon_inferno.yy +++ b/sprites/spr_weapon_inferno/spr_weapon_inferno.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_weapon_inferno", "bboxMode":0, "bbox_bottom":172, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"f788d341-e281-426b-99a8-576cdbb660ce","name":"f788d341-e281-426b-99a8-576cdbb660ce","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"f788d341-e281-426b-99a8-576cdbb660ce","name":"f788d341-e281-426b-99a8-576cdbb660ce","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"f788d341-e281-426b-99a8-576cdbb660ce","path":"sprites/spr_weapon_inferno/spr_weapon_inferno.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"0f3ad698-f0ed-487e-b9f1-ad0c95f7d469","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"f788d341-e281-426b-99a8-576cdbb660ce","path":"sprites/spr_weapon_inferno/spr_weapon_inferno.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"0f3ad698-f0ed-487e-b9f1-ad0c95f7d469","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_weapon_infernus_hbolt/spr_weapon_infernus_hbolt.yy b/sprites/spr_weapon_infernus_hbolt/spr_weapon_infernus_hbolt.yy index e553ddff29..5febc28d4d 100644 --- a/sprites/spr_weapon_infernus_hbolt/spr_weapon_infernus_hbolt.yy +++ b/sprites/spr_weapon_infernus_hbolt/spr_weapon_infernus_hbolt.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_weapon_infernus_hbolt", "bboxMode":0, "bbox_bottom":147, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"b8951bd7-5548-4acb-82c8-16e78b0f5610","name":"b8951bd7-5548-4acb-82c8-16e78b0f5610","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"b8951bd7-5548-4acb-82c8-16e78b0f5610","name":"b8951bd7-5548-4acb-82c8-16e78b0f5610","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -33,13 +33,7 @@ "resourceType":"GMNineSliceData", "resourceVersion":"2.0", "right":0, - "tileMode":[ - 0, - 0, - 0, - 0, - 0, - ], + "tileMode":[0,0,0,0,0,], "top":0, }, "origin":0, @@ -89,9 +83,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"b8951bd7-5548-4acb-82c8-16e78b0f5610","path":"sprites/spr_weapon_infernus_hbolt/spr_weapon_infernus_hbolt.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"46fa86a2-155a-4eb6-bf8f-4e12804bbb94","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"b8951bd7-5548-4acb-82c8-16e78b0f5610","path":"sprites/spr_weapon_infernus_hbolt/spr_weapon_infernus_hbolt.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"46fa86a2-155a-4eb6-bf8f-4e12804bbb94","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_weapon_knife/spr_weapon_knife.yy b/sprites/spr_weapon_knife/spr_weapon_knife.yy index b8599a09ea..601bc88326 100644 --- a/sprites/spr_weapon_knife/spr_weapon_knife.yy +++ b/sprites/spr_weapon_knife/spr_weapon_knife.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_weapon_knife", "bboxMode":0, "bbox_bottom":164, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"c5c496b3-8d87-42ea-9625-89bf253c33d0","name":"c5c496b3-8d87-42ea-9625-89bf253c33d0","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"c5c496b3-8d87-42ea-9625-89bf253c33d0","name":"c5c496b3-8d87-42ea-9625-89bf253c33d0","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -70,9 +70,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"c5c496b3-8d87-42ea-9625-89bf253c33d0","path":"sprites/spr_weapon_knife/spr_weapon_knife.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"aa85f45a-777f-4198-a19d-33ec37678e1a","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"c5c496b3-8d87-42ea-9625-89bf253c33d0","path":"sprites/spr_weapon_knife/spr_weapon_knife.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"aa85f45a-777f-4198-a19d-33ec37678e1a","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_weapon_lasca/spr_weapon_lasca.yy b/sprites/spr_weapon_lasca/spr_weapon_lasca.yy index 4abcf0081c..f972e9f4a1 100644 --- a/sprites/spr_weapon_lasca/spr_weapon_lasca.yy +++ b/sprites/spr_weapon_lasca/spr_weapon_lasca.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_weapon_lasca", "bboxMode":0, "bbox_bottom":119, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"c9a5a357-3cfc-4c90-b844-56ac38b0e0ff","name":"c9a5a357-3cfc-4c90-b844-56ac38b0e0ff","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"c9a5a357-3cfc-4c90-b844-56ac38b0e0ff","name":"c9a5a357-3cfc-4c90-b844-56ac38b0e0ff","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -70,9 +70,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"c9a5a357-3cfc-4c90-b844-56ac38b0e0ff","path":"sprites/spr_weapon_lasca/spr_weapon_lasca.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"a6e0e1e3-52cb-44dc-a20f-6be1ae1d90b8","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"c9a5a357-3cfc-4c90-b844-56ac38b0e0ff","path":"sprites/spr_weapon_lasca/spr_weapon_lasca.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"a6e0e1e3-52cb-44dc-a20f-6be1ae1d90b8","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_weapon_lightning1/spr_weapon_lightning1.yy b/sprites/spr_weapon_lightning1/spr_weapon_lightning1.yy index 8a68f8e1b7..4493002092 100644 --- a/sprites/spr_weapon_lightning1/spr_weapon_lightning1.yy +++ b/sprites/spr_weapon_lightning1/spr_weapon_lightning1.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_weapon_lightning1", "bboxMode":0, "bbox_bottom":192, @@ -12,8 +12,8 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"b1c6a391-2103-4634-8d8d-639c44dfdc61","name":"b1c6a391-2103-4634-8d8d-639c44dfdc61","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"1ded3c78-16a8-4653-a48b-3dc1b2e1e824","name":"1ded3c78-16a8-4653-a48b-3dc1b2e1e824","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"b1c6a391-2103-4634-8d8d-639c44dfdc61","name":"b1c6a391-2103-4634-8d8d-639c44dfdc61","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"1ded3c78-16a8-4653-a48b-3dc1b2e1e824","name":"1ded3c78-16a8-4653-a48b-3dc1b2e1e824","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -69,12 +69,8 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"b1c6a391-2103-4634-8d8d-639c44dfdc61","path":"sprites/spr_weapon_lightning1/spr_weapon_lightning1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"c502156f-5600-4fd7-b57c-dbad9c3b4c1c","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"1ded3c78-16a8-4653-a48b-3dc1b2e1e824","path":"sprites/spr_weapon_lightning1/spr_weapon_lightning1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"f24b1116-c8d7-44b5-b845-94444938cf9c","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"b1c6a391-2103-4634-8d8d-639c44dfdc61","path":"sprites/spr_weapon_lightning1/spr_weapon_lightning1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"c502156f-5600-4fd7-b57c-dbad9c3b4c1c","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"1ded3c78-16a8-4653-a48b-3dc1b2e1e824","path":"sprites/spr_weapon_lightning1/spr_weapon_lightning1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"f24b1116-c8d7-44b5-b845-94444938cf9c","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_weapon_lightning2/spr_weapon_lightning2.yy b/sprites/spr_weapon_lightning2/spr_weapon_lightning2.yy index f356ab3ae9..1915ab06e1 100644 --- a/sprites/spr_weapon_lightning2/spr_weapon_lightning2.yy +++ b/sprites/spr_weapon_lightning2/spr_weapon_lightning2.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_weapon_lightning2", "bboxMode":0, "bbox_bottom":213, @@ -12,8 +12,8 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"c9653695-b70a-4b29-8291-cce821c9115f","name":"c9653695-b70a-4b29-8291-cce821c9115f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"3b7f909d-5ebb-4c2b-b818-ed5cf4504109","name":"3b7f909d-5ebb-4c2b-b818-ed5cf4504109","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"c9653695-b70a-4b29-8291-cce821c9115f","name":"c9653695-b70a-4b29-8291-cce821c9115f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"3b7f909d-5ebb-4c2b-b818-ed5cf4504109","name":"3b7f909d-5ebb-4c2b-b818-ed5cf4504109","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -69,12 +69,8 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"c9653695-b70a-4b29-8291-cce821c9115f","path":"sprites/spr_weapon_lightning2/spr_weapon_lightning2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"0986b23f-598a-4bf0-b8a2-77a37ff8a0f2","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"3b7f909d-5ebb-4c2b-b818-ed5cf4504109","path":"sprites/spr_weapon_lightning2/spr_weapon_lightning2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"55509048-bb06-4c81-8f41-961cde83eacc","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"c9653695-b70a-4b29-8291-cce821c9115f","path":"sprites/spr_weapon_lightning2/spr_weapon_lightning2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"0986b23f-598a-4bf0-b8a2-77a37ff8a0f2","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"3b7f909d-5ebb-4c2b-b818-ed5cf4504109","path":"sprites/spr_weapon_lightning2/spr_weapon_lightning2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"55509048-bb06-4c81-8f41-961cde83eacc","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_weapon_mace_of_absolution/spr_weapon_mace_of_absolution.yy b/sprites/spr_weapon_mace_of_absolution/spr_weapon_mace_of_absolution.yy index 684164c02b..20baa9fddd 100644 --- a/sprites/spr_weapon_mace_of_absolution/spr_weapon_mace_of_absolution.yy +++ b/sprites/spr_weapon_mace_of_absolution/spr_weapon_mace_of_absolution.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_weapon_mace_of_absolution", "bboxMode":0, "bbox_bottom":256, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"630e8d95-baaa-4950-8761-35b8ccf4848c","name":"630e8d95-baaa-4950-8761-35b8ccf4848c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"630e8d95-baaa-4950-8761-35b8ccf4848c","name":"630e8d95-baaa-4950-8761-35b8ccf4848c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -70,9 +70,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"630e8d95-baaa-4950-8761-35b8ccf4848c","path":"sprites/spr_weapon_mace_of_absolution/spr_weapon_mace_of_absolution.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"03644e7c-f6ca-4447-91f5-b7c7c2d15ce1","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"630e8d95-baaa-4950-8761-35b8ccf4848c","path":"sprites/spr_weapon_mace_of_absolution/spr_weapon_mace_of_absolution.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"03644e7c-f6ca-4447-91f5-b7c7c2d15ce1","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_weapon_melta/spr_weapon_melta.yy b/sprites/spr_weapon_melta/spr_weapon_melta.yy index 53ec32f54e..a3277d2bc7 100644 --- a/sprites/spr_weapon_melta/spr_weapon_melta.yy +++ b/sprites/spr_weapon_melta/spr_weapon_melta.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_weapon_melta", "bboxMode":0, "bbox_bottom":212, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"881d2fb1-5056-4735-8d84-8ca6614caff0","name":"881d2fb1-5056-4735-8d84-8ca6614caff0","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"881d2fb1-5056-4735-8d84-8ca6614caff0","name":"881d2fb1-5056-4735-8d84-8ca6614caff0","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"881d2fb1-5056-4735-8d84-8ca6614caff0","path":"sprites/spr_weapon_melta/spr_weapon_melta.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"74cd6908-01ec-4465-b482-4435e04d4f02","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"881d2fb1-5056-4735-8d84-8ca6614caff0","path":"sprites/spr_weapon_melta/spr_weapon_melta.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"74cd6908-01ec-4465-b482-4435e04d4f02","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_weapon_missile/spr_weapon_missile.yy b/sprites/spr_weapon_missile/spr_weapon_missile.yy index 122aab8fdb..e250858a0c 100644 --- a/sprites/spr_weapon_missile/spr_weapon_missile.yy +++ b/sprites/spr_weapon_missile/spr_weapon_missile.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_weapon_missile", "bboxMode":0, "bbox_bottom":160, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"2250a315-f18a-45f1-956e-3e196b64c3b6","name":"2250a315-f18a-45f1-956e-3e196b64c3b6","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"2250a315-f18a-45f1-956e-3e196b64c3b6","name":"2250a315-f18a-45f1-956e-3e196b64c3b6","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"2250a315-f18a-45f1-956e-3e196b64c3b6","path":"sprites/spr_weapon_missile/spr_weapon_missile.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"c1cf7e78-050c-4d04-bbb5-967f84a51577","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"2250a315-f18a-45f1-956e-3e196b64c3b6","path":"sprites/spr_weapon_missile/spr_weapon_missile.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"c1cf7e78-050c-4d04-bbb5-967f84a51577","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_weapon_mmelta/spr_weapon_mmelta.yy b/sprites/spr_weapon_mmelta/spr_weapon_mmelta.yy index 14129074fe..59e67fde7d 100644 --- a/sprites/spr_weapon_mmelta/spr_weapon_mmelta.yy +++ b/sprites/spr_weapon_mmelta/spr_weapon_mmelta.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_weapon_mmelta", "bboxMode":0, "bbox_bottom":155, @@ -12,8 +12,8 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"f0ff24f9-bb86-49c8-9679-44c56735a77c","name":"f0ff24f9-bb86-49c8-9679-44c56735a77c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"ed216edf-c023-4a02-94fb-993a99341d45","name":"ed216edf-c023-4a02-94fb-993a99341d45","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"f0ff24f9-bb86-49c8-9679-44c56735a77c","name":"f0ff24f9-bb86-49c8-9679-44c56735a77c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"ed216edf-c023-4a02-94fb-993a99341d45","name":"ed216edf-c023-4a02-94fb-993a99341d45","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -71,12 +71,8 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"f0ff24f9-bb86-49c8-9679-44c56735a77c","path":"sprites/spr_weapon_mmelta/spr_weapon_mmelta.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"dd31ff2a-f4ee-48f0-af23-769fa634ed88","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"ed216edf-c023-4a02-94fb-993a99341d45","path":"sprites/spr_weapon_mmelta/spr_weapon_mmelta.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"d315b60f-aeb7-4131-98ba-f1b38c072733","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"f0ff24f9-bb86-49c8-9679-44c56735a77c","path":"sprites/spr_weapon_mmelta/spr_weapon_mmelta.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"dd31ff2a-f4ee-48f0-af23-769fa634ed88","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"ed216edf-c023-4a02-94fb-993a99341d45","path":"sprites/spr_weapon_mmelta/spr_weapon_mmelta.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"d315b60f-aeb7-4131-98ba-f1b38c072733","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_weapon_plasc/spr_weapon_plasc.yy b/sprites/spr_weapon_plasc/spr_weapon_plasc.yy index 93e2389bd5..da5d64f7f3 100644 --- a/sprites/spr_weapon_plasc/spr_weapon_plasc.yy +++ b/sprites/spr_weapon_plasc/spr_weapon_plasc.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_weapon_plasc", "bboxMode":0, "bbox_bottom":122, @@ -12,8 +12,8 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"f0ff24f9-bb86-49c8-9679-44c56735a77c","name":"f0ff24f9-bb86-49c8-9679-44c56735a77c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"cd611ad5-3140-4b0f-afc5-f6566415e601","name":"cd611ad5-3140-4b0f-afc5-f6566415e601","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"f0ff24f9-bb86-49c8-9679-44c56735a77c","name":"f0ff24f9-bb86-49c8-9679-44c56735a77c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"cd611ad5-3140-4b0f-afc5-f6566415e601","name":"cd611ad5-3140-4b0f-afc5-f6566415e601","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -70,12 +70,8 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"f0ff24f9-bb86-49c8-9679-44c56735a77c","path":"sprites/spr_weapon_plasc/spr_weapon_plasc.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"ce6676cf-5a3c-4f75-90a3-654dbcecc670","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"cd611ad5-3140-4b0f-afc5-f6566415e601","path":"sprites/spr_weapon_plasc/spr_weapon_plasc.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"58c402f8-99e1-4962-9fae-deec1a64ba03","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"f0ff24f9-bb86-49c8-9679-44c56735a77c","path":"sprites/spr_weapon_plasc/spr_weapon_plasc.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"ce6676cf-5a3c-4f75-90a3-654dbcecc670","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"cd611ad5-3140-4b0f-afc5-f6566415e601","path":"sprites/spr_weapon_plasc/spr_weapon_plasc.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"58c402f8-99e1-4962-9fae-deec1a64ba03","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_weapon_plasg/spr_weapon_plasg.yy b/sprites/spr_weapon_plasg/spr_weapon_plasg.yy index 973baf9def..7083e69c60 100644 --- a/sprites/spr_weapon_plasg/spr_weapon_plasg.yy +++ b/sprites/spr_weapon_plasg/spr_weapon_plasg.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_weapon_plasg", "bboxMode":0, "bbox_bottom":195, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"8fe8f87d-cc4c-49b1-a8c7-5b595d9a9e9d","name":"8fe8f87d-cc4c-49b1-a8c7-5b595d9a9e9d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"8fe8f87d-cc4c-49b1-a8c7-5b595d9a9e9d","name":"8fe8f87d-cc4c-49b1-a8c7-5b595d9a9e9d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"8fe8f87d-cc4c-49b1-a8c7-5b595d9a9e9d","path":"sprites/spr_weapon_plasg/spr_weapon_plasg.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"e8b5a45b-814c-49dc-9fc4-16d6bf9347bd","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"8fe8f87d-cc4c-49b1-a8c7-5b595d9a9e9d","path":"sprites/spr_weapon_plasg/spr_weapon_plasg.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"e8b5a45b-814c-49dc-9fc4-16d6bf9347bd","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_weapon_plasma_cannon_term/spr_weapon_plasma_cannon_term.yy b/sprites/spr_weapon_plasma_cannon_term/spr_weapon_plasma_cannon_term.yy index 6096621d64..4ebd435371 100644 --- a/sprites/spr_weapon_plasma_cannon_term/spr_weapon_plasma_cannon_term.yy +++ b/sprites/spr_weapon_plasma_cannon_term/spr_weapon_plasma_cannon_term.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_weapon_plasma_cannon_term", "bboxMode":0, "bbox_bottom":224, @@ -12,8 +12,8 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"a881943a-e7b3-4a2d-aa8e-4482d90446bf","name":"a881943a-e7b3-4a2d-aa8e-4482d90446bf","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"b3de42d5-27c7-4349-82ce-0d82b0f1b555","name":"b3de42d5-27c7-4349-82ce-0d82b0f1b555","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"a881943a-e7b3-4a2d-aa8e-4482d90446bf","name":"a881943a-e7b3-4a2d-aa8e-4482d90446bf","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"b3de42d5-27c7-4349-82ce-0d82b0f1b555","name":"b3de42d5-27c7-4349-82ce-0d82b0f1b555","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -71,12 +71,8 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"a881943a-e7b3-4a2d-aa8e-4482d90446bf","path":"sprites/spr_weapon_plasma_cannon_term/spr_weapon_plasma_cannon_term.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"b6ff589f-4704-4be6-bb05-636239790be6","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"b3de42d5-27c7-4349-82ce-0d82b0f1b555","path":"sprites/spr_weapon_plasma_cannon_term/spr_weapon_plasma_cannon_term.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"2caa7e10-26a7-4146-b122-b0d0df872c4f","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"a881943a-e7b3-4a2d-aa8e-4482d90446bf","path":"sprites/spr_weapon_plasma_cannon_term/spr_weapon_plasma_cannon_term.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"b6ff589f-4704-4be6-bb05-636239790be6","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"b3de42d5-27c7-4349-82ce-0d82b0f1b555","path":"sprites/spr_weapon_plasma_cannon_term/spr_weapon_plasma_cannon_term.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"2caa7e10-26a7-4146-b122-b0d0df872c4f","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_weapon_plasp/spr_weapon_plasp.yy b/sprites/spr_weapon_plasp/spr_weapon_plasp.yy index 62ba733af5..17926d1558 100644 --- a/sprites/spr_weapon_plasp/spr_weapon_plasp.yy +++ b/sprites/spr_weapon_plasp/spr_weapon_plasp.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_weapon_plasp", "bboxMode":0, "bbox_bottom":172, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"8fe8f87d-cc4c-49b1-a8c7-5b595d9a9e9d","name":"8fe8f87d-cc4c-49b1-a8c7-5b595d9a9e9d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"8fe8f87d-cc4c-49b1-a8c7-5b595d9a9e9d","name":"8fe8f87d-cc4c-49b1-a8c7-5b595d9a9e9d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"8fe8f87d-cc4c-49b1-a8c7-5b595d9a9e9d","path":"sprites/spr_weapon_plasp/spr_weapon_plasp.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"8333a6b3-f6e7-4458-ad54-3d025c953fdb","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"8fe8f87d-cc4c-49b1-a8c7-5b595d9a9e9d","path":"sprites/spr_weapon_plasp/spr_weapon_plasp.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"8333a6b3-f6e7-4458-ad54-3d025c953fdb","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_weapon_powaxe/spr_weapon_powaxe.yy b/sprites/spr_weapon_powaxe/spr_weapon_powaxe.yy index 8819cc4a07..085d8ff017 100644 --- a/sprites/spr_weapon_powaxe/spr_weapon_powaxe.yy +++ b/sprites/spr_weapon_powaxe/spr_weapon_powaxe.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_weapon_powaxe", "bboxMode":0, "bbox_bottom":231, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"45ac5706-a0cb-4b2b-aeee-ad707b9c98af","name":"45ac5706-a0cb-4b2b-aeee-ad707b9c98af","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"45ac5706-a0cb-4b2b-aeee-ad707b9c98af","name":"45ac5706-a0cb-4b2b-aeee-ad707b9c98af","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"45ac5706-a0cb-4b2b-aeee-ad707b9c98af","path":"sprites/spr_weapon_powaxe/spr_weapon_powaxe.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"90a9b82b-dd4a-488d-87a8-50b3fff5dc34","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"45ac5706-a0cb-4b2b-aeee-ad707b9c98af","path":"sprites/spr_weapon_powaxe/spr_weapon_powaxe.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"90a9b82b-dd4a-488d-87a8-50b3fff5dc34","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_weapon_powfist/spr_weapon_powfist.yy b/sprites/spr_weapon_powfist/spr_weapon_powfist.yy index bc020f0b89..b07fc3769c 100644 --- a/sprites/spr_weapon_powfist/spr_weapon_powfist.yy +++ b/sprites/spr_weapon_powfist/spr_weapon_powfist.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_weapon_powfist", "bboxMode":0, "bbox_bottom":182, @@ -12,8 +12,8 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"b72324e5-1184-447b-810f-30d301bb38bd","name":"b72324e5-1184-447b-810f-30d301bb38bd","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"4e1395a0-97b4-428f-8884-85c870d1d70d","name":"4e1395a0-97b4-428f-8884-85c870d1d70d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"b72324e5-1184-447b-810f-30d301bb38bd","name":"b72324e5-1184-447b-810f-30d301bb38bd","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"4e1395a0-97b4-428f-8884-85c870d1d70d","name":"4e1395a0-97b4-428f-8884-85c870d1d70d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -71,12 +71,8 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"b72324e5-1184-447b-810f-30d301bb38bd","path":"sprites/spr_weapon_powfist/spr_weapon_powfist.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"78267efe-7cf7-46a7-acf5-b376e96873ba","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"4e1395a0-97b4-428f-8884-85c870d1d70d","path":"sprites/spr_weapon_powfist/spr_weapon_powfist.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"36e190c8-ca3b-4cf2-b14b-2c7e1b5c5cad","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"b72324e5-1184-447b-810f-30d301bb38bd","path":"sprites/spr_weapon_powfist/spr_weapon_powfist.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"78267efe-7cf7-46a7-acf5-b376e96873ba","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"4e1395a0-97b4-428f-8884-85c870d1d70d","path":"sprites/spr_weapon_powfist/spr_weapon_powfist.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"36e190c8-ca3b-4cf2-b14b-2c7e1b5c5cad","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_weapon_powfist2/spr_weapon_powfist2.yy b/sprites/spr_weapon_powfist2/spr_weapon_powfist2.yy index db51650d86..461d587a7d 100644 --- a/sprites/spr_weapon_powfist2/spr_weapon_powfist2.yy +++ b/sprites/spr_weapon_powfist2/spr_weapon_powfist2.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_weapon_powfist2", "bboxMode":0, "bbox_bottom":212, @@ -12,12 +12,12 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"55265bf4-8dbc-40d1-ba7d-eb810f73a01b","name":"55265bf4-8dbc-40d1-ba7d-eb810f73a01b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"3fd0e236-dc6d-4e8f-85b7-b0a052be83b2","name":"3fd0e236-dc6d-4e8f-85b7-b0a052be83b2","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"ea311519-a01c-426c-a8c0-10475dfaee04","name":"ea311519-a01c-426c-a8c0-10475dfaee04","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"050ce403-9d9f-43b0-8e0e-a96e27bc40b9","name":"050ce403-9d9f-43b0-8e0e-a96e27bc40b9","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"73c69746-f941-4d24-9de1-f145a13328b7","name":"73c69746-f941-4d24-9de1-f145a13328b7","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"0376a19f-82c2-445b-988c-3f02c34315b8","name":"0376a19f-82c2-445b-988c-3f02c34315b8","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"55265bf4-8dbc-40d1-ba7d-eb810f73a01b","name":"55265bf4-8dbc-40d1-ba7d-eb810f73a01b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"3fd0e236-dc6d-4e8f-85b7-b0a052be83b2","name":"3fd0e236-dc6d-4e8f-85b7-b0a052be83b2","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"ea311519-a01c-426c-a8c0-10475dfaee04","name":"ea311519-a01c-426c-a8c0-10475dfaee04","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"050ce403-9d9f-43b0-8e0e-a96e27bc40b9","name":"050ce403-9d9f-43b0-8e0e-a96e27bc40b9","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"73c69746-f941-4d24-9de1-f145a13328b7","name":"73c69746-f941-4d24-9de1-f145a13328b7","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"0376a19f-82c2-445b-988c-3f02c34315b8","name":"0376a19f-82c2-445b-988c-3f02c34315b8","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -73,24 +73,12 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"55265bf4-8dbc-40d1-ba7d-eb810f73a01b","path":"sprites/spr_weapon_powfist2/spr_weapon_powfist2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"3278e4ea-7460-40e6-8145-962dc0de12d5","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"3fd0e236-dc6d-4e8f-85b7-b0a052be83b2","path":"sprites/spr_weapon_powfist2/spr_weapon_powfist2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"c2b1795c-a15e-46b4-a00b-3db25b561e32","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"ea311519-a01c-426c-a8c0-10475dfaee04","path":"sprites/spr_weapon_powfist2/spr_weapon_powfist2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"9e16fdb3-fff1-4be4-a1e4-35f56ad7a560","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"050ce403-9d9f-43b0-8e0e-a96e27bc40b9","path":"sprites/spr_weapon_powfist2/spr_weapon_powfist2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"4317d34f-5720-4a6d-a8a1-710e4331b846","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"73c69746-f941-4d24-9de1-f145a13328b7","path":"sprites/spr_weapon_powfist2/spr_weapon_powfist2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"9814f170-a29e-419d-a816-cc341f192907","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"0376a19f-82c2-445b-988c-3f02c34315b8","path":"sprites/spr_weapon_powfist2/spr_weapon_powfist2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"c923798f-ab68-4624-8da2-c3643898906d","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"55265bf4-8dbc-40d1-ba7d-eb810f73a01b","path":"sprites/spr_weapon_powfist2/spr_weapon_powfist2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"3278e4ea-7460-40e6-8145-962dc0de12d5","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"3fd0e236-dc6d-4e8f-85b7-b0a052be83b2","path":"sprites/spr_weapon_powfist2/spr_weapon_powfist2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"c2b1795c-a15e-46b4-a00b-3db25b561e32","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"ea311519-a01c-426c-a8c0-10475dfaee04","path":"sprites/spr_weapon_powfist2/spr_weapon_powfist2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"9e16fdb3-fff1-4be4-a1e4-35f56ad7a560","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"050ce403-9d9f-43b0-8e0e-a96e27bc40b9","path":"sprites/spr_weapon_powfist2/spr_weapon_powfist2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"4317d34f-5720-4a6d-a8a1-710e4331b846","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"73c69746-f941-4d24-9de1-f145a13328b7","path":"sprites/spr_weapon_powfist2/spr_weapon_powfist2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"9814f170-a29e-419d-a816-cc341f192907","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"0376a19f-82c2-445b-988c-3f02c34315b8","path":"sprites/spr_weapon_powfist2/spr_weapon_powfist2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"c923798f-ab68-4624-8da2-c3643898906d","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":{ diff --git a/sprites/spr_weapon_powfist4/spr_weapon_powfist4.yy b/sprites/spr_weapon_powfist4/spr_weapon_powfist4.yy index 991886319a..cbe822c20f 100644 --- a/sprites/spr_weapon_powfist4/spr_weapon_powfist4.yy +++ b/sprites/spr_weapon_powfist4/spr_weapon_powfist4.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_weapon_powfist4", "bboxMode":0, "bbox_bottom":188, @@ -12,8 +12,8 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"de3dcbc3-1a69-4b3c-ad1b-9c3dbaae504c","name":"de3dcbc3-1a69-4b3c-ad1b-9c3dbaae504c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"4410e334-93f0-4b8b-8b06-2247349c1ba2","name":"4410e334-93f0-4b8b-8b06-2247349c1ba2","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"de3dcbc3-1a69-4b3c-ad1b-9c3dbaae504c","name":"de3dcbc3-1a69-4b3c-ad1b-9c3dbaae504c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"4410e334-93f0-4b8b-8b06-2247349c1ba2","name":"4410e334-93f0-4b8b-8b06-2247349c1ba2","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -69,12 +69,8 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"de3dcbc3-1a69-4b3c-ad1b-9c3dbaae504c","path":"sprites/spr_weapon_powfist4/spr_weapon_powfist4.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"47151b1c-9cef-45fe-883f-ffbcadc946d8","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"4410e334-93f0-4b8b-8b06-2247349c1ba2","path":"sprites/spr_weapon_powfist4/spr_weapon_powfist4.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"a0047329-f211-4ad9-9557-0d0295d68efc","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"de3dcbc3-1a69-4b3c-ad1b-9c3dbaae504c","path":"sprites/spr_weapon_powfist4/spr_weapon_powfist4.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"47151b1c-9cef-45fe-883f-ffbcadc946d8","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"4410e334-93f0-4b8b-8b06-2247349c1ba2","path":"sprites/spr_weapon_powfist4/spr_weapon_powfist4.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"a0047329-f211-4ad9-9557-0d0295d68efc","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_weapon_powfist_old/spr_weapon_powfist_old.yy b/sprites/spr_weapon_powfist_old/spr_weapon_powfist_old.yy index 86e0c15636..52674ca02e 100644 --- a/sprites/spr_weapon_powfist_old/spr_weapon_powfist_old.yy +++ b/sprites/spr_weapon_powfist_old/spr_weapon_powfist_old.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_weapon_powfist_old", "bboxMode":0, "bbox_bottom":144, @@ -12,10 +12,10 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"0be31cfe-78c4-471d-b859-e254532372b9","name":"0be31cfe-78c4-471d-b859-e254532372b9","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"01579dc0-615a-49a2-9b4d-ea41758f00db","name":"01579dc0-615a-49a2-9b4d-ea41758f00db","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"726ce5d7-3fbd-4c4e-bfc9-623155e5a082","name":"726ce5d7-3fbd-4c4e-bfc9-623155e5a082","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"984d3389-f9ab-456a-9fa4-08daa820a402","name":"984d3389-f9ab-456a-9fa4-08daa820a402","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"0be31cfe-78c4-471d-b859-e254532372b9","name":"0be31cfe-78c4-471d-b859-e254532372b9","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"01579dc0-615a-49a2-9b4d-ea41758f00db","name":"01579dc0-615a-49a2-9b4d-ea41758f00db","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"726ce5d7-3fbd-4c4e-bfc9-623155e5a082","name":"726ce5d7-3fbd-4c4e-bfc9-623155e5a082","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"984d3389-f9ab-456a-9fa4-08daa820a402","name":"984d3389-f9ab-456a-9fa4-08daa820a402","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -71,18 +71,10 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"0be31cfe-78c4-471d-b859-e254532372b9","path":"sprites/spr_weapon_powfist_old/spr_weapon_powfist_old.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"510c3907-1247-443e-b8b5-1c65f1520ef2","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"01579dc0-615a-49a2-9b4d-ea41758f00db","path":"sprites/spr_weapon_powfist_old/spr_weapon_powfist_old.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"bf80a95d-0048-4e86-bd8b-3fd9c5c85d47","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"726ce5d7-3fbd-4c4e-bfc9-623155e5a082","path":"sprites/spr_weapon_powfist_old/spr_weapon_powfist_old.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"5451e330-335c-43db-a09f-024a21e42b94","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"984d3389-f9ab-456a-9fa4-08daa820a402","path":"sprites/spr_weapon_powfist_old/spr_weapon_powfist_old.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"3b9a418e-eac9-490f-9230-2751e6a5bc6f","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"0be31cfe-78c4-471d-b859-e254532372b9","path":"sprites/spr_weapon_powfist_old/spr_weapon_powfist_old.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"510c3907-1247-443e-b8b5-1c65f1520ef2","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"01579dc0-615a-49a2-9b4d-ea41758f00db","path":"sprites/spr_weapon_powfist_old/spr_weapon_powfist_old.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"bf80a95d-0048-4e86-bd8b-3fd9c5c85d47","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"726ce5d7-3fbd-4c4e-bfc9-623155e5a082","path":"sprites/spr_weapon_powfist_old/spr_weapon_powfist_old.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"5451e330-335c-43db-a09f-024a21e42b94","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"984d3389-f9ab-456a-9fa4-08daa820a402","path":"sprites/spr_weapon_powfist_old/spr_weapon_powfist_old.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"3b9a418e-eac9-490f-9230-2751e6a5bc6f","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_weapon_powmace/spr_weapon_powmace.yy b/sprites/spr_weapon_powmace/spr_weapon_powmace.yy index 643716c4fe..72f95d9407 100644 --- a/sprites/spr_weapon_powmace/spr_weapon_powmace.yy +++ b/sprites/spr_weapon_powmace/spr_weapon_powmace.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_weapon_powmace", "bboxMode":0, "bbox_bottom":261, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"97b672d1-9ce4-474d-b0cc-23fd0503f0cd","name":"97b672d1-9ce4-474d-b0cc-23fd0503f0cd","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"97b672d1-9ce4-474d-b0cc-23fd0503f0cd","name":"97b672d1-9ce4-474d-b0cc-23fd0503f0cd","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"97b672d1-9ce4-474d-b0cc-23fd0503f0cd","path":"sprites/spr_weapon_powmace/spr_weapon_powmace.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"316e0e0f-a739-4bb0-b052-89d4b964924d","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"97b672d1-9ce4-474d-b0cc-23fd0503f0cd","path":"sprites/spr_weapon_powmace/spr_weapon_powmace.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"316e0e0f-a739-4bb0-b052-89d4b964924d","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_weapon_powmaul/spr_weapon_powmaul.yy b/sprites/spr_weapon_powmaul/spr_weapon_powmaul.yy index 79f1f81edd..0b10ac8a3d 100644 --- a/sprites/spr_weapon_powmaul/spr_weapon_powmaul.yy +++ b/sprites/spr_weapon_powmaul/spr_weapon_powmaul.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_weapon_powmaul", "bboxMode":0, "bbox_bottom":223, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"0411c512-ab45-4528-8744-8f5cc93375d9","name":"0411c512-ab45-4528-8744-8f5cc93375d9","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"0411c512-ab45-4528-8744-8f5cc93375d9","name":"0411c512-ab45-4528-8744-8f5cc93375d9","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"0411c512-ab45-4528-8744-8f5cc93375d9","path":"sprites/spr_weapon_powmaul/spr_weapon_powmaul.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"562e79ed-f23d-4371-8a19-59b8c0541d4a","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"0411c512-ab45-4528-8744-8f5cc93375d9","path":"sprites/spr_weapon_powmaul/spr_weapon_powmaul.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"562e79ed-f23d-4371-8a19-59b8c0541d4a","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_weapon_powspear/spr_weapon_powspear.yy b/sprites/spr_weapon_powspear/spr_weapon_powspear.yy index aeca124146..31e4726545 100644 --- a/sprites/spr_weapon_powspear/spr_weapon_powspear.yy +++ b/sprites/spr_weapon_powspear/spr_weapon_powspear.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_weapon_powspear", "bboxMode":0, "bbox_bottom":275, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"49d770e0-45f5-4f6a-932b-88984416b02a","name":"49d770e0-45f5-4f6a-932b-88984416b02a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"49d770e0-45f5-4f6a-932b-88984416b02a","name":"49d770e0-45f5-4f6a-932b-88984416b02a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"49d770e0-45f5-4f6a-932b-88984416b02a","path":"sprites/spr_weapon_powspear/spr_weapon_powspear.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"b384452c-57a9-4471-867e-57707dc0e6f9","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"49d770e0-45f5-4f6a-932b-88984416b02a","path":"sprites/spr_weapon_powspear/spr_weapon_powspear.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"b384452c-57a9-4471-867e-57707dc0e6f9","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_weapon_powspear2/spr_weapon_powspear2.yy b/sprites/spr_weapon_powspear2/spr_weapon_powspear2.yy index 8763191879..6e0a9a9fd5 100644 --- a/sprites/spr_weapon_powspear2/spr_weapon_powspear2.yy +++ b/sprites/spr_weapon_powspear2/spr_weapon_powspear2.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_weapon_powspear2", "bboxMode":0, "bbox_bottom":281, @@ -12,10 +12,10 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"9e672385-98c8-4ea0-ae1e-13d49a097f5d","name":"9e672385-98c8-4ea0-ae1e-13d49a097f5d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"e7a5116f-9003-4fe0-a3a6-22b578284d0f","name":"e7a5116f-9003-4fe0-a3a6-22b578284d0f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"a02ce5c0-2d43-4023-80b7-6fcfe2f77d94","name":"a02ce5c0-2d43-4023-80b7-6fcfe2f77d94","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"152b7978-2299-46a9-8659-9d3fa7ea8162","name":"152b7978-2299-46a9-8659-9d3fa7ea8162","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"9e672385-98c8-4ea0-ae1e-13d49a097f5d","name":"9e672385-98c8-4ea0-ae1e-13d49a097f5d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"e7a5116f-9003-4fe0-a3a6-22b578284d0f","name":"e7a5116f-9003-4fe0-a3a6-22b578284d0f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"a02ce5c0-2d43-4023-80b7-6fcfe2f77d94","name":"a02ce5c0-2d43-4023-80b7-6fcfe2f77d94","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"152b7978-2299-46a9-8659-9d3fa7ea8162","name":"152b7978-2299-46a9-8659-9d3fa7ea8162","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -73,18 +73,10 @@ "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, diff --git a/sprites/spr_weapon_powspear3/spr_weapon_powspear3.yy b/sprites/spr_weapon_powspear3/spr_weapon_powspear3.yy index 6dd8447800..8b184dbb0e 100644 --- a/sprites/spr_weapon_powspear3/spr_weapon_powspear3.yy +++ b/sprites/spr_weapon_powspear3/spr_weapon_powspear3.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_weapon_powspear3", "bboxMode":0, "bbox_bottom":281, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"9e672385-98c8-4ea0-ae1e-13d49a097f5d","name":"9e672385-98c8-4ea0-ae1e-13d49a097f5d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"9e672385-98c8-4ea0-ae1e-13d49a097f5d","name":"9e672385-98c8-4ea0-ae1e-13d49a097f5d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -72,9 +72,7 @@ "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_powspear3/spr_weapon_powspear3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"bfafdbb3-42c5-4130-bc4e-ac9fd5f89808","IsCreationKey":false,"Key":0.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_powspear3/spr_weapon_powspear3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"bfafdbb3-42c5-4130-bc4e-ac9fd5f89808","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_weapon_powswo/spr_weapon_powswo.yy b/sprites/spr_weapon_powswo/spr_weapon_powswo.yy index 1cdc4c0489..42f98df256 100644 --- a/sprites/spr_weapon_powswo/spr_weapon_powswo.yy +++ b/sprites/spr_weapon_powswo/spr_weapon_powswo.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_weapon_powswo", "bboxMode":0, "bbox_bottom":220, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"d76e9ffc-a89c-41eb-bc8a-b41946b2e18b","name":"d76e9ffc-a89c-41eb-bc8a-b41946b2e18b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"d76e9ffc-a89c-41eb-bc8a-b41946b2e18b","name":"d76e9ffc-a89c-41eb-bc8a-b41946b2e18b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -70,9 +70,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"d76e9ffc-a89c-41eb-bc8a-b41946b2e18b","path":"sprites/spr_weapon_powswo/spr_weapon_powswo.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"c90840de-d6cc-483e-a57c-af59544fddb7","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"d76e9ffc-a89c-41eb-bc8a-b41946b2e18b","path":"sprites/spr_weapon_powswo/spr_weapon_powswo.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"c90840de-d6cc-483e-a57c-af59544fddb7","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_weapon_relbla/spr_weapon_relbla.yy b/sprites/spr_weapon_relbla/spr_weapon_relbla.yy index a299183662..8b2cf17b70 100644 --- a/sprites/spr_weapon_relbla/spr_weapon_relbla.yy +++ b/sprites/spr_weapon_relbla/spr_weapon_relbla.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_weapon_relbla", "bboxMode":0, "bbox_bottom":230, @@ -12,10 +12,10 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"96d5ab85-1eea-4ab9-8c1e-2fea4e82785a","name":"96d5ab85-1eea-4ab9-8c1e-2fea4e82785a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"08907d07-7132-4c10-8132-430b9ebec89a","name":"08907d07-7132-4c10-8132-430b9ebec89a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"fef7faa3-ce59-4fc8-a6ad-2c89c10fed92","name":"fef7faa3-ce59-4fc8-a6ad-2c89c10fed92","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"eb77f72c-3aea-4fef-aab3-30c0b3649335","name":"eb77f72c-3aea-4fef-aab3-30c0b3649335","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"96d5ab85-1eea-4ab9-8c1e-2fea4e82785a","name":"96d5ab85-1eea-4ab9-8c1e-2fea4e82785a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"08907d07-7132-4c10-8132-430b9ebec89a","name":"08907d07-7132-4c10-8132-430b9ebec89a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"fef7faa3-ce59-4fc8-a6ad-2c89c10fed92","name":"fef7faa3-ce59-4fc8-a6ad-2c89c10fed92","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"eb77f72c-3aea-4fef-aab3-30c0b3649335","name":"eb77f72c-3aea-4fef-aab3-30c0b3649335","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -71,18 +71,10 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"96d5ab85-1eea-4ab9-8c1e-2fea4e82785a","path":"sprites/spr_weapon_relbla/spr_weapon_relbla.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"2f8678c0-8af9-4d94-a719-002848218458","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"08907d07-7132-4c10-8132-430b9ebec89a","path":"sprites/spr_weapon_relbla/spr_weapon_relbla.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"2b3f6409-1338-410e-b86c-2a0d4af07980","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"fef7faa3-ce59-4fc8-a6ad-2c89c10fed92","path":"sprites/spr_weapon_relbla/spr_weapon_relbla.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"b98b33ea-aa3f-4a1e-837d-3b713f0059f6","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"eb77f72c-3aea-4fef-aab3-30c0b3649335","path":"sprites/spr_weapon_relbla/spr_weapon_relbla.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"53a6ed03-3962-49b4-924f-ccb66edc1df0","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"96d5ab85-1eea-4ab9-8c1e-2fea4e82785a","path":"sprites/spr_weapon_relbla/spr_weapon_relbla.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"2f8678c0-8af9-4d94-a719-002848218458","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"08907d07-7132-4c10-8132-430b9ebec89a","path":"sprites/spr_weapon_relbla/spr_weapon_relbla.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"2b3f6409-1338-410e-b86c-2a0d4af07980","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"fef7faa3-ce59-4fc8-a6ad-2c89c10fed92","path":"sprites/spr_weapon_relbla/spr_weapon_relbla.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"b98b33ea-aa3f-4a1e-837d-3b713f0059f6","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"eb77f72c-3aea-4fef-aab3-30c0b3649335","path":"sprites/spr_weapon_relbla/spr_weapon_relbla.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"53a6ed03-3962-49b4-924f-ccb66edc1df0","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_weapon_relic_blade/spr_weapon_relic_blade.yy b/sprites/spr_weapon_relic_blade/spr_weapon_relic_blade.yy index 7d4e6bacf4..13417a6fb1 100644 --- a/sprites/spr_weapon_relic_blade/spr_weapon_relic_blade.yy +++ b/sprites/spr_weapon_relic_blade/spr_weapon_relic_blade.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_weapon_relic_blade", "bboxMode":0, "bbox_bottom":271, @@ -12,8 +12,8 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"a9e77be2-64e4-4dd1-a478-6b5a0b0a6ba8","name":"a9e77be2-64e4-4dd1-a478-6b5a0b0a6ba8","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"0ab801f3-77b9-4897-baa2-21d1b1a66a59","name":"0ab801f3-77b9-4897-baa2-21d1b1a66a59","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"a9e77be2-64e4-4dd1-a478-6b5a0b0a6ba8","name":"a9e77be2-64e4-4dd1-a478-6b5a0b0a6ba8","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"0ab801f3-77b9-4897-baa2-21d1b1a66a59","name":"0ab801f3-77b9-4897-baa2-21d1b1a66a59","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -70,12 +70,8 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"a9e77be2-64e4-4dd1-a478-6b5a0b0a6ba8","path":"sprites/spr_weapon_relic_blade/spr_weapon_relic_blade.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"551ad9d7-f899-49d8-824c-c4aa630cc24b","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"0ab801f3-77b9-4897-baa2-21d1b1a66a59","path":"sprites/spr_weapon_relic_blade/spr_weapon_relic_blade.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"93d5883f-4bed-45b6-9c83-3b88ce7201db","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"a9e77be2-64e4-4dd1-a478-6b5a0b0a6ba8","path":"sprites/spr_weapon_relic_blade/spr_weapon_relic_blade.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"551ad9d7-f899-49d8-824c-c4aa630cc24b","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"0ab801f3-77b9-4897-baa2-21d1b1a66a59","path":"sprites/spr_weapon_relic_blade/spr_weapon_relic_blade.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"93d5883f-4bed-45b6-9c83-3b88ce7201db","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_weapon_sbolter/spr_weapon_sbolter.yy b/sprites/spr_weapon_sbolter/spr_weapon_sbolter.yy index 6d5dd765a9..713baba12d 100644 --- a/sprites/spr_weapon_sbolter/spr_weapon_sbolter.yy +++ b/sprites/spr_weapon_sbolter/spr_weapon_sbolter.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_weapon_sbolter", "bboxMode":0, "bbox_bottom":168, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"f0dc16e8-bbd2-4823-87a1-ba3601853ffe","name":"f0dc16e8-bbd2-4823-87a1-ba3601853ffe","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"f0dc16e8-bbd2-4823-87a1-ba3601853ffe","name":"f0dc16e8-bbd2-4823-87a1-ba3601853ffe","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"f0dc16e8-bbd2-4823-87a1-ba3601853ffe","path":"sprites/spr_weapon_sbolter/spr_weapon_sbolter.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"6f46c285-35b1-4a8e-b996-6405ca743092","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"f0dc16e8-bbd2-4823-87a1-ba3601853ffe","path":"sprites/spr_weapon_sbolter/spr_weapon_sbolter.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"6f46c285-35b1-4a8e-b996-6405ca743092","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_weapon_skill_icon/spr_weapon_skill_icon.yy b/sprites/spr_weapon_skill_icon/spr_weapon_skill_icon.yy index c2164a8d03..6e901609ed 100644 --- a/sprites/spr_weapon_skill_icon/spr_weapon_skill_icon.yy +++ b/sprites/spr_weapon_skill_icon/spr_weapon_skill_icon.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_weapon_skill_icon", "bboxMode":0, "bbox_bottom":56, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"5c9ad60b-aa51-4a12-a391-cc9a458aa714","name":"5c9ad60b-aa51-4a12-a391-cc9a458aa714","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"5c9ad60b-aa51-4a12-a391-cc9a458aa714","name":"5c9ad60b-aa51-4a12-a391-cc9a458aa714","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"5c9ad60b-aa51-4a12-a391-cc9a458aa714","path":"sprites/spr_weapon_skill_icon/spr_weapon_skill_icon.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"b2f2a734-5d3b-4329-b118-519351df5fb9","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"5c9ad60b-aa51-4a12-a391-cc9a458aa714","path":"sprites/spr_weapon_skill_icon/spr_weapon_skill_icon.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"b2f2a734-5d3b-4329-b118-519351df5fb9","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_weapon_sniper/spr_weapon_sniper.yy b/sprites/spr_weapon_sniper/spr_weapon_sniper.yy index 24261b5e71..bdf2f96bc5 100644 --- a/sprites/spr_weapon_sniper/spr_weapon_sniper.yy +++ b/sprites/spr_weapon_sniper/spr_weapon_sniper.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_weapon_sniper", "bboxMode":0, "bbox_bottom":230, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"09e772d4-7976-49cd-a2e3-9dce1939fed0","name":"09e772d4-7976-49cd-a2e3-9dce1939fed0","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"09e772d4-7976-49cd-a2e3-9dce1939fed0","name":"09e772d4-7976-49cd-a2e3-9dce1939fed0","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"09e772d4-7976-49cd-a2e3-9dce1939fed0","path":"sprites/spr_weapon_sniper/spr_weapon_sniper.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"a7fe76e7-cc09-48ac-9bb7-983d65dd2ac7","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"09e772d4-7976-49cd-a2e3-9dce1939fed0","path":"sprites/spr_weapon_sniper/spr_weapon_sniper.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"a7fe76e7-cc09-48ac-9bb7-983d65dd2ac7","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_weapon_stalker/spr_weapon_stalker.yy b/sprites/spr_weapon_stalker/spr_weapon_stalker.yy index 30d49bc521..336734d0b0 100644 --- a/sprites/spr_weapon_stalker/spr_weapon_stalker.yy +++ b/sprites/spr_weapon_stalker/spr_weapon_stalker.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_weapon_stalker", "bboxMode":0, "bbox_bottom":222, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"14db339f-7395-4530-87dc-3a3aace86211","name":"14db339f-7395-4530-87dc-3a3aace86211","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"14db339f-7395-4530-87dc-3a3aace86211","name":"14db339f-7395-4530-87dc-3a3aace86211","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"14db339f-7395-4530-87dc-3a3aace86211","path":"sprites/spr_weapon_stalker/spr_weapon_stalker.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"160c40ae-6978-467b-a08b-d4ae57c05d2b","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"14db339f-7395-4530-87dc-3a3aace86211","path":"sprites/spr_weapon_stalker/spr_weapon_stalker.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"160c40ae-6978-467b-a08b-d4ae57c05d2b","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_weapon_standard/spr_weapon_standard.yy b/sprites/spr_weapon_standard/spr_weapon_standard.yy index ef822e374e..f41ed0fe92 100644 --- a/sprites/spr_weapon_standard/spr_weapon_standard.yy +++ b/sprites/spr_weapon_standard/spr_weapon_standard.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_weapon_standard", "bboxMode":0, "bbox_bottom":271, @@ -12,10 +12,10 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"7a4a520a-7a19-4f59-bc07-dde98452c760","name":"7a4a520a-7a19-4f59-bc07-dde98452c760","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"f2936088-e4f0-4a05-881d-20ac9d75bb29","name":"f2936088-e4f0-4a05-881d-20ac9d75bb29","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"cbce5203-3778-468e-b7c8-7515f6e18fde","name":"cbce5203-3778-468e-b7c8-7515f6e18fde","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"ee70063b-766f-4ba8-8b3f-51fdb1ec6ec5","name":"ee70063b-766f-4ba8-8b3f-51fdb1ec6ec5","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"7a4a520a-7a19-4f59-bc07-dde98452c760","name":"7a4a520a-7a19-4f59-bc07-dde98452c760","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"f2936088-e4f0-4a05-881d-20ac9d75bb29","name":"f2936088-e4f0-4a05-881d-20ac9d75bb29","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"cbce5203-3778-468e-b7c8-7515f6e18fde","name":"cbce5203-3778-468e-b7c8-7515f6e18fde","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"ee70063b-766f-4ba8-8b3f-51fdb1ec6ec5","name":"ee70063b-766f-4ba8-8b3f-51fdb1ec6ec5","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -71,18 +71,10 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"7a4a520a-7a19-4f59-bc07-dde98452c760","path":"sprites/spr_weapon_standard/spr_weapon_standard.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"6098e9c5-5468-41a9-a2b2-b8a20ab9a5b1","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"f2936088-e4f0-4a05-881d-20ac9d75bb29","path":"sprites/spr_weapon_standard/spr_weapon_standard.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"c93b7cba-b1b1-4daa-a530-bfb41ed7d67d","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"cbce5203-3778-468e-b7c8-7515f6e18fde","path":"sprites/spr_weapon_standard/spr_weapon_standard.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"718e1208-998c-4f79-b774-96d8555dfc20","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"ee70063b-766f-4ba8-8b3f-51fdb1ec6ec5","path":"sprites/spr_weapon_standard/spr_weapon_standard.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"40db7c33-c106-423a-ab76-892e47323159","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"7a4a520a-7a19-4f59-bc07-dde98452c760","path":"sprites/spr_weapon_standard/spr_weapon_standard.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"6098e9c5-5468-41a9-a2b2-b8a20ab9a5b1","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"f2936088-e4f0-4a05-881d-20ac9d75bb29","path":"sprites/spr_weapon_standard/spr_weapon_standard.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"c93b7cba-b1b1-4daa-a530-bfb41ed7d67d","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"cbce5203-3778-468e-b7c8-7515f6e18fde","path":"sprites/spr_weapon_standard/spr_weapon_standard.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"718e1208-998c-4f79-b774-96d8555dfc20","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"ee70063b-766f-4ba8-8b3f-51fdb1ec6ec5","path":"sprites/spr_weapon_standard/spr_weapon_standard.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"40db7c33-c106-423a-ab76-892e47323159","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_weapon_standard2/spr_weapon_standard2.yy b/sprites/spr_weapon_standard2/spr_weapon_standard2.yy index f6a4e046fa..16943323f5 100644 --- a/sprites/spr_weapon_standard2/spr_weapon_standard2.yy +++ b/sprites/spr_weapon_standard2/spr_weapon_standard2.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_weapon_standard2", "bboxMode":0, "bbox_bottom":281, @@ -12,8 +12,8 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"fc5175d3-d91f-4714-a7cf-f97f841078f9","name":"fc5175d3-d91f-4714-a7cf-f97f841078f9","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"3e954feb-84ef-4aa3-9cde-3ff472c5b06b","name":"3e954feb-84ef-4aa3-9cde-3ff472c5b06b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"fc5175d3-d91f-4714-a7cf-f97f841078f9","name":"fc5175d3-d91f-4714-a7cf-f97f841078f9","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"3e954feb-84ef-4aa3-9cde-3ff472c5b06b","name":"3e954feb-84ef-4aa3-9cde-3ff472c5b06b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -70,12 +70,8 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"fc5175d3-d91f-4714-a7cf-f97f841078f9","path":"sprites/spr_weapon_standard2/spr_weapon_standard2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"46000387-92ab-4c63-aeca-861fad536597","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"3e954feb-84ef-4aa3-9cde-3ff472c5b06b","path":"sprites/spr_weapon_standard2/spr_weapon_standard2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"df99334c-a885-446f-9589-d197bb8535d4","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"fc5175d3-d91f-4714-a7cf-f97f841078f9","path":"sprites/spr_weapon_standard2/spr_weapon_standard2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"46000387-92ab-4c63-aeca-861fad536597","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"3e954feb-84ef-4aa3-9cde-3ff472c5b06b","path":"sprites/spr_weapon_standard2/spr_weapon_standard2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"df99334c-a885-446f-9589-d197bb8535d4","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_weapon_storm/spr_weapon_storm.yy b/sprites/spr_weapon_storm/spr_weapon_storm.yy index 92da4f20fc..fd92cfb168 100644 --- a/sprites/spr_weapon_storm/spr_weapon_storm.yy +++ b/sprites/spr_weapon_storm/spr_weapon_storm.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_weapon_storm", "bboxMode":0, "bbox_bottom":178, @@ -12,8 +12,8 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"daea238a-4d48-48a6-be27-b0685c438110","name":"daea238a-4d48-48a6-be27-b0685c438110","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"ee465ab4-6f68-4a2c-9730-d75939fe4cdb","name":"ee465ab4-6f68-4a2c-9730-d75939fe4cdb","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"daea238a-4d48-48a6-be27-b0685c438110","name":"daea238a-4d48-48a6-be27-b0685c438110","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"ee465ab4-6f68-4a2c-9730-d75939fe4cdb","name":"ee465ab4-6f68-4a2c-9730-d75939fe4cdb","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -69,12 +69,8 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"daea238a-4d48-48a6-be27-b0685c438110","path":"sprites/spr_weapon_storm/spr_weapon_storm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"ee3e6256-19ea-4071-91e7-fdc1b74bcdff","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"ee465ab4-6f68-4a2c-9730-d75939fe4cdb","path":"sprites/spr_weapon_storm/spr_weapon_storm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"0c0636cd-15ad-4c13-934c-2259a4748348","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"daea238a-4d48-48a6-be27-b0685c438110","path":"sprites/spr_weapon_storm/spr_weapon_storm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"ee3e6256-19ea-4071-91e7-fdc1b74bcdff","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"ee465ab4-6f68-4a2c-9730-d75939fe4cdb","path":"sprites/spr_weapon_storm/spr_weapon_storm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"0c0636cd-15ad-4c13-934c-2259a4748348","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_weapon_storm2/spr_weapon_storm2.yy b/sprites/spr_weapon_storm2/spr_weapon_storm2.yy index 1f20f6e4f6..5f65d5500c 100644 --- a/sprites/spr_weapon_storm2/spr_weapon_storm2.yy +++ b/sprites/spr_weapon_storm2/spr_weapon_storm2.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_weapon_storm2", "bboxMode":0, "bbox_bottom":156, @@ -12,8 +12,8 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"2d1cb628-a0f2-4600-b7e6-b5bd352c12b6","name":"2d1cb628-a0f2-4600-b7e6-b5bd352c12b6","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"92b335a7-bf24-4f08-8e25-68f66ea594da","name":"92b335a7-bf24-4f08-8e25-68f66ea594da","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"2d1cb628-a0f2-4600-b7e6-b5bd352c12b6","name":"2d1cb628-a0f2-4600-b7e6-b5bd352c12b6","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"92b335a7-bf24-4f08-8e25-68f66ea594da","name":"92b335a7-bf24-4f08-8e25-68f66ea594da","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -71,12 +71,8 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"2d1cb628-a0f2-4600-b7e6-b5bd352c12b6","path":"sprites/spr_weapon_storm2/spr_weapon_storm2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"652f8a4e-ce6f-49f9-bdfc-7ed6eb9bb380","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"92b335a7-bf24-4f08-8e25-68f66ea594da","path":"sprites/spr_weapon_storm2/spr_weapon_storm2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"9105c9ef-4d04-49b9-af90-81abd84cb227","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"2d1cb628-a0f2-4600-b7e6-b5bd352c12b6","path":"sprites/spr_weapon_storm2/spr_weapon_storm2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"652f8a4e-ce6f-49f9-bdfc-7ed6eb9bb380","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"92b335a7-bf24-4f08-8e25-68f66ea594da","path":"sprites/spr_weapon_storm2/spr_weapon_storm2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"9105c9ef-4d04-49b9-af90-81abd84cb227","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_weapon_storm_tall/spr_weapon_storm_tall.yy b/sprites/spr_weapon_storm_tall/spr_weapon_storm_tall.yy index 8d1c0d7c90..f26aeeaf43 100644 --- a/sprites/spr_weapon_storm_tall/spr_weapon_storm_tall.yy +++ b/sprites/spr_weapon_storm_tall/spr_weapon_storm_tall.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_weapon_storm_tall", "bboxMode":0, "bbox_bottom":221, @@ -12,8 +12,8 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"f6262674-c261-4da7-aa0e-506e3196aa81","name":"f6262674-c261-4da7-aa0e-506e3196aa81","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"c0e369b0-ce8e-42eb-8a69-e7058b47bcff","name":"c0e369b0-ce8e-42eb-8a69-e7058b47bcff","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"f6262674-c261-4da7-aa0e-506e3196aa81","name":"f6262674-c261-4da7-aa0e-506e3196aa81","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"c0e369b0-ce8e-42eb-8a69-e7058b47bcff","name":"c0e369b0-ce8e-42eb-8a69-e7058b47bcff","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -71,12 +71,8 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"f6262674-c261-4da7-aa0e-506e3196aa81","path":"sprites/spr_weapon_storm_tall/spr_weapon_storm_tall.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"2995137d-6005-4690-8d87-3db7ccdd4a8f","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"c0e369b0-ce8e-42eb-8a69-e7058b47bcff","path":"sprites/spr_weapon_storm_tall/spr_weapon_storm_tall.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"d37d0b5a-f4ff-4e58-a47e-444660a0acf0","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"f6262674-c261-4da7-aa0e-506e3196aa81","path":"sprites/spr_weapon_storm_tall/spr_weapon_storm_tall.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"2995137d-6005-4690-8d87-3db7ccdd4a8f","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"c0e369b0-ce8e-42eb-8a69-e7058b47bcff","path":"sprites/spr_weapon_storm_tall/spr_weapon_storm_tall.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"d37d0b5a-f4ff-4e58-a47e-444660a0acf0","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_weapon_storm_tall_2/spr_weapon_storm_tall_2.yy b/sprites/spr_weapon_storm_tall_2/spr_weapon_storm_tall_2.yy index 25ff52f98a..95d9666d6c 100644 --- a/sprites/spr_weapon_storm_tall_2/spr_weapon_storm_tall_2.yy +++ b/sprites/spr_weapon_storm_tall_2/spr_weapon_storm_tall_2.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_weapon_storm_tall_2", "bboxMode":0, "bbox_bottom":231, @@ -12,8 +12,8 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"05d4f358-c637-4959-b4f8-043dddfe5af9","name":"05d4f358-c637-4959-b4f8-043dddfe5af9","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"0ae042dd-6007-483e-a319-a21e64ff24ac","name":"0ae042dd-6007-483e-a319-a21e64ff24ac","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"05d4f358-c637-4959-b4f8-043dddfe5af9","name":"05d4f358-c637-4959-b4f8-043dddfe5af9","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"0ae042dd-6007-483e-a319-a21e64ff24ac","name":"0ae042dd-6007-483e-a319-a21e64ff24ac","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -71,12 +71,8 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"05d4f358-c637-4959-b4f8-043dddfe5af9","path":"sprites/spr_weapon_storm_tall_2/spr_weapon_storm_tall_2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"08ecee5b-0d7d-4070-b8ec-270dfd0e535c","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"0ae042dd-6007-483e-a319-a21e64ff24ac","path":"sprites/spr_weapon_storm_tall_2/spr_weapon_storm_tall_2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"82b4df8c-0dbd-4454-99f2-0cd556e14669","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"05d4f358-c637-4959-b4f8-043dddfe5af9","path":"sprites/spr_weapon_storm_tall_2/spr_weapon_storm_tall_2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"08ecee5b-0d7d-4070-b8ec-270dfd0e535c","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"0ae042dd-6007-483e-a319-a21e64ff24ac","path":"sprites/spr_weapon_storm_tall_2/spr_weapon_storm_tall_2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"82b4df8c-0dbd-4454-99f2-0cd556e14669","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_weapon_sword_oriental/spr_weapon_sword_oriental.yy b/sprites/spr_weapon_sword_oriental/spr_weapon_sword_oriental.yy index d0d37c7e13..94e577d46e 100644 --- a/sprites/spr_weapon_sword_oriental/spr_weapon_sword_oriental.yy +++ b/sprites/spr_weapon_sword_oriental/spr_weapon_sword_oriental.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_weapon_sword_oriental", "bboxMode":0, "bbox_bottom":231, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"c811cdad-6281-47b5-bc49-194a06afa81a","name":"c811cdad-6281-47b5-bc49-194a06afa81a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"c811cdad-6281-47b5-bc49-194a06afa81a","name":"c811cdad-6281-47b5-bc49-194a06afa81a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -70,9 +70,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"c811cdad-6281-47b5-bc49-194a06afa81a","path":"sprites/spr_weapon_sword_oriental/spr_weapon_sword_oriental.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"f5366391-42ac-4772-bf63-3a1f398c0acc","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"c811cdad-6281-47b5-bc49-194a06afa81a","path":"sprites/spr_weapon_sword_oriental/spr_weapon_sword_oriental.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"f5366391-42ac-4772-bf63-3a1f398c0acc","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_weapon_sword_turk/spr_weapon_sword_turk.yy b/sprites/spr_weapon_sword_turk/spr_weapon_sword_turk.yy index 79ea6bd9ab..fb8329d946 100644 --- a/sprites/spr_weapon_sword_turk/spr_weapon_sword_turk.yy +++ b/sprites/spr_weapon_sword_turk/spr_weapon_sword_turk.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_weapon_sword_turk", "bboxMode":0, "bbox_bottom":221, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"88d55934-39f8-4cf5-b787-e8fcfa454635","name":"88d55934-39f8-4cf5-b787-e8fcfa454635","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"88d55934-39f8-4cf5-b787-e8fcfa454635","name":"88d55934-39f8-4cf5-b787-e8fcfa454635","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -70,9 +70,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"88d55934-39f8-4cf5-b787-e8fcfa454635","path":"sprites/spr_weapon_sword_turk/spr_weapon_sword_turk.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"cfdbccb1-0a44-4898-a80b-736ec777a6e2","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"88d55934-39f8-4cf5-b787-e8fcfa454635","path":"sprites/spr_weapon_sword_turk/spr_weapon_sword_turk.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"cfdbccb1-0a44-4898-a80b-736ec777a6e2","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_weapon_thhammer/spr_weapon_thhammer.yy b/sprites/spr_weapon_thhammer/spr_weapon_thhammer.yy index 553d5c8398..0e3530514c 100644 --- a/sprites/spr_weapon_thhammer/spr_weapon_thhammer.yy +++ b/sprites/spr_weapon_thhammer/spr_weapon_thhammer.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_weapon_thhammer", "bboxMode":0, "bbox_bottom":220, @@ -12,8 +12,8 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"6d683d25-adba-4942-a5d9-ef5f267f4485","name":"6d683d25-adba-4942-a5d9-ef5f267f4485","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"7091a0da-79ce-4cc8-90f4-c0cc1f33d26f","name":"7091a0da-79ce-4cc8-90f4-c0cc1f33d26f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"6d683d25-adba-4942-a5d9-ef5f267f4485","name":"6d683d25-adba-4942-a5d9-ef5f267f4485","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"7091a0da-79ce-4cc8-90f4-c0cc1f33d26f","name":"7091a0da-79ce-4cc8-90f4-c0cc1f33d26f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -69,12 +69,8 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"6d683d25-adba-4942-a5d9-ef5f267f4485","path":"sprites/spr_weapon_thhammer/spr_weapon_thhammer.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"2ff65f5b-1f6b-4784-8772-4baedbf78fa4","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"7091a0da-79ce-4cc8-90f4-c0cc1f33d26f","path":"sprites/spr_weapon_thhammer/spr_weapon_thhammer.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"1174f450-c54c-4b3f-91db-ea2d44f77ee5","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"6d683d25-adba-4942-a5d9-ef5f267f4485","path":"sprites/spr_weapon_thhammer/spr_weapon_thhammer.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"2ff65f5b-1f6b-4784-8772-4baedbf78fa4","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"7091a0da-79ce-4cc8-90f4-c0cc1f33d26f","path":"sprites/spr_weapon_thhammer/spr_weapon_thhammer.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"1174f450-c54c-4b3f-91db-ea2d44f77ee5","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_weapon_xenophase_blade_var1/spr_weapon_xenophase_blade_var1.yy b/sprites/spr_weapon_xenophase_blade_var1/spr_weapon_xenophase_blade_var1.yy index e5646cd0ff..8ad2bdb8bd 100644 --- a/sprites/spr_weapon_xenophase_blade_var1/spr_weapon_xenophase_blade_var1.yy +++ b/sprites/spr_weapon_xenophase_blade_var1/spr_weapon_xenophase_blade_var1.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_weapon_xenophase_blade_var1", "bboxMode":0, "bbox_bottom":220, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"9f12e580-11d2-41e9-a836-732806ddd9e1","name":"9f12e580-11d2-41e9-a836-732806ddd9e1","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"9f12e580-11d2-41e9-a836-732806ddd9e1","name":"9f12e580-11d2-41e9-a836-732806ddd9e1","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -70,9 +70,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"9f12e580-11d2-41e9-a836-732806ddd9e1","path":"sprites/spr_weapon_xenophase_blade_var1/spr_weapon_xenophase_blade_var1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"460f9a3b-0ee2-44d7-804f-d40f568a1d51","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"9f12e580-11d2-41e9-a836-732806ddd9e1","path":"sprites/spr_weapon_xenophase_blade_var1/spr_weapon_xenophase_blade_var1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"460f9a3b-0ee2-44d7-804f-d40f568a1d51","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_weapoon_powso_flamberge/spr_weapoon_powso_flamberge.yy b/sprites/spr_weapoon_powso_flamberge/spr_weapoon_powso_flamberge.yy index d582e2a271..4be445fa19 100644 --- a/sprites/spr_weapoon_powso_flamberge/spr_weapoon_powso_flamberge.yy +++ b/sprites/spr_weapoon_powso_flamberge/spr_weapoon_powso_flamberge.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_weapoon_powso_flamberge", "bboxMode":0, "bbox_bottom":219, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"b9e276c7-1d8b-4129-82dc-1842ecff6f07","name":"b9e276c7-1d8b-4129-82dc-1842ecff6f07","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"b9e276c7-1d8b-4129-82dc-1842ecff6f07","name":"b9e276c7-1d8b-4129-82dc-1842ecff6f07","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -70,9 +70,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"b9e276c7-1d8b-4129-82dc-1842ecff6f07","path":"sprites/spr_weapoon_powso_flamberge/spr_weapoon_powso_flamberge.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"93646429-a51d-45af-b161-669f4ae09116","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"b9e276c7-1d8b-4129-82dc-1842ecff6f07","path":"sprites/spr_weapoon_powso_flamberge/spr_weapoon_powso_flamberge.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"93646429-a51d-45af-b161-669f4ae09116","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_welcome_bg/spr_welcome_bg.yy b/sprites/spr_welcome_bg/spr_welcome_bg.yy index 820c193573..e07329010c 100644 --- a/sprites/spr_welcome_bg/spr_welcome_bg.yy +++ b/sprites/spr_welcome_bg/spr_welcome_bg.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_welcome_bg", "bboxMode":0, "bbox_bottom":717, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"0e4d5dc2-9e3f-47bf-8eb3-29b65da13289","name":"0e4d5dc2-9e3f-47bf-8eb3-29b65da13289","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"0e4d5dc2-9e3f-47bf-8eb3-29b65da13289","name":"0e4d5dc2-9e3f-47bf-8eb3-29b65da13289","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -70,9 +70,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"0e4d5dc2-9e3f-47bf-8eb3-29b65da13289","path":"sprites/spr_welcome_bg/spr_welcome_bg.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"2271bb95-4e9b-40ac-9214-44ff3a002300","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"0e4d5dc2-9e3f-47bf-8eb3-29b65da13289","path":"sprites/spr_welcome_bg/spr_welcome_bg.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"2271bb95-4e9b-40ac-9214-44ff3a002300","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_wings/spr_wings.yy b/sprites/spr_wings/spr_wings.yy index 9fad0d3742..ca71e2281d 100644 --- a/sprites/spr_wings/spr_wings.yy +++ b/sprites/spr_wings/spr_wings.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_wings", "bboxMode":0, "bbox_bottom":199, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"633f09f2-db3b-4b35-afd5-d04b2ce031b9","name":"633f09f2-db3b-4b35-afd5-d04b2ce031b9","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"633f09f2-db3b-4b35-afd5-d04b2ce031b9","name":"633f09f2-db3b-4b35-afd5-d04b2ce031b9","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -70,9 +70,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"633f09f2-db3b-4b35-afd5-d04b2ce031b9","path":"sprites/spr_wings/spr_wings.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"e9592866-0134-4230-8307-ca1670527c95","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"633f09f2-db3b-4b35-afd5-d04b2ce031b9","path":"sprites/spr_wings/spr_wings.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"e9592866-0134-4230-8307-ca1670527c95","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_wisdom_icon/spr_wisdom_icon.yy b/sprites/spr_wisdom_icon/spr_wisdom_icon.yy index 76abac1c73..aeefde3e55 100644 --- a/sprites/spr_wisdom_icon/spr_wisdom_icon.yy +++ b/sprites/spr_wisdom_icon/spr_wisdom_icon.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_wisdom_icon", "bboxMode":0, "bbox_bottom":56, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"3bbcf618-5a44-4096-8419-d1f5a0080164","name":"3bbcf618-5a44-4096-8419-d1f5a0080164","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"3bbcf618-5a44-4096-8419-d1f5a0080164","name":"3bbcf618-5a44-4096-8419-d1f5a0080164","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"3bbcf618-5a44-4096-8419-d1f5a0080164","path":"sprites/spr_wisdom_icon/spr_wisdom_icon.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"7aeb2f92-2fa6-410a-9c77-f83f039bc28f","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"3bbcf618-5a44-4096-8419-d1f5a0080164","path":"sprites/spr_wisdom_icon/spr_wisdom_icon.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"7aeb2f92-2fa6-410a-9c77-f83f039bc28f","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_wolf_tail/spr_wolf_tail.yy b/sprites/spr_wolf_tail/spr_wolf_tail.yy index d5bdb393fb..e43d16b69a 100644 --- a/sprites/spr_wolf_tail/spr_wolf_tail.yy +++ b/sprites/spr_wolf_tail/spr_wolf_tail.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_wolf_tail", "bboxMode":0, "bbox_bottom":66, @@ -12,9 +12,9 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"db6935ae-cfa8-4c74-b21c-6a3fc6b9ec5d","name":"db6935ae-cfa8-4c74-b21c-6a3fc6b9ec5d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"b90f1a4f-e127-4476-a034-e7e662bfb45c","name":"b90f1a4f-e127-4476-a034-e7e662bfb45c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"86713530-ec28-4099-9e88-05c203661df3","name":"86713530-ec28-4099-9e88-05c203661df3","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"db6935ae-cfa8-4c74-b21c-6a3fc6b9ec5d","name":"db6935ae-cfa8-4c74-b21c-6a3fc6b9ec5d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"b90f1a4f-e127-4476-a034-e7e662bfb45c","name":"b90f1a4f-e127-4476-a034-e7e662bfb45c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"86713530-ec28-4099-9e88-05c203661df3","name":"86713530-ec28-4099-9e88-05c203661df3","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -70,15 +70,9 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"db6935ae-cfa8-4c74-b21c-6a3fc6b9ec5d","path":"sprites/spr_wolf_tail/spr_wolf_tail.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"d5a2f0ae-ed1f-4c48-a9c9-8bef775b955e","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"b90f1a4f-e127-4476-a034-e7e662bfb45c","path":"sprites/spr_wolf_tail/spr_wolf_tail.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"ba562b9d-ac8b-4e7c-8d71-0c6b9581c167","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"86713530-ec28-4099-9e88-05c203661df3","path":"sprites/spr_wolf_tail/spr_wolf_tail.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"ce5a623c-7be4-487f-81b2-de39672f4cfa","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"db6935ae-cfa8-4c74-b21c-6a3fc6b9ec5d","path":"sprites/spr_wolf_tail/spr_wolf_tail.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"d5a2f0ae-ed1f-4c48-a9c9-8bef775b955e","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"b90f1a4f-e127-4476-a034-e7e662bfb45c","path":"sprites/spr_wolf_tail/spr_wolf_tail.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"ba562b9d-ac8b-4e7c-8d71-0c6b9581c167","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"86713530-ec28-4099-9e88-05c203661df3","path":"sprites/spr_wolf_tail/spr_wolf_tail.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"ce5a623c-7be4-487f-81b2-de39672f4cfa","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_ws_mk3__pualdron_veteran/spr_ws_mk3__pualdron_veteran.yy b/sprites/spr_ws_mk3__pualdron_veteran/spr_ws_mk3__pualdron_veteran.yy index 9871db8935..de9237b701 100644 --- a/sprites/spr_ws_mk3__pualdron_veteran/spr_ws_mk3__pualdron_veteran.yy +++ b/sprites/spr_ws_mk3__pualdron_veteran/spr_ws_mk3__pualdron_veteran.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_ws_mk3__pualdron_veteran", "bboxMode":0, "bbox_bottom":121, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"41a2cc3c-da75-4ae5-957f-4605884d3c33","name":"41a2cc3c-da75-4ae5-957f-4605884d3c33","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"41a2cc3c-da75-4ae5-957f-4605884d3c33","name":"41a2cc3c-da75-4ae5-957f-4605884d3c33","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"41a2cc3c-da75-4ae5-957f-4605884d3c33","path":"sprites/spr_ws_mk3__pualdron_veteran/spr_ws_mk3__pualdron_veteran.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"a6bfe4dd-ff75-4365-af6c-fadbb12914f0","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"41a2cc3c-da75-4ae5-957f-4605884d3c33","path":"sprites/spr_ws_mk3__pualdron_veteran/spr_ws_mk3__pualdron_veteran.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"a6bfe4dd-ff75-4365-af6c-fadbb12914f0","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_ws_mk4_monovisor/spr_ws_mk4_monovisor.yy b/sprites/spr_ws_mk4_monovisor/spr_ws_mk4_monovisor.yy index 3561f75c07..dee019e50c 100644 --- a/sprites/spr_ws_mk4_monovisor/spr_ws_mk4_monovisor.yy +++ b/sprites/spr_ws_mk4_monovisor/spr_ws_mk4_monovisor.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_ws_mk4_monovisor", "bboxMode":0, "bbox_bottom":83, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"f4b0c099-c3b8-4ad8-9d54-538fd3bf5226","name":"f4b0c099-c3b8-4ad8-9d54-538fd3bf5226","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"f4b0c099-c3b8-4ad8-9d54-538fd3bf5226","name":"f4b0c099-c3b8-4ad8-9d54-538fd3bf5226","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"f4b0c099-c3b8-4ad8-9d54-538fd3bf5226","path":"sprites/spr_ws_mk4_monovisor/spr_ws_mk4_monovisor.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"2f7020a2-698f-4265-8a00-5d2988511edc","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"f4b0c099-c3b8-4ad8-9d54-538fd3bf5226","path":"sprites/spr_ws_mk4_monovisor/spr_ws_mk4_monovisor.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"2f7020a2-698f-4265-8a00-5d2988511edc","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_ws_mk5_helm/spr_ws_mk5_helm.yy b/sprites/spr_ws_mk5_helm/spr_ws_mk5_helm.yy index 96a29b3a75..18437a3e84 100644 --- a/sprites/spr_ws_mk5_helm/spr_ws_mk5_helm.yy +++ b/sprites/spr_ws_mk5_helm/spr_ws_mk5_helm.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_ws_mk5_helm", "bboxMode":0, "bbox_bottom":43, @@ -12,8 +12,8 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"03a198ae-96cd-4c20-8cc7-9b6a1b9d53cf","name":"03a198ae-96cd-4c20-8cc7-9b6a1b9d53cf","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"7a87ea04-33d2-4453-a402-33a139b3742b","name":"7a87ea04-33d2-4453-a402-33a139b3742b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"03a198ae-96cd-4c20-8cc7-9b6a1b9d53cf","name":"03a198ae-96cd-4c20-8cc7-9b6a1b9d53cf","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"7a87ea04-33d2-4453-a402-33a139b3742b","name":"7a87ea04-33d2-4453-a402-33a139b3742b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -69,12 +69,8 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"03a198ae-96cd-4c20-8cc7-9b6a1b9d53cf","path":"sprites/spr_ws_mk5_helm/spr_ws_mk5_helm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"9ac808ab-f109-4dfc-af94-029a6be8186c","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"7a87ea04-33d2-4453-a402-33a139b3742b","path":"sprites/spr_ws_mk5_helm/spr_ws_mk5_helm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"f29cf236-99c6-43ae-a485-1e516a3dca76","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"03a198ae-96cd-4c20-8cc7-9b6a1b9d53cf","path":"sprites/spr_ws_mk5_helm/spr_ws_mk5_helm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"9ac808ab-f109-4dfc-af94-029a6be8186c","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"7a87ea04-33d2-4453-a402-33a139b3742b","path":"sprites/spr_ws_mk5_helm/spr_ws_mk5_helm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"f29cf236-99c6-43ae-a485-1e516a3dca76","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_ws_mk6_helm/spr_ws_mk6_helm.yy b/sprites/spr_ws_mk6_helm/spr_ws_mk6_helm.yy index c2abdf8b12..ebf6142bc5 100644 --- a/sprites/spr_ws_mk6_helm/spr_ws_mk6_helm.yy +++ b/sprites/spr_ws_mk6_helm/spr_ws_mk6_helm.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_ws_mk6_helm", "bboxMode":0, "bbox_bottom":47, @@ -12,8 +12,8 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"ace61ddf-2a3c-423b-86ea-b56b31a0533d","name":"ace61ddf-2a3c-423b-86ea-b56b31a0533d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"9dbd87d8-a84a-4a59-810f-85199bcae9b7","name":"9dbd87d8-a84a-4a59-810f-85199bcae9b7","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"ace61ddf-2a3c-423b-86ea-b56b31a0533d","name":"ace61ddf-2a3c-423b-86ea-b56b31a0533d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"9dbd87d8-a84a-4a59-810f-85199bcae9b7","name":"9dbd87d8-a84a-4a59-810f-85199bcae9b7","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -69,12 +69,8 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"ace61ddf-2a3c-423b-86ea-b56b31a0533d","path":"sprites/spr_ws_mk6_helm/spr_ws_mk6_helm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"f663dea8-4248-4425-b3fd-962c9d79c68a","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"9dbd87d8-a84a-4a59-810f-85199bcae9b7","path":"sprites/spr_ws_mk6_helm/spr_ws_mk6_helm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"f66e0f37-9262-4300-a3d6-a0b6a2b18e67","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"ace61ddf-2a3c-423b-86ea-b56b31a0533d","path":"sprites/spr_ws_mk6_helm/spr_ws_mk6_helm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"f663dea8-4248-4425-b3fd-962c9d79c68a","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"9dbd87d8-a84a-4a59-810f-85199bcae9b7","path":"sprites/spr_ws_mk6_helm/spr_ws_mk6_helm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"f66e0f37-9262-4300-a3d6-a0b6a2b18e67","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_ws_mk7_helm/spr_ws_mk7_helm.yy b/sprites/spr_ws_mk7_helm/spr_ws_mk7_helm.yy index 2a46ab972c..7177900376 100644 --- a/sprites/spr_ws_mk7_helm/spr_ws_mk7_helm.yy +++ b/sprites/spr_ws_mk7_helm/spr_ws_mk7_helm.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_ws_mk7_helm", "bboxMode":0, "bbox_bottom":43, @@ -12,8 +12,8 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"d741c8ac-e09c-4942-8ffa-99bb0eaa246e","name":"d741c8ac-e09c-4942-8ffa-99bb0eaa246e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"7b0ac816-9e4f-436c-8858-8ece96a57c75","name":"7b0ac816-9e4f-436c-8858-8ece96a57c75","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"d741c8ac-e09c-4942-8ffa-99bb0eaa246e","name":"d741c8ac-e09c-4942-8ffa-99bb0eaa246e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"7b0ac816-9e4f-436c-8858-8ece96a57c75","name":"7b0ac816-9e4f-436c-8858-8ece96a57c75","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -69,12 +69,8 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"d741c8ac-e09c-4942-8ffa-99bb0eaa246e","path":"sprites/spr_ws_mk7_helm/spr_ws_mk7_helm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"1b78bdea-9192-4b19-b573-26e0b3c39c6b","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"7b0ac816-9e4f-436c-8858-8ece96a57c75","path":"sprites/spr_ws_mk7_helm/spr_ws_mk7_helm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"3fb83486-3ae3-40aa-b06b-a1ddf367f6dc","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"d741c8ac-e09c-4942-8ffa-99bb0eaa246e","path":"sprites/spr_ws_mk7_helm/spr_ws_mk7_helm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"1b78bdea-9192-4b19-b573-26e0b3c39c6b","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"7b0ac816-9e4f-436c-8858-8ece96a57c75","path":"sprites/spr_ws_mk7_helm/spr_ws_mk7_helm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"3fb83486-3ae3-40aa-b06b-a1ddf367f6dc","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_ws_mk7_scar_of_the_ancients/spr_ws_mk7_scar_of_the_ancients.yy b/sprites/spr_ws_mk7_scar_of_the_ancients/spr_ws_mk7_scar_of_the_ancients.yy index 18d76ec3f6..3c0f958bab 100644 --- a/sprites/spr_ws_mk7_scar_of_the_ancients/spr_ws_mk7_scar_of_the_ancients.yy +++ b/sprites/spr_ws_mk7_scar_of_the_ancients/spr_ws_mk7_scar_of_the_ancients.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_ws_mk7_scar_of_the_ancients", "bboxMode":0, "bbox_bottom":73, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"5c43a742-205d-4a15-b030-7a635381bb2e","name":"5c43a742-205d-4a15-b030-7a635381bb2e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"5c43a742-205d-4a15-b030-7a635381bb2e","name":"5c43a742-205d-4a15-b030-7a635381bb2e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"5c43a742-205d-4a15-b030-7a635381bb2e","path":"sprites/spr_ws_mk7_scar_of_the_ancients/spr_ws_mk7_scar_of_the_ancients.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"93fb0caf-9576-4f30-be2c-b8caebd494e2","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"5c43a742-205d-4a15-b030-7a635381bb2e","path":"sprites/spr_ws_mk7_scar_of_the_ancients/spr_ws_mk7_scar_of_the_ancients.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"93fb0caf-9576-4f30-be2c-b8caebd494e2","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/sprite134/sprite134.yy b/sprites/sprite134/sprite134.yy index fcffeafa8d..72b3c254ad 100644 --- a/sprites/sprite134/sprite134.yy +++ b/sprites/sprite134/sprite134.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"sprite134", "bboxMode":0, "bbox_bottom":47, @@ -12,19 +12,19 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"d8273305-4465-4d22-a64b-780734cd03ba","name":"d8273305-4465-4d22-a64b-780734cd03ba","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"14ef9ee2-f1bd-4b24-bb51-d2c98d5b183e","name":"14ef9ee2-f1bd-4b24-bb51-d2c98d5b183e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"a69cf538-5a49-4518-8015-49d79ddec83d","name":"a69cf538-5a49-4518-8015-49d79ddec83d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"2891688e-79f2-40e2-b98d-566120a66fbd","name":"2891688e-79f2-40e2-b98d-566120a66fbd","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"08792547-4006-4d96-8882-e37f089d5a8b","name":"08792547-4006-4d96-8882-e37f089d5a8b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"1bb1c266-8b39-4d83-a984-899e4addf463","name":"1bb1c266-8b39-4d83-a984-899e4addf463","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"b920cd3a-4de5-481a-bb61-4f7d057b5234","name":"b920cd3a-4de5-481a-bb61-4f7d057b5234","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"7596e5a1-ed7b-4db2-9876-6c80751c76a3","name":"7596e5a1-ed7b-4db2-9876-6c80751c76a3","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"ab4b69c8-1611-4deb-840c-ec3856709168","name":"ab4b69c8-1611-4deb-840c-ec3856709168","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"797f4d51-679b-4a32-aa48-a310f3da1ab6","name":"797f4d51-679b-4a32-aa48-a310f3da1ab6","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"5f4dd0c3-c4cb-487b-bd5d-936cfb4cd950","name":"5f4dd0c3-c4cb-487b-bd5d-936cfb4cd950","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"772af5e9-273a-461c-9125-555b64ac5ba3","name":"772af5e9-273a-461c-9125-555b64ac5ba3","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"bc1477ea-64f8-4039-988c-b33365cfea60","name":"bc1477ea-64f8-4039-988c-b33365cfea60","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"d8273305-4465-4d22-a64b-780734cd03ba","name":"d8273305-4465-4d22-a64b-780734cd03ba","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"14ef9ee2-f1bd-4b24-bb51-d2c98d5b183e","name":"14ef9ee2-f1bd-4b24-bb51-d2c98d5b183e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"a69cf538-5a49-4518-8015-49d79ddec83d","name":"a69cf538-5a49-4518-8015-49d79ddec83d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"2891688e-79f2-40e2-b98d-566120a66fbd","name":"2891688e-79f2-40e2-b98d-566120a66fbd","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"08792547-4006-4d96-8882-e37f089d5a8b","name":"08792547-4006-4d96-8882-e37f089d5a8b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"1bb1c266-8b39-4d83-a984-899e4addf463","name":"1bb1c266-8b39-4d83-a984-899e4addf463","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"b920cd3a-4de5-481a-bb61-4f7d057b5234","name":"b920cd3a-4de5-481a-bb61-4f7d057b5234","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"7596e5a1-ed7b-4db2-9876-6c80751c76a3","name":"7596e5a1-ed7b-4db2-9876-6c80751c76a3","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"ab4b69c8-1611-4deb-840c-ec3856709168","name":"ab4b69c8-1611-4deb-840c-ec3856709168","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"797f4d51-679b-4a32-aa48-a310f3da1ab6","name":"797f4d51-679b-4a32-aa48-a310f3da1ab6","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"5f4dd0c3-c4cb-487b-bd5d-936cfb4cd950","name":"5f4dd0c3-c4cb-487b-bd5d-936cfb4cd950","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"772af5e9-273a-461c-9125-555b64ac5ba3","name":"772af5e9-273a-461c-9125-555b64ac5ba3","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"bc1477ea-64f8-4039-988c-b33365cfea60","name":"bc1477ea-64f8-4039-988c-b33365cfea60","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -80,45 +80,19 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"d8273305-4465-4d22-a64b-780734cd03ba","path":"sprites/sprite134/sprite134.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"fbd64374-4333-4b4d-8c2e-f5a2ce2a5811","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"14ef9ee2-f1bd-4b24-bb51-d2c98d5b183e","path":"sprites/sprite134/sprite134.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"841a3b27-dbab-4bdd-8a9b-cb9ee744b0af","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"a69cf538-5a49-4518-8015-49d79ddec83d","path":"sprites/sprite134/sprite134.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"ca53b7c3-c844-4983-a706-bf106c2297d6","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"2891688e-79f2-40e2-b98d-566120a66fbd","path":"sprites/sprite134/sprite134.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"0c4dfaa0-85ae-4712-99b5-7b1a54302096","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"08792547-4006-4d96-8882-e37f089d5a8b","path":"sprites/sprite134/sprite134.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"49816e7d-4407-4f43-852b-17bea81e7571","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"1bb1c266-8b39-4d83-a984-899e4addf463","path":"sprites/sprite134/sprite134.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"d69b6664-ce96-4ca7-a51f-6642065adfe9","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"b920cd3a-4de5-481a-bb61-4f7d057b5234","path":"sprites/sprite134/sprite134.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"b26ab3c9-4f0b-4b3d-b9d8-0fd7dc84f175","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"7596e5a1-ed7b-4db2-9876-6c80751c76a3","path":"sprites/sprite134/sprite134.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"b7594d23-549b-42ee-84e8-b0e52725e9a5","IsCreationKey":false,"Key":7.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"ab4b69c8-1611-4deb-840c-ec3856709168","path":"sprites/sprite134/sprite134.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"cd9e724d-2e43-4906-9c4b-c3ad12a8c01b","IsCreationKey":false,"Key":8.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"797f4d51-679b-4a32-aa48-a310f3da1ab6","path":"sprites/sprite134/sprite134.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"68bb4843-55ae-4c03-be3b-59caf4504a0d","IsCreationKey":false,"Key":9.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"5f4dd0c3-c4cb-487b-bd5d-936cfb4cd950","path":"sprites/sprite134/sprite134.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"ba7905a7-e2dd-4a17-8f9c-5baf7660b40b","IsCreationKey":false,"Key":10.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"772af5e9-273a-461c-9125-555b64ac5ba3","path":"sprites/sprite134/sprite134.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"8323034a-0e2d-4cef-b102-fe538e3ffdc0","IsCreationKey":false,"Key":11.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"bc1477ea-64f8-4039-988c-b33365cfea60","path":"sprites/sprite134/sprite134.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"f3f2e6ec-1bf2-4f17-8c24-bf4419ed1830","IsCreationKey":false,"Key":12.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"d8273305-4465-4d22-a64b-780734cd03ba","path":"sprites/sprite134/sprite134.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"fbd64374-4333-4b4d-8c2e-f5a2ce2a5811","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"14ef9ee2-f1bd-4b24-bb51-d2c98d5b183e","path":"sprites/sprite134/sprite134.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"841a3b27-dbab-4bdd-8a9b-cb9ee744b0af","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"a69cf538-5a49-4518-8015-49d79ddec83d","path":"sprites/sprite134/sprite134.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"ca53b7c3-c844-4983-a706-bf106c2297d6","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"2891688e-79f2-40e2-b98d-566120a66fbd","path":"sprites/sprite134/sprite134.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"0c4dfaa0-85ae-4712-99b5-7b1a54302096","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"08792547-4006-4d96-8882-e37f089d5a8b","path":"sprites/sprite134/sprite134.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"49816e7d-4407-4f43-852b-17bea81e7571","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"1bb1c266-8b39-4d83-a984-899e4addf463","path":"sprites/sprite134/sprite134.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"d69b6664-ce96-4ca7-a51f-6642065adfe9","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"b920cd3a-4de5-481a-bb61-4f7d057b5234","path":"sprites/sprite134/sprite134.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"b26ab3c9-4f0b-4b3d-b9d8-0fd7dc84f175","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"7596e5a1-ed7b-4db2-9876-6c80751c76a3","path":"sprites/sprite134/sprite134.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"b7594d23-549b-42ee-84e8-b0e52725e9a5","IsCreationKey":false,"Key":7.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"ab4b69c8-1611-4deb-840c-ec3856709168","path":"sprites/sprite134/sprite134.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"cd9e724d-2e43-4906-9c4b-c3ad12a8c01b","IsCreationKey":false,"Key":8.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"797f4d51-679b-4a32-aa48-a310f3da1ab6","path":"sprites/sprite134/sprite134.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"68bb4843-55ae-4c03-be3b-59caf4504a0d","IsCreationKey":false,"Key":9.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"5f4dd0c3-c4cb-487b-bd5d-936cfb4cd950","path":"sprites/sprite134/sprite134.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"ba7905a7-e2dd-4a17-8f9c-5baf7660b40b","IsCreationKey":false,"Key":10.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"772af5e9-273a-461c-9125-555b64ac5ba3","path":"sprites/sprite134/sprite134.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"8323034a-0e2d-4cef-b102-fe538e3ffdc0","IsCreationKey":false,"Key":11.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"bc1477ea-64f8-4039-988c-b33365cfea60","path":"sprites/sprite134/sprite134.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"f3f2e6ec-1bf2-4f17-8c24-bf4419ed1830","IsCreationKey":false,"Key":12.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":{ diff --git a/sprites/sprite156/sprite156.yy b/sprites/sprite156/sprite156.yy index 9003cde1ab..7911927ca8 100644 --- a/sprites/sprite156/sprite156.yy +++ b/sprites/sprite156/sprite156.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"sprite156", "bboxMode":0, "bbox_bottom":116, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"e2948b50-50ff-42f8-ba8b-b81b72a05d60","name":"e2948b50-50ff-42f8-ba8b-b81b72a05d60","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"e2948b50-50ff-42f8-ba8b-b81b72a05d60","name":"e2948b50-50ff-42f8-ba8b-b81b72a05d60","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"e2948b50-50ff-42f8-ba8b-b81b72a05d60","path":"sprites/sprite156/sprite156.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"2d68a0c0-92c4-4151-9b34-0a50793ad97d","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"e2948b50-50ff-42f8-ba8b-b81b72a05d60","path":"sprites/sprite156/sprite156.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"2d68a0c0-92c4-4151-9b34-0a50793ad97d","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":{ diff --git a/sprites/sprite158/sprite158.yy b/sprites/sprite158/sprite158.yy index 59fda13fa3..71472adfbb 100644 --- a/sprites/sprite158/sprite158.yy +++ b/sprites/sprite158/sprite158.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"sprite158", "bboxMode":0, "bbox_bottom":161, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"4eb9f516-6525-48ee-8a72-0fe9cc7a53a1","name":"4eb9f516-6525-48ee-8a72-0fe9cc7a53a1","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"4eb9f516-6525-48ee-8a72-0fe9cc7a53a1","name":"4eb9f516-6525-48ee-8a72-0fe9cc7a53a1","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"4eb9f516-6525-48ee-8a72-0fe9cc7a53a1","path":"sprites/sprite158/sprite158.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"e4b3a683-7ac5-4c0c-a411-2784b6229a01","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"4eb9f516-6525-48ee-8a72-0fe9cc7a53a1","path":"sprites/sprite158/sprite158.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"e4b3a683-7ac5-4c0c-a411-2784b6229a01","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":{ diff --git a/sprites/sprite160/sprite160.yy b/sprites/sprite160/sprite160.yy index cd9bcfe7a4..c708d9e9e1 100644 --- a/sprites/sprite160/sprite160.yy +++ b/sprites/sprite160/sprite160.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"sprite160", "bboxMode":0, "bbox_bottom":67, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"73cf3a8a-5e04-4474-ac5d-3f327957e02d","name":"73cf3a8a-5e04-4474-ac5d-3f327957e02d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"73cf3a8a-5e04-4474-ac5d-3f327957e02d","name":"73cf3a8a-5e04-4474-ac5d-3f327957e02d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"73cf3a8a-5e04-4474-ac5d-3f327957e02d","path":"sprites/sprite160/sprite160.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"b653cca5-0503-453c-87e1-1c766f7b6be6","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"73cf3a8a-5e04-4474-ac5d-3f327957e02d","path":"sprites/sprite160/sprite160.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"b653cca5-0503-453c-87e1-1c766f7b6be6","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":{ diff --git a/sprites/sprite205/sprite205.yy b/sprites/sprite205/sprite205.yy index 4c8b1348df..f1fd3708e6 100644 --- a/sprites/sprite205/sprite205.yy +++ b/sprites/sprite205/sprite205.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"sprite205", "bboxMode":0, "bbox_bottom":89, @@ -12,68 +12,68 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"60ac8d66-8f1b-41fb-b5d3-9a392c503232","name":"60ac8d66-8f1b-41fb-b5d3-9a392c503232","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"2607afba-bd5d-4cf8-98bf-379fb4a063c4","name":"2607afba-bd5d-4cf8-98bf-379fb4a063c4","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"20187b7b-038c-4892-a9c1-8f74807691cc","name":"20187b7b-038c-4892-a9c1-8f74807691cc","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"19600006-5d16-45a4-8554-f6c3ff3f9d2b","name":"19600006-5d16-45a4-8554-f6c3ff3f9d2b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"e398dfd3-d86d-476e-baa3-3dad5d89e1ab","name":"e398dfd3-d86d-476e-baa3-3dad5d89e1ab","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"948f3853-433a-4d70-9e76-5bf277b69d7f","name":"948f3853-433a-4d70-9e76-5bf277b69d7f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"1f938192-8a38-4af0-9eb6-1cf001029629","name":"1f938192-8a38-4af0-9eb6-1cf001029629","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"84e9ae94-69d2-47e9-8a8b-045569940e74","name":"84e9ae94-69d2-47e9-8a8b-045569940e74","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"d7fe316e-612d-40c7-bf4e-cb3c322c5355","name":"d7fe316e-612d-40c7-bf4e-cb3c322c5355","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"4c66a00b-df26-451e-b820-a5b9fb7929c5","name":"4c66a00b-df26-451e-b820-a5b9fb7929c5","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"ca79c445-092d-42e1-af3a-bcf4c107fca7","name":"ca79c445-092d-42e1-af3a-bcf4c107fca7","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"08b6c661-4eaf-4953-b2ca-b50fbd52e7d9","name":"08b6c661-4eaf-4953-b2ca-b50fbd52e7d9","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"d75a4f8e-556f-43f1-9532-c0b2e171a8c0","name":"d75a4f8e-556f-43f1-9532-c0b2e171a8c0","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"a0f9ea07-182f-46fd-8a9d-97ecb4966e45","name":"a0f9ea07-182f-46fd-8a9d-97ecb4966e45","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"596a5858-6bfc-4d39-9aff-87b1ec02d7a0","name":"596a5858-6bfc-4d39-9aff-87b1ec02d7a0","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"713882f5-5933-468c-9b6b-ded602dfa95c","name":"713882f5-5933-468c-9b6b-ded602dfa95c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"b1ea20b4-22e3-41e1-b125-231adc4ea25a","name":"b1ea20b4-22e3-41e1-b125-231adc4ea25a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"c9afdd1b-aa2d-4488-8576-17ff8b3e5348","name":"c9afdd1b-aa2d-4488-8576-17ff8b3e5348","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"d12c9028-3151-4ff0-af7a-71126a9eef72","name":"d12c9028-3151-4ff0-af7a-71126a9eef72","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"2e0eea1c-e2f8-4ebe-bab3-180ab5d9edad","name":"2e0eea1c-e2f8-4ebe-bab3-180ab5d9edad","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"72e2b11b-39ae-474c-a8fc-04ac2330fea9","name":"72e2b11b-39ae-474c-a8fc-04ac2330fea9","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"2b9e0f9c-f62b-4088-85dc-1159b01d4aea","name":"2b9e0f9c-f62b-4088-85dc-1159b01d4aea","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"f8dc011f-7ea1-48c4-a1ad-c6288238b610","name":"f8dc011f-7ea1-48c4-a1ad-c6288238b610","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"ed597f49-74bb-4554-be3b-f8396d43330e","name":"ed597f49-74bb-4554-be3b-f8396d43330e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"572abf2c-f688-451c-86ad-7ae450ebf09b","name":"572abf2c-f688-451c-86ad-7ae450ebf09b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"89a7d63a-1643-4d53-8cdd-862c4b2b0931","name":"89a7d63a-1643-4d53-8cdd-862c4b2b0931","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"a2ec40a2-1e71-41a0-90d4-60e04ca7039b","name":"a2ec40a2-1e71-41a0-90d4-60e04ca7039b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"83fbca9d-40f5-4c2d-90e3-712e0e665a50","name":"83fbca9d-40f5-4c2d-90e3-712e0e665a50","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"d31e0391-fddc-48f2-aaa5-cdc6041884e5","name":"d31e0391-fddc-48f2-aaa5-cdc6041884e5","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"3aa432cd-3da0-45e8-8ebe-d14cd2d30f6d","name":"3aa432cd-3da0-45e8-8ebe-d14cd2d30f6d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"2af12c7e-de77-468a-9b8f-d14df64683d6","name":"2af12c7e-de77-468a-9b8f-d14df64683d6","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"1464fb39-aba1-4946-8e95-a2a730849c4b","name":"1464fb39-aba1-4946-8e95-a2a730849c4b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"76c7c0ab-d65e-4c8f-8a80-e0017f92b87f","name":"76c7c0ab-d65e-4c8f-8a80-e0017f92b87f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"7159807f-7ffb-4c46-a38b-ce11ae89a567","name":"7159807f-7ffb-4c46-a38b-ce11ae89a567","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"c38969c1-c382-48b4-889e-2b704786075b","name":"c38969c1-c382-48b4-889e-2b704786075b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"15796572-346e-4a2d-b76d-7dec6f12c885","name":"15796572-346e-4a2d-b76d-7dec6f12c885","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"256a727a-239a-47ea-acab-fc1298ed61e2","name":"256a727a-239a-47ea-acab-fc1298ed61e2","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"986e1b76-0fed-49b5-bdaf-9affe1f09636","name":"986e1b76-0fed-49b5-bdaf-9affe1f09636","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"d4622fa4-9ca3-4859-8309-ccccddc7e86b","name":"d4622fa4-9ca3-4859-8309-ccccddc7e86b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"a6486fe6-7ba6-468b-ab3c-eac51120c800","name":"a6486fe6-7ba6-468b-ab3c-eac51120c800","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"95e9f5f9-08dc-4c46-9578-c1a47900a710","name":"95e9f5f9-08dc-4c46-9578-c1a47900a710","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"7a757ca2-f275-48a2-b0da-78a3639c5b2a","name":"7a757ca2-f275-48a2-b0da-78a3639c5b2a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"bdd957a0-f8ad-4292-9018-bef34ccf2e84","name":"bdd957a0-f8ad-4292-9018-bef34ccf2e84","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"f7687056-5b88-4134-8cea-e50b8bc34382","name":"f7687056-5b88-4134-8cea-e50b8bc34382","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"99391a19-306d-425e-bf27-a3d8448a675f","name":"99391a19-306d-425e-bf27-a3d8448a675f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"56266570-4945-49e0-a71c-bcf06cd9dac0","name":"56266570-4945-49e0-a71c-bcf06cd9dac0","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"1aeb8dc6-92a6-449d-8eb9-6d7857832485","name":"1aeb8dc6-92a6-449d-8eb9-6d7857832485","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"464320dd-9757-4029-a3ad-319447951151","name":"464320dd-9757-4029-a3ad-319447951151","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"5780a724-ceda-47f4-b408-3054627786eb","name":"5780a724-ceda-47f4-b408-3054627786eb","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"a4477e45-963e-46b7-94ec-85e932d2cdb8","name":"a4477e45-963e-46b7-94ec-85e932d2cdb8","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"d58e08aa-0785-471c-bfcc-db0d3d385728","name":"d58e08aa-0785-471c-bfcc-db0d3d385728","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"dbb99977-f483-4227-8b9e-f1cc43280e39","name":"dbb99977-f483-4227-8b9e-f1cc43280e39","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"b9058249-50e6-4b75-99da-8fe5042da131","name":"b9058249-50e6-4b75-99da-8fe5042da131","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"ae1cc1cc-181f-41bd-a44f-c9841760947d","name":"ae1cc1cc-181f-41bd-a44f-c9841760947d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"82c64d4a-d421-488a-8b81-ddab5542a642","name":"82c64d4a-d421-488a-8b81-ddab5542a642","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"866c182a-607d-4a51-a4b5-703faa5a955f","name":"866c182a-607d-4a51-a4b5-703faa5a955f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"6953b7ca-cb1a-44ad-b33f-1f687e83b95f","name":"6953b7ca-cb1a-44ad-b33f-1f687e83b95f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"28dc9fde-1843-4f47-9929-6bb6782e4209","name":"28dc9fde-1843-4f47-9929-6bb6782e4209","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"bb93e4a1-19f1-4b78-88e8-26b6938e7a38","name":"bb93e4a1-19f1-4b78-88e8-26b6938e7a38","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"e6d72988-dc32-41f8-9003-a8efbfcf3d9e","name":"e6d72988-dc32-41f8-9003-a8efbfcf3d9e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"14245612-2105-4fe4-a0d0-b6c41880dd78","name":"14245612-2105-4fe4-a0d0-b6c41880dd78","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"e7e3af5a-8994-4462-86e2-b64ea2567102","name":"e7e3af5a-8994-4462-86e2-b64ea2567102","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"60ac8d66-8f1b-41fb-b5d3-9a392c503232","name":"60ac8d66-8f1b-41fb-b5d3-9a392c503232","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"2607afba-bd5d-4cf8-98bf-379fb4a063c4","name":"2607afba-bd5d-4cf8-98bf-379fb4a063c4","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"20187b7b-038c-4892-a9c1-8f74807691cc","name":"20187b7b-038c-4892-a9c1-8f74807691cc","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"19600006-5d16-45a4-8554-f6c3ff3f9d2b","name":"19600006-5d16-45a4-8554-f6c3ff3f9d2b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"e398dfd3-d86d-476e-baa3-3dad5d89e1ab","name":"e398dfd3-d86d-476e-baa3-3dad5d89e1ab","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"948f3853-433a-4d70-9e76-5bf277b69d7f","name":"948f3853-433a-4d70-9e76-5bf277b69d7f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"1f938192-8a38-4af0-9eb6-1cf001029629","name":"1f938192-8a38-4af0-9eb6-1cf001029629","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"84e9ae94-69d2-47e9-8a8b-045569940e74","name":"84e9ae94-69d2-47e9-8a8b-045569940e74","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"d7fe316e-612d-40c7-bf4e-cb3c322c5355","name":"d7fe316e-612d-40c7-bf4e-cb3c322c5355","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"4c66a00b-df26-451e-b820-a5b9fb7929c5","name":"4c66a00b-df26-451e-b820-a5b9fb7929c5","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"ca79c445-092d-42e1-af3a-bcf4c107fca7","name":"ca79c445-092d-42e1-af3a-bcf4c107fca7","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"08b6c661-4eaf-4953-b2ca-b50fbd52e7d9","name":"08b6c661-4eaf-4953-b2ca-b50fbd52e7d9","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"d75a4f8e-556f-43f1-9532-c0b2e171a8c0","name":"d75a4f8e-556f-43f1-9532-c0b2e171a8c0","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"a0f9ea07-182f-46fd-8a9d-97ecb4966e45","name":"a0f9ea07-182f-46fd-8a9d-97ecb4966e45","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"596a5858-6bfc-4d39-9aff-87b1ec02d7a0","name":"596a5858-6bfc-4d39-9aff-87b1ec02d7a0","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"713882f5-5933-468c-9b6b-ded602dfa95c","name":"713882f5-5933-468c-9b6b-ded602dfa95c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"b1ea20b4-22e3-41e1-b125-231adc4ea25a","name":"b1ea20b4-22e3-41e1-b125-231adc4ea25a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"c9afdd1b-aa2d-4488-8576-17ff8b3e5348","name":"c9afdd1b-aa2d-4488-8576-17ff8b3e5348","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"d12c9028-3151-4ff0-af7a-71126a9eef72","name":"d12c9028-3151-4ff0-af7a-71126a9eef72","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"2e0eea1c-e2f8-4ebe-bab3-180ab5d9edad","name":"2e0eea1c-e2f8-4ebe-bab3-180ab5d9edad","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"72e2b11b-39ae-474c-a8fc-04ac2330fea9","name":"72e2b11b-39ae-474c-a8fc-04ac2330fea9","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"2b9e0f9c-f62b-4088-85dc-1159b01d4aea","name":"2b9e0f9c-f62b-4088-85dc-1159b01d4aea","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"f8dc011f-7ea1-48c4-a1ad-c6288238b610","name":"f8dc011f-7ea1-48c4-a1ad-c6288238b610","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"ed597f49-74bb-4554-be3b-f8396d43330e","name":"ed597f49-74bb-4554-be3b-f8396d43330e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"572abf2c-f688-451c-86ad-7ae450ebf09b","name":"572abf2c-f688-451c-86ad-7ae450ebf09b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"89a7d63a-1643-4d53-8cdd-862c4b2b0931","name":"89a7d63a-1643-4d53-8cdd-862c4b2b0931","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"a2ec40a2-1e71-41a0-90d4-60e04ca7039b","name":"a2ec40a2-1e71-41a0-90d4-60e04ca7039b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"83fbca9d-40f5-4c2d-90e3-712e0e665a50","name":"83fbca9d-40f5-4c2d-90e3-712e0e665a50","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"d31e0391-fddc-48f2-aaa5-cdc6041884e5","name":"d31e0391-fddc-48f2-aaa5-cdc6041884e5","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"3aa432cd-3da0-45e8-8ebe-d14cd2d30f6d","name":"3aa432cd-3da0-45e8-8ebe-d14cd2d30f6d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"2af12c7e-de77-468a-9b8f-d14df64683d6","name":"2af12c7e-de77-468a-9b8f-d14df64683d6","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"1464fb39-aba1-4946-8e95-a2a730849c4b","name":"1464fb39-aba1-4946-8e95-a2a730849c4b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"76c7c0ab-d65e-4c8f-8a80-e0017f92b87f","name":"76c7c0ab-d65e-4c8f-8a80-e0017f92b87f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"7159807f-7ffb-4c46-a38b-ce11ae89a567","name":"7159807f-7ffb-4c46-a38b-ce11ae89a567","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"c38969c1-c382-48b4-889e-2b704786075b","name":"c38969c1-c382-48b4-889e-2b704786075b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"15796572-346e-4a2d-b76d-7dec6f12c885","name":"15796572-346e-4a2d-b76d-7dec6f12c885","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"256a727a-239a-47ea-acab-fc1298ed61e2","name":"256a727a-239a-47ea-acab-fc1298ed61e2","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"986e1b76-0fed-49b5-bdaf-9affe1f09636","name":"986e1b76-0fed-49b5-bdaf-9affe1f09636","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"d4622fa4-9ca3-4859-8309-ccccddc7e86b","name":"d4622fa4-9ca3-4859-8309-ccccddc7e86b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"a6486fe6-7ba6-468b-ab3c-eac51120c800","name":"a6486fe6-7ba6-468b-ab3c-eac51120c800","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"95e9f5f9-08dc-4c46-9578-c1a47900a710","name":"95e9f5f9-08dc-4c46-9578-c1a47900a710","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"7a757ca2-f275-48a2-b0da-78a3639c5b2a","name":"7a757ca2-f275-48a2-b0da-78a3639c5b2a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"bdd957a0-f8ad-4292-9018-bef34ccf2e84","name":"bdd957a0-f8ad-4292-9018-bef34ccf2e84","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"f7687056-5b88-4134-8cea-e50b8bc34382","name":"f7687056-5b88-4134-8cea-e50b8bc34382","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"99391a19-306d-425e-bf27-a3d8448a675f","name":"99391a19-306d-425e-bf27-a3d8448a675f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"56266570-4945-49e0-a71c-bcf06cd9dac0","name":"56266570-4945-49e0-a71c-bcf06cd9dac0","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"1aeb8dc6-92a6-449d-8eb9-6d7857832485","name":"1aeb8dc6-92a6-449d-8eb9-6d7857832485","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"464320dd-9757-4029-a3ad-319447951151","name":"464320dd-9757-4029-a3ad-319447951151","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"5780a724-ceda-47f4-b408-3054627786eb","name":"5780a724-ceda-47f4-b408-3054627786eb","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"a4477e45-963e-46b7-94ec-85e932d2cdb8","name":"a4477e45-963e-46b7-94ec-85e932d2cdb8","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"d58e08aa-0785-471c-bfcc-db0d3d385728","name":"d58e08aa-0785-471c-bfcc-db0d3d385728","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"dbb99977-f483-4227-8b9e-f1cc43280e39","name":"dbb99977-f483-4227-8b9e-f1cc43280e39","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"b9058249-50e6-4b75-99da-8fe5042da131","name":"b9058249-50e6-4b75-99da-8fe5042da131","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"ae1cc1cc-181f-41bd-a44f-c9841760947d","name":"ae1cc1cc-181f-41bd-a44f-c9841760947d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"82c64d4a-d421-488a-8b81-ddab5542a642","name":"82c64d4a-d421-488a-8b81-ddab5542a642","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"866c182a-607d-4a51-a4b5-703faa5a955f","name":"866c182a-607d-4a51-a4b5-703faa5a955f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"6953b7ca-cb1a-44ad-b33f-1f687e83b95f","name":"6953b7ca-cb1a-44ad-b33f-1f687e83b95f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"28dc9fde-1843-4f47-9929-6bb6782e4209","name":"28dc9fde-1843-4f47-9929-6bb6782e4209","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"bb93e4a1-19f1-4b78-88e8-26b6938e7a38","name":"bb93e4a1-19f1-4b78-88e8-26b6938e7a38","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"e6d72988-dc32-41f8-9003-a8efbfcf3d9e","name":"e6d72988-dc32-41f8-9003-a8efbfcf3d9e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"14245612-2105-4fe4-a0d0-b6c41880dd78","name":"14245612-2105-4fe4-a0d0-b6c41880dd78","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"e7e3af5a-8994-4462-86e2-b64ea2567102","name":"e7e3af5a-8994-4462-86e2-b64ea2567102","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -129,192 +129,68 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"60ac8d66-8f1b-41fb-b5d3-9a392c503232","path":"sprites/sprite205/sprite205.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"c26af98b-dc2a-433f-bc29-1720b15d1be9","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"2607afba-bd5d-4cf8-98bf-379fb4a063c4","path":"sprites/sprite205/sprite205.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"a78a35f7-ae08-4af8-b3b7-4272b331b176","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"20187b7b-038c-4892-a9c1-8f74807691cc","path":"sprites/sprite205/sprite205.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"dcd98c6d-522c-4884-9fd0-1495cdd2592d","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"19600006-5d16-45a4-8554-f6c3ff3f9d2b","path":"sprites/sprite205/sprite205.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"2e036c0c-af20-4d84-884d-77b93095fc49","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"e398dfd3-d86d-476e-baa3-3dad5d89e1ab","path":"sprites/sprite205/sprite205.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"5c330d83-ca2e-42b1-97a8-f572b3b2563c","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"948f3853-433a-4d70-9e76-5bf277b69d7f","path":"sprites/sprite205/sprite205.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"a74ec994-f514-4110-a038-02458347f6fa","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"1f938192-8a38-4af0-9eb6-1cf001029629","path":"sprites/sprite205/sprite205.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"6b088956-0479-4b8d-a182-c477012c08a0","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"84e9ae94-69d2-47e9-8a8b-045569940e74","path":"sprites/sprite205/sprite205.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"b75b6f93-11eb-4961-8366-6c0902c02268","IsCreationKey":false,"Key":7.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"d7fe316e-612d-40c7-bf4e-cb3c322c5355","path":"sprites/sprite205/sprite205.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"0f725165-8268-44ff-8c1d-d91dc0802148","IsCreationKey":false,"Key":8.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"4c66a00b-df26-451e-b820-a5b9fb7929c5","path":"sprites/sprite205/sprite205.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"d7652d5a-c5b3-4e53-829f-dc1df0f44e3c","IsCreationKey":false,"Key":9.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"ca79c445-092d-42e1-af3a-bcf4c107fca7","path":"sprites/sprite205/sprite205.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"7f654dff-36b1-4f79-b858-641df43ff6b3","IsCreationKey":false,"Key":10.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"08b6c661-4eaf-4953-b2ca-b50fbd52e7d9","path":"sprites/sprite205/sprite205.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"4940dbf7-b6df-4eeb-9517-2bdbc6e8f7b3","IsCreationKey":false,"Key":11.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"d75a4f8e-556f-43f1-9532-c0b2e171a8c0","path":"sprites/sprite205/sprite205.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"615fa685-7b45-4d5d-9d10-294a2675647f","IsCreationKey":false,"Key":12.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"a0f9ea07-182f-46fd-8a9d-97ecb4966e45","path":"sprites/sprite205/sprite205.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"877ea5c1-1244-4c51-bf92-21cb2c61403f","IsCreationKey":false,"Key":13.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"596a5858-6bfc-4d39-9aff-87b1ec02d7a0","path":"sprites/sprite205/sprite205.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"c03aa812-0003-4523-9457-b4bb56f0da6d","IsCreationKey":false,"Key":14.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"713882f5-5933-468c-9b6b-ded602dfa95c","path":"sprites/sprite205/sprite205.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"312ee670-e08c-4c31-9c70-8ed40f6ad91e","IsCreationKey":false,"Key":15.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"b1ea20b4-22e3-41e1-b125-231adc4ea25a","path":"sprites/sprite205/sprite205.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"12468898-9cff-4501-9ce1-35984b543471","IsCreationKey":false,"Key":16.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"c9afdd1b-aa2d-4488-8576-17ff8b3e5348","path":"sprites/sprite205/sprite205.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"11d29fc7-c1d4-4bb6-a261-0c69c739814f","IsCreationKey":false,"Key":17.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"d12c9028-3151-4ff0-af7a-71126a9eef72","path":"sprites/sprite205/sprite205.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"3844657d-eb55-467b-904f-adb38da21212","IsCreationKey":false,"Key":18.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"2e0eea1c-e2f8-4ebe-bab3-180ab5d9edad","path":"sprites/sprite205/sprite205.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"4d31be4d-8388-480a-8dc4-8ccd5d5da073","IsCreationKey":false,"Key":19.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"72e2b11b-39ae-474c-a8fc-04ac2330fea9","path":"sprites/sprite205/sprite205.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"4220a72b-3cfa-47c2-ab46-293c7b5a2da8","IsCreationKey":false,"Key":20.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"2b9e0f9c-f62b-4088-85dc-1159b01d4aea","path":"sprites/sprite205/sprite205.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"c37e1ae7-c04e-4a5d-9ad2-142a39badfe5","IsCreationKey":false,"Key":21.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"f8dc011f-7ea1-48c4-a1ad-c6288238b610","path":"sprites/sprite205/sprite205.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"53572527-7dfa-470b-80fc-f6ed37adb9a4","IsCreationKey":false,"Key":22.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"ed597f49-74bb-4554-be3b-f8396d43330e","path":"sprites/sprite205/sprite205.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"d7e8b093-a7f6-4e17-94e8-e5f97de878cc","IsCreationKey":false,"Key":23.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"572abf2c-f688-451c-86ad-7ae450ebf09b","path":"sprites/sprite205/sprite205.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"104b58e9-d4f9-4014-90f9-3ab206e8cbca","IsCreationKey":false,"Key":24.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"89a7d63a-1643-4d53-8cdd-862c4b2b0931","path":"sprites/sprite205/sprite205.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"f2397701-8f34-4abe-b1c0-7f33a5654a20","IsCreationKey":false,"Key":25.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"a2ec40a2-1e71-41a0-90d4-60e04ca7039b","path":"sprites/sprite205/sprite205.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"21b766bb-2f49-4bc7-a058-aa03ef27eed2","IsCreationKey":false,"Key":26.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"83fbca9d-40f5-4c2d-90e3-712e0e665a50","path":"sprites/sprite205/sprite205.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"3ae2e161-596e-462b-9af7-b845bfcd3a15","IsCreationKey":false,"Key":27.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"d31e0391-fddc-48f2-aaa5-cdc6041884e5","path":"sprites/sprite205/sprite205.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"4d446b18-ea81-4133-9cb0-3009dc718e7d","IsCreationKey":false,"Key":28.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"3aa432cd-3da0-45e8-8ebe-d14cd2d30f6d","path":"sprites/sprite205/sprite205.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"fbd85722-9516-48b2-9d7c-1d6d60df18f9","IsCreationKey":false,"Key":29.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"2af12c7e-de77-468a-9b8f-d14df64683d6","path":"sprites/sprite205/sprite205.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"bd0ed600-6016-4083-be67-de5f4bb3aed6","IsCreationKey":false,"Key":30.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"1464fb39-aba1-4946-8e95-a2a730849c4b","path":"sprites/sprite205/sprite205.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"1dae602f-db65-42e8-b84a-b71e1024e5ac","IsCreationKey":false,"Key":31.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"76c7c0ab-d65e-4c8f-8a80-e0017f92b87f","path":"sprites/sprite205/sprite205.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"8e1aedee-9eb0-41fc-befb-144a674bad75","IsCreationKey":false,"Key":32.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"7159807f-7ffb-4c46-a38b-ce11ae89a567","path":"sprites/sprite205/sprite205.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"5e2cc7eb-0172-41d1-9644-131dd0e43e9d","IsCreationKey":false,"Key":33.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"c38969c1-c382-48b4-889e-2b704786075b","path":"sprites/sprite205/sprite205.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"ed5c6bec-23f1-4f20-a038-86ac3ec94d58","IsCreationKey":false,"Key":34.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"15796572-346e-4a2d-b76d-7dec6f12c885","path":"sprites/sprite205/sprite205.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"2d5c8e79-806e-452d-8a96-154d58956094","IsCreationKey":false,"Key":35.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"256a727a-239a-47ea-acab-fc1298ed61e2","path":"sprites/sprite205/sprite205.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"5c5f4260-f449-46fe-a6e0-590761c2472e","IsCreationKey":false,"Key":36.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"986e1b76-0fed-49b5-bdaf-9affe1f09636","path":"sprites/sprite205/sprite205.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"bc057fe4-8b3e-42d5-a520-7eea412389e4","IsCreationKey":false,"Key":37.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"d4622fa4-9ca3-4859-8309-ccccddc7e86b","path":"sprites/sprite205/sprite205.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"84f69a5e-4265-47bf-a9bc-9ffcd9a6b815","IsCreationKey":false,"Key":38.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"a6486fe6-7ba6-468b-ab3c-eac51120c800","path":"sprites/sprite205/sprite205.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"fcf4e6a2-69ee-48c1-b78f-0e5d00ccf8a2","IsCreationKey":false,"Key":39.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"95e9f5f9-08dc-4c46-9578-c1a47900a710","path":"sprites/sprite205/sprite205.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"2d627ee4-442f-4c19-9493-0e251d5d7aa2","IsCreationKey":false,"Key":40.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"7a757ca2-f275-48a2-b0da-78a3639c5b2a","path":"sprites/sprite205/sprite205.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"d89792ac-02d6-442d-bba3-d0af163ee1d8","IsCreationKey":false,"Key":41.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"bdd957a0-f8ad-4292-9018-bef34ccf2e84","path":"sprites/sprite205/sprite205.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"40782400-7b56-4337-bb93-6084856c5199","IsCreationKey":false,"Key":42.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"f7687056-5b88-4134-8cea-e50b8bc34382","path":"sprites/sprite205/sprite205.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"1fd7a900-0be0-49fc-91fd-a523376d97e3","IsCreationKey":false,"Key":43.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"99391a19-306d-425e-bf27-a3d8448a675f","path":"sprites/sprite205/sprite205.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"f9ce2752-9394-4a6c-b72c-2d7139e0329c","IsCreationKey":false,"Key":44.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"56266570-4945-49e0-a71c-bcf06cd9dac0","path":"sprites/sprite205/sprite205.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"54c8ad82-d213-4478-9a7b-f8111144e37e","IsCreationKey":false,"Key":45.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"1aeb8dc6-92a6-449d-8eb9-6d7857832485","path":"sprites/sprite205/sprite205.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"5d92e1e5-d295-4057-80ab-1b5b3652d24f","IsCreationKey":false,"Key":46.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"464320dd-9757-4029-a3ad-319447951151","path":"sprites/sprite205/sprite205.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"3b3a35a5-9d2c-4187-bdaa-8abc2761b90d","IsCreationKey":false,"Key":47.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"5780a724-ceda-47f4-b408-3054627786eb","path":"sprites/sprite205/sprite205.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"acee4c47-6e2e-4e89-903b-a40e10ad918e","IsCreationKey":false,"Key":48.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"a4477e45-963e-46b7-94ec-85e932d2cdb8","path":"sprites/sprite205/sprite205.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"40c5845c-3a36-430e-857e-6f0199377ba8","IsCreationKey":false,"Key":49.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"d58e08aa-0785-471c-bfcc-db0d3d385728","path":"sprites/sprite205/sprite205.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"70d75d83-71a2-45fd-96ad-2a71d48c234d","IsCreationKey":false,"Key":50.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"dbb99977-f483-4227-8b9e-f1cc43280e39","path":"sprites/sprite205/sprite205.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"ddb6b09d-eeb7-4daf-bcdf-890f7839b48b","IsCreationKey":false,"Key":51.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"b9058249-50e6-4b75-99da-8fe5042da131","path":"sprites/sprite205/sprite205.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"53e9b533-2c57-4049-b344-a1b47ad5ce21","IsCreationKey":false,"Key":52.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"ae1cc1cc-181f-41bd-a44f-c9841760947d","path":"sprites/sprite205/sprite205.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"75f14c91-a6de-4a1d-94eb-ff22f6863dfe","IsCreationKey":false,"Key":53.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"82c64d4a-d421-488a-8b81-ddab5542a642","path":"sprites/sprite205/sprite205.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"421da936-db93-479e-86b1-58020a2209e5","IsCreationKey":false,"Key":54.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"866c182a-607d-4a51-a4b5-703faa5a955f","path":"sprites/sprite205/sprite205.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"8b4799db-7675-44f5-ab0f-1098459be066","IsCreationKey":false,"Key":55.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"6953b7ca-cb1a-44ad-b33f-1f687e83b95f","path":"sprites/sprite205/sprite205.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"96221e44-125f-4004-9e41-ddfc2289d072","IsCreationKey":false,"Key":56.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"28dc9fde-1843-4f47-9929-6bb6782e4209","path":"sprites/sprite205/sprite205.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"2fb6640f-fbb7-4447-b54f-c397310fdb49","IsCreationKey":false,"Key":57.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"bb93e4a1-19f1-4b78-88e8-26b6938e7a38","path":"sprites/sprite205/sprite205.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"9b02dfcb-b7f4-40b6-b600-14befa8da52a","IsCreationKey":false,"Key":58.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"e6d72988-dc32-41f8-9003-a8efbfcf3d9e","path":"sprites/sprite205/sprite205.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"ff4ced38-5f98-42f3-98c6-9a96a9826adf","IsCreationKey":false,"Key":59.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"14245612-2105-4fe4-a0d0-b6c41880dd78","path":"sprites/sprite205/sprite205.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"9e4285d3-345e-4a3c-a534-378c4026c407","IsCreationKey":false,"Key":60.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"e7e3af5a-8994-4462-86e2-b64ea2567102","path":"sprites/sprite205/sprite205.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"237ef745-c957-45bb-b2f3-fc84f1257b95","IsCreationKey":false,"Key":61.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"60ac8d66-8f1b-41fb-b5d3-9a392c503232","path":"sprites/sprite205/sprite205.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"c26af98b-dc2a-433f-bc29-1720b15d1be9","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"2607afba-bd5d-4cf8-98bf-379fb4a063c4","path":"sprites/sprite205/sprite205.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"a78a35f7-ae08-4af8-b3b7-4272b331b176","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"20187b7b-038c-4892-a9c1-8f74807691cc","path":"sprites/sprite205/sprite205.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"dcd98c6d-522c-4884-9fd0-1495cdd2592d","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"19600006-5d16-45a4-8554-f6c3ff3f9d2b","path":"sprites/sprite205/sprite205.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"2e036c0c-af20-4d84-884d-77b93095fc49","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"e398dfd3-d86d-476e-baa3-3dad5d89e1ab","path":"sprites/sprite205/sprite205.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"5c330d83-ca2e-42b1-97a8-f572b3b2563c","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"948f3853-433a-4d70-9e76-5bf277b69d7f","path":"sprites/sprite205/sprite205.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"a74ec994-f514-4110-a038-02458347f6fa","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"1f938192-8a38-4af0-9eb6-1cf001029629","path":"sprites/sprite205/sprite205.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"6b088956-0479-4b8d-a182-c477012c08a0","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"84e9ae94-69d2-47e9-8a8b-045569940e74","path":"sprites/sprite205/sprite205.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"b75b6f93-11eb-4961-8366-6c0902c02268","IsCreationKey":false,"Key":7.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"d7fe316e-612d-40c7-bf4e-cb3c322c5355","path":"sprites/sprite205/sprite205.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"0f725165-8268-44ff-8c1d-d91dc0802148","IsCreationKey":false,"Key":8.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"4c66a00b-df26-451e-b820-a5b9fb7929c5","path":"sprites/sprite205/sprite205.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"d7652d5a-c5b3-4e53-829f-dc1df0f44e3c","IsCreationKey":false,"Key":9.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"ca79c445-092d-42e1-af3a-bcf4c107fca7","path":"sprites/sprite205/sprite205.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"7f654dff-36b1-4f79-b858-641df43ff6b3","IsCreationKey":false,"Key":10.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"08b6c661-4eaf-4953-b2ca-b50fbd52e7d9","path":"sprites/sprite205/sprite205.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"4940dbf7-b6df-4eeb-9517-2bdbc6e8f7b3","IsCreationKey":false,"Key":11.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"d75a4f8e-556f-43f1-9532-c0b2e171a8c0","path":"sprites/sprite205/sprite205.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"615fa685-7b45-4d5d-9d10-294a2675647f","IsCreationKey":false,"Key":12.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"a0f9ea07-182f-46fd-8a9d-97ecb4966e45","path":"sprites/sprite205/sprite205.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"877ea5c1-1244-4c51-bf92-21cb2c61403f","IsCreationKey":false,"Key":13.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"596a5858-6bfc-4d39-9aff-87b1ec02d7a0","path":"sprites/sprite205/sprite205.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"c03aa812-0003-4523-9457-b4bb56f0da6d","IsCreationKey":false,"Key":14.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"713882f5-5933-468c-9b6b-ded602dfa95c","path":"sprites/sprite205/sprite205.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"312ee670-e08c-4c31-9c70-8ed40f6ad91e","IsCreationKey":false,"Key":15.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"b1ea20b4-22e3-41e1-b125-231adc4ea25a","path":"sprites/sprite205/sprite205.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"12468898-9cff-4501-9ce1-35984b543471","IsCreationKey":false,"Key":16.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"c9afdd1b-aa2d-4488-8576-17ff8b3e5348","path":"sprites/sprite205/sprite205.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"11d29fc7-c1d4-4bb6-a261-0c69c739814f","IsCreationKey":false,"Key":17.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"d12c9028-3151-4ff0-af7a-71126a9eef72","path":"sprites/sprite205/sprite205.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"3844657d-eb55-467b-904f-adb38da21212","IsCreationKey":false,"Key":18.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"2e0eea1c-e2f8-4ebe-bab3-180ab5d9edad","path":"sprites/sprite205/sprite205.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"4d31be4d-8388-480a-8dc4-8ccd5d5da073","IsCreationKey":false,"Key":19.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"72e2b11b-39ae-474c-a8fc-04ac2330fea9","path":"sprites/sprite205/sprite205.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"4220a72b-3cfa-47c2-ab46-293c7b5a2da8","IsCreationKey":false,"Key":20.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"2b9e0f9c-f62b-4088-85dc-1159b01d4aea","path":"sprites/sprite205/sprite205.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"c37e1ae7-c04e-4a5d-9ad2-142a39badfe5","IsCreationKey":false,"Key":21.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"f8dc011f-7ea1-48c4-a1ad-c6288238b610","path":"sprites/sprite205/sprite205.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"53572527-7dfa-470b-80fc-f6ed37adb9a4","IsCreationKey":false,"Key":22.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"ed597f49-74bb-4554-be3b-f8396d43330e","path":"sprites/sprite205/sprite205.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"d7e8b093-a7f6-4e17-94e8-e5f97de878cc","IsCreationKey":false,"Key":23.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"572abf2c-f688-451c-86ad-7ae450ebf09b","path":"sprites/sprite205/sprite205.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"104b58e9-d4f9-4014-90f9-3ab206e8cbca","IsCreationKey":false,"Key":24.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"89a7d63a-1643-4d53-8cdd-862c4b2b0931","path":"sprites/sprite205/sprite205.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"f2397701-8f34-4abe-b1c0-7f33a5654a20","IsCreationKey":false,"Key":25.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"a2ec40a2-1e71-41a0-90d4-60e04ca7039b","path":"sprites/sprite205/sprite205.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"21b766bb-2f49-4bc7-a058-aa03ef27eed2","IsCreationKey":false,"Key":26.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"83fbca9d-40f5-4c2d-90e3-712e0e665a50","path":"sprites/sprite205/sprite205.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"3ae2e161-596e-462b-9af7-b845bfcd3a15","IsCreationKey":false,"Key":27.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"d31e0391-fddc-48f2-aaa5-cdc6041884e5","path":"sprites/sprite205/sprite205.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"4d446b18-ea81-4133-9cb0-3009dc718e7d","IsCreationKey":false,"Key":28.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"3aa432cd-3da0-45e8-8ebe-d14cd2d30f6d","path":"sprites/sprite205/sprite205.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"fbd85722-9516-48b2-9d7c-1d6d60df18f9","IsCreationKey":false,"Key":29.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"2af12c7e-de77-468a-9b8f-d14df64683d6","path":"sprites/sprite205/sprite205.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"bd0ed600-6016-4083-be67-de5f4bb3aed6","IsCreationKey":false,"Key":30.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"1464fb39-aba1-4946-8e95-a2a730849c4b","path":"sprites/sprite205/sprite205.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"1dae602f-db65-42e8-b84a-b71e1024e5ac","IsCreationKey":false,"Key":31.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"76c7c0ab-d65e-4c8f-8a80-e0017f92b87f","path":"sprites/sprite205/sprite205.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"8e1aedee-9eb0-41fc-befb-144a674bad75","IsCreationKey":false,"Key":32.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"7159807f-7ffb-4c46-a38b-ce11ae89a567","path":"sprites/sprite205/sprite205.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"5e2cc7eb-0172-41d1-9644-131dd0e43e9d","IsCreationKey":false,"Key":33.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"c38969c1-c382-48b4-889e-2b704786075b","path":"sprites/sprite205/sprite205.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"ed5c6bec-23f1-4f20-a038-86ac3ec94d58","IsCreationKey":false,"Key":34.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"15796572-346e-4a2d-b76d-7dec6f12c885","path":"sprites/sprite205/sprite205.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"2d5c8e79-806e-452d-8a96-154d58956094","IsCreationKey":false,"Key":35.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"256a727a-239a-47ea-acab-fc1298ed61e2","path":"sprites/sprite205/sprite205.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"5c5f4260-f449-46fe-a6e0-590761c2472e","IsCreationKey":false,"Key":36.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"986e1b76-0fed-49b5-bdaf-9affe1f09636","path":"sprites/sprite205/sprite205.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"bc057fe4-8b3e-42d5-a520-7eea412389e4","IsCreationKey":false,"Key":37.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"d4622fa4-9ca3-4859-8309-ccccddc7e86b","path":"sprites/sprite205/sprite205.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"84f69a5e-4265-47bf-a9bc-9ffcd9a6b815","IsCreationKey":false,"Key":38.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"a6486fe6-7ba6-468b-ab3c-eac51120c800","path":"sprites/sprite205/sprite205.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"fcf4e6a2-69ee-48c1-b78f-0e5d00ccf8a2","IsCreationKey":false,"Key":39.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"95e9f5f9-08dc-4c46-9578-c1a47900a710","path":"sprites/sprite205/sprite205.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"2d627ee4-442f-4c19-9493-0e251d5d7aa2","IsCreationKey":false,"Key":40.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"7a757ca2-f275-48a2-b0da-78a3639c5b2a","path":"sprites/sprite205/sprite205.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"d89792ac-02d6-442d-bba3-d0af163ee1d8","IsCreationKey":false,"Key":41.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"bdd957a0-f8ad-4292-9018-bef34ccf2e84","path":"sprites/sprite205/sprite205.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"40782400-7b56-4337-bb93-6084856c5199","IsCreationKey":false,"Key":42.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"f7687056-5b88-4134-8cea-e50b8bc34382","path":"sprites/sprite205/sprite205.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"1fd7a900-0be0-49fc-91fd-a523376d97e3","IsCreationKey":false,"Key":43.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"99391a19-306d-425e-bf27-a3d8448a675f","path":"sprites/sprite205/sprite205.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"f9ce2752-9394-4a6c-b72c-2d7139e0329c","IsCreationKey":false,"Key":44.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"56266570-4945-49e0-a71c-bcf06cd9dac0","path":"sprites/sprite205/sprite205.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"54c8ad82-d213-4478-9a7b-f8111144e37e","IsCreationKey":false,"Key":45.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"1aeb8dc6-92a6-449d-8eb9-6d7857832485","path":"sprites/sprite205/sprite205.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"5d92e1e5-d295-4057-80ab-1b5b3652d24f","IsCreationKey":false,"Key":46.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"464320dd-9757-4029-a3ad-319447951151","path":"sprites/sprite205/sprite205.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"3b3a35a5-9d2c-4187-bdaa-8abc2761b90d","IsCreationKey":false,"Key":47.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"5780a724-ceda-47f4-b408-3054627786eb","path":"sprites/sprite205/sprite205.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"acee4c47-6e2e-4e89-903b-a40e10ad918e","IsCreationKey":false,"Key":48.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"a4477e45-963e-46b7-94ec-85e932d2cdb8","path":"sprites/sprite205/sprite205.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"40c5845c-3a36-430e-857e-6f0199377ba8","IsCreationKey":false,"Key":49.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"d58e08aa-0785-471c-bfcc-db0d3d385728","path":"sprites/sprite205/sprite205.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"70d75d83-71a2-45fd-96ad-2a71d48c234d","IsCreationKey":false,"Key":50.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"dbb99977-f483-4227-8b9e-f1cc43280e39","path":"sprites/sprite205/sprite205.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"ddb6b09d-eeb7-4daf-bcdf-890f7839b48b","IsCreationKey":false,"Key":51.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"b9058249-50e6-4b75-99da-8fe5042da131","path":"sprites/sprite205/sprite205.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"53e9b533-2c57-4049-b344-a1b47ad5ce21","IsCreationKey":false,"Key":52.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"ae1cc1cc-181f-41bd-a44f-c9841760947d","path":"sprites/sprite205/sprite205.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"75f14c91-a6de-4a1d-94eb-ff22f6863dfe","IsCreationKey":false,"Key":53.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"82c64d4a-d421-488a-8b81-ddab5542a642","path":"sprites/sprite205/sprite205.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"421da936-db93-479e-86b1-58020a2209e5","IsCreationKey":false,"Key":54.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"866c182a-607d-4a51-a4b5-703faa5a955f","path":"sprites/sprite205/sprite205.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"8b4799db-7675-44f5-ab0f-1098459be066","IsCreationKey":false,"Key":55.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"6953b7ca-cb1a-44ad-b33f-1f687e83b95f","path":"sprites/sprite205/sprite205.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"96221e44-125f-4004-9e41-ddfc2289d072","IsCreationKey":false,"Key":56.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"28dc9fde-1843-4f47-9929-6bb6782e4209","path":"sprites/sprite205/sprite205.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"2fb6640f-fbb7-4447-b54f-c397310fdb49","IsCreationKey":false,"Key":57.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"bb93e4a1-19f1-4b78-88e8-26b6938e7a38","path":"sprites/sprite205/sprite205.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"9b02dfcb-b7f4-40b6-b600-14befa8da52a","IsCreationKey":false,"Key":58.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"e6d72988-dc32-41f8-9003-a8efbfcf3d9e","path":"sprites/sprite205/sprite205.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"ff4ced38-5f98-42f3-98c6-9a96a9826adf","IsCreationKey":false,"Key":59.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"14245612-2105-4fe4-a0d0-b6c41880dd78","path":"sprites/sprite205/sprite205.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"9e4285d3-345e-4a3c-a534-378c4026c407","IsCreationKey":false,"Key":60.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"e7e3af5a-8994-4462-86e2-b64ea2567102","path":"sprites/sprite205/sprite205.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"237ef745-c957-45bb-b2f3-fc84f1257b95","IsCreationKey":false,"Key":61.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/sprite221/sprite221.yy b/sprites/sprite221/sprite221.yy index fba5a72e29..853d3fb4f3 100644 --- a/sprites/sprite221/sprite221.yy +++ b/sprites/sprite221/sprite221.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"sprite221", "bboxMode":0, "bbox_bottom":142, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"f17b0368-0c5d-4b61-b9c6-a71ae5d6d8a6","name":"f17b0368-0c5d-4b61-b9c6-a71ae5d6d8a6","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"f17b0368-0c5d-4b61-b9c6-a71ae5d6d8a6","name":"f17b0368-0c5d-4b61-b9c6-a71ae5d6d8a6","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"f17b0368-0c5d-4b61-b9c6-a71ae5d6d8a6","path":"sprites/sprite221/sprite221.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"00942437-fc4a-44e1-82ba-71afe70103ec","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"f17b0368-0c5d-4b61-b9c6-a71ae5d6d8a6","path":"sprites/sprite221/sprite221.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"00942437-fc4a-44e1-82ba-71afe70103ec","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":{ diff --git a/sprites/sprite230/sprite230.yy b/sprites/sprite230/sprite230.yy index 912a845c0e..d91923af0a 100644 --- a/sprites/sprite230/sprite230.yy +++ b/sprites/sprite230/sprite230.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"sprite230", "bboxMode":0, "bbox_bottom":14, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"323ac7c3-7087-4ed0-9b70-3a3ad70cf299","name":"323ac7c3-7087-4ed0-9b70-3a3ad70cf299","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"323ac7c3-7087-4ed0-9b70-3a3ad70cf299","name":"323ac7c3-7087-4ed0-9b70-3a3ad70cf299","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"323ac7c3-7087-4ed0-9b70-3a3ad70cf299","path":"sprites/sprite230/sprite230.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"d3aa82a1-63b2-4fa8-9879-382551ff4562","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"323ac7c3-7087-4ed0-9b70-3a3ad70cf299","path":"sprites/sprite230/sprite230.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"d3aa82a1-63b2-4fa8-9879-382551ff4562","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":{ diff --git a/sprites/sprite235/sprite235.yy b/sprites/sprite235/sprite235.yy index 066ec267be..621d0cd1d7 100644 --- a/sprites/sprite235/sprite235.yy +++ b/sprites/sprite235/sprite235.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"sprite235", "bboxMode":0, "bbox_bottom":144, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"9eb64083-b01d-475f-b7fb-b488e2255abd","name":"9eb64083-b01d-475f-b7fb-b488e2255abd","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"9eb64083-b01d-475f-b7fb-b488e2255abd","name":"9eb64083-b01d-475f-b7fb-b488e2255abd","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"9eb64083-b01d-475f-b7fb-b488e2255abd","path":"sprites/sprite235/sprite235.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"ac93298c-518d-4c5f-94ac-058b0a29d115","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"9eb64083-b01d-475f-b7fb-b488e2255abd","path":"sprites/sprite235/sprite235.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"ac93298c-518d-4c5f-94ac-058b0a29d115","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":{ diff --git a/sprites/sprite245/sprite245.yy b/sprites/sprite245/sprite245.yy index 2ca36e95af..58dff6f64a 100644 --- a/sprites/sprite245/sprite245.yy +++ b/sprites/sprite245/sprite245.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"sprite245", "bboxMode":0, "bbox_bottom":41, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"4c0d94ce-c927-4cb2-94cb-eb1d829e6859","name":"4c0d94ce-c927-4cb2-94cb-eb1d829e6859","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"4c0d94ce-c927-4cb2-94cb-eb1d829e6859","name":"4c0d94ce-c927-4cb2-94cb-eb1d829e6859","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"4c0d94ce-c927-4cb2-94cb-eb1d829e6859","path":"sprites/sprite245/sprite245.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"a5f8e957-69c2-4cd4-8045-13fe17b94f01","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"4c0d94ce-c927-4cb2-94cb-eb1d829e6859","path":"sprites/sprite245/sprite245.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"a5f8e957-69c2-4cd4-8045-13fe17b94f01","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/sprite266/sprite266.yy b/sprites/sprite266/sprite266.yy index 512507f9bc..9850e78b65 100644 --- a/sprites/sprite266/sprite266.yy +++ b/sprites/sprite266/sprite266.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"sprite266", "bboxMode":0, "bbox_bottom":91, @@ -12,8 +12,8 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"61bfa4bb-2e45-4bcb-962f-2fd5a15e65b4","name":"61bfa4bb-2e45-4bcb-962f-2fd5a15e65b4","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"490f001a-c449-42ac-bc26-286c2d57d439","name":"490f001a-c449-42ac-bc26-286c2d57d439","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"61bfa4bb-2e45-4bcb-962f-2fd5a15e65b4","name":"61bfa4bb-2e45-4bcb-962f-2fd5a15e65b4","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"490f001a-c449-42ac-bc26-286c2d57d439","name":"490f001a-c449-42ac-bc26-286c2d57d439","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -69,12 +69,8 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"61bfa4bb-2e45-4bcb-962f-2fd5a15e65b4","path":"sprites/sprite266/sprite266.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"21f73b8d-9fb1-4758-a596-31ebf4daff11","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"490f001a-c449-42ac-bc26-286c2d57d439","path":"sprites/sprite266/sprite266.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"d8f1a35c-fb4e-4576-8331-ca347235b814","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"61bfa4bb-2e45-4bcb-962f-2fd5a15e65b4","path":"sprites/sprite266/sprite266.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"21f73b8d-9fb1-4758-a596-31ebf4daff11","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"490f001a-c449-42ac-bc26-286c2d57d439","path":"sprites/sprite266/sprite266.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"d8f1a35c-fb4e-4576-8331-ca347235b814","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":{ diff --git a/sprites/sprite267/sprite267.yy b/sprites/sprite267/sprite267.yy index 456c1b0d2a..da380150a6 100644 --- a/sprites/sprite267/sprite267.yy +++ b/sprites/sprite267/sprite267.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"sprite267", "bboxMode":0, "bbox_bottom":479, @@ -12,18 +12,18 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"7ea52bfd-5fa6-48a2-add4-48a262a6a7a0","name":"7ea52bfd-5fa6-48a2-add4-48a262a6a7a0","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"d10268f1-5242-4fec-b503-09bd2d966fbf","name":"d10268f1-5242-4fec-b503-09bd2d966fbf","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"e17715e2-75a5-400d-bda2-b10c9b3f80dd","name":"e17715e2-75a5-400d-bda2-b10c9b3f80dd","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"472439bf-2235-45b0-8408-a582c8e4feb4","name":"472439bf-2235-45b0-8408-a582c8e4feb4","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"e0d528ef-8f76-4cac-92dd-2394f7650407","name":"e0d528ef-8f76-4cac-92dd-2394f7650407","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"715a306f-fbbe-4982-8f1b-1af7e29e8980","name":"715a306f-fbbe-4982-8f1b-1af7e29e8980","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"bc4a1b5e-6f06-4f6c-b7e7-d85ea78297b7","name":"bc4a1b5e-6f06-4f6c-b7e7-d85ea78297b7","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"1cf8dd5b-3be1-4e92-93c6-252a86c21bb2","name":"1cf8dd5b-3be1-4e92-93c6-252a86c21bb2","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"ff171f68-da9a-4b80-999a-541e07c9802d","name":"ff171f68-da9a-4b80-999a-541e07c9802d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"5b891142-339b-44a3-ad4d-ad21539a301b","name":"5b891142-339b-44a3-ad4d-ad21539a301b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"de7dfe22-6475-4fa4-9f51-198fe54ff011","name":"de7dfe22-6475-4fa4-9f51-198fe54ff011","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"257d8024-9824-43ad-8813-307c289c0e47","name":"257d8024-9824-43ad-8813-307c289c0e47","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"7ea52bfd-5fa6-48a2-add4-48a262a6a7a0","name":"7ea52bfd-5fa6-48a2-add4-48a262a6a7a0","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"d10268f1-5242-4fec-b503-09bd2d966fbf","name":"d10268f1-5242-4fec-b503-09bd2d966fbf","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"e17715e2-75a5-400d-bda2-b10c9b3f80dd","name":"e17715e2-75a5-400d-bda2-b10c9b3f80dd","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"472439bf-2235-45b0-8408-a582c8e4feb4","name":"472439bf-2235-45b0-8408-a582c8e4feb4","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"e0d528ef-8f76-4cac-92dd-2394f7650407","name":"e0d528ef-8f76-4cac-92dd-2394f7650407","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"715a306f-fbbe-4982-8f1b-1af7e29e8980","name":"715a306f-fbbe-4982-8f1b-1af7e29e8980","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"bc4a1b5e-6f06-4f6c-b7e7-d85ea78297b7","name":"bc4a1b5e-6f06-4f6c-b7e7-d85ea78297b7","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"1cf8dd5b-3be1-4e92-93c6-252a86c21bb2","name":"1cf8dd5b-3be1-4e92-93c6-252a86c21bb2","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"ff171f68-da9a-4b80-999a-541e07c9802d","name":"ff171f68-da9a-4b80-999a-541e07c9802d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"5b891142-339b-44a3-ad4d-ad21539a301b","name":"5b891142-339b-44a3-ad4d-ad21539a301b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"de7dfe22-6475-4fa4-9f51-198fe54ff011","name":"de7dfe22-6475-4fa4-9f51-198fe54ff011","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"257d8024-9824-43ad-8813-307c289c0e47","name":"257d8024-9824-43ad-8813-307c289c0e47","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -79,42 +79,18 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"7ea52bfd-5fa6-48a2-add4-48a262a6a7a0","path":"sprites/sprite267/sprite267.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"a3109ba7-a554-445a-93e1-af9bf24c6b10","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"d10268f1-5242-4fec-b503-09bd2d966fbf","path":"sprites/sprite267/sprite267.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"5bdcd633-b77f-45ed-8ec2-73091bc9b6ee","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"e17715e2-75a5-400d-bda2-b10c9b3f80dd","path":"sprites/sprite267/sprite267.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"017a8296-69f5-4a63-85c6-9027867e2a7a","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"472439bf-2235-45b0-8408-a582c8e4feb4","path":"sprites/sprite267/sprite267.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"0c46d0de-8ccd-4d4a-9a45-ae7d02f3bee5","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"e0d528ef-8f76-4cac-92dd-2394f7650407","path":"sprites/sprite267/sprite267.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"a07ce368-ea35-42b6-b87f-52ab20da4767","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"715a306f-fbbe-4982-8f1b-1af7e29e8980","path":"sprites/sprite267/sprite267.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"bd1cbf43-f31c-4331-ab25-50b4c7b984a2","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"bc4a1b5e-6f06-4f6c-b7e7-d85ea78297b7","path":"sprites/sprite267/sprite267.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"f05d0012-d481-4718-92aa-a1708d1c4fdc","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"1cf8dd5b-3be1-4e92-93c6-252a86c21bb2","path":"sprites/sprite267/sprite267.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"95adb502-9d7a-41dd-9e0d-1dd44b237961","IsCreationKey":false,"Key":7.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"ff171f68-da9a-4b80-999a-541e07c9802d","path":"sprites/sprite267/sprite267.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"de1cb9d0-329e-441c-bdcc-fae3dc0b3361","IsCreationKey":false,"Key":8.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"5b891142-339b-44a3-ad4d-ad21539a301b","path":"sprites/sprite267/sprite267.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"ec84286c-ddf6-4269-99fd-c17529eabe69","IsCreationKey":false,"Key":9.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"de7dfe22-6475-4fa4-9f51-198fe54ff011","path":"sprites/sprite267/sprite267.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"93ccf62d-cdc9-4fce-9f20-724524f373a6","IsCreationKey":false,"Key":10.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"257d8024-9824-43ad-8813-307c289c0e47","path":"sprites/sprite267/sprite267.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"7c9801f5-dc63-49f8-82df-920a647afc4c","IsCreationKey":false,"Key":11.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"7ea52bfd-5fa6-48a2-add4-48a262a6a7a0","path":"sprites/sprite267/sprite267.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"a3109ba7-a554-445a-93e1-af9bf24c6b10","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"d10268f1-5242-4fec-b503-09bd2d966fbf","path":"sprites/sprite267/sprite267.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"5bdcd633-b77f-45ed-8ec2-73091bc9b6ee","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"e17715e2-75a5-400d-bda2-b10c9b3f80dd","path":"sprites/sprite267/sprite267.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"017a8296-69f5-4a63-85c6-9027867e2a7a","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"472439bf-2235-45b0-8408-a582c8e4feb4","path":"sprites/sprite267/sprite267.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"0c46d0de-8ccd-4d4a-9a45-ae7d02f3bee5","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"e0d528ef-8f76-4cac-92dd-2394f7650407","path":"sprites/sprite267/sprite267.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"a07ce368-ea35-42b6-b87f-52ab20da4767","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"715a306f-fbbe-4982-8f1b-1af7e29e8980","path":"sprites/sprite267/sprite267.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"bd1cbf43-f31c-4331-ab25-50b4c7b984a2","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"bc4a1b5e-6f06-4f6c-b7e7-d85ea78297b7","path":"sprites/sprite267/sprite267.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"f05d0012-d481-4718-92aa-a1708d1c4fdc","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"1cf8dd5b-3be1-4e92-93c6-252a86c21bb2","path":"sprites/sprite267/sprite267.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"95adb502-9d7a-41dd-9e0d-1dd44b237961","IsCreationKey":false,"Key":7.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"ff171f68-da9a-4b80-999a-541e07c9802d","path":"sprites/sprite267/sprite267.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"de1cb9d0-329e-441c-bdcc-fae3dc0b3361","IsCreationKey":false,"Key":8.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"5b891142-339b-44a3-ad4d-ad21539a301b","path":"sprites/sprite267/sprite267.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"ec84286c-ddf6-4269-99fd-c17529eabe69","IsCreationKey":false,"Key":9.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"de7dfe22-6475-4fa4-9f51-198fe54ff011","path":"sprites/sprite267/sprite267.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"93ccf62d-cdc9-4fce-9f20-724524f373a6","IsCreationKey":false,"Key":10.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"257d8024-9824-43ad-8813-307c289c0e47","path":"sprites/sprite267/sprite267.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"7c9801f5-dc63-49f8-82df-920a647afc4c","IsCreationKey":false,"Key":11.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":{ diff --git a/sprites/sprite269/sprite269.yy b/sprites/sprite269/sprite269.yy index e1ba8979da..bb6354e9dc 100644 --- a/sprites/sprite269/sprite269.yy +++ b/sprites/sprite269/sprite269.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"sprite269", "bboxMode":0, "bbox_bottom":37, @@ -12,23 +12,23 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"a073afca-5924-4620-8e3c-51c617e567dc","name":"a073afca-5924-4620-8e3c-51c617e567dc","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"5d523a48-4412-4d7b-8c14-6867ce042d04","name":"5d523a48-4412-4d7b-8c14-6867ce042d04","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"496dca9c-7c1e-4bc9-a178-a95da77e7f1d","name":"496dca9c-7c1e-4bc9-a178-a95da77e7f1d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"3f03d714-5096-4e08-bac7-0e9e2d90ba30","name":"3f03d714-5096-4e08-bac7-0e9e2d90ba30","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"d438dbcf-4161-42f6-b539-ce4ed494069e","name":"d438dbcf-4161-42f6-b539-ce4ed494069e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"96628852-dfc1-4166-a1ca-7461aee00d71","name":"96628852-dfc1-4166-a1ca-7461aee00d71","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"e7029bf5-3690-4dcc-89d2-5d431df67b17","name":"e7029bf5-3690-4dcc-89d2-5d431df67b17","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"dce71047-c025-431f-81f3-e617e163ffc0","name":"dce71047-c025-431f-81f3-e617e163ffc0","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"be8d6592-8364-405c-a9a1-095c0695c9aa","name":"be8d6592-8364-405c-a9a1-095c0695c9aa","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"2ee6323f-f81c-40dc-aeb5-be47dc5cf8c0","name":"2ee6323f-f81c-40dc-aeb5-be47dc5cf8c0","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"48cbc4c2-b582-4a30-838f-5c464f4c0e8f","name":"48cbc4c2-b582-4a30-838f-5c464f4c0e8f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"473f0628-ddbe-404b-9a82-26d821253c62","name":"473f0628-ddbe-404b-9a82-26d821253c62","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"032afc88-4208-4b2e-9b64-43e4694015ac","name":"032afc88-4208-4b2e-9b64-43e4694015ac","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"9e9f94d2-ffaf-48e0-815c-416b7b00a375","name":"9e9f94d2-ffaf-48e0-815c-416b7b00a375","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"6fe2cfbf-8a7e-4d80-84fa-29a83f641401","name":"6fe2cfbf-8a7e-4d80-84fa-29a83f641401","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"331027b0-c1c6-4440-8cf1-1af0367abe81","name":"331027b0-c1c6-4440-8cf1-1af0367abe81","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"9c2ea474-5efe-4235-a8c1-c50e3d076bfd","name":"9c2ea474-5efe-4235-a8c1-c50e3d076bfd","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"a073afca-5924-4620-8e3c-51c617e567dc","name":"a073afca-5924-4620-8e3c-51c617e567dc","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"5d523a48-4412-4d7b-8c14-6867ce042d04","name":"5d523a48-4412-4d7b-8c14-6867ce042d04","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"496dca9c-7c1e-4bc9-a178-a95da77e7f1d","name":"496dca9c-7c1e-4bc9-a178-a95da77e7f1d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"3f03d714-5096-4e08-bac7-0e9e2d90ba30","name":"3f03d714-5096-4e08-bac7-0e9e2d90ba30","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"d438dbcf-4161-42f6-b539-ce4ed494069e","name":"d438dbcf-4161-42f6-b539-ce4ed494069e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"96628852-dfc1-4166-a1ca-7461aee00d71","name":"96628852-dfc1-4166-a1ca-7461aee00d71","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"e7029bf5-3690-4dcc-89d2-5d431df67b17","name":"e7029bf5-3690-4dcc-89d2-5d431df67b17","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"dce71047-c025-431f-81f3-e617e163ffc0","name":"dce71047-c025-431f-81f3-e617e163ffc0","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"be8d6592-8364-405c-a9a1-095c0695c9aa","name":"be8d6592-8364-405c-a9a1-095c0695c9aa","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"2ee6323f-f81c-40dc-aeb5-be47dc5cf8c0","name":"2ee6323f-f81c-40dc-aeb5-be47dc5cf8c0","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"48cbc4c2-b582-4a30-838f-5c464f4c0e8f","name":"48cbc4c2-b582-4a30-838f-5c464f4c0e8f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"473f0628-ddbe-404b-9a82-26d821253c62","name":"473f0628-ddbe-404b-9a82-26d821253c62","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"032afc88-4208-4b2e-9b64-43e4694015ac","name":"032afc88-4208-4b2e-9b64-43e4694015ac","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"9e9f94d2-ffaf-48e0-815c-416b7b00a375","name":"9e9f94d2-ffaf-48e0-815c-416b7b00a375","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"6fe2cfbf-8a7e-4d80-84fa-29a83f641401","name":"6fe2cfbf-8a7e-4d80-84fa-29a83f641401","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"331027b0-c1c6-4440-8cf1-1af0367abe81","name":"331027b0-c1c6-4440-8cf1-1af0367abe81","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"9c2ea474-5efe-4235-a8c1-c50e3d076bfd","name":"9c2ea474-5efe-4235-a8c1-c50e3d076bfd","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -84,57 +84,23 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"a073afca-5924-4620-8e3c-51c617e567dc","path":"sprites/sprite269/sprite269.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"0581599c-2f3c-4ce5-ad28-f3e015ddaa40","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"5d523a48-4412-4d7b-8c14-6867ce042d04","path":"sprites/sprite269/sprite269.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"fcac7175-ab87-4f9f-b44f-dd12662f22c5","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"496dca9c-7c1e-4bc9-a178-a95da77e7f1d","path":"sprites/sprite269/sprite269.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"a6656fff-9c5d-482f-9460-55bc461660ec","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"3f03d714-5096-4e08-bac7-0e9e2d90ba30","path":"sprites/sprite269/sprite269.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"7f1d9d5c-661b-42a7-997a-39adc322408f","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"d438dbcf-4161-42f6-b539-ce4ed494069e","path":"sprites/sprite269/sprite269.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"535bed8d-0c26-404f-ba29-a3c24b59cc06","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"96628852-dfc1-4166-a1ca-7461aee00d71","path":"sprites/sprite269/sprite269.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"92e84616-accc-4665-af0f-9fec1f2b9bc5","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"e7029bf5-3690-4dcc-89d2-5d431df67b17","path":"sprites/sprite269/sprite269.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"7ea65ba1-304c-4de3-b957-19bfb4c08d68","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"dce71047-c025-431f-81f3-e617e163ffc0","path":"sprites/sprite269/sprite269.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"68200938-40f8-468b-a1ae-0939b1a37575","IsCreationKey":false,"Key":7.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"be8d6592-8364-405c-a9a1-095c0695c9aa","path":"sprites/sprite269/sprite269.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"abb42097-8f47-4164-801a-3f3abe9cb1d7","IsCreationKey":false,"Key":8.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"2ee6323f-f81c-40dc-aeb5-be47dc5cf8c0","path":"sprites/sprite269/sprite269.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"ccd81133-8876-4e1b-8826-ffdb05d0efe8","IsCreationKey":false,"Key":9.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"48cbc4c2-b582-4a30-838f-5c464f4c0e8f","path":"sprites/sprite269/sprite269.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"1d972cb5-8045-4a6b-acff-5ba375ca3368","IsCreationKey":false,"Key":10.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"473f0628-ddbe-404b-9a82-26d821253c62","path":"sprites/sprite269/sprite269.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"f9f2405c-9feb-4591-9e7c-3726f729a4ec","IsCreationKey":false,"Key":11.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"032afc88-4208-4b2e-9b64-43e4694015ac","path":"sprites/sprite269/sprite269.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"932e0576-09cc-405f-9bdf-5d2be8acb4d1","IsCreationKey":false,"Key":12.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"9e9f94d2-ffaf-48e0-815c-416b7b00a375","path":"sprites/sprite269/sprite269.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"ef369565-fc5f-4e59-aad9-876de3a0c00c","IsCreationKey":false,"Key":13.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"6fe2cfbf-8a7e-4d80-84fa-29a83f641401","path":"sprites/sprite269/sprite269.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"ed93683a-0a88-4504-b522-d9e05069b883","IsCreationKey":false,"Key":14.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"331027b0-c1c6-4440-8cf1-1af0367abe81","path":"sprites/sprite269/sprite269.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"eecddf30-9f15-4733-96f0-51ac2f554848","IsCreationKey":false,"Key":15.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"9c2ea474-5efe-4235-a8c1-c50e3d076bfd","path":"sprites/sprite269/sprite269.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"ffc3fc14-3204-43b7-87af-21d871c970d3","IsCreationKey":false,"Key":16.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"a073afca-5924-4620-8e3c-51c617e567dc","path":"sprites/sprite269/sprite269.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"0581599c-2f3c-4ce5-ad28-f3e015ddaa40","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"5d523a48-4412-4d7b-8c14-6867ce042d04","path":"sprites/sprite269/sprite269.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"fcac7175-ab87-4f9f-b44f-dd12662f22c5","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"496dca9c-7c1e-4bc9-a178-a95da77e7f1d","path":"sprites/sprite269/sprite269.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"a6656fff-9c5d-482f-9460-55bc461660ec","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"3f03d714-5096-4e08-bac7-0e9e2d90ba30","path":"sprites/sprite269/sprite269.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"7f1d9d5c-661b-42a7-997a-39adc322408f","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"d438dbcf-4161-42f6-b539-ce4ed494069e","path":"sprites/sprite269/sprite269.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"535bed8d-0c26-404f-ba29-a3c24b59cc06","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"96628852-dfc1-4166-a1ca-7461aee00d71","path":"sprites/sprite269/sprite269.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"92e84616-accc-4665-af0f-9fec1f2b9bc5","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"e7029bf5-3690-4dcc-89d2-5d431df67b17","path":"sprites/sprite269/sprite269.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"7ea65ba1-304c-4de3-b957-19bfb4c08d68","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"dce71047-c025-431f-81f3-e617e163ffc0","path":"sprites/sprite269/sprite269.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"68200938-40f8-468b-a1ae-0939b1a37575","IsCreationKey":false,"Key":7.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"be8d6592-8364-405c-a9a1-095c0695c9aa","path":"sprites/sprite269/sprite269.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"abb42097-8f47-4164-801a-3f3abe9cb1d7","IsCreationKey":false,"Key":8.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"2ee6323f-f81c-40dc-aeb5-be47dc5cf8c0","path":"sprites/sprite269/sprite269.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"ccd81133-8876-4e1b-8826-ffdb05d0efe8","IsCreationKey":false,"Key":9.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"48cbc4c2-b582-4a30-838f-5c464f4c0e8f","path":"sprites/sprite269/sprite269.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"1d972cb5-8045-4a6b-acff-5ba375ca3368","IsCreationKey":false,"Key":10.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"473f0628-ddbe-404b-9a82-26d821253c62","path":"sprites/sprite269/sprite269.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"f9f2405c-9feb-4591-9e7c-3726f729a4ec","IsCreationKey":false,"Key":11.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"032afc88-4208-4b2e-9b64-43e4694015ac","path":"sprites/sprite269/sprite269.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"932e0576-09cc-405f-9bdf-5d2be8acb4d1","IsCreationKey":false,"Key":12.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"9e9f94d2-ffaf-48e0-815c-416b7b00a375","path":"sprites/sprite269/sprite269.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"ef369565-fc5f-4e59-aad9-876de3a0c00c","IsCreationKey":false,"Key":13.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"6fe2cfbf-8a7e-4d80-84fa-29a83f641401","path":"sprites/sprite269/sprite269.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"ed93683a-0a88-4504-b522-d9e05069b883","IsCreationKey":false,"Key":14.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"331027b0-c1c6-4440-8cf1-1af0367abe81","path":"sprites/sprite269/sprite269.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"eecddf30-9f15-4733-96f0-51ac2f554848","IsCreationKey":false,"Key":15.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"9c2ea474-5efe-4235-a8c1-c50e3d076bfd","path":"sprites/sprite269/sprite269.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"ffc3fc14-3204-43b7-87af-21d871c970d3","IsCreationKey":false,"Key":16.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":{ From baaf5caec6272fd580c261fc8975d16d8d3a9a32 Mon Sep 17 00:00:00 2001 From: EttyKitty <20323032+EttyKitty@users.noreply.github.com> Date: Thu, 29 May 2025 14:14:45 +0300 Subject: [PATCH 062/286] fix: Enemy damage dealing code (#843) --- scripts/scr_clean/scr_clean.gml | 291 +++++++++++++++------------- scripts/scr_flavor2/scr_flavor2.gml | 2 + 2 files changed, 157 insertions(+), 136 deletions(-) diff --git a/scripts/scr_clean/scr_clean.gml b/scripts/scr_clean/scr_clean.gml index 9654735677..a9062f10c4 100644 --- a/scripts/scr_clean/scr_clean.gml +++ b/scripts/scr_clean/scr_clean.gml @@ -128,154 +128,36 @@ function scr_clean(target_object, target_is_infantry, hostile_shots, hostile_dam exit; } - var vehicle_hits = 0; - var man_hits = 0; - var total_hits = hostile_shots; - var unit_type = ""; + var damage_data = { + "units_lost": 0, + "unit_type": "", + "hits": 0 + }; // ### Vehicle Damage Processing ### if (!target_is_infantry && veh > 0) { - var you = -1; - - // Find valid vehicle targets - var valid_vehicles = []; - for (var v = 0; v < veh; v++) { - if (veh_hp[v] > 0 && veh_dead[v] == 0) { - array_push(valid_vehicles, v); - } - } - - // Apply damage for each hostile shot, until we run out of targets - for (var shot = 0; shot < total_hits; shot++) { - if (array_length(valid_vehicles) == 0) { - break; - } - - // Select a random vehicle from the valid list - var random_index = array_random_index(valid_vehicles); - you = random_index; - - // Apply damage - var _modified_damage = hostile_damage - veh_ac[you]; - if (_modified_damage < 0) { - _modified_damage = 0.25; - } - if (enemy == 13 && _modified_damage < 1) { - _modified_damage = 1; - } - veh_hp[you] -= _modified_damage; - unit_type = veh_type[you]; - vehicle_hits++; - - var units_lost = 0; - // Check if the vehicle is destroyed - if (veh_hp[you] <= 0 && veh_dead[you] == 0) { - veh_dead[you] = 1; - units_lost++; - obj_ncombat.player_forces -= 1; - - // Record loss - var existing_index = array_get_index(lost, veh_type[you]); - if (existing_index != -1) { - lost_num[existing_index] += 1; - } else { - array_push(lost, veh_type[you]); - array_push(lost_num, 1); - } - - // Remove dead vehicles from further hits - array_delete(valid_vehicles, you, 1); - } - // Flavor messages - scr_flavor2(units_lost, unit_type, hostile_range, hostile_weapon, vehicle_hits, hostile_splash); - } + damage_vehicles(damage_data, hostile_shots, hostile_damage); } // ### Marine + Dreadnought Processing ### if (target_is_infantry && (men + dreads > 0)) { - man_hits = total_hits - vehicle_hits; - - // Find valid infantry targets - var valid_marines = []; - for (var m = 0; m < array_length(unit_struct); m++) { - var unit = unit_struct[m]; - if (is_struct(unit) && unit.hp() > 0 && marine_dead[m] == 0) { - array_push(valid_marines, m); - } + damage_infantry(damage_data, hostile_shots, hostile_damage); + } + + if (damage_data.hits < hostile_shots) { + // ### Vehicle Damage Processing ### + if (target_is_infantry && veh > 0) { + damage_vehicles(damage_data, hostile_shots, hostile_damage); } - // Apply damage for each shot - for (var shot = 0; shot < man_hits; shot++) { - if (array_length(valid_marines) == 0) { - break; // No valid targets left - } - - // Select a random marine from the valid list - var random_index = array_random_index(valid_marines); - var marine_index = valid_marines[random_index]; - var marine = unit_struct[marine_index]; - unit_type = marine.role(); - var units_lost = 0; - - // Apply damage - var _shot_luck = roll_dice_chapter(1, 100, "low"); - var _modified_damage = 0; - if (_shot_luck <= 5) { - _modified_damage = hostile_damage - (2 * marine_ac[marine_index]); - } else if (_shot_luck > 95) { - _modified_damage = hostile_damage; - } else { - _modified_damage = hostile_damage - marine_ac[marine_index]; - } - - if (_modified_damage > 0) { - var damage_resistance = marine.damage_resistance() / 100; - if (marine_mshield[marine_index] > 0) { - damage_resistance += 0.1; - } - if (marine_fiery[marine_index] > 0) { - damage_resistance += 0.15; - } - if (marine_fshield[marine_index] > 0) { - damage_resistance += 0.08; - } - if (marine_quick[marine_index] > 0) { - damage_resistance += 0.2; - } // TODO: only if melee - if (marine_dome[marine_index] > 0) { - damage_resistance += 0.15; - } - if (marine_iron[marine_index] > 0) { - if (damage_resistance <= 0) { - marine.add_or_sub_health(20); - } else { - damage_resistance += marine_iron[marine_index] / 5; - } - } - _modified_damage = round(_modified_damage * (1 - damage_resistance)); - } - if (_modified_damage < 0 && hostile_weapon == "Fleshborer") { - _modified_damage = 1.5; - } - /* if (hostile_weapon == "Web Spinner") { - var webr = floor(random(100)) + 1; - var chunk = max(10, 62 - (marine_ac[marine_index] * 2)); - _modified_damage = (webr <= chunk) ? 5000 : 0; - } */ - marine.add_or_sub_health(-_modified_damage); - - // Check if marine is dead - if (check_dead_marines(marine, marine_index)) { - // Remove dead infantry from further hits - array_delete(valid_marines, marine_index, 1); - units_lost++; - } - - // Flavor messages - scr_flavor2(units_lost, unit_type, hostile_range, hostile_weapon, man_hits, hostile_splash); + // ### Marine + Dreadnought Processing ### + if (!target_is_infantry && (men + dreads > 0)) { + damage_infantry(damage_data, hostile_shots, hostile_damage); } } + scr_flavor2(damage_data.units_lost, damage_data.unit_type, hostile_range, hostile_weapon, damage_data.hits, hostile_splash); + // ### Cleanup ### // If the target_object got wiped out, move it off-screen if ((men + veh + dreads) <= 0) { @@ -287,3 +169,140 @@ function scr_clean(target_object, target_is_infantry, hostile_shots, hostile_dam handle_exception(_exception); } } + +function damage_infantry(_damage_data, _shots, _damage) { + // Find valid infantry targets + var valid_marines = []; + for (var m = 0, l = array_length(unit_struct); m < l; m++) { + var unit = unit_struct[m]; + if (is_struct(unit) && unit.hp() > 0 && marine_dead[m] == 0) { + array_push(valid_marines, m); + } + } + + // Apply damage for each shot + for (var shot = 0; shot < _shots; shot++) { + if (array_length(valid_marines) == 0) { + break; // No valid targets left + } + + _damage_data.hits++; + + // Select a random marine from the valid list + var marine_index = array_random_element(valid_marines); + var marine = unit_struct[marine_index]; + _damage_data.unit_type = marine.role(); + + // Apply damage + var _shot_luck = roll_dice_chapter(1, 100, "low"); + var _modified_damage = 0; + if (_shot_luck <= 5) { + _modified_damage = _damage - (2 * marine_ac[marine_index]); + } else if (_shot_luck > 95) { + _modified_damage = _damage; + } else { + _modified_damage = _damage - marine_ac[marine_index]; + } + + if (_modified_damage > 0) { + var damage_resistance = marine.damage_resistance() / 100; + if (marine_mshield[marine_index] > 0) { + damage_resistance += 0.1; + } + if (marine_fiery[marine_index] > 0) { + damage_resistance += 0.15; + } + if (marine_fshield[marine_index] > 0) { + damage_resistance += 0.08; + } + if (marine_quick[marine_index] > 0) { + damage_resistance += 0.2; + } // TODO: only if melee + if (marine_dome[marine_index] > 0) { + damage_resistance += 0.15; + } + if (marine_iron[marine_index] > 0) { + if (damage_resistance <= 0) { + marine.add_or_sub_health(20); + } else { + damage_resistance += marine_iron[marine_index] / 5; + } + } + _modified_damage = round(_modified_damage * (1 - damage_resistance)); + } + if (_modified_damage < 0 && hostile_weapon == "Fleshborer") { + _modified_damage = 1.5; + } + /* if (hostile_weapon == "Web Spinner") { + var webr = floor(random(100)) + 1; + var chunk = max(10, 62 - (marine_ac[marine_index] * 2)); + _modified_damage = (webr <= chunk) ? 5000 : 0; + } */ + marine.add_or_sub_health(-_modified_damage); + + // Check if marine is dead + if (check_dead_marines(marine, marine_index)) { + // Remove dead infantry from further hits + array_delete_value(valid_marines, marine_index); + _damage_data.units_lost++; + } + } + + return; +} + +function damage_vehicles(_damage_data, _shots, _damage) { + var veh_index = -1; + + // Find valid vehicle targets + var valid_vehicles = []; + for (var v = 0, l = array_length(veh_hp); v < l; v++) { + if (veh_hp[v] > 0 && veh_dead[v] == 0) { + array_push(valid_vehicles, v); + } + } + + // Apply damage for each hostile shot, until we run out of targets + for (var shot = 0; shot < _shots; shot++) { + if (array_length(valid_vehicles) == 0) { + break; + } + + _damage_data.hits++; + + // Select a random vehicle from the valid list + veh_index = array_random_element(valid_vehicles); + + // Apply damage + var _modified_damage = _damage - veh_ac[veh_index]; + if (_modified_damage < 0) { + _modified_damage = 0.25; + } + if (enemy == 13 && _modified_damage < 1) { + _modified_damage = 1; + } + veh_hp[veh_index] -= _modified_damage; + _damage_data.unit_type = veh_type[veh_index]; + + // Check if the vehicle is destroyed + if (veh_hp[veh_index] <= 0 && veh_dead[veh_index] == 0) { + veh_dead[veh_index] = 1; + _damage_data.units_lost++; + obj_ncombat.player_forces -= 1; + + // Record loss + var existing_index = array_get_index(lost, veh_type[veh_index]); + if (existing_index != -1) { + lost_num[existing_index] += 1; + } else { + array_push(lost, veh_type[veh_index]); + array_push(lost_num, 1); + } + + // Remove dead vehicles from further hits + array_delete_value(valid_vehicles, veh_index); + } + } + + return; +} \ No newline at end of file diff --git a/scripts/scr_flavor2/scr_flavor2.gml b/scripts/scr_flavor2/scr_flavor2.gml index 7ad3ad7b45..9dfae2ac59 100644 --- a/scripts/scr_flavor2/scr_flavor2.gml +++ b/scripts/scr_flavor2/scr_flavor2.gml @@ -345,6 +345,8 @@ function scr_flavor2(lost_units_count, target_type, hostile_range, hostile_weapo } } + lost = []; + lost_num = []; var unce = 0; From 1bd2bc2b9e265bbf90f18952f2d955f9eb675dcd Mon Sep 17 00:00:00 2001 From: EttyKitty <20323032+EttyKitty@users.noreply.github.com> Date: Fri, 30 May 2025 03:23:49 +0300 Subject: [PATCH 063/286] style: Format scr_ui_settings (#847) --- scripts/scr_ui_settings/scr_ui_settings.gml | 1972 ++++++++++--------- 1 file changed, 1037 insertions(+), 935 deletions(-) diff --git a/scripts/scr_ui_settings/scr_ui_settings.gml b/scripts/scr_ui_settings/scr_ui_settings.gml index dd9e47eb25..9eab643628 100644 --- a/scripts/scr_ui_settings/scr_ui_settings.gml +++ b/scripts/scr_ui_settings/scr_ui_settings.gml @@ -1,262 +1,300 @@ +/// @mixin function scr_ui_settings() { + var romanNumerals = scr_roman_numerals(); + // Var declaration + var xx, yy; + var tool1 = "", tool2 = ""; + var che, cx, cy; + var x5 = 0, y5 = 0, x6 = 0; + var too_img = 0; + xx = __view_get(e__VW.XView, 0) + 0; + yy = __view_get(e__VW.YView, 0) + 0; - var romanNumerals=scr_roman_numerals(); - // Var declaration - var xx,yy; - var tool1="",tool2=""; - var che,cx,cy; - var x5=0,y5=0,x6=0; - var too_img=0; - xx=__view_get( e__VW.XView, 0 )+0; - yy=__view_get( e__VW.YView, 0 )+0; - - if (menu>=21) and (menu<=24) then draw_sprite(spr_settings_bg,0,xx,yy); - - if (menu=24) and (formating>0){ - // Reset vars - tool1=""; - tool2=""; - - // Back arrow - draw_sprite_ext(spr_arrow,0,xx+25,yy+70,2,2,0,c_white,1); - - if (scr_hit(xx+25,yy+70,xx+25+64,yy+70+64)=true) and (scr_click_left()){ - with(obj_formation_bar){instance_destroy();} - - menu=21; - if (bat_formation[formating]="") then bat_formation_type[formating]=0; - exit; - } - - draw_set_halign(fa_center); - draw_set_color(c_gray); - draw_set_font(fnt_40k_30b); - - draw_set_alpha(1); - draw_sprite(spr_formation_arrow,0,xx+550,yy+385); - - var bar_wid=0; - draw_set_alpha(0.25); - if (bat_formation[formating]!="") then bar_wid=max(400,string_width(bat_formation[formating])); - if (bat_formation[formating]="") then bar_wid=400; - - if (formating>3) then draw_rectangle(xx+800-(bar_wid/2),yy+66,xx+800+(bar_wid/2),yy+66+string_height("LOL"),1); - obj_cursor.image_index=0; - - if (formating>3) and (obj_cursor.dragging=0){ - if (scr_hit(xx+800-(bar_wid/2),yy+66,xx+800+(bar_wid/2),yy+66+string_height("LOL"))=false) and (scr_click_left()) then text_bar=0; - if (scr_hit(xx+800-(bar_wid/2),yy+66,xx+800+(bar_wid/2),yy+66+string_height("LOL"))=true){ - obj_cursor.image_index=2; - if (scr_click_left()) and (text_bar=0){ - text_bar=1;keyboard_string=bat_formation[formating]; - } - - } - } - draw_set_alpha(1); - if (bat_formation[formating]!="") or (text_bar>0){ - if (formating>3){ - if (text_bar=0) or (text_bar>31) then draw_text(xx+800,yy+66,"''"+string(bat_formation[formating])+"'' "); - if (text_bar>0) and (text_bar<=31) then draw_text(xx+800,yy+66,"''"+string(bat_formation[formating])+"|''"); - } - if (formating<=3) then draw_text(xx+800,yy+66,string(bat_formation[formating])); - } - - draw_set_font(fnt_40k_14);draw_set_halign(fa_left); - - if (bat_formation_type[formating]!=1) then che=1; - if (bat_formation_type[formating]=1) then che=2; - cx=xx+757; - cy=yy+115; - - // Defines the attack command - draw_text(cx,cy,"Attack"); - cx-=35; - cy-=4; - - if (formating<=3) then draw_set_alpha(0.5); - draw_sprite(spr_creation_check,che+1,cx,cy); - draw_set_alpha(1); - // Attack command tool tips - if (scr_hit(cx+31,cy,cx+260,cy+20)=true){ - tool1="Attack"; - tool2="Allows the use of vehicles, and bikes, but prevents this formation from being used during Raids."; - } - if (scr_hit(cx,cy,cx+32,cy+32)=true) and (scr_click_left()) and (formating>3){ - var onceh=0; - - if (onceh=0) and ((bat_formation_type[formating]=0) or (bat_formation_type[formating]=2)){ - onceh=1;bat_formation_type[formating]=1; - scr_ui_formation_bars(); - } - } - if (bat_formation_type[formating]!=2) then che=1; - if (bat_formation_type[formating]=2) then che=2; - - // Defines the Raid action - cx=xx+757; - cy=yy+150; - draw_text(cx,cy,"Raid"); - - cx-=35; - cy-=4; - if (formating<=3) then draw_set_alpha(0.5); - draw_sprite(spr_creation_check,che+1,cx,cy); - draw_set_alpha(1); - // Raid action tooltip - if (scr_hit(cx+31,cy,cx+260,cy+20)=true){ - tool1="Raid"; - tool2="Prevents the use of vehicles, and bikes, but allows this formation to be used for Raids."; - } - if (scr_hit(cx,cy,cx+32,cy+32)=true) and (scr_click_left()) and (formating>3){ - var onceh; - onceh=0; - - if (onceh=0) and ((bat_formation_type[formating]=0) or (bat_formation_type[formating]=1)){ - onceh=1; - bat_formation_type[formating]=2; - scr_ui_formation_bars(); - } - } - - draw_set_color(c_gray); - draw_set_alpha(0.25); - - x5=xx+49; - y5=yy+224; - - for(var i=0; i<10; i++){ - draw_rectangle(x5,y5,x5+38,y5+464,0); - x5+=50; - } - draw_set_alpha(1); - - // Attack Box - if (bat_formation_type[formating]=1){ - draw_rectangle(xx+35,yy+211,xx+1206,yy+703,1); - draw_rectangle(xx+36,yy+212,xx+1205,yy+702,1); - x6=xx+1054; - } - // Raid Box - if (bat_formation_type[formating]=2){ - draw_rectangle(xx+35,yy+211,xx+841,yy+703,1); - draw_rectangle(xx+36,yy+212,xx+840,yy+702,1); - x6=xx+684; - } - - draw_set_alpha(0.25); - // Draw Enemy boxes - draw_set_color(c_red); - y5=yy+224; - for(var i=0; i<3; i++){ - draw_rectangle(x6,y5,x6+38,y5+464,0); - x6+=50; - } - - // Draw Secondary info box - draw_set_alpha(1); - draw_set_color(c_gray); - draw_rectangle(xx+1221,yy+211,xx+1561,yy+703,1); - draw_rectangle(xx+1220,yy+212,xx+1560,yy+702,1); - draw_set_alpha(1); - - draw_set_halign(fa_center); - draw_set_font(fnt_40k_30b); - - // This is where the cursor is changed- needs to be smart and also pass the instance type - tooltip=""; - tooltip_other=""; - - if (collision_point(mouse_x,mouse_y,obj_formation_bar,1,1)) and (obj_cursor.image_index=0) then obj_cursor.image_index=3; - if (!collision_point(mouse_x,mouse_y,obj_formation_bar,1,1)) and (obj_cursor.image_index=3) then obj_cursor.image_index=0; - - if (obj_cursor.image_index=3){ - var theh=instance_position(mouse_x,mouse_y,obj_formation_bar); - if (instance_exists(theh)){ - if (theh.unit_id=1){ - tooltip="Headquarters"; - tooltip2="You and your advisors will be placed within this section. It is strongly advisable you give them backup in this same column."; - } - if (theh.unit_id=2){ - tooltip="Honour Guard"; - tooltip2="Any Honour Guard within your Headquarters will be placed here. The best place for them within the formation depends on loadout."; - } - if (theh.unit_id=3){ - tooltip="Librarians"; - tooltip2="Epistolary, Lexicanum, and Codiciery make up this section. They tend to deal decent damage and offer useful buffs for other units."; - } - if (theh.unit_id=4){ - tooltip="Techmarines"; - tooltip2="Techmarines and their servitors are placed within this block. It is advisable that they are placed near your vehicles and armour."; - } - if (theh.unit_id=5){ - tooltip="Terminators"; - tooltip2="Any Terminators that you may have will be placed here. They can very easily soak lots of damage and dish it back in return."; - } - if (theh.unit_id=6){ - tooltip="Veterans"; - tooltip2="Veterans, the most experienced tacticals of your Chapter, are placed here. Their best position in the formation depends on loadout."; - } - if (theh.unit_id=7){ - tooltip="Tacticals"; - tooltip2="The greater bulk of your Chapter, the tactical marines, go here. Tactical marines may be situated nearly anywhere. Note that Apothecaries and Chaplains without jump-packs will also be placed here."; - } - if (theh.unit_id=8){ - tooltip="Devastators"; - tooltip2="Devastators offer much long ranged firepower. As a result they are best placed in the rear of your formation."; - } - if (theh.unit_id=9){ - tooltip="Assaults"; - tooltip2="Assault marines are damage powerhouses, but tend to be squisher. You may or may not wish for them to be on the front lines. Note that Apothecaries and Chaplains with jump-packs will be placed here."; - } - if (theh.unit_id=10){ - tooltip="Scouts"; - tooltip2="Scouts are not-yet full fledged Astartes. Striking a balance between exposure to the enemy, for experience, and safety is key."; - } - if (theh.unit_id=11){ - tooltip="Dreadnoughts"; - tooltip2="Dreadnoughts are the most durable and tough marines within your chapter. They are best suited for the front lines."; - } - if (theh.unit_id=12){ - tooltip="Hirelings"; - tooltip2="Any and all units that you recieve from other factions are placed within this block."; - } - if (theh.unit_id=13){ - tooltip="Rhinos"; - tooltip2="Rhinos offer protection for units behind them but are not well armoured and lacking in firepower."; - } - if (theh.unit_id=14){ - tooltip="Predators"; - tooltip2="Predators offer protection for units behind them and have a decent amount of long ranged firepower."; - } - if (theh.unit_id=15){ - tooltip="Land Raiders"; - tooltip2="Land Raiders are incredibly tanky war machines that protect rear columns and offer tremendous amounts of firepower. Other super-heavy vehicles will also be placed here."; - } - if (theh.unit_id=16){ - tooltip="Land Speeders"; - tooltip2="Land Speeders are incredibly agile attack vehicles that offer a light highly mobile heavy weapon platform."; - } - if (theh.unit_id=17){ - tooltip="Whirlwinds"; - tooltip2="Whirlwinds are armoured fire-support capable of supporting assaults from a long range safe from enemy retaliation."; - } - too_img=theh.unit_id-1; - } - } - - if (tooltip!=""){ - draw_set_font(fnt_40k_30b); - draw_text_transformed(xx+1398,yy+213,string(tooltip),0.75,0.75,0); - draw_set_font(fnt_40k_14);draw_set_halign(fa_left); - draw_text_ext(xx+1227,yy+565,string(tooltip2),-1,323); - - // draw_sprite(spr_formation_splash,too_img,xx+1271,yy+252); - scr_image("formation",too_img,xx+1271,yy+252,239,297); - } - - - /* + if ((menu >= 21) && (menu <= 24)) { + draw_sprite(spr_settings_bg, 0, xx, yy); + } + + if ((menu == 24) && (formating > 0)) { + // Reset vars + tool1 = ""; + tool2 = ""; + + // Back arrow + draw_sprite_ext(spr_arrow, 0, xx + 25, yy + 70, 2, 2, 0, c_white, 1); + + if ((scr_hit(xx + 25, yy + 70, xx + 25 + 64, yy + 70 + 64) == true) && scr_click_left()) { + with (obj_formation_bar) { + instance_destroy(); + } + + menu = 21; + if (bat_formation[formating] == "") { + bat_formation_type[formating] = 0; + } + exit; + } + + draw_set_halign(fa_center); + draw_set_color(c_gray); + draw_set_font(fnt_40k_30b); + + draw_set_alpha(1); + draw_sprite(spr_formation_arrow, 0, xx + 550, yy + 385); + + var bar_wid = 0; + draw_set_alpha(0.25); + if (bat_formation[formating] != "") { + bar_wid = max(400, string_width(bat_formation[formating])); + } + if (bat_formation[formating] == "") { + bar_wid = 400; + } + + if (formating > 3) { + draw_rectangle(xx + 800 - (bar_wid / 2), yy + 66, xx + 800 + (bar_wid / 2), yy + 66 + string_height("LOL"), 1); + } + obj_cursor.image_index = 0; + + if ((formating > 3) && (obj_cursor.dragging == 0)) { + if ((scr_hit(xx + 800 - (bar_wid / 2), yy + 66, xx + 800 + (bar_wid / 2), yy + 66 + string_height("LOL")) == false) && scr_click_left()) { + text_bar = 0; + } + if (scr_hit(xx + 800 - (bar_wid / 2), yy + 66, xx + 800 + (bar_wid / 2), yy + 66 + string_height("LOL")) == true) { + obj_cursor.image_index = 2; + if (scr_click_left() && (text_bar == 0)) { + text_bar = 1; + keyboard_string = bat_formation[formating]; + } + } + } + draw_set_alpha(1); + if ((bat_formation[formating] != "") || (text_bar > 0)) { + if (formating > 3) { + if ((text_bar == 0) || (text_bar > 31)) { + draw_text(xx + 800, yy + 66, "''" + string(bat_formation[formating]) + "'' "); + } + if ((text_bar > 0) && (text_bar <= 31)) { + draw_text(xx + 800, yy + 66, "''" + string(bat_formation[formating]) + "|''"); + } + } + if (formating <= 3) { + draw_text(xx + 800, yy + 66, string(bat_formation[formating])); + } + } + + draw_set_font(fnt_40k_14); + draw_set_halign(fa_left); + + if (bat_formation_type[formating] != 1) { + che = 1; + } + if (bat_formation_type[formating] == 1) { + che = 2; + } + cx = xx + 757; + cy = yy + 115; + + // Defines the attack command + draw_text(cx, cy, "Attack"); + cx -= 35; + cy -= 4; + + if (formating <= 3) { + draw_set_alpha(0.5); + } + draw_sprite(spr_creation_check, che + 1, cx, cy); + draw_set_alpha(1); + // Attack command tool tips + if (scr_hit(cx + 31, cy, cx + 260, cy + 20) == true) { + tool1 = "Attack"; + tool2 = "Allows the use of vehicles, and bikes, but prevents this formation from being used during Raids."; + } + if ((scr_hit(cx, cy, cx + 32, cy + 32) == true) && scr_click_left() && (formating > 3)) { + var onceh = 0; + + if ((onceh == 0) && ((bat_formation_type[formating] == 0) || (bat_formation_type[formating] == 2))) { + onceh = 1; + bat_formation_type[formating] = 1; + scr_ui_formation_bars(); + } + } + if (bat_formation_type[formating] != 2) { + che = 1; + } + if (bat_formation_type[formating] == 2) { + che = 2; + } + + // Defines the Raid action + cx = xx + 757; + cy = yy + 150; + draw_text(cx, cy, "Raid"); + + cx -= 35; + cy -= 4; + if (formating <= 3) { + draw_set_alpha(0.5); + } + draw_sprite(spr_creation_check, che + 1, cx, cy); + draw_set_alpha(1); + // Raid action tooltip + if (scr_hit(cx + 31, cy, cx + 260, cy + 20) == true) { + tool1 = "Raid"; + tool2 = "Prevents the use of vehicles, and bikes, but allows this formation to be used for Raids."; + } + if ((scr_hit(cx, cy, cx + 32, cy + 32) == true) && scr_click_left() && (formating > 3)) { + var onceh; + onceh = 0; + + if ((onceh == 0) && ((bat_formation_type[formating] == 0) || (bat_formation_type[formating] == 1))) { + onceh = 1; + bat_formation_type[formating] = 2; + scr_ui_formation_bars(); + } + } + + draw_set_color(c_gray); + draw_set_alpha(0.25); + + x5 = xx + 49; + y5 = yy + 224; + + for (var i = 0; i < 10; i++) { + draw_rectangle(x5, y5, x5 + 38, y5 + 464, 0); + x5 += 50; + } + draw_set_alpha(1); + + // Attack Box + if (bat_formation_type[formating] == 1) { + draw_rectangle(xx + 35, yy + 211, xx + 1206, yy + 703, 1); + draw_rectangle(xx + 36, yy + 212, xx + 1205, yy + 702, 1); + x6 = xx + 1054; + } + // Raid Box + if (bat_formation_type[formating] == 2) { + draw_rectangle(xx + 35, yy + 211, xx + 841, yy + 703, 1); + draw_rectangle(xx + 36, yy + 212, xx + 840, yy + 702, 1); + x6 = xx + 684; + } + + draw_set_alpha(0.25); + // Draw Enemy boxes + draw_set_color(c_red); + y5 = yy + 224; + for (var i = 0; i < 3; i++) { + draw_rectangle(x6, y5, x6 + 38, y5 + 464, 0); + x6 += 50; + } + + // Draw Secondary info box + draw_set_alpha(1); + draw_set_color(c_gray); + draw_rectangle(xx + 1221, yy + 211, xx + 1561, yy + 703, 1); + draw_rectangle(xx + 1220, yy + 212, xx + 1560, yy + 702, 1); + draw_set_alpha(1); + + draw_set_halign(fa_center); + draw_set_font(fnt_40k_30b); + + // This is where the cursor is changed- needs to be smart and also pass the instance type + tooltip = ""; + tooltip_other = ""; + + if (collision_point(mouse_x, mouse_y, obj_formation_bar, 1, 1) && (obj_cursor.image_index == 0)) { + obj_cursor.image_index = 3; + } + if ((!collision_point(mouse_x, mouse_y, obj_formation_bar, 1, 1)) && (obj_cursor.image_index == 3)) { + obj_cursor.image_index = 0; + } + + if (obj_cursor.image_index == 3) { + var theh = instance_position(mouse_x, mouse_y, obj_formation_bar); + if (instance_exists(theh)) { + if (theh.unit_id == 1) { + tooltip = "Headquarters"; + tooltip2 = "You and your advisors will be placed within this section. It is strongly advisable you give them backup in this same column."; + } + if (theh.unit_id == 2) { + tooltip = "Honour Guard"; + tooltip2 = "Any Honour Guard within your Headquarters will be placed here. The best place for them within the formation depends on loadout."; + } + if (theh.unit_id == 3) { + tooltip = "Librarians"; + tooltip2 = "Epistolary, Lexicanum, and Codiciery make up this section. They tend to deal decent damage and offer useful buffs for other units."; + } + if (theh.unit_id == 4) { + tooltip = "Techmarines"; + tooltip2 = "Techmarines and their servitors are placed within this block. It is advisable that they are placed near your vehicles and armour."; + } + if (theh.unit_id == 5) { + tooltip = "Terminators"; + tooltip2 = "Any Terminators that you may have will be placed here. They can very easily soak lots of damage and dish it back in return."; + } + if (theh.unit_id == 6) { + tooltip = "Veterans"; + tooltip2 = "Veterans, the most experienced tacticals of your Chapter, are placed here. Their best position in the formation depends on loadout."; + } + if (theh.unit_id == 7) { + tooltip = "Tacticals"; + tooltip2 = "The greater bulk of your Chapter, the tactical marines, go here. Tactical marines may be situated nearly anywhere. Note that Apothecaries and Chaplains without jump-packs will also be placed here."; + } + if (theh.unit_id == 8) { + tooltip = "Devastators"; + tooltip2 = "Devastators offer much long ranged firepower. As a result they are best placed in the rear of your formation."; + } + if (theh.unit_id == 9) { + tooltip = "Assaults"; + tooltip2 = "Assault marines are damage powerhouses, but tend to be squisher. You may or may not wish for them to be on the front lines. Note that Apothecaries and Chaplains with jump-packs will be placed here."; + } + if (theh.unit_id == 10) { + tooltip = "Scouts"; + tooltip2 = "Scouts are not-yet full fledged Astartes. Striking a balance between exposure to the enemy, for experience, and safety is key."; + } + if (theh.unit_id == 11) { + tooltip = "Dreadnoughts"; + tooltip2 = "Dreadnoughts are the most durable and tough marines within your chapter. They are best suited for the front lines."; + } + if (theh.unit_id == 12) { + tooltip = "Hirelings"; + tooltip2 = "Any and all units that you recieve from other factions are placed within this block."; + } + if (theh.unit_id == 13) { + tooltip = "Rhinos"; + tooltip2 = "Rhinos offer protection for units behind them but are not well armoured and lacking in firepower."; + } + if (theh.unit_id == 14) { + tooltip = "Predators"; + tooltip2 = "Predators offer protection for units behind them and have a decent amount of long ranged firepower."; + } + if (theh.unit_id == 15) { + tooltip = "Land Raiders"; + tooltip2 = "Land Raiders are incredibly tanky war machines that protect rear columns and offer tremendous amounts of firepower. Other super-heavy vehicles will also be placed here."; + } + if (theh.unit_id == 16) { + tooltip = "Land Speeders"; + tooltip2 = "Land Speeders are incredibly agile attack vehicles that offer a light highly mobile heavy weapon platform."; + } + if (theh.unit_id == 17) { + tooltip = "Whirlwinds"; + tooltip2 = "Whirlwinds are armoured fire-support capable of supporting assaults from a long range safe from enemy retaliation."; + } + too_img = theh.unit_id - 1; + } + } + + if (tooltip != "") { + draw_set_font(fnt_40k_30b); + draw_text_transformed(xx + 1398, yy + 213, string(tooltip), 0.75, 0.75, 0); + draw_set_font(fnt_40k_14); + draw_set_halign(fa_left); + draw_text_ext(xx + 1227, yy + 565, string(tooltip2), -1, 323); + + // draw_sprite(spr_formation_splash,too_img,xx+1271,yy+252); + scr_image("formation", too_img, xx + 1271, yy + 252, 239, 297); + } + + /* if (tool1!=""){ draw_set_alpha(1); draw_set_font(fnt_40k_14);draw_set_halign(fa_left);draw_set_color(0); @@ -266,701 +304,765 @@ function scr_ui_settings() { draw_set_font(fnt_40k_14b);draw_text(mouse_x+22,mouse_y+22,string(tool1)); draw_set_font(fnt_40k_14);draw_text_ext(mouse_x+22,mouse_y+42,string(tool2),-1,500); }*/ - } - - if (menu=23){ - if (settings>0){ - var co=100; - var ide; - ide=settings; - - draw_sprite_ext(spr_arrow,0,xx+25,yy+70,2,2,0,c_white,1);// Back - if (scr_hit(xx+25,yy+70,xx+25+64,yy+70+64)=true) and (scr_click_left()){ - - with(obj_mass_equip){instance_destroy();} - menu=21;exit; - } - - draw_set_halign(fa_center); - draw_set_color(c_gray); - draw_set_font(fnt_40k_30b); - draw_text_transformed(xx+800,yy+66,string(obj_ini.role[100,settings])+" Settings",1,1,0); - - // New: 678,160 - // Old: 444,550 - // Dif: 234,-390 - - draw_set_font(fnt_40k_30b); - draw_set_color(c_gray); - draw_set_halign(fa_left); - draw_text_transformed(xx+678,yy+160,obj_ini.role[co,ide],0.6,0.6,0); - var wid,hei; - wid=0; - hei=string_height_ext(string(obj_ini.role[co,ide])+"Q",-1,580)*0.6; - draw_rectangle(xx+678-1,yy+160-1,xx+1056,yy+160+hei,1); - draw_set_color(c_gray); - draw_set_font(fnt_40k_14b); - draw_set_halign(fa_right); - + } + + if (menu == 23) { + if (settings > 0) { + var co = 100; + var ide; + ide = settings; + + draw_sprite_ext(spr_arrow, 0, xx + 25, yy + 70, 2, 2, 0, c_white, 1); // Back + if ((scr_hit(xx + 25, yy + 70, xx + 25 + 64, yy + 70 + 64) == true) && scr_click_left()) { + with (obj_mass_equip) { + instance_destroy(); + } + menu = 21; + exit; + } + + draw_set_halign(fa_center); + draw_set_color(c_gray); + draw_set_font(fnt_40k_30b); + draw_text_transformed(xx + 800, yy + 66, string(obj_ini.role[100, settings]) + " Settings", 1, 1, 0); + + // New: 678,160 + // Old: 444,550 + // Dif: 234,-390 + + draw_set_font(fnt_40k_30b); + draw_set_color(c_gray); + draw_set_halign(fa_left); + draw_text_transformed(xx + 678, yy + 160, obj_ini.role[co, ide], 0.6, 0.6, 0); + var wid, hei; + wid = 0; + hei = string_height_ext(string(obj_ini.role[co, ide]) + "Q", -1, 580) * 0.6; + draw_rectangle(xx + 678 - 1, yy + 160 - 1, xx + 1056, yy + 160 + hei, 1); + draw_set_color(c_gray); + draw_set_font(fnt_40k_14b); + draw_set_halign(fa_right); + var title = ""; var geh = ""; - spacing=22; - x5=xx+830; - y5=yy+207-spacing; - - for (var gg=1; gg<=5; gg++){ - y5+=spacing; - if (gg=1){ - title="Main Weapon: "; - geh=obj_ini.wep1[co,ide]; - } - if (gg=2){ - title="Secondary Weapon: "; - geh=obj_ini.wep2[co,ide]; - } - if (gg=3){ - title="Armour: "; - geh=obj_ini.armour[co,ide]; - } - if (gg=4){ - title="Special Item: "; - geh=obj_ini.gear[co,ide]; - } - if (gg=5){ - title="Mobility Item: "; - geh=obj_ini.mobi[co,ide]; - } - - draw_set_halign(fa_right); - draw_set_color(c_gray); - draw_rectangle(x5,y5,x5-string_width(title),y5+string_height(title)-2,0); - draw_set_color(0);draw_text(x5,y5,string(title)); - - if (scr_hit(x5-string_width(title),y5,x5,y5+string_height(title)-2)=true){ - draw_set_color(c_white); - draw_set_alpha(0.2); - 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") or (obj_ini.armour[co,ide]="Dreadnought")) and (gg=4) then nep=true; - if (ide=6) and ((gg=3) or (gg=5)) then nep=true; - + spacing = 22; + x5 = xx + 830; + y5 = yy + 207 - spacing; + + for (var gg = 1; gg <= 5; gg++) { + y5 += spacing; + if (gg == 1) { + title = "Main Weapon: "; + geh = obj_ini.wep1[co, ide]; + } + if (gg == 2) { + title = "Secondary Weapon: "; + geh = obj_ini.wep2[co, ide]; + } + if (gg == 3) { + title = "Armour: "; + geh = obj_ini.armour[co, ide]; + } + if (gg == 4) { + title = "Special Item: "; + geh = obj_ini.gear[co, ide]; + } + if (gg == 5) { + title = "Mobility Item: "; + geh = obj_ini.mobi[co, ide]; + } + + draw_set_halign(fa_right); + draw_set_color(c_gray); + draw_rectangle(x5, y5, x5 - string_width(title), y5 + string_height(title) - 2, 0); + draw_set_color(0); + draw_text(x5, y5, string(title)); + + if (scr_hit(x5 - string_width(title), y5, x5, y5 + string_height(title) - 2) == true) { + draw_set_color(c_white); + draw_set_alpha(0.2); + 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; + } + if ((ide == 6) && ((gg == 3) || (gg == 5))) { + nep = true; + } + if (scr_click_left() && !nep) { - if (obj_mass_equip.tab != 0) { obj_mass_equip.refresh = true; } else if (obj_mass_equip.tab == 0) { obj_mass_equip.tab = gg; obj_mass_equip.item_name = []; - var is_hand_slot = (gg == 1 || gg == 2); + var is_hand_slot = gg == 1 || gg == 2; scr_get_item_names( obj_mass_equip.item_name, obj_controller.settings, // eROLE gg, // slot - is_hand_slot ? ( - obj_mass_equip.tab == 1 ? eENGAGEMENT.Ranged : eENGAGEMENT.Melee - ) : eENGAGEMENT.None, + is_hand_slot ? (obj_mass_equip.tab == 1 ? eENGAGEMENT.Ranged : eENGAGEMENT.Melee) : eENGAGEMENT.None, true, // include company standard false, // show all regardless of inventory + ); } } - } - draw_set_alpha(1); - draw_set_color(c_gray); - draw_set_halign(fa_left); - draw_text(x5+5,y5,string(geh)); - } - } - } - - - if (menu=21){ - // Reset vars - tool1=""; - tool2=""; - draw_set_halign(fa_center); - draw_set_color(c_gray); - draw_set_font(fnt_40k_30b); - draw_text_transformed(xx+800,yy+66,string(global.chapter_name)+" Chapter Settings",1,1,0); - draw_text_transformed(xx+800,yy+110,"(Codex Compliant)",0.6,0.6,0); - draw_set_font(fnt_40k_14); - draw_set_halign(fa_left); - - yy-=64; - - - cx = xx + 31; - cy = yy + 203; - che = progenitor_visuals; - draw_sprite(spr_creation_check, che + 2, cx, cy); - - var _option_name = "Progenitor Livery"; - draw_text(cx + 35, cy, _option_name); - - if (scr_hit(cx, cy, cx + string_width(_option_name) + 35, cy + sprite_get_height(spr_creation_check))) { - tool1 = _option_name; - tool2 = "Turned off by default. \nWhen turned on, various unit visuals may change depending on your progenitor chapter."; - if ((scr_click_left())) { - progenitor_visuals = !progenitor_visuals; - - } - } - - - draw_text(xx+66,yy+238,"Allow Astartes Transfer"); - che=command_set[1]; - cx=xx+31; - cy=yy+234; - - draw_sprite(spr_creation_check,che+2,cx,cy); - if (scr_hit(cx+31,cy,cx+260,cy+20)=true){ - tool1="Allow Astartes Transfer"; - tool2="Turned off by default. Allows you to transfer Astartes in the same way as vehicles."; - } - if (scr_hit(cx,cy,cx+32,cy+32)=true) and (scr_click_left()){ - var onceh; - onceh=0; - if (onceh=0) and (command_set[1]=0){ - onceh=1; - command_set[1]=1; - } - if (onceh=0) and (command_set[1]=1){ - onceh=1; - command_set[1]=0; - } - } - - draw_text(xx+66,yy+273,"Codex Compliant Organization"); - che=command_set[2]; - cx=xx+31; - cy=yy+269; - - draw_sprite(spr_creation_check,che+2,cx,cy); - if (scr_hit(cx+31,cy,cx+300,cy+20)=true){ - tool1="Codex Compliant Organization"; - tool2="When enabled, marine promotions are limited based on their current company and EXP, overall following the Codex Astartes promotion sequence." + "\n\n" + "When disabled, you can promote marines to any company, from any company, disregarding any EXP requirements." + "\n" + "Terminators, Dreadnoughts and Company Command roles retain EXP requirements however."; - } - if (scr_hit(cx,cy,cx+32,cy+32)=true) and (scr_click_left()){ - var onceh=0; - - if (onceh=0) and (command_set[2]=1){ - onceh=1; - command_set[2]=0; - } - if (onceh=0) and (command_set[2]=0){ - onceh=1; - command_set[2]=1; - } - } - - draw_text(xx+66,yy+308,"Modest Livery"); - che=modest_livery; - cx=xx+31; - cy=yy+304; - - draw_sprite(spr_creation_check,che+2,cx,cy); - if (scr_hit(cx+31,cy,cx+300,cy+20)=true){ - tool1="Modest Livery"; - tool2="Turned off by default. Prevents Advantages and Disadvantages from changing the appearances of your marines, effectively disabling any special ornamentation or possible battle wear."; - } - if (scr_hit(cx,cy,cx+32,cy+32)=true) and (scr_click_left()){ - var onceh=0; - - if (onceh=0) and (modest_livery=0){ - onceh=1; - modest_livery=1; - } - if (onceh=0) and (modest_livery=1){ - onceh=1; - modest_livery=0; - } - } - - draw_text(xx+66,yy+343,"Tagged Training"); - che=tagged_training; - cx=xx+31; - cy=yy+339; - - draw_sprite(spr_creation_check,che+2,cx,cy); - if (scr_hit(cx+31,cy,cx+300,cy+20)=true) { - tool1="Tagged training"; - tool2="Turned off by default, makes specialist training select only tagged marines, click on their potential indicators to tag."; - } - if (point_and_click([cx,cy,cx+32,cy+32])) { + } + draw_set_alpha(1); + draw_set_color(c_gray); + draw_set_halign(fa_left); + draw_text(x5 + 5, y5, string(geh)); + } + } + } + + if (menu == 21) { + // Reset vars + tool1 = ""; + tool2 = ""; + draw_set_halign(fa_center); + draw_set_color(c_gray); + draw_set_font(fnt_40k_30b); + draw_text_transformed(xx + 800, yy + 66, string(global.chapter_name) + " Chapter Settings", 1, 1, 0); + draw_text_transformed(xx + 800, yy + 110, "(Codex Compliant)", 0.6, 0.6, 0); + draw_set_font(fnt_40k_14); + draw_set_halign(fa_left); + + yy -= 64; + + cx = xx + 31; + cy = yy + 203; + che = progenitor_visuals; + draw_sprite(spr_creation_check, che + 2, cx, cy); + + var _option_name = "Progenitor Livery"; + draw_text(cx + 35, cy, _option_name); + + if (scr_hit(cx, cy, cx + string_width(_option_name) + 35, cy + sprite_get_height(spr_creation_check))) { + tool1 = _option_name; + tool2 = "Turned off by default. \nWhen turned on, various unit visuals may change depending on your progenitor chapter."; + if (scr_click_left()) { + progenitor_visuals = !progenitor_visuals; + } + } + + draw_text(xx + 66, yy + 238, "Allow Astartes Transfer"); + che = command_set[1]; + cx = xx + 31; + cy = yy + 234; + + draw_sprite(spr_creation_check, che + 2, cx, cy); + if (scr_hit(cx + 31, cy, cx + 260, cy + 20) == true) { + tool1 = "Allow Astartes Transfer"; + tool2 = "Turned off by default. Allows you to transfer Astartes in the same way as vehicles."; + } + if ((scr_hit(cx, cy, cx + 32, cy + 32) == true) && scr_click_left()) { + var onceh; + onceh = 0; + if ((onceh == 0) && (command_set[1] == 0)) { + onceh = 1; + command_set[1] = 1; + } + if ((onceh == 0) && (command_set[1] == 1)) { + onceh = 1; + command_set[1] = 0; + } + } + + draw_text(xx + 66, yy + 273, "Codex Compliant Organization"); + che = command_set[2]; + cx = xx + 31; + cy = yy + 269; + + draw_sprite(spr_creation_check, che + 2, cx, cy); + if (scr_hit(cx + 31, cy, cx + 300, cy + 20) == true) { + tool1 = "Codex Compliant Organization"; + tool2 = "When enabled, marine promotions are limited based on their current company and EXP, overall following the Codex Astartes promotion sequence." + "\n\n" + "When disabled, you can promote marines to any company, from any company, disregarding any EXP requirements." + "\n" + "Terminators, Dreadnoughts and Company Command roles retain EXP requirements however."; + } + if ((scr_hit(cx, cy, cx + 32, cy + 32) == true) && scr_click_left()) { + var onceh = 0; + + if ((onceh == 0) && (command_set[2] == 1)) { + onceh = 1; + command_set[2] = 0; + } + if ((onceh == 0) && (command_set[2] == 0)) { + onceh = 1; + command_set[2] = 1; + } + } + + draw_text(xx + 66, yy + 308, "Modest Livery"); + che = modest_livery; + cx = xx + 31; + cy = yy + 304; + + draw_sprite(spr_creation_check, che + 2, cx, cy); + if (scr_hit(cx + 31, cy, cx + 300, cy + 20) == true) { + tool1 = "Modest Livery"; + tool2 = "Turned off by default. Prevents Advantages and Disadvantages from changing the appearances of your marines, effectively disabling any special ornamentation or possible battle wear."; + } + if ((scr_hit(cx, cy, cx + 32, cy + 32) == true) && scr_click_left()) { + var onceh = 0; + + if ((onceh == 0) && (modest_livery == 0)) { + onceh = 1; + modest_livery = 1; + } + if ((onceh == 0) && (modest_livery == 1)) { + onceh = 1; + modest_livery = 0; + } + } + + draw_text(xx + 66, yy + 343, "Tagged Training"); + che = tagged_training; + cx = xx + 31; + cy = yy + 339; + + draw_sprite(spr_creation_check, che + 2, cx, cy); + if (scr_hit(cx + 31, cy, cx + 300, cy + 20) == true) { + tool1 = "Tagged training"; + tool2 = "Turned off by default, makes specialist training select only tagged marines, click on their potential indicators to tag."; + } + if (point_and_click([cx, cy, cx + 32, cy + 32])) { tagged_training = !tagged_training; } - - yy+=35; - - draw_text(xx+28,yy+332,"Company Command Structure"); - - if (scr_hit(xx+28,yy+332,xx+316,yy+352)=true){ - tool1="Comany Command Structure"; - tool2="The default members of your Company Command."; - } - - draw_text(xx+66,yy+359,"Captain"); - draw_text(xx+66,yy+386,"Standard Bearer"); - draw_text(xx+66,yy+413,"Champion"); - draw_text(xx+66,yy+440,"Chaplain"); - draw_text(xx+66,yy+467,"Apothecary"); - draw_text(xx+66,yy+494,"Librarian"); - draw_text(xx+66,yy+521,"Techmarine"); - - che=command_set[3]; - cx=xx+31; - cy=yy+355; - - draw_sprite(spr_creation_check,che+2,cx,cy); - if (scr_hit(cx,cy,cx+32,cy+32)=true) and (scr_click_left()){ - var onceh=0; - - if (onceh=0) and (command_set[3]=0){ - onceh=1; - command_set[3]=1; - } - if (onceh=0) and (command_set[3]=1){ - onceh=1; - command_set[3]=0; - } - } - - che=command_set[4]; - cx=xx+31; - cy=yy+382; - draw_sprite(spr_creation_check,che+2,cx,cy); - - if (scr_hit(cx,cy,cx+32,cy+32)=true) and (scr_click_left()){ - var onceh=0; - - if (onceh=0) and (command_set[4]=0){ - onceh=1; - command_set[4]=1; - } - if (onceh=0) and (command_set[4]=1){ - onceh=1; - command_set[4]=0; - } - } - - che=command_set[5]; - cx=xx+31; - cy=yy+409; - draw_sprite(spr_creation_check,che+2,cx,cy); - - if (scr_hit(cx,cy,cx+32,cy+32)=true) and (scr_click_left()){ - var onceh=0; - - if (onceh=0) and (command_set[5]=0){ - onceh=1; - command_set[5]=1; - } - if (onceh=0) and (command_set[5]=1){ - onceh=1; - command_set[5]=0; - } - } - - che=command_set[6]; - cx=xx+31; - cy=yy+436; - draw_sprite(spr_creation_check,che+2,cx,cy); - - if (scr_hit(cx,cy,cx+32,cy+32)=true) and (scr_click_left()){ - var onceh=0; - - if (onceh=0) and (command_set[6]=0){ - onceh=1; - command_set[6]=1; - } - if (onceh=0) and (command_set[6]=1){ - onceh=1; - command_set[6]=0; - } - } - - che=command_set[7]; - cx=xx+31; - cy=yy+463; - draw_sprite(spr_creation_check,che+2,cx,cy); - - if (scr_hit(cx,cy,cx+32,cy+32)=true) and (scr_click_left()){ - var onceh=0; - - if (onceh=0) and (command_set[7]=0){ - onceh=1; - command_set[7]=1; - } - if (onceh=0) and (command_set[7]=1){ - onceh=1; - command_set[7]=0; - } - } - - che=command_set[8]; - cx=xx+31; - cy=yy+490; - draw_sprite(spr_creation_check,che+2,cx,cy); - - if (scr_hit(cx,cy,cx+32,cy+32)=true) and (scr_click_left()){ - var onceh=0; - - if (onceh=0) and (command_set[8]=0){ - onceh=1; - command_set[8]=1; - } - if (onceh=0) and (command_set[8]=1){ - onceh=1; - command_set[8]=0; - } - } - - che=command_set[9]; - cx=xx+31; - cy=yy+517; - draw_sprite(spr_creation_check,che+2,cx,cy); - - if (scr_hit(cx,cy,cx+32,cy+32)=true) and (scr_click_left()){ - var onceh=0; - - if (onceh=0) and (command_set[9]=0){ - onceh=1; - command_set[9]=1; - } - if (onceh=0) and (command_set[9]=1){ - onceh=1; - command_set[9]=0; - } - } - - yy-=35; - - draw_text(xx+28,yy+611,"Boarding Objective"); - if (scr_hit(xx+28,yy+611,xx+316,yy+611+20)=true){ - tool1="Boarding Objective"; - tool2="The objective of your Astartes once they board an enemy ship."; - } - - draw_text(xx+66,yy+611+27,"Damage Systems"); - draw_text(xx+86,yy+611+54,"Use Plasma Bombs"); - draw_text(xx+66,yy+611+81,"Commandeer Ship"); - - che=command_set[20]; - cx=xx+31; - cy=yy+611+23;draw_sprite(spr_creation_check,che+2,cx,cy); - - if (scr_hit(cx+31,cy,cx+260,cy+20)=true){ - tool1="Damage Systems"; - tool2="Your Astartes will attempt to disable the ship by attacking the ship bridge and systems."; - } - if (scr_hit(cx,cy,cx+32,cy+32)=true) and (scr_click_left()){ - var onceh=0; - - if (onceh=0) and (command_set[20]=0){ - onceh=1; - command_set[20]=1; - command_set[22]=0; - } - } - - che=command_set[21]; - cx=xx+51; - cy=yy+611+50; - draw_sprite(spr_creation_check,che+2,cx,cy); - - if (scr_hit(cx+31,cy,cx+260,cy+20)=true){ - tool1="Use Plasma Bombs"; - tool2="Your Astartes will use equipped Plasma Bombs to massively damage the boarded ship."; - } - if (scr_hit(cx,cy,cx+32,cy+32)=true) and (scr_click_left()){ - var onceh=0; - - if (onceh=0) and (command_set[21]=0) and (command_set[22]=0){ - onceh=1; - command_set[21]=1; - } - if (onceh=0) and (command_set[21]=1){ - onceh=1; - command_set[21]=0; - } - } - - draw_set_alpha(0.5); - che=command_set[22]; - cx=xx+31; - cy=yy+611+77; - draw_sprite(spr_creation_check,che+2,cx,cy); - - if (scr_hit(cx+31,cy,cx+260,cy+20)=true){ - tool1="Commandeer Ship"; - tool2="Your Astartes will attempt to commandeer the vessel, to be permenantely used or salvaged."; - } - if (scr_hit(cx,cy,cx+32,cy+32)=true) and (scr_click_left()){ - var onceh=0; - - if (onceh=0) and (command_set[22]=0){ - onceh=1; - command_set[22]=1; - command_set[20]=0; - command_set[21]=0; - } - } - draw_set_alpha(1); - - // 59 lower - - if (command_set[22]=1) then draw_set_alpha(0.5); - draw_text(xx+28,yy+747,"Post-Boarding"); - if (scr_hit(xx+28,yy+747,xx+316-150,yy+767)=true){ - tool1="Post-Boarding"; - tool2="What your Boarders will do after achieving their objective. This is disabled if your objective is to Commandeer the enemy ships."; - } - - draw_text(xx+66,yy+747+27,"Board Next Nearest"); - draw_text(xx+86,yy+747+54,"Return and Recuperate"); - - che=command_set[23]; - if (command_set[22]=1) then che=0; - cx=xx+31; - cy=yy+747+23; - draw_sprite(spr_creation_check,che+2,cx,cy); - if (scr_hit(cx+31,cy,cx+260-70,cy+20)=true){ - tool1="Board Next Nearest"; - tool2="After disabling an enemy vessel your Astartes will launch a new boarding mission at the nearest enemy."; - } - if (scr_hit(cx,cy,cx+32,cy+32)=true) and (scr_click_left()){ - var onceh=0; - - if (onceh=0) and (command_set[23]=0) and (command_set[22]=0){ - onceh=1; - command_set[23]=1; - command_set[24]=0; - } - } - - che=command_set[24]; - if (command_set[22]=1) then che=0; - cx=xx+51; - cy=yy+747+50; - draw_sprite(spr_creation_check,che+2,cx,cy); - if (scr_hit(cx+31,cy,cx+260-70,cy+20)=true){ - tool1="Return and Recuperate"; - tool2="After disabling an enemy vessel your Astartes will return to their mother vessel and heal."; - } - if (scr_hit(cx,cy,cx+32,cy+32)=true) and (scr_click_left()){ - var onceh=0; - - if (onceh=0) and (command_set[24]=0) and (command_set[22]=0){ - onceh=1; - command_set[24]=1;command_set[23]=0; - } - } - draw_set_alpha(1); - - - xx+=260; - draw_text(xx+28,yy+747,"Automatic Boarding"); - if (scr_hit(xx+28,yy+747,xx+316,yy+767)=true){ - tool1="Automatic Boarding"; - tool2="If checked your ships will launch Boarding teams automatically when an eligible target is in range."; - } - - draw_text(xx+66,yy+747+27,"Battleships"); - draw_text(xx+86,yy+747+54,"Cruisers"); - - che=command_set[25]; - cx=xx+31; - cy=yy+747+23; - - draw_sprite(spr_creation_check,che+2,cx,cy); - if (scr_hit(cx,cy,cx+32,cy+32)=true) and (scr_click_left()){ - var onceh=0; - - if (onceh=0) and (command_set[25]=0){ - onceh=1; - command_set[25]=1; - } - if (onceh=0) and (command_set[25]=1){ - onceh=1; - command_set[25]=0; - } - } - - che=command_set[26]; - cx=xx+51; - cy=yy+747+50; - draw_sprite(spr_creation_check,che+2,cx,cy); - - if (scr_hit(cx,cy,cx+32,cy+32)=true) and (scr_click_left()){ - var onceh=0; - if (onceh=0) and (command_set[26]=0){ - onceh=1; - command_set[26]=1; - } - if (onceh=0) and (command_set[26]=1){ - onceh=1; - command_set[26]=0; - } - } - xx-=260; - yy+=64; - - draw_text(xx+937-341,yy+207,"Battle Formations"); - draw_text(xx+937,yy+207,"Company Settings"); - draw_text(xx+1278,yy+207,"Astartes Role Settings"); - - // Role Settings - var ide,xxx,yyy; - ide=0; - xxx=xx+1277;yyy=yy+250-31; - - for (var derpaderp=1; derpaderp<=14; derpaderp++){ - if (derpaderp=1) then ide=15; - if (derpaderp=2) then ide=14; - if (derpaderp=3) then ide=17; - if (derpaderp=4) then ide=16; - if (derpaderp=5) then ide=5; - if (derpaderp=6) then ide=7; - if (derpaderp=7) then ide=2; - if (derpaderp=8) then ide=4; - if (derpaderp=9) then ide=3; - if (derpaderp=10) then ide=6; - if (derpaderp=11) then ide=8; - if (derpaderp=12) then ide=9; - if (derpaderp=13) then ide=10; - if (derpaderp=14) then ide=12; - - draw_set_alpha(1); - if (obj_ini.race[100,ide]!=0){// Creates mass_equip here - // if (custom!=eCHAPTER_TYPE.CUSTOM) then draw_set_alpha(0.5); - yyy+=31; - draw_set_color(c_gray); - draw_rectangle(xxx,yyy,xxx+289,yyy+20,0); - draw_set_color(0); - draw_text(xxx,yyy,obj_ini.role[100,ide]); - if (scr_hit(xxx,yyy,xxx+289,yyy+20)=true){/*if (custom==eCHAPTER_TYPE.CUSTOM) then draw_set_alpha(0.2);if (custom!=eCHAPTER_TYPE.CUSTOM) then */ - draw_set_alpha(0.1); - draw_set_color(c_white); - draw_rectangle(xxx,yyy,xxx+289,yyy+20,0); - draw_set_alpha(1); - tool1=string(obj_ini.role[100,ide])+" Settings"; - tool2="Click to open the settings for this unit."; - if (scr_click_left()){ - settings=ide; - menu=23; - with(obj_mass_equip){instance_destroy();} - instance_create(0,0,obj_mass_equip); - } - } - } - } - - xxx=xx+936; - yyy=yy+250-31; - - for (var ides=0; ides<=10; ides++){ - draw_set_alpha(1); - // if (custom!=eCHAPTER_TYPE.CUSTOM) then draw_set_alpha(0.5); - yyy+=31;draw_set_color(c_gray);draw_rectangle(xxx,yyy,xxx+289,yyy+20,0); - draw_set_color(0); - - var shw=""; - if (ides=0) then shw="Headquarters"; - if (ides>0) then shw=romanNumerals[ides - 1] + " Company"; - draw_text(xxx,yyy,string(shw)); - - if (scr_hit(xxx,yyy,xxx+289,yyy+20)=true){/*if (custom==eCHAPTER_TYPE.CUSTOM) then draw_set_alpha(0.2);if (custom!=eCHAPTER_TYPE.CUSTOM) then */ - draw_set_alpha(0.1); - draw_set_color(c_white); - draw_rectangle(xxx,yyy,xxx+289,yyy+20,0); - draw_set_alpha(1); - tool1=string(shw)+" Settings"; - tool2="Click to open the settings for this company."; - // if (mouse_left>=1) and (cooldown<=0){settings=ides;menu=22;} - } - } - - xxx=xx+936-341; - yyy=yy+250-31; - - for(var i=1; i<=11;i++){ - draw_set_alpha(1); - // if (custom!=eCHAPTER_TYPE.CUSTOM) then draw_set_alpha(0.5); - yyy+=31;draw_set_color(c_gray); - - if (bat_formation[i]!="") then draw_rectangle(xxx,yyy,xxx+289,yyy+20,0); - if (i>2){if (bat_formation[i]="") and (bat_formation[i-1]!="") then draw_rectangle(xxx,yyy,xxx+289,yyy+20,0);} - - draw_set_color(0); - - var shw="",isnew=false; - shw=string(bat_formation[i]); - - if (i>3){ - if (bat_formation_type[i]=1) then shw="A] "+string(shw); - if (bat_formation_type[i]=2) then shw="R] "+string(shw); - } - if (i>2){ - if (shw="") and (bat_formation[i-1]!=""){ - isnew=true;shw="(New Formation)"; - } - } - - if (shw!="") or (isnew=true){ - draw_text(xxx,yyy,string(shw)); - if (scr_hit(xxx,yyy,xxx+289,yyy+20)=true){/*if (custom==eCHAPTER_TYPE.CUSTOM) then draw_set_alpha(0.2);if (custom!=eCHAPTER_TYPE.CUSTOM) then */ - draw_set_alpha(0.1); - draw_set_color(c_white); - draw_rectangle(xxx,yyy,xxx+289,yyy+20,0); - draw_set_alpha(1); - - if (i<=3) then tool1=string(shw)+" Settings";tool2="Click to open the settings for this formation."; - if (i>3){ - if (bat_formation[i]!=""){ - tool1=string(bat_formation[i])+" Settings"; - tool2="Click to open the settings for this formation."; - } - if (bat_formation[i]=""){ - tool1="New Custom Formation"; - tool2="Click to open and create a new Battle Formation for Ground combat or Raiding."; - } - } - - if (scr_click_left()){ - formating=i; - menu=24; - - scr_ui_formation_bars(); - if (bat_formation[formating]=""){ - bat_formation[formating]="Custom"+string(formating-3); - bat_formation_type[formating]=1; - bat_deva_for[formating]=1; - bat_assa_for[formating]=4; - bat_tact_for[formating]=2; - bat_vete_for[formating]=2; - bat_hire_for[formating]=3; - bat_libr_for[formating]=3; - bat_comm_for[formating]=3; - bat_tech_for[formating]=3; - bat_term_for[formating]=3; - bat_hono_for[formating]=3; - bat_drea_for[formating]=5; - bat_rhin_for[formating]=6; - bat_pred_for[formating]=7; - bat_landraid_for[formating] = 7; - bat_landspee_for[formating] = 4; - bat_whirl_for[formating] = 1; - bat_scou_for[formating]=1; - } - } - } - } - } - - if (tool1!=""){ - tooltip_draw(tool2,,,,,tool1); - } - } + + yy += 35; + + draw_text(xx + 28, yy + 332, "Company Command Structure"); + + if (scr_hit(xx + 28, yy + 332, xx + 316, yy + 352) == true) { + tool1 = "Comany Command Structure"; + tool2 = "The default members of your Company Command."; + } + + draw_text(xx + 66, yy + 359, "Captain"); + draw_text(xx + 66, yy + 386, "Standard Bearer"); + draw_text(xx + 66, yy + 413, "Champion"); + draw_text(xx + 66, yy + 440, "Chaplain"); + draw_text(xx + 66, yy + 467, "Apothecary"); + draw_text(xx + 66, yy + 494, "Librarian"); + draw_text(xx + 66, yy + 521, "Techmarine"); + + che = command_set[3]; + cx = xx + 31; + cy = yy + 355; + + draw_sprite(spr_creation_check, che + 2, cx, cy); + if ((scr_hit(cx, cy, cx + 32, cy + 32) == true) && scr_click_left()) { + var onceh = 0; + + if ((onceh == 0) && (command_set[3] == 0)) { + onceh = 1; + command_set[3] = 1; + } + if ((onceh == 0) && (command_set[3] == 1)) { + onceh = 1; + command_set[3] = 0; + } + } + + che = command_set[4]; + cx = xx + 31; + cy = yy + 382; + draw_sprite(spr_creation_check, che + 2, cx, cy); + + if ((scr_hit(cx, cy, cx + 32, cy + 32) == true) && scr_click_left()) { + var onceh = 0; + + if ((onceh == 0) && (command_set[4] == 0)) { + onceh = 1; + command_set[4] = 1; + } + if ((onceh == 0) && (command_set[4] == 1)) { + onceh = 1; + command_set[4] = 0; + } + } + + che = command_set[5]; + cx = xx + 31; + cy = yy + 409; + draw_sprite(spr_creation_check, che + 2, cx, cy); + + if ((scr_hit(cx, cy, cx + 32, cy + 32) == true) && scr_click_left()) { + var onceh = 0; + + if ((onceh == 0) && (command_set[5] == 0)) { + onceh = 1; + command_set[5] = 1; + } + if ((onceh == 0) && (command_set[5] == 1)) { + onceh = 1; + command_set[5] = 0; + } + } + + che = command_set[6]; + cx = xx + 31; + cy = yy + 436; + draw_sprite(spr_creation_check, che + 2, cx, cy); + + if ((scr_hit(cx, cy, cx + 32, cy + 32) == true) && scr_click_left()) { + var onceh = 0; + + if ((onceh == 0) && (command_set[6] == 0)) { + onceh = 1; + command_set[6] = 1; + } + if ((onceh == 0) && (command_set[6] == 1)) { + onceh = 1; + command_set[6] = 0; + } + } + + che = command_set[7]; + cx = xx + 31; + cy = yy + 463; + draw_sprite(spr_creation_check, che + 2, cx, cy); + + if ((scr_hit(cx, cy, cx + 32, cy + 32) == true) && scr_click_left()) { + var onceh = 0; + + if ((onceh == 0) && (command_set[7] == 0)) { + onceh = 1; + command_set[7] = 1; + } + if ((onceh == 0) && (command_set[7] == 1)) { + onceh = 1; + command_set[7] = 0; + } + } + + che = command_set[8]; + cx = xx + 31; + cy = yy + 490; + draw_sprite(spr_creation_check, che + 2, cx, cy); + + if ((scr_hit(cx, cy, cx + 32, cy + 32) == true) && scr_click_left()) { + var onceh = 0; + + if ((onceh == 0) && (command_set[8] == 0)) { + onceh = 1; + command_set[8] = 1; + } + if ((onceh == 0) && (command_set[8] == 1)) { + onceh = 1; + command_set[8] = 0; + } + } + + che = command_set[9]; + cx = xx + 31; + cy = yy + 517; + draw_sprite(spr_creation_check, che + 2, cx, cy); + + if ((scr_hit(cx, cy, cx + 32, cy + 32) == true) && scr_click_left()) { + var onceh = 0; + + if ((onceh == 0) && (command_set[9] == 0)) { + onceh = 1; + command_set[9] = 1; + } + if ((onceh == 0) && (command_set[9] == 1)) { + onceh = 1; + command_set[9] = 0; + } + } + + yy -= 35; + + draw_text(xx + 28, yy + 611, "Boarding Objective"); + if (scr_hit(xx + 28, yy + 611, xx + 316, yy + 611 + 20) == true) { + tool1 = "Boarding Objective"; + tool2 = "The objective of your Astartes once they board an enemy ship."; + } + + draw_text(xx + 66, yy + 611 + 27, "Damage Systems"); + draw_text(xx + 86, yy + 611 + 54, "Use Plasma Bombs"); + draw_text(xx + 66, yy + 611 + 81, "Commandeer Ship"); + + che = command_set[20]; + cx = xx + 31; + cy = yy + 611 + 23; + draw_sprite(spr_creation_check, che + 2, cx, cy); + + if (scr_hit(cx + 31, cy, cx + 260, cy + 20) == true) { + tool1 = "Damage Systems"; + tool2 = "Your Astartes will attempt to disable the ship by attacking the ship bridge and systems."; + } + if ((scr_hit(cx, cy, cx + 32, cy + 32) == true) && scr_click_left()) { + var onceh = 0; + + if ((onceh == 0) && (command_set[20] == 0)) { + onceh = 1; + command_set[20] = 1; + command_set[22] = 0; + } + } + + che = command_set[21]; + cx = xx + 51; + cy = yy + 611 + 50; + draw_sprite(spr_creation_check, che + 2, cx, cy); + + if (scr_hit(cx + 31, cy, cx + 260, cy + 20) == true) { + tool1 = "Use Plasma Bombs"; + tool2 = "Your Astartes will use equipped Plasma Bombs to massively damage the boarded ship."; + } + if ((scr_hit(cx, cy, cx + 32, cy + 32) == true) && scr_click_left()) { + var onceh = 0; + + if ((onceh == 0) && (command_set[21] == 0) && (command_set[22] == 0)) { + onceh = 1; + command_set[21] = 1; + } + if ((onceh == 0) && (command_set[21] == 1)) { + onceh = 1; + command_set[21] = 0; + } + } + + draw_set_alpha(0.5); + che = command_set[22]; + cx = xx + 31; + cy = yy + 611 + 77; + draw_sprite(spr_creation_check, che + 2, cx, cy); + + if (scr_hit(cx + 31, cy, cx + 260, cy + 20) == true) { + tool1 = "Commandeer Ship"; + tool2 = "Your Astartes will attempt to commandeer the vessel, to be permenantely used or salvaged."; + } + if ((scr_hit(cx, cy, cx + 32, cy + 32) == true) && scr_click_left()) { + var onceh = 0; + + if ((onceh == 0) && (command_set[22] == 0)) { + onceh = 1; + command_set[22] = 1; + command_set[20] = 0; + command_set[21] = 0; + } + } + draw_set_alpha(1); + + // 59 lower + + if (command_set[22] == 1) { + draw_set_alpha(0.5); + } + draw_text(xx + 28, yy + 747, "Post-Boarding"); + if (scr_hit(xx + 28, yy + 747, xx + 316 - 150, yy + 767) == true) { + tool1 = "Post-Boarding"; + tool2 = "What your Boarders will do after achieving their objective. This is disabled if your objective is to Commandeer the enemy ships."; + } + + draw_text(xx + 66, yy + 747 + 27, "Board Next Nearest"); + draw_text(xx + 86, yy + 747 + 54, "Return and Recuperate"); + + che = command_set[23]; + if (command_set[22] == 1) { + che = 0; + } + cx = xx + 31; + cy = yy + 747 + 23; + draw_sprite(spr_creation_check, che + 2, cx, cy); + if (scr_hit(cx + 31, cy, cx + 260 - 70, cy + 20) == true) { + tool1 = "Board Next Nearest"; + tool2 = "After disabling an enemy vessel your Astartes will launch a new boarding mission at the nearest enemy."; + } + if ((scr_hit(cx, cy, cx + 32, cy + 32) == true) && scr_click_left()) { + var onceh = 0; + + if ((onceh == 0) && (command_set[23] == 0) && (command_set[22] == 0)) { + onceh = 1; + command_set[23] = 1; + command_set[24] = 0; + } + } + + che = command_set[24]; + if (command_set[22] == 1) { + che = 0; + } + cx = xx + 51; + cy = yy + 747 + 50; + draw_sprite(spr_creation_check, che + 2, cx, cy); + if (scr_hit(cx + 31, cy, cx + 260 - 70, cy + 20) == true) { + tool1 = "Return and Recuperate"; + tool2 = "After disabling an enemy vessel your Astartes will return to their mother vessel and heal."; + } + if ((scr_hit(cx, cy, cx + 32, cy + 32) == true) && scr_click_left()) { + var onceh = 0; + + if ((onceh == 0) && (command_set[24] == 0) && (command_set[22] == 0)) { + onceh = 1; + command_set[24] = 1; + command_set[23] = 0; + } + } + draw_set_alpha(1); + + xx += 260; + draw_text(xx + 28, yy + 747, "Automatic Boarding"); + if (scr_hit(xx + 28, yy + 747, xx + 316, yy + 767) == true) { + tool1 = "Automatic Boarding"; + tool2 = "If checked your ships will launch Boarding teams automatically when an eligible target is in range."; + } + + draw_text(xx + 66, yy + 747 + 27, "Battleships"); + draw_text(xx + 86, yy + 747 + 54, "Cruisers"); + + che = command_set[25]; + cx = xx + 31; + cy = yy + 747 + 23; + + draw_sprite(spr_creation_check, che + 2, cx, cy); + if ((scr_hit(cx, cy, cx + 32, cy + 32) == true) && scr_click_left()) { + var onceh = 0; + + if ((onceh == 0) && (command_set[25] == 0)) { + onceh = 1; + command_set[25] = 1; + } + if ((onceh == 0) && (command_set[25] == 1)) { + onceh = 1; + command_set[25] = 0; + } + } + + che = command_set[26]; + cx = xx + 51; + cy = yy + 747 + 50; + draw_sprite(spr_creation_check, che + 2, cx, cy); + + if ((scr_hit(cx, cy, cx + 32, cy + 32) == true) && scr_click_left()) { + var onceh = 0; + if ((onceh == 0) && (command_set[26] == 0)) { + onceh = 1; + command_set[26] = 1; + } + if ((onceh == 0) && (command_set[26] == 1)) { + onceh = 1; + command_set[26] = 0; + } + } + xx -= 260; + yy += 64; + + draw_text(xx + 937 - 341, yy + 207, "Battle Formations"); + draw_text(xx + 937, yy + 207, "Company Settings"); + draw_text(xx + 1278, yy + 207, "Astartes Role Settings"); + + // Role Settings + var ide, xxx, yyy; + ide = 0; + xxx = xx + 1277; + yyy = yy + 250 - 31; + + for (var derpaderp = 1; derpaderp <= 14; derpaderp++) { + if (derpaderp == 1) { + ide = 15; + } + if (derpaderp == 2) { + ide = 14; + } + if (derpaderp == 3) { + ide = 17; + } + if (derpaderp == 4) { + ide = 16; + } + if (derpaderp == 5) { + ide = 5; + } + if (derpaderp == 6) { + ide = 7; + } + if (derpaderp == 7) { + ide = 2; + } + if (derpaderp == 8) { + ide = 4; + } + if (derpaderp == 9) { + ide = 3; + } + if (derpaderp == 10) { + ide = 6; + } + if (derpaderp == 11) { + ide = 8; + } + if (derpaderp == 12) { + ide = 9; + } + if (derpaderp == 13) { + ide = 10; + } + if (derpaderp == 14) { + ide = 12; + } + + draw_set_alpha(1); + if (obj_ini.race[100, ide] != 0) { + // Creates mass_equip here + // if (custom!=eCHAPTER_TYPE.CUSTOM) then draw_set_alpha(0.5); + yyy += 31; + draw_set_color(c_gray); + draw_rectangle(xxx, yyy, xxx + 289, yyy + 20, 0); + draw_set_color(0); + draw_text(xxx, yyy, obj_ini.role[100, ide]); + if (scr_hit(xxx, yyy, xxx + 289, yyy + 20) == true) { + /*if (custom==eCHAPTER_TYPE.CUSTOM) then draw_set_alpha(0.2);if (custom!=eCHAPTER_TYPE.CUSTOM) then */ + draw_set_alpha(0.1); + draw_set_color(c_white); + draw_rectangle(xxx, yyy, xxx + 289, yyy + 20, 0); + draw_set_alpha(1); + tool1 = string(obj_ini.role[100, ide]) + " Settings"; + tool2 = "Click to open the settings for this unit."; + if (scr_click_left()) { + settings = ide; + menu = 23; + with (obj_mass_equip) { + instance_destroy(); + } + instance_create(0, 0, obj_mass_equip); + } + } + } + } + + xxx = xx + 936; + yyy = yy + 250 - 31; + + for (var ides = 0; ides <= 10; ides++) { + draw_set_alpha(1); + // if (custom!=eCHAPTER_TYPE.CUSTOM) then draw_set_alpha(0.5); + yyy += 31; + draw_set_color(c_gray); + draw_rectangle(xxx, yyy, xxx + 289, yyy + 20, 0); + draw_set_color(0); + + var shw = ""; + if (ides == 0) { + shw = "Headquarters"; + } + if (ides > 0) { + shw = romanNumerals[ides - 1] + " Company"; + } + draw_text(xxx, yyy, string(shw)); + + if (scr_hit(xxx, yyy, xxx + 289, yyy + 20) == true) { + /*if (custom==eCHAPTER_TYPE.CUSTOM) then draw_set_alpha(0.2);if (custom!=eCHAPTER_TYPE.CUSTOM) then */ + draw_set_alpha(0.1); + draw_set_color(c_white); + draw_rectangle(xxx, yyy, xxx + 289, yyy + 20, 0); + draw_set_alpha(1); + tool1 = string(shw) + " Settings"; + tool2 = "Click to open the settings for this company."; + // if (mouse_left>=1) and (cooldown<=0){settings=ides;menu=22;} + } + } + + xxx = xx + 936 - 341; + yyy = yy + 250 - 31; + + for (var i = 1; i <= 11; i++) { + draw_set_alpha(1); + // if (custom!=eCHAPTER_TYPE.CUSTOM) then draw_set_alpha(0.5); + yyy += 31; + draw_set_color(c_gray); + + if (bat_formation[i] != "") { + draw_rectangle(xxx, yyy, xxx + 289, yyy + 20, 0); + } + if (i > 2) { + if ((bat_formation[i] == "") && (bat_formation[i - 1] != "")) { + draw_rectangle(xxx, yyy, xxx + 289, yyy + 20, 0); + } + } + + draw_set_color(0); + + var shw = "", isnew = false; + shw = string(bat_formation[i]); + + if (i > 3) { + if (bat_formation_type[i] == 1) { + shw = "A] " + string(shw); + } + if (bat_formation_type[i] == 2) { + shw = "R] " + string(shw); + } + } + if (i > 2) { + if ((shw == "") && (bat_formation[i - 1] != "")) { + isnew = true; + shw = "(New Formation)"; + } + } + + if ((shw != "") || (isnew == true)) { + draw_text(xxx, yyy, string(shw)); + if (scr_hit(xxx, yyy, xxx + 289, yyy + 20) == true) { + /*if (custom==eCHAPTER_TYPE.CUSTOM) then draw_set_alpha(0.2);if (custom!=eCHAPTER_TYPE.CUSTOM) then */ + draw_set_alpha(0.1); + draw_set_color(c_white); + draw_rectangle(xxx, yyy, xxx + 289, yyy + 20, 0); + draw_set_alpha(1); + + if (i <= 3) { + tool1 = string(shw) + " Settings"; + } + tool2 = "Click to open the settings for this formation."; + if (i > 3) { + if (bat_formation[i] != "") { + tool1 = string(bat_formation[i]) + " Settings"; + tool2 = "Click to open the settings for this formation."; + } + if (bat_formation[i] == "") { + tool1 = "New Custom Formation"; + tool2 = "Click to open and create a new Battle Formation for Ground combat or Raiding."; + } + } + + if (scr_click_left()) { + formating = i; + menu = 24; + + scr_ui_formation_bars(); + if (bat_formation[formating] == "") { + bat_formation[formating] = "Custom" + string(formating - 3); + bat_formation_type[formating] = 1; + bat_deva_for[formating] = 1; + bat_assa_for[formating] = 4; + bat_tact_for[formating] = 2; + bat_vete_for[formating] = 2; + bat_hire_for[formating] = 3; + bat_libr_for[formating] = 3; + bat_comm_for[formating] = 3; + bat_tech_for[formating] = 3; + bat_term_for[formating] = 3; + bat_hono_for[formating] = 3; + bat_drea_for[formating] = 5; + bat_rhin_for[formating] = 6; + bat_pred_for[formating] = 7; + bat_landraid_for[formating] = 7; + bat_landspee_for[formating] = 4; + bat_whirl_for[formating] = 1; + bat_scou_for[formating] = 1; + } + } + } + } + } + + if (tool1 != "") { + tooltip_draw(tool2,,,,, tool1); + } + } } From 4a14f6c18ee328f6cccbdaf488607918d2e3dbd4 Mon Sep 17 00:00:00 2001 From: EttyKitty <20323032+EttyKitty@users.noreply.github.com> Date: Sat, 31 May 2025 00:04:35 +0300 Subject: [PATCH 064/286] fix: Chapter strength values for pre-made chapters (#844) --- .../scr_initialize_custom.gml | 146 +++++++++--------- 1 file changed, 72 insertions(+), 74 deletions(-) diff --git a/scripts/scr_initialize_custom/scr_initialize_custom.gml b/scripts/scr_initialize_custom/scr_initialize_custom.gml index 1f28caa156..1836a7b4ba 100644 --- a/scripts/scr_initialize_custom/scr_initialize_custom.gml +++ b/scripts/scr_initialize_custom/scr_initialize_custom.gml @@ -1119,81 +1119,79 @@ function scr_initialize_custom() { predator += 1; } - if (obj_creation.custom != eCHAPTER_TYPE.PREMADE) { - if (obj_creation.strength <= 4) then ninth = 0; - if (obj_creation.strength <= 3) then eighth = 0; - if (obj_creation.strength <= 2) then seventh = 0; - if (obj_creation.strength <= 1) then sixth = 0; - - var bonus_marines = 0; - if (obj_creation.strength > 5) then bonus_marines = (obj_creation.strength - 5) * 50; - if scr_has_disadv("Obliterated") then bonus_marines = (obj_creation.strength - 1) * 10; - var i = 0; - while (bonus_marines >= 5) { - switch (i % 10) { - case 0: - if (veteran > 0) { - bonus_marines -= 5; - veteran += 5; - } - break; - case 1: - if (second > 0) { - bonus_marines -= 5; - second += 5; - } - break; - case 2: - if (third > 0) { - bonus_marines -= 5; - third += 5; - } - break; - case 3: - if (fourth > 0) { - bonus_marines -= 5; - fourth += 5; - } - break; - case 4: - if (fifth > 0) { - bonus_marines -= 5; - fifth += 5; - } - break; - case 5: - if (sixth > 0) { - bonus_marines -= 5; - sixth += 5; - } - break; - case 6: - if (seventh > 0) { - bonus_marines -= 5; - seventh += 5; - } - break; - case 7: - if (eighth > 0) { - bonus_marines -= 5; - eighth += 5; - } - break; - case 8: - if (ninth > 0) { - bonus_marines -= 5; - ninth += 5; - } - break; - case 9: - if (tenth > 0) { - bonus_marines -= 5; - tenth += 5; - } - break; - } - i++; + if (obj_creation.strength <= 4) then ninth = 0; + if (obj_creation.strength <= 3) then eighth = 0; + if (obj_creation.strength <= 2) then seventh = 0; + if (obj_creation.strength <= 1) then sixth = 0; + + var bonus_marines = 0; + if (obj_creation.strength > 5) then bonus_marines = (obj_creation.strength - 5) * 50; + if scr_has_disadv("Obliterated") then bonus_marines = (obj_creation.strength - 1) * 10; + var i = 0; + while (bonus_marines >= 5) { + switch (i % 10) { + case 0: + if (veteran > 0) { + bonus_marines -= 5; + veteran += 5; + } + break; + case 1: + if (second > 0) { + bonus_marines -= 5; + second += 5; + } + break; + case 2: + if (third > 0) { + bonus_marines -= 5; + third += 5; + } + break; + case 3: + if (fourth > 0) { + bonus_marines -= 5; + fourth += 5; + } + break; + case 4: + if (fifth > 0) { + bonus_marines -= 5; + fifth += 5; + } + break; + case 5: + if (sixth > 0) { + bonus_marines -= 5; + sixth += 5; + } + break; + case 6: + if (seventh > 0) { + bonus_marines -= 5; + seventh += 5; + } + break; + case 7: + if (eighth > 0) { + bonus_marines -= 5; + eighth += 5; + } + break; + case 8: + if (ninth > 0) { + bonus_marines -= 5; + ninth += 5; + } + break; + case 9: + if (tenth > 0) { + bonus_marines -= 5; + tenth += 5; + } + break; } + i++; } if (struct_exists(obj_creation, "extra_specialists")) { From 5a685f5564d242e2c247e84ce20e47a1b39066b8 Mon Sep 17 00:00:00 2001 From: EttyKitty <20323032+EttyKitty@users.noreply.github.com> Date: Sat, 31 May 2025 00:04:48 +0300 Subject: [PATCH 065/286] chore: Reorgonize sound assets (#845) --- ChapterMaster.yyp | 2 ++ sounds/snd_battle/snd_battle.yy | 4 ++-- sounds/snd_blood/snd_blood.yy | 4 ++-- sounds/snd_buzz/snd_buzz.yy | 8 ++++---- sounds/snd_click/snd_click.yy | 8 ++++---- sounds/snd_click_small/snd_click_small.yy | 8 ++++---- sounds/snd_defeat/snd_defeat.yy | 4 ++-- sounds/snd_diboz/snd_diboz.yy | 4 ++-- sounds/snd_end_turn/snd_end_turn.yy | 8 ++++---- sounds/snd_error/snd_error.yy | 8 ++++---- sounds/snd_identify/snd_identify.yy | 8 ++++---- sounds/snd_legal/snd_legal.yy | 4 ++-- sounds/snd_postbattle/snd_postbattle.yy | 8 ++++---- sounds/snd_prologue/snd_prologue.yy | 4 ++-- sounds/snd_redownload/snd_redownload.yy | 8 ++++---- sounds/snd_royal/snd_royal.yy | 4 ++-- sounds/snd_stc/snd_stc.yy | 8 ++++---- sounds/snd_vode/snd_vode.yy | 8 ++++---- 18 files changed, 56 insertions(+), 54 deletions(-) diff --git a/ChapterMaster.yyp b/ChapterMaster.yyp index 227c0302fd..3991233425 100644 --- a/ChapterMaster.yyp +++ b/ChapterMaster.yyp @@ -52,7 +52,9 @@ {"$GMFolder":"","%Name":"Sequences","folderPath":"folders/Sequences.yy","name":"Sequences","resourceType":"GMFolder","resourceVersion":"2.0",}, {"$GMFolder":"","%Name":"Shaders","folderPath":"folders/Shaders.yy","name":"Shaders","resourceType":"GMFolder","resourceVersion":"2.0",}, {"$GMFolder":"","%Name":"Sounds","folderPath":"folders/Sounds.yy","name":"Sounds","resourceType":"GMFolder","resourceVersion":"2.0",}, + {"$GMFolder":"","%Name":"UI","folderPath":"folders/Sounds/UI.yy","name":"UI","resourceType":"GMFolder","resourceVersion":"2.0",}, {"$GMFolder":"","%Name":"Themes","folderPath":"folders/Sounds/Themes.yy","name":"Themes","resourceType":"GMFolder","resourceVersion":"2.0",}, + {"$GMFolder":"","%Name":"Unused","folderPath":"folders/Sounds/Unused.yy","name":"Unused","resourceType":"GMFolder","resourceVersion":"2.0",}, {"$GMFolder":"","%Name":"Sprites","folderPath":"folders/Sprites.yy","name":"Sprites","resourceType":"GMFolder","resourceVersion":"2.0",}, {"$GMFolder":"","%Name":"Marine Viewer","folderPath":"folders/Sprites/Marine Viewer.yy","name":"Marine Viewer","resourceType":"GMFolder","resourceVersion":"2.0",}, {"$GMFolder":"","%Name":"allies","folderPath":"folders/Sprites/Marine Viewer/allies.yy","name":"allies","resourceType":"GMFolder","resourceVersion":"2.0",}, diff --git a/sounds/snd_battle/snd_battle.yy b/sounds/snd_battle/snd_battle.yy index 8eca95eaf4..2e175a9216 100644 --- a/sounds/snd_battle/snd_battle.yy +++ b/sounds/snd_battle/snd_battle.yy @@ -9,8 +9,8 @@ "bitRate":192, "compression":3, "conversionMode":0, - "duration":164.70705, - "exportDir":"", + "duration":31.423855, + "exportDir":"sounds", "name":"snd_battle", "parent":{ "name":"Themes", diff --git a/sounds/snd_blood/snd_blood.yy b/sounds/snd_blood/snd_blood.yy index d588cf2b7c..3292768151 100644 --- a/sounds/snd_blood/snd_blood.yy +++ b/sounds/snd_blood/snd_blood.yy @@ -9,8 +9,8 @@ "bitRate":192, "compression":3, "conversionMode":0, - "duration":120.95194, - "exportDir":"", + "duration":120.9178, + "exportDir":"sounds", "name":"snd_blood", "parent":{ "name":"Themes", diff --git a/sounds/snd_buzz/snd_buzz.yy b/sounds/snd_buzz/snd_buzz.yy index efb71e7707..a73db8a9f4 100644 --- a/sounds/snd_buzz/snd_buzz.yy +++ b/sounds/snd_buzz/snd_buzz.yy @@ -9,12 +9,12 @@ "bitRate":192, "compression":0, "conversionMode":0, - "duration":1.547641, - "exportDir":"", + "duration":1.5426531, + "exportDir":"sounds", "name":"snd_buzz", "parent":{ - "name":"Sounds", - "path":"folders/Sounds.yy", + "name":"UI", + "path":"folders/Sounds/UI.yy", }, "preload":true, "resourceType":"GMSound", diff --git a/sounds/snd_click/snd_click.yy b/sounds/snd_click/snd_click.yy index 8893b9b6b8..0943be6175 100644 --- a/sounds/snd_click/snd_click.yy +++ b/sounds/snd_click/snd_click.yy @@ -9,12 +9,12 @@ "bitRate":192, "compression":0, "conversionMode":0, - "duration":0.336406, - "exportDir":"", + "duration":0.3314059, + "exportDir":"sounds", "name":"snd_click", "parent":{ - "name":"Sounds", - "path":"folders/Sounds.yy", + "name":"UI", + "path":"folders/Sounds/UI.yy", }, "preload":true, "resourceType":"GMSound", diff --git a/sounds/snd_click_small/snd_click_small.yy b/sounds/snd_click_small/snd_click_small.yy index c57ac785b4..dde4b5de26 100644 --- a/sounds/snd_click_small/snd_click_small.yy +++ b/sounds/snd_click_small/snd_click_small.yy @@ -9,12 +9,12 @@ "bitRate":192, "compression":0, "conversionMode":0, - "duration":0.187857, - "exportDir":"", + "duration":0.18285714, + "exportDir":"sounds", "name":"snd_click_small", "parent":{ - "name":"Sounds", - "path":"folders/Sounds.yy", + "name":"UI", + "path":"folders/Sounds/UI.yy", }, "preload":true, "resourceType":"GMSound", diff --git a/sounds/snd_defeat/snd_defeat.yy b/sounds/snd_defeat/snd_defeat.yy index 0f6a233732..cdd48c77d9 100644 --- a/sounds/snd_defeat/snd_defeat.yy +++ b/sounds/snd_defeat/snd_defeat.yy @@ -9,8 +9,8 @@ "bitRate":192, "compression":3, "conversionMode":0, - "duration":267.6556, - "exportDir":"", + "duration":0.0, + "exportDir":"sounds", "name":"snd_defeat", "parent":{ "name":"Themes", diff --git a/sounds/snd_diboz/snd_diboz.yy b/sounds/snd_diboz/snd_diboz.yy index 515025db07..3031b3f5a3 100644 --- a/sounds/snd_diboz/snd_diboz.yy +++ b/sounds/snd_diboz/snd_diboz.yy @@ -9,8 +9,8 @@ "bitRate":192, "compression":3, "conversionMode":0, - "duration":214.39194, - "exportDir":"", + "duration":0.0, + "exportDir":"sounds", "name":"snd_diboz", "parent":{ "name":"Themes", diff --git a/sounds/snd_end_turn/snd_end_turn.yy b/sounds/snd_end_turn/snd_end_turn.yy index ff1a8de04e..aec24b0ee9 100644 --- a/sounds/snd_end_turn/snd_end_turn.yy +++ b/sounds/snd_end_turn/snd_end_turn.yy @@ -9,12 +9,12 @@ "bitRate":192, "compression":0, "conversionMode":0, - "duration":0.331667, - "exportDir":"", + "duration":0.32666665, + "exportDir":"sounds", "name":"snd_end_turn", "parent":{ - "name":"Sounds", - "path":"folders/Sounds.yy", + "name":"UI", + "path":"folders/Sounds/UI.yy", }, "preload":true, "resourceType":"GMSound", diff --git a/sounds/snd_error/snd_error.yy b/sounds/snd_error/snd_error.yy index 08324bf515..743777b29d 100644 --- a/sounds/snd_error/snd_error.yy +++ b/sounds/snd_error/snd_error.yy @@ -9,12 +9,12 @@ "bitRate":192, "compression":0, "conversionMode":0, - "duration":0.274388, - "exportDir":"", + "duration":0.26938775, + "exportDir":"sounds", "name":"snd_error", "parent":{ - "name":"Sounds", - "path":"folders/Sounds.yy", + "name":"UI", + "path":"folders/Sounds/UI.yy", }, "preload":true, "resourceType":"GMSound", diff --git a/sounds/snd_identify/snd_identify.yy b/sounds/snd_identify/snd_identify.yy index 6a25de74d9..b1c6cc15cf 100644 --- a/sounds/snd_identify/snd_identify.yy +++ b/sounds/snd_identify/snd_identify.yy @@ -9,12 +9,12 @@ "bitRate":192, "compression":0, "conversionMode":0, - "duration":0.773, - "exportDir":"", + "duration":0.76800454, + "exportDir":"sounds", "name":"snd_identify", "parent":{ - "name":"Sounds", - "path":"folders/Sounds.yy", + "name":"UI", + "path":"folders/Sounds/UI.yy", }, "preload":true, "resourceType":"GMSound", diff --git a/sounds/snd_legal/snd_legal.yy b/sounds/snd_legal/snd_legal.yy index f45f02da1e..39a6d25741 100644 --- a/sounds/snd_legal/snd_legal.yy +++ b/sounds/snd_legal/snd_legal.yy @@ -9,8 +9,8 @@ "bitRate":192, "compression":3, "conversionMode":0, - "duration":30.280918, - "exportDir":"", + "duration":30.249727, + "exportDir":"sounds", "name":"snd_legal", "parent":{ "name":"Themes", diff --git a/sounds/snd_postbattle/snd_postbattle.yy b/sounds/snd_postbattle/snd_postbattle.yy index ccb0bc0387..1436632884 100644 --- a/sounds/snd_postbattle/snd_postbattle.yy +++ b/sounds/snd_postbattle/snd_postbattle.yy @@ -9,12 +9,12 @@ "bitRate":192, "compression":3, "conversionMode":0, - "duration":279.72418, - "exportDir":"", + "duration":137.55646, + "exportDir":"sounds", "name":"snd_postbattle", "parent":{ - "name":"Themes", - "path":"folders/Sounds/Themes.yy", + "name":"Unused", + "path":"folders/Sounds/Unused.yy", }, "preload":true, "resourceType":"GMSound", diff --git a/sounds/snd_prologue/snd_prologue.yy b/sounds/snd_prologue/snd_prologue.yy index c3b900765f..4e3b9c055d 100644 --- a/sounds/snd_prologue/snd_prologue.yy +++ b/sounds/snd_prologue/snd_prologue.yy @@ -9,8 +9,8 @@ "bitRate":192, "compression":3, "conversionMode":0, - "duration":146.21767, - "exportDir":"", + "duration":103.17932, + "exportDir":"sounds", "name":"snd_prologue", "parent":{ "name":"Themes", diff --git a/sounds/snd_redownload/snd_redownload.yy b/sounds/snd_redownload/snd_redownload.yy index 2b31e9491a..668583a29e 100644 --- a/sounds/snd_redownload/snd_redownload.yy +++ b/sounds/snd_redownload/snd_redownload.yy @@ -9,12 +9,12 @@ "bitRate":192, "compression":0, "conversionMode":0, - "duration":1.816156, - "exportDir":"", + "duration":1.8111565, + "exportDir":"sounds", "name":"snd_redownload", "parent":{ - "name":"Sounds", - "path":"folders/Sounds.yy", + "name":"Unused", + "path":"folders/Sounds/Unused.yy", }, "preload":true, "resourceType":"GMSound", diff --git a/sounds/snd_royal/snd_royal.yy b/sounds/snd_royal/snd_royal.yy index 58fce7d63c..c1d422ca33 100644 --- a/sounds/snd_royal/snd_royal.yy +++ b/sounds/snd_royal/snd_royal.yy @@ -9,8 +9,8 @@ "bitRate":256, "compression":3, "conversionMode":0, - "duration":179.23112, - "exportDir":"", + "duration":19.401724, + "exportDir":"sounds", "name":"snd_royal", "parent":{ "name":"Themes", diff --git a/sounds/snd_stc/snd_stc.yy b/sounds/snd_stc/snd_stc.yy index 8e9cff2715..02cbd41d76 100644 --- a/sounds/snd_stc/snd_stc.yy +++ b/sounds/snd_stc/snd_stc.yy @@ -9,12 +9,12 @@ "bitRate":192, "compression":0, "conversionMode":0, - "duration":0.597109, - "exportDir":"", + "duration":0.59210885, + "exportDir":"sounds", "name":"snd_stc", "parent":{ - "name":"Sounds", - "path":"folders/Sounds.yy", + "name":"UI", + "path":"folders/Sounds/UI.yy", }, "preload":true, "resourceType":"GMSound", diff --git a/sounds/snd_vode/snd_vode.yy b/sounds/snd_vode/snd_vode.yy index bc6194d9c3..919cf3e443 100644 --- a/sounds/snd_vode/snd_vode.yy +++ b/sounds/snd_vode/snd_vode.yy @@ -9,12 +9,12 @@ "bitRate":256, "compression":3, "conversionMode":0, - "duration":118.42445, - "exportDir":"", + "duration":118.41306, + "exportDir":"sounds", "name":"snd_vode", "parent":{ - "name":"Themes", - "path":"folders/Sounds/Themes.yy", + "name":"Unused", + "path":"folders/Sounds/Unused.yy", }, "preload":true, "resourceType":"GMSound", From c03eafc1f20d72f4cb434d9bc7f19f6b81a119a2 Mon Sep 17 00:00:00 2001 From: EttyKitty <20323032+EttyKitty@users.noreply.github.com> Date: Sat, 31 May 2025 00:05:10 +0300 Subject: [PATCH 066/286] fix: Disable the "Restart" save button (#846) --- objects/obj_saveload/Draw_0.gml | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/objects/obj_saveload/Draw_0.gml b/objects/obj_saveload/Draw_0.gml index a6684e30ae..32264d127f 100644 --- a/objects/obj_saveload/Draw_0.gml +++ b/objects/obj_saveload/Draw_0.gml @@ -147,9 +147,10 @@ if (menu=1) or (menu=2){// This is the other one } } - - if (menu=2) and (save[o]>=0){// Restart - draw_set_alpha(1); + if (menu=2) and (save[o]>=0){ + // Restart + //! Doesn't work properly, commented out until repaired; + /* draw_set_alpha(1); draw_set_color(c_gray);draw_rectangle(x2+977,y2+113,x2+1121,y2+146,0); draw_set_color(c_black);draw_rectangle(x2+977,y2+113,x2+1121,y2+146,1); draw_text_transformed(x2+1050,y2+117,string_hash_to_newline("Restart Game"),0.7,0.7,0); @@ -178,8 +179,9 @@ if (menu=1) or (menu=2){// This is the other one room_goto(Game); } } - } + } */ + // Load draw_set_alpha(1); draw_set_color(c_gray);draw_rectangle(x2+1317,y2+113,x2+1461,y2+146,0); draw_set_color(c_black);draw_rectangle(x2+1317,y2+113,x2+1461,y2+146,1); From 1bbd0259e1184572bfa5ecc7ecb5ca8768e211b5 Mon Sep 17 00:00:00 2001 From: EttyKitty <20323032+EttyKitty@users.noreply.github.com> Date: Sat, 31 May 2025 00:05:24 +0300 Subject: [PATCH 067/286] fix: Type change for custom formations and tooltips (#849) --- .../scr_ui_formation_bars.gml | 4 +- scripts/scr_ui_settings/scr_ui_settings.gml | 109 +++++++++--------- 2 files changed, 56 insertions(+), 57 deletions(-) diff --git a/scripts/scr_ui_formation_bars/scr_ui_formation_bars.gml b/scripts/scr_ui_formation_bars/scr_ui_formation_bars.gml index 7489878866..41877760c0 100644 --- a/scripts/scr_ui_formation_bars/scr_ui_formation_bars.gml +++ b/scripts/scr_ui_formation_bars/scr_ui_formation_bars.gml @@ -1,5 +1,6 @@ +/// @mixin function scr_ui_formation_bars() { - ui_formations_data = { + var ui_formations_data = { nbar: 0, abar: 0, te: 4700, @@ -112,6 +113,7 @@ function scr_ui_formation_bars() { } } +/// @mixin function init_combat_bars(bar, ii, formations_data, size, image_index, unit_type) { formations_data.nbar = instance_create(formations_data.x9, formations_data.y9 + temp[formations_data.te], obj_formation_bar); formations_data.nbar.size = size; diff --git a/scripts/scr_ui_settings/scr_ui_settings.gml b/scripts/scr_ui_settings/scr_ui_settings.gml index 9eab643628..75d466af9a 100644 --- a/scripts/scr_ui_settings/scr_ui_settings.gml +++ b/scripts/scr_ui_settings/scr_ui_settings.gml @@ -4,7 +4,8 @@ function scr_ui_settings() { // Var declaration var xx, yy; var tool1 = "", tool2 = ""; - var che, cx, cy; + var che = false; + var cx, cy; var x5 = 0, y5 = 0, x6 = 0; var too_img = 0; xx = __view_get(e__VW.XView, 0) + 0; @@ -56,17 +57,17 @@ function scr_ui_settings() { obj_cursor.image_index = 0; if ((formating > 3) && (obj_cursor.dragging == 0)) { - if ((scr_hit(xx + 800 - (bar_wid / 2), yy + 66, xx + 800 + (bar_wid / 2), yy + 66 + string_height("LOL")) == false) && scr_click_left()) { - text_bar = 0; - } - if (scr_hit(xx + 800 - (bar_wid / 2), yy + 66, xx + 800 + (bar_wid / 2), yy + 66 + string_height("LOL")) == true) { + if (scr_hit([xx + 800 - (bar_wid / 2), yy + 66, xx + 800 + (bar_wid / 2), yy + 66 + string_height("LOL")])) { obj_cursor.image_index = 2; if (scr_click_left() && (text_bar == 0)) { text_bar = 1; keyboard_string = bat_formation[formating]; } + } else { + text_bar = 0; } } + draw_set_alpha(1); if ((bat_formation[formating] != "") || (text_bar > 0)) { if (formating > 3) { @@ -85,72 +86,65 @@ function scr_ui_settings() { draw_set_font(fnt_40k_14); draw_set_halign(fa_left); - if (bat_formation_type[formating] != 1) { - che = 1; - } if (bat_formation_type[formating] == 1) { - che = 2; - } + che = true; + } else { + che = false; + } + cx = xx + 757; - cy = yy + 115; + cy = yy + 120; // Defines the attack command - draw_text(cx, cy, "Attack"); + var _formation_name = "Attack Formation"; + draw_text(cx, cy, _formation_name); + cx -= 35; cy -= 4; - if (formating <= 3) { draw_set_alpha(0.5); } - draw_sprite(spr_creation_check, che + 1, cx, cy); + draw_sprite(spr_creation_check, 2 + che, cx, cy); draw_set_alpha(1); + // Attack command tool tips - if (scr_hit(cx + 31, cy, cx + 260, cy + 20) == true) { - tool1 = "Attack"; - tool2 = "Allows the use of vehicles, and bikes, but prevents this formation from being used during Raids."; + if (scr_hit(cx, cy, cx + string_width(_formation_name), cy + sprite_get_height(spr_creation_check))) { + tool1 = _formation_name; + tool2 = "Can't be used in Raids. Can use any vehicles."; + if (scr_click_left() && formating > 3 && bat_formation_type[formating] != 1) { + bat_formation_type[formating] = 1; + scr_ui_formation_bars(); + } } - if ((scr_hit(cx, cy, cx + 32, cy + 32) == true) && scr_click_left() && (formating > 3)) { - var onceh = 0; - if ((onceh == 0) && ((bat_formation_type[formating] == 0) || (bat_formation_type[formating] == 2))) { - onceh = 1; - bat_formation_type[formating] = 1; - scr_ui_formation_bars(); - } - } - if (bat_formation_type[formating] != 2) { - che = 1; - } if (bat_formation_type[formating] == 2) { - che = 2; - } + che = true; + } else { + che = false; + } // Defines the Raid action cx = xx + 757; - cy = yy + 150; - draw_text(cx, cy, "Raid"); + cy = yy + 155; + _formation_name = "Raid Formation"; + draw_text(cx, cy, _formation_name); cx -= 35; cy -= 4; if (formating <= 3) { draw_set_alpha(0.5); } - draw_sprite(spr_creation_check, che + 1, cx, cy); + draw_sprite(spr_creation_check, 2 + che, cx, cy); draw_set_alpha(1); - // Raid action tooltip - if (scr_hit(cx + 31, cy, cx + 260, cy + 20) == true) { - tool1 = "Raid"; - tool2 = "Prevents the use of vehicles, and bikes, but allows this formation to be used for Raids."; - } - if ((scr_hit(cx, cy, cx + 32, cy + 32) == true) && scr_click_left() && (formating > 3)) { - var onceh; - onceh = 0; - if ((onceh == 0) && ((bat_formation_type[formating] == 0) || (bat_formation_type[formating] == 1))) { - onceh = 1; - bat_formation_type[formating] = 2; - scr_ui_formation_bars(); - } + // Raid action tooltip + if (scr_hit(cx, cy, cx + string_width(_formation_name), cy + sprite_get_height(spr_creation_check))) { + tool1 = _formation_name; + tool2 = "Can only be used in Raids. Prevents the use of all vehicles aside from Dreadnoughts and Land Speeders. Starts in melee."; + if (scr_click_left() && formating > 3 && bat_formation_type[formating] != 2) { + bat_formation_type[formating] = 2; + scr_ui_formation_bars(); + } } draw_set_color(c_gray); @@ -294,16 +288,19 @@ function scr_ui_settings() { scr_image("formation", too_img, xx + 1271, yy + 252, 239, 297); } - /* - if (tool1!=""){ - draw_set_alpha(1); - draw_set_font(fnt_40k_14);draw_set_halign(fa_left);draw_set_color(0); - draw_rectangle(mouse_x+18,mouse_y+20,mouse_x+string_width_ext(tool2,-1,500)+24,mouse_y+44+string_height_ext(tool2,-1,500),0); - draw_set_color(c_gray); - draw_rectangle(mouse_x+18,mouse_y+20,mouse_x+string_width_ext(tool2,-1,500)+24,mouse_y+44+string_height_ext(tool2,-1,500),1); - draw_set_font(fnt_40k_14b);draw_text(mouse_x+22,mouse_y+22,string(tool1)); - draw_set_font(fnt_40k_14);draw_text_ext(mouse_x+22,mouse_y+42,string(tool2),-1,500); - }*/ + if (tool1 != "") { + draw_set_alpha(1); + draw_set_font(fnt_40k_14); + draw_set_halign(fa_left); + draw_set_color(0); + draw_rectangle(mouse_x + 18, mouse_y + 20, mouse_x + string_width_ext(tool2, -1, 500) + 24, mouse_y + 44 + string_height_ext(tool2, -1, 500), 0); + draw_set_color(c_gray); + draw_rectangle(mouse_x + 18, mouse_y + 20, mouse_x + string_width_ext(tool2, -1, 500) + 24, mouse_y + 44 + string_height_ext(tool2, -1, 500), 1); + draw_set_font(fnt_40k_14b); + draw_text(mouse_x + 22, mouse_y + 22, string(tool1)); + draw_set_font(fnt_40k_14); + draw_text_ext(mouse_x + 22, mouse_y + 42, string(tool2), -1, 500); + } } if (menu == 23) { From 30726bb500f7692992a9f983b77f714d2a9c93a4 Mon Sep 17 00:00:00 2001 From: EttyKitty <20323032+EttyKitty@users.noreply.github.com> Date: Sat, 31 May 2025 00:05:38 +0300 Subject: [PATCH 068/286] fix: Crusade crash (audience variable init) (#850) --- objects/obj_crusade/Mouse_50.gml | 6 +++++- objects/obj_turn_end/Create_0.gml | 3 ++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/objects/obj_crusade/Mouse_50.gml b/objects/obj_crusade/Mouse_50.gml index 9e9f6f846e..d6118ee7f0 100644 --- a/objects/obj_crusade/Mouse_50.gml +++ b/objects/obj_crusade/Mouse_50.gml @@ -12,7 +12,11 @@ if (placing=true) and (cooldown<=0){ if (instance_exists(obj_turn_end)){ if (obj_turn_end.audience>0){ with(obj_turn_end){ - cooldown=8;diplomacy=0;alarm[1]=1;audience=0;force_goodbye=0; + cooldown=8; + diplomacy=0; + alarm[1]=1; + audience=0; + force_goodbye=0; } } } diff --git a/objects/obj_turn_end/Create_0.gml b/objects/obj_turn_end/Create_0.gml index 8d8e1d6aa7..d635fe5838 100644 --- a/objects/obj_turn_end/Create_0.gml +++ b/objects/obj_turn_end/Create_0.gml @@ -70,7 +70,8 @@ repeat(91){ } -audiences=0; +audiences = 0; +audience = 0; audien[0]=0;audien[1]=0;audien[2]=0;audien[3]=0;audien[4]=0;audien[5]=0; audien[6]=0;audien[7]=0;audien[8]=0;audien[9]=0;audien[10]=0;audien[11]=0; audien_topic[0]="";audien_topic[1]="";audien_topic[2]="";audien_topic[3]="";audien_topic[4]="";audien_topic[5]=""; From fb6630286012f83930525d9e1ced3489ea72837b Mon Sep 17 00:00:00 2001 From: EttyKitty <20323032+EttyKitty@users.noreply.github.com> Date: Sat, 31 May 2025 02:12:13 +0300 Subject: [PATCH 069/286] fix: scr_turn_first crash (#852) --- scripts/scr_turn_first/scr_turn_first.gml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/scripts/scr_turn_first/scr_turn_first.gml b/scripts/scr_turn_first/scr_turn_first.gml index 9b24f24222..e1c292a726 100644 --- a/scripts/scr_turn_first/scr_turn_first.gml +++ b/scripts/scr_turn_first/scr_turn_first.gml @@ -46,22 +46,22 @@ function scr_turn_first() { host_p=0; if (peace_check>0){ - var baddy, - var total = 0; + var _baddy = 0; + var _total = 0; with(obj_star){ if (owner>5){ - baddy = 0; + _baddy = 0; o = 0; repeat(planets){ o+=1; - if (p_orks[o]+p_tyranids[o]+p_chaos[o]+p_traitors[o]+p_necrons[o]>=3) then baddy+=1; + if (p_orks[o]+p_tyranids[o]+p_chaos[o]+p_traitors[o]+p_necrons[o]>=3) then _baddy+=1; } - if (baddy>0) { - total++; + if (_baddy>0) { + _total++; } } } - if (total<=3){ + if (_total<=3){ peace_check=2; } if (peace_check==2){ From f5a3368a9f096f5ae693f1abd026f00a49bec412 Mon Sep 17 00:00:00 2001 From: Nelsonh <81228864+OH296@users.noreply.github.com> Date: Sun, 1 Jun 2025 23:27:44 +0100 Subject: [PATCH 070/286] fix: Fallen trait improvement and loyalty changes (#851) Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com> --- datafiles/data/traits.json | 23 ++++++++++++------- objects/obj_controller/Alarm_5.gml | 2 +- scripts/scr_enemy_ai_d/scr_enemy_ai_d.gml | 23 ++++++++++--------- .../scr_marine_struct/scr_marine_struct.gml | 14 +++++++++++ .../scr_pen_And_paper/scr_pen_And_paper.gml | 17 +++++++++++++- scripts/scr_squads/scr_squads.gml | 5 ++-- 6 files changed, 60 insertions(+), 24 deletions(-) diff --git a/datafiles/data/traits.json b/datafiles/data/traits.json index 9f9507339f..1d090f0ba2 100644 --- a/datafiles/data/traits.json +++ b/datafiles/data/traits.json @@ -94,7 +94,8 @@ "max" ], "flavour_text": "Seen many young warriors rise and die before them but they themselves still remain", - "display_name": "Old Guard" + "display_name": "Old Guard", + "effect": "All loyalty changes are halved", }, "seasoned": { "luck": 1, @@ -319,7 +320,8 @@ "max" ], "display_name": "Faithless", - "flavour_text": "Puts great emphasis on a pragmatic and logical approach in place of faith and spiritual beliefs" + "flavour_text": "Puts great emphasis on a pragmatic and logical approach in place of faith and spiritual beliefs", + "effect" : "corruption attempts are less effective" }, "feet_floor": { "wisdom": 1, @@ -418,7 +420,8 @@ "max" ], "display_name": "Charismatic", - "flavour_text": "Liked by most without even trying" + "flavour_text": "Liked by most without even trying", + "effect" : "failed charisma rolls are re-rolled", }, "recluse": { "charisma": [ @@ -446,7 +449,8 @@ "display_name": "Jaded", "flavour_text": "Their past has led them to form a deep distrust and cynical outlook on most parts of their life", "charisma": -2, - "wisdom": -1 + "wisdom": -1, + "effect" : "negative loyalty effects are doubled" }, "observant": { "display_name": "Observant", @@ -589,10 +593,13 @@ "soft_target": { "display_name": "Marked for death", "constitution": [ - -5, - 2 + -3, + 2, + "min" ], - "flavour_text": "This Marine can't shake the feeling that his days are numbered; in battle enemy attacks seem to find their way to softer sections of armor" + "luck" : -2, + "flavour_text": "This Marine can't shake the feeling that his days are numbered; in battle enemy attacks seem to find their way to softer sections of armor", + "effect" : "-10 modifier for rolls against constitution", }, "fast_learner": { "display_name": "Quick Learner", @@ -713,7 +720,7 @@ 1 ], "flavour_text": "Is known for their impeccable honor even in the heat of battle", - "effect": "If commanding garrison will prevent disposition loss" + "effect": "If commanding garrison will prevent disposition loss, losses to loyalty are halved" }, "duelist": { "weapon_skill": [ diff --git a/objects/obj_controller/Alarm_5.gml b/objects/obj_controller/Alarm_5.gml index cfc08acce0..808b31d09b 100644 --- a/objects/obj_controller/Alarm_5.gml +++ b/objects/obj_controller/Alarm_5.gml @@ -255,7 +255,7 @@ for (var c = 0; c < 11; c++){ penit_co[p]=c; penit_id[p]=e; penitorium+=1; - unit.loyalty--; + unit.alter_loyalty(-1); if (unit.corruption<90) and (unit.corruption>0){ var heresy_old=0,heresy_new=0; heresy_old=round((unit.corruption*unit.corruption)/50)-0.5; diff --git a/scripts/scr_enemy_ai_d/scr_enemy_ai_d.gml b/scripts/scr_enemy_ai_d/scr_enemy_ai_d.gml index 1e8a0c05b2..0926392dbd 100644 --- a/scripts/scr_enemy_ai_d/scr_enemy_ai_d.gml +++ b/scripts/scr_enemy_ai_d/scr_enemy_ai_d.gml @@ -1,5 +1,5 @@ function scr_enemy_ai_d() { - + if (x<-15000){x+=20000;y+=20000;} if (x<-15000){x+=20000;y+=20000;} if (x<-15000){x+=20000;y+=20000;} @@ -201,25 +201,26 @@ function scr_enemy_ai_d() { //TODO marker point for cohesion mechanics var alert_text=""; var unit; - if (ran>33){// Give all marines +3d6 corruption and reduce loyalty by 20*/ + if (irandom(100)>33){// Give all marines +3d6 corruption and reduce loyalty by 20*/ var me=0; for (var co=0;co<=obj_ini.companies;co++){ me=0; for (me=0;me-1){ diff --git a/scripts/scr_marine_struct/scr_marine_struct.gml b/scripts/scr_marine_struct/scr_marine_struct.gml index e7d3e7045b..2de84589a9 100644 --- a/scripts/scr_marine_struct/scr_marine_struct.gml +++ b/scripts/scr_marine_struct/scr_marine_struct.gml @@ -863,6 +863,20 @@ function TTRPG_stats(faction, comp, mar, class = "marine", other_spawn_data = {} that could be chosen to give boostes to the other stats so as an example salamanders could have the chapter values as */ loyalty = 0; + static alter_loyalty = function(alt_val){ + if (alt_val < 0){ + if (has_trait("honorable")){ + alt_val/=2; + } + if (has_trait("jaded")){ + alt_val*=2; + } + } + if (has_trait("old_guard")){ + alt_val/=2; + } + loyalty = clamp(loyalty + alt_val, 0, 100); + } switch (base_group) { case "astartes": //basic marine class //adds specific mechanics not releveant to most units loyalty = 100; diff --git a/scripts/scr_pen_And_paper/scr_pen_And_paper.gml b/scripts/scr_pen_And_paper/scr_pen_And_paper.gml index 7b8f1fa959..8dd51a8b23 100644 --- a/scripts/scr_pen_And_paper/scr_pen_And_paper.gml +++ b/scripts/scr_pen_And_paper/scr_pen_And_paper.gml @@ -1,9 +1,19 @@ function PenAndPaperSim() constructor{ + + static test_rerollable = function(unit, stat){ + if (stat == "charisma"){ + if (unit.has_trait("charismatic")){ + return true; + } + } + return false; + } static oppposed_test = function(unit1, unit2, stat,unit1_mod=0,unit2_mod=0, modifiers={}){ var stat1 = irandom(99)+1; var unit1_val = unit1[$ stat]+unit1_mod; var unit2_val = unit2[$ stat]+unit2_mod; var stat2 = irandom(99)+1; + var _reroll = test_rerollable(unit1, stat); var stat1_pass_margin, stat2_pass_margin, winner, pass_margin; //unit 1 passes test if (stat1 < unit1_val){ @@ -73,12 +83,17 @@ function PenAndPaperSim() constructor{ static standard_test = function(unit, stat, difficulty_mod=0, tags = []){ var passed =false; var margin=0; + array_push(tags,stat); + var _reroll = test_rerollable(unit, stat); difficulty_mod+=evaluate_tags(unit, tags); var random_roll = irandom_range(1,100); + if (_reroll && random_roll>=unit[$ stat]+difficulty_mod){ + random_roll = irandom_range(1,100); + } if (random_roll Date: Mon, 2 Jun 2025 16:31:49 +0300 Subject: [PATCH 071/286] refactor: A lot of array_create stuff and scr_turn_first refactor (#853) Co-authored-by: Nelsonh <81228864+OH296@users.noreply.github.com> --- objects/obj_controller/Create_0.gml | 108 +++----------- objects/obj_ini/Create_0.gml | 26 ++-- objects/obj_star/Create_0.gml | 89 ++++++----- .../scr_array_functions.gml | 7 + scripts/scr_turn_first/scr_turn_first.gml | 139 +++++++++--------- 5 files changed, 145 insertions(+), 224 deletions(-) diff --git a/objects/obj_controller/Create_0.gml b/objects/obj_controller/Create_0.gml index 8a584e6472..15011e9b8b 100644 --- a/objects/obj_controller/Create_0.gml +++ b/objects/obj_controller/Create_0.gml @@ -1054,9 +1054,8 @@ faction[12]=""; disposition[12]=0; faction[13]="Necrons"; disposition[13]=-20; -// ** Max disposition for imperials ** -disposition_max[0]=0; -disposition_max[1]=0; +// ** Max disposition ** +disposition_max = array_create(14, 0); disposition_max[2]=40; disposition_max[3]=40; disposition_max[4]=40; @@ -1071,108 +1070,63 @@ if (instance_exists(obj_ini)){ disposition_max[5]=40+obj_ini.ecclesiarchy_disposition; if (disposition_max[5]>100) then disposition_max[5]=100; } -// ** Max disposition for non imperials ** -disposition_max[6]=0; -disposition_max[7]=0; -disposition_max[8]=0; -disposition_max[9]=0; -disposition_max[10]=0; -disposition_max[11]=0; -disposition_max[12]=0; -disposition_max[13]=0; // ** Sets up faction leader names as well as player faction stuff ** -faction_leader[0]=""; -faction_title[0]=""; -faction_status[0]=""; -faction_leader[1]=""; -faction_title[1]=""; -faction_status[1]=""; +faction_leader = array_create(14, ""); +faction_title = array_create(14, ""); +faction_status = array_create(14, ""); // Sector Command faction faction_leader[eFACTION.Imperium]=global.name_generator.generate_imperial_name(); -faction_title[2]="Sector Commander"; +faction_title[eFACTION.Imperium]="Sector Commander"; faction_status[eFACTION.Imperium]="Allied"; // Mechanicus faction faction_leader[eFACTION.Mechanicus]=global.name_generator.generate_imperial_name(); -faction_title[3]="Magos"; +faction_title[eFACTION.Mechanicus]="Magos"; faction_status[eFACTION.Mechanicus]="Allied"; if (faction_leader[eFACTION.Mechanicus]==faction_leader[eFACTION.Imperium]) then faction_leader[eFACTION.Mechanicus]=global.name_generator.generate_space_marine_name(); // Inquisition faction faction_leader[eFACTION.Inquisition]=global.name_generator.generate_imperial_name(); if (faction_leader[eFACTION.Inquisition]==faction_leader[eFACTION.Mechanicus]) then faction_leader[eFACTION.Inquisition]=global.name_generator.generate_imperial_name(); -faction_title[4]="Inquisitor Lord"; +faction_title[eFACTION.Inquisition]="Inquisitor Lord"; faction_status[eFACTION.Inquisition]="Allied"; // Sisters faction faction_leader[eFACTION.Ecclesiarchy]=global.name_generator.generate_imperial_name(false); -faction_title[5]="Prioress"; +faction_title[eFACTION.Ecclesiarchy]="Prioress"; faction_status[eFACTION.Ecclesiarchy]="Allied"; // Eldar faction faction_leader[eFACTION.Eldar]=global.name_generator.generate_eldar_name(2); -faction_title[6]="Farseer"; +faction_title[eFACTION.Eldar]="Farseer"; faction_status[eFACTION.Eldar]="Antagonism";// If disposition = 0 then instead set it to "Antagonism" // Orkz faction faction_leader[eFACTION.Ork]=global.name_generator.generate_ork_name(); -faction_title[7]="Warboss"; +faction_title[eFACTION.Ork]="Warboss"; faction_status[eFACTION.Ork]="War"; // Tau faction faction_leader[eFACTION.Tau] = global.name_generator.generate_tau_leader_name(); -faction_title[8]="Diplomat"; +faction_title[eFACTION.Tau]="Diplomat"; faction_status[eFACTION.Tau]="Antagonism"; // Other factions unkown to player -faction_leader[eFACTION.Tyranids]=""; -faction_title[9]=""; faction_status[eFACTION.Tyranids]="War"; - -faction_leader[eFACTION.Chaos]=":D"; -faction_title[10]="Chaos Lord"; +faction_title[eFACTION.Chaos]="Chaos Lord"; faction_status[eFACTION.Chaos]="War"; - -faction_leader[eFACTION.Heretics]=""; -faction_title[11]=""; faction_status[eFACTION.Heretics]="War"; - -faction_leader[12]=""; -faction_title[12]=""; -faction_status[12]="War"; - -faction_leader[eFACTION.Necrons]=""; -faction_title[13]=""; +faction_status[eFACTION.Genestealer]="War"; faction_status[eFACTION.Necrons]="War"; // ** Sets faction gender for names ** -faction_gender[0]=1; -faction_gender[1]=1; -faction_gender[2]=1; -faction_gender[3]=1; -faction_gender[4]=1; -faction_gender[10]=1; -faction_gender[5]=1; +faction_gender = array_create(14, 1); faction_gender[6]=choose(1,2); -faction_gender[7]=1; faction_gender[8]=choose(1,1,2); -faction_gender[9]=1; if (faction_gender[4]=2) then faction_leader[eFACTION.Inquisition]=global.name_generator.generate_imperial_name(false); faction_gender[10]=choose(1,1,1,2,2); if (faction_gender[10]==1) then faction_leader[eFACTION.Chaos]=choose("1","1","1","2"); if (faction_gender[10]==2) then faction_leader[eFACTION.Chaos]=choose("1","2","2","2"); if (faction_leader[eFACTION.Chaos]=="1") then faction_leader[eFACTION.Chaos]=global.name_generator.generate_space_marine_name(); if (faction_leader[eFACTION.Chaos]=="2") then faction_leader[eFACTION.Chaos]=global.name_generator.generate_chaos_name(); -faction_gender[11]=1; -faction_gender[12]=1; -faction_gender[13]=1; +known = array_create(14, 0); known[0]=2; known[eFACTION.Player]=999; known[eFACTION.Imperium]=1; known[eFACTION.Mechanicus]=1; -known[eFACTION.Inquisition]=0; -known[eFACTION.Ecclesiarchy]=0; -known[eFACTION.Eldar]=0; -known[eFACTION.Ork]=0; -known[eFACTION.Tau]=0; -known[eFACTION.Tyranids]=0; -known[eFACTION.Chaos]=0; -known[eFACTION.Heretics]=0; -known[12]=0; -known[eFACTION.Necrons]=0; // UI testing // known[eFACTION.Inquisition]=1;known[eFACTION.Ecclesiarchy]=1;known[eFACTION.Eldar]=1;known[eFACTION.Ork]=1;known[eFACTION.Tau]=1;known[eFACTION.Tyranids]=1;known[eFACTION.Chaos]=1; @@ -1182,35 +1136,9 @@ known[eFACTION.Necrons]=0; // disposition[4]=90; // disposition[3]=60; // ** Sets diplomacy annoyed status ** -annoyed[0]=0; -annoyed[eFACTION.Player]=0; -annoyed[eFACTION.Imperium]=0; -annoyed[eFACTION.Mechanicus]=0; -annoyed[eFACTION.Inquisition]=0; -annoyed[eFACTION.Ecclesiarchy]=0; -annoyed[eFACTION.Eldar]=0; -annoyed[eFACTION.Ork]=0; -annoyed[eFACTION.Tau]=0; -annoyed[eFACTION.Tyranids]=0; -annoyed[eFACTION.Chaos]=0; -annoyed[eFACTION.Heretics]=0; -annoyed[12]=0; -annoyed[eFACTION.Necrons]=0; +annoyed = array_create(14, 0); // ** Sets diplomacy ignore status ** -ignore[0]=0; -ignore[eFACTION.Player]=0; -ignore[eFACTION.Imperium]=0; -ignore[eFACTION.Mechanicus]=0; -ignore[eFACTION.Inquisition]=0; -ignore[eFACTION.Ecclesiarchy]=0; -ignore[eFACTION.Eldar]=0; -ignore[eFACTION.Ork]=0; -ignore[eFACTION.Tau]=0; -ignore[eFACTION.Tyranids]=0; -ignore[eFACTION.Chaos]=0; -ignore[eFACTION.Heretics]=0; -ignore[12]=0; -ignore[eFACTION.Necrons]=0; +ignore = array_create(14, 0); // ** Sets diplomacy turns to be ignored ** turns_ignored[0]=0; turns_ignored[1]=0; diff --git a/objects/obj_ini/Create_0.gml b/objects/obj_ini/Create_0.gml index 36ca47d6cb..b075fbcac3 100644 --- a/objects/obj_ini/Create_0.gml +++ b/objects/obj_ini/Create_0.gml @@ -31,21 +31,21 @@ artifact_struct = array_create(200); // Equipment- maybe the bikes should go here or something? yes they should equipment = {}; -i=-1; -repeat(200){i+=1; - artifact[i]=""; - artifact_equipped[i]=false; - artifact_tags[i]=[]; - artifact_identified[i]=0; - artifact_condition[i]=100; - artifact_quality[i]="artifact"; - artifact_loc[i]=""; - artifact_sid[i]=0;// Over 500 : ship - // Weapon Unidentified - artifact_struct[i] = new ArtifactStruct(i); + +var _artifact_array_size = 200; +artifact = array_create(_artifact_array_size, ""); +artifact_equipped = array_create(_artifact_array_size, false); +artifact_tags = array_create_advanced(_artifact_array_size, []); +artifact_identified = array_create(_artifact_array_size, 0); +artifact_condition = array_create(_artifact_array_size, 100); +artifact_quality = array_create(_artifact_array_size, "artifact"); +artifact_loc = array_create(_artifact_array_size, ""); +artifact_sid = array_create(_artifact_array_size, 0); +artifact_struct = array_create(_artifact_array_size); +for (var i = 0; i < _artifact_array_size; i++) { + artifact_struct[i] = new ArtifactStruct(i); } -var i=-1; init_player_fleet_arrays(); ship_id = []; diff --git a/objects/obj_star/Create_0.gml b/objects/obj_star/Create_0.gml index 5e0c32b8f0..2e9613b634 100644 --- a/objects/obj_star/Create_0.gml +++ b/objects/obj_star/Create_0.gml @@ -28,54 +28,47 @@ stored_owner = -1; star_surface = 0; // sets up default planet variables -for(run=1; run<=8; run++){ - planet[run]=0; - dispo[run]=-50; - p_type[run]=""; - p_operatives[run]=[]; - p_feature[run]=[]; - p_owner[run]=0; - p_first[run]=0; - p_population[run]=0; - p_max_population[run]=0; - p_large[run]=0; - p_pop[run]=""; - p_guardsmen[run]=0; - p_pdf[run]=0; - p_fortified[run]=0; - p_station[run]=0; - //warlord=0; uneeded i think - // Whether or not player forces are on the planet - p_player[run]=0; - p_lasers[run]=0; - p_silo[run]=0; - p_defenses[run]=0; - p_upgrades[run]=[]; - // v how much of a problem they are from 1-6 - p_orks[run]=0; - p_tau[run]=0; - p_eldar[run]=0; - p_tyranids[run]=0; - p_traitors[run]=0; - p_chaos[run]=0; - p_demons[run]=0; - p_sisters[run]=0; - p_necrons[run]=0; - p_halp[run]=0; - // current planet heresy - p_heresy[run]=0; - p_hurssy[run]=0; - p_hurssy_time[run]=0; - p_heresy_secret[run]=0; - p_influence[run] = array_create(15, 0); - - p_raided[run]=0; - // - p_governor[run] = ""; - p_problem[run] = array_create(8,""); - p_problem_other_data[run] = array_create(8,{}); - p_timer[run] = array_create(8,-1); -} +var _planet_array_size = 9; +planet = array_create(_planet_array_size, 0); +dispo = array_create(_planet_array_size, -50); +p_type = array_create(_planet_array_size, ""); +p_owner = array_create(_planet_array_size, 0); +p_first = array_create(_planet_array_size, 0); +p_population = array_create(_planet_array_size, 0); +p_max_population = array_create(_planet_array_size, 0); +p_large = array_create(_planet_array_size, 0); +p_pop = array_create(_planet_array_size, ""); +p_guardsmen = array_create(_planet_array_size, 0); +p_pdf = array_create(_planet_array_size, 0); +p_fortified = array_create(_planet_array_size, 0); +p_station = array_create(_planet_array_size, 0); +p_player = array_create(_planet_array_size, 0); +p_lasers = array_create(_planet_array_size, 0); +p_silo = array_create(_planet_array_size, 0); +p_defenses = array_create(_planet_array_size, 0); +p_orks = array_create(_planet_array_size, 0); +p_tau = array_create(_planet_array_size, 0); +p_eldar = array_create(_planet_array_size, 0); +p_tyranids = array_create(_planet_array_size, 0); +p_traitors = array_create(_planet_array_size, 0); +p_chaos = array_create(_planet_array_size, 0); +p_demons = array_create(_planet_array_size, 0); +p_sisters = array_create(_planet_array_size, 0); +p_necrons = array_create(_planet_array_size, 0); +p_halp = array_create(_planet_array_size, 0); +p_heresy = array_create(_planet_array_size, 0); +p_hurssy = array_create(_planet_array_size, 0); +p_hurssy_time = array_create(_planet_array_size, 0); +p_heresy_secret = array_create(_planet_array_size, 0); +p_raided = array_create(_planet_array_size, 0); +p_governor = array_create(_planet_array_size, ""); +p_operatives = array_create_advanced(_planet_array_size, []); +p_feature = array_create_advanced(_planet_array_size, []); +p_upgrades = array_create_advanced(_planet_array_size, []); +p_influence = array_create_advanced(_planet_array_size, array_create(15, 0)); +p_problem = array_create_advanced(_planet_array_size, array_create(8, "")); +p_problem_other_data = array_create_advanced(_planet_array_size, array_create_advanced(8, {})); +p_timer = array_create_advanced(_planet_array_size, array_create(8, -1)); system_player_ground_forces = 0; garrison = false; diff --git a/scripts/scr_array_functions/scr_array_functions.gml b/scripts/scr_array_functions/scr_array_functions.gml index 2dda8146a8..21e1c00633 100644 --- a/scripts/scr_array_functions/scr_array_functions.gml +++ b/scripts/scr_array_functions/scr_array_functions.gml @@ -277,3 +277,10 @@ function array_set_range(_array, _start_index, _end_index, _value) { _array[@ i] = _value; } } + +/// @description Similar to array_create, but uses `variable_clone()` to clone the default if it's a complex type (array/struct). Supports default with nesting. +/// @param {Real} _size The size of the array to create. +/// @param {Any} _default The value to set for the elements. +function array_create_advanced(_size, _default = 0) { + return array_create(_size, variable_clone(_default)); +} diff --git a/scripts/scr_turn_first/scr_turn_first.gml b/scripts/scr_turn_first/scr_turn_first.gml index e1c292a726..c470e2540b 100644 --- a/scripts/scr_turn_first/scr_turn_first.gml +++ b/scripts/scr_turn_first/scr_turn_first.gml @@ -1,82 +1,75 @@ function scr_turn_first() { - try{ - // I believe this is ran at the start of the end of the turn. That would make sense, right? + try { + // I believe this is ran at the start of the end of the turn. That would make sense, right? - var identifiable=0; - var unload=0; - var cur_arti; - for (var i=0;i-1){ - obj_ini.artifact_loc[unload] = obj_ini.ship[valid_ship]; - obj_ini.artifact_sid[unload] = 500+valid_ship; - } - } - if (cur_arti.identified()>0){ - var _identifiable = cur_arti.is_identifiable() - - if (instance_exists(obj_p_fleet)) and (!_identifiable){ - var _arti_fleet = find_ships_fleet(cur_arti.ship_id()); - if (_arti_fleet!="none"){ - if (array_length(_arti_fleet.capital_num)){ - _identifiable = true; - cur_arti.set_ship_id(_arti_fleet.capital_num[0]); - } - } - } - - if (_identifiable) then obj_ini.artifact_identified[unload]-=1; - if (obj_ini.artifact_identified[unload]=0) then scr_alert("green","artifact","Artifact ("+string(obj_ini.artifact[unload])+") has been identified.",0,0); - } - _identifiable=false; - } - unload=0; + var _unload_i = 0; + for (var i = 0, l = array_length(obj_ini.artifact); i < l; i++) { + _unload_i = i; + if (obj_ini.artifact[_unload_i] == "") { + continue; + } + var _cur_arti = obj_ini.artifact_struct[_unload_i]; + if (_cur_arti.loc() == "") { + var _valid_ship_i = get_valid_player_ship(); + if (_valid_ship_i > -1) { + obj_ini.artifact_loc[_unload_i] = obj_ini.ship[_valid_ship_i]; + obj_ini.artifact_sid[_unload_i] = 500 + _valid_ship_i; + } + } + if (_cur_arti.identified() > 0) { + var _identifiable = _cur_arti.is_identifiable(); + if (instance_exists(obj_p_fleet) && (!_identifiable)) { + var _arti_fleet = find_ships_fleet(_cur_arti.ship_id()); + if (_arti_fleet != "none") { + if (array_length(_arti_fleet.capital_num)) { + _identifiable = true; + _cur_arti.set_ship_id(_arti_fleet.capital_num[0]); + } + } + } - var host_p,ox,oy,x5,y5,fdir; - ox=0;oy=0;x5=0;y5=0;fdir=0; + if (_identifiable) { + obj_ini.artifact_identified[_unload_i] -= 1; + } + if (obj_ini.artifact_identified[_unload_i] == 0) { + scr_alert("green", "artifact", "Artifact (" + string(obj_ini.artifact[_unload_i]) + ") has been identified.", 0, 0); + } + } + } - var peace_check = (turn > 100); - // peace_check=1;// Testing - host_p=0; + var _peace_check = obj_controller.turn > 100; + // peace_check=1;// Testing - if (peace_check>0){ - var _baddy = 0; - var _total = 0; - with(obj_star){ - if (owner>5){ - _baddy = 0; - o = 0; - repeat(planets){ - o+=1; - if (p_orks[o]+p_tyranids[o]+p_chaos[o]+p_traitors[o]+p_necrons[o]>=3) then _baddy+=1; - } - if (_baddy>0) { - _total++; - } - } - } - if (_total<=3){ - peace_check=2; - } - if (peace_check==2){ - if (turn>=150) and (faction_defeated[10]=0) and (known[eFACTION.Chaos]=0) and (faction_gender[10]=2){ - // if (turn>=100000) and (faction_defeated[10]=0) and (known[eFACTION.Chaos]=0){faction_gender[10]=2; - spawn_chaos_warlord(); - - } else { - out_of_system_warboss(); - } - } - } - }catch(_exception) { - handle_exception(_exception); - } + if (_peace_check > 0) { + var _total = 0; + with (obj_star) { + if (owner > 5) { + var _baddy = 0; + var o = 0; + repeat (planets) { + o++; + if (p_orks[o] + p_tyranids[o] + p_chaos[o] + p_traitors[o] + p_necrons[o] >= 3) { + _baddy++; + } + } + if (_baddy > 0) { + _total++; + } + } + } + if (_total <= 3) { + if ((obj_controller.turn >= 150) && (obj_controller.faction_defeated[eFACTION.Chaos] == 0) && (obj_controller.known[eFACTION.Chaos] == 0) && (obj_controller.faction_gender[eFACTION.Chaos] == 2)) { + // if (turn>=100000) and (faction_defeated[10]=0) and (known[eFACTION.Chaos]=0){faction_gender[10]=2; + spawn_chaos_warlord(); + } else { + out_of_system_warboss(); + } + } + } + } catch (_exception) { + handle_exception(_exception); + } } From 34147e604d2c88dcdeb0d55a7e8e1494bf62e03e Mon Sep 17 00:00:00 2001 From: EttyKitty <20323032+EttyKitty@users.noreply.github.com> Date: Mon, 2 Jun 2025 16:33:43 +0300 Subject: [PATCH 072/286] refactor: Vehicle size map to struct (#855) --- scripts/scr_unit_size/scr_unit_size.gml | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/scripts/scr_unit_size/scr_unit_size.gml b/scripts/scr_unit_size/scr_unit_size.gml index 0a93b61ff2..b14c5deb21 100644 --- a/scripts/scr_unit_size/scr_unit_size.gml +++ b/scripts/scr_unit_size/scr_unit_size.gml @@ -1,12 +1,14 @@ // TODO sizes should really be held in the vehicle's struct function get_vehicle_size_map() { - var vehicle_size_map = ds_map_create(); - vehicle_size_map[? "Rhino"] = 10; - vehicle_size_map[? "Predator"] = 10; - vehicle_size_map[? "Land Raider"] = 20; - vehicle_size_map[? "Land Speeder"] = 5; - vehicle_size_map[? "Whirlwind"] = 10; - vehicle_size_map[? "Harlequin Troupe"] = 5; + var vehicle_size_map = { + "Rhino": 10, + "Predator": 10, + "Land Raider": 20, + "Land Speeder": 5, + "Whirlwind": 10, + "Harlequin Troupe": 5 + }; + return vehicle_size_map; } @@ -28,13 +30,13 @@ function scr_unit_size(armour, role, other_factors, mobility=false) { if (role == obj_ini.role[100][eROLE.ChapterMaster]) { _size++; - } else if (ds_map_exists(vehicle_size_map, role)) { - _size = vehicle_size_map[? role]; + } else if (struct_exists(vehicle_size_map, role)) { + _size = vehicle_size_map[$ role]; } else if (armour=="") { show_debug_message($"Could not find size for vehicle '{role}'"); } - ds_map_destroy(vehicle_size_map); + delete(vehicle_size_map); return (_size); } \ No newline at end of file From 14d9eca1ed7f5599af7cbef375d2e9e98b870a93 Mon Sep 17 00:00:00 2001 From: Luke Van Epen Date: Tue, 3 Jun 2025 01:20:10 +1000 Subject: [PATCH 073/286] fix: Various issues caused by missing autosave file (#857) --- ChapterMaster.yyp | 3 +- objects/obj_creation/Create_0.gml | 47 ++++++++------------ objects/obj_ingame_menu/Step_0.gml | 30 +++++++++++-- objects/obj_saveload/Create_0.gml | 8 ++++ objects/obj_saveload/Draw_0.gml | 6 --- scripts/DebugView/DebugView.gml | 70 ++++++++++++++++++++++++++++++ scripts/DebugView/DebugView.yy | 13 ++++++ scripts/macros/macros.gml | 1 + 8 files changed, 137 insertions(+), 41 deletions(-) create mode 100644 scripts/DebugView/DebugView.gml create mode 100644 scripts/DebugView/DebugView.yy diff --git a/ChapterMaster.yyp b/ChapterMaster.yyp index 3991233425..f72a9baa11 100644 --- a/ChapterMaster.yyp +++ b/ChapterMaster.yyp @@ -52,8 +52,8 @@ {"$GMFolder":"","%Name":"Sequences","folderPath":"folders/Sequences.yy","name":"Sequences","resourceType":"GMFolder","resourceVersion":"2.0",}, {"$GMFolder":"","%Name":"Shaders","folderPath":"folders/Shaders.yy","name":"Shaders","resourceType":"GMFolder","resourceVersion":"2.0",}, {"$GMFolder":"","%Name":"Sounds","folderPath":"folders/Sounds.yy","name":"Sounds","resourceType":"GMFolder","resourceVersion":"2.0",}, - {"$GMFolder":"","%Name":"UI","folderPath":"folders/Sounds/UI.yy","name":"UI","resourceType":"GMFolder","resourceVersion":"2.0",}, {"$GMFolder":"","%Name":"Themes","folderPath":"folders/Sounds/Themes.yy","name":"Themes","resourceType":"GMFolder","resourceVersion":"2.0",}, + {"$GMFolder":"","%Name":"UI","folderPath":"folders/Sounds/UI.yy","name":"UI","resourceType":"GMFolder","resourceVersion":"2.0",}, {"$GMFolder":"","%Name":"Unused","folderPath":"folders/Sounds/Unused.yy","name":"Unused","resourceType":"GMFolder","resourceVersion":"2.0",}, {"$GMFolder":"","%Name":"Sprites","folderPath":"folders/Sprites.yy","name":"Sprites","resourceType":"GMFolder","resourceVersion":"2.0",}, {"$GMFolder":"","%Name":"Marine Viewer","folderPath":"folders/Sprites/Marine Viewer.yy","name":"Marine Viewer","resourceType":"GMFolder","resourceVersion":"2.0",}, @@ -715,6 +715,7 @@ {"id":{"name":"clean_tags","path":"scripts/clean_tags/clean_tags.yy",},}, {"id":{"name":"d3d_set_fog","path":"scripts/d3d_set_fog/d3d_set_fog.yy",},}, {"id":{"name":"debugl","path":"scripts/debugl/debugl.yy",},}, + {"id":{"name":"DebugView","path":"scripts/DebugView/DebugView.yy",},}, {"id":{"name":"DiploBasicNodes","path":"scripts/DiploBasicNodes/DiploBasicNodes.yy",},}, {"id":{"name":"DiploCommonComponents","path":"scripts/DiploCommonComponents/DiploCommonComponents.yy",},}, {"id":{"name":"draw_line_dashed","path":"scripts/draw_line_dashed/draw_line_dashed.yy",},}, diff --git a/objects/obj_creation/Create_0.gml b/objects/obj_creation/Create_0.gml index ece6cde89e..1a31c0cfc5 100644 --- a/objects/obj_creation/Create_0.gml +++ b/objects/obj_creation/Create_0.gml @@ -44,36 +44,23 @@ successor_y = 250; custom_y = 463; /// y coord of Other section heading other_y = 593; -var show_debug = false; -if(show_debug){ - show_debug_overlay(true); - dbg_view("obj_creation_dbg", true); - dbg_section("Icon Grid"); - ref_to_max_cols = ref_create(self, "max_cols"); - ref_to_icon_width = ref_create(self, "icon_width"); - ref_to_icon_height = ref_create(self, "icon_height"); - ref_to_icon_grid_left_edge = ref_create(self, "icon_grid_left_edge"); - ref_to_icon_gap_y = ref_create(self, "icon_gap_y"); - ref_to_icon_gap_x = ref_create(self, "icon_gap_x"); - ref_to_icon_row_gap = ref_create(self, "icon_row_gap"); - dbg_slider_int(ref_to_max_cols,1,15); - dbg_slider_int(ref_to_icon_width,1,100); - dbg_slider_int(ref_to_icon_height,1,100); - dbg_slider_int(ref_to_icon_grid_left_edge,1,1000); - dbg_slider_int(ref_to_icon_gap_y,1,300); - dbg_slider_int(ref_to_icon_gap_x,1,300); - dbg_slider_int(ref_to_icon_row_gap,1,300); - - dbg_section("Heading Positions") - ref_to_founding_y = ref_create(self, "founding_y"); - ref_to_successor_y = ref_create(self, "successor_y"); - ref_to_custom_y = ref_create(self, "custom_y"); - ref_to_other_y = ref_create(self, "other_y"); - dbg_slider_int(ref_to_founding_y,1,1000); - dbg_slider_int(ref_to_successor_y,1,1000); - dbg_slider_int(ref_to_custom_y,1,1000); - dbg_slider_int(ref_to_other_y,1,1000); -} + +var view = new DebugView("Obj Creation Grid", self); +view.add_section("Icon Grid") +.add_slider_int("max_cols", 1, 15) +.add_slider_int("icon_width", 1 ,100) +.add_slider_int("icon_height", 1, 100) +.add_slider_int("icon_grid_left_edge", 1, 1000) +.add_slider_int("icon_gap_y", 1 , 300) +.add_slider_int("icon_gap_x", 1, 300) +.add_slider_int("icon_row_gap", 1, 300) +.add_section("Heading Positions") +.add_slider_int("founding_y", 1, 1000) +.add_slider_int("successor_y", 1, 1000) +.add_slider_int("custom_y", 1, 1000) +.add_slider_int("other_y", 1, 1000) +.hide(); + #endregion window_data=string(window_get_x())+"|"+string(window_get_y())+"|"+string(window_get_width())+"|"+string(window_get_height())+"|"; diff --git a/objects/obj_ingame_menu/Step_0.gml b/objects/obj_ingame_menu/Step_0.gml index ca3051f107..bdf8a34299 100644 --- a/objects/obj_ingame_menu/Step_0.gml +++ b/objects/obj_ingame_menu/Step_0.gml @@ -5,11 +5,33 @@ var xx,yy; xx=__view_get( e__VW.XView, 0 )+0; yy=__view_get( e__VW.YView, 0 )+0; -if (effect=11) and (!instance_exists(obj_saveload)){var sav,butt; +if (effect=11) and (!instance_exists(obj_saveload)){ + var sav,butt; with(obj_new_button){x-=2000;y-=2000;} - sav=instance_create(0,0,obj_saveload);sav.menu=1; - butt=instance_create(xx+707,yy+830,obj_new_button);butt.sprite_index=spr_ui_but_1; - butt.depth=-20010;butt.button_text="Back";butt.button_id=1;butt.scaling=1.5;butt.target=18; + + // Force an autosave if none exists the first time someone clicks into the save menu + if(!file_exists(PATH_autosave_file)){ + if(!instance_exists(obj_saveload)){ + instance_create(0,0,obj_saveload); + } + obj_saveload.autosaving = true; + with (obj_controller){ + scr_save(0,0,true); + } + with(obj_saveload){ + instance_destroy(); + } + } + + sav=instance_create(0,0,obj_saveload); + sav.menu=1; + butt=instance_create(xx+707,yy+830,obj_new_button); + butt.sprite_index=spr_ui_but_1; + butt.depth=-20010; + butt.button_text="Back"; + butt.button_id=1; + butt.scaling=1.5; + butt.target=18; } if (effect=12) and (!instance_exists(obj_saveload)){var sav,butt; with(obj_new_button){x-=2000;y-=2000;} diff --git a/objects/obj_saveload/Create_0.gml b/objects/obj_saveload/Create_0.gml index 14213cd64e..2ce7683417 100644 --- a/objects/obj_saveload/Create_0.gml +++ b/objects/obj_saveload/Create_0.gml @@ -104,3 +104,11 @@ if (file_exists("saves.ini")){ ini_close(); } +var view = new DebugView("Save Debug", self); +view.add_section("Save Vars") +.add_watch("menu") +.add_watch("first_open") +.add_watch("top") +.add_watch("debug") +.dump_props() +.hide(); \ No newline at end of file diff --git a/objects/obj_saveload/Draw_0.gml b/objects/obj_saveload/Draw_0.gml index 32264d127f..4fbe6a0d25 100644 --- a/objects/obj_saveload/Draw_0.gml +++ b/objects/obj_saveload/Draw_0.gml @@ -41,13 +41,7 @@ if (menu=1) or (menu=2){// This is the other one if (room_get_name(room)="Main_Menu") then draw_rectangle(0,0,room_width,707,0); draw_set_alpha(1); - draw_set_color(c_red); - draw_set_font(fnt_40k_14); - draw_set_halign(fa_left); - // draw_text(xx+40,yy+730,"Menu: "+string(menu)+", First Open: "+string(first_open)+", Top Save: "+string(top)); - // draw_text(xx+40,yy+730,string(debug)); draw_set_halign(fa_center); - draw_set_color(0); draw_sprite(spr_save_header,0,xx+0,yy+27); diff --git a/scripts/DebugView/DebugView.gml b/scripts/DebugView/DebugView.gml new file mode 100644 index 0000000000..6fc83350f1 --- /dev/null +++ b/scripts/DebugView/DebugView.gml @@ -0,0 +1,70 @@ + +/// Slightly nicer syntax for working with dbg_views. +/// Functions can be chained for simpler construction. +/// Parameters passed into the "add_" functions should always match instance variable names. Local variables don't work with dbg_views. +/// Creating a debug view opens the overlay automatically, finish construction with .hide() to prevent it from open automatically during regular play. +/// @param {String} view_name the title of the view +/// @param {Id.Instance|Struct} obj The object being debugged. Can be a regular struct, an instance or a full object +function DebugView(view_name, obj) constructor { + + view_ptr = dbg_view(view_name, false); // calling dbg_view opens the overlay automatically + obj_ref = obj; + name = view_name; + + static add_watch = function (_name, _label = _name){ + dbg_watch(ref_create(self.obj_ref, _name), _label); + return self; + } + + static add_slider_int = function(_name, min, max, label = _name, step = 1){ + dbg_slider_int(ref_create(self.obj_ref, _name), min, max, label, step); + return self; + } + + static add_slider = function(_name, min, max, label = _name, step = 0.01){ + dbg_slider(ref_create(self.obj_ref, _name), min, max, label = name, step); + return self; + } + + static add_checkbox = function(_name, _label = _name){ + dbg_checkbox(ref_create(self.obj_ref, _name), _label); + return self; + } + + static add_button = function(_label, fn){ + dbg_button(_label, fn); + return self; + } + + static add_section = function(_name, _open = true) { + dbg_section(_name, true); + return self; + } + + static show = function(){ + show_debug_overlay(true); + dbg_set_view(self.view_ptr) + return self; + } + + static hide = function(){ + show_debug_overlay(false); + return self; + } + + static delete_view = function(){ + dbg_view_delete(self.view_ptr); + return self; + } + + /// quick and dirty way to display all variables of the given obj in a dbg section + static dump_props = function(){ + dbg_section("Dump Props"); + var names = struct_get_names(self.obj_ref); + for(var i = 0; i < array_length(names); i++){ + dbg_watch(ref_create(self.obj_ref, names[i])); + } + + return self; + } +} \ No newline at end of file diff --git a/scripts/DebugView/DebugView.yy b/scripts/DebugView/DebugView.yy new file mode 100644 index 0000000000..92da1986c4 --- /dev/null +++ b/scripts/DebugView/DebugView.yy @@ -0,0 +1,13 @@ +{ + "$GMScript":"v1", + "%Name":"DebugView", + "isCompatibility":false, + "isDnD":false, + "name":"DebugView", + "parent":{ + "name":"Helpers", + "path":"folders/Scripts/Helpers.yy", + }, + "resourceType":"GMScript", + "resourceVersion":"2.0", +} \ No newline at end of file diff --git a/scripts/macros/macros.gml b/scripts/macros/macros.gml index ea957d6d89..aab5e294f3 100644 --- a/scripts/macros/macros.gml +++ b/scripts/macros/macros.gml @@ -18,6 +18,7 @@ #macro LIST_BASIC_POWER_ARMOUR ["MK7 Aquila", "MK6 Corvus", "MK5 Heresy", "MK8 Errant", "MK4 Maximus", "MK3 Iron Armour","Power Armour"] #macro LIST_TERMINATOR_ARMOUR ["Terminator Armour", "Tartaros"] + enum luck { bad = -1, neutral = 0, From 0e2a1bbc88c9c6a7a556666d7f706fb6f95a6d89 Mon Sep 17 00:00:00 2001 From: EttyKitty <20323032+EttyKitty@users.noreply.github.com> Date: Mon, 2 Jun 2025 18:20:41 +0300 Subject: [PATCH 074/286] fix: Fort targeting (#854) --- objects/obj_enunit/Alarm_0.gml | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/objects/obj_enunit/Alarm_0.gml b/objects/obj_enunit/Alarm_0.gml index 07e44329f8..ba93e60882 100644 --- a/objects/obj_enunit/Alarm_0.gml +++ b/objects/obj_enunit/Alarm_0.gml @@ -14,7 +14,6 @@ var enemy2 = enemy; //In melee check engaged = collision_point(x-10, y, obj_pnunit, 0, 1) || collision_point(x+10, y, obj_pnunit, 0, 1); -// show_debug_message($"enemy is in melee {engaged}") if (!engaged){ // Shooting for (var i=0;i= dist) { // The weapon is in range; @@ -111,11 +116,9 @@ if (!engaged){ // Shooting } } else { enemy=instance_nearest(x,y,obj_nfort); - if (range[i] >= get_block_distance(enemy)) { scr_shoot(i,enemy,1,"arp","wall"); // show_debug_message($"I'm shooting at the fort! {wep[i]}; Column ID: {id}; Enemy Unit: {wep_owner[i]}"); continue; - } } } @@ -194,11 +197,9 @@ if (!engaged){ // Shooting } } else { enemy=instance_nearest(x,y,obj_nfort); - if (range[i] >= get_block_distance(enemy)) { scr_shoot(i,enemy,1,"att","wall"); // show_debug_message($"I'm shooting at a fort, because I can't find a normal unit! {wep[i]}; Column ID: {id}; Enemy Unit: {wep_owner[i]}"); continue; - } } } } From d47170c912db831e6da0a8eea1eeea4d8804b6a2 Mon Sep 17 00:00:00 2001 From: Nelsonh <81228864+OH296@users.noreply.github.com> Date: Mon, 2 Jun 2025 22:15:49 +0100 Subject: [PATCH 075/286] feat: Alpha style bits (#836) --- ChapterMaster.yyp | 10 +- scripts/scr_ComplexSet/scr_ComplexSet.gml | 42 +++++- .../scr_culture_visuals.gml | 123 +++++++++++++++++- .../scr_draw_unit_image.gml | 73 ----------- .../b8e39c4b-d4da-4ef0-8433-a2ff2ec9115a.png | Bin 0 -> 1559 bytes .../39cb22a8-79fe-4d1d-96c2-78c089342379.png | Bin 0 -> 1559 bytes .../spr_alpha_backpack/spr_alpha_backpack.yy | 111 ++++++++++++++++ .../spr_chaplain_wolfterm_helm.yy | 6 +- .../58ee1e71-509f-4b0e-ab39-17c8da2a0687.png | Bin 0 -> 1114 bytes .../ef1f92c3-6086-487a-a4a8-c38f6098016b.png | Bin 0 -> 1114 bytes .../spr_checker_texture_small.yy | 111 ++++++++++++++++ sprites/spr_cloak_fur/spr_cloak_fur.yy | 6 +- .../66d4ebbb-311f-4ed4-9ab0-84b9e5a937ec.png | Bin 1571 -> 1629 bytes .../69575369-6061-47a6-b608-894dae3a1efd.png | Bin 1154 -> 1210 bytes .../25a3433d-721c-49ce-8a7a-3513cf831ef5.png | Bin 1571 -> 1629 bytes .../25a3433d-721c-49ce-8a7a-3513cf831ef5.png | Bin 1154 -> 1210 bytes sprites/spr_da_backpack/spr_da_backpack.yy | 18 ++- .../spr_da_mk5_helm_crests.yy | 6 +- .../e5637504-add9-474b-ae10-1e954d497810.png | Bin 1137 -> 1172 bytes .../ee39ecff-a565-42aa-99f0-f549f95bc5a0.png | Bin 1251 -> 1286 bytes .../330f878c-cc0f-48bf-a507-68961e6c03cd.png | Bin 1137 -> 1172 bytes .../330f878c-cc0f-48bf-a507-68961e6c03cd.png | Bin 1251 -> 1286 bytes .../spr_dev_pack_complex.yy | 24 ++-- .../spr_generic_honor_guard.yy | 26 +++- .../spr_hazzard_texture.yy | 14 +- sprites/spr_honor_helm/spr_honor_helm.yy | 22 +++- .../26a48129-bbce-4502-98fa-bb1536100ae8.png | Bin 677 -> 713 bytes .../3c4a6865-1bd0-4736-afba-d1184eb7c9c2.png | Bin 662 -> 698 bytes .../f263cbc2-c596-4d91-bf6e-98df697e82d6.png | Bin 482 -> 518 bytes .../62b09ae3-d70e-4c96-a796-f9dc9b29190d.png | Bin 677 -> 713 bytes .../62b09ae3-d70e-4c96-a796-f9dc9b29190d.png | Bin 662 -> 698 bytes .../62b09ae3-d70e-4c96-a796-f9dc9b29190d.png | Bin 482 -> 518 bytes .../spr_indomitus_backpack_variants.yy | 24 ++-- .../spr_indomitus_left_leg_bionic.yy | 6 +- .../c5bc43cd-b567-4673-92b9-efede7a0b44f.png | Bin 1813 -> 1872 bytes .../0e8b239a-6017-4ba5-8cbe-9353a86768ec.png | Bin 1813 -> 1872 bytes .../spr_jump_pack_complex.yy | 16 ++- .../spr_leopard_sprite/spr_leopard_sprite.yy | 14 +- .../358913f3-25cd-4411-aa3a-01c656c1166c.png | Bin 5235 -> 5310 bytes .../9f0d4e11-dbb4-4a1d-a21b-c96ba3d82387.png | Bin 5235 -> 5310 bytes .../d9e2c0be-152c-435b-b546-d987a36b384c.png | Bin 439 -> 439 bytes sprites/spr_mk3_complex/spr_mk3_complex.yy | 4 +- .../1b7c53e0-54ee-4ded-bfb1-a4a19c2f498f.png | Bin 1003 -> 1060 bytes .../9bf31ffc-9a0a-492f-89fb-b703fed172b9.png | Bin 1003 -> 1060 bytes .../spr_mk3_complex_backpack.yy | 16 ++- .../spr_mk3_forehead_variants.yy | 30 ++++- .../31a02b91-20f6-4e25-8262-cdd09b5a5081.png | Bin 0 -> 881 bytes .../791128a9-6e7d-45a1-9768-df389631c490.png | Bin 0 -> 690 bytes .../7945b113-31a9-4792-8b3d-f168bac8c94f.png | Bin 0 -> 839 bytes .../9f0d4e11-dbb4-4a1d-a21b-c96ba3d82387.png | Bin 0 -> 881 bytes .../9f0d4e11-dbb4-4a1d-a21b-c96ba3d82387.png | Bin 0 -> 690 bytes .../9f0d4e11-dbb4-4a1d-a21b-c96ba3d82387.png | Bin 0 -> 839 bytes .../spr_mk3_left_knee.yy} | 34 +++-- .../04fc9961-d557-4205-a023-dd867df0fdfb.png | Bin 1348 -> 0 bytes .../1ac1a90e-a16e-421a-8a7c-2edb61a4b0df.png | Bin 1516 -> 0 bytes .../9e7144c8-574e-488a-bdf9-38b61ac9a946.png | Bin 1537 -> 0 bytes .../9f0d4e11-dbb4-4a1d-a21b-c96ba3d82387.png | Bin 1348 -> 0 bytes .../9f0d4e11-dbb4-4a1d-a21b-c96ba3d82387.png | Bin 1516 -> 0 bytes .../9f0d4e11-dbb4-4a1d-a21b-c96ba3d82387.png | Bin 1537 -> 0 bytes .../04fc9961-d557-4205-a023-dd867df0fdfb.png | Bin 0 -> 714 bytes .../1ac1a90e-a16e-421a-8a7c-2edb61a4b0df.png | Bin 0 -> 868 bytes .../9e7144c8-574e-488a-bdf9-38b61ac9a946.png | Bin 0 -> 986 bytes .../9f0d4e11-dbb4-4a1d-a21b-c96ba3d82387.png | Bin 0 -> 714 bytes .../9f0d4e11-dbb4-4a1d-a21b-c96ba3d82387.png | Bin 0 -> 868 bytes .../9f0d4e11-dbb4-4a1d-a21b-c96ba3d82387.png | Bin 0 -> 986 bytes .../spr_mk3_right_knee.yy} | 26 ++-- .../04fc9961-d557-4205-a023-dd867df0fdfb.png | Bin 1376 -> 0 bytes .../1ac1a90e-a16e-421a-8a7c-2edb61a4b0df.png | Bin 1527 -> 0 bytes .../9e7144c8-574e-488a-bdf9-38b61ac9a946.png | Bin 1589 -> 0 bytes .../9f0d4e11-dbb4-4a1d-a21b-c96ba3d82387.png | Bin 1376 -> 0 bytes .../9f0d4e11-dbb4-4a1d-a21b-c96ba3d82387.png | Bin 1527 -> 0 bytes .../9f0d4e11-dbb4-4a1d-a21b-c96ba3d82387.png | Bin 1589 -> 0 bytes sprites/spr_mk4_complex/spr_mk4_complex.yy | 6 +- .../a43406eb-6236-415d-9902-e818a2185ba9.png | Bin 839 -> 895 bytes .../32295d2f-e43c-4d2b-a49d-2a445111c733.png | Bin 839 -> 895 bytes .../spr_mk4_complex_backpack.yy | 16 ++- .../9aa55975-2b4b-4679-8fd7-f6141f200e93.png | Bin 835 -> 892 bytes .../013833bd-91ce-4c08-a77d-d15ce3981f2f.png | Bin 835 -> 892 bytes .../spr_mk5_complex_backpack.yy | 16 ++- .../557d0497-d213-4f3c-9acb-a261ca311b93.png | Bin 931 -> 988 bytes .../7dd54480-bbb1-4af4-b670-96698734e764.png | Bin 931 -> 988 bytes .../spr_mk6_complex_backpack.yy | 16 ++- .../b6ba8600-fb6b-4fa9-abc7-bdc2311eb79e.png | Bin 4281 -> 4893 bytes .../468e0a30-2dea-45bc-a7bd-4b115f803d2d.png | Bin 4281 -> 4893 bytes sprites/spr_mk7_complex/spr_mk7_complex.yy | 12 +- .../d759779c-a75b-4d79-b22b-410d27d6c6de.png | Bin 810 -> 868 bytes .../216ff805-fa19-4063-a04c-9a3542762bd3.png | Bin 810 -> 868 bytes .../spr_mk7_complex_backpack.yy | 16 ++- .../b6ba8600-fb6b-4fa9-abc7-bdc2311eb79e.png | Bin 0 -> 872 bytes .../468e0a30-2dea-45bc-a7bd-4b115f803d2d.png | Bin 0 -> 872 bytes .../88207c69-b4a6-4dcf-bff5-449f98b2cb6f.png | Bin 0 -> 439 bytes .../spr_mk7_complex_left_knee_1.yy | 112 ++++++++++++++++ .../b6ba8600-fb6b-4fa9-abc7-bdc2311eb79e.png | Bin 0 -> 851 bytes .../468e0a30-2dea-45bc-a7bd-4b115f803d2d.png | Bin 0 -> 439 bytes .../88207c69-b4a6-4dcf-bff5-449f98b2cb6f.png | Bin 0 -> 851 bytes .../spr_mk7_complex_right_knee.yy | 112 ++++++++++++++++ sprites/spr_pack_arm/spr_pack_arm.yy | 15 ++- sprites/spr_pack_arms/spr_pack_arms.yy | 14 +- .../3368318c-d87a-46c2-891b-f8d5cebbf275.png | Bin 5741 -> 6675 bytes .../4dbb61b5-014b-49c6-90e2-0a89427c2fb6.png | Bin 4427 -> 5114 bytes .../fdac9a6c-2f3a-44f5-babc-322180e5b74a.png | Bin 1396 -> 1713 bytes .../1a16b695-842b-4c36-b421-733edb7d6a1c.png | Bin 5741 -> 6675 bytes .../1a16b695-842b-4c36-b421-733edb7d6a1c.png | Bin 4427 -> 5114 bytes .../1a16b695-842b-4c36-b421-733edb7d6a1c.png | Bin 1396 -> 1713 bytes sprites/spr_pack_brazier/spr_pack_brazier.yy | 24 ++-- .../3368318c-d87a-46c2-891b-f8d5cebbf275.png | Bin 6334 -> 6417 bytes .../98aca475-f03b-4cda-b4db-4409d657d963.png | Bin 6334 -> 6417 bytes .../spr_pack_brazier2/spr_pack_brazier2.yy | 14 +- .../3368318c-d87a-46c2-891b-f8d5cebbf275.png | Bin 2086 -> 2130 bytes .../23f60daa-fe76-4e85-9875-adbeb4cce378.png | Bin 2086 -> 2130 bytes .../spr_pack_brazier3/spr_pack_brazier3.yy | 14 +- .../979ae0e5-f063-4c2b-a97a-acb0b32a860f.png | Bin 1320 -> 1355 bytes .../b1e913d3-e6e0-41c1-9cdd-2e2fb3b41530.png | Bin 1331 -> 1367 bytes .../e5637504-add9-474b-ae10-1e954d497810.png | Bin 1327 -> 1362 bytes .../330f878c-cc0f-48bf-a507-68961e6c03cd.png | Bin 1320 -> 1355 bytes .../330f878c-cc0f-48bf-a507-68961e6c03cd.png | Bin 1331 -> 1367 bytes .../330f878c-cc0f-48bf-a507-68961e6c03cd.png | Bin 1327 -> 1362 bytes .../spr_pack_devastator.yy | 20 ++- sprites/spr_pack_jump/spr_pack_jump.yy | 14 +- .../8d214563-cc0c-4310-a5c4-13f0a699a86f.png | Bin 0 -> 1496 bytes .../5a4891da-2115-41b1-bd6d-0a3eab1e83f7.png | Bin 0 -> 1496 bytes .../spr_psy_hood_alpha/spr_psy_hood_alpha.yy | 92 +++++++++++++ .../e8a1632c-8084-4d13-8d30-4732feda986c.png | Bin 0 -> 1506 bytes .../4e04fbbe-15f2-4571-aba0-3c07dcc066f0.png | Bin 0 -> 1506 bytes .../spr_psy_hood_alpha2.yy | 92 +++++++++++++ .../spr_roman_centurian_crest.yy | 14 +- sprites/spr_roman_cloak/spr_roman_cloak.yy | 6 +- .../spr_sanguin_guard/spr_sanguin_guard.yy | 10 +- .../spr_techmarine_core.yy | 42 ++++-- .../8e269d92-a1bd-4360-9ab3-d9310feae634.png | Bin 1624 -> 1682 bytes .../a3482820-22c0-4934-a6c1-87b382d13fad.png | Bin 1624 -> 1682 bytes .../spr_ultra_backpack/spr_ultra_backpack.yy | 16 ++- sprites/spr_ultra_belt/spr_ultra_belt.yy | 6 +- .../spr_ultra_honor_guard2.yy | 14 +- .../88b996d0-3ce9-4c6f-bc17-518446f0995d.png | Bin 1399 -> 1773 bytes .../a3482820-22c0-4934-a6c1-87b382d13fad.png | Bin 1399 -> 1773 bytes .../spr_ultra_right_shoulder_hanging.yy | 6 +- .../spr_ultra_tassels/spr_ultra_tassels.yy | 6 +- 138 files changed, 1218 insertions(+), 269 deletions(-) create mode 100644 sprites/spr_alpha_backpack/b8e39c4b-d4da-4ef0-8433-a2ff2ec9115a.png create mode 100644 sprites/spr_alpha_backpack/layers/b8e39c4b-d4da-4ef0-8433-a2ff2ec9115a/39cb22a8-79fe-4d1d-96c2-78c089342379.png create mode 100644 sprites/spr_alpha_backpack/spr_alpha_backpack.yy create mode 100644 sprites/spr_checker_texture_small/58ee1e71-509f-4b0e-ab39-17c8da2a0687.png create mode 100644 sprites/spr_checker_texture_small/layers/58ee1e71-509f-4b0e-ab39-17c8da2a0687/ef1f92c3-6086-487a-a4a8-c38f6098016b.png create mode 100644 sprites/spr_checker_texture_small/spr_checker_texture_small.yy create mode 100644 sprites/spr_mk3_left_knee/31a02b91-20f6-4e25-8262-cdd09b5a5081.png create mode 100644 sprites/spr_mk3_left_knee/791128a9-6e7d-45a1-9768-df389631c490.png create mode 100644 sprites/spr_mk3_left_knee/7945b113-31a9-4792-8b3d-f168bac8c94f.png create mode 100644 sprites/spr_mk3_left_knee/layers/31a02b91-20f6-4e25-8262-cdd09b5a5081/9f0d4e11-dbb4-4a1d-a21b-c96ba3d82387.png create mode 100644 sprites/spr_mk3_left_knee/layers/791128a9-6e7d-45a1-9768-df389631c490/9f0d4e11-dbb4-4a1d-a21b-c96ba3d82387.png create mode 100644 sprites/spr_mk3_left_knee/layers/7945b113-31a9-4792-8b3d-f168bac8c94f/9f0d4e11-dbb4-4a1d-a21b-c96ba3d82387.png rename sprites/{spr_mk3_left_leg_variants/spr_mk3_left_leg_variants.yy => spr_mk3_left_knee/spr_mk3_left_knee.yy} (54%) delete mode 100644 sprites/spr_mk3_left_leg_variants/04fc9961-d557-4205-a023-dd867df0fdfb.png delete mode 100644 sprites/spr_mk3_left_leg_variants/1ac1a90e-a16e-421a-8a7c-2edb61a4b0df.png delete mode 100644 sprites/spr_mk3_left_leg_variants/9e7144c8-574e-488a-bdf9-38b61ac9a946.png delete mode 100644 sprites/spr_mk3_left_leg_variants/layers/04fc9961-d557-4205-a023-dd867df0fdfb/9f0d4e11-dbb4-4a1d-a21b-c96ba3d82387.png delete mode 100644 sprites/spr_mk3_left_leg_variants/layers/1ac1a90e-a16e-421a-8a7c-2edb61a4b0df/9f0d4e11-dbb4-4a1d-a21b-c96ba3d82387.png delete mode 100644 sprites/spr_mk3_left_leg_variants/layers/9e7144c8-574e-488a-bdf9-38b61ac9a946/9f0d4e11-dbb4-4a1d-a21b-c96ba3d82387.png create mode 100644 sprites/spr_mk3_right_knee/04fc9961-d557-4205-a023-dd867df0fdfb.png create mode 100644 sprites/spr_mk3_right_knee/1ac1a90e-a16e-421a-8a7c-2edb61a4b0df.png create mode 100644 sprites/spr_mk3_right_knee/9e7144c8-574e-488a-bdf9-38b61ac9a946.png create mode 100644 sprites/spr_mk3_right_knee/layers/04fc9961-d557-4205-a023-dd867df0fdfb/9f0d4e11-dbb4-4a1d-a21b-c96ba3d82387.png create mode 100644 sprites/spr_mk3_right_knee/layers/1ac1a90e-a16e-421a-8a7c-2edb61a4b0df/9f0d4e11-dbb4-4a1d-a21b-c96ba3d82387.png create mode 100644 sprites/spr_mk3_right_knee/layers/9e7144c8-574e-488a-bdf9-38b61ac9a946/9f0d4e11-dbb4-4a1d-a21b-c96ba3d82387.png rename sprites/{spr_mk3_right_leg_variants/spr_mk3_right_leg_variants.yy => spr_mk3_right_knee/spr_mk3_right_knee.yy} (63%) delete mode 100644 sprites/spr_mk3_right_leg_variants/04fc9961-d557-4205-a023-dd867df0fdfb.png delete mode 100644 sprites/spr_mk3_right_leg_variants/1ac1a90e-a16e-421a-8a7c-2edb61a4b0df.png delete mode 100644 sprites/spr_mk3_right_leg_variants/9e7144c8-574e-488a-bdf9-38b61ac9a946.png delete mode 100644 sprites/spr_mk3_right_leg_variants/layers/04fc9961-d557-4205-a023-dd867df0fdfb/9f0d4e11-dbb4-4a1d-a21b-c96ba3d82387.png delete mode 100644 sprites/spr_mk3_right_leg_variants/layers/1ac1a90e-a16e-421a-8a7c-2edb61a4b0df/9f0d4e11-dbb4-4a1d-a21b-c96ba3d82387.png delete mode 100644 sprites/spr_mk3_right_leg_variants/layers/9e7144c8-574e-488a-bdf9-38b61ac9a946/9f0d4e11-dbb4-4a1d-a21b-c96ba3d82387.png create mode 100644 sprites/spr_mk7_complex_left_knee_1/b6ba8600-fb6b-4fa9-abc7-bdc2311eb79e.png create mode 100644 sprites/spr_mk7_complex_left_knee_1/layers/b6ba8600-fb6b-4fa9-abc7-bdc2311eb79e/468e0a30-2dea-45bc-a7bd-4b115f803d2d.png create mode 100644 sprites/spr_mk7_complex_left_knee_1/layers/b6ba8600-fb6b-4fa9-abc7-bdc2311eb79e/88207c69-b4a6-4dcf-bff5-449f98b2cb6f.png create mode 100644 sprites/spr_mk7_complex_left_knee_1/spr_mk7_complex_left_knee_1.yy create mode 100644 sprites/spr_mk7_complex_right_knee/b6ba8600-fb6b-4fa9-abc7-bdc2311eb79e.png create mode 100644 sprites/spr_mk7_complex_right_knee/layers/b6ba8600-fb6b-4fa9-abc7-bdc2311eb79e/468e0a30-2dea-45bc-a7bd-4b115f803d2d.png create mode 100644 sprites/spr_mk7_complex_right_knee/layers/b6ba8600-fb6b-4fa9-abc7-bdc2311eb79e/88207c69-b4a6-4dcf-bff5-449f98b2cb6f.png create mode 100644 sprites/spr_mk7_complex_right_knee/spr_mk7_complex_right_knee.yy create mode 100644 sprites/spr_psy_hood_alpha/8d214563-cc0c-4310-a5c4-13f0a699a86f.png create mode 100644 sprites/spr_psy_hood_alpha/layers/8d214563-cc0c-4310-a5c4-13f0a699a86f/5a4891da-2115-41b1-bd6d-0a3eab1e83f7.png create mode 100644 sprites/spr_psy_hood_alpha/spr_psy_hood_alpha.yy create mode 100644 sprites/spr_psy_hood_alpha2/e8a1632c-8084-4d13-8d30-4732feda986c.png create mode 100644 sprites/spr_psy_hood_alpha2/layers/e8a1632c-8084-4d13-8d30-4732feda986c/4e04fbbe-15f2-4571-aba0-3c07dcc066f0.png create mode 100644 sprites/spr_psy_hood_alpha2/spr_psy_hood_alpha2.yy diff --git a/ChapterMaster.yyp b/ChapterMaster.yyp index f72a9baa11..66c4506a26 100644 --- a/ChapterMaster.yyp +++ b/ChapterMaster.yyp @@ -976,6 +976,7 @@ {"id":{"name":"dsgsdgsdg","path":"sprites/dsgsdgsdg/dsgsdgsdg.yy",},}, {"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_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",},}, @@ -1045,6 +1046,7 @@ {"id":{"name":"spr_chaplain_wolf_helm","path":"sprites/spr_chaplain_wolf_helm/spr_chaplain_wolf_helm.yy",},}, {"id":{"name":"spr_chaplain_wolfterm_helm","path":"sprites/spr_chaplain_wolfterm_helm/spr_chaplain_wolfterm_helm.yy",},}, {"id":{"name":"spr_charisma_icon","path":"sprites/spr_charisma_icon/spr_charisma_icon.yy",},}, + {"id":{"name":"spr_checker_texture_small","path":"sprites/spr_checker_texture_small/spr_checker_texture_small.yy",},}, {"id":{"name":"spr_checker_texture","path":"sprites/spr_checker_texture/spr_checker_texture.yy",},}, {"id":{"name":"spr_cloak_cloth","path":"sprites/spr_cloak_cloth/spr_cloak_cloth.yy",},}, {"id":{"name":"spr_cloak_fur","path":"sprites/spr_cloak_fur/spr_cloak_fur.yy",},}, @@ -1302,13 +1304,13 @@ {"id":{"name":"spr_mk3_forehead_variants","path":"sprites/spr_mk3_forehead_variants/spr_mk3_forehead_variants.yy",},}, {"id":{"name":"spr_mk3_head_variants","path":"sprites/spr_mk3_head_variants/spr_mk3_head_variants.yy",},}, {"id":{"name":"spr_mk3_left_arm","path":"sprites/spr_mk3_left_arm/spr_mk3_left_arm.yy",},}, - {"id":{"name":"spr_mk3_left_leg_variants","path":"sprites/spr_mk3_left_leg_variants/spr_mk3_left_leg_variants.yy",},}, + {"id":{"name":"spr_mk3_left_knee","path":"sprites/spr_mk3_left_knee/spr_mk3_left_knee.yy",},}, {"id":{"name":"spr_mk3_left_trim","path":"sprites/spr_mk3_left_trim/spr_mk3_left_trim.yy",},}, {"id":{"name":"spr_mk3_mouth_flame_cult","path":"sprites/spr_mk3_mouth_flame_cult/spr_mk3_mouth_flame_cult.yy",},}, {"id":{"name":"spr_mk3_mouth_prussian","path":"sprites/spr_mk3_mouth_prussian/spr_mk3_mouth_prussian.yy",},}, {"id":{"name":"spr_mk3_mouth","path":"sprites/spr_mk3_mouth/spr_mk3_mouth.yy",},}, {"id":{"name":"spr_mk3_right_arm","path":"sprites/spr_mk3_right_arm/spr_mk3_right_arm.yy",},}, - {"id":{"name":"spr_mk3_right_leg_variants","path":"sprites/spr_mk3_right_leg_variants/spr_mk3_right_leg_variants.yy",},}, + {"id":{"name":"spr_mk3_right_knee","path":"sprites/spr_mk3_right_knee/spr_mk3_right_knee.yy",},}, {"id":{"name":"spr_mk3_right_trim","path":"sprites/spr_mk3_right_trim/spr_mk3_right_trim.yy",},}, {"id":{"name":"spr_mk3_runic_chest","path":"sprites/spr_mk3_runic_chest/spr_mk3_runic_chest.yy",},}, {"id":{"name":"spr_mk4_chest_fastenings","path":"sprites/spr_mk4_chest_fastenings/spr_mk4_chest_fastenings.yy",},}, @@ -1351,7 +1353,9 @@ {"id":{"name":"spr_mk7_complex_belt","path":"sprites/spr_mk7_complex_belt/spr_mk7_complex_belt.yy",},}, {"id":{"name":"spr_mk7_complex_crux_belt","path":"sprites/spr_mk7_complex_crux_belt/spr_mk7_complex_crux_belt.yy",},}, {"id":{"name":"spr_mk7_complex_knees","path":"sprites/spr_mk7_complex_knees/spr_mk7_complex_knees.yy",},}, + {"id":{"name":"spr_mk7_complex_left_knee_1","path":"sprites/spr_mk7_complex_left_knee_1/spr_mk7_complex_left_knee_1.yy",},}, {"id":{"name":"spr_mk7_complex_left_pauldron","path":"sprites/spr_mk7_complex_left_pauldron/spr_mk7_complex_left_pauldron.yy",},}, + {"id":{"name":"spr_mk7_complex_right_knee","path":"sprites/spr_mk7_complex_right_knee/spr_mk7_complex_right_knee.yy",},}, {"id":{"name":"spr_mk7_complex_right_pauldron","path":"sprites/spr_mk7_complex_right_pauldron/spr_mk7_complex_right_pauldron.yy",},}, {"id":{"name":"spr_mk7_complex","path":"sprites/spr_mk7_complex/spr_mk7_complex.yy",},}, {"id":{"name":"spr_mk7_full_colour","path":"sprites/spr_mk7_full_colour/spr_mk7_full_colour.yy",},}, @@ -1424,6 +1428,8 @@ {"id":{"name":"spr_postbattle_space","path":"sprites/spr_postbattle_space/spr_postbattle_space.yy",},}, {"id":{"name":"spr_postbattle","path":"sprites/spr_postbattle/spr_postbattle.yy",},}, {"id":{"name":"spr_prussian_spike","path":"sprites/spr_prussian_spike/spr_prussian_spike.yy",},}, + {"id":{"name":"spr_psy_hood_alpha","path":"sprites/spr_psy_hood_alpha/spr_psy_hood_alpha.yy",},}, + {"id":{"name":"spr_psy_hood_alpha2","path":"sprites/spr_psy_hood_alpha2/spr_psy_hood_alpha2.yy",},}, {"id":{"name":"spr_psy_hood_complex","path":"sprites/spr_psy_hood_complex/spr_psy_hood_complex.yy",},}, {"id":{"name":"spr_psy_hood","path":"sprites/spr_psy_hood/spr_psy_hood.yy",},}, {"id":{"name":"spr_pulse","path":"sprites/spr_pulse/spr_pulse.yy",},}, diff --git a/scripts/scr_ComplexSet/scr_ComplexSet.gml b/scripts/scr_ComplexSet/scr_ComplexSet.gml index 6ebe733381..702884e6f4 100644 --- a/scripts/scr_ComplexSet/scr_ComplexSet.gml +++ b/scripts/scr_ComplexSet/scr_ComplexSet.gml @@ -105,7 +105,7 @@ function ComplexSet(_unit) constructor { chest_variants: spr_mk7_chest_variants, leg_variants: spr_mk7_leg_variants, head: spr_mk7_head_variants, - knees: spr_mk7_complex_knees + right_knee: spr_mk7_complex_knees }; _are_exceptions = false; @@ -142,7 +142,7 @@ function ComplexSet(_unit) constructor { _mod = modulars[i]; exceptions = []; if (array_contains(blocked, _mod.position)) { - return "blocked"; + continue; } if (struct_exists(_mod, "allow_either")) { @@ -327,6 +327,24 @@ function ComplexSet(_unit) constructor { if (struct_exists(_mod, "overides")) { _overides = _mod.overides; } + + if (struct_exists(_mod, "body_parts")){ + var _viable = true; + var _body_areas = struct_get_names(_mod.body_parts); + for (var b=0;bF+ul(Gl_31$GW6bJy&JOI#& zD{67Kl_!*NXe0uVebQ&_s;2<3Uj>D@;Bj+IJb{Uwvr-2FTMQI>;eMM6V$1@To_`O* z$;R{52K~+}C>|Je!ueGi`0S-`2j9`r?L~Yzvb}}CewULiFZ>w^Tn*J|W2t(UglX2B zM5^l^L9FY>>AFgH-32hcIg;%aKgOtR+~b626AkMZo_pp(l$uOUu{!f*JPjnY^?Eyl z>3ui56(&|linz4fD<%cOdN$Ia`yLJxS5oQzFZhHy=oqgv)Zln$0@LAnc=xTrpxgVg zm&j}@^qa}OvHc=7J)1Sbe2OA_EU)9x$S)UB-0b?9-JOqXGgp<#bysi;An}3RyndC- zuB|KIPAf-N5Rk)_gU4R`H|1SiviZrSQyDfLs1l!fySo7cxlJNEduDN11Va$D}nIUf<|QU5+|>w&?j!%@g0 z%8}7VcZT(dcTNMkw@eg0$&@Qc#%0E@#BW%!#%m)KL1Xpv;UZiwy`So&1LANtAez6Y38r&03$qR~agkdGA^yA9$O3PWHHHq$Z#U9>whppWa&ckegYn zf6wc|UB`xGQUr>-n<`lzk(4I$*cI(Ag<08rbffOsN5`JLDTWVNO#2G@LWu$xI-!t~ z&F>=Ak!{vjV(`AzH`g;(n$LCT^V4Szsb1>oT%shdT9onz$aWh>J*M1ZShwhHZrr}o8pc|^s-y>1W~!4gv|@uE znR%F{w5iB!!m|Uyly|)CMU4`xt`3T%f2KY0^&tu4V1Fj2b!Cq)*=TDEp0d%H-(L8A z2$>vjtQS|Iag}ipWSt~*+{i5C^J*><`9@3R75F`cf zy4+DZ2Y2f*bbb|RRUBX}b!LY(kNiOQmUg7w_e{1Ero56$9AC+z8~&PvkUMx0=u_}}w;0Epe zRMpgqWLer2|0ICS5mvim1}fmAI-I`GJc<8JsDv+5c}}e>)~G!ypGlA8`CT5l<<{%G{HPp-u3WgZTt(jTJ++@Ok2r>BJh|pVKCNMZ5-EzXYe>;#O cVnT?dYcX+O=FHY0G(T+$<>ZE_g$Jho1KQ=K@Bjb+ literal 0 HcmV?d00001 diff --git a/sprites/spr_alpha_backpack/layers/b8e39c4b-d4da-4ef0-8433-a2ff2ec9115a/39cb22a8-79fe-4d1d-96c2-78c089342379.png b/sprites/spr_alpha_backpack/layers/b8e39c4b-d4da-4ef0-8433-a2ff2ec9115a/39cb22a8-79fe-4d1d-96c2-78c089342379.png new file mode 100644 index 0000000000000000000000000000000000000000..df4ca653caac4bbdaff95633aee4949add43fa09 GIT binary patch literal 1559 zcmd5+c`(}v6#mt!EvF+ul(Gl_31$GW6bJy&JOI#& zD{67Kl_!*NXe0uVebQ&_s;2<3Uj>D@;Bj+IJb{Uwvr-2FTMQI>;eMM6V$1@To_`O* z$;R{52K~+}C>|Je!ueGi`0S-`2j9`r?L~Yzvb}}CewULiFZ>w^Tn*J|W2t(UglX2B zM5^l^L9FY>>AFgH-32hcIg;%aKgOtR+~b626AkMZo_pp(l$uOUu{!f*JPjnY^?Eyl z>3ui56(&|linz4fD<%cOdN$Ia`yLJxS5oQzFZhHy=oqgv)Zln$0@LAnc=xTrpxgVg zm&j}@^qa}OvHc=7J)1Sbe2OA_EU)9x$S)UB-0b?9-JOqXGgp<#bysi;An}3RyndC- zuB|KIPAf-N5Rk)_gU4R`H|1SiviZrSQyDfLs1l!fySo7cxlJNEduDN11Va$D}nIUf<|QU5+|>w&?j!%@g0 z%8}7VcZT(dcTNMkw@eg0$&@Qc#%0E@#BW%!#%m)KL1Xpv;UZiwy`So&1LANtAez6Y38r&03$qR~agkdGA^yA9$O3PWHHHq$Z#U9>whppWa&ckegYn zf6wc|UB`xGQUr>-n<`lzk(4I$*cI(Ag<08rbffOsN5`JLDTWVNO#2G@LWu$xI-!t~ z&F>=Ak!{vjV(`AzH`g;(n$LCT^V4Szsb1>oT%shdT9onz$aWh>J*M1ZShwhHZrr}o8pc|^s-y>1W~!4gv|@uE znR%F{w5iB!!m|Uyly|)CMU4`xt`3T%f2KY0^&tu4V1Fj2b!Cq)*=TDEp0d%H-(L8A z2$>vjtQS|Iag}ipWSt~*+{i5C^J*><`9@3R75F`cf zy4+DZ2Y2f*bbb|RRUBX}b!LY(kNiOQmUg7w_e{1Ero56$9AC+z8~&PvkUMx0=u_}}w;0Epe zRMpgqWLer2|0ICS5mvim1}fmAI-I`GJc<8JsDv+5c}}e>)~G!ypGlA8`CT5l<<{%G{HPp-u3WgZTt(jTJ++@Ok2r>BJh|pVKCNMZ5-EzXYe>;#O cVnT?dYcX+O=FHY0G(T+$<>ZE_g$Jho1KQ=K@Bjb+ literal 0 HcmV?d00001 diff --git a/sprites/spr_alpha_backpack/spr_alpha_backpack.yy b/sprites/spr_alpha_backpack/spr_alpha_backpack.yy new file mode 100644 index 0000000000..17d4f5ba23 --- /dev/null +++ b/sprites/spr_alpha_backpack/spr_alpha_backpack.yy @@ -0,0 +1,111 @@ +{ + "$GMSprite":"v2", + "%Name":"spr_alpha_backpack", + "bboxMode":0, + "bbox_bottom":80, + "bbox_left":26, + "bbox_right":137, + "bbox_top":35, + "collisionKind":1, + "collisionTolerance":0, + "DynamicTexturePage":false, + "edgeFiltering":false, + "For3D":false, + "frames":[ + {"$GMSpriteFrame":"v1","%Name":"b8e39c4b-d4da-4ef0-8433-a2ff2ec9115a","name":"b8e39c4b-d4da-4ef0-8433-a2ff2ec9115a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + ], + "gridX":0, + "gridY":0, + "height":322, + "HTile":false, + "layers":[ + {"$GMImageLayer":"","%Name":"39cb22a8-79fe-4d1d-96c2-78c089342379","blendMode":0,"displayName":"default","isLocked":false,"name":"39cb22a8-79fe-4d1d-96c2-78c089342379","opacity":100.0,"resourceType":"GMImageLayer","resourceVersion":"2.0","visible":true,}, + ], + "name":"spr_alpha_backpack", + "nineSlice":{ + "$GMNineSliceData":"", + "bottom":0, + "enabled":false, + "guideColour":[4294902015,4294902015,4294902015,4294902015,], + "highlightColour":1728023040, + "highlightStyle":0, + "left":0, + "resourceType":"GMNineSliceData", + "resourceVersion":"2.0", + "right":0, + "tileMode":[ + 0, + 0, + 0, + 0, + 0, + ], + "top":0, + }, + "origin":9, + "parent":{ + "name":"packs", + "path":"folders/Sprites/Marine Viewer/packs.yy", + }, + "preMultiplyAlpha":false, + "resourceType":"GMSprite", + "resourceVersion":"2.0", + "sequence":{ + "$GMSequence":"v1", + "%Name":"spr_alpha_backpack", + "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_alpha_backpack", + "playback":1, + "playbackSpeed":30.0, + "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":"b8e39c4b-d4da-4ef0-8433-a2ff2ec9115a","path":"sprites/spr_alpha_backpack/spr_alpha_backpack.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"7584aeaf-ec78-4cb8-871a-d428db5248c3","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":6, + "yorigin":88, + }, + "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_chaplain_wolfterm_helm/spr_chaplain_wolfterm_helm.yy b/sprites/spr_chaplain_wolfterm_helm/spr_chaplain_wolfterm_helm.yy index 14404fe4b0..2af21ed81c 100644 --- a/sprites/spr_chaplain_wolfterm_helm/spr_chaplain_wolfterm_helm.yy +++ b/sprites/spr_chaplain_wolfterm_helm/spr_chaplain_wolfterm_helm.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":"f2f04903-70d2-4526-bee9-08bfa83c5f9b","path":"sprites/spr_chaplain_wolfterm_helm/spr_chaplain_wolfterm_helm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"eb7d7ec9-98d3-495d-9bdc-175c698dd371","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"f2f04903-70d2-4526-bee9-08bfa83c5f9b","path":"sprites/spr_chaplain_wolfterm_helm/spr_chaplain_wolfterm_helm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"eb7d7ec9-98d3-495d-9bdc-175c698dd371","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_checker_texture_small/58ee1e71-509f-4b0e-ab39-17c8da2a0687.png b/sprites/spr_checker_texture_small/58ee1e71-509f-4b0e-ab39-17c8da2a0687.png new file mode 100644 index 0000000000000000000000000000000000000000..f0df36fc083752f5f79a226e76353194d4b10699 GIT binary patch literal 1114 zcmeAS@N?(olHy`uVBq!ia0vp^TR@nD4M^IaWitX&3dtTpz6=aiY77hwEes65fI|H*Yfq~iA)5S5Q;?~={8}nW{ zNU%OEJ@R|M0c&PZoMI18b@{j1d0f*id7e!#vXSdQE|DyA-0+yhV}Hx|OZ995k0g?9 zj?MT#{pe58yoD1VecS&hwXm)=I%CO&3pP);H>&Qq|9)OQBk$SZx~hfYKfTx5^*_(Z zm{*imE=I@uLyaeg^}ubI@W<#+U3Jr*vkJf&+A z1acO4uLwxcNx8M{nP&Ov#`O>6W_>oV+1)y?*87pz)6Gau-`x&&?K+5S^S{eUJ)iM+ z?(;XFfd!IOz`(DwSzU|ik-GDyKhC~5M(7v<%qI71TSIpB& zU^wr)`~O$m-%1;IpyKM&jYuBfegSuw@bBf=y#7yEWgJk~?)JDhg!ONi`N5TEX;FW8 zd-RK&+a>ZW?Ye=XazAfjcuoKmoS9I%5kcmg+QJkUWW+Jfit(SifJGv;QG5 zD&Is4ZP%C&ib-QO=*9DnoPCVl>OP~7W%$vR#9^>ZjFm2H!C8<`)MX5lF!N|bKRM)^%*Vr(`z}U*j#LC!Q+rYrez(AQ} zRx65z-29Zxv`X9>f|H*Yfq~iA)5S5Q;?~={8}nW{ zNU%OEJ@R|M0c&PZoMI18b@{j1d0f*id7e!#vXSdQE|DyA-0+yhV}Hx|OZ995k0g?9 zj?MT#{pe58yoD1VecS&hwXm)=I%CO&3pP);H>&Qq|9)OQBk$SZx~hfYKfTx5^*_(Z zm{*imE=I@uLyaeg^}ubI@W<#+U3Jr*vkJf&+A z1acO4uLwxcNx8M{nP&Ov#`O>6W_>oV+1)y?*87pz)6Gau-`x&&?K+5S^S{eUJ)iM+ z?(;XFfd!IOz`(DwSzU|ik-GDyKhC~5M(7v<%qI71TSIpB& zU^wr)`~O$m-%1;IpyKM&jYuBfegSuw@bBf=y#7yEWgJk~?)JDhg!ONi`N5TEX;FW8 zd-RK&+a>ZW?Ye=XazAfjcuoKmoS9I%5kcmg+QJkUWW+Jfit(SifJGv;QG5 zD&Is4ZP%C&ib-QO=*9DnoPCVl>OP~7W%$vR#9^>ZjFm2H!C8<`)MX5lF!N|bKRM)^%*Vr(`z}U*j#LC!Q+rYrez(AQ} zRx65z-29Zxv`X9>f":"", + "Keyframes":[], + "resourceType":"KeyframeStore", + "resourceVersion":"2.0", + }, + "eventStubScript":null, + "eventToFunction":{}, + "length":1.0, + "lockOrigin":false, + "moments":{ + "$KeyframeStore":"", + "Keyframes":[], + "resourceType":"KeyframeStore", + "resourceVersion":"2.0", + }, + "name":"spr_checker_texture_small", + "playback":1, + "playbackSpeed":30.0, + "playbackSpeedType":0, + "resourceType":"GMSequence", + "resourceVersion":"2.0", + "seqHeight":180.0, + "seqWidth":180.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":"58ee1e71-509f-4b0e-ab39-17c8da2a0687","path":"sprites/spr_checker_texture_small/spr_checker_texture_small.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"1e6e1650-2926-4786-b31b-bbc04b9c7746","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":true, + "width":180, +} \ No newline at end of file diff --git a/sprites/spr_cloak_fur/spr_cloak_fur.yy b/sprites/spr_cloak_fur/spr_cloak_fur.yy index 79f1cd197d..c0c86cff59 100644 --- a/sprites/spr_cloak_fur/spr_cloak_fur.yy +++ b/sprites/spr_cloak_fur/spr_cloak_fur.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_cloak_fur/spr_cloak_fur.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"1c0b8831-0ab4-46ac-944f-5c99c40dbe5b","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_cloak_fur/spr_cloak_fur.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"1c0b8831-0ab4-46ac-944f-5c99c40dbe5b","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_da_backpack/66d4ebbb-311f-4ed4-9ab0-84b9e5a937ec.png b/sprites/spr_da_backpack/66d4ebbb-311f-4ed4-9ab0-84b9e5a937ec.png index d02cd42edc3ef5c5c59e205b53a7fcf56da6d026..5790390130bae80625f2580c33e7e976f134f291 100644 GIT binary patch delta 1257 zcmVV3TqdH(vg-flLiGGe}Jt}ZMp$lY%5~d-E;$1 zP(6D1Fk(vro0+YN-PR;zQ54bbcB3eYw%yqWdW~jcaZc>AvMmW&{eI_8L`0mv)`Pw^ zcmG8zilQwRi(;3ZtP-*)iYhI&%~eE1w>xfXdOh7)A62xwrRCajScAaIn#&%;w^ylJVf~-FWi!>B4|E9UUH>%uC4cU4~XY_PW{<5m60? z!-(C%x=QZ2*8#ixH-j`)L6TiCpz8vI| zkX1^oX2M0B1vTxfPjB3~d3#P$F8$H1TXTPUD2k%BjW=%Io{E1@uh*N2UtL+2acgIM zW8b)WyFJ6#D5sJ=30P4SQ%kScYfZ+*7WX3CX_W!k*yFvusrb!{Z7#A&$it(PNx+u% ze1HFc_Kw@BD1MI7=u_*yk00Kp>8~Y^HBQR<+~g+ZQnDjrTs~4sX-mxd{)jj?8RwO? z%kH%NPS(q^Z2f<^^c-83WgH(LZ@SqLkxviV>G%6_e0&^bSw>lwF&d2~OY^~eFc{1v z7-FEuT3);mULe8EPYOyYZiI+OE_h)!EC*`^-TdRdQ5=5BMiYSnN!jDEjA zGdLsR`jHijX=sc?F3wc=*vNaiN=NvO}YQ`}gwEirf!}r=*CS=5PQa0M# zTwi$XA21r%poCjd4`OLvpQKUz54j!-Bi4DkxfFT2kge{wq?(@=*)>Xr>aspuix?b)#?9@R8?9(TOy;S*{){0 zw<_){%Vi$2URKsvSJTHVdfZw^8`>U=*V2a0oY#%ncmvj?s(%%kzA|gumbPE?9}B0? zZhr0(ZTwNL8Iu78bdwMTB@Dnf`VSM`b2FW&Zqk#11sZ=fEi*AxFflqbFgi0ZD=;uR zFfeDWdwBo=03~!qSaf7zbY(hiZ)9m^c>ppnGBqtQH7zqSR4_3*G%z|dFe@-HIxsL6 z@WaIb001a-MObuXVRU6WbZKp6b97;CZ~!teGBqtQH7zqSR4_3*G%z|dFe@-HIxsLn T<>DFu000R9NkvXXu0mjf9Vuoz delta 1202 zcmV;j1Wo(h45JK?77GCA2nGNE0AVjrR*@k=G!{ujK~#9!?c1?#6Im1h&}(Z26wKBE z8dqDX(UF!ef2gZA-GD8&6|w7Xx&bSw9zJ*w zu_b}c%+|ziYZ9_3is*K`Q4~en?(74-Ml-QECw5ucmV~T+zjG%dB2HiHLEoCY|DqK| z(H4tEvCB?Y30V|Hm6qD(Dk7rW9XB<-o^G!mK6p^y_QUITyHQKZd9j<)67!AeY`OtS zQ54l5e|PUjr`wIcU%ZIXXcQ3B9VG=5oJyrL+o`@6eS+fqPp-MBjU_YRLvChz}x`cy*h z?|)O=>Yl%Pwb7)^=HjK2aesF=9zS`qFrZC`97iYf67qYOp;eE)uC_!(RKwwL<+w$R zlk)kiSCjhzPJg;_H3ox0#M$WbvS-8OJO_ipOx)UH)aKTWt7+hvMZB`=A(LhxuU+{( zwXfIfP1Zktc-L}-D$YvZ(j{=pMNcAsdo^gD*KFH&Zr+}}FUxW!es%SIImjg;tCU#H zgo`)}YT8$y-q^W$drnd={n4#kbANg$ilViRJ2!7n#eb*Q>&?Wkt}M&Abz^*E@7%oI zp5behQ^}qLtSE}9rPu4VCgWm@dy(z5$^dNa(ft$KC{(oG0jxEbFj*pKw-Ry|Sr-$tH`~5gRK8~_1qb$o9jYgBD`CvX63}%w?&D-~} zx3?GVCHgXy?Y43~-nO^57jNFapW5^B!@D%=5E0|SOIuu1GUhTDnNtth>G%7S!Ap+UxaVFc`#dzy8vCpwu&tMxPdzw{5iS`G2Gvw0<+E_$6t3F3A{?PY*dYZ zwJV>OnwB{09iub8V53eZ@x4Hu$@xY^r>&Q4Q;%uAtVbquw>ez3YB(H5zu%vko@kpx zOTA-VO2+1KQ+&^QmDNY7c^J2Qx_6xU`Y_^jlDrw4d2wvUJ6(s^U|wXCko9jGPVd}K zM1NHE64Ok^(?nc!9@X@PyetXXnvAt`j+r<$0=f>ZmpvYZI8ukX+vku>&9%n0c%p#zluy>nYC?8+b{Z$h0|v@KX-{X z{wUWBlOY9s41nDI2Wz!+Gs=+$uamn48W%DxGB;E(Fgi3fIx{pYFfckWFg8?VN0aOY z8W%DxGB;E(Fgi3fIx{pYFfckWFh>d8`;#389V0R=GB;E(Fgi3fIx{pYFfckWFc2L5 QBme*a07*qoM6N<$f~aX%X#fBK diff --git a/sprites/spr_da_backpack/69575369-6061-47a6-b608-894dae3a1efd.png b/sprites/spr_da_backpack/69575369-6061-47a6-b608-894dae3a1efd.png index ff2657fd3a1a2ada927e905d6e835d8098e0774a..3793af56599dc43a9d4c5b058000f61eb6b60549 100644 GIT binary patch delta 865 zcmV-n1D^bX3Azc877GDF2nGNE0Ds?hYLOv90j-f^FcXjhgN+S#f1eb|iZE60)uVoJ z1d~w%C4a#6*euj;b*5P6Zl~SGn0rsXer@sgwR19mpR=*Hm*>}6@Avq0Uqv!``^IQ9 z;+p!})`g?$apLu3`;)AZ>I6BR^?qagb@mo#bpC`@t-n)TKaV8}X)YIAkdIIIvE6RF z$**FmDmcGntUY(rT_8i{xc&YZknK5Rb zS@Ke(;uw|2B`2QA5w2CTg7z&%%`CZzJkPIemTb?CMIGn3ob=vsRhFC~BL=Eu>K^F( zzNw0$SY5tn(G=rQ{EdO-eER14#FiehgAO)dPkie@6Wi@J9v&Xz<@vRqCG-5>D2ku0 zP%n9wY=8RS#I>p8ZO5O=(E<7WBMUNOLQ%Gso=x|=ofCJY2JadQvip$r$KT{AVtipP zS&WM|+%i~@o&C>d?DxOVlGj#{>AmAXLDj*J$oFD(vGg7?X+#l5jC}Ho;^*feUh-)> zH9Mw#F5&-sLD~J>-aF3ybK@M5uECUd8Kak=>wlRg$IXuE`0E?=Ip{soDI>iUdkZoB zdgD3^vTI~sRzKcr@8FbuPhULMWfx_#7<>1KNAAZLx5iFQ+TV;h^!!N$Ib+@yi*`-+ zz5?p`)nPD>EX%60{5?>VYf3}6UrjM)**{U1<-X2-d)h|kbQMWhMJGDG73Hx{bGIOO z16=z%I=Lb`DIyF-QC^A?d@&6zrV-Z z+gp@n8F`-9*X(|d+u8jFUPMHEoFKNFuQpQcw)>N1StR;>?3k_UR1K3+13L)-zyYeN zs+R5plTiaZlVAfO3#{6Ikq40k^H~jQli&jy7d0(2F;p-yIy5jkGcYSKFgh?WXRUjA zlMw_OS2Zm&F;p-yIy5jkGcYSKFgh?W7VyKx0000ebVXQnWMOn=I&^7mWpi|4ZEyfG rFfuhQFf}bRF;p-yIy5jkGcYSKFgh?WLFM8a00000NkvXXu0mjf_8+FU delta 877 zcmdnR*~B?PjGN&F2O9$eL!!Qa*hED~#?pz&2K535T6=lR>gS7`>@o;_e|2$P0SizG z1o&)=Tygi6&&D%%{dV_GsrKJnm-~@#Yq3%N{LLG;O@Dqp^8NQ8CGoELpT6~8RC_q< z*R5--Qqp&nI^}%{qNl?8)QHwK>~w z=Y3jj7_o}$+mW%-^_dUN-W`&PNn9rM;=~}CkdZ_!f}1o z_NH&Tu4i?2cG{d@pEE7ze4ndqdXyhq{thkga}xxWLyb!Lztr9jaSdFfcYkw6SE0_o zV<(F2YKv==y!&rBvd>R);?@wQ3{P|az+bGE?aND$bzTbDx6)yk6d(TuP<-4ME-~N+($okv-jJcZ{MY z%>8>_?d$LR=_j+bPyE~a*u(MaLG>rq8+S!i@!!;5$e}DW|IeZyKP@|^*W7wHTlROY z-oyXZjyM0_xo3UuZ}DT9iR%tdDVIFyec@~UnMs+Olk5L{eMB~5b-^SfPl zt5wG{^8R^cAmu(SH8k>{oaQOhr3-JbUna5n&3uj1Me*tTZF4&ur zd`I`h-2*ZI`p&K1b?xnW%Vs`Xnb5oEJ6UhezPz5Fd1tJz?3!iDvYY4q*`%}j-Me>> zzI`*hcmMw5w{LY%ZR)W(|2n(O{`lKBbzmoL9>7)D=R zDK&W`vkgZBb4X~Y?p<~u$G*OyqvJorTDFNS!T*nK0H#pY64!{5l*E!$tK_0oAjM#0 zU}UOmV5Dng9%5i%Wolw&XrT>c7#Pf*yBAeMZhlH;S|x4`Zw|2X0Bz8K+fb63JGqO6 XR~d`pyRWKT2IUt|S3j3^P6V3TqdH(vg-flLiGGe}Jt}ZMp$lY%5~d-E;$1 zP(6D1Fk(vro0+YN-PR;zQ54bbcB3eYw%yqWdW~jcaZc>AvMmW&{eI_8L`0mv)`Pw^ zcmG8zilQwRi(;3ZtP-*)iYhI&%~eE1w>xfXdOh7)A62xwrRCajScAaIn#&%;w^ylJVf~-FWi!>B4|E9UUH>%uC4cU4~XY_PW{<5m60? z!-(C%x=QZ2*8#ixH-j`)L6TiCpz8vI| zkX1^oX2M0B1vTxfPjB3~d3#P$F8$H1TXTPUD2k%BjW=%Io{E1@uh*N2UtL+2acgIM zW8b)WyFJ6#D5sJ=30P4SQ%kScYfZ+*7WX3CX_W!k*yFvusrb!{Z7#A&$it(PNx+u% ze1HFc_Kw@BD1MI7=u_*yk00Kp>8~Y^HBQR<+~g+ZQnDjrTs~4sX-mxd{)jj?8RwO? z%kH%NPS(q^Z2f<^^c-83WgH(LZ@SqLkxviV>G%6_e0&^bSw>lwF&d2~OY^~eFc{1v z7-FEuT3);mULe8EPYOyYZiI+OE_h)!EC*`^-TdRdQ5=5BMiYSnN!jDEjA zGdLsR`jHijX=sc?F3wc=*vNaiN=NvO}YQ`}gwEirf!}r=*CS=5PQa0M# zTwi$XA21r%poCjd4`OLvpQKUz54j!-Bi4DkxfFT2kge{wq?(@=*)>Xr>aspuix?b)#?9@R8?9(TOy;S*{){0 zw<_){%Vi$2URKsvSJTHVdfZw^8`>U=*V2a0oY#%ncmvj?s(%%kzA|gumbPE?9}B0? zZhr0(ZTwNL8Iu78bdwMTB@Dnf`VSM`b2FW&Zqk#11sZ=fEi*AxFflqbFgi0ZD=;uR zFfeDWdwBo=03~!qSaf7zbY(hiZ)9m^c>ppnGBqtQH7zqSR4_3*G%z|dFe@-HIxsL6 z@WaIb001a-MObuXVRU6WbZKp6b97;CZ~!teGBqtQH7zqSR4_3*G%z|dFe@-HIxsLn T<>DFu000R9NkvXXu0mjf9Vuoz delta 1202 zcmV;j1Wo(h45JK?77GCA2nGNE0AVjrR*@k=G!{ujK~#9!?c1?#6Im1h&}(Z26wKBE z8dqDX(UF!ef2gZA-GD8&6|w7Xx&bSw9zJ*w zu_b}c%+|ziYZ9_3is*K`Q4~en?(74-Ml-QECw5ucmV~T+zjG%dB2HiHLEoCY|DqK| z(H4tEvCB?Y30V|Hm6qD(Dk7rW9XB<-o^G!mK6p^y_QUITyHQKZd9j<)67!AeY`OtS zQ54l5e|PUjr`wIcU%ZIXXcQ3B9VG=5oJyrL+o`@6eS+fqPp-MBjU_YRLvChz}x`cy*h z?|)O=>Yl%Pwb7)^=HjK2aesF=9zS`qFrZC`97iYf67qYOp;eE)uC_!(RKwwL<+w$R zlk)kiSCjhzPJg;_H3ox0#M$WbvS-8OJO_ipOx)UH)aKTWt7+hvMZB`=A(LhxuU+{( zwXfIfP1Zktc-L}-D$YvZ(j{=pMNcAsdo^gD*KFH&Zr+}}FUxW!es%SIImjg;tCU#H zgo`)}YT8$y-q^W$drnd={n4#kbANg$ilViRJ2!7n#eb*Q>&?Wkt}M&Abz^*E@7%oI zp5behQ^}qLtSE}9rPu4VCgWm@dy(z5$^dNa(ft$KC{(oG0jxEbFj*pKw-Ry|Sr-$tH`~5gRK8~_1qb$o9jYgBD`CvX63}%w?&D-~} zx3?GVCHgXy?Y43~-nO^57jNFapW5^B!@D%=5E0|SOIuu1GUhTDnNtth>G%7S!Ap+UxaVFc`#dzy8vCpwu&tMxPdzw{5iS`G2Gvw0<+E_$6t3F3A{?PY*dYZ zwJV>OnwB{09iub8V53eZ@x4Hu$@xY^r>&Q4Q;%uAtVbquw>ez3YB(H5zu%vko@kpx zOTA-VO2+1KQ+&^QmDNY7c^J2Qx_6xU`Y_^jlDrw4d2wvUJ6(s^U|wXCko9jGPVd}K zM1NHE64Ok^(?nc!9@X@PyetXXnvAt`j+r<$0=f>ZmpvYZI8ukX+vku>&9%n0c%p#zluy>nYC?8+b{Z$h0|v@KX-{X z{wUWBlOY9s41nDI2Wz!+Gs=+$uamn48W%DxGB;E(Fgi3fIx{pYFfckWFg8?VN0aOY z8W%DxGB;E(Fgi3fIx{pYFfckWFh>d8`;#389V0R=GB;E(Fgi3fIx{pYFfckWFc2L5 QBme*a07*qoM6N<$f~aX%X#fBK diff --git a/sprites/spr_da_backpack/layers/69575369-6061-47a6-b608-894dae3a1efd/25a3433d-721c-49ce-8a7a-3513cf831ef5.png b/sprites/spr_da_backpack/layers/69575369-6061-47a6-b608-894dae3a1efd/25a3433d-721c-49ce-8a7a-3513cf831ef5.png index ff2657fd3a1a2ada927e905d6e835d8098e0774a..3793af56599dc43a9d4c5b058000f61eb6b60549 100644 GIT binary patch delta 865 zcmV-n1D^bX3Azc877GDF2nGNE0Ds?hYLOv90j-f^FcXjhgN+S#f1eb|iZE60)uVoJ z1d~w%C4a#6*euj;b*5P6Zl~SGn0rsXer@sgwR19mpR=*Hm*>}6@Avq0Uqv!``^IQ9 z;+p!})`g?$apLu3`;)AZ>I6BR^?qagb@mo#bpC`@t-n)TKaV8}X)YIAkdIIIvE6RF z$**FmDmcGntUY(rT_8i{xc&YZknK5Rb zS@Ke(;uw|2B`2QA5w2CTg7z&%%`CZzJkPIemTb?CMIGn3ob=vsRhFC~BL=Eu>K^F( zzNw0$SY5tn(G=rQ{EdO-eER14#FiehgAO)dPkie@6Wi@J9v&Xz<@vRqCG-5>D2ku0 zP%n9wY=8RS#I>p8ZO5O=(E<7WBMUNOLQ%Gso=x|=ofCJY2JadQvip$r$KT{AVtipP zS&WM|+%i~@o&C>d?DxOVlGj#{>AmAXLDj*J$oFD(vGg7?X+#l5jC}Ho;^*feUh-)> zH9Mw#F5&-sLD~J>-aF3ybK@M5uECUd8Kak=>wlRg$IXuE`0E?=Ip{soDI>iUdkZoB zdgD3^vTI~sRzKcr@8FbuPhULMWfx_#7<>1KNAAZLx5iFQ+TV;h^!!N$Ib+@yi*`-+ zz5?p`)nPD>EX%60{5?>VYf3}6UrjM)**{U1<-X2-d)h|kbQMWhMJGDG73Hx{bGIOO z16=z%I=Lb`DIyF-QC^A?d@&6zrV-Z z+gp@n8F`-9*X(|d+u8jFUPMHEoFKNFuQpQcw)>N1StR;>?3k_UR1K3+13L)-zyYeN zs+R5plTiaZlVAfO3#{6Ikq40k^H~jQli&jy7d0(2F;p-yIy5jkGcYSKFgh?WXRUjA zlMw_OS2Zm&F;p-yIy5jkGcYSKFgh?W7VyKx0000ebVXQnWMOn=I&^7mWpi|4ZEyfG rFfuhQFf}bRF;p-yIy5jkGcYSKFgh?WLFM8a00000NkvXXu0mjf_8+FU delta 877 zcmdnR*~B?PjGN&F2O9$eL!!Qa*hED~#?pz&2K535T6=lR>gS7`>@o;_e|2$P0SizG z1o&)=Tygi6&&D%%{dV_GsrKJnm-~@#Yq3%N{LLG;O@Dqp^8NQ8CGoELpT6~8RC_q< z*R5--Qqp&nI^}%{qNl?8)QHwK>~w z=Y3jj7_o}$+mW%-^_dUN-W`&PNn9rM;=~}CkdZ_!f}1o z_NH&Tu4i?2cG{d@pEE7ze4ndqdXyhq{thkga}xxWLyb!Lztr9jaSdFfcYkw6SE0_o zV<(F2YKv==y!&rBvd>R);?@wQ3{P|az+bGE?aND$bzTbDx6)yk6d(TuP<-4ME-~N+($okv-jJcZ{MY z%>8>_?d$LR=_j+bPyE~a*u(MaLG>rq8+S!i@!!;5$e}DW|IeZyKP@|^*W7wHTlROY z-oyXZjyM0_xo3UuZ}DT9iR%tdDVIFyec@~UnMs+Olk5L{eMB~5b-^SfPl zt5wG{^8R^cAmu(SH8k>{oaQOhr3-JbUna5n&3uj1Me*tTZF4&ur zd`I`h-2*ZI`p&K1b?xnW%Vs`Xnb5oEJ6UhezPz5Fd1tJz?3!iDvYY4q*`%}j-Me>> zzI`*hcmMw5w{LY%ZR)W(|2n(O{`lKBbzmoL9>7)D=R zDK&W`vkgZBb4X~Y?p<~u$G*OyqvJorTDFNS!T*nK0H#pY64!{5l*E!$tK_0oAjM#0 zU}UOmV5Dng9%5i%Wolw&XrT>c7#Pf*yBAeMZhlH;S|x4`Zw|2X0Bz8K+fb63JGqO6 XR~d`pyRWKT2IUt|S3j3^P6":"","Keyframes":[ - {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"69575369-6061-47a6-b608-894dae3a1efd","path":"sprites/spr_da_backpack/spr_da_backpack.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"f0c1f3a8-3480-46bb-990e-e40fbdd3727f","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"66d4ebbb-311f-4ed4-9ab0-84b9e5a937ec","path":"sprites/spr_da_backpack/spr_da_backpack.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"a68ed315-401e-4e7a-9d2a-bd3f16cb1f5b","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"69575369-6061-47a6-b608-894dae3a1efd","path":"sprites/spr_da_backpack/spr_da_backpack.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"f0c1f3a8-3480-46bb-990e-e40fbdd3727f","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"66d4ebbb-311f-4ed4-9ab0-84b9e5a937ec","path":"sprites/spr_da_backpack/spr_da_backpack.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"a68ed315-401e-4e7a-9d2a-bd3f16cb1f5b","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":6, - "yorigin":43, + "yorigin":88, }, "swatchColours":null, "swfPrecision":2.525, diff --git a/sprites/spr_da_mk5_helm_crests/spr_da_mk5_helm_crests.yy b/sprites/spr_da_mk5_helm_crests/spr_da_mk5_helm_crests.yy index b3e2143524..55b3ba2d39 100644 --- a/sprites/spr_da_mk5_helm_crests/spr_da_mk5_helm_crests.yy +++ b/sprites/spr_da_mk5_helm_crests/spr_da_mk5_helm_crests.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":"bab500e1-62e8-42cc-afd7-17f69a8aebe4","path":"sprites/spr_da_mk5_helm_crests/spr_da_mk5_helm_crests.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"3edacb19-eeca-4612-ae77-05723e4d3649","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"bab500e1-62e8-42cc-afd7-17f69a8aebe4","path":"sprites/spr_da_mk5_helm_crests/spr_da_mk5_helm_crests.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"3edacb19-eeca-4612-ae77-05723e4d3649","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_dev_pack_complex/e5637504-add9-474b-ae10-1e954d497810.png b/sprites/spr_dev_pack_complex/e5637504-add9-474b-ae10-1e954d497810.png index d3f7ae6e88cb120c68a14346d0f9f8a2332790e3..fba68c8909b1186b68e9108fe537fbaa83c879c4 100644 GIT binary patch delta 854 zcmV-c1F8J+2$Tts7YafM1^@s6x3iqQks(1zhe=k253g=EQ}P zh<9Lc!wt;rxMX(YX56tN-T|1jF)?R$YEC$du^Emu(EN#0^*lR@uIlRU*XE-dBa_YJk(ZdYz!jia+{(kqTB7pU@(}3yLByp9eM&E(W*f2YMVM^u)bVEz49*o zk(GDr*!)XuR&ojTTFSCu-`ms~gZ1T5Q`f#rx7+RbadQ*T&(F07ulk~RetsU`uYa#= z^=~$t3+w4wYU}!P2=!XZfOR^Z==b{(5z*`QVmKVGHBMF7w;hvuQZGL?szGPN7ZK6# z_oLJ4Y&DS`kEym^BIQs|mOTiWU8DX;$}*#TAXDY_xCDEFltaC-;cyteUT^w(7p1~J z#-y5>dV$#x?kary7?XKIy~H}ftAG2O4`JRv8vm}GRUwWS*BT%Nc! zGCJ1Uvj3v^cAfg=S^KyL76@x0TdGoic%5K&VNMP?MZoKEmey3uZJL#mULZq32cU@$oUL=KCs_YqqhR zPEZQVUpZZ`jVV7!PA;KNVfpJ%pZ~kb=0u&HolVP+`}_N{E#9`3?XR!@-NRHq&F=f{ zepk#fo9hJt00000000000Fx^Nn3FIA2Mn+q{{cB$^szy@YIc*)0~!}KEi*AxF)=zd zH99dhD=;uRFfh#+rcsgv8W%M!Gci;#F*-FhIx#gXFfckWFuX+`?UOMC9V0a@Gci;# gF*-FhIx#gXFfckWFzZl1G5`Po07*qoM6N<$g2g1P>;M1& delta 908 zcmbQj`H^FSIF|qi8v_Hwx38uS6BQlnQ#@T9Ln>~)y?xM6$y0*;L;qdT{LLR1s63LE z*zN+ZB@eb2{=F)N*~!obx@~X4`Yt;L;6~ri`oa%NM^`weH=&+chD{EI>1L zGTv4*RU1WLytk@y|GDU2*T0_q8f7}|ap$bBzyF>xcUv6j;xcFM++33nDMmMU)Zg5m zmRD~XxBl3_Ti;o}E!F7i_#wHhZoj;1;F-e~bN#e`Z;9G(WIFrru7zd0@1A;lx-jgk z_SV~Pf9~sE)Zw>Wc=5%Id)Ho;e5>7MH}#H_tv2(XQzcft_5132J38v?|5TK2*uTG~ zv!f$_`gHGu`*!Y(%$`%!^FBPhu%;$vr*ELh#rNNnP3oo29=f~hn*8s12i!x&U*zU) zJ||%^Ie10(`%ChXmD~Hy?mv>Iyga}>Xd3J8duekGGt{Qfs(QP-Wc%%2piv)x{MhmB zL1?^)zrX+E+fScH{k{G6+o`ImiMOh3ced=BXq2!wPQUGNqKgX;TeC#}@!n%Axqe3< zUlPan^thYpi=-b)^-4hLFI9WZeN#>+uUZ@KVS8osb-5Oub%FINsWSuZCanBa6Vnu{ z_%$Fu$42gWg29aa_uN))=r)X8wyf@G632GYeX%_!-?!{?oBUwy@7er`_jI4KpA^iR zG`VO+airvo)RHyXo|ad3+7xDkm>*pYlQQT2dihdQNr{i2|9)!ye|~=c!h(Vi(X;Od zia|X*JXN`ZXuz?nf_?d(}~*U!z@jZ)vdYzTT$-ucmO8ur5@ybn-1K`t>8~ zm;Q{CDMIeEm`7oEIw?i`V6`-^s`^=jIC`1vjLOZ@qI^ZEa= zDW#MA{QRChJ^uD>?oBcM+o!%gzyAMif>yoWyWdaivY*YkYRWv>k$G{w0_%U~huvQ` z-dGyL4@`=xC9V-ADTyViR>?)FK#IZ0z{phBz*yJ7FvQT(%E-dX#8TV9z{&E>K z6b-rgDVb@NxHVL_rkemYXuxeK$;?gFFD^;UEx@fwXM)>npe6=SS3j3^P6os}Dg0J!(udlhzQ7fA4Jz34n`{k+L&8qeXgm^hPkA{kgsIl&j z`F7}DgW+=<|D$u}S{9!>vwQRXGhMxt7cwi>zX;TD2&+Y;Wk$L@^DZT{P4$3L5F zyu%k3xccg^eHU`fl$9QxZJAkj!)}WI-CY9H80C#uV$If+jc9zCGE)XTc0z` zW-rh0`@XgQd8+)nX!Yd*;&&O}eOqB9{Qdpi?v9RnyShDFHtWB?V|nx0TOa=o_46u) zzVDa1=fAu^{@&W-n)V4n)+|b z-CVoZS8h+fcO*@9dO-iuV6m9*R*SzJ{86-GrTadw{d#?mXP4K$yC+>Zf5KZ8*M8rq8p(PA%;7_?n0)404I?m3Po2DhS%fF1_djD|<+H68BJ5WuJF-aCo9Y@Hh8P-JnVMP|nra&u zSQ!|cl~@)C%yFtEt`Q|Ei6yC4x%nxXX_X8{21cg323R!gag}=u)Sv;^P?DLOT3nKt YTYy{7>i~NrpdL;JPgg&ebxsLQ0Flx4X8-^I delta 1022 zcmZqUddxXNoJ)X%je&vT+gDSEiHeT(*F0SuLn>~)y<_h$oi4-vVSc9J+@OsInvQTg zByBV@zv(k+;j1etjJabZcfYC6%zR?{pBT=>N8VRzn zWS;cT?+<;hu@nCOCyat`TFy3-<-BC=i6RsU8;4%-ru(K zcl^}vm)}30UcUNc?DwlDO5c^ubCqG+%Mt!MD0upNCEwJ>eXB~3y=*@DMC8?_)nAss z$$K8T|K7eAzBy(^Twh&&r5-F@Z|o=Uqc(k3)tl8{UO!UUSNYxb&D*!VcYm&sKKh=& zu6KIAeE-(ky>a%N=he$C*(T?&w{YHx`FHD;l^z{E)ts^YwxHm}9JA!LTkQhv?M3#_ z&HBCJ(<_(x-D|IQK?ir2Ew|rRZ2a^fh*^@SWdC`7?Wf@{R?i9N z3*s-`xM4%Vv+l+70_(YcnYaGcPjP#B)_a4yhwT;dZP%ju(>7ObshRjGx&B5{_SX=Q z(W{ovk}>^ic`fR-;ND4(H#NSC&ROeL{Paiux_JT9XQ-UXU(~VxQU9f{EkCO??LGPe zCeNATJoohEMy16&`&6F>Jpa@itqWux?M-s2v5mFgxM%-U%q@< z{noVPov#iTWpkFg=;+VqyKwE=wff#S)pd3IUcFRzU!k0ooV<8b?fW-xdUE2UqE_Yj zY>z!NoH=k253g=EQ}P zh<9Lc!wt;rxMX(YX56tN-T|1jF)?R$YEC$du^Emu(EN#0^*lR@uIlRU*XE-dBa_YJk(ZdYz!jia+{(kqTB7pU@(}3yLByp9eM&E(W*f2YMVM^u)bVEz49*o zk(GDr*!)XuR&ojTTFSCu-`ms~gZ1T5Q`f#rx7+RbadQ*T&(F07ulk~RetsU`uYa#= z^=~$t3+w4wYU}!P2=!XZfOR^Z==b{(5z*`QVmKVGHBMF7w;hvuQZGL?szGPN7ZK6# z_oLJ4Y&DS`kEym^BIQs|mOTiWU8DX;$}*#TAXDY_xCDEFltaC-;cyteUT^w(7p1~J z#-y5>dV$#x?kary7?XKIy~H}ftAG2O4`JRv8vm}GRUwWS*BT%Nc! zGCJ1Uvj3v^cAfg=S^KyL76@x0TdGoic%5K&VNMP?MZoKEmey3uZJL#mULZq32cU@$oUL=KCs_YqqhR zPEZQVUpZZ`jVV7!PA;KNVfpJ%pZ~kb=0u&HolVP+`}_N{E#9`3?XR!@-NRHq&F=f{ zepk#fo9hJt00000000000Fx^Nn3FIA2Mn+q{{cB$^szy@YIc*)0~!}KEi*AxF)=zd zH99dhD=;uRFfh#+rcsgv8W%M!Gci;#F*-FhIx#gXFfckWFuX+`?UOMC9V0a@Gci;# gF*-FhIx#gXFfckWFzZl1G5`Po07*qoM6N<$g2g1P>;M1& delta 908 zcmbQj`H^FSIF|qi8v_Hwx38uS6BQlnQ#@T9Ln>~)y?xM6$y0*;L;qdT{LLR1s63LE z*zN+ZB@eb2{=F)N*~!obx@~X4`Yt;L;6~ri`oa%NM^`weH=&+chD{EI>1L zGTv4*RU1WLytk@y|GDU2*T0_q8f7}|ap$bBzyF>xcUv6j;xcFM++33nDMmMU)Zg5m zmRD~XxBl3_Ti;o}E!F7i_#wHhZoj;1;F-e~bN#e`Z;9G(WIFrru7zd0@1A;lx-jgk z_SV~Pf9~sE)Zw>Wc=5%Id)Ho;e5>7MH}#H_tv2(XQzcft_5132J38v?|5TK2*uTG~ zv!f$_`gHGu`*!Y(%$`%!^FBPhu%;$vr*ELh#rNNnP3oo29=f~hn*8s12i!x&U*zU) zJ||%^Ie10(`%ChXmD~Hy?mv>Iyga}>Xd3J8duekGGt{Qfs(QP-Wc%%2piv)x{MhmB zL1?^)zrX+E+fScH{k{G6+o`ImiMOh3ced=BXq2!wPQUGNqKgX;TeC#}@!n%Axqe3< zUlPan^thYpi=-b)^-4hLFI9WZeN#>+uUZ@KVS8osb-5Oub%FINsWSuZCanBa6Vnu{ z_%$Fu$42gWg29aa_uN))=r)X8wyf@G632GYeX%_!-?!{?oBUwy@7er`_jI4KpA^iR zG`VO+airvo)RHyXo|ad3+7xDkm>*pYlQQT2dihdQNr{i2|9)!ye|~=c!h(Vi(X;Od zia|X*JXN`ZXuz?nf_?d(}~*U!z@jZ)vdYzTT$-ucmO8ur5@ybn-1K`t>8~ zm;Q{CDMIeEm`7oEIw?i`V6`-^s`^=jIC`1vjLOZ@qI^ZEa= zDW#MA{QRChJ^uD>?oBcM+o!%gzyAMif>yoWyWdaivY*YkYRWv>k$G{w0_%U~huvQ` z-dGyL4@`=xC9V-ADTyViR>?)FK#IZ0z{phBz*yJ7FvQT(%E-dX#8TV9z{&E>K z6b-rgDVb@NxHVL_rkemYXuxeK$;?gFFD^;UEx@fwXM)>npe6=SS3j3^P6os}Dg0J!(udlhzQ7fA4Jz34n`{k+L&8qeXgm^hPkA{kgsIl&j z`F7}DgW+=<|D$u}S{9!>vwQRXGhMxt7cwi>zX;TD2&+Y;Wk$L@^DZT{P4$3L5F zyu%k3xccg^eHU`fl$9QxZJAkj!)}WI-CY9H80C#uV$If+jc9zCGE)XTc0z` zW-rh0`@XgQd8+)nX!Yd*;&&O}eOqB9{Qdpi?v9RnyShDFHtWB?V|nx0TOa=o_46u) zzVDa1=fAu^{@&W-n)V4n)+|b z-CVoZS8h+fcO*@9dO-iuV6m9*R*SzJ{86-GrTadw{d#?mXP4K$yC+>Zf5KZ8*M8rq8p(PA%;7_?n0)404I?m3Po2DhS%fF1_djD|<+H68BJ5WuJF-aCo9Y@Hh8P-JnVMP|nra&u zSQ!|cl~@)C%yFtEt`Q|Ei6yC4x%nxXX_X8{21cg323R!gag}=u)Sv;^P?DLOT3nKt YTYy{7>i~NrpdL;JPgg&ebxsLQ0Flx4X8-^I delta 1022 zcmZqUddxXNoJ)X%je&vT+gDSEiHeT(*F0SuLn>~)y<_h$oi4-vVSc9J+@OsInvQTg zByBV@zv(k+;j1etjJabZcfYC6%zR?{pBT=>N8VRzn zWS;cT?+<;hu@nCOCyat`TFy3-<-BC=i6RsU8;4%-ru(K zcl^}vm)}30UcUNc?DwlDO5c^ubCqG+%Mt!MD0upNCEwJ>eXB~3y=*@DMC8?_)nAss z$$K8T|K7eAzBy(^Twh&&r5-F@Z|o=Uqc(k3)tl8{UO!UUSNYxb&D*!VcYm&sKKh=& zu6KIAeE-(ky>a%N=he$C*(T?&w{YHx`FHD;l^z{E)ts^YwxHm}9JA!LTkQhv?M3#_ z&HBCJ(<_(x-D|IQK?ir2Ew|rRZ2a^fh*^@SWdC`7?Wf@{R?i9N z3*s-`xM4%Vv+l+70_(YcnYaGcPjP#B)_a4yhwT;dZP%ju(>7ObshRjGx&B5{_SX=Q z(W{ovk}>^ic`fR-;ND4(H#NSC&ROeL{Paiux_JT9XQ-UXU(~VxQU9f{EkCO??LGPe zCeNATJoohEMy16&`&6F>Jpa@itqWux?M-s2v5mFgxM%-U%q@< z{noVPov#iTWpkFg=;+VqyKwE=wff#S)pd3IUcFRzU!k0ooV<8b?fW-xdUE2UqE_Yj zY>z!NoH":"","Keyframes":[ - {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"e5637504-add9-474b-ae10-1e954d497810","path":"sprites/spr_dev_pack_complex/spr_dev_pack_complex.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"36fcc4b6-c054-4c76-9a1c-67bc678fa11d","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"ee39ecff-a565-42aa-99f0-f549f95bc5a0","path":"sprites/spr_dev_pack_complex/spr_dev_pack_complex.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"c77ca9f7-3220-4d01-a6cc-c19084c25a7c","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"e5637504-add9-474b-ae10-1e954d497810","path":"sprites/spr_dev_pack_complex/spr_dev_pack_complex.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"36fcc4b6-c054-4c76-9a1c-67bc678fa11d","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"ee39ecff-a565-42aa-99f0-f549f95bc5a0","path":"sprites/spr_dev_pack_complex/spr_dev_pack_complex.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"c77ca9f7-3220-4d01-a6cc-c19084c25a7c","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, + "yorigin":45, }, "swatchColours":null, "swfPrecision":2.525, diff --git a/sprites/spr_generic_honor_guard/spr_generic_honor_guard.yy b/sprites/spr_generic_honor_guard/spr_generic_honor_guard.yy index 8db0a8e2df..1f626dccde 100644 --- a/sprites/spr_generic_honor_guard/spr_generic_honor_guard.yy +++ b/sprites/spr_generic_honor_guard/spr_generic_honor_guard.yy @@ -68,17 +68,31 @@ "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":"d1ffcc4e-d302-4897-b7f2-6f29a2cd019c","path":"sprites/spr_generic_honor_guard/spr_generic_honor_guard.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"c66cce41-4b23-4476-82b8-6046bf8be6aa","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"36357777-96a0-45ba-9211-32f9f0c807f9","path":"sprites/spr_generic_honor_guard/spr_generic_honor_guard.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"7581b692-35d0-4dad-91d1-ac5b40020afc","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"66b749b5-748d-4f6b-b3ee-de1acf85499c","path":"sprites/spr_generic_honor_guard/spr_generic_honor_guard.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"497b6308-557a-4877-8fe6-4a0ea6442f0b","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"c43cfd5a-416a-4ba7-be6d-94492a1488a9","path":"sprites/spr_generic_honor_guard/spr_generic_honor_guard.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"dd2d972b-1bff-4558-a244-a0de713ea441","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"47cc3181-8c92-4cdd-bc8d-add01497c0ea","path":"sprites/spr_generic_honor_guard/spr_generic_honor_guard.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"af180f89-ae18-4ab3-973a-12d8556cf866","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"32642e56-6593-4c11-b48b-a780b48d9332","path":"sprites/spr_generic_honor_guard/spr_generic_honor_guard.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"ed017c0c-0f4f-4fd1-90d3-ae09be762548","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"d1ffcc4e-d302-4897-b7f2-6f29a2cd019c","path":"sprites/spr_generic_honor_guard/spr_generic_honor_guard.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"c66cce41-4b23-4476-82b8-6046bf8be6aa","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"36357777-96a0-45ba-9211-32f9f0c807f9","path":"sprites/spr_generic_honor_guard/spr_generic_honor_guard.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"7581b692-35d0-4dad-91d1-ac5b40020afc","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"66b749b5-748d-4f6b-b3ee-de1acf85499c","path":"sprites/spr_generic_honor_guard/spr_generic_honor_guard.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"497b6308-557a-4877-8fe6-4a0ea6442f0b","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"c43cfd5a-416a-4ba7-be6d-94492a1488a9","path":"sprites/spr_generic_honor_guard/spr_generic_honor_guard.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"dd2d972b-1bff-4558-a244-a0de713ea441","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"47cc3181-8c92-4cdd-bc8d-add01497c0ea","path":"sprites/spr_generic_honor_guard/spr_generic_honor_guard.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"af180f89-ae18-4ab3-973a-12d8556cf866","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"32642e56-6593-4c11-b48b-a780b48d9332","path":"sprites/spr_generic_honor_guard/spr_generic_honor_guard.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"ed017c0c-0f4f-4fd1-90d3-ae09be762548","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_hazzard_texture/spr_hazzard_texture.yy b/sprites/spr_hazzard_texture/spr_hazzard_texture.yy index a4d666beef..c7c1ea0e1f 100644 --- a/sprites/spr_hazzard_texture/spr_hazzard_texture.yy +++ b/sprites/spr_hazzard_texture/spr_hazzard_texture.yy @@ -33,7 +33,13 @@ "resourceType":"GMNineSliceData", "resourceVersion":"2.0", "right":0, - "tileMode":[0,0,0,0,0,], + "tileMode":[ + 0, + 0, + 0, + 0, + 0, + ], "top":0, }, "origin":0, @@ -76,12 +82,16 @@ "playbackSpeedType":0, "resourceType":"GMSequence", "resourceVersion":"2.0", + "seqHeight":180.0, + "seqWidth":180.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":"58ee1e71-509f-4b0e-ab39-17c8da2a0687","path":"sprites/spr_hazzard_texture/spr_hazzard_texture.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"0091329d-a69b-44eb-84c6-f0a31350ebd2","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"58ee1e71-509f-4b0e-ab39-17c8da2a0687","path":"sprites/spr_hazzard_texture/spr_hazzard_texture.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"0091329d-a69b-44eb-84c6-f0a31350ebd2","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_honor_helm/spr_honor_helm.yy b/sprites/spr_honor_helm/spr_honor_helm.yy index b9f60ea1fb..f104bf4424 100644 --- a/sprites/spr_honor_helm/spr_honor_helm.yy +++ b/sprites/spr_honor_helm/spr_honor_helm.yy @@ -67,16 +67,28 @@ "playbackSpeedType":1, "resourceType":"GMSequence", "resourceVersion":"2.0", + "seqHeight":80.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":"2faa2af3-c655-4c48-98c0-b35ce45ac30d","path":"sprites/spr_honor_helm/spr_honor_helm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"2ad7497e-3b41-4229-b8b5-b3a878b88839","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"7fda6c5c-99be-453f-9f3c-e2b3f414e643","path":"sprites/spr_honor_helm/spr_honor_helm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"ff207f62-e98a-4f92-b03a-5811e7159312","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"8362ac13-7231-4584-a993-c6d4f51343b0","path":"sprites/spr_honor_helm/spr_honor_helm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"fc1beb56-9e35-4bd4-91d2-5891d9b8febe","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"6d89f537-514e-4956-bd62-3d0e38852475","path":"sprites/spr_honor_helm/spr_honor_helm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"ed57c839-ea9e-4aee-b1eb-ae95029ab662","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"3bb7c5a4-77cb-4634-a0c7-0715b3f5ff2a","path":"sprites/spr_honor_helm/spr_honor_helm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"ce788ad0-56e7-4d23-be0f-ad858299a699","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"2faa2af3-c655-4c48-98c0-b35ce45ac30d","path":"sprites/spr_honor_helm/spr_honor_helm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"2ad7497e-3b41-4229-b8b5-b3a878b88839","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"7fda6c5c-99be-453f-9f3c-e2b3f414e643","path":"sprites/spr_honor_helm/spr_honor_helm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"ff207f62-e98a-4f92-b03a-5811e7159312","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"8362ac13-7231-4584-a993-c6d4f51343b0","path":"sprites/spr_honor_helm/spr_honor_helm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"fc1beb56-9e35-4bd4-91d2-5891d9b8febe","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"6d89f537-514e-4956-bd62-3d0e38852475","path":"sprites/spr_honor_helm/spr_honor_helm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"ed57c839-ea9e-4aee-b1eb-ae95029ab662","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"3bb7c5a4-77cb-4634-a0c7-0715b3f5ff2a","path":"sprites/spr_honor_helm/spr_honor_helm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"ce788ad0-56e7-4d23-be0f-ad858299a699","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_indomitus_backpack_variants/26a48129-bbce-4502-98fa-bb1536100ae8.png b/sprites/spr_indomitus_backpack_variants/26a48129-bbce-4502-98fa-bb1536100ae8.png index 6ad75c3f815fc4651aa11f71f2d773189282bfea..a825f405fca3f268c7aaaa50d6562f0b3b72d45f 100644 GIT binary patch delta 409 zcmZ3=dXja5IF}O#8v_Hw_RVwlOjLAK+2iTr7*cWT?ahO}M+^iU0;L0)*7`(-I7jBS z%AIL#P+W6jk?6!WmB|H+Las3j&&ee$s{63-%=rw@{>|(&mV946JwAWc`tzHgKjAlW z`z!cmX+}TG`M*^&Y!BG)mMC$V(lNtU-h6`QtJ({HKWD8yJFj1Q;(O7E)fQhPqEGqC z3jV(QJnESEQL7joweQR1CY63Fl+!f-nqhM)du{Ii{<_>Jd`o+FZQW*lO1eqx+oK@2 zzjr0RxZQYt>XTB5#yP_`-+AXf{aKJ?tF-NXPk~eu+vG&X=|Go?*Uxy!Td=~3^QD-&ZYV@quV11kdqNv777C>nC} vQ!>*kacjtkw-p6y(16=el9`)YtXGnlTYy`Wy_d`>pe6=SS3j3^P6O5c{B z-`b=bf*u%IhbOZG!S%U96aLJ?eIy{NGzAWW6LyvvbR*n6v1@}UU}@8m+pIrVoAN&i0W#8JK4)EwwZ)e_f; zl9a@fRIB8oR3OD*WME{XYiOWrWEo;)Y-M6*WniIgU|?ln@NVMP925WtO_ue-W#8v+~XXvs{4rElXf53YArtkyZuMc)ic|H5nLiT|5Pk+5%aC=5c z_MCT(>>FMGhTqwJKX~our*Akv?Cj7GEG*9#|9bKKRK<=efzLMjFV}^il-{<2eFN)V zFPUvCB+s1(nr7?nXTRywvUiuS#GFta7ul8N-h%oDV`txF( z+oE?`;jzqlhx7WsU8}y?vCF^ozgynnb9z6ohhKkps7^5>`&{^H!Ha*|Ig$lTfXd>+sO9J=H`dYK(DKoxJHzuB$lLFB^RXvDF!10BU4=iQ(a@j5CcOi6Jsl5 zOKk%KD+2>brq-1x8glbfGSez?YsiSV6$NV0fZI@#nVVXySCW`pfLoKjm&_@kCI(Me KKbLh*2~7Z{0IZ$> delta 415 zcmdnRI*oOLI2S($8v_FaOKB_LL`6s4PEQxdkcwMxZ#woh8HhAIOxkm4_x$gV14<7% zXl1n(irv`v-up&^xawc$3|-cV6GiJAe3oriKj8lAV4>!9^QX@I3+|nId)?7K`O@0L zUF>p4#J=v{QNDk9)brCfg&+J^TI6!%@ZQ)f?)Kqr3a=c`eBQHUcbsbejYVCuk%2VIF%UAB4=KJW2P163#Gfr2UZydT8bl&?)?P|e|IU=WDFW%eZ za#w5pF19;ucjex${k}=CbpEST$dNoHFVdQ I&MBb@0IPGao&W#< diff --git a/sprites/spr_indomitus_backpack_variants/f263cbc2-c596-4d91-bf6e-98df697e82d6.png b/sprites/spr_indomitus_backpack_variants/f263cbc2-c596-4d91-bf6e-98df697e82d6.png index 2066073dcd4ba8385cfbbafb31a4f9b380429384..c7a53a5565930b2963fc7157a6a5ed4c2b1b7b02 100644 GIT binary patch delta 187 zcmaFF+{Q9NoXd%Wje&t-`{p@&CMr6L{q%Hk45_&F_8=oKQ1sA(@BX>`>>?8zw@#d( z!+l^i;{je&uIrL>iAqN1bNRZkbkkcwMx4;nH8MGr0b>YvNYzhGkHzIqG8 z|1%jFxtgz@14^itxJHzuB$lLFB^RXvDF!10BNJUi16?D_5F=wN6Eh&vHZZUPq9+GV zqiD#@PsvQH#I3=5XGJ+sg9hA&lFZ!H;u77&+ydO1WY$Ek0BU0JboFyt=akR{0J9K3 A|(&mV946JwAWc`tzHgKjAlW z`z!cmX+}TG`M*^&Y!BG)mMC$V(lNtU-h6`QtJ({HKWD8yJFj1Q;(O7E)fQhPqEGqC z3jV(QJnESEQL7joweQR1CY63Fl+!f-nqhM)du{Ii{<_>Jd`o+FZQW*lO1eqx+oK@2 zzjr0RxZQYt>XTB5#yP_`-+AXf{aKJ?tF-NXPk~eu+vG&X=|Go?*Uxy!Td=~3^QD-&ZYV@quV11kdqNv777C>nC} vQ!>*kacjtkw-p6y(16=el9`)YtXGnlTYy`Wy_d`>pe6=SS3j3^P6O5c{B z-`b=bf*u%IhbOZG!S%U96aLJ?eIy{NGzAWW6LyvvbR*n6v1@}UU}@8m+pIrVoAN&i0W#8JK4)EwwZ)e_f; zl9a@fRIB8oR3OD*WME{XYiOWrWEo;)Y-M6*WniprU|?ln@MhY>X($?U^HVa@DsgL= pdpc4Js6hj6LrG?CYO!8PVr~I$O{eZvdWtO_ue-W#8v+~XXvs{4rElXf53YArtkyZuMc)ic|H5nLiT|5Pk+5%aC=5c z_MCT(>>FMGhTqwJKX~our*Akv?Cj7GEG*9#|9bKKRK<=efzLMjFV}^il-{<2eFN)V zFPUvCB+s1(nr7?nXTRywvUiuS#GFta7ul8N-h%oDV`txF( z+oE?`;jzqlhx7WsU8}y?vCF^ozgynnb9z6ohhKkps7^5>`&{^H!Ha*|Ig$lTfXd>+sO9J=H`dYK(DKoxJHzuB$lLFB^RXvDF!10BU4=iQ(a@j5CcOi6Jsl5 zOKk%KD+2>brq-1x8glbfGSez?YsiSV6$NV0fZI@#nVVXySCW`pfLoKjm&_@kCI(Me KKbLh*2~7Z{0IZ$> delta 415 zcmdnRI*oOLI2S($8v_FaOKB_LL`6s4PEQxdkcwMxZ#woh8HhAIOxkm4_x$gV14<7% zXl1n(irv`v-up&^xawc$3|-cV6GiJAe3oriKj8lAV4>!9^QX@I3+|nId)?7K`O@0L zUF>p4#J=v{QNDk9)brCfg&+J^TI6!%@ZQ)f?)Kqr3a=c`eBQHUcbsbejYVCuk%2VIF%UAB4=KJW2P163#Gfr2UZydT8bl&?)?P|e|IU=WDFW%eZ za#w5pF19;ucjex${k}=CbpEST$dNoHFVdQ I&MBb@0IPGao&W#< diff --git a/sprites/spr_indomitus_backpack_variants/layers/f263cbc2-c596-4d91-bf6e-98df697e82d6/62b09ae3-d70e-4c96-a796-f9dc9b29190d.png b/sprites/spr_indomitus_backpack_variants/layers/f263cbc2-c596-4d91-bf6e-98df697e82d6/62b09ae3-d70e-4c96-a796-f9dc9b29190d.png index 2066073dcd4ba8385cfbbafb31a4f9b380429384..c7a53a5565930b2963fc7157a6a5ed4c2b1b7b02 100644 GIT binary patch delta 187 zcmaFF+{Q9NoXd%Wje&t-`{p@&CMr6L{q%Hk45_&F_8=oKQ1sA(@BX>`>>?8zw@#d( z!+l^i;{je&uIrL>iAqN1bNRZkbkkcwMx4;nH8MGr0b>YvNYzhGkHzIqG8 z|1%jFxtgz@14^itxJHzuB$lLFB^RXvDF!10BNJUi16?D_5F=wN6Eh&vHZZUPq9+GV zqiD#@PsvQH#I3=5XGJ+sg9hA&lFZ!H;u77&+ydO1WY$Ek0BU0JboFyt=akR{0J9K3 A":"","Keyframes":[ - {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"f263cbc2-c596-4d91-bf6e-98df697e82d6","path":"sprites/spr_indomitus_backpack_variants/spr_indomitus_backpack_variants.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"976d99d5-b8ca-4296-bfec-0428f709446a","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"26a48129-bbce-4502-98fa-bb1536100ae8","path":"sprites/spr_indomitus_backpack_variants/spr_indomitus_backpack_variants.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"e490a9e6-100a-4231-83ea-f81f970510d0","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"3c4a6865-1bd0-4736-afba-d1184eb7c9c2","path":"sprites/spr_indomitus_backpack_variants/spr_indomitus_backpack_variants.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"103b9ed3-895b-4aaa-853a-46c40325bda5","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"f263cbc2-c596-4d91-bf6e-98df697e82d6","path":"sprites/spr_indomitus_backpack_variants/spr_indomitus_backpack_variants.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"976d99d5-b8ca-4296-bfec-0428f709446a","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"26a48129-bbce-4502-98fa-bb1536100ae8","path":"sprites/spr_indomitus_backpack_variants/spr_indomitus_backpack_variants.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"e490a9e6-100a-4231-83ea-f81f970510d0","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"3c4a6865-1bd0-4736-afba-d1184eb7c9c2","path":"sprites/spr_indomitus_backpack_variants/spr_indomitus_backpack_variants.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"103b9ed3-895b-4aaa-853a-46c40325bda5","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, "volume":1.0, "xorigin":7, - "yorigin":38, + "yorigin":63, }, "swatchColours":null, "swfPrecision":2.525, diff --git a/sprites/spr_indomitus_left_leg_bionic/spr_indomitus_left_leg_bionic.yy b/sprites/spr_indomitus_left_leg_bionic/spr_indomitus_left_leg_bionic.yy index 9af0d69d60..fb009449c6 100644 --- a/sprites/spr_indomitus_left_leg_bionic/spr_indomitus_left_leg_bionic.yy +++ b/sprites/spr_indomitus_left_leg_bionic/spr_indomitus_left_leg_bionic.yy @@ -63,12 +63,16 @@ "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":"9050d74b-ae5d-43ad-9ef5-42a5ae426e64","path":"sprites/spr_indomitus_left_leg_bionic/spr_indomitus_left_leg_bionic.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"7eac121b-3931-417e-870e-272025ef2a2e","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"9050d74b-ae5d-43ad-9ef5-42a5ae426e64","path":"sprites/spr_indomitus_left_leg_bionic/spr_indomitus_left_leg_bionic.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"7eac121b-3931-417e-870e-272025ef2a2e","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_jump_pack_complex/c5bc43cd-b567-4673-92b9-efede7a0b44f.png b/sprites/spr_jump_pack_complex/c5bc43cd-b567-4673-92b9-efede7a0b44f.png index 0eb23c1554690c1175050be554bcdf9ad63e4500..7d71dd4efe6a5bd97a5651259405291c608d0f1c 100644 GIT binary patch delta 1596 zcmZ|PeKgYx7zc2=H%B6GSEWcOFBKcM*bL<*rA*gbLb+br+BB0*tJSQlB9*3wu}L>t z*jimJV~A2C^O9B(3rA|d)#wh; zqoY&!sRwh-cBgK@wdCD&Gd*kSfi(VCg(sVop3SC(GR6z1FW6U{Iy~q$DsmXYjXbhu zTIu3ul)ssp=AOJVql~qB@0N6HT&0z)Z|#ab+s>8etFqd-^{Vw4Wx4@Ph$9W|>joprI+f#R*j$PsS#tg|R!kJ~UU3pf`4u1H(_^(jY zUJoP>n;%2MBY88gw|5>k@6qhA2k8&$kEMIY!HjbQ>J$q+3PLoN-gK*FP&{~O3O_Ia z;_<_puS_2MehfrqD6(kP>i0COG}kf^2$Yb0uoCjuQp5IiZekgr>z%_u+tO?p4IwqB zuN_|}4x<_8N^-$mcH10Jb=8{STvF$?rZ2=LqlKXl)L)!!`BJ-978#M{S~3ifYD*P@ z{2tp4exWuu4BiRPM!$VVr7d6980gg+9OQZIJ4W0@l~7-;_!y5{aJXJj-guG}6ne&d z<*&rN-YELjti6X<_(4i07CR~Dq{2H*QpZpmpg1kqy$P&Pip_d2K2V$F8_L2vfG*{w zhIjP{i#{_6w!HZu${R%pYx7)FJb!8JP$96P*2cRNGuyc6FyMn=_fYhhvB6I$*`>a% zkCjx|9bu%i7LgFr=tGEp0ow{NIHi2eyrn6XnDql>_hVunv8e>Qn~Tw$8C^Kc7xniu z;BrUJxt>uUmcssiL|t-GjdXr7v!d~i?5+UdsI{!BJWCD`Kh`~0g(goCNi0cL3Qx_g zl7tKzi7q^*3<=ebyUir=!RSp_Rxe;16>9-;C+b|t^aWI&omgPDYTGk4V! zW$`>&b=l?Up7>wr*Q372XO>9~iv9f}Py3+TUuGzOe9AMO3g3QX^yM}S2~1NS@l?3` zO+37W!TcsE;uj^l68Oa3Rn_-ilvXAQsE-vfHV zCdtar(`GGt4FX~V>$(`Q!sZ{ULIc*!(rsP7yU_^OkCx+$tC<0ga|EO7Ib|v#urZb7 zLFu)x*WTMjUVmJduky*A@!ktn1W8_^W1a2r(<4U1LT(qH`m#<1^GxOD4C81qqK!w* zOBZ9>3s98Io6EWzhxgs2!wuym6s|wDRGMNPi6nbJOYTqgz3}fpiZ!PcBoc|OW>|E_ z!l?7JiQtDBOM^jK3RGeEO{0M?1d+{w&5m5W~u+25)SKO-q&No792ZxrC zS>&6l+9;2tp-uCmvj&s6z1gq^Z?7Yn7e1xzAl2q+P5M$v*cJj747@J>B7-p;~+zMwv01a-j+kzGA(oOXa&^PKiQO|O}`c+QE-6qUdS}&#XW@1nbF(r|B1fHC6 zWU1)5gWaJnV5p0STO`;G4snM=AX~v;I2e3Gl7svoz~NIcs8c@&UueGHmVncL8;BU( c5fFixh)e%DYGT^BEFqmeLCC;+{(ofu1Bi_rr~m)} delta 1519 zcmVA|m1tkI_C}i$gp{EOeZHUwY$rSqsp3HNBDEPk8l~ zej_a&&Q?t)zpLgqPpwrn*PACxIFqKb8qd+hb2Qa$SH!Pi)>cLL@f7=b%CcR*<=UxT zY~tbJ;eTxh_xmay*BHvKLp;WQzmJHBhlhtM9_M_sWD6$@C7e`CIH{I!QZ3=6TEa=S zvQ5IT)TNb!*W~AI=?%Un!g0?#-#yp4ukaYob{nXygSU8zCI-W-I66aHw{@ zzqOC2I2>*_)Hho>yX*b!`ue4H_KBC#ovohj<$rSB?-BK0{E@@Wh4ba*^9};g~jdT5?3j8FEUO;`RVcDQ2G#NwNyC2mEN&qE(Nm|=K@-(Mb7sU z;rtd6-!97tjiu`0uemK$i&T_o(QGtv*e8 zSAY6%I-#7at=~iv(o+}juBeG`Vu64z(Yb2U(QnBs;fDsZ{Xe;Ha68v@cl)I2iB#)UJ;l3mZt(*LR!s}H_L3tZ0iv#J`=NhXk_*X*Ers@4Me?w%FSGQYZaHf3W$xXLEhzb*gr(GIg8(zfM%w)ST7! zT=jl`^E5F-^_(l5Isf!b@15>$Q`(QL^?vnKS}D7sxDdEcJNF)#SwfntTd|tu%YV+C z<7nL_%J%!Q*DSGodF;9Fl4ke&NOR8Bp7p++ldIJnm2=UmnQLHDvZ|h|j&obVQs{?j zujkA-S}xunJu%{4%BJ%>nx#TIN8fX5I2Wm!O9%5(Q(n4qwld6RZk7(|6xH=Pb5zXs z4|pBxgO-|FYA4s*$KB^L1ZR=kNPnjGJ*R|o)~Y$jfQLz{yU(eL%9+evN@zjpC4Ey( zsh(r|oU>KU92Z%n6*=u+*63J2G{cC#JupoT%cNriF?Tqp2J`F%Cw(tQIkNn^copBr z)2CmW2J+nf?icQbpL|Tu{r;iGY*Q7@`jRfaiAoNFPU$lU$}vbPeH_L#>wmRX%~_RP z9V*?7*5>Lf=Mbf53u+rJ$BZNRF$1GwD@3(a%~So(+>`JTzrtBzNQXmcHlEerKs> zy+}IxOe;m?ZQi?~J9l;YEq}U}KIdj_)v&wm5vv#kZ6fm@%NWwEukKTTS+|?%b5e&P z{m!h-dM$ICtb@u)Z-;oydd;VBQZ3=6T3J7D{qF9r^!~CUSu5v{A3qF+R_^ZZF58@} zW}QJ^Utg!cNKeAaAU}Wp%+~q|C)E;8sx>5>YreRG6;e6LYRE0Z!hcD%hJ^E5jBMI> zv5D<=TY6tvnIYkv^pSx%=f_yqcDo%l5#MRjdwtT|&}Myf_2hcYP-uD;x}o8$>H}9< zkD*mFV%&g8^<;|P1#V0@$5u~izENYUX2kfZB-N8K1{Jok;cP!!TR?A9?~^{ZYDP?( zgufV2!M$xsFb8)Br(~`WoebzMHgO*UdhJflcTNrFoZ6DzJV(<+M05ZC`2Ou4Wq*y~ z`h1+{c>5fqkFWT3z6UquOZf=seexB;d5yjlpt*xNcbnUm@MB@rzF(K-K6&Dww{KN6 z<=nRB$X7%~O*xY>24f3w%>VtYTci=e7|@fh1{xPLEif@uGB7$YIXW^mD=;uRFfd0= zLAR6N1{xPLEif@uGB7$YIXW^mD=;uRFfcX{`3sW}2OT3bEif@uGB7$YIXW^mD=;uR VFfd^S*wg?3002ovPDHLkV1fZ+4*dWC diff --git a/sprites/spr_jump_pack_complex/layers/c5bc43cd-b567-4673-92b9-efede7a0b44f/0e8b239a-6017-4ba5-8cbe-9353a86768ec.png b/sprites/spr_jump_pack_complex/layers/c5bc43cd-b567-4673-92b9-efede7a0b44f/0e8b239a-6017-4ba5-8cbe-9353a86768ec.png index 0eb23c1554690c1175050be554bcdf9ad63e4500..7d71dd4efe6a5bd97a5651259405291c608d0f1c 100644 GIT binary patch delta 1596 zcmZ|PeKgYx7zc2=H%B6GSEWcOFBKcM*bL<*rA*gbLb+br+BB0*tJSQlB9*3wu}L>t z*jimJV~A2C^O9B(3rA|d)#wh; zqoY&!sRwh-cBgK@wdCD&Gd*kSfi(VCg(sVop3SC(GR6z1FW6U{Iy~q$DsmXYjXbhu zTIu3ul)ssp=AOJVql~qB@0N6HT&0z)Z|#ab+s>8etFqd-^{Vw4Wx4@Ph$9W|>joprI+f#R*j$PsS#tg|R!kJ~UU3pf`4u1H(_^(jY zUJoP>n;%2MBY88gw|5>k@6qhA2k8&$kEMIY!HjbQ>J$q+3PLoN-gK*FP&{~O3O_Ia z;_<_puS_2MehfrqD6(kP>i0COG}kf^2$Yb0uoCjuQp5IiZekgr>z%_u+tO?p4IwqB zuN_|}4x<_8N^-$mcH10Jb=8{STvF$?rZ2=LqlKXl)L)!!`BJ-978#M{S~3ifYD*P@ z{2tp4exWuu4BiRPM!$VVr7d6980gg+9OQZIJ4W0@l~7-;_!y5{aJXJj-guG}6ne&d z<*&rN-YELjti6X<_(4i07CR~Dq{2H*QpZpmpg1kqy$P&Pip_d2K2V$F8_L2vfG*{w zhIjP{i#{_6w!HZu${R%pYx7)FJb!8JP$96P*2cRNGuyc6FyMn=_fYhhvB6I$*`>a% zkCjx|9bu%i7LgFr=tGEp0ow{NIHi2eyrn6XnDql>_hVunv8e>Qn~Tw$8C^Kc7xniu z;BrUJxt>uUmcssiL|t-GjdXr7v!d~i?5+UdsI{!BJWCD`Kh`~0g(goCNi0cL3Qx_g zl7tKzi7q^*3<=ebyUir=!RSp_Rxe;16>9-;C+b|t^aWI&omgPDYTGk4V! zW$`>&b=l?Up7>wr*Q372XO>9~iv9f}Py3+TUuGzOe9AMO3g3QX^yM}S2~1NS@l?3` zO+37W!TcsE;uj^l68Oa3Rn_-ilvXAQsE-vfHV zCdtar(`GGt4FX~V>$(`Q!sZ{ULIc*!(rsP7yU_^OkCx+$tC<0ga|EO7Ib|v#urZb7 zLFu)x*WTMjUVmJduky*A@!ktn1W8_^W1a2r(<4U1LT(qH`m#<1^GxOD4C81qqK!w* zOBZ9>3s98Io6EWzhxgs2!wuym6s|wDRGMNPi6nbJOYTqgz3}fpiZ!PcBoc|OW>|E_ z!l?7JiQtDBOM^jK3RGeEO{0M?1d+{w&5m5W~u+25)SKO-q&No792ZxrC zS>&6l+9;2tp-uCmvj&s6z1gq^Z?7Yn7e1xzAl2q+P5M$v*cJj747@J>B7-p;~+zMwv01a-j+kzGA(oOXa&^PKiQO|O}`c+QE-6qUdS}&#XW@1nbF(r|B1fHC6 zWU1)5gWaJnV5p0STO`;G4snM=AX~v;I2e3Gl7svoz~NIcs8c@&UueGHmVncL8;BU( c5fFixh)e%DYGT^BEFqmeLCC;+{(ofu1Bi_rr~m)} delta 1519 zcmVA|m1tkI_C}i$gp{EOeZHUwY$rSqsp3HNBDEPk8l~ zej_a&&Q?t)zpLgqPpwrn*PACxIFqKb8qd+hb2Qa$SH!Pi)>cLL@f7=b%CcR*<=UxT zY~tbJ;eTxh_xmay*BHvKLp;WQzmJHBhlhtM9_M_sWD6$@C7e`CIH{I!QZ3=6TEa=S zvQ5IT)TNb!*W~AI=?%Un!g0?#-#yp4ukaYob{nXygSU8zCI-W-I66aHw{@ zzqOC2I2>*_)Hho>yX*b!`ue4H_KBC#ovohj<$rSB?-BK0{E@@Wh4ba*^9};g~jdT5?3j8FEUO;`RVcDQ2G#NwNyC2mEN&qE(Nm|=K@-(Mb7sU z;rtd6-!97tjiu`0uemK$i&T_o(QGtv*e8 zSAY6%I-#7at=~iv(o+}juBeG`Vu64z(Yb2U(QnBs;fDsZ{Xe;Ha68v@cl)I2iB#)UJ;l3mZt(*LR!s}H_L3tZ0iv#J`=NhXk_*X*Ers@4Me?w%FSGQYZaHf3W$xXLEhzb*gr(GIg8(zfM%w)ST7! zT=jl`^E5F-^_(l5Isf!b@15>$Q`(QL^?vnKS}D7sxDdEcJNF)#SwfntTd|tu%YV+C z<7nL_%J%!Q*DSGodF;9Fl4ke&NOR8Bp7p++ldIJnm2=UmnQLHDvZ|h|j&obVQs{?j zujkA-S}xunJu%{4%BJ%>nx#TIN8fX5I2Wm!O9%5(Q(n4qwld6RZk7(|6xH=Pb5zXs z4|pBxgO-|FYA4s*$KB^L1ZR=kNPnjGJ*R|o)~Y$jfQLz{yU(eL%9+evN@zjpC4Ey( zsh(r|oU>KU92Z%n6*=u+*63J2G{cC#JupoT%cNriF?Tqp2J`F%Cw(tQIkNn^copBr z)2CmW2J+nf?icQbpL|Tu{r;iGY*Q7@`jRfaiAoNFPU$lU$}vbPeH_L#>wmRX%~_RP z9V*?7*5>Lf=Mbf53u+rJ$BZNRF$1GwD@3(a%~So(+>`JTzrtBzNQXmcHlEerKs> zy+}IxOe;m?ZQi?~J9l;YEq}U}KIdj_)v&wm5vv#kZ6fm@%NWwEukKTTS+|?%b5e&P z{m!h-dM$ICtb@u)Z-;oydd;VBQZ3=6T3J7D{qF9r^!~CUSu5v{A3qF+R_^ZZF58@} zW}QJ^Utg!cNKeAaAU}Wp%+~q|C)E;8sx>5>YreRG6;e6LYRE0Z!hcD%hJ^E5jBMI> zv5D<=TY6tvnIYkv^pSx%=f_yqcDo%l5#MRjdwtT|&}Myf_2hcYP-uD;x}o8$>H}9< zkD*mFV%&g8^<;|P1#V0@$5u~izENYUX2kfZB-N8K1{Jok;cP!!TR?A9?~^{ZYDP?( zgufV2!M$xsFb8)Br(~`WoebzMHgO*UdhJflcTNrFoZ6DzJV(<+M05ZC`2Ou4Wq*y~ z`h1+{c>5fqkFWT3z6UquOZf=seexB;d5yjlpt*xNcbnUm@MB@rzF(K-K6&Dww{KN6 z<=nRB$X7%~O*xY>24f3w%>VtYTci=e7|@fh1{xPLEif@uGB7$YIXW^mD=;uRFfd0= zLAR6N1{xPLEif@uGB7$YIXW^mD=;uRFfcX{`3sW}2OT3bEif@uGB7$YIXW^mD=;uR VFfd^S*wg?3002ovPDHLkV1fZ+4*dWC diff --git a/sprites/spr_jump_pack_complex/spr_jump_pack_complex.yy b/sprites/spr_jump_pack_complex/spr_jump_pack_complex.yy index 76aa8a6fe6..0ca44b59a7 100644 --- a/sprites/spr_jump_pack_complex/spr_jump_pack_complex.yy +++ b/sprites/spr_jump_pack_complex/spr_jump_pack_complex.yy @@ -2,10 +2,10 @@ "$GMSprite":"v2", "%Name":"spr_jump_pack_complex", "bboxMode":0, - "bbox_bottom":77, + "bbox_bottom":122, "bbox_left":10, "bbox_right":157, - "bbox_top":2, + "bbox_top":47, "collisionKind":1, "collisionTolerance":0, "DynamicTexturePage":false, @@ -16,14 +16,14 @@ ], "gridX":0, "gridY":0, - "height":232, + "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_jump_pack_complex", "nineSlice":null, - "origin":0, + "origin":9, "parent":{ "name":"packs", "path":"folders/Sprites/Marine Viewer/packs.yy", @@ -63,18 +63,22 @@ "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_jump_pack_complex/spr_jump_pack_complex.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,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"c5bc43cd-b567-4673-92b9-efede7a0b44f","path":"sprites/spr_jump_pack_complex/spr_jump_pack_complex.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":0, + "yorigin":45, }, "swatchColours":null, "swfPrecision":2.525, diff --git a/sprites/spr_leopard_sprite/spr_leopard_sprite.yy b/sprites/spr_leopard_sprite/spr_leopard_sprite.yy index e1e33b8165..2e86214a95 100644 --- a/sprites/spr_leopard_sprite/spr_leopard_sprite.yy +++ b/sprites/spr_leopard_sprite/spr_leopard_sprite.yy @@ -33,7 +33,13 @@ "resourceType":"GMNineSliceData", "resourceVersion":"2.0", "right":0, - "tileMode":[0,0,0,0,0,], + "tileMode":[ + 0, + 0, + 0, + 0, + 0, + ], "top":0, }, "origin":0, @@ -76,12 +82,16 @@ "playbackSpeedType":0, "resourceType":"GMSequence", "resourceVersion":"2.0", + "seqHeight":1046.0, + "seqWidth":1454.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":"65e7e956-93b9-47bc-8d8d-2515bf68797e","path":"sprites/spr_leopard_sprite/spr_leopard_sprite.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"062dc391-a5c8-448f-ae78-77f49f609d50","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"65e7e956-93b9-47bc-8d8d-2515bf68797e","path":"sprites/spr_leopard_sprite/spr_leopard_sprite.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"062dc391-a5c8-448f-ae78-77f49f609d50","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_complex/358913f3-25cd-4411-aa3a-01c656c1166c.png b/sprites/spr_mk3_complex/358913f3-25cd-4411-aa3a-01c656c1166c.png index b241890deeeb832c6f27d4677429bba7aa71b5f7..d5831fd55f9163fa1a9355865c29cc2b0a0af43f 100644 GIT binary patch literal 5310 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 Wf5zAl_D3!-0EE7oUY(9(?0*4edD*`J delta 5117 zcmZ{ocQD-j^T72e$suY)JH15jC3-nEYP9p{Ax`hY`G`j+9OsCd$cd03iOvZgoe=Ff z1Q*>AE_y=n%QN$x-(TPF&c0{fGdug<_s;BVW_LS9k3h97)xE5{+ttNYd2E(ylLo4sq!fQbVuY-ib1kwl8p#vw z2>cM=%x)RlXJS>Mm!8tG<$W`D>o4bYpz{~VD2;^cUbQjYKqONW{QYUc`%q z!zYc_++c{JJ9Bezg-9q}?lbnm3=H06%T1j2ZPar1Z7*}}dPX!NnP0DP25ge?5k+(0 zRX9?n8HwDyEdaorIFq0D$N!^`KVwfW4^x~Sni`nrtZ!74Jd{1*`S+!^3`?|r^+h)4 zc}`J@S+Oo6Hm{Y;&@E&XnX>L*+7DJ~<6rS6(adIxB>E_?3y>5Q40GWLu?1g>jp~HV zB_I*T(Bl1-+daDH&q{g}!HWu}6k@1ecU$B_B$+zCB8MGr_+G$^lkMDcCUt(f%`z%i)DekKSir5B?R(ss*xg_}TXpll)e5h~H z^twx{q;>m1i4jlt^ntzc(6Y7}5_LPCbv{!3#S4D^h}N@!6u-9Xq4=4O5RSPDgbsiN ztLa|n&^^+uS2?B5%~qgYoU3`}3>p@N-mtQ6t&<&(5u7v~3J4yCMa`RR@p3s)4$pGH zmdp8AH!p|GIOe}2Sdw8Yyr&R!Awr_@A6D&I&u7reSgXHYf6PyNtSRd#Ud);6)T-g5 zg*=~fnf60Ltidr}TGlhiMn21h^nl;1G!_9V7_%?0vD_qRSOQ8HJI{yODUg1CIk-Pv zoI+_q4|8w5>1!2Q&6YNaSn4tE^GW&M9&ph6Jn{nRO82!seCbd)-#$e>+PGSDWD0x< zt-}Vfk490n%vYZ#`#mI^S>YfV$iRG4m_r3ou4X>*Kh5Dh(3{7?hjb}-fF0Rmcy__h zD`TlqVOY&O18rx*;mL^1pJ*IMoBW752t;ljd&)21KM= zs4Y8kV5Ag$Wr}nJtTme3m8(T0_u0s9Xctkm`A{pm3ElQmH1*D0e7RHJVY(!h=ve0! zna_g@7M{=^yEh{0`M{5HYiwW~IvSnIjD9aUyOY7yL_L+<@QMIDd{RVWSeDNa^v z5Z^r70-30SDE(&cY)K7WW*lSp3Y_2gK0D)mJORC!`Hs*if>nizdb~@ZAmbRFd(^hh zyTzLNWWWvSPO-o$pv4i;(OL|cgWM+yut(VgF-MwCg^m^B+F$0VREvfMP0|mOd#C%9 zgA@}gp7RHEOW6ZGp=;j6U=nV_(Yl=Q*W-2b6oY98uYBA%%Hg&);@iY=bl~_*enVw= z3e@!a4=gn*<$K({pWLA)pJQCm`X5kuru{brknHi26k8-14vGCuAlh&iJatnqGV(lX ziz5JS6u;>`WT}+Kn!nB``biiUD-WZJP2hvkX9TlmV2kUm_9OyMXh#mpj06-lFbebw zn}1vRa)gSZS3>i2R8xgNc1jM);;U#}PJ#B96pV@*6g|S934dnzVw;%P5C*xs*(+1c zuA8rws6L!wPMk30-C~HVZRCS|9g=Hb3uH1FIZ>8p7G`kEl?_ExYG;x7?X#-iU)?d; zwCCIeih#_UxK3F+i4j(c=n(6KJG3pP_#nq>pY$2l9sWQk4-=*Y&ScWYF)9U;4@xB_ zC9qJG3e6`{+`aLr%axDNKo^$b7~i+eXK9SI*$FlSZ)l6D=s$w){ETwXmDu?GeZIlF zwX5p|;Bs$EkdJ~pN%=2e;{CgTX(7(33^J;lK!bF($cy_iid~gtB2UGoj-2;!Jn_5l zGd2&X7Yb8s;v=CigJ9-++sR#BT`ttCK2`jxecK(;Q5{!7t3?Xd7~Zu2`JmLPn>mIa zpLJ8&kysizUp7yX>}PL(EDDZTMfE|5AosQ`b%iZH$XM@R>fDyxqNeap7MZvfi4#>7 z;D+`>X+JgIk=^mRp(*L)5vjIYdvrmK1A-nd$P)XzdYZvAWBY-5#)ME3CgZcB@X9|RsP{MpZ+zi{+w4WHoQ)1TlQ3w|#j7x+0N zINtYK6pW^^^4}l7yo7Iibv108%t}BufXn0AqfbuLcN89No3k{V$?V{oF;j!P^ey7k z_m`uGi>hrAGVqFUZ_CdY;A#=;n?X=_?3^S`faK?9Rd?OmgvDOEwMZfrX|=(UqKxC> zq7kJF$| z&h_nap3f3Y^&6QigMaA}nE1m7^P*u%vlN7oK_94OwbWVd3e(!3B5_VsYxk*_a(KgQ zd#u!BIO}^Ay+yYKp6i3OCIHttkr;!;rc-_xQ^orSdCQ`=Qx7Xha6BRE!!vfLZ_jg@ zXk-(c{xS8r_QR2@IhU)-?kN=b?T5IFCye5<7ry0+yVtx2fhvTwlNSS;H`!&-I73ng zJ({`qq2eON>_BAYr!S6WrCxOh5skBUT$Sy|r<6aG4?zxFdyuuQ3E*$L5iGQ77Q2p+ z)OquyxeaaL5ZS)RsR?e$+Xx!o>5ZUE2+P58mH$v8`O}}!%@5_JA8hd8p^{Up)`}5W zK8W4*0efUcboV_)Jcu!4T;05INf5ScILkL=Z-rSCl*WfKw)f6)wqJA_o}HpvJxNYz zthCiOa`qt?i83+3Rv4)XQ+=!F*{Ln+uEmV-Q212)T3=c1{yl5W)m)J8yeLfmJX<3& zR{J6IfU7FYEgaXWKb7hkK2>^5^yN2kUC+S=CvPtGAdlD-cnt0vLZBmPLrdhsGi3oIYcHAec2cD)*3iaJOLGKon zO3!;y>t%i{p1I)kESrnSIHZn*=1p$pa!43BMMJ%u-|?(PJ>+mj-C?Jv;7BIzx?*5$ zdJ+4}p4rZ$HdQtfKk4}JfyO z8m)_KCn@+*T(kQ0nZf65q8#pEAUeHw#n`M-&NuGTEsXm;{>|UTjt-#)W;JgOO4KP^ zS^*K2x#L#-%<_pJ@Z0S#K-nvYtrl>rIM+MvE>{O*uXk0FRhT^ziLZ)8_7L;eeAU)v zt?Ov&d9Au|@*yb$I(_H*Mqak^^WlOe_r?<1;vz%MUB+V&zuh)HTxn0szMg|HS^C_o)?{`?t6clx&nmm%!_zepyAW z&vi(B!+w`4h;hTwd2|;h*HbR}Ma+}@)Yx0PUELujG;4+9TTH0FELl4VXJx04M$H{b z4eclf?=1vbpdNxu+&J-jXqrZo^?KPbAL#Mj;f*3@7Zs&~E40D`!^|jW^qCcU4|oN} zVC8jhp>emP*QM*dWk%u-y$bwwpg(liLR?hkl+oH_NGZ%JveRk%qRgv{kFB4=h(frexR{HC_ejmq+68f& z)3K8cG2NYZ%XNGGD`6s!l}ie3F6~4ztDq~sSeOEDPT##spYVy7CEsnjiOJCK)APsG zD5CibCBdP2F5Jsk6wSa`N?RgiJlJ)ES8J(T`_4;if{qb!c?s#!uN@;1Lzeo z37cIXYv)!X;+qHjq9W8h=*^wJw_arsM=ucSqR`LcgCmKNxq4tw+ULO$I#D=2L{ zs1(V;l}j$b8DwyNYb!`$`b&i5qBLCS`I22MI$&ZQ}9)zqC2$XfsLM`q6~Za7eiuC(8`**qSf z1jC*mR?ECM8WIE`5toKw6^DhNoLp9}ri$9e*B_m21{y=Dt$I#=Av$UWJ?UzO_#jy; z?E^-^&%{cfk{{(cB5v1>XIJ=3f}LFTL$pI~;&ixelI5*wWry087EOzDIo`)I4>#!K zealVqr9$96WyoGV7|R0!a@)-B2nTpra^ibBKgG+#imh|bB4+&aZBram!2#@KOEz*z z9%baT*;&uqZ^dcDEOet^HMs6&vSuKmd98P9ElbJ4R^W@4kN#i^v$rA3%%n z^gI3(n^+MkNgw#LbqN;zLdjrR#@+dAWK1#zo79pP>=ih`q@(vPdyzVXm(1`W%s(;n#|3ak|$>Ma(jU=%M5~#8;%}qcIMP+c)gC%^-VZS&16A`bYuZ4 zWu4xWJ(a4A1BS}Jr3S*?5lFXew5X)No7JOIAOuWckx75 zLoVUsl!^*aj)q%u=Fn3(&~%esck4E43!c=dJoVLf(1^0oDOE$5lDo8LI% z*8}WOTPcXbCyRV~)J9~I2Y5?di9Wi5-D5w)&+F}Aa=Nn6`rOT53+nU^GhAzRgGtX{ zSUMJo*ggICn?YXhcr!E|z=w-XDZ5p&RSAUxTg&UYwkj0{nB^jq=JhNN7T_mFr__(p zlV#t2#kP<^mG^37WD*f-i19>$s%aP=nYiB+LyDDRN^K+{FULM~u>6bKoB#x5Eyky( z^frttVjZklG1FRT19QU=6st5m>HI$usGLDywZw2Jax!zU$w|m4*~rSN$|}l&UGLD&x|G)S>T`LqP`6EX9=6ZEHt_lAKr!Uq# diff --git a/sprites/spr_mk3_complex/layers/358913f3-25cd-4411-aa3a-01c656c1166c/9f0d4e11-dbb4-4a1d-a21b-c96ba3d82387.png b/sprites/spr_mk3_complex/layers/358913f3-25cd-4411-aa3a-01c656c1166c/9f0d4e11-dbb4-4a1d-a21b-c96ba3d82387.png index b241890deeeb832c6f27d4677429bba7aa71b5f7..4830c87d6bf0b2b89077a56effd6b1a736c27528 100644 GIT binary patch literal 5310 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 X@IPaUfTOzS7ywewRJUH+A@;uj6pGkv delta 5117 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 diff --git a/sprites/spr_mk3_complex/layers/358913f3-25cd-4411-aa3a-01c656c1166c/d9e2c0be-152c-435b-b546-d987a36b384c.png b/sprites/spr_mk3_complex/layers/358913f3-25cd-4411-aa3a-01c656c1166c/d9e2c0be-152c-435b-b546-d987a36b384c.png index c10299292ef7bc295a2b9e171dd83502788eea32..5502cf7facb04694028c7c44e52961555f89ee0f 100644 GIT binary patch delta 120 zcmdnayq$T2KBI@JuCZZ=fw7gLft8`Lwt<0_fdOlF{R9RE2GtVRh?11Vl2ohQ{FKbJ pN(LhXBU4=iEE-D8j_XV=XOvaOBB!kU>@(0X22WQ%mvv4FO#niV9@YQ= delta 120 zcmdnayq$T2KBI@RuAzB|k+GGrsg<#@wt<0_fdP|<%~u8n2GtVRh?11Vl2ohQ{FKbJ pN(LhXBU4=iEE":"","Keyframes":[ - {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"358913f3-25cd-4411-aa3a-01c656c1166c","path":"sprites/spr_mk3_complex/spr_mk3_complex.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"ec45e7d5-2e29-4440-965b-2b5e148ec8a4","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"358913f3-25cd-4411-aa3a-01c656c1166c","path":"sprites/spr_mk3_complex/spr_mk3_complex.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"ec45e7d5-2e29-4440-965b-2b5e148ec8a4","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_complex_backpack/1b7c53e0-54ee-4ded-bfb1-a4a19c2f498f.png b/sprites/spr_mk3_complex_backpack/1b7c53e0-54ee-4ded-bfb1-a4a19c2f498f.png index eeffda3174f66d991ea2b9ebeef2b6e8c140ad8c..a69022b30bc1e3ba80da81f074c6f7ac51ca11ef 100644 GIT binary patch delta 814 zcmaFOzJz0f7&oI62O9$eL;d}-tci*aPR!z-E{-7;x8B~`U3l9;fbGH36#&W6e7+eo_G8`1p6cXt;`uMlf#KYq6>h9f}C&4)RB9mgh!@k&W z>=6ySK7Zf)*z{O-PSe4k5r1DlzyIynclrBDZT&YT)^C)I-)!%&sOr&k-r8Q@wzAcY zYvS`x9Qo&?rf2)!|Bqeuf6c!4@2b0=uYO@1N-jl=Lgi5pPTLi}RH`b29wI#;~LNcD`j_{-uNYtNYo@rjy?* zu3lAj^#Z! zBxPwr-rO&Hg{(eIarAz_N&ceT4TC!|&lGgxA28|GfB(t8jrVBa{W&^4z%-~@;u=wsl30>zm0Xkxq!^40j7)V6Om&S7LktY9 zOpL9JEwv2{tPBh!nOaw(Xvob^$xN%ntsx`cRurf~18ze}W^QWngTe~DWM4f@uGo2 delta 815 zcmZ3&@tS>t7&pTU4mJh`hD3e;u!)Ke^-T9XT^vIyZoR!_Uo_i6g#E#CpLIugFI`-5 zMX;vTMDx-UE~}=?hLa1YOBZNdlJMD(!YO%!b>I3;Ccloq^Z)&AttcbVFa`$eB9Fg} zVGCaV{rjTA_oLMAgaW&3e}4VkzWd|fl6?uh)X%Cm91~g ziF;Rn!lhDC`1-u>>UHsZ{>v;c|89Hq^V#oq$5(dBwtez`#XrGe`U)dHap&o$Ed35M z_-~Y2e@c$o^VqkjP0Ej|e)>M07qqW5nj88(JOuqFxr=GQO95W>w|N z#;Do8ZxnwkN?%^FX2Hsxzc)s6Bp=zueDlbHSNb;w!X~ zTfAzO#$$t3HS2e-%#^>~wo$hE-rxS1m{0kouN=ynzhzj&E$ZA<#r;%{_ppTFzT|q| zGHcG0O*2=em>?kdzSm&;_gKM`Z%`LPnD*{DXzbELG#qNh@Dfv8a|&8yzhDM z(Zq|4QJ*cJSVzZ-+HczWzh0d)C7SEiu6cWON>YFK>3{P!iERC$Iq&`7wW&{Zj>r7{ z=@Gb2`4WrKe5sSV-RDCuHGh0~Z>dI?#_P9cDmx|L$p@EQbw2rR!b&fu?Mvs(4rz>8 zBl6^$r@fXV`@ED3lge)vo0#=XKW($*U*XX=+cwGHz4h^&=}G39huvn?JX5SZ$u{{R zQ+0jAnZL~bHAe#v%kRGiOfjk@t`Q|Ei6yC4$wjF^iowXh$VAuBK-b71#K^$P)Xd7z zRNKJ7%D~{!<;+JY8glbfGSez?Yna@3F%GCf18ze}W^Sr}aYbP0l+XkK2=#o2 diff --git a/sprites/spr_mk3_complex_backpack/layers/1b7c53e0-54ee-4ded-bfb1-a4a19c2f498f/9bf31ffc-9a0a-492f-89fb-b703fed172b9.png b/sprites/spr_mk3_complex_backpack/layers/1b7c53e0-54ee-4ded-bfb1-a4a19c2f498f/9bf31ffc-9a0a-492f-89fb-b703fed172b9.png index eeffda3174f66d991ea2b9ebeef2b6e8c140ad8c..a69022b30bc1e3ba80da81f074c6f7ac51ca11ef 100644 GIT binary patch delta 814 zcmaFOzJz0f7&oI62O9$eL;d}-tci*aPR!z-E{-7;x8B~`U3l9;fbGH36#&W6e7+eo_G8`1p6cXt;`uMlf#KYq6>h9f}C&4)RB9mgh!@k&W z>=6ySK7Zf)*z{O-PSe4k5r1DlzyIynclrBDZT&YT)^C)I-)!%&sOr&k-r8Q@wzAcY zYvS`x9Qo&?rf2)!|Bqeuf6c!4@2b0=uYO@1N-jl=Lgi5pPTLi}RH`b29wI#;~LNcD`j_{-uNYtNYo@rjy?* zu3lAj^#Z! zBxPwr-rO&Hg{(eIarAz_N&ceT4TC!|&lGgxA28|GfB(t8jrVBa{W&^4z%-~@;u=wsl30>zm0Xkxq!^40j7)V6Om&S7LktY9 zOpL9JEwv2{tPBh!nOaw(Xvob^$xN%ntsx`cRurf~18ze}W^QWngTe~DWM4f@uGo2 delta 815 zcmZ3&@tS>t7&pTU4mJh`hD3e;u!)Ke^-T9XT^vIyZoR!_Uo_i6g#E#CpLIugFI`-5 zMX;vTMDx-UE~}=?hLa1YOBZNdlJMD(!YO%!b>I3;Ccloq^Z)&AttcbVFa`$eB9Fg} zVGCaV{rjTA_oLMAgaW&3e}4VkzWd|fl6?uh)X%Cm91~g ziF;Rn!lhDC`1-u>>UHsZ{>v;c|89Hq^V#oq$5(dBwtez`#XrGe`U)dHap&o$Ed35M z_-~Y2e@c$o^VqkjP0Ej|e)>M07qqW5nj88(JOuqFxr=GQO95W>w|N z#;Do8ZxnwkN?%^FX2Hsxzc)s6Bp=zueDlbHSNb;w!X~ zTfAzO#$$t3HS2e-%#^>~wo$hE-rxS1m{0kouN=ynzhzj&E$ZA<#r;%{_ppTFzT|q| zGHcG0O*2=em>?kdzSm&;_gKM`Z%`LPnD*{DXzbELG#qNh@Dfv8a|&8yzhDM z(Zq|4QJ*cJSVzZ-+HczWzh0d)C7SEiu6cWON>YFK>3{P!iERC$Iq&`7wW&{Zj>r7{ z=@Gb2`4WrKe5sSV-RDCuHGh0~Z>dI?#_P9cDmx|L$p@EQbw2rR!b&fu?Mvs(4rz>8 zBl6^$r@fXV`@ED3lge)vo0#=XKW($*U*XX=+cwGHz4h^&=}G39huvn?JX5SZ$u{{R zQ+0jAnZL~bHAe#v%kRGiOfjk@t`Q|Ei6yC4$wjF^iowXh$VAuBK-b71#K^$P)Xd7z zRNKJ7%D~{!<;+JY8glbfGSez?Yna@3F%GCf18ze}W^Sr}aYbP0l+XkK2=#o2 diff --git a/sprites/spr_mk3_complex_backpack/spr_mk3_complex_backpack.yy b/sprites/spr_mk3_complex_backpack/spr_mk3_complex_backpack.yy index e7acffe5a7..7274a20a17 100644 --- a/sprites/spr_mk3_complex_backpack/spr_mk3_complex_backpack.yy +++ b/sprites/spr_mk3_complex_backpack/spr_mk3_complex_backpack.yy @@ -2,10 +2,10 @@ "$GMSprite":"v2", "%Name":"spr_mk3_complex_backpack", "bboxMode":0, - "bbox_bottom":36, + "bbox_bottom":81, "bbox_left":27, "bbox_right":136, - "bbox_top":9, + "bbox_top":54, "collisionKind":1, "collisionTolerance":0, "DynamicTexturePage":false, @@ -16,7 +16,7 @@ ], "gridX":0, "gridY":0, - "height":232, + "height":322, "HTile":false, "layers":[ {"$GMImageLayer":"","%Name":"9bf31ffc-9a0a-492f-89fb-b703fed172b9","blendMode":0,"displayName":"default","isLocked":false,"name":"9bf31ffc-9a0a-492f-89fb-b703fed172b9","opacity":100.0,"resourceType":"GMImageLayer","resourceVersion":"2.0","visible":true,}, @@ -63,20 +63,22 @@ "playbackSpeedType":0, "resourceType":"GMSequence", "resourceVersion":"2.0", - "seqHeight":232.0, + "seqHeight":322.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":"1b7c53e0-54ee-4ded-bfb1-a4a19c2f498f","path":"sprites/spr_mk3_complex_backpack/spr_mk3_complex_backpack.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"9e7c62a0-7429-45f3-88c0-0aa6dc2ae3a2","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"1b7c53e0-54ee-4ded-bfb1-a4a19c2f498f","path":"sprites/spr_mk3_complex_backpack/spr_mk3_complex_backpack.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"9e7c62a0-7429-45f3-88c0-0aa6dc2ae3a2","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, + "xorigin":0, + "yorigin":45, }, "swatchColours":null, "swfPrecision":2.525, diff --git a/sprites/spr_mk3_forehead_variants/spr_mk3_forehead_variants.yy b/sprites/spr_mk3_forehead_variants/spr_mk3_forehead_variants.yy index 804223e69f..8fefbecf92 100644 --- a/sprites/spr_mk3_forehead_variants/spr_mk3_forehead_variants.yy +++ b/sprites/spr_mk3_forehead_variants/spr_mk3_forehead_variants.yy @@ -69,18 +69,34 @@ "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":"006f1fc6-2a40-4299-aedd-c8ec3435711f","path":"sprites/spr_mk3_forehead_variants/spr_mk3_forehead_variants.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"9347642e-46b3-4195-9d03-d2a761f92bc9","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"6b0a122b-cbde-43d7-86fa-09659011d3ce","path":"sprites/spr_mk3_forehead_variants/spr_mk3_forehead_variants.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"6d57cb6f-4cdd-457e-a37f-9df410e5ea56","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"1b4c0911-af1a-4514-8459-35cf7d4f6aeb","path":"sprites/spr_mk3_forehead_variants/spr_mk3_forehead_variants.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"3093b5a7-e27d-48c5-b58b-dc513e7b8e2c","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"ee9859ca-5867-4ea9-9c32-bce41c0bf04d","path":"sprites/spr_mk3_forehead_variants/spr_mk3_forehead_variants.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"70daa5bd-729f-4641-a567-78e6da5b3720","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"3f3d4f82-2879-4b96-9ec5-2fd9414ac048","path":"sprites/spr_mk3_forehead_variants/spr_mk3_forehead_variants.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"8732fa6e-e469-4750-af0f-1e60cd6e2654","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"120c0dc2-09ee-43e7-8b97-23af2bfa96b6","path":"sprites/spr_mk3_forehead_variants/spr_mk3_forehead_variants.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"946cb3e6-0dc3-45d2-8897-5093b94d1de2","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"37c11dd3-1414-4c8d-8d71-e00098819009","path":"sprites/spr_mk3_forehead_variants/spr_mk3_forehead_variants.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"9fb25342-066e-479c-8282-263f7dff3763","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"006f1fc6-2a40-4299-aedd-c8ec3435711f","path":"sprites/spr_mk3_forehead_variants/spr_mk3_forehead_variants.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"9347642e-46b3-4195-9d03-d2a761f92bc9","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"6b0a122b-cbde-43d7-86fa-09659011d3ce","path":"sprites/spr_mk3_forehead_variants/spr_mk3_forehead_variants.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"6d57cb6f-4cdd-457e-a37f-9df410e5ea56","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"1b4c0911-af1a-4514-8459-35cf7d4f6aeb","path":"sprites/spr_mk3_forehead_variants/spr_mk3_forehead_variants.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"3093b5a7-e27d-48c5-b58b-dc513e7b8e2c","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"ee9859ca-5867-4ea9-9c32-bce41c0bf04d","path":"sprites/spr_mk3_forehead_variants/spr_mk3_forehead_variants.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"70daa5bd-729f-4641-a567-78e6da5b3720","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"3f3d4f82-2879-4b96-9ec5-2fd9414ac048","path":"sprites/spr_mk3_forehead_variants/spr_mk3_forehead_variants.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"8732fa6e-e469-4750-af0f-1e60cd6e2654","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"120c0dc2-09ee-43e7-8b97-23af2bfa96b6","path":"sprites/spr_mk3_forehead_variants/spr_mk3_forehead_variants.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"946cb3e6-0dc3-45d2-8897-5093b94d1de2","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"37c11dd3-1414-4c8d-8d71-e00098819009","path":"sprites/spr_mk3_forehead_variants/spr_mk3_forehead_variants.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"9fb25342-066e-479c-8282-263f7dff3763","IsCreationKey":false,"Key":6.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_knee/31a02b91-20f6-4e25-8262-cdd09b5a5081.png b/sprites/spr_mk3_left_knee/31a02b91-20f6-4e25-8262-cdd09b5a5081.png new file mode 100644 index 0000000000000000000000000000000000000000..88cfef1a019d7ca12accb7a54313d0ef4859936e GIT binary patch literal 881 zcmeAS@N?(olHy`uVBq!ia0vp^OMv(V2OE$~)b|eqQVPi)LB0$ORcZ_j4J`}|zkosw zFBlj~4Hy_+B``2p&0t^_}a??b>Va#c!+P7w=b@ztFnJomq3roQtx@Hb--) z&V5zfq0gVJJjMBM&pU?xYw8=lHNPJ{?wTnn=k=*_Mc?~XJrmb>t(wrecJ<@!0w?%C ztedn|ul@An{cQp#VrDr%6M1i6ZF|1>d+LdD!4pgN74GO0IFU2UwctnAV8IkdtM|jh&+Pr%JI{NP`)jrT!P_;zhl?;^*Ntz-lo_ibA>0>_PKSG;p^HIuEmy4akCq) zga`K7c`dzKxAneAq{l_hdAIH~N(i1!unTVAb}M|A%#xQJvC}%9IWOMzCgc=2ba&-8 zRbJ-GSR8vQdH$wgnNJ2wt{d6ct)I55cuvszX|l;griDpAS&!VeN$t6M#u%tWwZt`| zBqgyV)hf9t6-Y4{85o)B8kp)D8-^GdTNzkbnOJHY7+4t?STEYxhoT`jKP5A*61N7g m|C~lZ4H|G8N-}d(i%Sx73vla^eWmdhex1XNYbJDZ5b_$W%17@P)kP^MeZnqYtI~cHA-nYNtLpFg+vNzhV1S`!~|{`yQ*G zaG9Aab49Ld#l91shQ(G#RNp>IYumwT`0=7ZylR`Iv0&P%g3tYz7WK?vF`jN88H} zR_R|``&a(=ud9mfbNRkr_1bZ@dW9XM-J{k28$eM?Bxw4>lwV{l^X>K?4xkRz64!{5 zl*E!$tK_0oAjM#0U}UOmV5)0u7-C>-Wnf`tVySIlU}a!ny=Y?}iiX_$l+3hB+#0<8 ma~c6PXuxeK$;?eHE=kNSz^zC2mBw3;KRjLiT-G@yGywn$H`E6J literal 0 HcmV?d00001 diff --git a/sprites/spr_mk3_left_knee/7945b113-31a9-4792-8b3d-f168bac8c94f.png b/sprites/spr_mk3_left_knee/7945b113-31a9-4792-8b3d-f168bac8c94f.png new file mode 100644 index 0000000000000000000000000000000000000000..94cc2c35d21c4459bf4455c496bff32b3372b56a GIT binary patch literal 839 zcmeAS@N?(olHy`uVBq!ia0vp^OMv(V2OE$~)b|eqQVPi)LB0$ORcZ_j4J`}|zkosw zFBlj~4Hy_+B``2p&0t^NeSW?bgqldrwoQpH{8iQ{$;~VZA|FVpW8E#zL9H?q7M&=(H8y`tYhhUB>h7qb!N} zvUi-e`%0P5opQ)V=2&q3gRbwKPbGxxHkH5csrS1#cl+${cYC|i*{{YvTACOm_2f;| z)yL_}HaW`)9kYIZMfGqGa(6VzRuSS*$xH+B`gFvxu9t&Za4E+jHLD$jvbS<{0)*Z-(VAj(VeV7mfEVfdb7T zVvkq){d_Y2AXnmwQ=#Afmma@m`E(lhm*=MOXQp4${BxZvDm(J%P2DMnEY@vdvX%8p zl!?9--oF3Yl)wDf_eBXGo2V+Db?aAdmqMTR&V=eUnG$C@T4%GD9x)^`dJjndW?4Ob zzek_e^;Do1)e_f;l9a@fRIB8oR3OD*WME{fYhbEtY#3r-Y-M0!Wn!sqU|?lnV7+K# zABu+D{FKbJO57T}{&N}uHE6(XD9OxCEiOsSEx@fu_Lat4kViaS{an^LB{Ts5&3Yik literal 0 HcmV?d00001 diff --git a/sprites/spr_mk3_left_knee/layers/31a02b91-20f6-4e25-8262-cdd09b5a5081/9f0d4e11-dbb4-4a1d-a21b-c96ba3d82387.png b/sprites/spr_mk3_left_knee/layers/31a02b91-20f6-4e25-8262-cdd09b5a5081/9f0d4e11-dbb4-4a1d-a21b-c96ba3d82387.png new file mode 100644 index 0000000000000000000000000000000000000000..88cfef1a019d7ca12accb7a54313d0ef4859936e GIT binary patch literal 881 zcmeAS@N?(olHy`uVBq!ia0vp^OMv(V2OE$~)b|eqQVPi)LB0$ORcZ_j4J`}|zkosw zFBlj~4Hy_+B``2p&0t^_}a??b>Va#c!+P7w=b@ztFnJomq3roQtx@Hb--) z&V5zfq0gVJJjMBM&pU?xYw8=lHNPJ{?wTnn=k=*_Mc?~XJrmb>t(wrecJ<@!0w?%C ztedn|ul@An{cQp#VrDr%6M1i6ZF|1>d+LdD!4pgN74GO0IFU2UwctnAV8IkdtM|jh&+Pr%JI{NP`)jrT!P_;zhl?;^*Ntz-lo_ibA>0>_PKSG;p^HIuEmy4akCq) zga`K7c`dzKxAneAq{l_hdAIH~N(i1!unTVAb}M|A%#xQJvC}%9IWOMzCgc=2ba&-8 zRbJ-GSR8vQdH$wgnNJ2wt{d6ct)I55cuvszX|l;griDpAS&!VeN$t6M#u%tWwZt`| zBqgyV)hf9t6-Y4{85o)B8kp)D8-^GdTNzkbnOJHY7+4t?STEYxhoT`jKP5A*61N7g m|C~lZ4H|G8N-}d(i%Sx73vla^eWmdhex1XNYbJDZ5b_$W%17@P)kP^MeZnqYtI~cHA-nYNtLpFg+vNzhV1S`!~|{`yQ*G zaG9Aab49Ld#l91shQ(G#RNp>IYumwT`0=7ZylR`Iv0&P%g3tYz7WK?vF`jN88H} zR_R|``&a(=ud9mfbNRkr_1bZ@dW9XM-J{k28$eM?Bxw4>lwV{l^X>K?4xkRz64!{5 zl*E!$tK_0oAjM#0U}UOmV5)0u7-C>-Wnf`tVySIlU}a!ny=Y?}iiX_$l+3hB+#0<8 ma~c6PXuxeK$;?eHE=kNSz^zC2mBw3;KRjLiT-G@yGywn$H`E6J literal 0 HcmV?d00001 diff --git a/sprites/spr_mk3_left_knee/layers/7945b113-31a9-4792-8b3d-f168bac8c94f/9f0d4e11-dbb4-4a1d-a21b-c96ba3d82387.png b/sprites/spr_mk3_left_knee/layers/7945b113-31a9-4792-8b3d-f168bac8c94f/9f0d4e11-dbb4-4a1d-a21b-c96ba3d82387.png new file mode 100644 index 0000000000000000000000000000000000000000..94cc2c35d21c4459bf4455c496bff32b3372b56a GIT binary patch literal 839 zcmeAS@N?(olHy`uVBq!ia0vp^OMv(V2OE$~)b|eqQVPi)LB0$ORcZ_j4J`}|zkosw zFBlj~4Hy_+B``2p&0t^NeSW?bgqldrwoQpH{8iQ{$;~VZA|FVpW8E#zL9H?q7M&=(H8y`tYhhUB>h7qb!N} zvUi-e`%0P5opQ)V=2&q3gRbwKPbGxxHkH5csrS1#cl+${cYC|i*{{YvTACOm_2f;| z)yL_}HaW`)9kYIZMfGqGa(6VzRuSS*$xH+B`gFvxu9t&Za4E+jHLD$jvbS<{0)*Z-(VAj(VeV7mfEVfdb7T zVvkq){d_Y2AXnmwQ=#Afmma@m`E(lhm*=MOXQp4${BxZvDm(J%P2DMnEY@vdvX%8p zl!?9--oF3Yl)wDf_eBXGo2V+Db?aAdmqMTR&V=eUnG$C@T4%GD9x)^`dJjndW?4Ob zzek_e^;Do1)e_f;l9a@fRIB8oR3OD*WME{fYhbEtY#3r-Y-M0!Wn!sqU|?lnV7+K# zABu+D{FKbJO57T}{&N}uHE6(XD9OxCEiOsSEx@fu_Lat4kViaS{an^LB{Ts5&3Yik literal 0 HcmV?d00001 diff --git a/sprites/spr_mk3_left_leg_variants/spr_mk3_left_leg_variants.yy b/sprites/spr_mk3_left_knee/spr_mk3_left_knee.yy similarity index 54% rename from sprites/spr_mk3_left_leg_variants/spr_mk3_left_leg_variants.yy rename to sprites/spr_mk3_left_knee/spr_mk3_left_knee.yy index 43eaa91a21..c55890c6f6 100644 --- a/sprites/spr_mk3_left_leg_variants/spr_mk3_left_leg_variants.yy +++ b/sprites/spr_mk3_left_knee/spr_mk3_left_knee.yy @@ -1,10 +1,10 @@ { "$GMSprite":"v2", - "%Name":"spr_mk3_left_leg_variants", + "%Name":"spr_mk3_left_knee", "bboxMode":0, - "bbox_bottom":220, - "bbox_left":97, - "bbox_right":152, + "bbox_bottom":169, + "bbox_left":27, + "bbox_right":136, "bbox_top":133, "collisionKind":1, "collisionTolerance":0, @@ -12,9 +12,9 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"v1","%Name":"1ac1a90e-a16e-421a-8a7c-2edb61a4b0df","name":"1ac1a90e-a16e-421a-8a7c-2edb61a4b0df","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"v1","%Name":"9e7144c8-574e-488a-bdf9-38b61ac9a946","name":"9e7144c8-574e-488a-bdf9-38b61ac9a946","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"v1","%Name":"04fc9961-d557-4205-a023-dd867df0fdfb","name":"04fc9961-d557-4205-a023-dd867df0fdfb","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"7945b113-31a9-4792-8b3d-f168bac8c94f","name":"7945b113-31a9-4792-8b3d-f168bac8c94f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"31a02b91-20f6-4e25-8262-cdd09b5a5081","name":"31a02b91-20f6-4e25-8262-cdd09b5a5081","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"791128a9-6e7d-45a1-9768-df389631c490","name":"791128a9-6e7d-45a1-9768-df389631c490","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -23,7 +23,7 @@ "layers":[ {"$GMImageLayer":"","%Name":"9f0d4e11-dbb4-4a1d-a21b-c96ba3d82387","blendMode":0,"displayName":"default","isLocked":false,"name":"9f0d4e11-dbb4-4a1d-a21b-c96ba3d82387","opacity":100.0,"resourceType":"GMImageLayer","resourceVersion":"2.0","visible":true,}, ], - "name":"spr_mk3_left_leg_variants", + "name":"spr_mk3_left_knee", "nineSlice":null, "origin":9, "parent":{ @@ -35,7 +35,7 @@ "resourceVersion":"2.0", "sequence":{ "$GMSequence":"v1", - "%Name":"spr_mk3_left_leg_variants", + "%Name":"spr_mk3_left_knee", "autoRecord":true, "backdropHeight":768, "backdropImageOpacity":0.5, @@ -59,20 +59,28 @@ "resourceType":"KeyframeStore", "resourceVersion":"2.0", }, - "name":"spr_mk3_left_leg_variants", + "name":"spr_mk3_left_knee", "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":"1ac1a90e-a16e-421a-8a7c-2edb61a4b0df","path":"sprites/spr_mk3_left_leg_variants/spr_mk3_left_leg_variants.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"dd674911-3574-4213-b332-57af50579a99","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"9e7144c8-574e-488a-bdf9-38b61ac9a946","path":"sprites/spr_mk3_left_leg_variants/spr_mk3_left_leg_variants.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"1e0625e6-7cca-4fb6-9a2e-a33cabfbe0a2","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"04fc9961-d557-4205-a023-dd867df0fdfb","path":"sprites/spr_mk3_left_leg_variants/spr_mk3_left_leg_variants.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"9c70ed6c-7032-4848-8556-ff826065b08e","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"7945b113-31a9-4792-8b3d-f168bac8c94f","path":"sprites/spr_mk3_left_knee/spr_mk3_left_knee.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"29d4a1e1-f8cc-4762-8f95-b8409db320b9","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"31a02b91-20f6-4e25-8262-cdd09b5a5081","path":"sprites/spr_mk3_left_knee/spr_mk3_left_knee.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"35d74b37-2ab9-442b-9444-49bdf176b9c0","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"791128a9-6e7d-45a1-9768-df389631c490","path":"sprites/spr_mk3_left_knee/spr_mk3_left_knee.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"6a284a54-5288-4198-9408-04ed16c817c1","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_mk3_left_leg_variants/04fc9961-d557-4205-a023-dd867df0fdfb.png b/sprites/spr_mk3_left_leg_variants/04fc9961-d557-4205-a023-dd867df0fdfb.png deleted file mode 100644 index 0e9a8a0e2c0a5066d04284a692489b44057020ff..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1348 zcmeAS@N?(olHy`uVBq!ia0vp^OMv(V2OE$~)b|eqQVPi)LB0$ORcZ_j4J`}|zkosw zFBlj~4Hy_+B``2p&0t^k@+Ey?`o?d0OVZ{yU#H zl{>Y|@xo?riF`kO`FGw5#k<~#9$UwA_0#+?S>si%VwVLx-WmN-ihmDOQA*H#tNi-c@8{lKH(%m?*5CcYp(kqI zS^hbe^|5zy3r{jXru&{0TSGE^l*~)a790opWcO!?SOt@^yk9_qLvV?a`pR+&Z`A&&!jLy9!<`MLB*LN@etc$M9 zk6xDL?ti;(lInbk^Y80==igZHamLQtq&eNrE1jN|_il=t`dTi&Sas`+jOEtbHaX1; zIdSJ*aOsrP#GX&W2a409&o2G_ujHHT>-v{Bb^+z&;;fHd&h6D`4nHz??d@X$|L5j* z8!dIJTcJ^}{b-WHy*sydgq{r-E#?$8+J5h5>6DjTl26qwf*sdnrk`2+_r?45PM^Z3 zd^9*Fo!cv0y))+2&l!);|+osziA2FpaqwUa-J@=(*r(WVrt^dCL{?0%}eigO4 zZ!*U;zAn2}x37Np+ptqXui~`!JTgtm+w1yK;)dp_KL*E6{I&dDzP{)NA8?*+!G#%rm}{J>=_pCsf~rI^pT`$~eD z-EHN%to-UMe}(-n@6VKGt?JuU_v4t&*W^?GnE2mk+jln}5BzrZ<$0?o=ADwiue{lP zaL2v4c99dzou}Rg7W#xSRmyDEYr5~X{QdS-OC02ULhSmAe3&YAmIr;R{e7)_UwXJ_ zqs_eO!R1@z?m993bX@e6AxvR{yaq7(4@&6t$e-7{AH8?et2rwtEP2Gdi(OnC}Q!>*kacl7RtpSyJ8gLs*GILXlOA>Pn VaO;tXi0uWr)6><@Wt~$(69B}4JC6VW diff --git a/sprites/spr_mk3_left_leg_variants/1ac1a90e-a16e-421a-8a7c-2edb61a4b0df.png b/sprites/spr_mk3_left_leg_variants/1ac1a90e-a16e-421a-8a7c-2edb61a4b0df.png deleted file mode 100644 index 7bb2ce80b2679c2a199cbbad3f6874523841379c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1516 zcmeAS@N?(olHy`uVBq!ia0vp^OMv(V2OE$~)b|eqQVPi)LB0$ORcZ_j4J`}|zkosw zFBlj~4Hy_+B``2p&0t^pz}I?5-{34VG=QDMrb>0;|AfE+<}@F2?UMQRyZA0%=1vw}adY0=6yB%y>E#WT^Bi~S zS6qD^&Un8nJYj0ce%UWItNThNrdQQHh}2H)^80XYkwM)RZGWA~hEv+!%rRTvv-gHrYyZl)-E+U64ABfdQSFrj#ojyN}4(r<^nyb{)p5~(P z`RAE?f(vuj^t3-cGGT6jP276()7zFLowIuuA@O+0{8)v_(L$%hoD<*ddS~2Yxc;Os zM@rJi8Rs}tPv3o#ocQPcN4sBV<(w2IcONfV?PV!)Oyj9>PrA?v?vCRnxf;h0S!_A0 zaa`y`%c82QpS>#OPhAUt8!NH6$13GU*)8?;)tZm5X1^4jdi$-J)IN=7$Gf)rOf#>i zD?Bz-juY#6w(QrjTe4C6WG0B0_ryn-oasIpmbPm9@T|V{ygLilTO?EK4zRvyjH^uq}i`~r9L5i7T>^aUrM{c(Ma4+xhHc;>x zdB3@{&*9m(*XM+}RlMJBlGmKDL}|hqG3#x*6V`0}xj`4i6&FY^e{jH#QzbjsDu-KT zC5KA)QNCQRl)B|HYdej!3ug1)X7be9|1RpK>)qs|r#>3py|wtR@1`exAOBR<^X*2N`0oPhB_5{OgTp z>t3IlpLKKL+x2gweSy-q_a*P~iFUd9Z0EyL>G#{>&qhzx6#dlR^(j75D|H+70 zzUIVKhq%Lgzs4l>oax`Rw((n7s+Yq0#1H=!u3a^}w?<;=&Q-eKF3ofJC$v}j`pSh? zr@lRu{^oH-v4S&%|AuM1dlNx`%-|iHs zbOZv8rGNN)ESm%E8D`f4xvC|u5hW>!C8<`)MX5lF!N|bKRM)^z*U&J;$k@u%*viCQ z+rYrez`#!6$U77bx%nxXX_dG&`1{s?ibV~$4JDbmsl_FUxdpiONJPZ;0`)L>y85}S Ib4q9e0H8afp#T5? diff --git a/sprites/spr_mk3_left_leg_variants/9e7144c8-574e-488a-bdf9-38b61ac9a946.png b/sprites/spr_mk3_left_leg_variants/9e7144c8-574e-488a-bdf9-38b61ac9a946.png deleted file mode 100644 index 01f6fe79df8c12a28cf71a7eebb31b17dd91a4f2..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1537 zcmb_cX;70_6#W#W7-SP!Y=H?DN+Co7DAI%iG9Za8N!bgAEeVJakPs@60D>qWTP9LU zTUJHDP)LbNkS%JMfUKe-$Pz84fJoT4kOUfarZfHFzrHu`o|$v!oOkcsnVW<0a8U+* z2?78>8HIH6lwq~(%_%C#VyHRVR|a4l($gIPlD`3f%b5VMBcm?Q0YCx_0Omsg0A2zB z+80Y(f3TG$6vA9xoPfO#x3Z)51^~#fqnu8ACyooJqDb>LY6?%oFKC@`U7;tV%>G`? z7HN>KHf2a2lWc0QpPlYud5RcUiE8RHqyPUbzl&k&b77MO`uNykm!utV;MAm->w&EoFflyWvB3tVhasyJRPw!5{7B~;cw!ffdA0@MO$mt5Txyj0F_ zUJP4JAdzyjCy48HM2^pRaf+VQg`_eNTKW~T3ZF9rJD!q>d3K(v9JdDZbxf*DE6@jq zdUMCPFlq(0-2|GIMc=jc>FzMak$sJPdJ29XS@BX799-~W^^y`PyCVkjEb|eQwZr1z zj?N(F0NY^e7_Drl>mA$?O!0zdWK|H`a~z&&rdLDuqXrCy4$HIbUk`o#I*u2JpxDnx z2Z9j^T}OXXjo92T`fG8GWX^o5*)yojed_MdKMfX>a}t;CVLe7&_zmhkH(HJavl~mi zqLtMeVq#U7_Wn+Oxw=@$`ED2d{P;%w-mKiBR z9nnVi6^5bom0^+n{e11v{%(xp_eF1Ksqv7Rmcjr+zZ^qgjGc!6o~4$zbh96O_V&wN zeykSp?sh^<>1yhaF<+lhsC5eEsZW6SmjQ!wyPwatn=PC;%@g}OSx{{ zHtP%)C*)>7c{s_=ug5_vy@ZzIn#2RES5m&P=1dxuxBFv$KS!0yMR8jeR^UoIY`Y4b}dhiiSD|R5t zX;2yG+gb6vbJDu$n&@WqLHwS64M$gMi3`%Pny-p^Rjw@Vx_<7U;Je8HrqPV*gjKW8 zyI7wZ`BmL=yJLpaOKWTjGCr(3Z-&u4R%f3sQA0;GGHd4Zgj_!>c!7yn&USKCzb~i4 zieGP2{+?E07;!H$vW?rK6`XaXN8<@k`07tIQ-0Mp9Ga0*$pko# zM34bs39~#2g;_u?EW9nP;3uu%Cr&|NFgOfmr`EOj9|18I9~qwXc>&s;`e9*z`|l6r dNFpJg97??Sd5w-gHvdDNC}$6+M#qqhe*pOYvdjPg diff --git a/sprites/spr_mk3_left_leg_variants/layers/04fc9961-d557-4205-a023-dd867df0fdfb/9f0d4e11-dbb4-4a1d-a21b-c96ba3d82387.png b/sprites/spr_mk3_left_leg_variants/layers/04fc9961-d557-4205-a023-dd867df0fdfb/9f0d4e11-dbb4-4a1d-a21b-c96ba3d82387.png deleted file mode 100644 index 0e9a8a0e2c0a5066d04284a692489b44057020ff..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1348 zcmeAS@N?(olHy`uVBq!ia0vp^OMv(V2OE$~)b|eqQVPi)LB0$ORcZ_j4J`}|zkosw zFBlj~4Hy_+B``2p&0t^k@+Ey?`o?d0OVZ{yU#H zl{>Y|@xo?riF`kO`FGw5#k<~#9$UwA_0#+?S>si%VwVLx-WmN-ihmDOQA*H#tNi-c@8{lKH(%m?*5CcYp(kqI zS^hbe^|5zy3r{jXru&{0TSGE^l*~)a790opWcO!?SOt@^yk9_qLvV?a`pR+&Z`A&&!jLy9!<`MLB*LN@etc$M9 zk6xDL?ti;(lInbk^Y80==igZHamLQtq&eNrE1jN|_il=t`dTi&Sas`+jOEtbHaX1; zIdSJ*aOsrP#GX&W2a409&o2G_ujHHT>-v{Bb^+z&;;fHd&h6D`4nHz??d@X$|L5j* z8!dIJTcJ^}{b-WHy*sydgq{r-E#?$8+J5h5>6DjTl26qwf*sdnrk`2+_r?45PM^Z3 zd^9*Fo!cv0y))+2&l!);|+osziA2FpaqwUa-J@=(*r(WVrt^dCL{?0%}eigO4 zZ!*U;zAn2}x37Np+ptqXui~`!JTgtm+w1yK;)dp_KL*E6{I&dDzP{)NA8?*+!G#%rm}{J>=_pCsf~rI^pT`$~eD z-EHN%to-UMe}(-n@6VKGt?JuU_v4t&*W^?GnE2mk+jln}5BzrZ<$0?o=ADwiue{lP zaL2v4c99dzou}Rg7W#xSRmyDEYr5~X{QdS-OC02ULhSmAe3&YAmIr;R{e7)_UwXJ_ zqs_eO!R1@z?m993bX@e6AxvR{yaq7(4@&6t$e-7{AH8?et2rwtEP2Gdi(OnC}Q!>*kacl7RtpSyJ8gLs*GILXlOA>Pn VaO;tXi0uWr)6><@Wt~$(69B}4JC6VW diff --git a/sprites/spr_mk3_left_leg_variants/layers/1ac1a90e-a16e-421a-8a7c-2edb61a4b0df/9f0d4e11-dbb4-4a1d-a21b-c96ba3d82387.png b/sprites/spr_mk3_left_leg_variants/layers/1ac1a90e-a16e-421a-8a7c-2edb61a4b0df/9f0d4e11-dbb4-4a1d-a21b-c96ba3d82387.png deleted file mode 100644 index 7bb2ce80b2679c2a199cbbad3f6874523841379c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1516 zcmeAS@N?(olHy`uVBq!ia0vp^OMv(V2OE$~)b|eqQVPi)LB0$ORcZ_j4J`}|zkosw zFBlj~4Hy_+B``2p&0t^pz}I?5-{34VG=QDMrb>0;|AfE+<}@F2?UMQRyZA0%=1vw}adY0=6yB%y>E#WT^Bi~S zS6qD^&Un8nJYj0ce%UWItNThNrdQQHh}2H)^80XYkwM)RZGWA~hEv+!%rRTvv-gHrYyZl)-E+U64ABfdQSFrj#ojyN}4(r<^nyb{)p5~(P z`RAE?f(vuj^t3-cGGT6jP276()7zFLowIuuA@O+0{8)v_(L$%hoD<*ddS~2Yxc;Os zM@rJi8Rs}tPv3o#ocQPcN4sBV<(w2IcONfV?PV!)Oyj9>PrA?v?vCRnxf;h0S!_A0 zaa`y`%c82QpS>#OPhAUt8!NH6$13GU*)8?;)tZm5X1^4jdi$-J)IN=7$Gf)rOf#>i zD?Bz-juY#6w(QrjTe4C6WG0B0_ryn-oasIpmbPm9@T|V{ygLilTO?EK4zRvyjH^uq}i`~r9L5i7T>^aUrM{c(Ma4+xhHc;>x zdB3@{&*9m(*XM+}RlMJBlGmKDL}|hqG3#x*6V`0}xj`4i6&FY^e{jH#QzbjsDu-KT zC5KA)QNCQRl)B|HYdej!3ug1)X7be9|1RpK>)qs|r#>3py|wtR@1`exAOBR<^X*2N`0oPhB_5{OgTp z>t3IlpLKKL+x2gweSy-q_a*P~iFUd9Z0EyL>G#{>&qhzx6#dlR^(j75D|H+70 zzUIVKhq%Lgzs4l>oax`Rw((n7s+Yq0#1H=!u3a^}w?<;=&Q-eKF3ofJC$v}j`pSh? zr@lRu{^oH-v4S&%|AuM1dlNx`%-|iHs zbOZv8rGNN)ESm%E8D`f4xvC|u5hW>!C8<`)MX5lF!N|bKRM)^z*U&J;$k@u%*viCQ z+rYrez`#!6$U77bx%nxXX_dG&`1{s?ibV~$4JDbmsl_FUxdpiONJPZ;0`)L>y85}S Ib4q9e0H8afp#T5? diff --git a/sprites/spr_mk3_left_leg_variants/layers/9e7144c8-574e-488a-bdf9-38b61ac9a946/9f0d4e11-dbb4-4a1d-a21b-c96ba3d82387.png b/sprites/spr_mk3_left_leg_variants/layers/9e7144c8-574e-488a-bdf9-38b61ac9a946/9f0d4e11-dbb4-4a1d-a21b-c96ba3d82387.png deleted file mode 100644 index 01f6fe79df8c12a28cf71a7eebb31b17dd91a4f2..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1537 zcmb_cX;70_6#W#W7-SP!Y=H?DN+Co7DAI%iG9Za8N!bgAEeVJakPs@60D>qWTP9LU zTUJHDP)LbNkS%JMfUKe-$Pz84fJoT4kOUfarZfHFzrHu`o|$v!oOkcsnVW<0a8U+* z2?78>8HIH6lwq~(%_%C#VyHRVR|a4l($gIPlD`3f%b5VMBcm?Q0YCx_0Omsg0A2zB z+80Y(f3TG$6vA9xoPfO#x3Z)51^~#fqnu8ACyooJqDb>LY6?%oFKC@`U7;tV%>G`? z7HN>KHf2a2lWc0QpPlYud5RcUiE8RHqyPUbzl&k&b77MO`uNykm!utV;MAm->w&EoFflyWvB3tVhasyJRPw!5{7B~;cw!ffdA0@MO$mt5Txyj0F_ zUJP4JAdzyjCy48HM2^pRaf+VQg`_eNTKW~T3ZF9rJD!q>d3K(v9JdDZbxf*DE6@jq zdUMCPFlq(0-2|GIMc=jc>FzMak$sJPdJ29XS@BX799-~W^^y`PyCVkjEb|eQwZr1z zj?N(F0NY^e7_Drl>mA$?O!0zdWK|H`a~z&&rdLDuqXrCy4$HIbUk`o#I*u2JpxDnx z2Z9j^T}OXXjo92T`fG8GWX^o5*)yojed_MdKMfX>a}t;CVLe7&_zmhkH(HJavl~mi zqLtMeVq#U7_Wn+Oxw=@$`ED2d{P;%w-mKiBR z9nnVi6^5bom0^+n{e11v{%(xp_eF1Ksqv7Rmcjr+zZ^qgjGc!6o~4$zbh96O_V&wN zeykSp?sh^<>1yhaF<+lhsC5eEsZW6SmjQ!wyPwatn=PC;%@g}OSx{{ zHtP%)C*)>7c{s_=ug5_vy@ZzIn#2RES5m&P=1dxuxBFv$KS!0yMR8jeR^UoIY`Y4b}dhiiSD|R5t zX;2yG+gb6vbJDu$n&@WqLHwS64M$gMi3`%Pny-p^Rjw@Vx_<7U;Je8HrqPV*gjKW8 zyI7wZ`BmL=yJLpaOKWTjGCr(3Z-&u4R%f3sQA0;GGHd4Zgj_!>c!7yn&USKCzb~i4 zieGP2{+?E07;!H$vW?rK6`XaXN8<@k`07tIQ-0Mp9Ga0*$pko# zM34bs39~#2g;_u?EW9nP;3uu%Cr&|NFgOfmr`EOj9|18I9~qwXc>&s;`e9*z`|l6r dNFpJg97??Sd5w-gHvdDNC}$6+M#qqhe*pOYvdjPg diff --git a/sprites/spr_mk3_right_knee/04fc9961-d557-4205-a023-dd867df0fdfb.png b/sprites/spr_mk3_right_knee/04fc9961-d557-4205-a023-dd867df0fdfb.png new file mode 100644 index 0000000000000000000000000000000000000000..aa85d16b24f2d075a8c761201777f236f98925d4 GIT binary patch literal 714 zcmeAS@N?(olHy`uVBq!ia0vp^OMv(V2OE$~)b|eqQVPi)LB0$ORcZ_j4J`}|zkosw zFBlj~4Hy_+B``2p&0t^&)3h7UtY( zL2q+ZOj2hbh;IMb9`I~c-ig>{j}&JIgkAT4zV#PV*WLe<4|qOpTr;EZ$ts>DDw~#< zIL+$&a%y|d3}KH&94dh6E-l=rv7PF@W zP*RKertLY030>#@yv{t7U2wc&-BsTcc~(|UT*dD>4Yz))eq-GC_@wy%(ki{&lXrhD zOPR1Kjpy(N-`hb3(YN`ZTi$2xpIct`nloiWOPbGezEjf=?J7C3@58^AUo$;3Pu#m# z^K!jq({~vm>8Jfmi4WU`ko#*6d&oCGdY1&$q*~${QIe8al4_M)lnSI6j0}uSbq!2) zjSWK#jI9jJt&GjJ4GgRd3?>B6a7WRQo1c=IR*74~Lq3JyKn)sj8%i>BQ;SOya|>|m T*(S}X0`iKdtDnm{r-UW|`ibVo literal 0 HcmV?d00001 diff --git a/sprites/spr_mk3_right_knee/1ac1a90e-a16e-421a-8a7c-2edb61a4b0df.png b/sprites/spr_mk3_right_knee/1ac1a90e-a16e-421a-8a7c-2edb61a4b0df.png new file mode 100644 index 0000000000000000000000000000000000000000..04d85b35f52f377400e365336d88d67ab0761c76 GIT binary patch literal 868 zcmeAS@N?(olHy`uVBq!ia0vp^OMv(V2OE$~)b|eqQVPi)LB0$ORcZ_j4J`}|zkosw zFBlj~4Hy_+B``2p&0t^o%?*uuIw zb$1Tx*1Qh2kzR3E^`6wRxcjQ==R&Lh^;~%~VRuVmnoq2e&sx5X(Gu-8{?Aqib{tKN z*;No(JSQM+bxMloglEJ^4a{t!ScRLC-P6mG6dVbzq!cNFOarc@3A2t?tPI}wBY%UF#Hwdnzf1n=)Gdq2KA1bp zKy&V)?O_34C$-KkyZ_qQH0(yr%n4x&raNo)_|AAA1!~ZM g+fb63n_66wm|K8bPvp%kDUe4zUHx3vIVCg!04X{-9RL6T literal 0 HcmV?d00001 diff --git a/sprites/spr_mk3_right_knee/9e7144c8-574e-488a-bdf9-38b61ac9a946.png b/sprites/spr_mk3_right_knee/9e7144c8-574e-488a-bdf9-38b61ac9a946.png new file mode 100644 index 0000000000000000000000000000000000000000..e0214477c12ea1f14fbd76ef1eb0ff2ced542c2e GIT binary patch literal 986 zcmeAS@N?(olHy`uVBq!ia0vp^OMv(V2OE$~)b|eqQVPi)LB0$ORcZ_j4J`}|zkosw zFBlj~4Hy_+B``2p&0t^YHq$$p|!y>fpm^ z-opmVrbNZ%+*$Wse8)p;#qN9NT#NW_g$lGMX54yFVwJnHU&KXbjkm;dg|Mb=6WF(J z@IA86NH}-Gu_^1CfBd{?mi?YTJ~omwZOcC+;miiT#2ns7B8Mt(zx+OxOM2z`Gk;$H zWj*(f@A0h6-}CGxVQ`Oo z{VJO&Kd;o<-Sjia-@D%-PBy!H%I2*PeBaA@=Rf;BZ_7NdN9kYJO;~$x{>8jF)z0PV z3i_!9t2*Y(C$F^H)>gRn@8*90%HDONMYGn$XV%})UG}JX?}ciLDl)x{9Y>pfraMZUwb?^@N<{jXm>e}2W3Lpyu}*-`>E zgMV3_`*ZFvQ%hmA67MMs{Ht3eRKdyHb8`5$~yp>Urmt`R9Ck()G5}!s7AX zsfFj78MkSFa_IfMDuVmD*X|R47bkEtZ>zAmKS%TD_ZyEMoSl9r`VBLY3GGkfe@4Fr z68Dy}A4&siQ7v(eC`m~yNwrEYN(E93Mg~Tvx(24Y#)ct=mR2T4RwicJ1_o9J24@|Y z)}Uy}%}>cptHiBgkBsaApau=N4JDbmsl_FUxdpiOyymo#2kK$)boFyt=akR{0A49@ APXGV_ literal 0 HcmV?d00001 diff --git a/sprites/spr_mk3_right_knee/layers/04fc9961-d557-4205-a023-dd867df0fdfb/9f0d4e11-dbb4-4a1d-a21b-c96ba3d82387.png b/sprites/spr_mk3_right_knee/layers/04fc9961-d557-4205-a023-dd867df0fdfb/9f0d4e11-dbb4-4a1d-a21b-c96ba3d82387.png new file mode 100644 index 0000000000000000000000000000000000000000..aa85d16b24f2d075a8c761201777f236f98925d4 GIT binary patch literal 714 zcmeAS@N?(olHy`uVBq!ia0vp^OMv(V2OE$~)b|eqQVPi)LB0$ORcZ_j4J`}|zkosw zFBlj~4Hy_+B``2p&0t^&)3h7UtY( zL2q+ZOj2hbh;IMb9`I~c-ig>{j}&JIgkAT4zV#PV*WLe<4|qOpTr;EZ$ts>DDw~#< zIL+$&a%y|d3}KH&94dh6E-l=rv7PF@W zP*RKertLY030>#@yv{t7U2wc&-BsTcc~(|UT*dD>4Yz))eq-GC_@wy%(ki{&lXrhD zOPR1Kjpy(N-`hb3(YN`ZTi$2xpIct`nloiWOPbGezEjf=?J7C3@58^AUo$;3Pu#m# z^K!jq({~vm>8Jfmi4WU`ko#*6d&oCGdY1&$q*~${QIe8al4_M)lnSI6j0}uSbq!2) zjSWK#jI9jJt&GjJ4GgRd3?>B6a7WRQo1c=IR*74~Lq3JyKn)sj8%i>BQ;SOya|>|m T*(S}X0`iKdtDnm{r-UW|`ibVo literal 0 HcmV?d00001 diff --git a/sprites/spr_mk3_right_knee/layers/1ac1a90e-a16e-421a-8a7c-2edb61a4b0df/9f0d4e11-dbb4-4a1d-a21b-c96ba3d82387.png b/sprites/spr_mk3_right_knee/layers/1ac1a90e-a16e-421a-8a7c-2edb61a4b0df/9f0d4e11-dbb4-4a1d-a21b-c96ba3d82387.png new file mode 100644 index 0000000000000000000000000000000000000000..04d85b35f52f377400e365336d88d67ab0761c76 GIT binary patch literal 868 zcmeAS@N?(olHy`uVBq!ia0vp^OMv(V2OE$~)b|eqQVPi)LB0$ORcZ_j4J`}|zkosw zFBlj~4Hy_+B``2p&0t^o%?*uuIw zb$1Tx*1Qh2kzR3E^`6wRxcjQ==R&Lh^;~%~VRuVmnoq2e&sx5X(Gu-8{?Aqib{tKN z*;No(JSQM+bxMloglEJ^4a{t!ScRLC-P6mG6dVbzq!cNFOarc@3A2t?tPI}wBY%UF#Hwdnzf1n=)Gdq2KA1bp zKy&V)?O_34C$-KkyZ_qQH0(yr%n4x&raNo)_|AAA1!~ZM g+fb63n_66wm|K8bPvp%kDUe4zUHx3vIVCg!04X{-9RL6T literal 0 HcmV?d00001 diff --git a/sprites/spr_mk3_right_knee/layers/9e7144c8-574e-488a-bdf9-38b61ac9a946/9f0d4e11-dbb4-4a1d-a21b-c96ba3d82387.png b/sprites/spr_mk3_right_knee/layers/9e7144c8-574e-488a-bdf9-38b61ac9a946/9f0d4e11-dbb4-4a1d-a21b-c96ba3d82387.png new file mode 100644 index 0000000000000000000000000000000000000000..e0214477c12ea1f14fbd76ef1eb0ff2ced542c2e GIT binary patch literal 986 zcmeAS@N?(olHy`uVBq!ia0vp^OMv(V2OE$~)b|eqQVPi)LB0$ORcZ_j4J`}|zkosw zFBlj~4Hy_+B``2p&0t^YHq$$p|!y>fpm^ z-opmVrbNZ%+*$Wse8)p;#qN9NT#NW_g$lGMX54yFVwJnHU&KXbjkm;dg|Mb=6WF(J z@IA86NH}-Gu_^1CfBd{?mi?YTJ~omwZOcC+;miiT#2ns7B8Mt(zx+OxOM2z`Gk;$H zWj*(f@A0h6-}CGxVQ`Oo z{VJO&Kd;o<-Sjia-@D%-PBy!H%I2*PeBaA@=Rf;BZ_7NdN9kYJO;~$x{>8jF)z0PV z3i_!9t2*Y(C$F^H)>gRn@8*90%HDONMYGn$XV%})UG}JX?}ciLDl)x{9Y>pfraMZUwb?^@N<{jXm>e}2W3Lpyu}*-`>E zgMV3_`*ZFvQ%hmA67MMs{Ht3eRKdyHb8`5$~yp>Urmt`R9Ck()G5}!s7AX zsfFj78MkSFa_IfMDuVmD*X|R47bkEtZ>zAmKS%TD_ZyEMoSl9r`VBLY3GGkfe@4Fr z68Dy}A4&siQ7v(eC`m~yNwrEYN(E93Mg~Tvx(24Y#)ct=mR2T4RwicJ1_o9J24@|Y z)}Uy}%}>cptHiBgkBsaApau=N4JDbmsl_FUxdpiOyymo#2kK$)boFyt=akR{0A49@ APXGV_ literal 0 HcmV?d00001 diff --git a/sprites/spr_mk3_right_leg_variants/spr_mk3_right_leg_variants.yy b/sprites/spr_mk3_right_knee/spr_mk3_right_knee.yy similarity index 63% rename from sprites/spr_mk3_right_leg_variants/spr_mk3_right_leg_variants.yy rename to sprites/spr_mk3_right_knee/spr_mk3_right_knee.yy index fe7f865ec2..eb55587df6 100644 --- a/sprites/spr_mk3_right_leg_variants/spr_mk3_right_leg_variants.yy +++ b/sprites/spr_mk3_right_knee/spr_mk3_right_knee.yy @@ -1,9 +1,9 @@ { "$GMSprite":"v2", - "%Name":"spr_mk3_right_leg_variants", + "%Name":"spr_mk3_right_knee", "bboxMode":0, - "bbox_bottom":220, - "bbox_left":11, + "bbox_bottom":169, + "bbox_left":27, "bbox_right":66, "bbox_top":133, "collisionKind":1, @@ -23,7 +23,7 @@ "layers":[ {"$GMImageLayer":"","%Name":"9f0d4e11-dbb4-4a1d-a21b-c96ba3d82387","blendMode":0,"displayName":"default","isLocked":false,"name":"9f0d4e11-dbb4-4a1d-a21b-c96ba3d82387","opacity":100.0,"resourceType":"GMImageLayer","resourceVersion":"2.0","visible":true,}, ], - "name":"spr_mk3_right_leg_variants", + "name":"spr_mk3_right_knee", "nineSlice":null, "origin":9, "parent":{ @@ -35,7 +35,7 @@ "resourceVersion":"2.0", "sequence":{ "$GMSequence":"v1", - "%Name":"spr_mk3_right_leg_variants", + "%Name":"spr_mk3_right_knee", "autoRecord":true, "backdropHeight":768, "backdropImageOpacity":0.5, @@ -59,20 +59,28 @@ "resourceType":"KeyframeStore", "resourceVersion":"2.0", }, - "name":"spr_mk3_right_leg_variants", + "name":"spr_mk3_right_knee", "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":"1ac1a90e-a16e-421a-8a7c-2edb61a4b0df","path":"sprites/spr_mk3_right_leg_variants/spr_mk3_right_leg_variants.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"fb1bc77b-386e-404a-84af-e5941220ad0c","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"9e7144c8-574e-488a-bdf9-38b61ac9a946","path":"sprites/spr_mk3_right_leg_variants/spr_mk3_right_leg_variants.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"3d485ac5-c0cd-4580-a56b-a873feaf2900","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"04fc9961-d557-4205-a023-dd867df0fdfb","path":"sprites/spr_mk3_right_leg_variants/spr_mk3_right_leg_variants.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"7ee4fbca-f448-4cd3-b4a5-259657157ff5","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"1ac1a90e-a16e-421a-8a7c-2edb61a4b0df","path":"sprites/spr_mk3_right_knee/spr_mk3_right_knee.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"fb1bc77b-386e-404a-84af-e5941220ad0c","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"9e7144c8-574e-488a-bdf9-38b61ac9a946","path":"sprites/spr_mk3_right_knee/spr_mk3_right_knee.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"3d485ac5-c0cd-4580-a56b-a873feaf2900","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"04fc9961-d557-4205-a023-dd867df0fdfb","path":"sprites/spr_mk3_right_knee/spr_mk3_right_knee.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"7ee4fbca-f448-4cd3-b4a5-259657157ff5","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_mk3_right_leg_variants/04fc9961-d557-4205-a023-dd867df0fdfb.png b/sprites/spr_mk3_right_leg_variants/04fc9961-d557-4205-a023-dd867df0fdfb.png deleted file mode 100644 index a98e27c591f52afc57da833ac94f12e59fb112af..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1376 zcmeAS@N?(olHy`uVBq!ia0vp^OMv(V2OE$~)b|eqQVPi)LB0$ORcZ_j4J`}|zkosw zFBlj~4Hy_+B``2p&0t^6L%{V9_(~=w@5PUSU$HCO`&;IqD#bH9Of-YaLR=-fY z>BR{&l=`4Ts9xqTi`%Yw4`e(yvcJ}A`TyTscXIvz>hi3K=O_DIY23BU#I_}uWwXvj zwv4R`W}In~O1x*%63?U_>?wIy(`lfwoh489*sOqKrC%D}1c~0RY5nx#^YVx17tcR% z@Y{dy1=k-o+AOjXx<0XSii?~~lwzp+EWZ4k6NEjS1d-6s*A2;0uNPic6y3CH)#CHB z7o5AdY41*@8JpQBC9q5i@RK}o?6@Syla7gzUosDwRvfR0S-yHg@2d<>tr>f@kC-lf zpF02a(@WLQcU~=Cp=#c@-ixisL*agW{H6Z+|L^3nWGs{=Rc1y!cns^#6h>$AykH z^i}Boc8pFqw&ml#;|qOuhn>)9{K>VKOY%b8X}f9R5>HEBPsqK#`pCv;h2vXZZ|^_v z%e49G<4yZ)nO4RcM|DJ&<*xShpK?;1!siY>QNgwKqC0 z)_7&zOyARLQ+$~uH^xSb=pViX6p3^Jidg~1# zbmniJc2|6kO-rb0Zuee!`}+I!o(8Y)|K(b$C3!=Nxp;M-Z>7NVH)&y~<&(V(Zm-&^ zC3#zIzSWv$i)B)Mf%a~pp{qlD9!056ILj3hdi4db%k2{1icbmqYJ0esKA4u8sqjAS zdTrtyp`LBI^NXjSP7Tt~JU*%QV_;%UeQl)7tZm1C@I5V$cv}>24%iQ zyUxs9^W^y3+q>^9StirX9GT6XEH`K4Z|A~b+yiFwxZVx-$E}<*|$37e9|5V zw(U`;?`8j7syiijZFO^TD*I}dqW4=5EDX3NHCek+=fI=V6Sjvfp4LtjJ99eZiuEz; zf9VeopDz+Sb=t^$Li?6ica9`yUvJe|<#g@UD)SK4(Bq%ZaHa@ey|~&aRcn*eH8+-E z3GUz$h2Trm=AT{T;1&@ic;vas)}>Q-%$%|sQh3^3PcpXe!k~z|7f~^dEGcHm_R0r>knBp6_Lo+}mlE5!XvE-q&BR6t{psQKltxYvO{| zO?=yz#veG5BJuxE)cw8h>+hJvUQb=UX^wKx))QjK?)~lmfB&A#*4{7sBs+={!`e6U z-wsM>-K6(_N*&`_#;JuX?EUKRIC7u2?NV>P6#D3b!M9&pmWAssy`MjElIW)?26{5V zQ+bw!v|8x)IKNYWtX-%$>F^Azg2>OsPLk0Rr`49F%Iq>aq1cf0eS&7`3mG|{SU1mNaANuN@A%pFldo@`KU}8B#JN}C^!amA z2@)rcEO!#>asZ)I+j*B+B5emNzWI|UyJEYUIQIzvZ#nQ7e z8r${O%`g^qG3W8oz}`zxD!Q=ICO1!v%G!x_WI@9 z-fz6Zcs@j8zT7*zJ#3FGY$wzT%mcDR*W6*A+hXQxkk0mLt+>72eiLA5+vnHk^F6)P zkgnIGm7H@_{aF3Ie|6lR>%263zFL`1I9z7?ee2$ZBFA>kH9fS)E8bFe$k*0k z9>I2vvZ5ynzV}~w2;?zY>r8kjfAdj?L)P`2WvRla6dQYPtn=-*B7_Qw^4_~>;G>*Qk3Z+)xmWNvYN z>BVi%r%Ma(&C`ilm8L1pz*D~FhV+Hb^i8Zr8*+55OU1jk#oiOkm$*^?f8YC;JAk3r z7BrPd=XmSRUHSffdnJ$0?p-!()wNYAIqf#3H`ooAN-dLk*D-Bzl2G_Ghd%8Km(Hbn zC(e@oz|;Km#~d-QgKJOUbEuPujpu$mE8$G8*wxp&@~P-*_V7{Mo;$5(f$;#J{EeNjaU6T5)fsrh4>gsa!@3_p?j3k2B;#B$`i4 zomkvlv38Q#+3KlZzVp1Ex;Ayb>0cw!Q!B649;klG63JBgE#^UxM)l%@Qysz*zS}&R znHaNK?@~+U+*MJAb#M6qFzem+=V}gDN{gnbZbAzum(TKn%5g?Z%kOXkMN~^%BT7;dOH!?pi&B9UgOP!esjh*c zuAxzgp@o%+rIn$%wt<0_fq{_CYE%um`6-!cmAEw|Ckk%`+Mofqp(HamwYVfPw*a>u TlM#xvi*{CGqOzg@0Ek(i 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 TlM#xvi*{CGqOzg@0Ek(i zH%IfefWH=n!TcSk^@|f<6!GWLwg3>W3II{}0N_u)6}1Qep-=!=!UBMPDggW(n9*Qw z$Pd77Hdf}q-uIEyRP+=81l6p~O&xEJtxom^P3RsL!m2$zj=B5rqF6+rT}f}z;q|EnnB^5=A_VF+N->X%K#KK&2K-qljV?|e+ zw9+6-am_az&5gXAO&c+qakoG0@VG{+C!{4M*jJB)9JIOCzUR}ApfO@mGPssvVS6Q>FdkKxRF#7QhlVMVBrIjRszUd&{7$A;gKk}tQ^=NQ zT6UKYo#GA@E60b1D?Ub)CA5clC{A@bF|j6;MqQJ~#{%w-+LhB;u3YbVM60dLD{@J4 zW%8B{xWxQNpKQ)8=u7RM^O%fk|w;s$on|)wu@!DoO8a35?+ghFRWp{14B)G?@ z3%Z#&le(6cKBH^5Yk+N=ffz)?D6X~3yPXb}$6T0xr?JO3d z62Pt4#GET69_>o>NU>zWHvfEblqv|%F#}xzSExqA8RNja>S@Q-riYY+0y2H}LUTS) zZN>otiswp_-|xnH1ma~%w+X_Jg0&f+1LK>RwN2!P!0G1dHXIe>BIi)zRGm0*b6mdk zUJXyWb2Pqw+;ec4z8v*6M7nQxy~WA#nwvo$sw`k60v74hM5eEa_&q=O zz<^R9!9Pij22hFLI*m4k`SIinKO{$mE;(Lf{n_}1INwoq(al9jxVMMdnz(?2?O!&} zdWbX7B#&`crU(;4aSf!lnb!JiAL;Np0I0W`AC6(G<#|K0(0D<1Oh-2 zyo?RmB+n{Ac!dWf;?!A!uvW_UoPAg8x3Ap2=TlN|c3-xb6{EoH_pLNzl2OggA=$Zz zGS_&*7RT}RXxObKs8Eo#4kiyXTWRsTGEmxa`ou&O7 zjz>oJ;kU+c=hg>$ZOp7qYA?{VL}%-sU)PN;+?40$k|ma3J5#-|-LJnc58YYQ_SJq@ z?^%HkAo;DX%|sj>YOmF!UxCmFf$TB~)*l=A++z`$HA*`b8?6(VT$y8A&z2BBrRz*- zQL-N0uR%Npb>*(4yi(D$xso%^DwjIGO&sdfEXgm0M=n(%J@(&Gr)7T7r>lE+EA+ThX;8-T z7=^*HWcI8ZdMwPU;Rc6%nq<^=Fqfc}Th6n(uY8#L_ssYEr?2I0OQ`$%VkWfXEcuQK z(c&`E9Y-YS":"","Keyframes":[ - {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"40cfe8bd-f11d-4d74-a157-47d58c39d7e8","path":"sprites/spr_mk4_complex/spr_mk4_complex.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"1ea2a7fc-3120-42db-b605-8fb780ff8b5d","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"40cfe8bd-f11d-4d74-a157-47d58c39d7e8","path":"sprites/spr_mk4_complex/spr_mk4_complex.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"1ea2a7fc-3120-42db-b605-8fb780ff8b5d","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_mk4_complex_backpack/a43406eb-6236-415d-9902-e818a2185ba9.png b/sprites/spr_mk4_complex_backpack/a43406eb-6236-415d-9902-e818a2185ba9.png index f5c405e1bef9456e2c0a6f1b4d4b3c805ae19143..5a81f710338afd6228e5661011725d21f27a0da1 100644 GIT binary patch delta 647 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":"","Keyframes":[ - {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"a43406eb-6236-415d-9902-e818a2185ba9","path":"sprites/spr_mk4_complex_backpack/spr_mk4_complex_backpack.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"90dd7544-906e-477c-a0a3-0c94bc9aee40","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"a43406eb-6236-415d-9902-e818a2185ba9","path":"sprites/spr_mk4_complex_backpack/spr_mk4_complex_backpack.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"90dd7544-906e-477c-a0a3-0c94bc9aee40","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, + "xorigin":0, + "yorigin":45, }, "swatchColours":null, "swfPrecision":2.525, diff --git a/sprites/spr_mk5_complex_backpack/9aa55975-2b4b-4679-8fd7-f6141f200e93.png b/sprites/spr_mk5_complex_backpack/9aa55975-2b4b-4679-8fd7-f6141f200e93.png index 8d1fd51cf846451a887d16d1980f14ab777bb951..4d18aad727d51d5fa6c47d2e481764e92e7bd5ac 100644 GIT binary patch delta 629 zcmX@i_J?hP7&oI62O9$eL;d}-tci+_X8E2jjv*Dd-rjU9TI3+Y_Tc%IJ9^U7EuH$N zD5tzU_W7$0+p-SH4U7}7f2s|g=6Z96TmAjlYJ!s$nUw3-1nfF~DfyknTieFADW8AJ z2ntR=t*WGyCii=d_McnTOa@=7-*c)MTnpO1E~EPI-773cO6$yTR#XS6**$uF`(yf^ z_kRQ5_$eH>tujt34n8O~DI|(FMY8fr&rBSvA+dS-URsPq+J>_-V zF5Kgels|FHpl{Cn*NfPV!cQDclsP4~!&I(tzESnkoK#-R+ooQj671RM>tml=FMp)F zwoms&l$~6h?DcoMwi~ENcwg%ieLwx(@AG#yg+~j$dSm@Ld|jWQzTAn0mQ(YeOFy=k zd0Bs_ol_-O;Dlgw*vatx-Ptl)6RO`YnQjrZyU!v*;iSKUdd|gdTVH1~d1^&6S7sIN zz23FP{HXFLwn@#WWIRHPm}jn5W?-1C%v3ztfJud$_ct?V%*+oNODBGvypTz}-c;AX zRM*%r#K6$X#MsK%Qrp15%D_O9sdXhV-c?InBT7;dOH!?J^HVa@DjAFnjIe9Sh_@95 kYS4gdD9OxCEiOsSEx@hE-b>~b4^R_>r>mdKI;Vst074}U?f?J) delta 640 zcmeyvc9?B~7&pTU4mJh`hD3e;u!)L}^=6(fjv*Dd-rn>rdSoELb|Eb*Z#wU38AbO~ zf}2tf|1{~|xLn4_?BBr^t@l?i(hxVA_;7J_krL1VAXvbSMz08ky69zW3|VA@6VRCUN0?t@q*jRsSbT?8?W#GCbs;Nt^LwV zR}F6bnX;1M`}(aSXT+k)cDl`!UH5QD`rB#qGj|Bb2i2GE-uSY9;m!RUZ?63wCV#B@ zc{=yoy%WAR&XGPg@pEzP7l&tDJFR-0Z!&E^s{AfEZT*zBYZS$IyUi3mcJS8bS2fc^ z_H4bnku~!4@x!YhUyJ=NH;pCx?5)CMznA|0XT1H**=sFUzt8=dx;pttH+xZr=hM|S z$$#3F|MvejXk5a}WSL}rUhC(p-12T`)=l61s(O{TzV2vdo%DyL=#X4)^zM0T6P8Re zov>W&diB~9Rlzn&`3jaR&NPOomQUDe#WdNGsiyw>U&hXDGe0bfmR$sl5!Djch?11V zl2ohYqEsNoU}RuqqHAcNYh(~&XlZ3^Ze?PiZD3$!V8GIGEFVQfZhlH;S|x4`rB~}N l12t&CZ79jiO)Z}6$IPLI-3Fxt@jO5c44$rjF6*2UngFX{Ajtp# diff --git a/sprites/spr_mk5_complex_backpack/layers/9aa55975-2b4b-4679-8fd7-f6141f200e93/013833bd-91ce-4c08-a77d-d15ce3981f2f.png b/sprites/spr_mk5_complex_backpack/layers/9aa55975-2b4b-4679-8fd7-f6141f200e93/013833bd-91ce-4c08-a77d-d15ce3981f2f.png index 8d1fd51cf846451a887d16d1980f14ab777bb951..4d18aad727d51d5fa6c47d2e481764e92e7bd5ac 100644 GIT binary patch delta 629 zcmX@i_J?hP7&oI62O9$eL;d}-tci+_X8E2jjv*Dd-rjU9TI3+Y_Tc%IJ9^U7EuH$N zD5tzU_W7$0+p-SH4U7}7f2s|g=6Z96TmAjlYJ!s$nUw3-1nfF~DfyknTieFADW8AJ z2ntR=t*WGyCii=d_McnTOa@=7-*c)MTnpO1E~EPI-773cO6$yTR#XS6**$uF`(yf^ z_kRQ5_$eH>tujt34n8O~DI|(FMY8fr&rBSvA+dS-URsPq+J>_-V zF5Kgels|FHpl{Cn*NfPV!cQDclsP4~!&I(tzESnkoK#-R+ooQj671RM>tml=FMp)F zwoms&l$~6h?DcoMwi~ENcwg%ieLwx(@AG#yg+~j$dSm@Ld|jWQzTAn0mQ(YeOFy=k zd0Bs_ol_-O;Dlgw*vatx-Ptl)6RO`YnQjrZyU!v*;iSKUdd|gdTVH1~d1^&6S7sIN zz23FP{HXFLwn@#WWIRHPm}jn5W?-1C%v3ztfJud$_ct?V%*+oNODBGvypTz}-c;AX zRM*%r#K6$X#MsK%Qrp15%D_O9sdXhV-c?InBT7;dOH!?J^HVa@DjAFnjIe9Sh_@95 kYS4gdD9OxCEiOsSEx@hE-b>~b4^R_>r>mdKI;Vst074}U?f?J) delta 640 zcmeyvc9?B~7&pTU4mJh`hD3e;u!)L}^=6(fjv*Dd-rn>rdSoELb|Eb*Z#wU38AbO~ zf}2tf|1{~|xLn4_?BBr^t@l?i(hxVA_;7J_krL1VAXvbSMz08ky69zW3|VA@6VRCUN0?t@q*jRsSbT?8?W#GCbs;Nt^LwV zR}F6bnX;1M`}(aSXT+k)cDl`!UH5QD`rB#qGj|Bb2i2GE-uSY9;m!RUZ?63wCV#B@ zc{=yoy%WAR&XGPg@pEzP7l&tDJFR-0Z!&E^s{AfEZT*zBYZS$IyUi3mcJS8bS2fc^ z_H4bnku~!4@x!YhUyJ=NH;pCx?5)CMznA|0XT1H**=sFUzt8=dx;pttH+xZr=hM|S z$$#3F|MvejXk5a}WSL}rUhC(p-12T`)=l61s(O{TzV2vdo%DyL=#X4)^zM0T6P8Re zov>W&diB~9Rlzn&`3jaR&NPOomQUDe#WdNGsiyw>U&hXDGe0bfmR$sl5!Djch?11V zl2ohYqEsNoU}RuqqHAcNYh(~&XlZ3^Ze?PiZD3$!V8GIGEFVQfZhlH;S|x4`rB~}N l12t&CZ79jiO)Z}6$IPLI-3Fxt@jO5c44$rjF6*2UngFX{Ajtp# diff --git a/sprites/spr_mk5_complex_backpack/spr_mk5_complex_backpack.yy b/sprites/spr_mk5_complex_backpack/spr_mk5_complex_backpack.yy index 2218324c12..ab866fb5ca 100644 --- a/sprites/spr_mk5_complex_backpack/spr_mk5_complex_backpack.yy +++ b/sprites/spr_mk5_complex_backpack/spr_mk5_complex_backpack.yy @@ -2,10 +2,10 @@ "$GMSprite":"v2", "%Name":"spr_mk5_complex_backpack", "bboxMode":0, - "bbox_bottom":35, + "bbox_bottom":80, "bbox_left":37, "bbox_right":126, - "bbox_top":10, + "bbox_top":55, "collisionKind":1, "collisionTolerance":0, "DynamicTexturePage":false, @@ -16,7 +16,7 @@ ], "gridX":0, "gridY":0, - "height":232, + "height":322, "HTile":false, "layers":[ {"$GMImageLayer":"","%Name":"013833bd-91ce-4c08-a77d-d15ce3981f2f","blendMode":0,"displayName":"default","isLocked":false,"name":"013833bd-91ce-4c08-a77d-d15ce3981f2f","opacity":100.0,"resourceType":"GMImageLayer","resourceVersion":"2.0","visible":true,}, @@ -63,18 +63,22 @@ "playbackSpeedType":0, "resourceType":"GMSequence", "resourceVersion":"2.0", + "seqHeight":322.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":"9aa55975-2b4b-4679-8fd7-f6141f200e93","path":"sprites/spr_mk5_complex_backpack/spr_mk5_complex_backpack.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"d00609fa-9d93-4657-a437-e937e9cd46e0","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"9aa55975-2b4b-4679-8fd7-f6141f200e93","path":"sprites/spr_mk5_complex_backpack/spr_mk5_complex_backpack.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"d00609fa-9d93-4657-a437-e937e9cd46e0","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, + "xorigin":0, + "yorigin":45, }, "swatchColours":null, "swfPrecision":2.525, diff --git a/sprites/spr_mk6_complex_backpack/557d0497-d213-4f3c-9acb-a261ca311b93.png b/sprites/spr_mk6_complex_backpack/557d0497-d213-4f3c-9acb-a261ca311b93.png index 11ee799f19c6c45d3996448cc41116f024350d32..01a505c4eadf6bbb3ede3c6c39229d9387d1ae8d 100644 GIT binary patch delta 727 zcmZ3?eusU67&oI62O9$eL;d}-tci+_rsq9f978H@y}cD!v?xG;^+H+JwkKMj4yR9> zpqk2gv*C5Jo!eY?W~QzS2P{Lwcz!XRSSl^wIk}NZxjw^U?Ow*tt84H3=SR4mUcc2` zVe_h0i&m}LuDAH*_gm5veE$BLUy&8N>giOjn?;>gdUtoOc^>mk)c&KWefIl2E2f|4 z55KCgo1Y$QmU`D+X~Ghv3H4W}i*{exTDp3Y;soC8mP@56m*tov{cGEVfTJUmE527=9i6GvbOH-j|;!IzLZ*I zbxd}}?-}d3c1}sxPTARCo4oGe-7B&S-!$&2pOM@Y#Ikzdzd!kRW?i-p=BaPdQCcL& zmH)F!droHa%(BBtkG3Yn-QK6LpUBv97MEJ)1fI z+h_OpwW;qmNzC39n!@`eE$X#c>b#!w5+`m>vUs|y_|5ONMN$DiznXX6jDpp1(1A^@RKhtCGCZxSzaPIKzl>-cBdCGx9fjLXBb-rZ01P zRy4!mTj+k>kQ285gk9$!X4%xwHS_dCW>3ABOgl?%-*Gw}mvlEWh5N~)&I_B0?_NG9 zcA_IKDV7Ol>zEpyNH`3>RtJLawyD|7+*8aGnTg!jfyxDvH zOzgH}%W^~`nd^7XzP8JKrut)JwxX>ndOP3E`TcL}*29MC8rtoecO&N;PFT&Jyhil> z($w{~ob$GNrEx!bmj33R))Vd}t0vuK+F7MB&8H!K-2}nc>}JVReZ)_!T{&Ur9$$s_ zRrlqzo(TT$OgeF!rKp2z=IPt)lVUEh7QNoKvwhm$qq{br5Ib>Jc%fYC^Igm5>P`^c zn7g# zpqk2gv*C5Jo!eY?W~QzS2P{Lwcz!XRSSl^wIk}NZxjw^U?Ow*tt84H3=SR4mUcc2` zVe_h0i&m}LuDAH*_gm5veE$BLUy&8N>giOjn?;>gdUtoOc^>mk)c&KWefIl2E2f|4 z55KCgo1Y$QmU`D+X~Ghv3H4W}i*{exTDp3Y;soC8mP@56m*tov{cGEVfTJUmE527=9i6GvbOH-j|;!IzLZ*I zbxd}}?-}d3c1}sxPTARCo4oGe-7B&S-!$&2pOM@Y#Ikzdzd!kRW?i-p=BaPdQCcL& zmH)F!droHa%(BBtkG3Yn-QK6LpUBv97MEJ)1fI z+h_OpwW;qmNzC39n!@`eE$X#c>b#!w5+`m>vUs|y_|5ONMN$DiznXX6jDpp1(1A^@RKhtCGCZxSzaPIKzl>-cBdCGx9fjLXBb-rZ01P zRy4!mTj+k>kQ285gk9$!X4%xwHS_dCW>3ABOgl?%-*Gw}mvlEWh5N~)&I_B0?_NG9 zcA_IKDV7Ol>zEpyNH`3>RtJLawyD|7+*8aGnTg!jfyxDvH zOzgH}%W^~`nd^7XzP8JKrut)JwxX>ndOP3E`TcL}*29MC8rtoecO&N;PFT&Jyhil> z($w{~ob$GNrEx!bmj33R))Vd}t0vuK+F7MB&8H!K-2}nc>}JVReZ)_!T{&Ur9$$s_ zRrlqzo(TT$OgeF!rKp2z=IPt)lVUEh7QNoKvwhm$qq{br5Ib>Jc%fYC^Igm5>P`^c zn7g#":"","Keyframes":[ - {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"557d0497-d213-4f3c-9acb-a261ca311b93","path":"sprites/spr_mk6_complex_backpack/spr_mk6_complex_backpack.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"a8ae85dd-0643-4118-a10b-348ff5c192da","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"557d0497-d213-4f3c-9acb-a261ca311b93","path":"sprites/spr_mk6_complex_backpack/spr_mk6_complex_backpack.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"a8ae85dd-0643-4118-a10b-348ff5c192da","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, + "xorigin":0, + "yorigin":45, }, "swatchColours":null, "swfPrecision":2.525, diff --git a/sprites/spr_mk7_complex/b6ba8600-fb6b-4fa9-abc7-bdc2311eb79e.png b/sprites/spr_mk7_complex/b6ba8600-fb6b-4fa9-abc7-bdc2311eb79e.png index 168fe2d1229c1e9a72721b4a6dc9e37a2ae3148b..4c2524c0925b2797ef039a170f767b858a9f4bc9 100644 GIT binary patch literal 4893 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":"","Keyframes":[ - {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"b6ba8600-fb6b-4fa9-abc7-bdc2311eb79e","path":"sprites/spr_mk7_complex/spr_mk7_complex.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"0920e5f3-c5b3-46e7-9eb6-c9832e0b26b8","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/spr_mk7_complex.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"0920e5f3-c5b3-46e7-9eb6-c9832e0b26b8","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_backpack/d759779c-a75b-4d79-b22b-410d27d6c6de.png b/sprites/spr_mk7_complex_backpack/d759779c-a75b-4d79-b22b-410d27d6c6de.png index 91e1fdb2bfebff31281e65c0cc940d9e430cee30..8da5258765333bef5367e4537fb46a61253fc5c6 100644 GIT binary patch delta 616 zcmZ3*_JnPM7&oI62O9$eL;d}-tci+_CgGkgjv*Dd-rhV|c-ugL^+KuI-Ia{fA54mA zDn7Tv?zvNi#BnZNL7AFE@9&x@Sql8v`M@c3vLKUc{f5(rUoi4~Gpk|*=v12EGV`ab(bmM5rr$KB=g(x`d2>UI-JQ#) z7gYZV(f|MV&&4yn=VvnQ3^iT0M#6kXQr#uypVw95S66taT7MR*?XRzUzxC9vkSkw5 zZhYt?d*k<$yPNzg>Q}Z`t=;~8>Gx}@)}FjVy8nt+MSs}Us?wX) zOtn*%IFwZfMX%U?Xl{h-cBf1G-peeT(dogJ^1b0qi0tfp)e|y9jZ`P3wc9Ry&G!7( zcg=0HW;P!dHWbusd?VLWws+>LC%X>6(_HDbEWf9`xGmw_pXm?6kA`@x5b`+0p%R$H zRC&ZYE{Of^X+d6(OS`kZ6h2$`{dB$4JjEgGs-@M#n<}BlS4~)+l)BIKo6MymU{L2w zR$$Vp*RE%f@=Tj=+OMtR}7Y(7MDDK)5n>X6K3g=7acT=-&SBm|$V%w{SpM8vP}*Gl?zc$v z*)!)JcFyRS;!wu#w)>t>Xwluo?^8llFPk6RZRuo?{?Gfv@+2*l5KfguU|<+F-gzvm zzq0vVYCoH@%FDZ^suO<79{;2C&e2O@^(%?FA95zGN)9~{ywT{sR5eegUy^d z_VkXl`IFBCbOOU(wZt`|BqgyV)hf9t6-Y4{85o)98XD*tnuHh`TNxTz8JcSw7+4t? ze3QTM4@E<6eoAIqC2kGvP8m)>4H|G8N-}d(i}gwpa|>{5x)AO;7nCGCUHx3vIVCg! E0JB*Gxc~qF diff --git a/sprites/spr_mk7_complex_backpack/layers/d759779c-a75b-4d79-b22b-410d27d6c6de/216ff805-fa19-4063-a04c-9a3542762bd3.png b/sprites/spr_mk7_complex_backpack/layers/d759779c-a75b-4d79-b22b-410d27d6c6de/216ff805-fa19-4063-a04c-9a3542762bd3.png index 91e1fdb2bfebff31281e65c0cc940d9e430cee30..8da5258765333bef5367e4537fb46a61253fc5c6 100644 GIT binary patch delta 616 zcmZ3*_JnPM7&oI62O9$eL;d}-tci+_CgGkgjv*Dd-rhV|c-ugL^+KuI-Ia{fA54mA zDn7Tv?zvNi#BnZNL7AFE@9&x@Sql8v`M@c3vLKUc{f5(rUoi4~Gpk|*=v12EGV`ab(bmM5rr$KB=g(x`d2>UI-JQ#) z7gYZV(f|MV&&4yn=VvnQ3^iT0M#6kXQr#uypVw95S66taT7MR*?XRzUzxC9vkSkw5 zZhYt?d*k<$yPNzg>Q}Z`t=;~8>Gx}@)}FjVy8nt+MSs}Us?wX) zOtn*%IFwZfMX%U?Xl{h-cBf1G-peeT(dogJ^1b0qi0tfp)e|y9jZ`P3wc9Ry&G!7( zcg=0HW;P!dHWbusd?VLWws+>LC%X>6(_HDbEWf9`xGmw_pXm?6kA`@x5b`+0p%R$H zRC&ZYE{Of^X+d6(OS`kZ6h2$`{dB$4JjEgGs-@M#n<}BlS4~)+l)BIKo6MymU{L2w zR$$Vp*RE%f@=Tj=+OMtR}7Y(7MDDK)5n>X6K3g=7acT=-&SBm|$V%w{SpM8vP}*Gl?zc$v z*)!)JcFyRS;!wu#w)>t>Xwluo?^8llFPk6RZRuo?{?Gfv@+2*l5KfguU|<+F-gzvm zzq0vVYCoH@%FDZ^suO<79{;2C&e2O@^(%?FA95zGN)9~{ywT{sR5eegUy^d z_VkXl`IFBCbOOU(wZt`|BqgyV)hf9t6-Y4{85o)98XD*tnuHh`TNxTz8JcSw7+4t? ze3QTM4@E<6eoAIqC2kGvP8m)>4H|G8N-}d(i}gwpa|>{5x)AO;7nCGCUHx3vIVCg! E0JB*Gxc~qF diff --git a/sprites/spr_mk7_complex_backpack/spr_mk7_complex_backpack.yy b/sprites/spr_mk7_complex_backpack/spr_mk7_complex_backpack.yy index 8b13f59d81..8fddc2cf0e 100644 --- a/sprites/spr_mk7_complex_backpack/spr_mk7_complex_backpack.yy +++ b/sprites/spr_mk7_complex_backpack/spr_mk7_complex_backpack.yy @@ -2,10 +2,10 @@ "$GMSprite":"v2", "%Name":"spr_mk7_complex_backpack", "bboxMode":0, - "bbox_bottom":38, + "bbox_bottom":83, "bbox_left":33, "bbox_right":130, - "bbox_top":14, + "bbox_top":59, "collisionKind":1, "collisionTolerance":0, "DynamicTexturePage":false, @@ -16,7 +16,7 @@ ], "gridX":0, "gridY":0, - "height":232, + "height":322, "HTile":false, "layers":[ {"$GMImageLayer":"","%Name":"216ff805-fa19-4063-a04c-9a3542762bd3","blendMode":0,"displayName":"default","isLocked":false,"name":"216ff805-fa19-4063-a04c-9a3542762bd3","opacity":100.0,"resourceType":"GMImageLayer","resourceVersion":"2.0","visible":true,}, @@ -63,18 +63,22 @@ "playbackSpeedType":0, "resourceType":"GMSequence", "resourceVersion":"2.0", + "seqHeight":322.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":"d759779c-a75b-4d79-b22b-410d27d6c6de","path":"sprites/spr_mk7_complex_backpack/spr_mk7_complex_backpack.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"dfcc2188-1c25-4b83-b365-64f54b46e5f6","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"d759779c-a75b-4d79-b22b-410d27d6c6de","path":"sprites/spr_mk7_complex_backpack/spr_mk7_complex_backpack.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"dfcc2188-1c25-4b83-b365-64f54b46e5f6","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, + "xorigin":0, + "yorigin":45, }, "swatchColours":null, "swfPrecision":2.525, diff --git a/sprites/spr_mk7_complex_left_knee_1/b6ba8600-fb6b-4fa9-abc7-bdc2311eb79e.png b/sprites/spr_mk7_complex_left_knee_1/b6ba8600-fb6b-4fa9-abc7-bdc2311eb79e.png new file mode 100644 index 0000000000000000000000000000000000000000..c43cd0abc791783c96c8bee6431f246ad3c29265 GIT binary patch literal 872 zcmeAS@N?(olHy`uVBq!ia0vp^OMv(V2OE$~)b|eqQVPi)LB0$ORcZ_j4J`}|zkosw zFBlj~4Hy_+B``2p&0t^N?eMODxHZpgS?A8YMIK_mE;e8P*&Tai{vku(Go`|=Mi=Y{&yANplK zO&Vg)?tUyt{c|)SjqhpyUhW0wx(wo^K7XrRw~F_o9LpwM(?pqm-Cp_pmS3leZGCo4 zJL|MRFzeXq9~CeCrZUQY`Ylm@dP}U))!ogD)>=JD*!1w_KUPy;zLFDWGUhhnFK-$7 zP8T`x{gzO!ASG%~RCaGr1O?(p{)?O5zyD z^$EVSV*UBz!er{Nulv*e-(1T0-=v1it%XPXEV+|+{qzqP2>o?)^5v-?D+eA5-4EknXi@o*h74swJ)wB`Jv|saDBF zsX&Us$iT={*T7WQ*f7Mv*vi1j%Gg}nz`)ADpsXsG8AU^GeoAIqC2kGu>aX_$HE6(X fD9OxCEiOsSEx@fO!01#0P!EHrtDnm{r-UW|^-47f literal 0 HcmV?d00001 diff --git a/sprites/spr_mk7_complex_left_knee_1/layers/b6ba8600-fb6b-4fa9-abc7-bdc2311eb79e/468e0a30-2dea-45bc-a7bd-4b115f803d2d.png b/sprites/spr_mk7_complex_left_knee_1/layers/b6ba8600-fb6b-4fa9-abc7-bdc2311eb79e/468e0a30-2dea-45bc-a7bd-4b115f803d2d.png new file mode 100644 index 0000000000000000000000000000000000000000..f3f81af34f0a648e7e2318ebaa291d8f6f8a7e22 GIT binary patch literal 872 zcmeAS@N?(olHy`uVBq!ia0vp^OMv(V2OE$~)b|eqQVPi)LB0$ORcZ_j4J`}|zkosw zFBlj~4Hy_+B``2p&0t^N?eMODxHZpgS?A8YMIK_mE;e8P*&Tai{vku(Go`|=Mi=Y{&yANplK zO&Vg)?tUyt{c|)SjqhpyUhW0wx(wo^K7XrRw~F_o9LpwM(?pqm-Cp_pmS3leZGCo4 zJL|MRFzeXq9~CeCrZUQY`Ylm@dP}U))!ogD)>=JD*!1w_KUPy;zLFDWGUhhnFK-$7 zP8T`x{gzO!ASG%~RCaGr1O?(p{)?O5zyD z^$EVSV*UBz!er{Nulv*e-(1T0-=v1it%XPXEV+|+{qzqP2>o?)^5v-?D+eA5-4EknXi@o*h74swJ)wB`Jv|saDBF zsX&Us$iT={*T7iU&^*M*$jaEr%D_U~z`)ADVB@v50w@}C^HVa@DsgK#&@H+Ks6hj6 fLrG?CYH>+oZUJsR)90BKgZ$#@>gTe~DWM4fe%Us6 literal 0 HcmV?d00001 diff --git a/sprites/spr_mk7_complex_left_knee_1/layers/b6ba8600-fb6b-4fa9-abc7-bdc2311eb79e/88207c69-b4a6-4dcf-bff5-449f98b2cb6f.png b/sprites/spr_mk7_complex_left_knee_1/layers/b6ba8600-fb6b-4fa9-abc7-bdc2311eb79e/88207c69-b4a6-4dcf-bff5-449f98b2cb6f.png new file mode 100644 index 0000000000000000000000000000000000000000..8fd15c90adaa9dc2e1ef4afba70dd21f149fd383 GIT binary patch literal 439 zcmeAS@N?(olHy`uVBq!ia0vp^OMv(V2OE$~)b|eqQVPi)LB0$ORcZ_j4J`}|zkosw zFBlj~4Hy_+B``2p&0t^2OC7#SFu>Kd5p8XJZf z7+V<_Ss9ya8yHv_7?f27Goxt8%}>cptHiB=UH$cbpau=N4JDbmsl_FUxdpiO1Q?x4 Q0P11zboFyt=akR{0G~um-v9sr literal 0 HcmV?d00001 diff --git a/sprites/spr_mk7_complex_left_knee_1/spr_mk7_complex_left_knee_1.yy b/sprites/spr_mk7_complex_left_knee_1/spr_mk7_complex_left_knee_1.yy new file mode 100644 index 0000000000..e0f3656bc0 --- /dev/null +++ b/sprites/spr_mk7_complex_left_knee_1/spr_mk7_complex_left_knee_1.yy @@ -0,0 +1,112 @@ +{ + "$GMSprite":"v2", + "%Name":"spr_mk7_complex_left_knee_1", + "bboxMode":0, + "bbox_bottom":164, + "bbox_left":104, + "bbox_right":129, + "bbox_top":134, + "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":"88207c69-b4a6-4dcf-bff5-449f98b2cb6f","blendMode":0,"displayName":"Layer 1","isLocked":false,"name":"88207c69-b4a6-4dcf-bff5-449f98b2cb6f","opacity":100.0,"resourceType":"GMImageLayer","resourceVersion":"2.0","visible":true,}, + {"$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_mk7_complex_left_knee_1", + "nineSlice":{ + "$GMNineSliceData":"", + "bottom":0, + "enabled":false, + "guideColour":[4294902015,4294902015,4294902015,4294902015,], + "highlightColour":1728023040, + "highlightStyle":0, + "left":0, + "resourceType":"GMNineSliceData", + "resourceVersion":"2.0", + "right":0, + "tileMode":[ + 0, + 0, + 0, + 0, + 0, + ], + "top":0, + }, + "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_mk7_complex_left_knee_1", + "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_mk7_complex_left_knee_1", + "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_mk7_complex_left_knee_1/spr_mk7_complex_left_knee_1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"7ea69ecd-f81f-42b8-ac71-b6987343efcb","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_mk7_complex_right_knee/b6ba8600-fb6b-4fa9-abc7-bdc2311eb79e.png b/sprites/spr_mk7_complex_right_knee/b6ba8600-fb6b-4fa9-abc7-bdc2311eb79e.png new file mode 100644 index 0000000000000000000000000000000000000000..a09b740835691fc23a646ee22e2bde923b5d338c GIT binary patch literal 851 zcmeAS@N?(olHy`uVBq!ia0vp^OMv(V2OE$~)b|eqQVPi)LB0$ORcZ_j4J`}|zkosw zFBlj~4Hy_+B``2p&0t^pL6N+k>*An0?tXs!dF?R)Z0p4&du;b?-S=LtWk&7h|27GZf2 z%N=Mk>d9`7$g>weE^_Kgos4aRs`a6Yt><5#u87;H&zZvWq^5GY*s+>dMOr6zt9 zG1DtKe)r(3cD?MgKATEUEPc1)^xe*!#yv6bIUmnGRWd!+PU_Da1v~d6moK^&MX%zs z+%0`g^nJ)OzRHiHb0@kjc{L&4K|=cTTxQK4-cw>8*Za!#q802MW`f)=XaI?AQOzZk5=vc7bEdmT*1c^G@vP=%{;9Cu{3)?WD*Fy`*-e$joXanX8eeyJ{l+O>{>Q93H)M-ZW_I&UFIy6# zcEfG^Zzp4ed@hO|2I^8Rag8WRNi0dVN-jzTQVd20My9$3rn<(4AqK`)21ZtPnaO+vV^=1{wFP^S`F6*2U FngDeGCPDxJ literal 0 HcmV?d00001 diff --git a/sprites/spr_mk7_complex_right_knee/layers/b6ba8600-fb6b-4fa9-abc7-bdc2311eb79e/468e0a30-2dea-45bc-a7bd-4b115f803d2d.png b/sprites/spr_mk7_complex_right_knee/layers/b6ba8600-fb6b-4fa9-abc7-bdc2311eb79e/468e0a30-2dea-45bc-a7bd-4b115f803d2d.png new file mode 100644 index 0000000000000000000000000000000000000000..b02e41acdc7471031d537f7ac12741e7b07e97e6 GIT binary patch literal 439 zcmeAS@N?(olHy`uVBq!ia0vp^OMv(V2OE$~)b|eqQVPi)LB0$ORcZ_j4J`}|zkosw zFBlj~4Hy_+B``2p&0t^2OC7#SFu>Kd5p8XJZf z7+V<_S(%z>8yHv_7&QKMkVMgto1c=IR*74~hXp^D0ySvBZ79jiO)V}-%q_sJXZhBf QRiNR literal 0 HcmV?d00001 diff --git a/sprites/spr_mk7_complex_right_knee/layers/b6ba8600-fb6b-4fa9-abc7-bdc2311eb79e/88207c69-b4a6-4dcf-bff5-449f98b2cb6f.png b/sprites/spr_mk7_complex_right_knee/layers/b6ba8600-fb6b-4fa9-abc7-bdc2311eb79e/88207c69-b4a6-4dcf-bff5-449f98b2cb6f.png new file mode 100644 index 0000000000000000000000000000000000000000..a09b740835691fc23a646ee22e2bde923b5d338c GIT binary patch literal 851 zcmeAS@N?(olHy`uVBq!ia0vp^OMv(V2OE$~)b|eqQVPi)LB0$ORcZ_j4J`}|zkosw zFBlj~4Hy_+B``2p&0t^pL6N+k>*An0?tXs!dF?R)Z0p4&du;b?-S=LtWk&7h|27GZf2 z%N=Mk>d9`7$g>weE^_Kgos4aRs`a6Yt><5#u87;H&zZvWq^5GY*s+>dMOr6zt9 zG1DtKe)r(3cD?MgKATEUEPc1)^xe*!#yv6bIUmnGRWd!+PU_Da1v~d6moK^&MX%zs z+%0`g^nJ)OzRHiHb0@kjc{L&4K|=cTTxQK4-cw>8*Za!#q802MW`f)=XaI?AQOzZk5=vc7bEdmT*1c^G@vP=%{;9Cu{3)?WD*Fy`*-e$joXanX8eeyJ{l+O>{>Q93H)M-ZW_I&UFIy6# zcEfG^Zzp4ed@hO|2I^8Rag8WRNi0dVN-jzTQVd20My9$3rn<(4AqK`)21ZtPnaO+vV^=1{wFP^S`F6*2U FngDeGCPDxJ literal 0 HcmV?d00001 diff --git a/sprites/spr_mk7_complex_right_knee/spr_mk7_complex_right_knee.yy b/sprites/spr_mk7_complex_right_knee/spr_mk7_complex_right_knee.yy new file mode 100644 index 0000000000..0fead546d0 --- /dev/null +++ b/sprites/spr_mk7_complex_right_knee/spr_mk7_complex_right_knee.yy @@ -0,0 +1,112 @@ +{ + "$GMSprite":"v2", + "%Name":"spr_mk7_complex_right_knee", + "bboxMode":0, + "bbox_bottom":163, + "bbox_left":34, + "bbox_right":59, + "bbox_top":134, + "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":"88207c69-b4a6-4dcf-bff5-449f98b2cb6f","blendMode":0,"displayName":"Layer 1","isLocked":false,"name":"88207c69-b4a6-4dcf-bff5-449f98b2cb6f","opacity":100.0,"resourceType":"GMImageLayer","resourceVersion":"2.0","visible":true,}, + {"$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_mk7_complex_right_knee", + "nineSlice":{ + "$GMNineSliceData":"", + "bottom":0, + "enabled":false, + "guideColour":[4294902015,4294902015,4294902015,4294902015,], + "highlightColour":1728023040, + "highlightStyle":0, + "left":0, + "resourceType":"GMNineSliceData", + "resourceVersion":"2.0", + "right":0, + "tileMode":[ + 0, + 0, + 0, + 0, + 0, + ], + "top":0, + }, + "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_mk7_complex_right_knee", + "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_mk7_complex_right_knee", + "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_mk7_complex_right_knee/spr_mk7_complex_right_knee.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"7ea69ecd-f81f-42b8-ac71-b6987343efcb","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_pack_arm/spr_pack_arm.yy b/sprites/spr_pack_arm/spr_pack_arm.yy index bb52801509..ae0f80af85 100644 --- a/sprites/spr_pack_arm/spr_pack_arm.yy +++ b/sprites/spr_pack_arm/spr_pack_arm.yy @@ -64,19 +64,22 @@ "playbackSpeedType":1, "resourceType":"GMSequence", "resourceVersion":"2.0", + "seqHeight":231.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":"84b91922-cc04-47fc-989c-1f57e3b1fafe","path":"sprites/spr_pack_arm/spr_pack_arm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"878757e1-ecdc-4262-9fac-0cd2cc896318","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"248cf0d9-174e-4863-8f84-e32382a7c773","path":"sprites/spr_pack_arm/spr_pack_arm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"99c18d6d-89c3-455b-be9f-a6f49f0864d4","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"84b91922-cc04-47fc-989c-1f57e3b1fafe","path":"sprites/spr_pack_arm/spr_pack_arm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"878757e1-ecdc-4262-9fac-0cd2cc896318","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"248cf0d9-174e-4863-8f84-e32382a7c773","path":"sprites/spr_pack_arm/spr_pack_arm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"99c18d6d-89c3-455b-be9f-a6f49f0864d4","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":{ - "x":0.0, - "y":0.0, - }, + "visibleRange":null, "volume":1.0, "xorigin":0, "yorigin":0, diff --git a/sprites/spr_pack_arms/spr_pack_arms.yy b/sprites/spr_pack_arms/spr_pack_arms.yy index d693a5ec27..a906100f71 100644 --- a/sprites/spr_pack_arms/spr_pack_arms.yy +++ b/sprites/spr_pack_arms/spr_pack_arms.yy @@ -65,14 +65,22 @@ "playbackSpeedType":1, "resourceType":"GMSequence", "resourceVersion":"2.0", + "seqHeight":231.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":"0a62add5-b009-4050-ad6b-642b81efdcee","path":"sprites/spr_pack_arms/spr_pack_arms.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"1789541c-4533-4609-a018-a82ef1b709a0","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"bd9433c3-b178-4b5e-80c1-0f0daa3c9f1e","path":"sprites/spr_pack_arms/spr_pack_arms.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"2450620f-c70f-4df1-b4f4-bf7ea3682c22","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"dce20ba2-abbe-43c0-b5a2-22334ddd6fc7","path":"sprites/spr_pack_arms/spr_pack_arms.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"961fb051-1332-4540-9c9c-b86c69a2d34a","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"0a62add5-b009-4050-ad6b-642b81efdcee","path":"sprites/spr_pack_arms/spr_pack_arms.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"1789541c-4533-4609-a018-a82ef1b709a0","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"bd9433c3-b178-4b5e-80c1-0f0daa3c9f1e","path":"sprites/spr_pack_arms/spr_pack_arms.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"2450620f-c70f-4df1-b4f4-bf7ea3682c22","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"dce20ba2-abbe-43c0-b5a2-22334ddd6fc7","path":"sprites/spr_pack_arms/spr_pack_arms.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"961fb051-1332-4540-9c9c-b86c69a2d34a","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_brazier/3368318c-d87a-46c2-891b-f8d5cebbf275.png b/sprites/spr_pack_brazier/3368318c-d87a-46c2-891b-f8d5cebbf275.png index 445dbd9b4321a8c07db1b551e22f810caa879259..267164237e392be2d64b7ec259f361a1ae9c5472 100644 GIT binary patch literal 6675 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 QMm}Vy3(!Gd|MThJ0NMsQa{vGU diff --git a/sprites/spr_pack_brazier/4dbb61b5-014b-49c6-90e2-0a89427c2fb6.png b/sprites/spr_pack_brazier/4dbb61b5-014b-49c6-90e2-0a89427c2fb6.png index 6a9ca6b5cb4eaf9ce85304121de938bb23feda0b..77ff64cb63896bc019f4bf7a6a4537f90f8370ed 100644 GIT binary patch literal 5114 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 Vb5I|FQl}h%zOIQ*g_hHc{{Xm5)@}d* literal 4427 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 diff --git a/sprites/spr_pack_brazier/fdac9a6c-2f3a-44f5-babc-322180e5b74a.png b/sprites/spr_pack_brazier/fdac9a6c-2f3a-44f5-babc-322180e5b74a.png index 640b7c46c64f01bc131796e7857ba5d6878becc6..4395381971bf26a094923727106eaa97e5361482 100644 GIT binary patch literal 1713 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 QMm}Vy3(!Gd|MThJ0NMsQa{vGU diff --git a/sprites/spr_pack_brazier/layers/4dbb61b5-014b-49c6-90e2-0a89427c2fb6/1a16b695-842b-4c36-b421-733edb7d6a1c.png b/sprites/spr_pack_brazier/layers/4dbb61b5-014b-49c6-90e2-0a89427c2fb6/1a16b695-842b-4c36-b421-733edb7d6a1c.png index 6a9ca6b5cb4eaf9ce85304121de938bb23feda0b..77ff64cb63896bc019f4bf7a6a4537f90f8370ed 100644 GIT binary patch literal 5114 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 Vb5I|FQl}h%zOIQ*g_hHc{{Xm5)@}d* literal 4427 zcmeI0X*kqv-^W!~)j>+_u}KVz|463kLBMoV_-OUUSCHO5|BlH7wAiH4r&Y6zX7-+%5QGjl+b)W z`O^h0J-sHx8|IPrOKF^17NVRWK~5nd9k#*9@0u!jVZTp^&%m~!r#(NE!+$8$WDoF` z6lx1~-mq}yV!l!bz=!UKO)g{S8EuP6TM2U4CfAgNlY+HF5WSmo)Wa}7p>tktCfEn{ z;OwLYNTIR6fi(zN$+gNIeMd18_!2zco4Pyp!QMuWUFh<|vpwkoxb`>hYu7i>%Y_3N z=qM57g@^TDsW8-~x-X(FWo6QRTE_Qcd^J!>k1mFc7#QOSCue;pQ+dj|AZNu$$ zXRu?IBec;k!RSawbd(Re?aU3fuHR6N@i(NpR+d+K-~G5q zaC>5&3{F*TlweQvG|0Yj2VEp89pdKWRz~7rZ0Xdvbu>;|f#GAl#jW}z3IVElngCwKPD zq~N)Ujs8#kd$px3Glzji*0jrJs!)7^;m${?W{%VaKw)`4NO{zdxU?tu7$%k8v#Puu z21m<5@X>NzX~m8sr=6>>DjV+QGOFbQ{uG3M#)W<^LN-u}P*Hqos2F)) zF$$&_O`F*K8h^04B!DjoV>OI!Rr%Q5l-;x*cEY@5b}kovLIoiV7^CUicC-A*qj@lyd>dWWI7=!C}Ebc zNpe1y1iXXOTgG#{_HhMi|Fw0$5N+1M24$zY-KY7H(}Jt=5eS9jzI{~pA(o-Ts~hYj zU-_OEkA)a=b1AG_PzvH`OzdxDO26cbW zz(7b@^-<_6YpAXXO?PC*%;BeVrZ3(B%gDGBY;&c54sgUG0h-5rGo(_OtJP%0aYNfHDDrd!t}+S z=}QV(RGaQ;eKdU7Jx!l044$0}Xkw^4$an7d z@~ZLuTuL*jSnFI&b6KRULa5;T1w@>AEY0ot*lw@tVm(MA9g!(1TrMbjWU6)tA;{xj zH0U*hZ(404LjGx%(EseYxQWfiUwV)N+p{GLh_n2(O7_7g3oR-gJgE0#yC->nMSp@?qS+KCK@y_1BVHA+tO zACs#nJcB7kC`YG^MM8mFFDLp$g6{M#2%Vie37lg5JD{^?r_TeY|H0=5e8Ojm3vXF* zk*uHXKw8&S5WdKdLMcnH5cwF}IyVB+zo@|8gzPxwSqF<*)~8OL^?;wp7>xmzzm0#^ zv{IK!>9MOw69~_^o}-R0OA{oo zVU7bxmRp}xgvVCm8Le4pDp92A~xkbGYufwC+Vz(M(lZX z*W3UV{2Uz6PsB7g6A2v=-;S_PKwi^jse5`P3--Z_BUuyu9GTY#D6yb#7Ce?HT z-5J(^Rx_JfoXB+oe8@bg=??nS?FRPs69Qyq(+oYX<9{k#b?$mAUlp?FT~bm~ z*#OC%YKmk#0iA7q4X0Ld`Bp4kz|Q*pH6*_cf0Y<(lDD=CP`5mP{=Cyjl{2M9KL6pL z3dL&ZOi|m`JzuV6R5`S;)*Tomhg5|Z1Wa_lNv!2KYfVSuG<3ru{nO);<4du9#B%tK zLY-Yh`0v_QMe{UWb{9z{z}N*gQQpcHDXk?Je$4r0Sy5G3qB!8S9(%0RpUAj4-aLJ4Nh!o=n|tr#Zrrukxr=k#^~K{?+v$xt>t0kDin$Usxh$&dspBrhu2RJ+?>}B z46K7ECp%!MWv#`@ITgcypQe@mMAI$WdcZ~o zgv^@|T+bTf_>=Yk!!Y1Il*VUZZ=Y*T4~xyJ5GW-&KUBRO?zG*sRE;}7M5A|upKF+Qc^^PxkcN1lS8Q=wqf{da&pEyDeQfM`>X%avrIuGlP(*72KY6F~egmy< z-;ZZBm3+9mOWd0DpLx62y}H;>!8*}Lqu!Z@j`;@?=n#_C;!23txUmo=bgR;}u7Px5 z85B;ZDJc{$(@a!Lgq3~UOG-&M}YDfOKW88;s%hw(S9ExQi2&$PsCC*5>xJwum2 z=f1u%ks#w&_2~OmHPNHKuRctOJ}MORlw2jN${n)5SbPFH!glFRV+50-udlC3Z_8=J zZ36eM+TP^P`p4NjDevBu9=UZy;7_gzDeuaVm!49yYBNV{>auiyFT&izXJACZ;X{E9 zBUJ8;RCOq?T$UKye0TBz(UQ`REU)tDl^v-ox4j4$S~$&!`3zY2NPg9lzn$|_K&UW$ z{6oS{Uf$IaY;f&%3+w4(U^c6AKiJgtB=(T}rSW%r>laQ1-D%rq*Q$yGF*`No_Suj$ zZavW9`M?jAKw7g52QQb#7;Z#K$+NndKu+6ys(`tlzB%M@l0$nW8G(=uSH2><;L6ZH zFN%LhkSh2hZmi)a3yF*Cy;D0ly!5d-=A6h$=qnd!!6A>Gor%fi?(Xg(J}K@jMX#$< zu4e8D>ald}&Tky*3)r$glBCa}8@)~(nbjP{&bDubTfP-pH=1g%gd0*XXHm~mC!n+N zd@_ByRR5XTQxs&_BvnVrrF0AB#$V~`v5r8X=E1K|H-3ApBgN3 zr{+4~n#gteWE^zLf87kZetXWJ^#Dmny4U_U>CDz|DzLRUzfvA-y29gq`u-BYf7O~^ z$%)J(*=`7_py0)ej*?1BmdYOLWp=?2hRy`emxS&+zTvvnybS|^K>PO0M-$b4`Re;= z(v}XPm0FF91H}>6uZ1<#rzB)#WTvM4>nJL(-ByWeiZ+TpX#L|3dfV+w+ zMe$qmevp7f;-Ia|H6wy9bu&8WyRd|f@_evWTPW$d2brLoL7NGigq5J?rof5IQtfRj zp~g9pQhfN;A{k2exQf%(!uJ3@@8b+FlQS1zpaXQUHlbrTH^PZal#dd%emuLaOSs69 zUDC^p?N>zUOY%2k^6a&nvZnM5X1E_)*h$D;3jD)U_?6?C@S`|K;UoA-+xxk;!47Ng z9bH{1SG1$rlgn;OSRiCL0JjVr9IhfIdwx_p3T^Aaj;qzIz+GYW-fo(XI1+=Z;Urx8 zgMpzAN*?#`$xTz)1+JE$;DZCft$ctjpX&Ac(ckIt1e%B{mL!KyHgdhe8D9*tmS3-q z6$1$d?ylRYF(@vT3Js*aL4HslC)%IjED^XSrld zHbjvoDc>#%3s)ri_;Cd3GUMPj;}rHM)JK?SlUEL;m>ygfU&_@JCZSy?Sen+HptT{V zeyWYiKI7yXV!Qn9<@QNtd3!8_);$Zk|6KjQA~6N?c)NGR^%LJjbc(OUN?QY4`Ts8u iQTF`*_TS>{o-j)FwtC>uxnIvF4ElF~I!LVtFa8E<1gkv& diff --git a/sprites/spr_pack_brazier/layers/fdac9a6c-2f3a-44f5-babc-322180e5b74a/1a16b695-842b-4c36-b421-733edb7d6a1c.png b/sprites/spr_pack_brazier/layers/fdac9a6c-2f3a-44f5-babc-322180e5b74a/1a16b695-842b-4c36-b421-733edb7d6a1c.png index 640b7c46c64f01bc131796e7857ba5d6878becc6..4395381971bf26a094923727106eaa97e5361482 100644 GIT binary patch literal 1713 zcmeAS@N?(olHy`uVBq!ia0vp^%NZCLojBNltSK+fW&$aNWRD45bDP46hOx7_4S6Fo+k-*%fF5lweEpc6VX;4}uH!E}zW6z`DfK#WAGf*4sPx z^F&f*j(ucb+_s?e;*o+!jUUB!nCmxHD?bbnRu(eonpW@Ry>aQ+gfiWgVOf`J@28)B zKKV<>hTpR*_s_k1b8aRR(0H6+L+UzNdHM7682?>m-^|{yxnpwFqb1WUR;v1CbrNFM zT2wduPyYX-Y|@=wN80xk|Gl++v-#<7^B4Xz>*dusk$IK-i{1P7Qx@zxM>0#fKX3b9 zS|74^jekVT)@aXnXYTzgKV$yoXIQqO>7`l9&yN`R|28~%`KEi{-^aJ-tN%>r54(yESGf=l-zr?Jd4` z`l$65my1Tn@4KzP{zf_dcHn1?le2F+ui4{y-MiYTV(+q}kyTgz6n|rQ`k5zo`%L$9 z+ZLxy+B3`6;it{X1EsTt(q9G|dwxsj53oCLbY;QU*`-f%Y_il&-h0D%>UpH}rn=4k z9k=$(0V#Lx{Cs4!O8e$^i>C&2-&?l}Jnt0W%zk6jPBXtb>hsRYC7gbC%c4+^Z}OXS za*ud+zpUPE*kU2>Ke;5v`iKAVO8@?Ok7C}O0V;cbo1;)qfA-q>>g(Pv{hoXL*qN@) zFQ;|Hr}J-UE#`~duUU9*AL}FC^^20<$A8dBdEMU1Yp<43u&F6=Gc9pDGJ*V;0*A-91*3_SJ819WjsTH~M~g$}Wq^Pg9@N>AmOp zZV_&LW^3t!e*Kpp`!>D#FPOjiU+~rVnboKLrhT`JSO58>slRYSD!cv6y@t#(sy{VP z%6snf`gD<1KE3>_g{b+pt;c5SSijh<60fpz=96QV|L;3ay1#jkPVCh0)1QA;IUV`u ztV;Z|KNH`j-i#03f8uQ6I@`##SNHih{rT89ef9k3FZY@iw=7oK zpRzL`W$*rLzjI_?*ZFl0Egx<#0mX>3+yqKI z*z|{Wy}{3Sd(=C&0=cRst`Q|Ei6yC4$wjF^iowXh$W+(BRM*%r#K6$X#K_9TMBBi? z%D`amr8Ykl4Y~O#nQ4`{HN5G!`vlaW0k@$fGdH!kBr&%Dx1Qaz2OE&=lK2wJz`$zl>EaktG3V`_*z6E?5x0k( zQ6hnV99Ude-w4~n*!?a1oA~+Iwd{UJmPBq1G|u)2(Cq2&c5=S60rMR+B4biBP^ulw&$?a7*2`T` zyzj_ALGH*8_RF?yy}=b6^KZ)k4u7}k&Jnqlbw4-{+dOXk8*r`KMxubbbiprY39~at z_bNW#WBx$wm4muXi|65(JF-USb~EQKxIlGFL3Ne~vR1zuw;S z`By{qoYH{DTl#CS{r)PPcF4j!yT5jFFkjM~+cVeCI)3oZ|>h09#3Ap@UczQ?>Ew>ekaez z^A+C!I%0n9;$xaSZENOiXTP(ekn7$Y*=Gj|^RD^*4r4bw=gIu{&#~Vh3jL~_>(tE+ z`t#*03SaF#`|z>M=XuZ9UH;MDoy#BZ*;!i0@$>7t_r?!D*w=nKSH*hcaG_Lu;k~uzUp_dt zGvZ&@yTg5ae@|a;+sXd;&KmjSdhfm_RzF)`#-BT<`?$5mmrrpIw`v=m%f5Yg&-b4< zcAejHc>j(g%KH2JiyzznyZ_tl+}U3rW1hX2+-vaO_~VE3dJj+J>l>Z1m3n^C;eOnq zv-56#pIP8Od#Y$!~My v#pe{s|5YR_F_WJBM|BWiR1DIvI${4|_KvT|br)L$OH&3":"","Keyframes":[ - {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"3368318c-d87a-46c2-891b-f8d5cebbf275","path":"sprites/spr_pack_brazier/spr_pack_brazier.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"3a56ce07-8e61-4c45-b30f-8fdfa4e44d2d","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"4dbb61b5-014b-49c6-90e2-0a89427c2fb6","path":"sprites/spr_pack_brazier/spr_pack_brazier.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"9565c920-28b4-410e-9be7-a89088b5b95c","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"fdac9a6c-2f3a-44f5-babc-322180e5b74a","path":"sprites/spr_pack_brazier/spr_pack_brazier.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"7bf2e48d-0846-455b-ab62-0f5943650061","IsCreationKey":false,"Key":2.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_brazier/spr_pack_brazier.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"3a56ce07-8e61-4c45-b30f-8fdfa4e44d2d","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"4dbb61b5-014b-49c6-90e2-0a89427c2fb6","path":"sprites/spr_pack_brazier/spr_pack_brazier.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"9565c920-28b4-410e-9be7-a89088b5b95c","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"fdac9a6c-2f3a-44f5-babc-322180e5b74a","path":"sprites/spr_pack_brazier/spr_pack_brazier.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"7bf2e48d-0846-455b-ab62-0f5943650061","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, "volume":1.0, "xorigin":0, - "yorigin":0, + "yorigin":45, }, "swatchColours":null, "swfPrecision":2.525, diff --git a/sprites/spr_pack_brazier2/3368318c-d87a-46c2-891b-f8d5cebbf275.png b/sprites/spr_pack_brazier2/3368318c-d87a-46c2-891b-f8d5cebbf275.png index acfc734dc80804c0003da29f4f4bdf0864609e5e..2a1b275531d6a68baf491a099111736ef516176c 100644 GIT binary patch literal 6417 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 diff --git a/sprites/spr_pack_brazier2/layers/3368318c-d87a-46c2-891b-f8d5cebbf275/98aca475-f03b-4cda-b4db-4409d657d963.png b/sprites/spr_pack_brazier2/layers/3368318c-d87a-46c2-891b-f8d5cebbf275/98aca475-f03b-4cda-b4db-4409d657d963.png index acfc734dc80804c0003da29f4f4bdf0864609e5e..2a1b275531d6a68baf491a099111736ef516176c 100644 GIT binary patch literal 6417 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 diff --git a/sprites/spr_pack_brazier2/spr_pack_brazier2.yy b/sprites/spr_pack_brazier2/spr_pack_brazier2.yy index 5094b04a85..fa17178d47 100644 --- a/sprites/spr_pack_brazier2/spr_pack_brazier2.yy +++ b/sprites/spr_pack_brazier2/spr_pack_brazier2.yy @@ -2,10 +2,10 @@ "$GMSprite":"v2", "%Name":"spr_pack_brazier2", "bboxMode":0, - "bbox_bottom":97, + "bbox_bottom":117, "bbox_left":89, "bbox_right":195, - "bbox_top":16, + "bbox_top":36, "collisionKind":1, "collisionTolerance":0, "DynamicTexturePage":false, @@ -16,7 +16,7 @@ ], "gridX":0, "gridY":0, - "height":282, + "height":322, "HTile":false, "layers":[ {"$GMImageLayer":"","%Name":"98aca475-f03b-4cda-b4db-4409d657d963","blendMode":0,"displayName":"default","isLocked":false,"name":"98aca475-f03b-4cda-b4db-4409d657d963","opacity":100.0,"resourceType":"GMImageLayer","resourceVersion":"2.0","visible":true,}, @@ -63,18 +63,22 @@ "playbackSpeedType":1, "resourceType":"GMSequence", "resourceVersion":"2.0", + "seqHeight":322.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":"3368318c-d87a-46c2-891b-f8d5cebbf275","path":"sprites/spr_pack_brazier2/spr_pack_brazier2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"41a45b27-c017-44df-9857-968f0d783204","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_brazier2/spr_pack_brazier2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"41a45b27-c017-44df-9857-968f0d783204","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":57, - "yorigin":61, + "yorigin":81, }, "swatchColours":null, "swfPrecision":2.525, 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 0a65a67d2d55c79cbe1069325f4258b54306e6b8..3bd309f808aaeb32807f91c057f7f8214fa9b0ff 100644 GIT binary patch delta 1768 zcmZ{lc~FyQ9>=j(uvITjKEA}9iHfIT=sQmXJ_`0&OFaN^UO1!?{A*( z_c`izjP5A5{L5F{O-)Qp`ePfuyk#Hsw-9V_P}JAzh39|2zVC&N*=zmq={CWnQ^P`j zF$wWW9O>4T{Rck|hkJ2R`L-2DTtu7FJGnW<+PfXynzoqH)3iXlV{x`vc?^4befgrU zXeao{6vMeB|6$h8L>_ZeE*FIh9VoJm*=l3g96nbm>vu+OC2Iz8B7kJ0bYe7|?`>SV z{p*E@DMg?7jlm6OiT*%RY(-e)0gAvuhN>w+jiU(I*#o}we#zBLW=7`IEypBzs$j)> zy`WAOBv^7Lq>sRsoqop=-SIF_lNmFP6)%jhMS!V-E-s3ny(1=nI!R9ds6%WiL z0j9Ut{RxzM7sncAc@8GSa`G@aJk&*c^LqzEDSiexv75i;N838tY0Vdfjm3cIWlzm%lLj{$)MLrb@8f>&{n zN2G1Hp!pNzrL8lFw05M-2Sm|_qMcNVT6H*i)~Fo6$dq8N;YV!P=oqk2?y6D{PYwpP zlc}%-9n6<=w9zR|g^d%}DelknSY!53d3j3bui4k%5X7|#A25|$2{ja5;-%m5GhZ97 z?(cMFN{EmkWr99bS}3h-R}?Gx;&W!PcQ+rH%eWeGb6re1=?ocg_giA!0NZficw@4a0(ukLJ%=0= z^UuNR-b1~;vaIo1MY?)cz23vE8R3Cnkbs<5PZawa0+rP`VN)TJ$N{k%LF~oN1?>$q z_?7`PT$HsSO|mB7On1fI zyqTRXq-*9-AAUR^FrDQa>k&dbsubK7a*&syh(r-Ufp+{;4IJhQl~CLx2Oku@AXRtT^4vFTc9>P4m$Z3E)e(8AZ}DLLR5r)=6|~`!J^xH}sb7%a zyZH7xVKu!Ba_AFt?dwBLuub|61xUFO>s|V*ZYIBzRK&wr%KJig>c%0v%+}Hxh zbxQzoRRs5s`XG!b?)!yzr0>6?dzNCNa*9?eYH)cO(UlF##qye>0KGo9YM>fjw2J)r z8fRGNmu4zX)CHVLZhaCuWHDV833%gt7j?TD?cq0wBxRe6?5Fqpwxt}|^Q|JH>fIbZ zjJNmtM2cIWcgBw+Ll@UG1D=*Jb|t(MLD8R#9bryOybn{b5})YJA~E?yXyZ2>Rnmvn z?}Gyw=rPOsO!&y!YU2Q>h3)S8yKcaDt{U$!epUgGf(@?FYlMKDI`L-MTReBY&o=fb*1VI z&vd#qokoV^*=p)vUFVVn;sgV=c950KjWWZ=jtSY3@kGJ1Ip*<4aWMs{d-ZRLXGg;( zsH}63UaSF_zz|dDDZd9kHvN)w$=IIfI@bE(+{ZJ@Z1i}x2s2nXI{vVLW0O+&}e-6wSVU{4k`F|By^fW5`JS#En W+@C|;0y{SdGQoxrgT-H+y7C7Km2Z#$ delta 1724 zcmZuyX;hO37EQ;FNTHOrjEF56OG!v%3t>%=GKiE(Vv?FrC5AP52iDUg6HL1kYIOnT1z?2q^Bo_pVY@4j=M##(G$ zV*B3FLkA%c2<+PDa`tCI$Lw&Yg2FP!4CCaYPv-2+Ucc%|Xepn7HyEy!P*CQyD0aSs z%MrZ0cd6Gks4y6LZ?8#`n^mH#_idYOiO?i;SAJ0Mdb>*R9GI226R;X;&K^L5MrxY< zRlRfL9FKC3$f?uitvBWjrHQ|o(_OF;e2+|-r62`ig-uG@!gyod2}Bz7S^Dbz#hhHV zva7h&>M_6zWpHldd2k%Mx5km^O{8*K@m6h5N2-O<(GzKqvZWZGGoJgkVg^tmK7r@b zR?Q!o?{K&lgG$SPY{zzk`ZI7$PgS|t4Mv=`KZ#`29Vf~LbrLV!hCW_oBX|d~kE0GT z@XDG`#Xpe8Lwx&7IcHS$aR?k0M#V(hhFpZy6*AD}>3^MhHuQ-+tV0yRt=dUn=7I5n zY30utfH!e(xL0Q&kje;byL`T;lq1HTrj8}j{gY&uLX$wL$S0|LJ7q(1oS4}^wRfvS z7hk)yWq)-ALEP{>9-#@>s*+h~92eKo)7Qksog-B+%9pBZp)B9bT@F{TQCj};OJX%c zE|h&L?hS|AUE;urqbkQXK^TpJ575f9$fV&=_PqSbt64mUnd#j&sw7|(thyy#(OWMw z95__v>d#Q~n&o^WCmDOq)PCEAzmv@DQ0klQE>Vi5)M6?Mcf@lI}SG2de-ij zN^lKuGr;2>h|i3F2hb==4QPCkXn@y9^;Yd zKPtFs^X3bEe3y;jGt9U7$*On3WmChGCOgmFGCGCzR~(j8hA@wRKcSFb@R^&- za}{e7F1bqOM@JM>nNijEaWfNqVRVUwquI+0{&!XWBM1}N<=6UdeW@%pV@GN^PawG| zVyp<~Sv4lRgqUN6cijuG|6dfPYphv=8Ze>!gERG5s%XX|^zYe|+T9bk15=>u^g}j+ zUNCLUGWtnR_HcK?e~L@(y94ej63c+;UZ=3&b4Nv0!f&aZxP9OEo?b^;SKK-A=DFaO zoA=>|eNlOd(_dBcHn$eD8em#@$7|agByl!9KwWIx@=hI|)Ae8lWQi6+s#NKV7>k}a zA2wR9tze347+hdJDFGj$Inis9z#h1(Xz7Ek& zUNLB5gu}gw3;$A*+gvWt&z>G!m*jnjL{A)n4Fyq#*Tm;-_+0o#t1$faFz-%z_wJ*Q zE7k@!9I!wCzM6}!taLcQ9XQx+p?wVkwQ-)ABY|(Y_swjNdbxU_Ts<&h9$r{928;G^ zMxn4M6mS%3!JRU*jrw!=K&bek>Ej?$L%vCkk4>dxQyEG0E2*(b-$BqQ^q+IWD1`|o O4g?oMI@NG8CjWn1>ub{h 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 0a65a67d2d55c79cbe1069325f4258b54306e6b8..3bd309f808aaeb32807f91c057f7f8214fa9b0ff 100644 GIT binary patch delta 1768 zcmZ{lc~FyQ9>=j(uvITjKEA}9iHfIT=sQmXJ_`0&OFaN^UO1!?{A*( z_c`izjP5A5{L5F{O-)Qp`ePfuyk#Hsw-9V_P}JAzh39|2zVC&N*=zmq={CWnQ^P`j zF$wWW9O>4T{Rck|hkJ2R`L-2DTtu7FJGnW<+PfXynzoqH)3iXlV{x`vc?^4befgrU zXeao{6vMeB|6$h8L>_ZeE*FIh9VoJm*=l3g96nbm>vu+OC2Iz8B7kJ0bYe7|?`>SV z{p*E@DMg?7jlm6OiT*%RY(-e)0gAvuhN>w+jiU(I*#o}we#zBLW=7`IEypBzs$j)> zy`WAOBv^7Lq>sRsoqop=-SIF_lNmFP6)%jhMS!V-E-s3ny(1=nI!R9ds6%WiL z0j9Ut{RxzM7sncAc@8GSa`G@aJk&*c^LqzEDSiexv75i;N838tY0Vdfjm3cIWlzm%lLj{$)MLrb@8f>&{n zN2G1Hp!pNzrL8lFw05M-2Sm|_qMcNVT6H*i)~Fo6$dq8N;YV!P=oqk2?y6D{PYwpP zlc}%-9n6<=w9zR|g^d%}DelknSY!53d3j3bui4k%5X7|#A25|$2{ja5;-%m5GhZ97 z?(cMFN{EmkWr99bS}3h-R}?Gx;&W!PcQ+rH%eWeGb6re1=?ocg_giA!0NZficw@4a0(ukLJ%=0= z^UuNR-b1~;vaIo1MY?)cz23vE8R3Cnkbs<5PZawa0+rP`VN)TJ$N{k%LF~oN1?>$q z_?7`PT$HsSO|mB7On1fI zyqTRXq-*9-AAUR^FrDQa>k&dbsubK7a*&syh(r-Ufp+{;4IJhQl~CLx2Oku@AXRtT^4vFTc9>P4m$Z3E)e(8AZ}DLLR5r)=6|~`!J^xH}sb7%a zyZH7xVKu!Ba_AFt?dwBLuub|61xUFO>s|V*ZYIBzRK&wr%KJig>c%0v%+}Hxh zbxQzoRRs5s`XG!b?)!yzr0>6?dzNCNa*9?eYH)cO(UlF##qye>0KGo9YM>fjw2J)r z8fRGNmu4zX)CHVLZhaCuWHDV833%gt7j?TD?cq0wBxRe6?5Fqpwxt}|^Q|JH>fIbZ zjJNmtM2cIWcgBw+Ll@UG1D=*Jb|t(MLD8R#9bryOybn{b5})YJA~E?yXyZ2>Rnmvn z?}Gyw=rPOsO!&y!YU2Q>h3)S8yKcaDt{U$!epUgGf(@?FYlMKDI`L-MTReBY&o=fb*1VI z&vd#qokoV^*=p)vUFVVn;sgV=c950KjWWZ=jtSY3@kGJ1Ip*<4aWMs{d-ZRLXGg;( zsH}63UaSF_zz|dDDZd9kHvN)w$=IIfI@bE(+{ZJ@Z1i}x2s2nXI{vVLW0O+&}e-6wSVU{4k`F|By^fW5`JS#En W+@C|;0y{SdGQoxrgT-H+y7C7Km2Z#$ delta 1724 zcmZuyX;hO37EQ;FNTHOrjEF56OG!v%3t>%=GKiE(Vv?FrC5AP52iDUg6HL1kYIOnT1z?2q^Bo_pVY@4j=M##(G$ zV*B3FLkA%c2<+PDa`tCI$Lw&Yg2FP!4CCaYPv-2+Ucc%|Xepn7HyEy!P*CQyD0aSs z%MrZ0cd6Gks4y6LZ?8#`n^mH#_idYOiO?i;SAJ0Mdb>*R9GI226R;X;&K^L5MrxY< zRlRfL9FKC3$f?uitvBWjrHQ|o(_OF;e2+|-r62`ig-uG@!gyod2}Bz7S^Dbz#hhHV zva7h&>M_6zWpHldd2k%Mx5km^O{8*K@m6h5N2-O<(GzKqvZWZGGoJgkVg^tmK7r@b zR?Q!o?{K&lgG$SPY{zzk`ZI7$PgS|t4Mv=`KZ#`29Vf~LbrLV!hCW_oBX|d~kE0GT z@XDG`#Xpe8Lwx&7IcHS$aR?k0M#V(hhFpZy6*AD}>3^MhHuQ-+tV0yRt=dUn=7I5n zY30utfH!e(xL0Q&kje;byL`T;lq1HTrj8}j{gY&uLX$wL$S0|LJ7q(1oS4}^wRfvS z7hk)yWq)-ALEP{>9-#@>s*+h~92eKo)7Qksog-B+%9pBZp)B9bT@F{TQCj};OJX%c zE|h&L?hS|AUE;urqbkQXK^TpJ575f9$fV&=_PqSbt64mUnd#j&sw7|(thyy#(OWMw z95__v>d#Q~n&o^WCmDOq)PCEAzmv@DQ0klQE>Vi5)M6?Mcf@lI}SG2de-ij zN^lKuGr;2>h|i3F2hb==4QPCkXn@y9^;Yd zKPtFs^X3bEe3y;jGt9U7$*On3WmChGCOgmFGCGCzR~(j8hA@wRKcSFb@R^&- za}{e7F1bqOM@JM>nNijEaWfNqVRVUwquI+0{&!XWBM1}N<=6UdeW@%pV@GN^PawG| zVyp<~Sv4lRgqUN6cijuG|6dfPYphv=8Ze>!gERG5s%XX|^zYe|+T9bk15=>u^g}j+ zUNCLUGWtnR_HcK?e~L@(y94ej63c+;UZ=3&b4Nv0!f&aZxP9OEo?b^;SKK-A=DFaO zoA=>|eNlOd(_dBcHn$eD8em#@$7|agByl!9KwWIx@=hI|)Ae8lWQi6+s#NKV7>k}a zA2wR9tze347+hdJDFGj$Inis9z#h1(Xz7Ek& zUNLB5gu}gw3;$A*+gvWt&z>G!m*jnjL{A)n4Fyq#*Tm;-_+0o#t1$faFz-%z_wJ*Q zE7k@!9I!wCzM6}!taLcQ9XQx+p?wVkwQ-)ABY|(Y_swjNdbxU_Ts<&h9$r{928;G^ zMxn4M6mS%3!JRU*jrw!=K&bek>Ej?$L%vCkk4>dxQyEG0E2*(b-$BqQ^q+IWD1`|o O4g?oMI@NG8CjWn1>ub{h diff --git a/sprites/spr_pack_brazier3/spr_pack_brazier3.yy b/sprites/spr_pack_brazier3/spr_pack_brazier3.yy index 761348fb9e..fa3e050e61 100644 --- a/sprites/spr_pack_brazier3/spr_pack_brazier3.yy +++ b/sprites/spr_pack_brazier3/spr_pack_brazier3.yy @@ -2,10 +2,10 @@ "$GMSprite":"v2", "%Name":"spr_pack_brazier3", "bboxMode":0, - "bbox_bottom":99, + "bbox_bottom":119, "bbox_left":92, "bbox_right":188, - "bbox_top":38, + "bbox_top":58, "collisionKind":1, "collisionTolerance":0, "DynamicTexturePage":false, @@ -16,7 +16,7 @@ ], "gridX":0, "gridY":0, - "height":282, + "height":322, "HTile":false, "layers":[ {"$GMImageLayer":"","%Name":"23f60daa-fe76-4e85-9875-adbeb4cce378","blendMode":0,"displayName":"default","isLocked":false,"name":"23f60daa-fe76-4e85-9875-adbeb4cce378","opacity":100.0,"resourceType":"GMImageLayer","resourceVersion":"2.0","visible":true,}, @@ -63,18 +63,22 @@ "playbackSpeedType":1, "resourceType":"GMSequence", "resourceVersion":"2.0", + "seqHeight":322.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":"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,}, + {"$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,}, ],"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":61, + "yorigin":81, }, "swatchColours":null, "swfPrecision":2.525, diff --git a/sprites/spr_pack_devastator/979ae0e5-f063-4c2b-a97a-acb0b32a860f.png b/sprites/spr_pack_devastator/979ae0e5-f063-4c2b-a97a-acb0b32a860f.png index da05951c0de295be051733ab4bd98ac19dcb8120..7e2d28440914bd2b49dc1488842a95ff49f7f4ed 100644 GIT binary patch delta 1065 zcmZ3%b((8}IF}O#8v_Hw_RVwlOjLB#w)1px45_&F_V#%{B~Kal5AxQF=gsMDKj`B7 zjgcp=qVcBf#}jkP_Vk$h9h=yzHu(v&Pa?VO6Sg<6U*9h|Gj>U{aWkf+hrds&c1!T%se5u?Qo*YANgfvyJZhQ z{9xMCd{AM#-{OzP!JeOr9c*oF&+5+KX1q2otG@pK*UjyR6J_M(-Pd2QjxDdL+4J)5 z*3dHD`YWDN4>H-B9sm4$>h0q4=kt#rdCB|heu)SQ#_Q{=H`P{GN3WQ>r8hr3{NvBh z&+ix=erN!6*O#ijDm~YX|89E8yJA&jquy$tiDom->$O%r(}+!dnIYRf|H!+ZSgx-z zmog8oIxUjf{PWGJIlDe+)K*nV-Cwuv(a)bd3m#Xhcd6H_tAG6ZX;Z*oAXxeNrB3nd zq%zej#h%R9vbHX|{npLJW%=dK*RNmiymgZM_oiH<+j>6sVzZjl4vPz3d|S5oYL@O+ zMb+(@dA6>1o#*Z;S5~R+-Q{&D)2+%`?fi=Prn!sXEsVSI^=oN~)!ge(jh1n(&Y0}^ z?8^HSZ5!5nSi8vgUcJyO$!DB#7t`%pD!2OBub7)FyV7>v%=deRkI%hnep}>K%A@Iq zy?6IWP4J05A#vM$E8h>Z7OTp?feR9pgSTCC*Sq|D%X-hoqQ#rG-g6D*FWuC)u>6nJ z*VCtgfhi*+vu5dJe}Dgt+qZvDyQ?*S;W-tn&W`(T-Sz92Zq5#P8n9lq{(_*OxVX6R z>uaUXX_Nmm82n26t(|3-6mEKjo4u-rE9l7CvuBT4Rn^ze-~I2;pFIWApTC)BZ`q&q zwPA{P)fGQc=e=LHC|keT^Zk#Dtd6nQ@=50Ux7T+q)bq{l3+k)eAD{J~kDuTC?$S#k zx>uIYmC-ZWeorm+`}>c-zi+v@HhgP+z~M_Rvu>??rMfq!{>!Y^Q-5#n>+YBpyIjiH z?(2;5`&S~b_Eo+#kGa%*zvHC4^Y6cPGP1I{yUy>FlanjjZk|;7oVyoj)8OrnZ_{9~0vv$SYi~gt)+pfQ9i~ZEE$um!# zP1F2*_C#@cx%k<%&u2faxN~Gz$={5fSL`=Tft7*5+)HhKC>nC}Q!>*kacg+fZ}$nPK?80>NoH=UesM`+ZUJshyJyMk0yQys My85}Sb4q9e0NQQ{SO5S3 delta 1052 zcmX@jwSsGcIF|qi8v_Hwx38uS6BQk`r9E97Ln>~)y?x$K$y0{?gS_?Pd2@Q(54!k# zW8{geXuN6r^TfQeJw4`rM<({F)lay1;|p7khf!*6^0D8Wb%N`|?#9}N72iH8JGI1W z?j7@8ck^6a=FFR?ccoze{rDYqQRT)#HVed27PrdE%!)yum zX2-m_ZjaNKO?vXY;a1kxqSMRY`mCOQ>;C=vzi%EENE|q{rGRm?h=Ah5swr;woFe;d1fw{NVUZ|CZAoeB5v-4n}F&wYIRYiZ5DKbG6i z6j=25Ef>CCr@{>on8{P z;gyl=tpvN>M$7eVytYTJ{ZUpcd;a|SR_XKBfi{-)mYwUv!&_gyfB)Wpu7CQ>Xz|V3 z3+H)DZ7ACJk$d=eGN9T$Zy} z-sL-0UAx+?D&M<#e3L4jy5w@tmo}eyf%{pk-S0Z@-4M5490=B*PW2HDyQnt#%*y){ zc@rZaM!U}5Q?Gi(_>AzLMdxccK4;CW3$VUz6;y3we7{<~&w6wIHq9$1kLV{$?XEOc zn7M0$;kNuN*$=rKrJsH+b~xy^EN5+h%(C;D@spXJx}|3C?OrAKDn-`${g2XDK&N+f zSXfv@c&pE!H!mqa|NYrrp?1!5JxhcH_xFnZkMmByzTnitIPdxe%1YU(S9DzmjugUDgV5zArySmUPUXJ-fH`%fEki<$rJ9jC^SJ>}~$FjQXpu7&WJV zSut0ut?Ff_d)bZ3_dh$WBGRV#spiLRix+i{opnoQsm$NH{a60U%E{&J@?N?!YK6D8 zWlT!mUf)yi?mzziK67*Q`mFkeZA&>#w+3JJuG;zUg&FtM-pngpD*R_Si-(vaB_d!x8Hv)tgLR8%rCaJv3Zi0f8^CUaVemU;iA?blskU}l&QZq z%35!5;s3E|wZ;C)e!i=&G^R{mCGo0%ao}Q;(w%#@KMLH%7oU<@ul4%4(bU;zHJ{C% z`25{Fy;*0U&3+oVv$OQ&uZu-1>l2jaH_f;Gw{!D0!`(J<^^RL-R!#oMyre$B^*`ew zE4#i8<-wuAJf~XX8c~vxSdwa$T$Bo=7>o>zOmq!^$RfnR(#pWp%Ft5Vz`)AD;M0l6 z`%pCG=BH$)RpQprJT;mLs6hj6LrG?C>SP&KPBrWnTxqDf3sleG>FVdQ&MBb@0A#E6 A=Kufz diff --git a/sprites/spr_pack_devastator/b1e913d3-e6e0-41c1-9cdd-2e2fb3b41530.png b/sprites/spr_pack_devastator/b1e913d3-e6e0-41c1-9cdd-2e2fb3b41530.png index a400be32ad87a93afd230f41f011fe5d71264c3c..3b02905e3aa5492ca3790dc139f7be2f03b175be 100644 GIT binary patch delta 1090 zcmdnYb)9R1IF}O#8v_Hw_RVwlOjLCA_40Ia45_&F_V#|i#~w25AL8GMt+*k~>Zs)L zoq=Q4o&)bfZH%ruZZ27=B$wdNsL8=88_l@;lc>0}lgu1@zc&{1{h7u#h$fdmP#_=yotONxMOG-?_5ATi3 zfA=f%?wsV?M_!w5_D_{}i2U`p&gGB%va;Q>f9w96_L!TS&n%Vd-R`4$@^-_mtgS|; zm%sH{HT~ATdv&$%>-NjDv$J1(SrYeMRz_w@?XGL5mbF^ddotUcJbTu+=I*(k{eR^ZU{d@QPuKL|Nwte;L8~5*@*SY-u`{KKK?#nNG9?F>ediy5+ z1*<+W#fHqxyp>=!TjbT9z+I;GnetEZPqM)wbK1%*lN-H z>()K``LpuXvCVlR{QUg&j~{(1TJ`Jp?c2i7FCRX$cKK$_h4Vb6HcXy8*}~qwzoTRG z=FKn4b{lV%NCuTLF>9)!Cc?;ex^t1b=lv2^V z%j;66+pkuiX^#6@tex*V+iuU>E}fp9zW%nWkLa|EYLCyXv^S7BwCK?G9y7^$)hm{1 zocFezui^MyG_x+i`n6S1wT zmYiL;w|-Ttl$hF;D}JHVzZliN_1V6x`l8?U8QEKdOdtKd@_4;p@v5r&?e9<7eObEt zmT3GTalMyM^LuQiZoU4Rl%K!;ja_YBLKty!;C_8{HmQ}xHYYmTqj zd&J>?m+9{(^N!4!6>^Z-vl8emf5G1Pqh^u)Pxq?!UwZxD%<$W_`KNyE^mv-K+0y9K zox68kH{X=GDK|y>_Vjo1IpTlV#RQuJ4Qt~)y}i-zv4;%%gZg)3D{ct0cCvVU zXW*E%=fJyAo1#_CX)l8mildJUPc7Mf_l)?jzjZDyGBPrIRzEzL@ZsIB z`pmm?lB18mHr?(I)EC-zIML;g{Ib05(uW^@udDg$yY}y&A8D7H z9=7+&vuDpfSM#?Yeo*M#ixE$I4{d>OI zx8u*x3knuim6?gYdHwpe)7vGvHP-h1ckkXkV|2Lwp~0@Zd0&42Rq465vu^b-hF4np z7gDEcUSj(kxjf)`-=)%Neb+wzn|)*JM!$vgysdO2%4RC%8q6=987wZh^!xYkk8l61 zw6U`j%d>gyR+yi!?|1$j*VX%X?#!{AFPEMdduCTlm0sq7zP`Ri*I&E3965Q?GbSeH z%vHaz8{)Z>YhKqI{H?eyQ({viD7ZIHAE->sYQm)3CfnyNe7Vr?-Y=z;n%-T0monXc zwfam8+|Od|eA)SLp18PpVNubiJ+a3^5+!qu&d&M8`&dy&yXJJpWKXBL$@3nF);@Ed zG5z$H=3|jpC*FEI^X9!>g)y^>H+wDgGpe6^A?o??{_*sEL+6g+@$}H)+=@o94 zUtdL3?mvB+nku_@@7}X_>MJVhBX;!utg_B5*(UY1VT!7))bhTCdWp9_8hzOF^^c3N zj*-{$XFG)BIZJs;JEe-}F5_Wq4yxY1cW-Rzbg$s;0n;mrE&kuBnmXm~?%(qEm(s%H z?mF>u3uj3!U*}ylbKke_wJ+zDT{eB@wl>7K!uIQr)%W#6-oJn6d$oOEN$KuK-aqOO zsqX!=cBQ*Bd$Z%4H*Z4jKKCgvFQ0i_dgGqmt=Eq9UkyFZ_ov6BPJjRGvl3gUOT38R zm^A;+<{810wJH@>`pG)~)m-#-^&Pd@8~1E~5?J-s{#e|v;AngCm3Q*CtGmscJ$rV> z_S?d@7Z(NpzVvtT+e!ZqC?%O_Eqnj>SMBG%!kXXgrGLw_&Rk)h%*e91zQO7j|1=-F zzTfX_3V>NjwZt`|BqgyV)hf9t6-Y4{85o)98XD*tT80>!S{a#G8JcJt7+4t?v>i>U zLeY?$pOTqYiCe?>8F!8WHE6(XD9OxC)h{kd%q_sJX+iH_NuVYMPgg&ebxsLQ0Att{ A2LJ#7 diff --git a/sprites/spr_pack_devastator/e5637504-add9-474b-ae10-1e954d497810.png b/sprites/spr_pack_devastator/e5637504-add9-474b-ae10-1e954d497810.png index 6bbdaf14124cc2d8240f102452be71f4ba66ff84..364ec1460b9b58ffe9426ff9ff3429f73244d663 100644 GIT binary patch delta 928 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 My85}Sb4q9e0NQQ{SO5S3 delta 1052 zcmX@jwSsGcIF|qi8v_Hwx38uS6BQk`r9E97Ln>~)y?x$K$y0{?gS_?Pd2@Q(54!k# zW8{geXuN6r^TfQeJw4`rM<({F)lay1;|p7khf!*6^0D8Wb%N`|?#9}N72iH8JGI1W z?j7@8ck^6a=FFR?ccoze{rDYqQRT)#HVed27PrdE%!)yum zX2-m_ZjaNKO?vXY;a1kxqSMRY`mCOQ>;C=vzi%EENE|q{rGRm?h=Ah5swr;woFe;d1fw{NVUZ|CZAoeB5v-4n}F&wYIRYiZ5DKbG6i z6j=25Ef>CCr@{>on8{P z;gyl=tpvN>M$7eVytYTJ{ZUpcd;a|SR_XKBfi{-)mYwUv!&_gyfB)Wpu7CQ>Xz|V3 z3+H)DZ7ACJk$d=eGN9T$Zy} z-sL-0UAx+?D&M<#e3L4jy5w@tmo}eyf%{pk-S0Z@-4M5490=B*PW2HDyQnt#%*y){ zc@rZaM!U}5Q?Gi(_>AzLMdxccK4;CW3$VUz6;y3we7{<~&w6wIHq9$1kLV{$?XEOc zn7M0$;kNuN*$=rKrJsH+b~xy^EN5+h%(C;D@spXJx}|3C?OrAKDn-`${g2XDK&N+f zSXfv@c&pE!H!mqa|NYrrp?1!5JxhcH_xFnZkMmByzTnitIPdxe%1YU(S9DzmjugUDgV5zArySmUPUXJ-fH`%fEki<$rJ9jC^SJ>}~$FjQXpu7&WJV zSut0ut?Ff_d)bZ3_dh$WBGRV#spiLRix+i{opnoQsm$NH{a60U%E{&J@?N?!YK6D8 zWlT!mUf)yi?mzziK67*Q`mFkeZA&>#w+3JJuG;zUg&FtM-pngpD*R_Si-(vaB_d!x8Hv)tgLR8%rCaJv3Zi0f8^CUaVemU;iA?blskU}l&QZq z%35!5;s3E|wZ;C)e!i=&G^R{mCGo0%ao}Q;(w%#@KMLH%7oU<@ul4%4(bU;zHJ{C% z`25{Fy;*0U&3+oVv$OQ&uZu-1>l2jaH_f;Gw{!D0!`(J<^^RL-R!#oMyre$B^*`ew zE4#i8<-wuAJf~XX8c~vxSdwa$T$Bo=7>o>zOmq!^$RfnR(#pWp%Ft5Vz`)AD;M0l6 z`%pCG=BH$)RpQprJT;mLs6hj6LrG?C>SP&KPBrWnTxqDf3sleG>FVdQ&MBb@0A#E6 A=Kufz diff --git a/sprites/spr_pack_devastator/layers/b1e913d3-e6e0-41c1-9cdd-2e2fb3b41530/330f878c-cc0f-48bf-a507-68961e6c03cd.png b/sprites/spr_pack_devastator/layers/b1e913d3-e6e0-41c1-9cdd-2e2fb3b41530/330f878c-cc0f-48bf-a507-68961e6c03cd.png index a400be32ad87a93afd230f41f011fe5d71264c3c..3b02905e3aa5492ca3790dc139f7be2f03b175be 100644 GIT binary patch delta 1090 zcmdnYb)9R1IF}O#8v_Hw_RVwlOjLCA_40Ia45_&F_V#|i#~w25AL8GMt+*k~>Zs)L zoq=Q4o&)bfZH%ruZZ27=B$wdNsL8=88_l@;lc>0}lgu1@zc&{1{h7u#h$fdmP#_=yotONxMOG-?_5ATi3 zfA=f%?wsV?M_!w5_D_{}i2U`p&gGB%va;Q>f9w96_L!TS&n%Vd-R`4$@^-_mtgS|; zm%sH{HT~ATdv&$%>-NjDv$J1(SrYeMRz_w@?XGL5mbF^ddotUcJbTu+=I*(k{eR^ZU{d@QPuKL|Nwte;L8~5*@*SY-u`{KKK?#nNG9?F>ediy5+ z1*<+W#fHqxyp>=!TjbT9z+I;GnetEZPqM)wbK1%*lN-H z>()K``LpuXvCVlR{QUg&j~{(1TJ`Jp?c2i7FCRX$cKK$_h4Vb6HcXy8*}~qwzoTRG z=FKn4b{lV%NCuTLF>9)!Cc?;ex^t1b=lv2^V z%j;66+pkuiX^#6@tex*V+iuU>E}fp9zW%nWkLa|EYLCyXv^S7BwCK?G9y7^$)hm{1 zocFezui^MyG_x+i`n6S1wT zmYiL;w|-Ttl$hF;D}JHVzZliN_1V6x`l8?U8QEKdOdtKd@_4;p@v5r&?e9<7eObEt zmT3GTalMyM^LuQiZoU4Rl%K!;ja_YBLKty!;C_8{HmQ}xHYYmTqj zd&J>?m+9{(^N!4!6>^Z-vl8emf5G1Pqh^u)Pxq?!UwZxD%<$W_`KNyE^mv-K+0y9K zox68kH{X=GDK|y>_Vjo1IpTlV#RQuJ4Qt~)y}i-zv4;%%gZg)3D{ct0cCvVU zXW*E%=fJyAo1#_CX)l8mildJUPc7Mf_l)?jzjZDyGBPrIRzEzL@ZsIB z`pmm?lB18mHr?(I)EC-zIML;g{Ib05(uW^@udDg$yY}y&A8D7H z9=7+&vuDpfSM#?Yeo*M#ixE$I4{d>OI zx8u*x3knuim6?gYdHwpe)7vGvHP-h1ckkXkV|2Lwp~0@Zd0&42Rq465vu^b-hF4np z7gDEcUSj(kxjf)`-=)%Neb+wzn|)*JM!$vgysdO2%4RC%8q6=987wZh^!xYkk8l61 zw6U`j%d>gyR+yi!?|1$j*VX%X?#!{AFPEMdduCTlm0sq7zP`Ri*I&E3965Q?GbSeH z%vHaz8{)Z>YhKqI{H?eyQ({viD7ZIHAE->sYQm)3CfnyNe7Vr?-Y=z;n%-T0monXc zwfam8+|Od|eA)SLp18PpVNubiJ+a3^5+!qu&d&M8`&dy&yXJJpWKXBL$@3nF);@Ed zG5z$H=3|jpC*FEI^X9!>g)y^>H+wDgGpe6^A?o??{_*sEL+6g+@$}H)+=@o94 zUtdL3?mvB+nku_@@7}X_>MJVhBX;!utg_B5*(UY1VT!7))bhTCdWp9_8hzOF^^c3N zj*-{$XFG)BIZJs;JEe-}F5_Wq4yxY1cW-Rzbg$s;0n;mrE&kuBnmXm~?%(qEm(s%H z?mF>u3uj3!U*}ylbKke_wJ+zDT{eB@wl>7K!uIQr)%W#6-oJn6d$oOEN$KuK-aqOO zsqX!=cBQ*Bd$Z%4H*Z4jKKCgvFQ0i_dgGqmt=Eq9UkyFZ_ov6BPJjRGvl3gUOT38R zm^A;+<{810wJH@>`pG)~)m-#-^&Pd@8~1E~5?J-s{#e|v;AngCm3Q*CtGmscJ$rV> z_S?d@7Z(NpzVvtT+e!ZqC?%O_Eqnj>SMBG%!kXXgrGLw_&Rk)h%*e91zQO7j|1=-F zzTfX_3V>NjwZt`|BqgyV)hf9t6-Y4{85o)98XD*tT80>!S{a#G8JcJt7+4t?v>i>U zLeY?$pOTqYiCe?>8F!8WHE6(XD9OxC)h{kd%q_sJX+iH_NuVYMPgg&ebxsLQ0Att{ A2LJ#7 diff --git a/sprites/spr_pack_devastator/layers/e5637504-add9-474b-ae10-1e954d497810/330f878c-cc0f-48bf-a507-68961e6c03cd.png b/sprites/spr_pack_devastator/layers/e5637504-add9-474b-ae10-1e954d497810/330f878c-cc0f-48bf-a507-68961e6c03cd.png index 6bbdaf14124cc2d8240f102452be71f4ba66ff84..364ec1460b9b58ffe9426ff9ff3429f73244d663 100644 GIT binary patch delta 928 zcmV;R17G~F3epOY7YafM1^@s6x3iqQks(0=MUi7U5>AK{JI?nNfE~}oWB)Q4k4*%V z;R6(ZK#>|{??6eC57swwUeB{g`Mk25damZSi3ciax7(R7bUK}gh&Vnz{#3=?ZuisW z)3Q1Hwu$F!ZePmYfwJ`b{fKxCQ@h=ce!o8qW3SiCEYoPbWhzPDI@D&fnYn#h&qw7_ z+uPg2_wM)mad>zbola-C?(p!i?8CKIHZ9bDNgCjf^m@Jc{_R^tMEv{sIJL6BzJ85} zh>Oe1iD2K}-p*7{TE~y8tJvS)&)lZp??=1cj!vhOgx)&WA7$@ARpkY`sBLDcgZXSy zsB?SiDocCo`20oe#@M7#&m|oeEPI<->R>*bGNzunmu@zj@#E?$o}Zs*t~~2P@#yG( zC@wB9XDYwFz5U^MdX%yCY&Ip-b4df%YPI70{5&Ee&d$!_`ucjVda}a4Xr1KSgyF}h z#-O9&i-C5>HyDu;R{fsTkcJw2URx2hX5<^BUe z5)qA`QL`Sqs-a#W(C>#J`EG7*N^9u-{e9;8larG3e6kIo*qPI>%hAnW}fjhaU4EoBFES8DGK;m-OT} zCLRs#cDu2+w^w$XGd(;!WbW_qFfHYJp)vfi&Z^je-x0~5V8u7HF1_~B0{vgC**Et` zjHyW#+>w;0ilP28=rsydm+8Hw_R@9u8hdR`**h@B??nn992|`GJa>0@ad2=jwmjHw zVqLm^uw3v5EFuQIV*1|i-#2d`N0;B1|D@UsJ(J-Bpp)vkIlKs9cKovb1 zYpU48RDLGZDnI{f^Lfg7?cFP%uiD^i6X3b~?zx(UmtVTL9QpY1<8rNcWxMC=&7XGm z=5}A3_}1FUuY7B~_TTUCxNflZ_S+ZVe;+pZR<-wxQSY(nWs{z)bgDB^hkd(# zeZ8PyVPU1E;G5gGZ_j+?`T9p;sp#+Dzh~b5^80Vb_S--+CS8br{ww*abwFrkqh9vx z$X5$y_;Quz>BpvK=F86C-*H!Bw#X}|ONj>;ZJ)W6uj}R%!>{#c_LgkE*&`nw{_)Qr zo8qUD;$80U?jU=Df4+VDmjC$W#XW1&H)}4`Q{jzReYNZJ=g%D-7S`6?uV24*`kK;O zd(Z0RcFx27{=JUwhs6a8>+0mzhGnml)!gZq{F?uY?Uj>Tq!kwzUkRPWXM9Q8D3a~1 z&>Nmo{;$hpZPxOxg?foMK3@CiQ(d=6?%B(w^}(J~0z6Yg46mrJI$JsG!>>f$ z^|iZq?_Ql3l(|amm5@GPcmLY!-aFs^{`%T*ZOPkE-75y>3zwCxvRXR*Wp(;C%e&oW zR>xyj&s1<`vmKB-!0 z_-Es}RW};$3!a>x@YH;>-rjGAnEuAExoQ60y=SH8)H@T`_=!6IO}&skWrg15YVNm7 zUw<(Dc57DX`vW5TpKI0>6c}9leCO`nqX!QjyzwbvcW3F#Uk8g$%5Uh9_|o;VdVl@> zJ+(5ib@BfuXBmH){E>MH&w{Rh?0I2!eQCaeA(J<-h)bF18UT?+h=HY*fvJ_DrM7{A zm4U&h6OZ>ze#jyog":"","Keyframes":[ - {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"e5637504-add9-474b-ae10-1e954d497810","path":"sprites/spr_pack_devastator/spr_pack_devastator.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"6ab86151-8a87-45d0-9c06-4741f1b23ffd","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"979ae0e5-f063-4c2b-a97a-acb0b32a860f","path":"sprites/spr_pack_devastator/spr_pack_devastator.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"25804a20-d9f7-4f58-aede-581f282f1199","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"b1e913d3-e6e0-41c1-9cdd-2e2fb3b41530","path":"sprites/spr_pack_devastator/spr_pack_devastator.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"a2d952f8-77b2-4fde-92ee-dce364d06519","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"e5637504-add9-474b-ae10-1e954d497810","path":"sprites/spr_pack_devastator/spr_pack_devastator.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"6ab86151-8a87-45d0-9c06-4741f1b23ffd","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"979ae0e5-f063-4c2b-a97a-acb0b32a860f","path":"sprites/spr_pack_devastator/spr_pack_devastator.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"25804a20-d9f7-4f58-aede-581f282f1199","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"b1e913d3-e6e0-41c1-9cdd-2e2fb3b41530","path":"sprites/spr_pack_devastator/spr_pack_devastator.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"a2d952f8-77b2-4fde-92ee-dce364d06519","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_jump/spr_pack_jump.yy b/sprites/spr_pack_jump/spr_pack_jump.yy index 408b8188f3..13fab30df9 100644 --- a/sprites/spr_pack_jump/spr_pack_jump.yy +++ b/sprites/spr_pack_jump/spr_pack_jump.yy @@ -65,14 +65,22 @@ "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":"c5bc43cd-b567-4673-92b9-efede7a0b44f","path":"sprites/spr_pack_jump/spr_pack_jump.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"232f2f80-aef0-425c-91c6-b057a1e4eab0","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"f9fc03b0-0d35-4e00-b5c9-7c857679e38b","path":"sprites/spr_pack_jump/spr_pack_jump.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"fb16272d-2add-47a5-895f-f9827024011d","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"777ae2eb-75f6-4a1f-8633-057327b9a258","path":"sprites/spr_pack_jump/spr_pack_jump.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"02d8ecc3-ce99-4de6-a06b-f69ff1bfe13e","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"c5bc43cd-b567-4673-92b9-efede7a0b44f","path":"sprites/spr_pack_jump/spr_pack_jump.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"232f2f80-aef0-425c-91c6-b057a1e4eab0","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"f9fc03b0-0d35-4e00-b5c9-7c857679e38b","path":"sprites/spr_pack_jump/spr_pack_jump.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"fb16272d-2add-47a5-895f-f9827024011d","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"777ae2eb-75f6-4a1f-8633-057327b9a258","path":"sprites/spr_pack_jump/spr_pack_jump.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"02d8ecc3-ce99-4de6-a06b-f69ff1bfe13e","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_psy_hood_alpha/8d214563-cc0c-4310-a5c4-13f0a699a86f.png b/sprites/spr_psy_hood_alpha/8d214563-cc0c-4310-a5c4-13f0a699a86f.png new file mode 100644 index 0000000000000000000000000000000000000000..daf953e57656b974d940c396498049fc54c69cea GIT binary patch literal 1496 zcmbu9dr;B|5XXPckv*-j>oU{Ky3@K$zyuVdG%-_y%+$o9G++6^7vzh4blFHnU&S!W3+8f?DccXQt z>i_^S@;Hw1(Q7#X7#v+=sLu)}IwSS6E9AHj768($03a(H02cM7tO)?P3HL-I{VZieZ%mgmpcad^3|Vm%ku#M#Ph(o_@)ee8gz*r2>j7-WUQQ(_2#N)@LcQP z^$g`6AA~XE-tob<$J_)bKGnu@>QD2aW;hI_TG!_|Y+Zs{FvX3?B+*+c!20RmXQkc* zP8K-&j@cPq$ynd4wr;)2qul|W7dZs<&g2eJ^3Ii#ln(ZW*H1TY=GP(ihV9aB)G=3B zi_Eu&TJ%S^B2Gw~ zZ8RV?Y*d~=S$6GCS6pqY*p{%oR#+a<>1e{lF{o6g*iX^t>xZ$I!hYA~YHJTKihDxd zxpJn1yA3tjsKoZe*X`qW_z8yzL&Hu)xjF07!9Y;;(Dn=Nal<2;aoNw;tNihzpfV8Xe?hwi0p{2PxGmvXZqz?L9U6CY4@95_vn1CAe%ZFFux_&chDy+;V>2AnQUphfEZ^5*Up$EWfe5dE-|8nL_l#46Nqd zSO+DYk^hSHpgjl?hp>H`Uc;{6pUkoe(}g0yVD;xijaNP!gTZezbOYujrKn76SH@b~?-H#E zFV8q{tH@->Hk=Ldmp9>y$sOSgFo?l0nuxuP4-4ekOP@a*&Fkztf34zuY7!n55y#yQ zTe;(#B+yKu2XCBu5P$4lZExb~%K39X*GZny4f}*?wvkQv^YOVRnaE$ABK+~aP;7rX zGeZ7Mr$a`6#BtEQX@cEY8GY2Wrn+H6)K8I3jxF$Wnj;{OEx005+MDX&v}pc~>fy2g zwZ(n;!=lkl8M1|D@O{7Ff6!KA$X5n&&vY;BJ@xc2WVZlvXfQbp6_OaH7r+i`2R{IX zAFzY^!r&+<6a}^0|20C{W`ZC70}$gvBg0d_4e(r&-|B(A|85{h62nO3U}F5Y8M?23 Qke&fN+;Ethqd~v@1NP>Q>;M1& literal 0 HcmV?d00001 diff --git a/sprites/spr_psy_hood_alpha/layers/8d214563-cc0c-4310-a5c4-13f0a699a86f/5a4891da-2115-41b1-bd6d-0a3eab1e83f7.png b/sprites/spr_psy_hood_alpha/layers/8d214563-cc0c-4310-a5c4-13f0a699a86f/5a4891da-2115-41b1-bd6d-0a3eab1e83f7.png new file mode 100644 index 0000000000000000000000000000000000000000..daf953e57656b974d940c396498049fc54c69cea GIT binary patch literal 1496 zcmbu9dr;B|5XXPckv*-j>oU{Ky3@K$zyuVdG%-_y%+$o9G++6^7vzh4blFHnU&S!W3+8f?DccXQt z>i_^S@;Hw1(Q7#X7#v+=sLu)}IwSS6E9AHj768($03a(H02cM7tO)?P3HL-I{VZieZ%mgmpcad^3|Vm%ku#M#Ph(o_@)ee8gz*r2>j7-WUQQ(_2#N)@LcQP z^$g`6AA~XE-tob<$J_)bKGnu@>QD2aW;hI_TG!_|Y+Zs{FvX3?B+*+c!20RmXQkc* zP8K-&j@cPq$ynd4wr;)2qul|W7dZs<&g2eJ^3Ii#ln(ZW*H1TY=GP(ihV9aB)G=3B zi_Eu&TJ%S^B2Gw~ zZ8RV?Y*d~=S$6GCS6pqY*p{%oR#+a<>1e{lF{o6g*iX^t>xZ$I!hYA~YHJTKihDxd zxpJn1yA3tjsKoZe*X`qW_z8yzL&Hu)xjF07!9Y;;(Dn=Nal<2;aoNw;tNihzpfV8Xe?hwi0p{2PxGmvXZqz?L9U6CY4@95_vn1CAe%ZFFux_&chDy+;V>2AnQUphfEZ^5*Up$EWfe5dE-|8nL_l#46Nqd zSO+DYk^hSHpgjl?hp>H`Uc;{6pUkoe(}g0yVD;xijaNP!gTZezbOYujrKn76SH@b~?-H#E zFV8q{tH@->Hk=Ldmp9>y$sOSgFo?l0nuxuP4-4ekOP@a*&Fkztf34zuY7!n55y#yQ zTe;(#B+yKu2XCBu5P$4lZExb~%K39X*GZny4f}*?wvkQv^YOVRnaE$ABK+~aP;7rX zGeZ7Mr$a`6#BtEQX@cEY8GY2Wrn+H6)K8I3jxF$Wnj;{OEx005+MDX&v}pc~>fy2g zwZ(n;!=lkl8M1|D@O{7Ff6!KA$X5n&&vY;BJ@xc2WVZlvXfQbp6_OaH7r+i`2R{IX zAFzY^!r&+<6a}^0|20C{W`ZC70}$gvBg0d_4e(r&-|B(A|85{h62nO3U}F5Y8M?23 Qke&fN+;Ethqd~v@1NP>Q>;M1& literal 0 HcmV?d00001 diff --git a/sprites/spr_psy_hood_alpha/spr_psy_hood_alpha.yy b/sprites/spr_psy_hood_alpha/spr_psy_hood_alpha.yy new file mode 100644 index 0000000000..e4ced4a905 --- /dev/null +++ b/sprites/spr_psy_hood_alpha/spr_psy_hood_alpha.yy @@ -0,0 +1,92 @@ +{ + "$GMSprite":"", + "%Name":"spr_psy_hood_alpha", + "bboxMode":0, + "bbox_bottom":145, + "bbox_left":57, + "bbox_right":106, + "bbox_top":101, + "collisionKind":1, + "collisionTolerance":0, + "DynamicTexturePage":false, + "edgeFiltering":false, + "For3D":false, + "frames":[ + {"$GMSpriteFrame":"","%Name":"8d214563-cc0c-4310-a5c4-13f0a699a86f","name":"8d214563-cc0c-4310-a5c4-13f0a699a86f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + ], + "gridX":0, + "gridY":0, + "height":322, + "HTile":false, + "layers":[ + {"$GMImageLayer":"","%Name":"5a4891da-2115-41b1-bd6d-0a3eab1e83f7","blendMode":0,"displayName":"default","isLocked":false,"name":"5a4891da-2115-41b1-bd6d-0a3eab1e83f7","opacity":100.0,"resourceType":"GMImageLayer","resourceVersion":"2.0","visible":true,}, + ], + "name":"spr_psy_hood_alpha", + "nineSlice":null, + "origin":9, + "parent":{ + "name":"gear", + "path":"folders/Sprites/Marine Viewer/gear.yy", + }, + "preMultiplyAlpha":false, + "resourceType":"GMSprite", + "resourceVersion":"2.0", + "sequence":{ + "$GMSequence":"v1", + "%Name":"spr_psy_hood_alpha", + "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_psy_hood_alpha", + "playback":1, + "playbackSpeed":30.0, + "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":"8d214563-cc0c-4310-a5c4-13f0a699a86f","path":"sprites/spr_psy_hood_alpha/spr_psy_hood_alpha.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"51ba9fd0-369a-4be7-b5c8-f8d75c8a38d9","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":90, + }, + "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_psy_hood_alpha2/e8a1632c-8084-4d13-8d30-4732feda986c.png b/sprites/spr_psy_hood_alpha2/e8a1632c-8084-4d13-8d30-4732feda986c.png new file mode 100644 index 0000000000000000000000000000000000000000..45fafcc7861058d7469ac40e93380fa662edf987 GIT binary patch literal 1506 zcmbu9dsNZ~6vuxqb@|FDtu)iJ(@Qi_d}XMm_?%E$C2E)xKZWs&gxhfh79Qy?hMqijrvxN#?q@Mie#Ay!^F zGq1dwhTX#Hd%@?jO$?#1$r3_X>Ri8dPb$dUW<)SZ4ib%8?5j#M;Px2MX+T82NJBh%tZe z)smSE-K-@iw_L64gAX= z-gNxI5lcK8-ZIcD37Q_LDkh!*J(MBhfK6K4{#qMEU+y3Lel&0__brV19*G%@CcT6~ zL!3-Bw<;_nmWxxONe4sPC1xB{uilfOyHxuT`pD z&dz7`%K-sX&*r7m&WqZ)BshFFr+qY2gqEET<#tfQIyyUhCNS2) zMMe~ebKBEI@*bT|R}&DjS0pD1jGF3`4$QpwAD@`84&utx2YFhSi{jSImC2E)xKZWs&gxhfh79Qy?hMqijrvxN#?q@Mie#Ay!^F zGq1dwhTX#Hd%@?jO$?#1$r3_X>Ri8dPb$dUW<)SZ4ib%8?5j#M;Px2MX+T82NJBh%tZe z)smSE-K-@iw_L64gAX= z-gNxI5lcK8-ZIcD37Q_LDkh!*J(MBhfK6K4{#qMEU+y3Lel&0__brV19*G%@CcT6~ zL!3-Bw<;_nmWxxONe4sPC1xB{uilfOyHxuT`pD z&dz7`%K-sX&*r7m&WqZ)BshFFr+qY2gqEET<#tfQIyyUhCNS2) zMMe~ebKBEI@*bT|R}&DjS0pD1jGF3`4$QpwAD@`84&utx2YFhSi{jSIm":"", + "Keyframes":[], + "resourceType":"KeyframeStore", + "resourceVersion":"2.0", + }, + "eventStubScript":null, + "eventToFunction":{}, + "length":1.0, + "lockOrigin":false, + "moments":{ + "$KeyframeStore":"", + "Keyframes":[], + "resourceType":"KeyframeStore", + "resourceVersion":"2.0", + }, + "name":"spr_psy_hood_alpha2", + "playback":1, + "playbackSpeed":30.0, + "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":"e8a1632c-8084-4d13-8d30-4732feda986c","path":"sprites/spr_psy_hood_alpha2/spr_psy_hood_alpha2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"e9985ee2-2374-47e6-89f4-6a2b25a8ec5b","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":90, + }, + "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_roman_centurian_crest/spr_roman_centurian_crest.yy b/sprites/spr_roman_centurian_crest/spr_roman_centurian_crest.yy index 8e7ef3fb82..4938f0c4c1 100644 --- a/sprites/spr_roman_centurian_crest/spr_roman_centurian_crest.yy +++ b/sprites/spr_roman_centurian_crest/spr_roman_centurian_crest.yy @@ -65,14 +65,22 @@ "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":"dd649fd8-7e35-4852-a36d-a78f4f914d36","path":"sprites/spr_roman_centurian_crest/spr_roman_centurian_crest.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"508f7cdc-6556-4fd2-ae19-caa00fdda7cd","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"ecad98d1-bb1f-4cb3-b4f0-6d3bdd38418e","path":"sprites/spr_roman_centurian_crest/spr_roman_centurian_crest.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"081e45b1-f437-4ec9-bca2-4b4d5bd6000f","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"93ba81df-88f2-4d08-9f82-8e78097802e9","path":"sprites/spr_roman_centurian_crest/spr_roman_centurian_crest.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"2c11e64b-0ad4-4a34-a388-29e5e02054b8","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"dd649fd8-7e35-4852-a36d-a78f4f914d36","path":"sprites/spr_roman_centurian_crest/spr_roman_centurian_crest.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"508f7cdc-6556-4fd2-ae19-caa00fdda7cd","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"ecad98d1-bb1f-4cb3-b4f0-6d3bdd38418e","path":"sprites/spr_roman_centurian_crest/spr_roman_centurian_crest.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"081e45b1-f437-4ec9-bca2-4b4d5bd6000f","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"93ba81df-88f2-4d08-9f82-8e78097802e9","path":"sprites/spr_roman_centurian_crest/spr_roman_centurian_crest.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"2c11e64b-0ad4-4a34-a388-29e5e02054b8","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_roman_cloak/spr_roman_cloak.yy b/sprites/spr_roman_cloak/spr_roman_cloak.yy index d1fe356077..68bd59f315 100644 --- a/sprites/spr_roman_cloak/spr_roman_cloak.yy +++ b/sprites/spr_roman_cloak/spr_roman_cloak.yy @@ -64,12 +64,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":"a480dd5e-cfcb-474b-a59c-731ac71985a6","path":"sprites/spr_roman_cloak/spr_roman_cloak.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"60ec27ae-3716-4f2f-bedd-ecb89a562808","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"a480dd5e-cfcb-474b-a59c-731ac71985a6","path":"sprites/spr_roman_cloak/spr_roman_cloak.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"60ec27ae-3716-4f2f-bedd-ecb89a562808","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_sanguin_guard/spr_sanguin_guard.yy b/sprites/spr_sanguin_guard/spr_sanguin_guard.yy index 803d21a215..5e0cdb02b5 100644 --- a/sprites/spr_sanguin_guard/spr_sanguin_guard.yy +++ b/sprites/spr_sanguin_guard/spr_sanguin_guard.yy @@ -64,13 +64,19 @@ "playbackSpeedType":0, "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":"1d39ed2e-1e13-4613-90de-a21b28017808","path":"sprites/spr_sanguin_guard/spr_sanguin_guard.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"46b887ed-d41d-4816-934e-b3d81925b4ec","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"6e84cd8e-d989-4364-8931-044b097b2c0b","path":"sprites/spr_sanguin_guard/spr_sanguin_guard.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"41a96470-a2cc-4913-89ba-084ca5b95be3","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"1d39ed2e-1e13-4613-90de-a21b28017808","path":"sprites/spr_sanguin_guard/spr_sanguin_guard.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"46b887ed-d41d-4816-934e-b3d81925b4ec","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"6e84cd8e-d989-4364-8931-044b097b2c0b","path":"sprites/spr_sanguin_guard/spr_sanguin_guard.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"41a96470-a2cc-4913-89ba-084ca5b95be3","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_techmarine_core/spr_techmarine_core.yy b/sprites/spr_techmarine_core/spr_techmarine_core.yy index 44aa41efcf..cc46eaa7b4 100644 --- a/sprites/spr_techmarine_core/spr_techmarine_core.yy +++ b/sprites/spr_techmarine_core/spr_techmarine_core.yy @@ -72,21 +72,43 @@ "playbackSpeedType":0, "resourceType":"GMSequence", "resourceVersion":"2.0", + "seqHeight":262.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":"d6fd5b26-5a16-4837-83e7-762349cad0fe","path":"sprites/spr_techmarine_core/spr_techmarine_core.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"25cc4882-27cd-4eb3-8927-46d566e0e7b4","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"1952fa2a-5957-4a85-9c65-f7e12109ff46","path":"sprites/spr_techmarine_core/spr_techmarine_core.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"3a8a1299-9aee-4121-ba72-9229b4164ae5","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"0d3ae218-098c-4af6-af9e-9fa85eda6b9f","path":"sprites/spr_techmarine_core/spr_techmarine_core.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"9f6d611a-eeda-4ef8-b7d9-7d86184ba07b","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"d51b2fb6-4915-4181-8c98-cae57deb4866","path":"sprites/spr_techmarine_core/spr_techmarine_core.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"4ba5f3d8-f4b7-45d7-85fb-9fcb7142ee9c","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"3d110598-0228-4efe-ba5e-08cf667ed23b","path":"sprites/spr_techmarine_core/spr_techmarine_core.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"69e3269e-2975-42ee-95c9-20f36bd86568","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"41baa262-b761-43e7-85eb-08b7824a9899","path":"sprites/spr_techmarine_core/spr_techmarine_core.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"c92658c8-d4d4-4317-b200-9c8575a2bd45","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"7ee93fc8-dd78-44d7-bb05-85445635e575","path":"sprites/spr_techmarine_core/spr_techmarine_core.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"e75b9c32-73ee-4045-81ac-fbbdf654ab9b","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"26fe8275-a7d5-4ab8-9cfc-53c852839746","path":"sprites/spr_techmarine_core/spr_techmarine_core.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"4bd41038-2b15-43a9-a241-2531898b6533","IsCreationKey":false,"Key":7.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"a5226976-0539-4c1e-9467-9092d8ec7697","path":"sprites/spr_techmarine_core/spr_techmarine_core.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"2341b86a-9533-41e8-be8a-23eec3ef15de","IsCreationKey":false,"Key":8.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"a5a5bb6b-2ee7-474c-b749-bde2db13ad9f","path":"sprites/spr_techmarine_core/spr_techmarine_core.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"ca8c5988-e83e-45e8-80cd-806e8a04b657","IsCreationKey":false,"Key":9.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"d6fd5b26-5a16-4837-83e7-762349cad0fe","path":"sprites/spr_techmarine_core/spr_techmarine_core.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"25cc4882-27cd-4eb3-8927-46d566e0e7b4","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"1952fa2a-5957-4a85-9c65-f7e12109ff46","path":"sprites/spr_techmarine_core/spr_techmarine_core.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"3a8a1299-9aee-4121-ba72-9229b4164ae5","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"0d3ae218-098c-4af6-af9e-9fa85eda6b9f","path":"sprites/spr_techmarine_core/spr_techmarine_core.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"9f6d611a-eeda-4ef8-b7d9-7d86184ba07b","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"d51b2fb6-4915-4181-8c98-cae57deb4866","path":"sprites/spr_techmarine_core/spr_techmarine_core.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"4ba5f3d8-f4b7-45d7-85fb-9fcb7142ee9c","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"3d110598-0228-4efe-ba5e-08cf667ed23b","path":"sprites/spr_techmarine_core/spr_techmarine_core.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"69e3269e-2975-42ee-95c9-20f36bd86568","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"41baa262-b761-43e7-85eb-08b7824a9899","path":"sprites/spr_techmarine_core/spr_techmarine_core.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"c92658c8-d4d4-4317-b200-9c8575a2bd45","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"7ee93fc8-dd78-44d7-bb05-85445635e575","path":"sprites/spr_techmarine_core/spr_techmarine_core.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"e75b9c32-73ee-4045-81ac-fbbdf654ab9b","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"26fe8275-a7d5-4ab8-9cfc-53c852839746","path":"sprites/spr_techmarine_core/spr_techmarine_core.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"4bd41038-2b15-43a9-a241-2531898b6533","IsCreationKey":false,"Key":7.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"a5226976-0539-4c1e-9467-9092d8ec7697","path":"sprites/spr_techmarine_core/spr_techmarine_core.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"2341b86a-9533-41e8-be8a-23eec3ef15de","IsCreationKey":false,"Key":8.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"a5a5bb6b-2ee7-474c-b749-bde2db13ad9f","path":"sprites/spr_techmarine_core/spr_techmarine_core.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"ca8c5988-e83e-45e8-80cd-806e8a04b657","IsCreationKey":false,"Key":9.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_ultra_backpack/8e269d92-a1bd-4360-9ab3-d9310feae634.png b/sprites/spr_ultra_backpack/8e269d92-a1bd-4360-9ab3-d9310feae634.png index a93adbc8b62c4ccb0779307a601b1c6740f53113..b091ae9014b8f300f8052b302a32c0c2a78f20a7 100644 GIT binary patch delta 1105 zcmcb?Gl_SC7&oI62O9$e!;}|iGbbuKGPX`kHrI3(6neklB=-sJ7xzwfd9HUZn*Mml zXURv#W`Ao`RQ|Mo{yXpYub+3{=O|4!WL0KPSXVmnj86T(?}@v$9?m&%@PSU*uh*F_ zM+%+I{&&P{zpoeLzmya0llF31c|zNzS@Yej|9-XT+hRE5u}zQoM}xSO;Ih@ftE2C< zor|_g*+qR_a?0Rh_rL$IX!5pi7tY^&BF1v7NbH#-62cImuO;5ZM;J#NXzOeY2 z>)O|5f0utx-cVh%wpZR=O8T$g+vHqH@e8}w-Avg~J?Z+QRbe+PKeHF#k9=-Ar?;`E zLjF|8iRPJi_pLH>wm4Vn91-4q@SUgJg``-cqfvTJ0nc-ntHoWMwmbD>{WrgQ+u83P zy?CL)f8VVnia+UY*5BaN;Hq!cg*B0Tk6lffEi2xn;<@gt(`Jqr zHkqrEAIfaK;rm=^iMi-G?w1-O>ige+`C{__@7dYr8~5&&y_;vQq%_Z_PEt^O`PWB3 z!zQT|mXwIxY)X8*LU{frgIVfN*Uj8Jxs*vtXicT7hp~CkmdLf&w8L-QHG4FM0d+?Vq)!TV>6;MeWb^iaFo9)+W8bQn>Kv zCI6qX^EAcvwWF>sT~ZWy`mXV!yWZ}(>#iMNd*Sst%hgO_;kOHqFZP=qyQTNs%xkf? zG_>u_JPSAF{`>PM@XpR+^|0`8{k_)`zN^$#{?pj^|J`!4EHm@^Q^|Vs^2OxW&tCe= z|9$+5pP_aqG~(X;zu>xD?t+<6z2cm3*^-?Msm*sM-?;lb>rw8U{nq{~o+PaoPW4KX-pV_BSpv&Qp2OtDP^I z+CN{4Q2YB^#Z&8W#nfNdGqvZ`n-|U995G>+Qp)+r$bUP!C%0^RwzGRH)2eXOKF_R4 zeQt|SDVSZYzf*k6>~lfi?_D>55gIlve9`7DQ`$diHOf5R#`1O7))l{Yn>^^FzWFb4uJdm1?o5{_if2tsr<#4sO`EPi zsjK<--}Ca1ug0(cbbQ*heLdS3?-&1Fd^CEQ){;=h+|NOmd=5oQI8?pAx3}W&tFM#4 zvTU8~z$#ncQ23Ae@#b|p$^TT0fmv0x#5JNMC9x#cD!C{XNHG{07@6uCnCcoEh8P%H znHX7_m}naqSQ!}1z0~H1q9HdwB{QuOw}vY{q-~= z;})k^&kMsCh+5GdEJSS*_M9SJ>GK^L>-P0$&2=-;*B$M}HRUoHGmN$BzHW<3D3> ze>1kXxAXhzYCCQgDt??BErztM4L5%CCgSp?pYpprQ!ZXsw5m%<<)W6mXGFV~j@n$U zk6WSFopV+Ntgg1>jz^s~yJ#DoGp)O{QC5CzlHz3B{Q3E#xO3-DtgfzJdac3kN&NEs zQGEa1Pi@p}Zhw@=Ts+?_K3+FV^`G9qQ1h#NkWswY|GtY(J)mtQ{z5pfI_Po%$_Be9 zvAg%x#M?N3dw%J@MeUqLNs`29G^%`VRdcAT<#m*gYg^s3)o@Ot?mAr6Hu{6FBTfH{ z^S9@X`@OQfl14<;bJGP5=cTbs`u9naREF^?^{>-bIBaj^I%lyUbw$XYv$FhQ7bgj2 z&2txP1yrwU9Fx=}9gRknL2Ro3xaYKO=HVRob+MiPdaNw3L}zI!59L(?ImT@X>UC>T z^>=B+#Sq?&yYa)|-FbTX)4H1o=uD^ex~vyuK5F~=*{74x1Q;r>ALHfUFZ0Ki zmcEQPqkk6rbH!VxDx_5bZSzvnOu|_hKzi@qy?FKV)sqqhwG3dU{s)O=t}GTMU%Hd< z1sWGJEiyP%GBY|dGCD9bD=;uRFfgTCLrIe%1{zl~EiyP%GBY|dGCD9bD=;uRFfh~x z`}F_-04Q`tSaf7zbY(hpX>Db5bYX3905UK#H7zhQEiyP%GBY|dGCD9bD=;uRFffA? R+A075002ovPDHLkV1nho01f~E diff --git a/sprites/spr_ultra_backpack/layers/8e269d92-a1bd-4360-9ab3-d9310feae634/a3482820-22c0-4934-a6c1-87b382d13fad.png b/sprites/spr_ultra_backpack/layers/8e269d92-a1bd-4360-9ab3-d9310feae634/a3482820-22c0-4934-a6c1-87b382d13fad.png index a93adbc8b62c4ccb0779307a601b1c6740f53113..b091ae9014b8f300f8052b302a32c0c2a78f20a7 100644 GIT binary patch delta 1105 zcmcb?Gl_SC7&oI62O9$e!;}|iGbbuKGPX`kHrI3(6neklB=-sJ7xzwfd9HUZn*Mml zXURv#W`Ao`RQ|Mo{yXpYub+3{=O|4!WL0KPSXVmnj86T(?}@v$9?m&%@PSU*uh*F_ zM+%+I{&&P{zpoeLzmya0llF31c|zNzS@Yej|9-XT+hRE5u}zQoM}xSO;Ih@ftE2C< zor|_g*+qR_a?0Rh_rL$IX!5pi7tY^&BF1v7NbH#-62cImuO;5ZM;J#NXzOeY2 z>)O|5f0utx-cVh%wpZR=O8T$g+vHqH@e8}w-Avg~J?Z+QRbe+PKeHF#k9=-Ar?;`E zLjF|8iRPJi_pLH>wm4Vn91-4q@SUgJg``-cqfvTJ0nc-ntHoWMwmbD>{WrgQ+u83P zy?CL)f8VVnia+UY*5BaN;Hq!cg*B0Tk6lffEi2xn;<@gt(`Jqr zHkqrEAIfaK;rm=^iMi-G?w1-O>ige+`C{__@7dYr8~5&&y_;vQq%_Z_PEt^O`PWB3 z!zQT|mXwIxY)X8*LU{frgIVfN*Uj8Jxs*vtXicT7hp~CkmdLf&w8L-QHG4FM0d+?Vq)!TV>6;MeWb^iaFo9)+W8bQn>Kv zCI6qX^EAcvwWF>sT~ZWy`mXV!yWZ}(>#iMNd*Sst%hgO_;kOHqFZP=qyQTNs%xkf? zG_>u_JPSAF{`>PM@XpR+^|0`8{k_)`zN^$#{?pj^|J`!4EHm@^Q^|Vs^2OxW&tCe= z|9$+5pP_aqG~(X;zu>xD?t+<6z2cm3*^-?Msm*sM-?;lb>rw8U{nq{~o+PaoPW4KX-pV_BSpv&Qp2OtDP^I z+CN{4Q2YB^#Z&8W#nfNdGqvZ`n-|U995G>+Qp)+r$bUP!C%0^RwzGRH)2eXOKF_R4 zeQt|SDVSZYzf*k6>~lfi?_D>55gIlve9`7DQ`$diHOf5R#`1O7))l{Yn>^^FzWFb4uJdm1?o5{_if2tsr<#4sO`EPi zsjK<--}Ca1ug0(cbbQ*heLdS3?-&1Fd^CEQ){;=h+|NOmd=5oQI8?pAx3}W&tFM#4 zvTU8~z$#ncQ23Ae@#b|p$^TT0fmv0x#5JNMC9x#cD!C{XNHG{07@6uCnCcoEh8P%H znHX7_m}naqSQ!}1z0~H1q9HdwB{QuOw}vY{q-~= z;})k^&kMsCh+5GdEJSS*_M9SJ>GK^L>-P0$&2=-;*B$M}HRUoHGmN$BzHW<3D3> ze>1kXxAXhzYCCQgDt??BErztM4L5%CCgSp?pYpprQ!ZXsw5m%<<)W6mXGFV~j@n$U zk6WSFopV+Ntgg1>jz^s~yJ#DoGp)O{QC5CzlHz3B{Q3E#xO3-DtgfzJdac3kN&NEs zQGEa1Pi@p}Zhw@=Ts+?_K3+FV^`G9qQ1h#NkWswY|GtY(J)mtQ{z5pfI_Po%$_Be9 zvAg%x#M?N3dw%J@MeUqLNs`29G^%`VRdcAT<#m*gYg^s3)o@Ot?mAr6Hu{6FBTfH{ z^S9@X`@OQfl14<;bJGP5=cTbs`u9naREF^?^{>-bIBaj^I%lyUbw$XYv$FhQ7bgj2 z&2txP1yrwU9Fx=}9gRknL2Ro3xaYKO=HVRob+MiPdaNw3L}zI!59L(?ImT@X>UC>T z^>=B+#Sq?&yYa)|-FbTX)4H1o=uD^ex~vyuK5F~=*{74x1Q;r>ALHfUFZ0Ki zmcEQPqkk6rbH!VxDx_5bZSzvnOu|_hKzi@qy?FKV)sqqhwG3dU{s)O=t}GTMU%Hd< z1sWGJEiyP%GBY|dGCD9bD=;uRFfgTCLrIe%1{zl~EiyP%GBY|dGCD9bD=;uRFfh~x z`}F_-04Q`tSaf7zbY(hpX>Db5bYX3905UK#H7zhQEiyP%GBY|dGCD9bD=;uRFffA? R+A075002ovPDHLkV1nho01f~E diff --git a/sprites/spr_ultra_backpack/spr_ultra_backpack.yy b/sprites/spr_ultra_backpack/spr_ultra_backpack.yy index c91080a28d..c9a0b4bb4e 100644 --- a/sprites/spr_ultra_backpack/spr_ultra_backpack.yy +++ b/sprites/spr_ultra_backpack/spr_ultra_backpack.yy @@ -2,10 +2,10 @@ "$GMSprite":"v2", "%Name":"spr_ultra_backpack", "bboxMode":0, - "bbox_bottom":37, + "bbox_bottom":82, "bbox_left":20, "bbox_right":145, - "bbox_top":10, + "bbox_top":55, "collisionKind":1, "collisionTolerance":0, "DynamicTexturePage":false, @@ -16,14 +16,14 @@ ], "gridX":0, "gridY":0, - "height":232, + "height":322, "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_ultra_backpack", "nineSlice":null, - "origin":0, + "origin":9, "parent":{ "name":"specialist", "path":"folders/Sprites/Marine Viewer/body_types/specialist.yy", @@ -63,20 +63,22 @@ "playbackSpeedType":0, "resourceType":"GMSequence", "resourceVersion":"2.0", - "seqHeight":232.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":"8e269d92-a1bd-4360-9ab3-d9310feae634","path":"sprites/spr_ultra_backpack/spr_ultra_backpack.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"0b49ae84-efc3-48ec-9248-151c7c19f24c","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"8e269d92-a1bd-4360-9ab3-d9310feae634","path":"sprites/spr_ultra_backpack/spr_ultra_backpack.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"0b49ae84-efc3-48ec-9248-151c7c19f24c","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, + "yorigin":45, }, "swatchColours":null, "swfPrecision":2.525, diff --git a/sprites/spr_ultra_belt/spr_ultra_belt.yy b/sprites/spr_ultra_belt/spr_ultra_belt.yy index 0a502588e5..8f8c332226 100644 --- a/sprites/spr_ultra_belt/spr_ultra_belt.yy +++ b/sprites/spr_ultra_belt/spr_ultra_belt.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":"8a2b3d9f-db94-4f5a-8b6c-c14863b33cb4","path":"sprites/spr_ultra_belt/spr_ultra_belt.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,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"8a2b3d9f-db94-4f5a-8b6c-c14863b33cb4","path":"sprites/spr_ultra_belt/spr_ultra_belt.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, diff --git a/sprites/spr_ultra_honor_guard2/spr_ultra_honor_guard2.yy b/sprites/spr_ultra_honor_guard2/spr_ultra_honor_guard2.yy index df4b1772fa..ed6039129e 100644 --- a/sprites/spr_ultra_honor_guard2/spr_ultra_honor_guard2.yy +++ b/sprites/spr_ultra_honor_guard2/spr_ultra_honor_guard2.yy @@ -72,14 +72,22 @@ "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":"f40bb243-5f2e-4891-8cb0-e9ef181276bf","path":"sprites/spr_ultra_honor_guard2/spr_ultra_honor_guard2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"0c034e8b-987f-41d4-af0c-8aa2e09e5602","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"2991de12-c521-4ae7-b522-93889e9d98df","path":"sprites/spr_ultra_honor_guard2/spr_ultra_honor_guard2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"131b933f-5eb2-468c-ab2d-c38317e7486f","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"a480dd5e-cfcb-474b-a59c-731ac71985a6","path":"sprites/spr_ultra_honor_guard2/spr_ultra_honor_guard2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"be563dc1-21f3-489a-94ce-944fa3185a0f","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"f40bb243-5f2e-4891-8cb0-e9ef181276bf","path":"sprites/spr_ultra_honor_guard2/spr_ultra_honor_guard2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"0c034e8b-987f-41d4-af0c-8aa2e09e5602","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"2991de12-c521-4ae7-b522-93889e9d98df","path":"sprites/spr_ultra_honor_guard2/spr_ultra_honor_guard2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"131b933f-5eb2-468c-ab2d-c38317e7486f","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"a480dd5e-cfcb-474b-a59c-731ac71985a6","path":"sprites/spr_ultra_honor_guard2/spr_ultra_honor_guard2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"be563dc1-21f3-489a-94ce-944fa3185a0f","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_ultra_right_shoulder_hanging/88b996d0-3ce9-4c6f-bc17-518446f0995d.png b/sprites/spr_ultra_right_shoulder_hanging/88b996d0-3ce9-4c6f-bc17-518446f0995d.png index 8892fed75ae32f0f84eb7234d1fe322d5fc9c4ce..c581b8102841e5520bc3e04a61b54bf7b782e4f1 100644 GIT binary patch delta 1595 zcmZ{kYg7^j7=~-pQR!sOvhqgeveYO9Gef1B5IH3)6$+cw%1E;!u@tqDm6z1K3^i}e z%4;Z^LgJknTE;}}N@jp&q@sd^goxHuV&{?(X$zlUzng-$#8!y|&4wJ3U}$9NC&6}X zN2_{rpl8=Z>a3GVN%Fm|_qvm+7L1Smkz+)3@ZXMSb|-CdJk_?TeO}&Ts+h{QHz6aD z>08+!70p%O_ZIQjpbmAan0`;N0fF^;UIvw1b-KbgD;4{$QRz7!2JX_-278aXoevqV zF79XJL0#NEqV++91X6&_S%Hqt$WO%@19V+|i=vETocivO%A6ap9D5CiQ(oh?n(xX; z(NAdu$*ym3_O^s{Ox!s;mfi_7X2*+TU-wX$FWv?RKKP+_YiVb zvyIwTo4d_R#`zrSTqB#*FsP8a@jBiu|3ndJKg0y8=325zUI?nSR z#P|T0oaI0OnUjxm(hU~OlsCUbj5@QfX)mP_n%$d5rHm;0=AbawASO#-852Z@b`1@! z(+kd?5B2gU(w~3BqHZgTSju(dd9Go8dO3dXg*&}|k`1HO6qmV7Xi3pCrGr*M;sH_W zZ3_#3iE3t6DNXaq1zGG3ODjuIUFKNOMhZB#?|bcu@``7;GwBIQNo49|*umO$g%{WKqXPU2h`V!G z!os$i*P6*mIk?_=VH7ZPk58fny)m-Z{FKjc5(HAagtk`>mca z;B4e!!`L+#m3V!2L{5uts&je>f^X;_gcVRDRj!n?_kEk_Z<~HDFA@q>smaeqil1cA zOLmO$@B3;|oI*lmi$90ipwkNqOU^}w4dw+(d`D%xGN?4kEdyPv5G`(tKw8erOX_~Y zVJy>=XQ5ZV(=)mII-e@M7=Dm;Z6R>v6*U;7_KNk;RP1`w#2b)^Q<9S}Ahd(jGg@{g zcDVY{I+WvFP%*Oe(EbWT=S??gsYxv8j#72(HO8`X3vN19FYQAcWo$|D72mTd5;Qy@ zVeP!|lwaK=18Pfw{%-i)84?5GM3+!$cZV+W7!I!_OU#b}he!R|V^s6OQ`NeT!uw>9 z-%6RN!xNe2w=niZ86p_oNQKAx_3RCMK*sgXO~^isskRUVMSp5B;7WCh`D$gxO`kl@ z7V)6>S-Uvr{w83wgTJ+90;BQ~eARfHmgXw+yyd##HKYDOT-I%pOApEg?^B>VO8{*SnX5;rwT5h)+?YE=HO6+6 zi`_LiIFB$t&Z*N5zxEdi@iAHe delta 1158 zcmV;11bO@I4fhI=VSfZ_NklpDia8=8HG*~%%o&DdimNE1D2gcZ)vnKh73^I&Q<-ux7(~9h4puXa^D5%7 zOmUSXB638bH^1-pXOQo=Zzhkx>QZG^20OO_8(j{ znDYqc;o53AkJ8b?!JIV-63oN4)o|u~Jqs^;O_ zN;p%Q^4rnpU7suW%*HFvx+g$2mGkgzeYU>HcyngkL4UdJLubo28qUF>+ml0!8kQ-l z(Pvfjz-{afQP)S>pv^`qXFbj=2Bl>nmbTGuJztHdZtpVgY+G{r!9=JxHX6=)U2}5V zDvTBSW9{MG)Y4I{FiY=^jV~oltDdW98!B*kw!Y38vHrkvnARH3wk};5S;kf?=VU+y zmRZ&k&VN**1Uh$nMqC5`3Sm6wZ3ASqH9b$eP{zBGt3-qJ&;qxpLOwS~Q@OZRfttBOQmz*)JQJ z5OoP?vto9to<$L(k@04qtbNRRF|IlJ>K9+$_R+F4Fw znx(tRRHj@MMMTc=w!^zJyS%#a+i$*(cke&kY3rZa`e~^Pp30P8zj$-={rRh>5fQUP znoi=P`gi7jrv+3n`)lcN*5Uc}^!#S~ypRsd6j2P~qPlF|_hh9N&i-0CoV7(mn!fld z{(t!RzV+wA$=bqMn-s_OIvLu}Sw3adF&(D9F+OBI*+m?{77v97D z^qyKeoXzibP}@Qp(H_)@*%PUV>yQd)|E#o>R9%OvsKeSNq!G7+8qprsM{7D(?x$5Q zcy9iFvzm4dX>D3qN8>8a8ry%l-j{&($bUvI_GBfkbq(vIh&VevuLBuz`@4X$y84m2 z`g3-Ae)IV&V(KR%^4aNmj)?s7$;15HkKgB)PafXdzU%X1J2rY#ySW6E%9Nk|Kel}R z;?13|JfeGLr60ET#6>fx&t5&fQ~hoNI}y;|KU{X$J8V$1`;XgQxGue?_IYxV%?#H2 zZQn0;vr_K+u>zCf1z(f!1qTZ8AMG{T?+@VZOOs0m8W%DxGB{K+Fgi3iIx;XTFfckW zFqF$^?UQ^48W%DxGB{K+Fgi3iIx;XTFfckWFy)reQIo9(9V0R=GB{K+Fgi3iIx;XT YFfckWFtUU3jsO4v07*qoM6N<$f=2B|mjD0& diff --git a/sprites/spr_ultra_right_shoulder_hanging/layers/88b996d0-3ce9-4c6f-bc17-518446f0995d/a3482820-22c0-4934-a6c1-87b382d13fad.png b/sprites/spr_ultra_right_shoulder_hanging/layers/88b996d0-3ce9-4c6f-bc17-518446f0995d/a3482820-22c0-4934-a6c1-87b382d13fad.png index 8892fed75ae32f0f84eb7234d1fe322d5fc9c4ce..c581b8102841e5520bc3e04a61b54bf7b782e4f1 100644 GIT binary patch delta 1595 zcmZ{kYg7^j7=~-pQR!sOvhqgeveYO9Gef1B5IH3)6$+cw%1E;!u@tqDm6z1K3^i}e z%4;Z^LgJknTE;}}N@jp&q@sd^goxHuV&{?(X$zlUzng-$#8!y|&4wJ3U}$9NC&6}X zN2_{rpl8=Z>a3GVN%Fm|_qvm+7L1Smkz+)3@ZXMSb|-CdJk_?TeO}&Ts+h{QHz6aD z>08+!70p%O_ZIQjpbmAan0`;N0fF^;UIvw1b-KbgD;4{$QRz7!2JX_-278aXoevqV zF79XJL0#NEqV++91X6&_S%Hqt$WO%@19V+|i=vETocivO%A6ap9D5CiQ(oh?n(xX; z(NAdu$*ym3_O^s{Ox!s;mfi_7X2*+TU-wX$FWv?RKKP+_YiVb zvyIwTo4d_R#`zrSTqB#*FsP8a@jBiu|3ndJKg0y8=325zUI?nSR z#P|T0oaI0OnUjxm(hU~OlsCUbj5@QfX)mP_n%$d5rHm;0=AbawASO#-852Z@b`1@! z(+kd?5B2gU(w~3BqHZgTSju(dd9Go8dO3dXg*&}|k`1HO6qmV7Xi3pCrGr*M;sH_W zZ3_#3iE3t6DNXaq1zGG3ODjuIUFKNOMhZB#?|bcu@``7;GwBIQNo49|*umO$g%{WKqXPU2h`V!G z!os$i*P6*mIk?_=VH7ZPk58fny)m-Z{FKjc5(HAagtk`>mca z;B4e!!`L+#m3V!2L{5uts&je>f^X;_gcVRDRj!n?_kEk_Z<~HDFA@q>smaeqil1cA zOLmO$@B3;|oI*lmi$90ipwkNqOU^}w4dw+(d`D%xGN?4kEdyPv5G`(tKw8erOX_~Y zVJy>=XQ5ZV(=)mII-e@M7=Dm;Z6R>v6*U;7_KNk;RP1`w#2b)^Q<9S}Ahd(jGg@{g zcDVY{I+WvFP%*Oe(EbWT=S??gsYxv8j#72(HO8`X3vN19FYQAcWo$|D72mTd5;Qy@ zVeP!|lwaK=18Pfw{%-i)84?5GM3+!$cZV+W7!I!_OU#b}he!R|V^s6OQ`NeT!uw>9 z-%6RN!xNe2w=niZ86p_oNQKAx_3RCMK*sgXO~^isskRUVMSp5B;7WCh`D$gxO`kl@ z7V)6>S-Uvr{w83wgTJ+90;BQ~eARfHmgXw+yyd##HKYDOT-I%pOApEg?^B>VO8{*SnX5;rwT5h)+?YE=HO6+6 zi`_LiIFB$t&Z*N5zxEdi@iAHe delta 1158 zcmV;11bO@I4fhI=VSfZ_NklpDia8=8HG*~%%o&DdimNE1D2gcZ)vnKh73^I&Q<-ux7(~9h4puXa^D5%7 zOmUSXB638bH^1-pXOQo=Zzhkx>QZG^20OO_8(j{ znDYqc;o53AkJ8b?!JIV-63oN4)o|u~Jqs^;O_ zN;p%Q^4rnpU7suW%*HFvx+g$2mGkgzeYU>HcyngkL4UdJLubo28qUF>+ml0!8kQ-l z(Pvfjz-{afQP)S>pv^`qXFbj=2Bl>nmbTGuJztHdZtpVgY+G{r!9=JxHX6=)U2}5V zDvTBSW9{MG)Y4I{FiY=^jV~oltDdW98!B*kw!Y38vHrkvnARH3wk};5S;kf?=VU+y zmRZ&k&VN**1Uh$nMqC5`3Sm6wZ3ASqH9b$eP{zBGt3-qJ&;qxpLOwS~Q@OZRfttBOQmz*)JQJ z5OoP?vto9to<$L(k@04qtbNRRF|IlJ>K9+$_R+F4Fw znx(tRRHj@MMMTc=w!^zJyS%#a+i$*(cke&kY3rZa`e~^Pp30P8zj$-={rRh>5fQUP znoi=P`gi7jrv+3n`)lcN*5Uc}^!#S~ypRsd6j2P~qPlF|_hh9N&i-0CoV7(mn!fld z{(t!RzV+wA$=bqMn-s_OIvLu}Sw3adF&(D9F+OBI*+m?{77v97D z^qyKeoXzibP}@Qp(H_)@*%PUV>yQd)|E#o>R9%OvsKeSNq!G7+8qprsM{7D(?x$5Q zcy9iFvzm4dX>D3qN8>8a8ry%l-j{&($bUvI_GBfkbq(vIh&VevuLBuz`@4X$y84m2 z`g3-Ae)IV&V(KR%^4aNmj)?s7$;15HkKgB)PafXdzU%X1J2rY#ySW6E%9Nk|Kel}R z;?13|JfeGLr60ET#6>fx&t5&fQ~hoNI}y;|KU{X$J8V$1`;XgQxGue?_IYxV%?#H2 zZQn0;vr_K+u>zCf1z(f!1qTZ8AMG{T?+@VZOOs0m8W%DxGB{K+Fgi3iIx;XTFfckW zFqF$^?UQ^48W%DxGB{K+Fgi3iIx;XTFfckWFy)reQIo9(9V0R=GB{K+Fgi3iIx;XT YFfckWFtUU3jsO4v07*qoM6N<$f=2B|mjD0& diff --git a/sprites/spr_ultra_right_shoulder_hanging/spr_ultra_right_shoulder_hanging.yy b/sprites/spr_ultra_right_shoulder_hanging/spr_ultra_right_shoulder_hanging.yy index 456cc70939..354e5d0dc0 100644 --- a/sprites/spr_ultra_right_shoulder_hanging/spr_ultra_right_shoulder_hanging.yy +++ b/sprites/spr_ultra_right_shoulder_hanging/spr_ultra_right_shoulder_hanging.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":"88b996d0-3ce9-4c6f-bc17-518446f0995d","path":"sprites/spr_ultra_right_shoulder_hanging/spr_ultra_right_shoulder_hanging.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"b9642de9-3f72-4a7c-b92b-bbb1da41f352","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"88b996d0-3ce9-4c6f-bc17-518446f0995d","path":"sprites/spr_ultra_right_shoulder_hanging/spr_ultra_right_shoulder_hanging.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"b9642de9-3f72-4a7c-b92b-bbb1da41f352","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_ultra_tassels/spr_ultra_tassels.yy b/sprites/spr_ultra_tassels/spr_ultra_tassels.yy index 79dca46634..66a6228a09 100644 --- a/sprites/spr_ultra_tassels/spr_ultra_tassels.yy +++ b/sprites/spr_ultra_tassels/spr_ultra_tassels.yy @@ -64,12 +64,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":"f40bb243-5f2e-4891-8cb0-e9ef181276bf","path":"sprites/spr_ultra_tassels/spr_ultra_tassels.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"3b63153c-72b6-4b61-a54e-91c447e89091","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"f40bb243-5f2e-4891-8cb0-e9ef181276bf","path":"sprites/spr_ultra_tassels/spr_ultra_tassels.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"3b63153c-72b6-4b61-a54e-91c447e89091","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, From 9e37ef4bd4aac6e69acde941bbe09b6f159dcfa7 Mon Sep 17 00:00:00 2001 From: Nelsonh <81228864+OH296@users.noreply.github.com> Date: Thu, 5 Jun 2025 00:06:33 +0100 Subject: [PATCH 076/286] fix: Array creation casing duplicate constructs (#859) --- .../scr_array_functions.gml | 8 ++++++-- .../58ee1e71-509f-4b0e-ab39-17c8da2a0687.png | Bin 884 -> 884 bytes .../ef1f92c3-6086-487a-a4a8-c38f6098016b.png | Bin 884 -> 884 bytes .../spr_checker_texture.yy | 12 ++++++++++-- .../b6ba8600-fb6b-4fa9-abc7-bdc2311eb79e.png | Bin 1143 -> 1143 bytes .../468e0a30-2dea-45bc-a7bd-4b115f803d2d.png | Bin 872 -> 872 bytes .../88207c69-b4a6-4dcf-bff5-449f98b2cb6f.png | Bin 851 -> 851 bytes .../spr_mk7_complex_knees.yy | 12 ++++++++++-- 8 files changed, 26 insertions(+), 6 deletions(-) diff --git a/scripts/scr_array_functions/scr_array_functions.gml b/scripts/scr_array_functions/scr_array_functions.gml index 21e1c00633..c62271e7c1 100644 --- a/scripts/scr_array_functions/scr_array_functions.gml +++ b/scripts/scr_array_functions/scr_array_functions.gml @@ -281,6 +281,10 @@ function array_set_range(_array, _start_index, _end_index, _value) { /// @description Similar to array_create, but uses `variable_clone()` to clone the default if it's a complex type (array/struct). Supports default with nesting. /// @param {Real} _size The size of the array to create. /// @param {Any} _default The value to set for the elements. -function array_create_advanced(_size, _default = 0) { - return array_create(_size, variable_clone(_default)); +function array_create_advanced(_size = 1, _default = 0) { + var _array = []; + repeat (_size){ + array_push(_array, variable_clone(_default)); + } + return _array; } diff --git a/sprites/spr_checker_texture/58ee1e71-509f-4b0e-ab39-17c8da2a0687.png b/sprites/spr_checker_texture/58ee1e71-509f-4b0e-ab39-17c8da2a0687.png index 0c7b0dd3dcb54a33b46a1e53a7844001b36199e9..19bf6388b199fb5c12384b20e0257e9508b4e3f2 100644 GIT binary patch delta 145 zcmeyu_JwW38>V_QT?3O4BO@zQLn}igZ36=<0|T$D!fplz2GtVRh?11Vl2ohQ{FKbJ zN(LhXBU4=iEE=rMPnrWYXuvg;Wag$8mn7yE;MS9)^x_3j4=01CtDnm{r-UW|tIsFj delta 145 zcmeyu_JwW38>V_=T|?s#10yR#6Dt!-Z36=<1B1`UUVdU=U{Eb_jVMV;EJ?M>%}>cp zt7I@TFf!FOz@njPcAy_ng9cnfNoH8wHy85}Sb4q9e0HJ~^ A9{>OV diff --git a/sprites/spr_checker_texture/layers/58ee1e71-509f-4b0e-ab39-17c8da2a0687/ef1f92c3-6086-487a-a4a8-c38f6098016b.png b/sprites/spr_checker_texture/layers/58ee1e71-509f-4b0e-ab39-17c8da2a0687/ef1f92c3-6086-487a-a4a8-c38f6098016b.png index 0c7b0dd3dcb54a33b46a1e53a7844001b36199e9..19bf6388b199fb5c12384b20e0257e9508b4e3f2 100644 GIT binary patch delta 145 zcmeyu_JwW38>V_QT?3O4BO@zQLn}igZ36=<0|T$D!fplz2GtVRh?11Vl2ohQ{FKbJ zN(LhXBU4=iEE=rMPnrWYXuvg;Wag$8mn7yE;MS9)^x_3j4=01CtDnm{r-UW|tIsFj delta 145 zcmeyu_JwW38>V_=T|?s#10yR#6Dt!-Z36=<1B1`UUVdU=U{Eb_jVMV;EJ?M>%}>cp zt7I@TFf!FOz@njPcAy_ng9cnfNoH8wHy85}Sb4q9e0HJ~^ A9{>OV diff --git a/sprites/spr_checker_texture/spr_checker_texture.yy b/sprites/spr_checker_texture/spr_checker_texture.yy index e0d8251c4f..050b0bc62d 100644 --- a/sprites/spr_checker_texture/spr_checker_texture.yy +++ b/sprites/spr_checker_texture/spr_checker_texture.yy @@ -33,7 +33,13 @@ "resourceType":"GMNineSliceData", "resourceVersion":"2.0", "right":0, - "tileMode":[0,0,0,0,0,], + "tileMode":[ + 0, + 0, + 0, + 0, + 0, + ], "top":0, }, "origin":0, @@ -81,7 +87,9 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"58ee1e71-509f-4b0e-ab39-17c8da2a0687","path":"sprites/spr_checker_texture/spr_checker_texture.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"1e6e1650-2926-4786-b31b-bbc04b9c7746","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"58ee1e71-509f-4b0e-ab39-17c8da2a0687","path":"sprites/spr_checker_texture/spr_checker_texture.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"1e6e1650-2926-4786-b31b-bbc04b9c7746","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_knees/b6ba8600-fb6b-4fa9-abc7-bdc2311eb79e.png b/sprites/spr_mk7_complex_knees/b6ba8600-fb6b-4fa9-abc7-bdc2311eb79e.png index fd1454d6ee2afde173926f9b019b83cb0571fa70..97884b9bb2ad5a9f5859d86c00d82a50d27ffe64 100644 GIT binary patch delta 120 zcmey)@ttGCdu9(aT?3O4BO@zQLn}igZ36=<0|T$D!fplz2GtVRh?11Vl2ohQ{FKbJ pN(LhXBU4=iEE=rMPnu6QXOUILBA27|;sww!22WQ%mvv4FO#tJ5AUps7 delta 120 zcmey)@ttGCdu9(~T|@H_BO@zgBP#<7Z36=<1A~p%)(S8%FsPQeMwFx^mZVzc=BH$) qRWcYE7@6uCV9{`(TXfB2a~4@;EOOK5nG^#JWAJqKb6Mw<&;$T6jUe{` diff --git a/sprites/spr_mk7_complex_knees/layers/b6ba8600-fb6b-4fa9-abc7-bdc2311eb79e/468e0a30-2dea-45bc-a7bd-4b115f803d2d.png b/sprites/spr_mk7_complex_knees/layers/b6ba8600-fb6b-4fa9-abc7-bdc2311eb79e/468e0a30-2dea-45bc-a7bd-4b115f803d2d.png index f3f81af34f0a648e7e2318ebaa291d8f6f8a7e22..056cd479828f6843af8a322dd80fd6ca4587a8c3 100644 GIT binary patch delta 120 zcmaFC_JVE0111kMT?3O4BO@zQLn}igZ36=<0|T$D!fplz2GtVRh?11Vl2ohQ{FKbJ pN(LhXBU4=iEE=rMPnu8GV3t+JBA27|;sww!22WQ%mvv4FO#sRkANl|Q delta 120 zcmaFC_JVE0111k+T|@H_BO@zgBP#<7Z36=<1A~p%)(S8%FsPQeMwFx^mZVzc=BH$) qRWcYE7@6uCV9{`(TXfB24Q5$oEOOK5nG^#JWAJqKb6Mw<&;$S&B_Oo` diff --git a/sprites/spr_mk7_complex_knees/layers/b6ba8600-fb6b-4fa9-abc7-bdc2311eb79e/88207c69-b4a6-4dcf-bff5-449f98b2cb6f.png b/sprites/spr_mk7_complex_knees/layers/b6ba8600-fb6b-4fa9-abc7-bdc2311eb79e/88207c69-b4a6-4dcf-bff5-449f98b2cb6f.png index e904c4a1666f535dacf9967eca74b644c9d37826..5c22effc43c189cc62f0a841c54a86227990d928 100644 GIT binary patch delta 145 zcmcc2cA0I%X{LHJT?3O4BO@zQLn}igZ36=<0|T$D!fplz2GtVRh?11Vl2ohQ{FKbJ zN(LhXBU4=iEE=rMPnrWYXuvg;Wag$8mn7yE;MS9)^x_3j4=01CtDnm{r-UW|bfYJH delta 145 zcmcc2cA0I%X{LH(T|@H_BO@zgLn{+=Z36=<0|Sl684N(6TH+c}l9E`GYL%Oxl9^V? yU}Ruqs%wBnL*%{-dw?1=;2KIYb5n~;5_1c1>)~7dF&U_blfl!~&t;ucLK6V1eke2m diff --git a/sprites/spr_mk7_complex_knees/spr_mk7_complex_knees.yy b/sprites/spr_mk7_complex_knees/spr_mk7_complex_knees.yy index faa14d664a..fadcbfe35b 100644 --- a/sprites/spr_mk7_complex_knees/spr_mk7_complex_knees.yy +++ b/sprites/spr_mk7_complex_knees/spr_mk7_complex_knees.yy @@ -34,7 +34,13 @@ "resourceType":"GMNineSliceData", "resourceVersion":"2.0", "right":0, - "tileMode":[0,0,0,0,0,], + "tileMode":[ + 0, + 0, + 0, + 0, + 0, + ], "top":0, }, "origin":9, @@ -82,7 +88,9 @@ "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_knees/spr_mk7_complex_knees.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"7ea69ecd-f81f-42b8-ac71-b6987343efcb","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_knees/spr_mk7_complex_knees.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"7ea69ecd-f81f-42b8-ac71-b6987343efcb","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, From 01c9f73c2997b35c4cac564af838902190c58c16 Mon Sep 17 00:00:00 2001 From: Nelsonh <81228864+OH296@users.noreply.github.com> Date: Thu, 5 Jun 2025 00:18:02 +0100 Subject: [PATCH 077/286] fix: Inquisition missions now check planet is valid (#860) --- objects/obj_popup/Step_0.gml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/objects/obj_popup/Step_0.gml b/objects/obj_popup/Step_0.gml index a3ae8248ef..5141e9acf9 100644 --- a/objects/obj_popup/Step_0.gml +++ b/objects/obj_popup/Step_0.gml @@ -1141,7 +1141,7 @@ try { onceh = 0; var mission_star = star_by_name(obj_controller.temp[200]); var mission_is_go = false; - if (mission_star != "none") { + if (mission_star != "none" && planet > 0) { var _estimate = estimate; var _planet = planet; var _mission = mission; From 203c0b3b6ec91f2a1b2328aa58f56e60509dbf10 Mon Sep 17 00:00:00 2001 From: EttyKitty <20323032+EttyKitty@users.noreply.github.com> Date: Thu, 5 Jun 2025 20:34:52 +0300 Subject: [PATCH 078/286] refactor: Optimize array_create_advanced (#861) --- scripts/scr_array_functions/scr_array_functions.gml | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/scripts/scr_array_functions/scr_array_functions.gml b/scripts/scr_array_functions/scr_array_functions.gml index c62271e7c1..ba15fe965e 100644 --- a/scripts/scr_array_functions/scr_array_functions.gml +++ b/scripts/scr_array_functions/scr_array_functions.gml @@ -282,9 +282,11 @@ function array_set_range(_array, _start_index, _end_index, _value) { /// @param {Real} _size The size of the array to create. /// @param {Any} _default The value to set for the elements. function array_create_advanced(_size = 1, _default = 0) { - var _array = []; - repeat (_size){ - array_push(_array, variable_clone(_default)); + var _array = array_create(_size); + + for (var i = 0; i < _size; i++) { + _array[@ i] = variable_clone(_default); } + return _array; } From d045d0eb550e7206c8ad2c698d0adfff045782ae Mon Sep 17 00:00:00 2001 From: Nelsonh <81228864+OH296@users.noreply.github.com> Date: Fri, 6 Jun 2025 23:58:37 +0100 Subject: [PATCH 079/286] fix: ensure cargo_data variable is saved and loaded (#863) --- .../compatibility_report_040421_2234143414.yy | 2 +- notes/notes/notes.yy | 2 +- objects/obj_en_fleet/Create_0.gml | 15 +++++++++++++-- sounds/snd_battle/snd_battle.yy | 6 +++--- sounds/snd_blood/snd_blood.yy | 6 +++--- sounds/snd_buzz/snd_buzz.yy | 6 +++--- sounds/snd_click/snd_click.yy | 6 +++--- sounds/snd_click_small/snd_click_small.yy | 6 +++--- sounds/snd_defeat/snd_defeat.yy | 6 +++--- sounds/snd_diboz/snd_diboz.yy | 6 +++--- sounds/snd_end_turn/snd_end_turn.yy | 6 +++--- sounds/snd_error/snd_error.yy | 6 +++--- sounds/snd_identify/snd_identify.yy | 6 +++--- sounds/snd_legal/snd_legal.yy | 6 +++--- sounds/snd_postbattle/snd_postbattle.yy | 6 +++--- sounds/snd_prologue/snd_prologue.yy | 6 +++--- sounds/snd_redownload/snd_redownload.yy | 6 +++--- sounds/snd_royal/snd_royal.yy | 6 +++--- sounds/snd_stc/snd_stc.yy | 6 +++--- sounds/snd_vode/snd_vode.yy | 6 +++--- .../spr_checker_texture/spr_checker_texture.yy | 2 ++ .../spr_mk7_complex_knees.yy | 2 ++ sprites/spr_psy_hood_alpha/spr_psy_hood_alpha.yy | 8 +++----- .../spr_psy_hood_alpha2/spr_psy_hood_alpha2.yy | 8 +++----- sprites/spr_ship_aconite/spr_ship_aconite.yy | 11 ++++++----- sprites/spr_ship_apoc/spr_ship_apoc.yy | 11 ++++++----- sprites/spr_ship_aven/spr_ship_aven.yy | 11 ++++++----- sprites/spr_ship_nem/spr_ship_nem.yy | 11 ++++++----- 28 files changed, 100 insertions(+), 85 deletions(-) diff --git a/notes/compatibility_report_040421_2234143414/compatibility_report_040421_2234143414.yy b/notes/compatibility_report_040421_2234143414/compatibility_report_040421_2234143414.yy index b3b3a91586..9546aa042b 100644 --- a/notes/compatibility_report_040421_2234143414/compatibility_report_040421_2234143414.yy +++ b/notes/compatibility_report_040421_2234143414/compatibility_report_040421_2234143414.yy @@ -1,5 +1,5 @@ { - "$GMNotes":"", + "$GMNotes":"v1", "%Name":"compatibility_report_040421_2234143414", "name":"compatibility_report_040421_2234143414", "parent":{ diff --git a/notes/notes/notes.yy b/notes/notes/notes.yy index 12c9b69e52..9d80786dae 100644 --- a/notes/notes/notes.yy +++ b/notes/notes/notes.yy @@ -1,5 +1,5 @@ { - "$GMNotes":"", + "$GMNotes":"v1", "%Name":"notes", "name":"notes", "parent":{ diff --git a/objects/obj_en_fleet/Create_0.gml b/objects/obj_en_fleet/Create_0.gml index 851e17d517..d38a34f455 100644 --- a/objects/obj_en_fleet/Create_0.gml +++ b/objects/obj_en_fleet/Create_0.gml @@ -79,16 +79,17 @@ serialize = function(){ obj: object_get_name(object_index), x, y, + cargo_data : cargo_data, } - var excluded_from_save = ["temp", "serialize", "deserialize", "cargo_data"] + var excluded_from_save = ["temp", "serialize", "deserialize"]; copy_serializable_fields(object_fleet, save_data, excluded_from_save); return save_data; } deserialize = function(save_data){ - var exclusions = ["id"]; // skip automatic setting of certain vars, handle explicitly later + var exclusions = ["id","cargo_data"]; // skip automatic setting of certain vars, handle explicitly later // Automatic var setting var all_names = struct_get_names(save_data); @@ -106,6 +107,16 @@ deserialize = function(save_data){ show_debug_message(e); } } + if(struct_exists(save_data, "cargo_data")){ + variable_struct_set(self, "cargo_data", save_data.cargo_data); + show_debug_message("cargo_data"); + if (fleet_has_cargo("ork_warboss")){ + show_debug_message("warboss_fleet"); + var _boss = new NewPlanetFeature(P_features.OrkWarboss); + _boss.load_json_data(cargo_data.ork_warboss) + cargo_data.ork_warboss = _boss; + } + } if(save_data.orbiting != 0 && action == ""){ var nearest_star = instance_nearest(x, y, obj_star); diff --git a/sounds/snd_battle/snd_battle.yy b/sounds/snd_battle/snd_battle.yy index 2e175a9216..cc09b7e100 100644 --- a/sounds/snd_battle/snd_battle.yy +++ b/sounds/snd_battle/snd_battle.yy @@ -1,13 +1,14 @@ { - "$GMSound":"v1", + "$GMSound":"v2", "%Name":"snd_battle", "audioGroupId":{ "name":"audiogroup_default", "path":"audiogroups/audiogroup_default", }, "bitDepth":1, - "bitRate":192, + "channelFormat":0, "compression":3, + "compressionQuality":6, "conversionMode":0, "duration":31.423855, "exportDir":"sounds", @@ -21,6 +22,5 @@ "resourceVersion":"2.0", "sampleRate":44100, "soundFile":"snd_battle", - "type":0, "volume":1.0, } \ No newline at end of file diff --git a/sounds/snd_blood/snd_blood.yy b/sounds/snd_blood/snd_blood.yy index 3292768151..f02696aa93 100644 --- a/sounds/snd_blood/snd_blood.yy +++ b/sounds/snd_blood/snd_blood.yy @@ -1,13 +1,14 @@ { - "$GMSound":"v1", + "$GMSound":"v2", "%Name":"snd_blood", "audioGroupId":{ "name":"audiogroup_default", "path":"audiogroups/audiogroup_default", }, "bitDepth":1, - "bitRate":192, + "channelFormat":0, "compression":3, + "compressionQuality":6, "conversionMode":0, "duration":120.9178, "exportDir":"sounds", @@ -21,6 +22,5 @@ "resourceVersion":"2.0", "sampleRate":44100, "soundFile":"snd_blood", - "type":0, "volume":1.0, } \ No newline at end of file diff --git a/sounds/snd_buzz/snd_buzz.yy b/sounds/snd_buzz/snd_buzz.yy index a73db8a9f4..6748afd4ff 100644 --- a/sounds/snd_buzz/snd_buzz.yy +++ b/sounds/snd_buzz/snd_buzz.yy @@ -1,13 +1,14 @@ { - "$GMSound":"v1", + "$GMSound":"v2", "%Name":"snd_buzz", "audioGroupId":{ "name":"audiogroup_default", "path":"audiogroups/audiogroup_default", }, "bitDepth":1, - "bitRate":192, + "channelFormat":0, "compression":0, + "compressionQuality":6, "conversionMode":0, "duration":1.5426531, "exportDir":"sounds", @@ -21,6 +22,5 @@ "resourceVersion":"2.0", "sampleRate":44100, "soundFile":"snd_buzz", - "type":0, "volume":0.44, } \ No newline at end of file diff --git a/sounds/snd_click/snd_click.yy b/sounds/snd_click/snd_click.yy index 0943be6175..b3837f0e5e 100644 --- a/sounds/snd_click/snd_click.yy +++ b/sounds/snd_click/snd_click.yy @@ -1,13 +1,14 @@ { - "$GMSound":"v1", + "$GMSound":"v2", "%Name":"snd_click", "audioGroupId":{ "name":"audiogroup_default", "path":"audiogroups/audiogroup_default", }, "bitDepth":1, - "bitRate":192, + "channelFormat":0, "compression":0, + "compressionQuality":6, "conversionMode":0, "duration":0.3314059, "exportDir":"sounds", @@ -21,6 +22,5 @@ "resourceVersion":"2.0", "sampleRate":44100, "soundFile":"snd_click", - "type":0, "volume":0.13, } \ No newline at end of file diff --git a/sounds/snd_click_small/snd_click_small.yy b/sounds/snd_click_small/snd_click_small.yy index dde4b5de26..fb155b142d 100644 --- a/sounds/snd_click_small/snd_click_small.yy +++ b/sounds/snd_click_small/snd_click_small.yy @@ -1,13 +1,14 @@ { - "$GMSound":"v1", + "$GMSound":"v2", "%Name":"snd_click_small", "audioGroupId":{ "name":"audiogroup_default", "path":"audiogroups/audiogroup_default", }, "bitDepth":1, - "bitRate":192, + "channelFormat":0, "compression":0, + "compressionQuality":6, "conversionMode":0, "duration":0.18285714, "exportDir":"sounds", @@ -21,6 +22,5 @@ "resourceVersion":"2.0", "sampleRate":44100, "soundFile":"snd_click_small", - "type":0, "volume":0.06, } \ No newline at end of file diff --git a/sounds/snd_defeat/snd_defeat.yy b/sounds/snd_defeat/snd_defeat.yy index cdd48c77d9..b303b0c2af 100644 --- a/sounds/snd_defeat/snd_defeat.yy +++ b/sounds/snd_defeat/snd_defeat.yy @@ -1,13 +1,14 @@ { - "$GMSound":"v1", + "$GMSound":"v2", "%Name":"snd_defeat", "audioGroupId":{ "name":"audiogroup_default", "path":"audiogroups/audiogroup_default", }, "bitDepth":1, - "bitRate":192, + "channelFormat":0, "compression":3, + "compressionQuality":6, "conversionMode":0, "duration":0.0, "exportDir":"sounds", @@ -21,6 +22,5 @@ "resourceVersion":"2.0", "sampleRate":44100, "soundFile":"snd_defeat", - "type":0, "volume":1.0, } \ No newline at end of file diff --git a/sounds/snd_diboz/snd_diboz.yy b/sounds/snd_diboz/snd_diboz.yy index 3031b3f5a3..cfc4d8bd6f 100644 --- a/sounds/snd_diboz/snd_diboz.yy +++ b/sounds/snd_diboz/snd_diboz.yy @@ -1,13 +1,14 @@ { - "$GMSound":"v1", + "$GMSound":"v2", "%Name":"snd_diboz", "audioGroupId":{ "name":"audiogroup_default", "path":"audiogroups/audiogroup_default", }, "bitDepth":1, - "bitRate":192, + "channelFormat":0, "compression":3, + "compressionQuality":6, "conversionMode":0, "duration":0.0, "exportDir":"sounds", @@ -21,6 +22,5 @@ "resourceVersion":"2.0", "sampleRate":44100, "soundFile":"snd_diboz", - "type":0, "volume":1.0, } \ No newline at end of file diff --git a/sounds/snd_end_turn/snd_end_turn.yy b/sounds/snd_end_turn/snd_end_turn.yy index aec24b0ee9..7afb4e3689 100644 --- a/sounds/snd_end_turn/snd_end_turn.yy +++ b/sounds/snd_end_turn/snd_end_turn.yy @@ -1,13 +1,14 @@ { - "$GMSound":"v1", + "$GMSound":"v2", "%Name":"snd_end_turn", "audioGroupId":{ "name":"audiogroup_default", "path":"audiogroups/audiogroup_default", }, "bitDepth":1, - "bitRate":192, + "channelFormat":0, "compression":0, + "compressionQuality":6, "conversionMode":0, "duration":0.32666665, "exportDir":"sounds", @@ -21,6 +22,5 @@ "resourceVersion":"2.0", "sampleRate":44100, "soundFile":"snd_end_turn", - "type":0, "volume":1.0, } \ No newline at end of file diff --git a/sounds/snd_error/snd_error.yy b/sounds/snd_error/snd_error.yy index 743777b29d..3b3c192946 100644 --- a/sounds/snd_error/snd_error.yy +++ b/sounds/snd_error/snd_error.yy @@ -1,13 +1,14 @@ { - "$GMSound":"v1", + "$GMSound":"v2", "%Name":"snd_error", "audioGroupId":{ "name":"audiogroup_default", "path":"audiogroups/audiogroup_default", }, "bitDepth":1, - "bitRate":192, + "channelFormat":0, "compression":0, + "compressionQuality":6, "conversionMode":0, "duration":0.26938775, "exportDir":"sounds", @@ -21,6 +22,5 @@ "resourceVersion":"2.0", "sampleRate":44100, "soundFile":"snd_error", - "type":0, "volume":1.0, } \ No newline at end of file diff --git a/sounds/snd_identify/snd_identify.yy b/sounds/snd_identify/snd_identify.yy index b1c6cc15cf..6c9eb11448 100644 --- a/sounds/snd_identify/snd_identify.yy +++ b/sounds/snd_identify/snd_identify.yy @@ -1,13 +1,14 @@ { - "$GMSound":"v1", + "$GMSound":"v2", "%Name":"snd_identify", "audioGroupId":{ "name":"audiogroup_default", "path":"audiogroups/audiogroup_default", }, "bitDepth":1, - "bitRate":192, + "channelFormat":0, "compression":0, + "compressionQuality":6, "conversionMode":0, "duration":0.76800454, "exportDir":"sounds", @@ -21,6 +22,5 @@ "resourceVersion":"2.0", "sampleRate":44100, "soundFile":"snd_identify", - "type":0, "volume":1.0, } \ No newline at end of file diff --git a/sounds/snd_legal/snd_legal.yy b/sounds/snd_legal/snd_legal.yy index 39a6d25741..f3bce2b3c3 100644 --- a/sounds/snd_legal/snd_legal.yy +++ b/sounds/snd_legal/snd_legal.yy @@ -1,13 +1,14 @@ { - "$GMSound":"v1", + "$GMSound":"v2", "%Name":"snd_legal", "audioGroupId":{ "name":"audiogroup_default", "path":"audiogroups/audiogroup_default", }, "bitDepth":1, - "bitRate":192, + "channelFormat":0, "compression":3, + "compressionQuality":6, "conversionMode":0, "duration":30.249727, "exportDir":"sounds", @@ -21,6 +22,5 @@ "resourceVersion":"2.0", "sampleRate":44100, "soundFile":"snd_legal", - "type":0, "volume":1.0, } \ No newline at end of file diff --git a/sounds/snd_postbattle/snd_postbattle.yy b/sounds/snd_postbattle/snd_postbattle.yy index 1436632884..32c092a3e0 100644 --- a/sounds/snd_postbattle/snd_postbattle.yy +++ b/sounds/snd_postbattle/snd_postbattle.yy @@ -1,13 +1,14 @@ { - "$GMSound":"v1", + "$GMSound":"v2", "%Name":"snd_postbattle", "audioGroupId":{ "name":"audiogroup_default", "path":"audiogroups/audiogroup_default", }, "bitDepth":1, - "bitRate":192, + "channelFormat":0, "compression":3, + "compressionQuality":6, "conversionMode":0, "duration":137.55646, "exportDir":"sounds", @@ -21,6 +22,5 @@ "resourceVersion":"2.0", "sampleRate":44100, "soundFile":"snd_postbattle", - "type":0, "volume":1.0, } \ No newline at end of file diff --git a/sounds/snd_prologue/snd_prologue.yy b/sounds/snd_prologue/snd_prologue.yy index 4e3b9c055d..96e43444b8 100644 --- a/sounds/snd_prologue/snd_prologue.yy +++ b/sounds/snd_prologue/snd_prologue.yy @@ -1,13 +1,14 @@ { - "$GMSound":"v1", + "$GMSound":"v2", "%Name":"snd_prologue", "audioGroupId":{ "name":"audiogroup_default", "path":"audiogroups/audiogroup_default", }, "bitDepth":1, - "bitRate":192, + "channelFormat":0, "compression":3, + "compressionQuality":6, "conversionMode":0, "duration":103.17932, "exportDir":"sounds", @@ -21,6 +22,5 @@ "resourceVersion":"2.0", "sampleRate":44100, "soundFile":"snd_prologue", - "type":0, "volume":1.0, } \ No newline at end of file diff --git a/sounds/snd_redownload/snd_redownload.yy b/sounds/snd_redownload/snd_redownload.yy index 668583a29e..3835f36f53 100644 --- a/sounds/snd_redownload/snd_redownload.yy +++ b/sounds/snd_redownload/snd_redownload.yy @@ -1,13 +1,14 @@ { - "$GMSound":"v1", + "$GMSound":"v2", "%Name":"snd_redownload", "audioGroupId":{ "name":"audiogroup_default", "path":"audiogroups/audiogroup_default", }, "bitDepth":1, - "bitRate":192, + "channelFormat":0, "compression":0, + "compressionQuality":6, "conversionMode":0, "duration":1.8111565, "exportDir":"sounds", @@ -21,6 +22,5 @@ "resourceVersion":"2.0", "sampleRate":44100, "soundFile":"snd_redownload", - "type":0, "volume":1.0, } \ No newline at end of file diff --git a/sounds/snd_royal/snd_royal.yy b/sounds/snd_royal/snd_royal.yy index c1d422ca33..a242f6b95e 100644 --- a/sounds/snd_royal/snd_royal.yy +++ b/sounds/snd_royal/snd_royal.yy @@ -1,13 +1,14 @@ { - "$GMSound":"v1", + "$GMSound":"v2", "%Name":"snd_royal", "audioGroupId":{ "name":"audiogroup_default", "path":"audiogroups/audiogroup_default", }, "bitDepth":1, - "bitRate":256, + "channelFormat":1, "compression":3, + "compressionQuality":8, "conversionMode":0, "duration":19.401724, "exportDir":"sounds", @@ -21,6 +22,5 @@ "resourceVersion":"2.0", "sampleRate":44100, "soundFile":"snd_royal", - "type":1, "volume":1.0, } \ No newline at end of file diff --git a/sounds/snd_stc/snd_stc.yy b/sounds/snd_stc/snd_stc.yy index 02cbd41d76..0db2a12c35 100644 --- a/sounds/snd_stc/snd_stc.yy +++ b/sounds/snd_stc/snd_stc.yy @@ -1,13 +1,14 @@ { - "$GMSound":"v1", + "$GMSound":"v2", "%Name":"snd_stc", "audioGroupId":{ "name":"audiogroup_default", "path":"audiogroups/audiogroup_default", }, "bitDepth":1, - "bitRate":192, + "channelFormat":0, "compression":0, + "compressionQuality":6, "conversionMode":0, "duration":0.59210885, "exportDir":"sounds", @@ -21,6 +22,5 @@ "resourceVersion":"2.0", "sampleRate":44100, "soundFile":"snd_stc", - "type":0, "volume":1.0, } \ No newline at end of file diff --git a/sounds/snd_vode/snd_vode.yy b/sounds/snd_vode/snd_vode.yy index 919cf3e443..32479d46cc 100644 --- a/sounds/snd_vode/snd_vode.yy +++ b/sounds/snd_vode/snd_vode.yy @@ -1,13 +1,14 @@ { - "$GMSound":"v1", + "$GMSound":"v2", "%Name":"snd_vode", "audioGroupId":{ "name":"audiogroup_default", "path":"audiogroups/audiogroup_default", }, "bitDepth":1, - "bitRate":256, + "channelFormat":1, "compression":3, + "compressionQuality":8, "conversionMode":0, "duration":118.41306, "exportDir":"sounds", @@ -21,6 +22,5 @@ "resourceVersion":"2.0", "sampleRate":44100, "soundFile":"snd_vode", - "type":1, "volume":1.0, } \ No newline at end of file diff --git a/sprites/spr_checker_texture/spr_checker_texture.yy b/sprites/spr_checker_texture/spr_checker_texture.yy index 050b0bc62d..3cb1256c79 100644 --- a/sprites/spr_checker_texture/spr_checker_texture.yy +++ b/sprites/spr_checker_texture/spr_checker_texture.yy @@ -82,6 +82,8 @@ "playbackSpeedType":0, "resourceType":"GMSequence", "resourceVersion":"2.0", + "seqHeight":180.0, + "seqWidth":180.0, "showBackdrop":true, "showBackdropImage":false, "timeUnits":1, diff --git a/sprites/spr_mk7_complex_knees/spr_mk7_complex_knees.yy b/sprites/spr_mk7_complex_knees/spr_mk7_complex_knees.yy index fadcbfe35b..7927be7296 100644 --- a/sprites/spr_mk7_complex_knees/spr_mk7_complex_knees.yy +++ b/sprites/spr_mk7_complex_knees/spr_mk7_complex_knees.yy @@ -83,6 +83,8 @@ "playbackSpeedType":0, "resourceType":"GMSequence", "resourceVersion":"2.0", + "seqHeight":232.0, + "seqWidth":164.0, "showBackdrop":true, "showBackdropImage":false, "timeUnits":1, diff --git a/sprites/spr_psy_hood_alpha/spr_psy_hood_alpha.yy b/sprites/spr_psy_hood_alpha/spr_psy_hood_alpha.yy index e4ced4a905..0bb769cfc1 100644 --- a/sprites/spr_psy_hood_alpha/spr_psy_hood_alpha.yy +++ b/sprites/spr_psy_hood_alpha/spr_psy_hood_alpha.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_psy_hood_alpha", "bboxMode":0, "bbox_bottom":145, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"8d214563-cc0c-4310-a5c4-13f0a699a86f","name":"8d214563-cc0c-4310-a5c4-13f0a699a86f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"8d214563-cc0c-4310-a5c4-13f0a699a86f","name":"8d214563-cc0c-4310-a5c4-13f0a699a86f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -70,9 +70,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"8d214563-cc0c-4310-a5c4-13f0a699a86f","path":"sprites/spr_psy_hood_alpha/spr_psy_hood_alpha.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"51ba9fd0-369a-4be7-b5c8-f8d75c8a38d9","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"8d214563-cc0c-4310-a5c4-13f0a699a86f","path":"sprites/spr_psy_hood_alpha/spr_psy_hood_alpha.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"51ba9fd0-369a-4be7-b5c8-f8d75c8a38d9","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_psy_hood_alpha2/spr_psy_hood_alpha2.yy b/sprites/spr_psy_hood_alpha2/spr_psy_hood_alpha2.yy index 7b04c905e4..adb3b5b37b 100644 --- a/sprites/spr_psy_hood_alpha2/spr_psy_hood_alpha2.yy +++ b/sprites/spr_psy_hood_alpha2/spr_psy_hood_alpha2.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_psy_hood_alpha2", "bboxMode":0, "bbox_bottom":145, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"e8a1632c-8084-4d13-8d30-4732feda986c","name":"e8a1632c-8084-4d13-8d30-4732feda986c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"e8a1632c-8084-4d13-8d30-4732feda986c","name":"e8a1632c-8084-4d13-8d30-4732feda986c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -70,9 +70,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"e8a1632c-8084-4d13-8d30-4732feda986c","path":"sprites/spr_psy_hood_alpha2/spr_psy_hood_alpha2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"e9985ee2-2374-47e6-89f4-6a2b25a8ec5b","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"e8a1632c-8084-4d13-8d30-4732feda986c","path":"sprites/spr_psy_hood_alpha2/spr_psy_hood_alpha2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"e9985ee2-2374-47e6-89f4-6a2b25a8ec5b","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_ship_aconite/spr_ship_aconite.yy b/sprites/spr_ship_aconite/spr_ship_aconite.yy index 64b55a553d..2fc24c804a 100644 --- a/sprites/spr_ship_aconite/spr_ship_aconite.yy +++ b/sprites/spr_ship_aconite/spr_ship_aconite.yy @@ -63,18 +63,19 @@ "playbackSpeedType":1, "resourceType":"GMSequence", "resourceVersion":"2.0", + "seqHeight":32.0, + "seqWidth":105.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":"0135cb67-e9d4-47f9-ae29-035c8a8dfafa","path":"sprites/spr_ship_aconite/spr_ship_aconite.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"08b75cf2-26f5-4e6f-ad20-0821d2aa305a","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"0135cb67-e9d4-47f9-ae29-035c8a8dfafa","path":"sprites/spr_ship_aconite/spr_ship_aconite.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"08b75cf2-26f5-4e6f-ad20-0821d2aa305a","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":52, "yorigin":16, diff --git a/sprites/spr_ship_apoc/spr_ship_apoc.yy b/sprites/spr_ship_apoc/spr_ship_apoc.yy index 08ebbee5a5..d3f3356615 100644 --- a/sprites/spr_ship_apoc/spr_ship_apoc.yy +++ b/sprites/spr_ship_apoc/spr_ship_apoc.yy @@ -63,18 +63,19 @@ "playbackSpeedType":1, "resourceType":"GMSequence", "resourceVersion":"2.0", + "seqHeight":92.0, + "seqWidth":230.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":"6dc6f331-41a9-44b7-a4c9-24ab7fe44bd0","path":"sprites/spr_ship_apoc/spr_ship_apoc.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"0bee0e78-a619-4cda-9d54-12a929878829","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"6dc6f331-41a9-44b7-a4c9-24ab7fe44bd0","path":"sprites/spr_ship_apoc/spr_ship_apoc.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"0bee0e78-a619-4cda-9d54-12a929878829","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":80, "yorigin":45, diff --git a/sprites/spr_ship_aven/spr_ship_aven.yy b/sprites/spr_ship_aven/spr_ship_aven.yy index 54701be189..adeacc17b9 100644 --- a/sprites/spr_ship_aven/spr_ship_aven.yy +++ b/sprites/spr_ship_aven/spr_ship_aven.yy @@ -63,18 +63,19 @@ "playbackSpeedType":1, "resourceType":"GMSequence", "resourceVersion":"2.0", + "seqHeight":60.0, + "seqWidth":165.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":"3b549580-f553-4212-b6bb-c41c3ff18e19","path":"sprites/spr_ship_aven/spr_ship_aven.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"5c4593dc-7dbb-404f-8004-0357ea802527","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"3b549580-f553-4212-b6bb-c41c3ff18e19","path":"sprites/spr_ship_aven/spr_ship_aven.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"5c4593dc-7dbb-404f-8004-0357ea802527","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":82, "yorigin":30, diff --git a/sprites/spr_ship_nem/spr_ship_nem.yy b/sprites/spr_ship_nem/spr_ship_nem.yy index 4aee217c58..8e55215f6d 100644 --- a/sprites/spr_ship_nem/spr_ship_nem.yy +++ b/sprites/spr_ship_nem/spr_ship_nem.yy @@ -63,18 +63,19 @@ "playbackSpeedType":1, "resourceType":"GMSequence", "resourceVersion":"2.0", + "seqHeight":92.0, + "seqWidth":230.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":"917f9e5a-3547-4828-b346-63dc57b3f0a1","path":"sprites/spr_ship_nem/spr_ship_nem.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"d9a533f1-3c83-49c3-9c5a-644d09d03580","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"917f9e5a-3547-4828-b346-63dc57b3f0a1","path":"sprites/spr_ship_nem/spr_ship_nem.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"d9a533f1-3c83-49c3-9c5a-644d09d03580","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":100, "yorigin":45, From 19c8bbe7446bc4e8690f658e51d84d6d4a0bc943 Mon Sep 17 00:00:00 2001 From: Luke Van Epen Date: Sat, 7 Jun 2025 22:18:42 +1000 Subject: [PATCH 080/286] chore: Bump IDE version to 815 (#865) --- ChapterMaster.yyp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ChapterMaster.yyp b/ChapterMaster.yyp index 66c4506a26..f4f47f951e 100644 --- a/ChapterMaster.yyp +++ b/ChapterMaster.yyp @@ -572,7 +572,7 @@ "isEcma":false, "LibraryEmitters":[], "MetaData":{ - "IDEVersion":"2024.1400.0.808", + "IDEVersion":"2024.1400.0.815", }, "name":"ChapterMaster", "resources":[ From ac5de6c4d82b6c03333cdae0970d124d48cd6afa Mon Sep 17 00:00:00 2001 From: Luke Van Epen Date: Sat, 7 Jun 2025 22:20:27 +1000 Subject: [PATCH 081/286] fix: Dead planet ownership defaulting to orks (#864) --- scripts/scr_star_ownership/scr_star_ownership.gml | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/scripts/scr_star_ownership/scr_star_ownership.gml b/scripts/scr_star_ownership/scr_star_ownership.gml index 03cebbc94f..6cfb3a685a 100644 --- a/scripts/scr_star_ownership/scr_star_ownership.gml +++ b/scripts/scr_star_ownership/scr_star_ownership.gml @@ -1,3 +1,4 @@ +/// @mixin obj_star function scr_star_ownership(argument0) { @@ -10,7 +11,7 @@ function scr_star_ownership(argument0) { run+=1; if (p_owner[run]=eFACTION.Player){ if (dispo[run]<95 && !planet_feature_bool(p_feature[run], P_features.Monastery)){ - p_owner[run]=2; + p_owner[run]=eFACTION.Imperium; } } var _set_to_first = false; @@ -25,11 +26,11 @@ function scr_star_ownership(argument0) { p_owner[run]=p_first[run]; } } - if (p_type[run]=="Dead") and (p_owner[run]!=2) and (p_first[run]!=1) and (p_first[run]!=5){ - p_owner[run]=2; + if (p_type[run]=="Dead") and (p_owner[run]!=eFACTION.Imperium) and (p_first[run]!=eFACTION.Player) and (p_first[run]!=eFACTION.Ecclesiarchy){ + p_owner[run]=eFACTION.Imperium; } - if (p_owner[run]=8) and (p_tau[run]=0) and (p_pdf[run]=0){ - p_owner[run]=2; + if (p_owner[run]=eFACTION.Tau) and (p_tau[run]=0) and (p_pdf[run]=0){ + p_owner[run]=eFACTION.Imperium; p_influence[run][eFACTION.Tau]=round(p_influence[run][eFACTION.Tau]/2); } if (p_owner[run]=10) and (p_chaos[run]=0) and (p_traitors[run]=0) and (p_population[run]<=0){ @@ -115,7 +116,7 @@ function scr_star_ownership(argument0) { owner = eFACTION.Chaos; } else if (tau_owner>imperium_owner) and (tau_owner>forge_owner) and (tau_owner>ork_owner) and (tau_owner>necrons_owner) and (tau_owner>player_owner) and (tau_owner>traitors_owner){ owner = eFACTION.Tau - } else if (ork_owner>player_owner) and (ork_owner>tau_owner) and (ork_owner>traitors_owner) and (ork_owner>necrons_owner){ + } else if (ork_owner>imperium_owner) && (ork_owner>forge_owner) && (ork_owner>player_owner) and (ork_owner>tau_owner) and (ork_owner>traitors_owner) and (ork_owner>necrons_owner){ owner = eFACTION.Ork; } else if (imperium_owner>0) and (imperium_owner>=forge_owner) and (imperium_owner>=tau_owner) and (imperium_owner>=necrons_owner) and (imperium_owner>=traitors_owner) and (imperium_owner>=ork_owner) and (player_owner=0){ owner = eFACTION.Imperium; From cfedb4f74570a3bb627160f6a5e322d261741500 Mon Sep 17 00:00:00 2001 From: Frost-bit-jpg Date: Sat, 7 Jun 2025 22:46:49 +1000 Subject: [PATCH 082/286] feat: Adding event logs to alerts (#866) --- .../scr_mission_functions.gml | 3 ++- scripts/scr_random_event/scr_random_event.gml | 18 +++++++++--------- .../scr_specialist_point_handler.gml | 4 ++++ 3 files changed, 15 insertions(+), 10 deletions(-) diff --git a/scripts/scr_mission_functions/scr_mission_functions.gml b/scripts/scr_mission_functions/scr_mission_functions.gml index 1327adbcfe..acd92738b1 100644 --- a/scripts/scr_mission_functions/scr_mission_functions.gml +++ b/scripts/scr_mission_functions/scr_mission_functions.gml @@ -116,6 +116,7 @@ function init_marine_acting_strange(){ } text += " is behaving strangely."; scr_alert("color","lol",text,0,0); + scr_event_log("color",text); } function init_garrison_mission(planet, star, mission_slot){ @@ -643,4 +644,4 @@ function problem_has_key_and_value(planet, problem,key,value="",star="none"){ function mission_rewards(){ -} \ No newline at end of file +} diff --git a/scripts/scr_random_event/scr_random_event.gml b/scripts/scr_random_event/scr_random_event.gml index 8984b8d188..658ea0c3e5 100644 --- a/scripts/scr_random_event/scr_random_event.gml +++ b/scripts/scr_random_event/scr_random_event.gml @@ -304,6 +304,7 @@ function scr_random_event(execute_now) { } scr_popup("Promotions!",text,"distinguished",""); + scr_event_log("green",text); evented = true; } @@ -660,7 +661,8 @@ function scr_random_event(execute_now) { text +="the Chapter Garage."; break; } - scr_alert("color","lol",text,0,0); + scr_alert("color","lol",text,0,0); + scr_event_log("red",text); evented = true; } @@ -694,12 +696,9 @@ function scr_random_event(execute_now) { else{ star_id.storm += time; evented = true; - if (own==1){ - scr_alert("red","Warp","Warp Storms rage across the "+string(star_id.name)+" system.",star_id.x,star_id.y); - } - else{ - scr_alert("green","Warp","Warp Storms rage across the "+string(star_id.name)+" system.",star_id.x,star_id.y); - } + var _col = own == 1 ? "red" : "green"; + scr_alert(_col, "Warp", $"Warp Storms rage across the {star_id.name} system.", star_id.x, star_id.y); + scr_event_log(_col, $"Warp Storms rage across the {star_id.name} system.", star_id.x, star_id.y); } } @@ -777,7 +776,8 @@ function scr_random_event(execute_now) { log_error("RE: Enemy Forces, couldn't pick an enemy faction"); exit; } - scr_alert("red","enemy",string(text)+" forces suddenly appear at "+string(star_id.name)+" "+string(planet)+"!",star_id.x,star_id.y); + scr_alert("red","enemy", $"{text} forces suddenly appear at {star_id.name} {planet}!",star_id.x,star_id.y); + scr_event_log("red",$"{text} forces suddenly appear at {star_id.name} {planet}!",star_id.x,star_id.y); evented = true; } } @@ -977,4 +977,4 @@ function event_fallen(){ star_alert.col="purple"; } -} \ No newline at end of file +} diff --git a/scripts/scr_specialist_point_handler/scr_specialist_point_handler.gml b/scripts/scr_specialist_point_handler/scr_specialist_point_handler.gml index 2c4944f801..786cf38ca4 100644 --- a/scripts/scr_specialist_point_handler/scr_specialist_point_handler.gml +++ b/scripts/scr_specialist_point_handler/scr_specialist_point_handler.gml @@ -251,6 +251,7 @@ function SpecialistPointHandler() constructor{ } else if (charisma_test[0]==2){ if (charisma_test[1] > 40 && _noticed_heresy=false){ scr_alert("purple","Tech Heresy",$"{_current_tech.name_role()} contacts you concerned of Tech Heresy in the Armentarium"); + scr_event_log("purple",$"{_current_tech.name_role()} contacts you concerned of Tech Heresy in the Armentarium"); _noticed_heresy=true; } } @@ -393,6 +394,7 @@ function SpecialistPointHandler() constructor{ obj_controller.gene_seed+=_cur_slave.num; // color / type / text /x/y scr_alert("green","test-slaves",$"Test-Slave Incubators Batch {i} harvested for {_cur_slave.num} Gene-Seed.",0,0); + scr_event_log("green",$"Test-Slave Incubators Batch {i} harvested for {_cur_slave.num} Gene-Seed.",0,0); } else if (_cur_slave.num==0){ array_push(_stack_lost_incubators, i); } @@ -406,9 +408,11 @@ function SpecialistPointHandler() constructor{ } scr_alert("","test-slaves",_lost_inc_string ,0,0); + scr_event_log("","test-slaves",_lost_inc_string ,0,0); } if(_lost_gene_slaves>0){ scr_alert("","test-slaves",$"{_lost_gene_slaves} gene slaves lost due to geneseed instability their incubators have been returned to the armoury",0,0); + scr_event_log("",$"{_lost_gene_slaves} gene slaves lost due to geneseed instability their incubators have been returned to the armoury",0,0); } } static scr_forge_item = function(item){ From 562e6190edc0be0ceab2aeef492e1cf463cf6b44 Mon Sep 17 00:00:00 2001 From: EttyKitty <20323032+EttyKitty@users.noreply.github.com> Date: Sat, 7 Jun 2025 18:17:54 +0300 Subject: [PATCH 083/286] fix: HK Missile stats and vehicle tag (#867) --- scripts/scr_weapon/scr_weapon.gml | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/scripts/scr_weapon/scr_weapon.gml b/scripts/scr_weapon/scr_weapon.gml index c1b8cf8c7b..7fc42eda13 100644 --- a/scripts/scr_weapon/scr_weapon.gml +++ b/scripts/scr_weapon/scr_weapon.gml @@ -1101,7 +1101,16 @@ global.weapons = { "HK Missile": { "abbreviation": "HKMssl", "description": "A single shot hunter killer missile that serves as a powerful anti armour/aircraft deterent.", - "tags": ["HK"] + "attack": { + "standard": 350, + "master_crafted": 400, + "artifact": 450 + }, + "arp": 1, + "range": 50, + "ammo": 1, + "spli": 1, + "tags": ["vehicle"] }, "Twin Linked Heavy Bolter Mount": { "attack": { From e6b7238a8034d03dad406acbfe4006e57cf89594 Mon Sep 17 00:00:00 2001 From: EttyKitty <20323032+EttyKitty@users.noreply.github.com> Date: Sun, 8 Jun 2025 20:55:16 +0300 Subject: [PATCH 084/286] feat: EXP reward cap per unit (#868) --- scripts/scr_after_combat/scr_after_combat.gml | 24 ++++++++++--------- 1 file changed, 13 insertions(+), 11 deletions(-) diff --git a/scripts/scr_after_combat/scr_after_combat.gml b/scripts/scr_after_combat/scr_after_combat.gml index 9cc6cc1f4d..2cf8ed2f75 100644 --- a/scripts/scr_after_combat/scr_after_combat.gml +++ b/scripts/scr_after_combat/scr_after_combat.gml @@ -105,17 +105,19 @@ function assemble_alive_units() { } } -function distribute_experience(_units, _exp_amount) { - var _eligible_units_count = array_length(_units); - var _average_exp = 0; - - if (_eligible_units_count > 0 && _exp_amount > 0) { - var _individual_exp = _exp_amount / _eligible_units_count; - _average_exp = _individual_exp; - for (var i = 0; i < _eligible_units_count; i++) { +function distribute_experience(_units, _total_exp) { + var _unit_count = array_length(_units); + var _exp_reward = 0; + var _exp_reward_max = 5; + var _unit_exp_ceiling = 200; + var _exp_mod_min = 0.1; + + if (_unit_count > 0 && _total_exp > 0) { + _exp_reward = min(_total_exp / _unit_count, _exp_reward_max); + for (var i = 0; i < _unit_count; i++) { var _unit = _units[i]; - var _exp_mod = max(1 - (_unit.experience / 200), 0.1); - var _exp_update_data = _unit.add_exp(_individual_exp*_exp_mod); + var _exp_mod = max(1 - (_unit.experience / _unit_exp_ceiling), _exp_mod_min); + var _exp_update_data = _unit.add_exp(_exp_reward * _exp_mod); var _powers_learned = _exp_update_data[1]; if (_powers_learned > 0) { @@ -125,7 +127,7 @@ function distribute_experience(_units, _exp_amount) { } } - return _average_exp; + return _exp_reward; } /// @mixin From 746f90ca18025e8fe05c8b5b68f8aba6e3614e38 Mon Sep 17 00:00:00 2001 From: Nelsonh <81228864+OH296@users.noreply.github.com> Date: Mon, 9 Jun 2025 14:59:43 +0100 Subject: [PATCH 085/286] fix: Needed an if instead of an and colonist spawning (#870) --- scripts/scr_enemy_ai_d/scr_enemy_ai_d.gml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/scripts/scr_enemy_ai_d/scr_enemy_ai_d.gml b/scripts/scr_enemy_ai_d/scr_enemy_ai_d.gml index 0926392dbd..54c572797b 100644 --- a/scripts/scr_enemy_ai_d/scr_enemy_ai_d.gml +++ b/scripts/scr_enemy_ai_d/scr_enemy_ai_d.gml @@ -406,11 +406,13 @@ function scr_enemy_ai_d() { break; } - if ((p_owner[r]==eFACTION.Imperium) or (p_owner[r]==eFACTION.Ecclesiarchy)) and (p_type[r]!="Lava") and (p_type[r]!="Hive") and (p_type[r]!="Temperate") then array_push(non_priority_requests, r); + if ((p_owner[r]==eFACTION.Imperium) or (p_owner[r]==eFACTION.Ecclesiarchy)){ + array_push(non_priority_requests, r); + } } } - if (array_length(pop_doner_options)>0 && array_length(non_priority_requests) && array_length(priority_requests)){ + if (array_length(pop_doner_options)>0 && (array_length(non_priority_requests) || array_length(priority_requests))){ var onceh=0; var random_chance=floor(random(100))+1; var doner_index = 0; From 0196c4de577f4867cb121e729932daa6c87b9368 Mon Sep 17 00:00:00 2001 From: Nelsonh <81228864+OH296@users.noreply.github.com> Date: Mon, 9 Jun 2025 14:59:55 +0100 Subject: [PATCH 086/286] fix: make tags variable array in beast hunt check (#869) --- scripts/scr_mission_functions/scr_mission_functions.gml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/scr_mission_functions/scr_mission_functions.gml b/scripts/scr_mission_functions/scr_mission_functions.gml index acd92738b1..ecc0aeabbd 100644 --- a/scripts/scr_mission_functions/scr_mission_functions.gml +++ b/scripts/scr_mission_functions/scr_mission_functions.gml @@ -354,7 +354,7 @@ function complete_beast_hunt_mission(targ_planet, problem_index){ } for (var i=0;i Date: Wed, 11 Jun 2025 05:50:28 +1000 Subject: [PATCH 087/286] feat: Added dreads to file loading extra specialists (#871) --- ChapterMaster.yyp | 2 +- datafiles/main/chapters/template.JSON | 7 ++++++- scripts/scr_initialize_custom/scr_initialize_custom.gml | 3 +++ 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/ChapterMaster.yyp b/ChapterMaster.yyp index f4f47f951e..b7ea94f143 100644 --- a/ChapterMaster.yyp +++ b/ChapterMaster.yyp @@ -2,7 +2,7 @@ "$GMProject":"v1", "%Name":"ChapterMaster", "AudioGroups":[ - {"$GMAudioGroup":"v1","%Name":"audiogroup_default","exportDir":"","name":"audiogroup_default","resourceType":"GMAudioGroup","resourceVersion":"2.0","targets":-1,}, + {"$GMAudioGroup":"","%Name":"audiogroup_default","name":"audiogroup_default","resourceType":"GMAudioGroup","resourceVersion":"2.0","targets":-1,}, ], "configs":{ "children":[], diff --git a/datafiles/main/chapters/template.JSON b/datafiles/main/chapters/template.JSON index 6a47dea768..4f4ee40a63 100644 --- a/datafiles/main/chapters/template.JSON +++ b/datafiles/main/chapters/template.JSON @@ -168,15 +168,20 @@ */ "extra_specialists": { "chaplains": 0, + "chaplains_per_company": 0, "techmarines": 0, + "techmarines_per_company": 0, "apothecary": 0, + "apothecary_per_company": 0, "epistolary": 0, + "epistolary_per_company": 0, "codiciery": 0, "lexicanum": 0, "terminator": 0, "assault": 0, "veteran": 0, - "devastator": 0 + "devastator": 0, + "dreadnought": 0 }, /** * * Default Marine strength diff --git a/scripts/scr_initialize_custom/scr_initialize_custom.gml b/scripts/scr_initialize_custom/scr_initialize_custom.gml index 1836a7b4ba..440f5714e3 100644 --- a/scripts/scr_initialize_custom/scr_initialize_custom.gml +++ b/scripts/scr_initialize_custom/scr_initialize_custom.gml @@ -1244,6 +1244,9 @@ function scr_initialize_custom() { case "devastator": devastator = devastator + real(s_val); break; + case "dreadnought": + dreadnought = dreadnought + real(s_val); + break; } } } From 33af3e6266e746ffd0df1c8efb9512b8c9246351 Mon Sep 17 00:00:00 2001 From: Nelsonh <81228864+OH296@users.noreply.github.com> Date: Thu, 12 Jun 2025 13:42:44 +0100 Subject: [PATCH 088/286] feat: Couple of new armour texture options (#872) --- ChapterMaster.yyp | 4 +- .../scr_complex_colour_kit.gml | 5 +- .../58ee1e71-509f-4b0e-ab39-17c8da2a0687.png | Bin 1114 -> 984 bytes .../ef1f92c3-6086-487a-a4a8-c38f6098016b.png | Bin 1114 -> 984 bytes .../58ee1e71-509f-4b0e-ab39-17c8da2a0687.png | Bin 0 -> 884 bytes .../ef1f92c3-6086-487a-a4a8-c38f6098016b.png | Bin 0 -> 884 bytes .../spr_clear_checker/spr_clear_checker.yy | 111 ++++++++++++++++++ sprites/spr_purge_panel/spr_purge_panel.yy | 11 +- .../e7618234-0c05-4d39-9e6c-67e62a6b87ac.png | Bin 0 -> 5646 bytes .../d459e4d3-7468-4be8-8cd6-1f40b937e503.png | Bin 0 -> 5646 bytes .../spr_red_scale_texture.yy | 111 ++++++++++++++++++ 11 files changed, 234 insertions(+), 8 deletions(-) create mode 100644 sprites/spr_clear_checker/58ee1e71-509f-4b0e-ab39-17c8da2a0687.png create mode 100644 sprites/spr_clear_checker/layers/58ee1e71-509f-4b0e-ab39-17c8da2a0687/ef1f92c3-6086-487a-a4a8-c38f6098016b.png create mode 100644 sprites/spr_clear_checker/spr_clear_checker.yy create mode 100644 sprites/spr_red_scale_texture/e7618234-0c05-4d39-9e6c-67e62a6b87ac.png create mode 100644 sprites/spr_red_scale_texture/layers/e7618234-0c05-4d39-9e6c-67e62a6b87ac/d459e4d3-7468-4be8-8cd6-1f40b937e503.png create mode 100644 sprites/spr_red_scale_texture/spr_red_scale_texture.yy diff --git a/ChapterMaster.yyp b/ChapterMaster.yyp index b7ea94f143..f31874b70c 100644 --- a/ChapterMaster.yyp +++ b/ChapterMaster.yyp @@ -2,7 +2,7 @@ "$GMProject":"v1", "%Name":"ChapterMaster", "AudioGroups":[ - {"$GMAudioGroup":"","%Name":"audiogroup_default","name":"audiogroup_default","resourceType":"GMAudioGroup","resourceVersion":"2.0","targets":-1,}, + {"$GMAudioGroup":"v1","%Name":"audiogroup_default","exportDir":"","name":"audiogroup_default","resourceType":"GMAudioGroup","resourceVersion":"2.0","targets":-1,}, ], "configs":{ "children":[], @@ -1048,6 +1048,7 @@ {"id":{"name":"spr_charisma_icon","path":"sprites/spr_charisma_icon/spr_charisma_icon.yy",},}, {"id":{"name":"spr_checker_texture_small","path":"sprites/spr_checker_texture_small/spr_checker_texture_small.yy",},}, {"id":{"name":"spr_checker_texture","path":"sprites/spr_checker_texture/spr_checker_texture.yy",},}, + {"id":{"name":"spr_clear_checker","path":"sprites/spr_clear_checker/spr_clear_checker.yy",},}, {"id":{"name":"spr_cloak_cloth","path":"sprites/spr_cloak_cloth/spr_cloak_cloth.yy",},}, {"id":{"name":"spr_cloak_fur","path":"sprites/spr_cloak_fur/spr_cloak_fur.yy",},}, {"id":{"name":"spr_cloak_image_0","path":"sprites/spr_cloak_image_0/spr_cloak_image_0.yy",},}, @@ -1445,6 +1446,7 @@ {"id":{"name":"spr_railgun","path":"sprites/spr_railgun/spr_railgun.yy",},}, {"id":{"name":"spr_rectangle","path":"sprites/spr_rectangle/spr_rectangle.yy",},}, {"id":{"name":"spr_red_button","path":"sprites/spr_red_button/spr_red_button.yy",},}, + {"id":{"name":"spr_red_scale_texture","path":"sprites/spr_red_scale_texture/spr_red_scale_texture.yy",},}, {"id":{"name":"spr_requisition","path":"sprites/spr_requisition/spr_requisition.yy",},}, {"id":{"name":"spr_research_bar","path":"sprites/spr_research_bar/spr_research_bar.yy",},}, {"id":{"name":"spr_rg_mk5_helm","path":"sprites/spr_rg_mk5_helm/spr_rg_mk5_helm.yy",},}, diff --git a/scripts/scr_complex_colour_kit/scr_complex_colour_kit.gml b/scripts/scr_complex_colour_kit/scr_complex_colour_kit.gml index 7cc3a51022..ca0105dd30 100644 --- a/scripts/scr_complex_colour_kit/scr_complex_colour_kit.gml +++ b/scripts/scr_complex_colour_kit/scr_complex_colour_kit.gml @@ -623,8 +623,9 @@ global.textures = { "Hazzards" : spr_hazzard_texture, "Checks" : spr_checker_texture, "flora_camo" : spr_flora_camo_texture, - "Checks2" : spr_hazzard_texture, - "Checks3" : spr_checker_texture, + "red_scale" : spr_red_scale_texture, + "smallchecks" : spr_checker_texture_small, + "clearchecks" : spr_clear_checker, "Checks4" : spr_hazzard_texture, "Checks5" : spr_checker_texture diff --git a/sprites/spr_checker_texture_small/58ee1e71-509f-4b0e-ab39-17c8da2a0687.png b/sprites/spr_checker_texture_small/58ee1e71-509f-4b0e-ab39-17c8da2a0687.png index f0df36fc083752f5f79a226e76353194d4b10699..3f3a8fcd9b78a844349a4845ede21bf5481200fc 100644 GIT binary patch literal 984 zcmeAS@N?(olHy`uVBq!ia0vp^TR@nD4M^IaWitX&3dtTpz6=aiY77hwEes65fI|H*Yfr06?r;B4q#jUs34D${< z2(UO_{QrOR9Ek~^ecgIrwXFGLaO3&cmw&(4&e(s|USIRt@2{0_&&20)uMIiB|9_`+ z$Im40wK2iw0-ukHMXkJZVa}%3uyrdT!XbGXem9-8uV3LkQnRr&Ov~J4dCtPA*{|4= z_T6yOo+>>nc-w_jrlrh=@j&5Iyk|9|GoH@c)i^_c+Xb(uZO^9YZYlD;>u^RqI%8>( zbMYy$sGZC56rOeKZVB4C&@y$@T5#Bp1~MW^UDeM>T5EIRI?oyA<+6D$z1_pCAN|R7D?4#sWt!r literal 1114 zcmeAS@N?(olHy`uVBq!ia0vp^TR@nD4M^IaWitX&3dtTpz6=aiY77hwEes65fI|H*Yfq~iA)5S5Q;?~={8}nW{ zNU%OEJ@R|M0c&PZoMI18b@{j1d0f*id7e!#vXSdQE|DyA-0+yhV}Hx|OZ995k0g?9 zj?MT#{pe58yoD1VecS&hwXm)=I%CO&3pP);H>&Qq|9)OQBk$SZx~hfYKfTx5^*_(Z zm{*imE=I@uLyaeg^}ubI@W<#+U3Jr*vkJf&+A z1acO4uLwxcNx8M{nP&Ov#`O>6W_>oV+1)y?*87pz)6Gau-`x&&?K+5S^S{eUJ)iM+ z?(;XFfd!IOz`(DwSzU|ik-GDyKhC~5M(7v<%qI71TSIpB& zU^wr)`~O$m-%1;IpyKM&jYuBfegSuw@bBf=y#7yEWgJk~?)JDhg!ONi`N5TEX;FW8 zd-RK&+a>ZW?Ye=XazAfjcuoKmoS9I%5kcmg+QJkUWW+Jfit(SifJGv;QG5 zD&Is4ZP%C&ib-QO=*9DnoPCVl>OP~7W%$vR#9^>ZjFm2H!C8<`)MX5lF!N|bKRM)^%*Vr(`z}U*j#LC!Q+rYrez(AQ} zRx65z-29Zxv`X9>f|H*Yfr06?r;B4q#jUs34D${< z2(UO_{QrOR9Ek~^ecgIrwXFGLaO3&cmw&(4&e(s|USIRt@2{0_&&20)uMIiB|9_`+ z$Im40wK2iw0-ukHMXkJZVa}%3uyrdT!XbGXem9-8uV3LkQnRr&Ov~J4dCtPA*{|4= z_T6yOo+>>nc-w_jrlrh=@j&5Iyk|9|GoH@c)i^_c+Xb(uZO^9YZYlD;>u^RqI%8>( zbMYy$sGZC56rOeKZVB4C&@y$@T5#Bp1~MW^UDeM>T5EIRI?oyA<+6D$z1_pCAN|R7D?4#sWt!r literal 1114 zcmeAS@N?(olHy`uVBq!ia0vp^TR@nD4M^IaWitX&3dtTpz6=aiY77hwEes65fI|H*Yfq~iA)5S5Q;?~={8}nW{ zNU%OEJ@R|M0c&PZoMI18b@{j1d0f*id7e!#vXSdQE|DyA-0+yhV}Hx|OZ995k0g?9 zj?MT#{pe58yoD1VecS&hwXm)=I%CO&3pP);H>&Qq|9)OQBk$SZx~hfYKfTx5^*_(Z zm{*imE=I@uLyaeg^}ubI@W<#+U3Jr*vkJf&+A z1acO4uLwxcNx8M{nP&Ov#`O>6W_>oV+1)y?*87pz)6Gau-`x&&?K+5S^S{eUJ)iM+ z?(;XFfd!IOz`(DwSzU|ik-GDyKhC~5M(7v<%qI71TSIpB& zU^wr)`~O$m-%1;IpyKM&jYuBfegSuw@bBf=y#7yEWgJk~?)JDhg!ONi`N5TEX;FW8 zd-RK&+a>ZW?Ye=XazAfjcuoKmoS9I%5kcmg+QJkUWW+Jfit(SifJGv;QG5 zD&Is4ZP%C&ib-QO=*9DnoPCVl>OP~7W%$vR#9^>ZjFm2H!C8<`)MX5lF!N|bKRM)^%*Vr(`z}U*j#LC!Q+rYrez(AQ} zRx65z-29Zxv`X9>f|H*Yfq^OA)5S5Q;?~=nhFlE} z0xSnZpZxoO&)dY@bmB6tDV(!icO<91tGrpg-~Mb=_M12V_F1z#vG{f^@Dw!Bygt9~ z#oIUg-o<1D!Gw-iXl~(tizE=o^)|>_e3ppgWF@ew=}x<^oNHBcy|9D>B=~6Q1--4s z3qhtefdqlty+^e}f_FFt-6>|H;#Ga=Uq0^uCPLK`*NBpo#FA92>+|TpLgigQu&X%Q~loCIDvOM9lyI literal 0 HcmV?d00001 diff --git a/sprites/spr_clear_checker/layers/58ee1e71-509f-4b0e-ab39-17c8da2a0687/ef1f92c3-6086-487a-a4a8-c38f6098016b.png b/sprites/spr_clear_checker/layers/58ee1e71-509f-4b0e-ab39-17c8da2a0687/ef1f92c3-6086-487a-a4a8-c38f6098016b.png new file mode 100644 index 0000000000000000000000000000000000000000..19bf6388b199fb5c12384b20e0257e9508b4e3f2 GIT binary patch literal 884 zcmeAS@N?(olHy`uVBq!ia0vp^TR@nD4M^IaWitX&3dtTpz6=aiY77hwEes65fI|H*Yfq^OA)5S5Q;?~=nhFlE} z0xSnZpZxoO&)dY@bmB6tDV(!icO<91tGrpg-~Mb=_M12V_F1z#vG{f^@Dw!Bygt9~ z#oIUg-o<1D!Gw-iXl~(tizE=o^)|>_e3ppgWF@ew=}x<^oNHBcy|9D>B=~6Q1--4s z3qhtefdqlty+^e}f_FFt-6>|H;#Ga=Uq0^uCPLK`*NBpo#FA92q-|heWnkcyRoIQ9AvZrIGp!Q025a+^=0FV^a2rZ8b5n~;5_1c1 V>&a1i0n9E844$rjF6*2UngH!JL_Gii literal 0 HcmV?d00001 diff --git a/sprites/spr_clear_checker/spr_clear_checker.yy b/sprites/spr_clear_checker/spr_clear_checker.yy new file mode 100644 index 0000000000..b3ddab2f6b --- /dev/null +++ b/sprites/spr_clear_checker/spr_clear_checker.yy @@ -0,0 +1,111 @@ +{ + "$GMSprite":"v2", + "%Name":"spr_clear_checker", + "bboxMode":0, + "bbox_bottom":179, + "bbox_left":0, + "bbox_right":179, + "bbox_top":0, + "collisionKind":1, + "collisionTolerance":0, + "DynamicTexturePage":false, + "edgeFiltering":false, + "For3D":true, + "frames":[ + {"$GMSpriteFrame":"v1","%Name":"58ee1e71-509f-4b0e-ab39-17c8da2a0687","name":"58ee1e71-509f-4b0e-ab39-17c8da2a0687","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + ], + "gridX":0, + "gridY":0, + "height":180, + "HTile":true, + "layers":[ + {"$GMImageLayer":"","%Name":"ef1f92c3-6086-487a-a4a8-c38f6098016b","blendMode":0,"displayName":"default","isLocked":false,"name":"ef1f92c3-6086-487a-a4a8-c38f6098016b","opacity":100.0,"resourceType":"GMImageLayer","resourceVersion":"2.0","visible":true,}, + ], + "name":"spr_clear_checker", + "nineSlice":{ + "$GMNineSliceData":"", + "bottom":0, + "enabled":false, + "guideColour":[4294902015,4294902015,4294902015,4294902015,], + "highlightColour":1728023040, + "highlightStyle":0, + "left":0, + "resourceType":"GMNineSliceData", + "resourceVersion":"2.0", + "right":0, + "tileMode":[ + 0, + 0, + 0, + 0, + 0, + ], + "top":0, + }, + "origin":0, + "parent":{ + "name":"textures", + "path":"folders/Sprites/Marine Viewer/textures.yy", + }, + "preMultiplyAlpha":false, + "resourceType":"GMSprite", + "resourceVersion":"2.0", + "sequence":{ + "$GMSequence":"v1", + "%Name":"spr_clear_checker", + "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_clear_checker", + "playback":1, + "playbackSpeed":30.0, + "playbackSpeedType":0, + "resourceType":"GMSequence", + "resourceVersion":"2.0", + "seqHeight":180.0, + "seqWidth":180.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":"58ee1e71-509f-4b0e-ab39-17c8da2a0687","path":"sprites/spr_clear_checker/spr_clear_checker.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"1e6e1650-2926-4786-b31b-bbc04b9c7746","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":true, + "width":180, +} \ No newline at end of file diff --git a/sprites/spr_purge_panel/spr_purge_panel.yy b/sprites/spr_purge_panel/spr_purge_panel.yy index 95ff974a51..9942712f36 100644 --- a/sprites/spr_purge_panel/spr_purge_panel.yy +++ b/sprites/spr_purge_panel/spr_purge_panel.yy @@ -63,18 +63,19 @@ "playbackSpeedType":1, "resourceType":"GMSequence", "resourceVersion":"2.0", + "seqHeight":400.0, + "seqWidth":530.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":"92a13947-7100-4a9e-96d0-2af58cd2d330","path":"sprites/spr_purge_panel/spr_purge_panel.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"89cc209d-0fa1-4713-be02-efb2bfdf7d52","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"92a13947-7100-4a9e-96d0-2af58cd2d330","path":"sprites/spr_purge_panel/spr_purge_panel.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"89cc209d-0fa1-4713-be02-efb2bfdf7d52","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_red_scale_texture/e7618234-0c05-4d39-9e6c-67e62a6b87ac.png b/sprites/spr_red_scale_texture/e7618234-0c05-4d39-9e6c-67e62a6b87ac.png new file mode 100644 index 0000000000000000000000000000000000000000..229ed73bb88eceb096a3f440b971305e3802dee9 GIT binary patch literal 5646 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 QP0Io3X~8us)onxn2B_!SMF0Q* literal 0 HcmV?d00001 diff --git a/sprites/spr_red_scale_texture/layers/e7618234-0c05-4d39-9e6c-67e62a6b87ac/d459e4d3-7468-4be8-8cd6-1f40b937e503.png b/sprites/spr_red_scale_texture/layers/e7618234-0c05-4d39-9e6c-67e62a6b87ac/d459e4d3-7468-4be8-8cd6-1f40b937e503.png new file mode 100644 index 0000000000000000000000000000000000000000..229ed73bb88eceb096a3f440b971305e3802dee9 GIT binary patch literal 5646 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 QP0Io3X~8us)onxn2B_!SMF0Q* literal 0 HcmV?d00001 diff --git a/sprites/spr_red_scale_texture/spr_red_scale_texture.yy b/sprites/spr_red_scale_texture/spr_red_scale_texture.yy new file mode 100644 index 0000000000..1b42ac313b --- /dev/null +++ b/sprites/spr_red_scale_texture/spr_red_scale_texture.yy @@ -0,0 +1,111 @@ +{ + "$GMSprite":"v2", + "%Name":"spr_red_scale_texture", + "bboxMode":0, + "bbox_bottom":179, + "bbox_left":0, + "bbox_right":179, + "bbox_top":0, + "collisionKind":1, + "collisionTolerance":0, + "DynamicTexturePage":false, + "edgeFiltering":false, + "For3D":true, + "frames":[ + {"$GMSpriteFrame":"v1","%Name":"e7618234-0c05-4d39-9e6c-67e62a6b87ac","name":"e7618234-0c05-4d39-9e6c-67e62a6b87ac","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + ], + "gridX":0, + "gridY":0, + "height":180, + "HTile":true, + "layers":[ + {"$GMImageLayer":"","%Name":"d459e4d3-7468-4be8-8cd6-1f40b937e503","blendMode":0,"displayName":"default","isLocked":false,"name":"d459e4d3-7468-4be8-8cd6-1f40b937e503","opacity":100.0,"resourceType":"GMImageLayer","resourceVersion":"2.0","visible":true,}, + ], + "name":"spr_red_scale_texture", + "nineSlice":{ + "$GMNineSliceData":"", + "bottom":0, + "enabled":false, + "guideColour":[4294902015,4294902015,4294902015,4294902015,], + "highlightColour":1728023040, + "highlightStyle":0, + "left":0, + "resourceType":"GMNineSliceData", + "resourceVersion":"2.0", + "right":0, + "tileMode":[ + 0, + 0, + 0, + 0, + 0, + ], + "top":0, + }, + "origin":0, + "parent":{ + "name":"textures", + "path":"folders/Sprites/Marine Viewer/textures.yy", + }, + "preMultiplyAlpha":false, + "resourceType":"GMSprite", + "resourceVersion":"2.0", + "sequence":{ + "$GMSequence":"v1", + "%Name":"spr_red_scale_texture", + "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_red_scale_texture", + "playback":1, + "playbackSpeed":30.0, + "playbackSpeedType":0, + "resourceType":"GMSequence", + "resourceVersion":"2.0", + "seqHeight":180.0, + "seqWidth":180.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":"e7618234-0c05-4d39-9e6c-67e62a6b87ac","path":"sprites/spr_red_scale_texture/spr_red_scale_texture.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"9d4a22ab-d631-47e7-955b-d19d2a69efb5","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":true, + "width":180, +} \ No newline at end of file From 24617da7da451a5cf8a5a9da6e1200b47c81a9d9 Mon Sep 17 00:00:00 2001 From: Nelsonh <81228864+OH296@users.noreply.github.com> Date: Fri, 13 Jun 2025 21:43:12 +0100 Subject: [PATCH 089/286] fix: Game over on mercenary death (#873) --- objects/obj_controller/Step_0.gml | 8 +++--- rooms/Defeat/Defeat.yy | 2 +- scripts/instance_create/instance_create.gml | 14 ++++++++++ .../scr_initialize_custom.gml | 1 - scripts/scr_kill_unit/scr_kill_unit.gml | 1 - .../scr_map_and_warp_functions.gml | 2 +- .../scr_unit_quick_find_pane.gml | 2 +- sprites/spr_cursor/spr_cursor.yy | 22 ++++++++++++---- sprites/spr_ork_target/spr_ork_target.yy | 6 ++++- sprites/spr_star/spr_star.yy | 26 ++++++++++++++----- 10 files changed, 64 insertions(+), 20 deletions(-) diff --git a/objects/obj_controller/Step_0.gml b/objects/obj_controller/Step_0.gml index 52cc45e5d5..07f08714e6 100644 --- a/objects/obj_controller/Step_0.gml +++ b/objects/obj_controller/Step_0.gml @@ -1,7 +1,7 @@ try { // Handles most logic for main menus, audio and checks if cheats are enabled // TODO refactor will wait untill squads PR (#76) is merged - if (menu == 0 && zoomed == 0 && !instance_exists(obj_ingame_menu) && !instance_exists(obj_ncombat)) { + if (menu == 0 && zoomed == 0 && !instances_exist([obj_ingame_menu,obj_ncombat])){ scr_zoom_keys(); } if (double_click >= 0) { @@ -846,8 +846,10 @@ try { selecting_ship = -1; } - if ((marines <= 0) && (alarm[7] == -1) && (!instance_exists(obj_fleet_controller)) && (!instance_exists(obj_ncombat))) { - alarm[7] = 15; + if (menu == 0 && !instances_exist([obj_ncombat,obj_fleet_controller])){ + if (!array_contains(obj_ini.role[0],obj_ini.role[100][eROLE.ChapterMaster]) && (alarm[7] == -1)){ + alarm[7] = 15; + } } } catch (_exception) { handle_exception(_exception); diff --git a/rooms/Defeat/Defeat.yy b/rooms/Defeat/Defeat.yy index 52549415e4..6ec0b80f8f 100644 --- a/rooms/Defeat/Defeat.yy +++ b/rooms/Defeat/Defeat.yy @@ -1,7 +1,7 @@ { "$GMRoom":"v1", "%Name":"Defeat", - "creationCodeFile":"", + "creationCodeFile":"rooms/Defeat/RoomCreationCode.gml", "inheritCode":false, "inheritCreationOrder":false, "inheritLayers":false, diff --git a/scripts/instance_create/instance_create.gml b/scripts/instance_create/instance_create.gml index a29eb8eea3..8029038047 100644 --- a/scripts/instance_create/instance_create.gml +++ b/scripts/instance_create/instance_create.gml @@ -8,3 +8,17 @@ function instance_create(_x, _y, _obj) { var myDepth = object_get_depth(_obj); return instance_create_depth(_x, _y, myDepth, _obj); } + +/// @function instances_exist +/// @param {real} _x The x position the object will be created at. +/// @returns {bool} +function instances_exist(instance_set = []){ + var _exists = false; + for (var i=0;i":"","Keyframes":[ - {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"93ff084c-a13e-45b0-95ec-cc841cc02089","path":"sprites/spr_cursor/spr_cursor.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"15172d76-de0a-4ef8-9857-204bcfd3b55c","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"f02125fa-0440-4c76-bafb-a3e04a5d13e7","path":"sprites/spr_cursor/spr_cursor.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"1f57a812-e42e-40e1-a370-4a5fccb5c0e9","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"d4c07a38-bb56-4dd9-8b02-741295614559","path":"sprites/spr_cursor/spr_cursor.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"e9f897f8-70c3-4c81-807d-2f8a3ee5f62b","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"25b1bbac-cb87-44b3-9e9a-cf087f58b5fb","path":"sprites/spr_cursor/spr_cursor.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"64b047e5-e4ab-4543-a571-c654df47458a","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"437349a9-fdd1-438f-bfe1-5c0b7137503f","path":"sprites/spr_cursor/spr_cursor.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"df5149c8-7378-4ea3-b967-b84d714be29d","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"93ff084c-a13e-45b0-95ec-cc841cc02089","path":"sprites/spr_cursor/spr_cursor.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"15172d76-de0a-4ef8-9857-204bcfd3b55c","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"f02125fa-0440-4c76-bafb-a3e04a5d13e7","path":"sprites/spr_cursor/spr_cursor.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"1f57a812-e42e-40e1-a370-4a5fccb5c0e9","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"d4c07a38-bb56-4dd9-8b02-741295614559","path":"sprites/spr_cursor/spr_cursor.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"e9f897f8-70c3-4c81-807d-2f8a3ee5f62b","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"25b1bbac-cb87-44b3-9e9a-cf087f58b5fb","path":"sprites/spr_cursor/spr_cursor.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"64b047e5-e4ab-4543-a571-c654df47458a","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"437349a9-fdd1-438f-bfe1-5c0b7137503f","path":"sprites/spr_cursor/spr_cursor.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"df5149c8-7378-4ea3-b967-b84d714be29d","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":{ diff --git a/sprites/spr_ork_target/spr_ork_target.yy b/sprites/spr_ork_target/spr_ork_target.yy index 6d2a6a23d9..2b855e4324 100644 --- a/sprites/spr_ork_target/spr_ork_target.yy +++ b/sprites/spr_ork_target/spr_ork_target.yy @@ -63,12 +63,16 @@ "playbackSpeedType":1, "resourceType":"GMSequence", "resourceVersion":"2.0", + "seqHeight":36.0, + "seqWidth":41.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":"da401b80-f220-4151-8235-7d11983b9b40","path":"sprites/spr_ork_target/spr_ork_target.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"5209f4b7-620f-415b-8e5a-03ade6474c7b","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"da401b80-f220-4151-8235-7d11983b9b40","path":"sprites/spr_ork_target/spr_ork_target.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"5209f4b7-620f-415b-8e5a-03ade6474c7b","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":{ diff --git a/sprites/spr_star/spr_star.yy b/sprites/spr_star/spr_star.yy index 44240d6e5e..06feadc660 100644 --- a/sprites/spr_star/spr_star.yy +++ b/sprites/spr_star/spr_star.yy @@ -68,17 +68,31 @@ "playbackSpeedType":1, "resourceType":"GMSequence", "resourceVersion":"2.0", + "seqHeight":73.0, + "seqWidth":76.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":"61e9fd0f-8f10-45a6-8bc1-28717245fd09","path":"sprites/spr_star/spr_star.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"676cefc3-1d44-4b87-82a3-2be0a63f5ba6","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"282c87ae-537d-4711-a30b-867b90772a06","path":"sprites/spr_star/spr_star.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"1403b62b-f2e9-46c8-9a38-eb371632c278","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"4ba5bd68-4c5a-4f6e-a30a-e5b257991933","path":"sprites/spr_star/spr_star.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"e38b42a0-fdb5-483e-96e5-9202be8febe0","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"c2c97573-50d7-4380-97e7-912a14586164","path":"sprites/spr_star/spr_star.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"6a26c70c-4898-4592-b517-859992da0a34","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"38b74789-1504-4070-ad76-e81c8093ef03","path":"sprites/spr_star/spr_star.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"4e938f3b-04a3-49eb-a82c-9ea5eb79b86b","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"b6bd31d7-a5f1-464f-ab35-5baed5926179","path":"sprites/spr_star/spr_star.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"05e516f5-df1d-461e-a970-8f8ee2d3bd29","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"61e9fd0f-8f10-45a6-8bc1-28717245fd09","path":"sprites/spr_star/spr_star.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"676cefc3-1d44-4b87-82a3-2be0a63f5ba6","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"282c87ae-537d-4711-a30b-867b90772a06","path":"sprites/spr_star/spr_star.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"1403b62b-f2e9-46c8-9a38-eb371632c278","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"4ba5bd68-4c5a-4f6e-a30a-e5b257991933","path":"sprites/spr_star/spr_star.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"e38b42a0-fdb5-483e-96e5-9202be8febe0","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"c2c97573-50d7-4380-97e7-912a14586164","path":"sprites/spr_star/spr_star.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"6a26c70c-4898-4592-b517-859992da0a34","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"38b74789-1504-4070-ad76-e81c8093ef03","path":"sprites/spr_star/spr_star.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"4e938f3b-04a3-49eb-a82c-9ea5eb79b86b","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"b6bd31d7-a5f1-464f-ab35-5baed5926179","path":"sprites/spr_star/spr_star.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"05e516f5-df1d-461e-a970-8f8ee2d3bd29","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, From c53e47f6cbaa22340638da1d844f2f32ecebec84 Mon Sep 17 00:00:00 2001 From: Nelsonh <81228864+OH296@users.noreply.github.com> Date: Fri, 13 Jun 2025 22:08:14 +0100 Subject: [PATCH 090/286] refactor: Move data slats to own script (#874) --- ChapterMaster.yyp | 1 + scripts/scr_DataSlate/scr_DataSlate.gml | 344 +++++++++++++++++ scripts/scr_DataSlate/scr_DataSlate.yy | 13 + .../scr_draw_planet_features.gml | 345 ------------------ 4 files changed, 358 insertions(+), 345 deletions(-) create mode 100644 scripts/scr_DataSlate/scr_DataSlate.gml create mode 100644 scripts/scr_DataSlate/scr_DataSlate.yy diff --git a/ChapterMaster.yyp b/ChapterMaster.yyp index f31874b70c..5a948375b3 100644 --- a/ChapterMaster.yyp +++ b/ChapterMaster.yyp @@ -776,6 +776,7 @@ {"id":{"name":"scr_creation","path":"scripts/scr_creation/scr_creation.yy",},}, {"id":{"name":"scr_crusade","path":"scripts/scr_crusade/scr_crusade.yy",},}, {"id":{"name":"scr_culture_visuals","path":"scripts/scr_culture_visuals/scr_culture_visuals.yy",},}, + {"id":{"name":"scr_DataSlate","path":"scripts/scr_DataSlate/scr_DataSlate.yy",},}, {"id":{"name":"scr_dead_marines","path":"scripts/scr_dead_marines/scr_dead_marines.yy",},}, {"id":{"name":"scr_demand","path":"scripts/scr_demand/scr_demand.yy",},}, {"id":{"name":"scr_destroy_planet","path":"scripts/scr_destroy_planet/scr_destroy_planet.yy",},}, diff --git a/scripts/scr_DataSlate/scr_DataSlate.gml b/scripts/scr_DataSlate/scr_DataSlate.gml new file mode 100644 index 0000000000..444a43bd40 --- /dev/null +++ b/scripts/scr_DataSlate/scr_DataSlate.gml @@ -0,0 +1,344 @@ +function draw_building_builder(xx, yy, req_require, building_sprite){ + var clicked =false; + draw_sprite_ext(building_sprite, 0, xx, yy, 0.5, 0.5, 0, c_white, 1); + var image_bottom = yy+50; + var image_middle = xx-15; + if (obj_controller.requisition>=req_require){ + if (scr_hit(image_middle+30, image_bottom+28, image_middle+78, image_bottom+44)){ + draw_sprite_ext(spr_slate_2, 5, image_middle-10, image_bottom, 1, 1, 0, c_white, 1); + if (scr_click_left()){ + clicked=true; + } + } else { + draw_sprite_ext(spr_slate_2, 3, image_middle-10, image_bottom, 1, 1, 0, c_white, 1); + } + } else { + draw_sprite_ext(spr_slate_2, 7, image_middle-10, image_bottom, 1, 1, 0, c_white, 1); + } + draw_sprite_ext(spr_requisition,0,image_middle+65,image_bottom+30,1,1,0,c_white,1); + draw_set_halign(fa_left); + draw_text(image_middle+32, image_bottom+30, req_require); + return clicked; +} + +function DataSlateMKTwo()constructor{ + height=0; + width=0; + XX=0; + YY=0; + static entered = function(){ + return scr_hit(XX, YY, XX+width, YY+height); + } + static draw = function(xx,yy,x_scale=1, y_scale=1){ + XX=xx; + YY=yy; + height = 250*y_scale; + width=365*x_scale; + draw_sprite_ext(spr_slate_2, 1, xx, yy, x_scale, y_scale, 0, c_white, 1); + draw_sprite_ext(spr_slate_2, 0, xx, yy, x_scale, y_scale, 0, c_white, 1); + draw_sprite_ext(spr_slate_2, 2, xx, yy, x_scale, y_scale, 0, c_white, 1); + //draw_sprite_ext(spr_slate_2, 0, xx, yy, 1, 1, 0, c_white, 1) + } +} + +function RackAndPinion(Type="forward") constructor{ + reverse =false; + rack_y=0; + rotation = 360; + type=Type + if (type="forward"){ + draw = function(x, y, freeze=false, Reverse=""){ + x+=19; + if (!freeze){ + if (Reverse != ""){ + if (Reverse){ + reverse=true; + } else { + reverse=false; + } + } + draw_sprite_ext(spr_cog_pinion, 0, x, y, 1, 1, rotation, c_white, 1) + if (!reverse){ + rotation-=4; + } else { + rotation+=4; + } + rack_y = (75.3982236862/360)*(360-rotation); + if (rack_y > 70){ + reverse = true; + } else if (rack_y < 2){ + reverse = false; + } + draw_sprite_ext(spr_rack, 0, x-13, y-rack_y, 1, 1, 0, c_white, 1) + } else { + draw_sprite_ext(spr_cog_pinion, 0, x, y, 1, 1, rotation, c_white, 1) + draw_sprite_ext(spr_rack, 0, x-13, y-rack_y, 1, 1, 0, c_white, 1) + } + } + } else if (type="backward"){ + draw = function(x, y, freeze=false, Reverse=""){ + x-=19; + if (!freeze){ + if (Reverse != ""){ + if (Reverse){ + reverse=true; + } else { + reverse=false; + } + } + draw_sprite_ext(spr_cog_pinion, 0, x, y, 1, 1, rotation, c_white, 1) + if (!reverse){ + rotation+=4; + } else { + rotation-=4; + } + rack_y = (75.3982236862/360)*(360-rotation) + if (rack_y > 70){ + reverse = true; + } else if (rack_y < 2){ + reverse = false; + } + draw_sprite_ext(spr_rack, 0, x+13, y+rack_y, -1, 1, 0, c_white, 1) + } else { + draw_sprite_ext(spr_cog_pinion, 0, x, y, 1, 1, rotation, c_white, 1) + draw_sprite_ext(spr_rack, 0, x+13, y+rack_y, -1, 1, 0, c_white, 1) + } + } + } +} +function SpeedingDot(XX,YY, limit) constructor{ + bottom_limit = limit; + stack = 0; + yyy=YY; + xxx=XX; + draw = function(xx,yy){ + if (bottom_limit+(48*0.7)0 ? 36-stack :0; + var bottom_cut = bottom_limit 1*flash_modifier){ + flash_size-=flash_modifier; + }else { + flash_size+=flash_modifier; + flash = 0; + } + } + draw_set_alpha(1); + } + draw_one_flash = function(xx, yy){ + if (one_flash_finished) then exit; + draw_set_color(c_green); + for (var i=0; i<=flash_size;i++){ + draw_set_alpha(1 - ((1/40)*i)) + draw_circle(xx, yy, (i/3), 1); + } + if (flash==0){ + if (flash_size<40){ + flash_size++; + } else { + flash = 1; + flash_size--; + } + } else { + if (flash_size > 1){ + flash_size--; + }else { + flash_size++; + flash = 0; + one_flash_finished = true; + } + } + } +} + +function ShutterButton() constructor{ + time_open = 0; + click_timer = 0; + Width = 315; + Height = 90; + XX=0; + YY=0; + width=0; + height=0; + right_rack = new RackAndPinion(); + left_rack = new RackAndPinion("backward"); + draw_shutter = function(xx,yy,text, scale=1, entered = ""){ + XX=xx; + YY=yy; + draw_set_alpha(1); + + draw_set_font(fnt_40k_12); + draw_set_halign(fa_left); + draw_set_color(c_gray); + width = Width *scale; + height = Height *scale; + if (text=="") then entered = false; + if (entered==""){ + entered = scr_hit(xx, yy, xx+width, yy+height); + } else { + entered=entered; + } + var shutter_backdrop = 5; + if (entered || click_timer>0){ + if (time_open<20){ + time_open++; + right_rack.draw(xx+width, yy, false, false); + left_rack.draw(xx, yy, false, false); + } else { + right_rack.draw(xx+width, yy, true); + left_rack.draw(xx, yy, true); + } + if (point_and_click([xx, yy, xx+width, yy+height]) || click_timer>0 ){ + shutter_backdrop = 6; + click_timer++; + } + } else if (time_open>0){ + time_open--; + right_rack.draw(xx+width, yy, false, true); + left_rack.draw(xx, yy, false, true); + } else { + right_rack.draw(xx+width, yy, true); + left_rack.draw(xx, yy, true); + } + var text_draw = xx+(width/2)-(string_width(text)*(3*scale)/2); + var main_sprite = 0; + if (time_open<2){ + draw_sprite_ext(spr_shutter_button, main_sprite, xx, yy, scale, scale, 0, c_white, 1) + } else if (time_open<8 && time_open>=2){ + main_sprite=1; + }else if (time_open<13 && time_open>=8){ + main_sprite=2; + }else if (time_open<18 && time_open>=13){ + main_sprite=3; + } else if (time_open>=18){ + main_sprite=4; + } + if (time_open>=2){ + draw_sprite_ext(spr_shutter_button, shutter_backdrop, xx, yy, scale, scale, 0, c_white, 1) + draw_set_color(c_red); + if (click_timer>0){ + draw_text_transformed(text_draw, yy+(24*scale), text, 3*scale, 3*scale, 0); + } else { + draw_text_transformed(text_draw, yy+(20*scale), text, 3*scale, 3*scale, 0); + } + draw_sprite_ext(spr_shutter_button, main_sprite, xx, yy, scale, scale, 0, c_white, 1) + } + draw_set_color(c_grey); + if (click_timer>7){ + click_timer = 0; + return true; + } else { + return false; + } + } +} + +function DataSlate() constructor{ + static_line=1; + title=""; + sub_title=""; + body_text = ""; + inside_method = ""; + XX=0; + YY=0; + width=0; + height=0; + percent_cut=0; + + static entered = function(){ + return (scr_hit( + XX-4, + YY, + XX + width, + YY + height, + )); + } + static draw_with_dimensions = function(xx,yy, width , height){ + var _scale_x = width/860; + var _scale_y = height/850; + draw(xx,yy, _scale_x, _scale_y); + } + static draw = function(xx,yy, scale_x=1, scale_y=1){ + XX=xx; + YY=yy; + width = 860*scale_x; + height = 850*scale_y; + draw_sprite_ext(spr_data_slate,1, xx,yy, scale_x, scale_y, 0, c_white, 1); + if (is_callable(inside_method)){ + inside_method(); + } + if (static_line<=10) then draw_set_alpha(static_line/10); + if (static_line>10) then draw_set_alpha(1-((static_line-10)/10)); + draw_set_color(5998382); + var line_move = yy+(70*scale_y)+((36*scale_y)*static_line); + draw_line(xx+(30*scale_x),line_move,xx+(820*scale_x),line_move); + draw_set_alpha(1); + if (irandom(75)=0 && static_line>1){static_line--;} + else{ + static_line+=0.1; + } + if (static_line>20) then static_line=1; + draw_set_color(c_gray); + draw_set_halign(fa_center); + var draw_height = 5; + if (title!=""){ + draw_text_transformed(xx+(0.5*width), yy+(50*scale_y), title, 3*scale_x, 3*scale_y, 0); + draw_height += (string_height(title)*3)*scale_y; + } + if (sub_title!=""){ + draw_text_transformed(xx+(0.5*width), yy+(50*scale_y)+draw_height, sub_title, 2*scale_x, 2*scale_y, 0); + draw_height+=(25*scale_y) +(string_height(sub_title)*2)*scale_y; + } + if (body_text!=""){ + draw_text_ext(xx+(0.5*width), yy+(50*scale_y)+draw_height, string_hash_to_newline(body_text), -1, width-60); + } + } + static draw_cut = function(xx,yy, scale_x=1, scale_y=1, middle_percent=percent_cut){ + XX=xx; + YY=yy; + draw_sprite_part_ext(spr_data_slate,1, 0, 0, 850, 69, XX, YY, scale_x, scale_y, c_white, 1); + draw_sprite_part_ext(spr_data_slate,1, 0, 69, 850, 683*(middle_percent/100), XX, YY+(69*scale_y), scale_x, scale_y, c_white, 1); + draw_sprite_part_ext(spr_data_slate,1, 0, 752, 850, 98, XX, YY+(69+683*((middle_percent/100)))*scale_y, scale_x, scale_y, c_white, 1); + width = 860*scale_x; + height = (69+(683*(middle_percent/100))+98 )*scale_y; + if (is_callable(inside_method)){ + inside_method(); + } + } + + static percent_mod_draw_cut = function(xx,yy, scale_x=1, scale_y=1, mod_edit=1){ + percent_cut = min(percent_cut+mod_edit, 100); + if (!percent_cut) then percent_cut=0; + draw_cut(xx,yy, scale_x, scale_y); + } +} + + + diff --git a/scripts/scr_DataSlate/scr_DataSlate.yy b/scripts/scr_DataSlate/scr_DataSlate.yy new file mode 100644 index 0000000000..706bff707b --- /dev/null +++ b/scripts/scr_DataSlate/scr_DataSlate.yy @@ -0,0 +1,13 @@ +{ + "$GMScript":"v1", + "%Name":"scr_DataSlate", + "isCompatibility":false, + "isDnD":false, + "name":"scr_DataSlate", + "parent":{ + "name":"User Interface", + "path":"folders/Scripts/User Interface.yy", + }, + "resourceType":"GMScript", + "resourceVersion":"2.0", +} \ No newline at end of file diff --git a/scripts/scr_draw_planet_features/scr_draw_planet_features.gml b/scripts/scr_draw_planet_features/scr_draw_planet_features.gml index ff6b5d9205..1c186ea863 100644 --- a/scripts/scr_draw_planet_features/scr_draw_planet_features.gml +++ b/scripts/scr_draw_planet_features/scr_draw_planet_features.gml @@ -318,348 +318,3 @@ function FeatureSelected(Feature, system, planet) constructor{ return "done"; } } - -function draw_building_builder(xx, yy, req_require, building_sprite){ - var clicked =false; - draw_sprite_ext(building_sprite, 0, xx, yy, 0.5, 0.5, 0, c_white, 1); - var image_bottom = yy+50; - var image_middle = xx-15; - if (obj_controller.requisition>=req_require){ - if (scr_hit(image_middle+30, image_bottom+28, image_middle+78, image_bottom+44)){ - draw_sprite_ext(spr_slate_2, 5, image_middle-10, image_bottom, 1, 1, 0, c_white, 1); - if (scr_click_left()){ - clicked=true; - } - } else { - draw_sprite_ext(spr_slate_2, 3, image_middle-10, image_bottom, 1, 1, 0, c_white, 1); - } - } else { - draw_sprite_ext(spr_slate_2, 7, image_middle-10, image_bottom, 1, 1, 0, c_white, 1); - } - draw_sprite_ext(spr_requisition,0,image_middle+65,image_bottom+30,1,1,0,c_white,1); - draw_set_halign(fa_left); - draw_text(image_middle+32, image_bottom+30, req_require); - return clicked; -} - -function DataSlateMKTwo()constructor{ - height=0; - width=0; - XX=0; - YY=0; - static entered = function(){ - return scr_hit(XX, YY, XX+width, YY+height); - } - static draw = function(xx,yy,x_scale=1, y_scale=1){ - XX=xx; - YY=yy; - height = 250*y_scale; - width=365*x_scale; - draw_sprite_ext(spr_slate_2, 1, xx, yy, x_scale, y_scale, 0, c_white, 1); - draw_sprite_ext(spr_slate_2, 0, xx, yy, x_scale, y_scale, 0, c_white, 1); - draw_sprite_ext(spr_slate_2, 2, xx, yy, x_scale, y_scale, 0, c_white, 1); - //draw_sprite_ext(spr_slate_2, 0, xx, yy, 1, 1, 0, c_white, 1) - } -} - -function RackAndPinion(Type="forward") constructor{ - reverse =false; - rack_y=0; - rotation = 360; - type=Type - if (type="forward"){ - draw = function(x, y, freeze=false, Reverse=""){ - x+=19; - if (!freeze){ - if (Reverse != ""){ - if (Reverse){ - reverse=true; - } else { - reverse=false; - } - } - draw_sprite_ext(spr_cog_pinion, 0, x, y, 1, 1, rotation, c_white, 1) - if (!reverse){ - rotation-=4; - } else { - rotation+=4; - } - rack_y = (75.3982236862/360)*(360-rotation); - if (rack_y > 70){ - reverse = true; - } else if (rack_y < 2){ - reverse = false; - } - draw_sprite_ext(spr_rack, 0, x-13, y-rack_y, 1, 1, 0, c_white, 1) - } else { - draw_sprite_ext(spr_cog_pinion, 0, x, y, 1, 1, rotation, c_white, 1) - draw_sprite_ext(spr_rack, 0, x-13, y-rack_y, 1, 1, 0, c_white, 1) - } - } - } else if (type="backward"){ - draw = function(x, y, freeze=false, Reverse=""){ - x-=19; - if (!freeze){ - if (Reverse != ""){ - if (Reverse){ - reverse=true; - } else { - reverse=false; - } - } - draw_sprite_ext(spr_cog_pinion, 0, x, y, 1, 1, rotation, c_white, 1) - if (!reverse){ - rotation+=4; - } else { - rotation-=4; - } - rack_y = (75.3982236862/360)*(360-rotation) - if (rack_y > 70){ - reverse = true; - } else if (rack_y < 2){ - reverse = false; - } - draw_sprite_ext(spr_rack, 0, x+13, y+rack_y, -1, 1, 0, c_white, 1) - } else { - draw_sprite_ext(spr_cog_pinion, 0, x, y, 1, 1, rotation, c_white, 1) - draw_sprite_ext(spr_rack, 0, x+13, y+rack_y, -1, 1, 0, c_white, 1) - } - } - } -} -function SpeedingDot(XX,YY, limit) constructor{ - bottom_limit = limit; - stack = 0; - yyy=YY; - xxx=XX; - draw = function(xx,yy){ - if (bottom_limit+(48*0.7)0 ? 36-stack :0; - var bottom_cut = bottom_limit 1){ - flash_size--; - }else { - flash_size++; - flash = 0; - } - } - } - draw_one_flash = function(xx, yy){ - if (one_flash_finished) then exit; - draw_set_color(c_green); - for (var i=0; i<=flash_size;i++){ - draw_set_alpha(1 - ((1/40)*i)) - draw_circle(xx, yy, (i/3), 1); - } - if (flash==0){ - if (flash_size<40){ - flash_size++; - } else { - flash = 1; - flash_size--; - } - } else { - if (flash_size > 1){ - flash_size--; - }else { - flash_size++; - flash = 0; - one_flash_finished = true; - } - } - } -} - -function ShutterButton() constructor{ - time_open = 0; - click_timer = 0; - Width = 315; - Height = 90; - XX=0; - YY=0; - width=0; - height=0; - right_rack = new RackAndPinion(); - left_rack = new RackAndPinion("backward"); - draw_shutter = function(xx,yy,text, scale=1, entered = ""){ - XX=xx; - YY=yy; - draw_set_alpha(1); - - draw_set_font(fnt_40k_12); - draw_set_halign(fa_left); - draw_set_color(c_gray); - width = Width *scale; - height = Height *scale; - if (text=="") then entered = false; - if (entered==""){ - entered = scr_hit(xx, yy, xx+width, yy+height); - } else { - entered=entered; - } - var shutter_backdrop = 5; - if (entered || click_timer>0){ - if (time_open<20){ - time_open++; - right_rack.draw(xx+width, yy, false, false); - left_rack.draw(xx, yy, false, false); - } else { - right_rack.draw(xx+width, yy, true); - left_rack.draw(xx, yy, true); - } - if (point_and_click([xx, yy, xx+width, yy+height]) || click_timer>0 ){ - shutter_backdrop = 6; - click_timer++; - } - } else if (time_open>0){ - time_open--; - right_rack.draw(xx+width, yy, false, true); - left_rack.draw(xx, yy, false, true); - } else { - right_rack.draw(xx+width, yy, true); - left_rack.draw(xx, yy, true); - } - var text_draw = xx+(width/2)-(string_width(text)*(3*scale)/2); - var main_sprite = 0; - if (time_open<2){ - draw_sprite_ext(spr_shutter_button, main_sprite, xx, yy, scale, scale, 0, c_white, 1) - } else if (time_open<8 && time_open>=2){ - main_sprite=1; - }else if (time_open<13 && time_open>=8){ - main_sprite=2; - }else if (time_open<18 && time_open>=13){ - main_sprite=3; - } else if (time_open>=18){ - main_sprite=4; - } - if (time_open>=2){ - draw_sprite_ext(spr_shutter_button, shutter_backdrop, xx, yy, scale, scale, 0, c_white, 1) - draw_set_color(c_red); - if (click_timer>0){ - draw_text_transformed(text_draw, yy+(24*scale), text, 3*scale, 3*scale, 0); - } else { - draw_text_transformed(text_draw, yy+(20*scale), text, 3*scale, 3*scale, 0); - } - draw_sprite_ext(spr_shutter_button, main_sprite, xx, yy, scale, scale, 0, c_white, 1) - } - draw_set_color(c_grey); - if (click_timer>7){ - click_timer = 0; - return true; - } else { - return false; - } - } -} - -function DataSlate() constructor{ - static_line=1; - title=""; - sub_title=""; - body_text = ""; - inside_method = ""; - XX=0; - YY=0; - width=0; - height=0; - percent_cut=0; - - static entered = function(){ - return (scr_hit( - XX-4, - YY, - XX + width, - YY + height, - )); - } - static draw = function(xx,yy, scale_x=1, scale_y=1){ - XX=xx; - YY=yy; - width = 860*scale_x; - height = 850*scale_y; - draw_sprite_ext(spr_data_slate,1, xx,yy, scale_x, scale_y, 0, c_white, 1); - if (is_callable(inside_method)){ - inside_method(); - } - if (static_line<=10) then draw_set_alpha(static_line/10); - if (static_line>10) then draw_set_alpha(1-((static_line-10)/10)); - draw_set_color(5998382); - var line_move = yy+(70*scale_y)+((36*scale_y)*static_line); - draw_line(xx+(30*scale_x),line_move,xx+(820*scale_x),line_move); - draw_set_alpha(1); - if (irandom(75)=0 && static_line>1){static_line--;} - else{ - static_line+=0.1; - } - if (static_line>20) then static_line=1; - draw_set_color(c_gray); - draw_set_halign(fa_center); - var draw_height = 5; - if (title!=""){ - draw_text_transformed(xx+(0.5*width), yy+(50*scale_y), title, 3*scale_x, 3*scale_y, 0); - draw_height += (string_height(title)*3)*scale_y; - } - if (sub_title!=""){ - draw_text_transformed(xx+(0.5*width), yy+(50*scale_y)+draw_height, sub_title, 2*scale_x, 2*scale_y, 0); - draw_height+=(25*scale_y) +(string_height(sub_title)*2)*scale_y; - } - if (body_text!=""){ - draw_text_ext(xx+(0.5*width), yy+(50*scale_y)+draw_height, string_hash_to_newline(body_text), -1, width-60); - } - } - static draw_cut = function(xx,yy, scale_x=1, scale_y=1, middle_percent=percent_cut){ - XX=xx; - YY=yy; - draw_sprite_part_ext(spr_data_slate,1, 0, 0, 850, 69, XX, YY, scale_x, scale_y, c_white, 1); - draw_sprite_part_ext(spr_data_slate,1, 0, 69, 850, 683*(middle_percent/100), XX, YY+(69*scale_y), scale_x, scale_y, c_white, 1); - draw_sprite_part_ext(spr_data_slate,1, 0, 752, 850, 98, XX, YY+(69+683*((middle_percent/100)))*scale_y, scale_x, scale_y, c_white, 1); - width = 860*scale_x; - height = (69+(683*(middle_percent/100))+98 )*scale_y; - if (is_callable(inside_method)){ - inside_method(); - } - } - - static percent_mod_draw_cut = function(xx,yy, scale_x=1, scale_y=1, mod_edit=1){ - percent_cut = min(percent_cut+mod_edit, 100); - if (!percent_cut) then percent_cut=0; - draw_cut(xx,yy, scale_x, scale_y); - } -} - - - - - - - - - - From 125e8bb280b85b641ee7243f85f053c41361b5de Mon Sep 17 00:00:00 2001 From: Nelsonh <81228864+OH296@users.noreply.github.com> Date: Sun, 15 Jun 2025 17:04:18 +0100 Subject: [PATCH 091/286] refactor: Improve data slate use and other ui (#875) --- ChapterMaster.yyp | 2 + objects/obj_controller/Draw_64.gml | 5 +- scripts/is_specialist/is_specialist.gml | 2 +- scripts/scr_ComplexSet/scr_ComplexSet.gml | 8 +- scripts/scr_DataSlate/scr_DataSlate.gml | 267 ++++++---- .../scr_company_struct/scr_company_struct.gml | 16 + scripts/scr_company_view/scr_company_view.gml | 3 +- .../scr_complex_colour_kit.gml | 66 +-- .../scr_draw_management_unit.gml | 58 +-- scripts/scr_livery_setup/scr_livery_setup.gml | 2 +- scripts/scr_tooltip_draw/scr_tooltip_draw.gml | 11 +- scripts/scr_ui_manage/scr_ui_manage.gml | 467 +++++++++--------- .../scr_unit_quick_find_pane.gml | 5 +- .../spr_data_slate_back.yy | 6 +- .../88d208ab-efc3-4c8a-a23a-ac1685249362.png | Bin 0 -> 5901 bytes .../0c20ae10-2b03-43f4-b05e-7cb2256d0b71.png | Bin 0 -> 5901 bytes .../spr_data_slate_corner_decoration.yy | 92 ++++ .../b15ff156-9439-4de5-a856-2c34927170fc.png | Bin 0 -> 26388 bytes .../b201671b-7405-4bb4-ab4e-e9c0d0be9fe7.png | Bin 0 -> 26388 bytes .../spr_shutter_button/spr_shutter_button.yy | 36 +- .../88d208ab-efc3-4c8a-a23a-ac1685249362.png | Bin 0 -> 3799 bytes .../0c20ae10-2b03-43f4-b05e-7cb2256d0b71.png | Bin 0 -> 3799 bytes sprites/spr_slate_side/spr_slate_side.yy | 92 ++++ 23 files changed, 713 insertions(+), 425 deletions(-) create mode 100644 sprites/spr_data_slate_corner_decoration/88d208ab-efc3-4c8a-a23a-ac1685249362.png create mode 100644 sprites/spr_data_slate_corner_decoration/layers/88d208ab-efc3-4c8a-a23a-ac1685249362/0c20ae10-2b03-43f4-b05e-7cb2256d0b71.png create mode 100644 sprites/spr_data_slate_corner_decoration/spr_data_slate_corner_decoration.yy create mode 100644 sprites/spr_shutter_button/b15ff156-9439-4de5-a856-2c34927170fc.png create mode 100644 sprites/spr_shutter_button/layers/b15ff156-9439-4de5-a856-2c34927170fc/b201671b-7405-4bb4-ab4e-e9c0d0be9fe7.png create mode 100644 sprites/spr_slate_side/88d208ab-efc3-4c8a-a23a-ac1685249362.png create mode 100644 sprites/spr_slate_side/layers/88d208ab-efc3-4c8a-a23a-ac1685249362/0c20ae10-2b03-43f4-b05e-7cb2256d0b71.png create mode 100644 sprites/spr_slate_side/spr_slate_side.yy diff --git a/ChapterMaster.yyp b/ChapterMaster.yyp index 5a948375b3..932ca3b52a 100644 --- a/ChapterMaster.yyp +++ b/ChapterMaster.yyp @@ -1092,6 +1092,7 @@ {"id":{"name":"spr_darkstar","path":"sprites/spr_darkstar/spr_darkstar.yy",},}, {"id":{"name":"spr_data_slate_back","path":"sprites/spr_data_slate_back/spr_data_slate_back.yy",},}, {"id":{"name":"spr_data_slate_border","path":"sprites/spr_data_slate_border/spr_data_slate_border.yy",},}, + {"id":{"name":"spr_data_slate_corner_decoration","path":"sprites/spr_data_slate_corner_decoration/spr_data_slate_corner_decoration.yy",},}, {"id":{"name":"spr_data_slate","path":"sprites/spr_data_slate/spr_data_slate.yy",},}, {"id":{"name":"spr_death_watch_pauldron","path":"sprites/spr_death_watch_pauldron/spr_death_watch_pauldron.yy",},}, {"id":{"name":"spr_def_fortress","path":"sprites/spr_def_fortress/spr_def_fortress.yy",},}, @@ -1540,6 +1541,7 @@ {"id":{"name":"spr_skull_on_chain","path":"sprites/spr_skull_on_chain/spr_skull_on_chain.yy",},}, {"id":{"name":"spr_skulls_belt","path":"sprites/spr_skulls_belt/spr_skulls_belt.yy",},}, {"id":{"name":"spr_slate_2","path":"sprites/spr_slate_2/spr_slate_2.yy",},}, + {"id":{"name":"spr_slate_side","path":"sprites/spr_slate_side/spr_slate_side.yy",},}, {"id":{"name":"spr_sororitas1","path":"sprites/spr_sororitas1/spr_sororitas1.yy",},}, {"id":{"name":"spr_space_bg","path":"sprites/spr_space_bg/spr_space_bg.yy",},}, {"id":{"name":"spr_special_helm","path":"sprites/spr_special_helm/spr_special_helm.yy",},}, diff --git a/objects/obj_controller/Draw_64.gml b/objects/obj_controller/Draw_64.gml index 2fab4dfa21..010f6ddc99 100644 --- a/objects/obj_controller/Draw_64.gml +++ b/objects/obj_controller/Draw_64.gml @@ -175,8 +175,9 @@ function draw_line(x1, y1, y_slide, variable) { } - - +if ((menu == 1) && (managing > 0 || managing < 0)) { + draw_sprite_and_unit_equip_data(); +} diff --git a/scripts/is_specialist/is_specialist.gml b/scripts/is_specialist/is_specialist.gml index 45aaaf51ed..0f2e6e05c3 100644 --- a/scripts/is_specialist/is_specialist.gml +++ b/scripts/is_specialist/is_specialist.gml @@ -382,9 +382,9 @@ function group_selection(group, selection_data) { sel_loading = -1; unload = 0; alarm[6] = 7; - company_data = {}; view_squad = false; managing = -1; + new_company_struct(); var vehicles = []; for (var i = 0; i < array_length(group); i++) { if (!is_struct(group[i])) { diff --git a/scripts/scr_ComplexSet/scr_ComplexSet.gml b/scripts/scr_ComplexSet/scr_ComplexSet.gml index 702884e6f4..409eee9345 100644 --- a/scripts/scr_ComplexSet/scr_ComplexSet.gml +++ b/scripts/scr_ComplexSet/scr_ComplexSet.gml @@ -758,7 +758,7 @@ function ComplexSet(_unit) constructor { } } } - var _defualts = [ + var _defaults = [ "hand_on_top", "ui_xmod", "ui_ymod", @@ -771,9 +771,9 @@ function ComplexSet(_unit) constructor { "sprite", "display_type" ]; - for (var s = 0; s < array_length(_defualts); s++) { - if (!struct_exists(_arm, _defualts[s])) { - _arm[$ _defualts[s]] = 0; + for (var s = 0; s < array_length(_defaults); s++) { + if (!struct_exists(_arm, _defaults[s])) { + _arm[$ _defaults[s]] = 0; } } if (armour_type == ArmourType.Terminator && !array_contains(["terminator_ranged", "terminator_melee", "terminator_fist"], _arm.display_type)) { diff --git a/scripts/scr_DataSlate/scr_DataSlate.gml b/scripts/scr_DataSlate/scr_DataSlate.gml index 444a43bd40..39be679ef7 100644 --- a/scripts/scr_DataSlate/scr_DataSlate.gml +++ b/scripts/scr_DataSlate/scr_DataSlate.gml @@ -1,3 +1,134 @@ +function DataSlate() constructor{ + static_line=1; + title=""; + sub_title=""; + body_text = ""; + inside_method = ""; + XX=0; + YY=0; + width=0; + height=0; + percent_cut=0; + set_width = false; + + style = "default"; + + tooltip_drawing = []; + + blend_col = 5998382; + + static entered = function(){ + return (scr_hit( + XX-4, + YY, + XX + width, + YY + height, + )); + } + + static draw_with_dimensions = function(xx = -1,yy = -1, Width=-1 , Height=-1){ + if (Width != -1){ + width = Width; + } + if (Height != -1){ + height = Height; + } + var _scale_x = width/860; + var _scale_y = height/850; + draw(xx,yy, _scale_x, _scale_y); + } + + static draw = function(xx= -1,yy = -1, scale_x=1, scale_y=1){ + if (xx != -1){ + XX=xx; + } + if (yy != -1){ + YY=yy; + } + + if (!set_width){ + width = 860*scale_x; + height = 850*scale_y; + } + + switch (style){ + case "default": + draw_sprite_ext(spr_data_slate,1, XX,YY, scale_x, scale_y, 0, c_white, 1); + break; + case "decorated": + draw_sprite_stretched(spr_data_slate_back, 0, XX,YY, width, height); + draw_sprite_stretched(spr_slate_side, 0, XX,YY, width, height); + draw_rectangle_color_simple(xx,YY, XX+width,YY+height, 0, blend_col, 0.05); + break; + + case "plain": + draw_sprite_stretched(spr_data_slate_back, 0, XX,YY, width, height); + draw_rectangle_color_simple(xx,YY, XX+width,YY+height, 0, blend_col, 0.05); + break; + } + + if (is_callable(inside_method)){ + inside_method(); + } + if (static_line<=10) then draw_set_alpha(static_line/10); + if (static_line>10) then draw_set_alpha(1-((static_line-10)/10)); + draw_set_color(5998382); + var line_move = YY+(70*scale_y)+((36*scale_y)*static_line); + draw_line(XX+(30*scale_x),line_move,XX+(820*scale_x),line_move); + draw_set_alpha(1); + if (irandom(75)=0 && static_line>1){static_line--;} + else{ + static_line+=0.1; + } + if (static_line>20) then static_line=1; + draw_set_color(c_gray); + draw_set_halign(fa_center); + var draw_height = 5; + if (title!=""){ + draw_text_transformed(XX+(0.5*width), YY+(50*scale_y), title, 3*scale_x, 3*scale_y, 0); + draw_height += (string_height(title)*3)*scale_y; + } + if (sub_title!=""){ + draw_text_transformed(XX+(0.5*width), YY+(50*scale_y)+draw_height, sub_title, 2*scale_x, 2*scale_y, 0); + draw_height+=(25*scale_y) +(string_height(sub_title)*2)*scale_y; + } + if (body_text!=""){ + draw_text_ext(XX+(0.5*width), YY+(50*scale_y)+draw_height, string_hash_to_newline(body_text), -1, width-60); + } + switch (style){ + case "decorated": + var _slate_scalex = width/sprite_get_width(spr_slate_side); + var _slate_scaley = height/sprite_get_height(spr_slate_side); + draw_sprite(spr_data_slate_corner_decoration, 0,XX+width - (70*_slate_scalex), YY + (7*_slate_scaley)); + break; + + } + } + + static draw_cut = function(xx,yy, scale_x=1, scale_y=1, middle_percent=percent_cut){ + XX=xx; + YY=yy; + draw_sprite_part_ext(spr_data_slate,1, 0, 0, 850, 69, XX, YY, scale_x, scale_y, c_white, 1); + draw_sprite_part_ext(spr_data_slate,1, 0, 69, 850, 683*(middle_percent/100), XX, YY+(69*scale_y), scale_x, scale_y, c_white, 1); + draw_sprite_part_ext(spr_data_slate,1, 0, 752, 850, 98, XX, YY+(69+683*((middle_percent/100)))*scale_y, scale_x, scale_y, c_white, 1); + width = 860*scale_x; + height = (69+(683*(middle_percent/100))+98 )*scale_y; + if (is_callable(inside_method)){ + inside_method(); + } + } + + static percent_mod_draw_cut = function(xx,yy, scale_x=1, scale_y=1, mod_edit=1){ + percent_cut = min(percent_cut+mod_edit, 100); + if (!percent_cut) then percent_cut=0; + draw_cut(xx,yy, scale_x, scale_y); + } +} + + + + + function draw_building_builder(xx, yy, req_require, building_sprite){ var clicked =false; draw_sprite_ext(building_sprite, 0, xx, yy, 0.5, 0.5, 0, c_white, 1); @@ -41,7 +172,7 @@ function DataSlateMKTwo()constructor{ } } -function RackAndPinion(Type="forward") constructor{ +function RackAndPinion(Type="forward", scale = 1) constructor{ reverse =false; rack_y=0; rotation = 360; @@ -189,25 +320,35 @@ function ShutterButton() constructor{ height=0; right_rack = new RackAndPinion(); left_rack = new RackAndPinion("backward"); + background = new DataSlate(); + background.style = "plain"; + + /*draw_with_dimensions = function(xx,yy, ,width, entered){ + draw_shutter(); + }*/ + draw_shutter = function(xx,yy,text, scale=1, entered = ""){ XX=xx; YY=yy; draw_set_alpha(1); - + self.scale = scale; + self.text = text; draw_set_font(fnt_40k_12); draw_set_halign(fa_left); draw_set_color(c_gray); width = Width *scale; height = Height *scale; if (text=="") then entered = false; + if (entered==""){ entered = scr_hit(xx, yy, xx+width, yy+height); } else { entered=entered; } + var shutter_backdrop = 5; if (entered || click_timer>0){ - if (time_open<20){ + if (time_open<24){ time_open++; right_rack.draw(xx+width, yy, false, false); left_rack.draw(xx, yy, false, false); @@ -227,28 +368,32 @@ function ShutterButton() constructor{ right_rack.draw(xx+width, yy, true); left_rack.draw(xx, yy, true); } - var text_draw = xx+(width/2)-(string_width(text)*(3*scale)/2); + var main_sprite = 0; if (time_open<2){ draw_sprite_ext(spr_shutter_button, main_sprite, xx, yy, scale, scale, 0, c_white, 1) - } else if (time_open<8 && time_open>=2){ - main_sprite=1; - }else if (time_open<13 && time_open>=8){ - main_sprite=2; - }else if (time_open<18 && time_open>=13){ - main_sprite=3; - } else if (time_open>=18){ - main_sprite=4; - } - if (time_open>=2){ - draw_sprite_ext(spr_shutter_button, shutter_backdrop, xx, yy, scale, scale, 0, c_white, 1) - draw_set_color(c_red); - if (click_timer>0){ - draw_text_transformed(text_draw, yy+(24*scale), text, 3*scale, 3*scale, 0); - } else { - draw_text_transformed(text_draw, yy+(20*scale), text, 3*scale, 3*scale, 0); + } else if (time_open>=2){ + + main_sprite=floor(time_open/6) + 1; + + //draw_sprite_ext(spr_shutter_button, shutter_backdrop, xx, yy, scale, scale, 0, c_white, 1) + background.inside_method = function(){ + var yy = YY; + var xx = XX; + var text_draw = xx+(width/2)-(string_width(text)*(3*scale)/2); + if (scr_hit(xx, yy, xx+width, yy+height)){ + draw_rectangle_color_simple(xx, yy, xx+width, yy+height, false, CM_GREEN_COLOR, 0.35) + } + draw_set_halign(fa_left); + draw_set_color(c_red); + if (click_timer>0){ + draw_text_transformed(text_draw, yy+(24*scale), text, 3*scale, 3*scale, 0); + } else { + draw_text_transformed(text_draw, yy+(20*scale), text, 3*scale, 3*scale, 0); + } } - draw_sprite_ext(spr_shutter_button, main_sprite, xx, yy, scale, scale, 0, c_white, 1) + background.draw_with_dimensions(xx, yy, width, height); + draw_sprite_ext(spr_shutter_button, main_sprite, xx, yy, scale, scale, 0, c_white, 1); } draw_set_color(c_grey); if (click_timer>7){ @@ -260,85 +405,5 @@ function ShutterButton() constructor{ } } -function DataSlate() constructor{ - static_line=1; - title=""; - sub_title=""; - body_text = ""; - inside_method = ""; - XX=0; - YY=0; - width=0; - height=0; - percent_cut=0; - - static entered = function(){ - return (scr_hit( - XX-4, - YY, - XX + width, - YY + height, - )); - } - static draw_with_dimensions = function(xx,yy, width , height){ - var _scale_x = width/860; - var _scale_y = height/850; - draw(xx,yy, _scale_x, _scale_y); - } - static draw = function(xx,yy, scale_x=1, scale_y=1){ - XX=xx; - YY=yy; - width = 860*scale_x; - height = 850*scale_y; - draw_sprite_ext(spr_data_slate,1, xx,yy, scale_x, scale_y, 0, c_white, 1); - if (is_callable(inside_method)){ - inside_method(); - } - if (static_line<=10) then draw_set_alpha(static_line/10); - if (static_line>10) then draw_set_alpha(1-((static_line-10)/10)); - draw_set_color(5998382); - var line_move = yy+(70*scale_y)+((36*scale_y)*static_line); - draw_line(xx+(30*scale_x),line_move,xx+(820*scale_x),line_move); - draw_set_alpha(1); - if (irandom(75)=0 && static_line>1){static_line--;} - else{ - static_line+=0.1; - } - if (static_line>20) then static_line=1; - draw_set_color(c_gray); - draw_set_halign(fa_center); - var draw_height = 5; - if (title!=""){ - draw_text_transformed(xx+(0.5*width), yy+(50*scale_y), title, 3*scale_x, 3*scale_y, 0); - draw_height += (string_height(title)*3)*scale_y; - } - if (sub_title!=""){ - draw_text_transformed(xx+(0.5*width), yy+(50*scale_y)+draw_height, sub_title, 2*scale_x, 2*scale_y, 0); - draw_height+=(25*scale_y) +(string_height(sub_title)*2)*scale_y; - } - if (body_text!=""){ - draw_text_ext(xx+(0.5*width), yy+(50*scale_y)+draw_height, string_hash_to_newline(body_text), -1, width-60); - } - } - static draw_cut = function(xx,yy, scale_x=1, scale_y=1, middle_percent=percent_cut){ - XX=xx; - YY=yy; - draw_sprite_part_ext(spr_data_slate,1, 0, 0, 850, 69, XX, YY, scale_x, scale_y, c_white, 1); - draw_sprite_part_ext(spr_data_slate,1, 0, 69, 850, 683*(middle_percent/100), XX, YY+(69*scale_y), scale_x, scale_y, c_white, 1); - draw_sprite_part_ext(spr_data_slate,1, 0, 752, 850, 98, XX, YY+(69+683*((middle_percent/100)))*scale_y, scale_x, scale_y, c_white, 1); - width = 860*scale_x; - height = (69+(683*(middle_percent/100))+98 )*scale_y; - if (is_callable(inside_method)){ - inside_method(); - } - } - - static percent_mod_draw_cut = function(xx,yy, scale_x=1, scale_y=1, mod_edit=1){ - percent_cut = min(percent_cut+mod_edit, 100); - if (!percent_cut) then percent_cut=0; - draw_cut(xx,yy, scale_x, scale_y); - } -} - diff --git a/scripts/scr_company_struct/scr_company_struct.gml b/scripts/scr_company_struct/scr_company_struct.gml index 09a1316ff9..cc9f9866e3 100644 --- a/scripts/scr_company_struct/scr_company_struct.gml +++ b/scripts/scr_company_struct/scr_company_struct.gml @@ -10,8 +10,23 @@ function new_company_struct(){ } } function CompanyStruct(comp) constructor{ + has_squads = true; + + if (comp == 0 || comp == -1){ + has_squads = false; + } + + unit_ui_panel = new DataSlate(); + unit_ui_panel.width = 572; + unit_ui_panel.height = 378; + unit_ui_panel.XX = 1008; + unit_ui_panel.YY = 141 + unit_ui_panel.set_width = true; + unit_ui_panel.style = "decorated"; + company = comp; company_squads = []; + tooltip_drawing = []; static garbage_collect = function(){ reset_squad_surface(); delete next_squad_button; @@ -20,6 +35,7 @@ function CompanyStruct(comp) constructor{ delete reset_loadout_button; delete sabotage_button; delete garrison_button; + delete unit_ui_panel; } static squad_search = function(){ var _squads = obj_ini.squads; diff --git a/scripts/scr_company_view/scr_company_view.gml b/scripts/scr_company_view/scr_company_view.gml index da5972464c..778a2121f7 100644 --- a/scripts/scr_company_view/scr_company_view.gml +++ b/scripts/scr_company_view/scr_company_view.gml @@ -465,15 +465,14 @@ function switch_view_company(new_view){ } if (new_view>10){ view_squad=false; - company_data={}; scr_special_view(new_view); } else { with (obj_ini){ scr_company_order(new_view); } scr_company_view(new_view); - new_company_struct(); } + new_company_struct(); } } function company_manage_actions(){ diff --git a/scripts/scr_complex_colour_kit/scr_complex_colour_kit.gml b/scripts/scr_complex_colour_kit/scr_complex_colour_kit.gml index ca0105dd30..9856cdcf8b 100644 --- a/scripts/scr_complex_colour_kit/scr_complex_colour_kit.gml +++ b/scripts/scr_complex_colour_kit/scr_complex_colour_kit.gml @@ -13,39 +13,39 @@ function ColourItem(xx,yy) constructor{ self.xx=xx; self.yy=yy; data_slate = new DataSlate(); - static scr_unit_draw_data = function(defualt_val = 0){ + static scr_unit_draw_data = function(default_val = 0){ map_colour = { is_changed : false, - left_leg_lower : defualt_val, - left_leg_upper : defualt_val, - left_leg_knee : defualt_val, - right_leg_lower : defualt_val, - right_leg_upper : defualt_val, - right_leg_knee : defualt_val, - metallic_trim : defualt_val, - right_trim : defualt_val, - left_trim : defualt_val, - left_chest : defualt_val, - right_chest : defualt_val, - left_thorax : defualt_val, - right_thorax : defualt_val, - left_pauldron : defualt_val, - left_arm : defualt_val, - left_hand : defualt_val, - right_pauldron: defualt_val, - right_arm : defualt_val, - right_hand : defualt_val, - left_head : defualt_val, - right_head: defualt_val, - left_muzzle: defualt_val, - right_muzzle: defualt_val, - eye_lense :defualt_val, - right_backpack : defualt_val, - left_backpack : defualt_val, - weapon_primary : defualt_val, - weapon_secondary : defualt_val, - company_marks : defualt_val, - company_marks_loc : defualt_val, + left_leg_lower : default_val, + left_leg_upper : default_val, + left_leg_knee : default_val, + right_leg_lower : default_val, + right_leg_upper : default_val, + right_leg_knee : default_val, + metallic_trim : default_val, + right_trim : default_val, + left_trim : default_val, + left_chest : default_val, + right_chest : default_val, + left_thorax : default_val, + right_thorax : default_val, + left_pauldron : default_val, + left_arm : default_val, + left_hand : default_val, + right_pauldron: default_val, + right_arm : default_val, + right_hand : default_val, + left_head : default_val, + right_head: default_val, + left_muzzle: default_val, + right_muzzle: default_val, + eye_lense :default_val, + right_backpack : default_val, + left_backpack : default_val, + weapon_primary : default_val, + weapon_secondary : default_val, + company_marks : default_val, + company_marks_loc : default_val, } return map_colour; } @@ -739,8 +739,8 @@ function colour_picker(xx,yy, max_width=400) constructor{ var column = -1; var current_color = 0; var row = 0; - var defualt_box_x = x; - var box_x = defualt_box_x + var default_box_x = x; + var box_x = default_box_x var box_y = y; diff --git a/scripts/scr_draw_management_unit/scr_draw_management_unit.gml b/scripts/scr_draw_management_unit/scr_draw_management_unit.gml index efbd668c1c..c4f28ea1c4 100644 --- a/scripts/scr_draw_management_unit/scr_draw_management_unit.gml +++ b/scripts/scr_draw_management_unit/scr_draw_management_unit.gml @@ -201,35 +201,35 @@ function scr_draw_management_unit(selected, yy = 0, xx = 0, draw = true) { var sqi = ""; draw_set_color(c_black); var squad_colours = [ - #ff0000, // Red (HSL: 0, 100%, 50%) - #ff8000, // Orange (HSL: 30, 100%, 50%) - #ffff00, // Yellow (HSL: 60, 100%, 50%) - #00ff00, // Green (HSL: 120, 100%, 50%) - #00ffff, // Cyan (HSL: 180, 100%, 50%) - #0080ff, // Light Blue (HSL: 210, 100%, 50%) - #0000ff, // Blue (HSL: 240, 100%, 50%) - #8000ff, // Purple (HSL: 270, 100%, 50%) - #ff00ff, // Magenta (HSL: 300, 100%, 50%) - - #b20000, // Red (HSL: 0, 100%, 25%) - #b26e00, // Orange (HSL: 30, 100%, 25%) - #b2b200, // Yellow (HSL: 60, 100%, 25%) - #00b200, // Green (HSL: 120, 100%, 25%) - #00b2b2, // Cyan (HSL: 180, 100%, 25%) - #004db2, // Light Blue (HSL: 210, 100%, 25%) - #0000b2, // Blue (HSL: 240, 100%, 25%) - #4d00b2, // Purple (HSL: 270, 100%, 25%) - #b200b2, // Magenta (HSL: 300, 100%, 25%) - - #ff4d4d, // Red (HSL: 0, 50%, 50%) - #ffb84d, // Orange (HSL: 30, 50%, 50%) - #ffff66, // Yellow (HSL: 60, 50%, 50%) - #66ff66, // Green (HSL: 120, 50%, 50%) - #66ffff, // Cyan (HSL: 180, 50%, 50%) - #6680ff, // Light Blue (HSL: 210, 50%, 50%) - #6666ff, // Blue (HSL: 240, 50%, 50%) - #b366ff, // Purple (HSL: 270, 50%, 50%) - #ff66ff, // Magenta (HSL: 300, 50%, 50%) + #ff0000, // Red (HSL: 0, 100%, 50%) + #ff8000, // Orange (HSL: 30, 100%, 50%) + #ffff00, // Yellow (HSL: 60, 100%, 50%) + #00ff00, // Green (HSL: 120, 100%, 50%) + #00ffff, // Cyan (HSL: 180, 100%, 50%) + #0080ff, // Light Blue (HSL: 210, 100%, 50%) + #0000ff, // Blue (HSL: 240, 100%, 50%) + #8000ff, // Purple (HSL: 270, 100%, 50%) + #ff00ff, // Magenta (HSL: 300, 100%, 50%) + + #b20000, // Red (HSL: 0, 100%, 25%) + #b26e00, // Orange (HSL: 30, 100%, 25%) + #b2b200, // Yellow (HSL: 60, 100%, 25%) + #00b200, // Green (HSL: 120, 100%, 25%) + #00b2b2, // Cyan (HSL: 180, 100%, 25%) + #004db2, // Light Blue (HSL: 210, 100%, 25%) + #0000b2, // Blue (HSL: 240, 100%, 25%) + #4d00b2, // Purple (HSL: 270, 100%, 25%) + #b200b2, // Magenta (HSL: 300, 100%, 25%) + + #ff4d4d, // Red (HSL: 0, 50%, 50%) + #ffb84d, // Orange (HSL: 30, 50%, 50%) + #ffff66, // Yellow (HSL: 60, 50%, 50%) + #66ff66, // Green (HSL: 120, 50%, 50%) + #66ffff, // Cyan (HSL: 180, 50%, 50%) + #6680ff, // Light Blue (HSL: 210, 50%, 50%) + #6666ff, // Blue (HSL: 240, 50%, 50%) + #b366ff, // Purple (HSL: 270, 50%, 50%) + #ff66ff, // Magenta (HSL: 300, 50%, 50%) ]; if (squad[selected] != -1) { var _squad_modulo = squad[selected] % array_length(squad_colours); diff --git a/scripts/scr_livery_setup/scr_livery_setup.gml b/scripts/scr_livery_setup/scr_livery_setup.gml index ea9efa3d0f..426e5f117c 100644 --- a/scripts/scr_livery_setup/scr_livery_setup.gml +++ b/scripts/scr_livery_setup/scr_livery_setup.gml @@ -141,7 +141,7 @@ function scr_livery_setup(){ draw_text_transformed(cur_button.cords[0]+30,cur_button.cords[1]+4,cur_button.text,0.4,0.4,0); }*/ if (!complex_livery){ - var _tooltip_add_on = ". You can change this value as much as you want in order to update the marine role, company and defualt options on the left but remember to set this value back to your desired base value before continuing"; + var _tooltip_add_on = ". You can change this value as much as you want in order to update the marine role, company and default options on the left but remember to set this value back to your desired base value before continuing"; var button_data = [ { text : $"Primary : {col[main_color]}", diff --git a/scripts/scr_tooltip_draw/scr_tooltip_draw.gml b/scripts/scr_tooltip_draw/scr_tooltip_draw.gml index 2e26c9db26..fb6ca6ae04 100644 --- a/scripts/scr_tooltip_draw/scr_tooltip_draw.gml +++ b/scripts/scr_tooltip_draw/scr_tooltip_draw.gml @@ -22,7 +22,16 @@ function tooltip_draw(_tooltip="", _width=350, _coords=return_mouse_consts_toolt } - +function setup_tooltip_list(list){ + var tip, coords; + for (var i = 0; i < array_length(list); i++) { + tip = list[i]; + coords = tip[1]; + if (scr_hit(coords)) { + tooltip_draw(tip[0], 350, , , , tip[2]); + } + } +} diff --git a/scripts/scr_ui_manage/scr_ui_manage.gml b/scripts/scr_ui_manage/scr_ui_manage.gml index 61c47acf1d..b0e20235da 100644 --- a/scripts/scr_ui_manage/scr_ui_manage.gml +++ b/scripts/scr_ui_manage/scr_ui_manage.gml @@ -170,172 +170,19 @@ function alternative_manage_views(x1, y1) { } } -/// @mixin -function scr_ui_manage() { - if (combat != 0) { - exit; - } - // This is the draw script for showing the main management screen or individual company screens - - if ((zoomed == 0) && (menu == 1) && (managing >= 0)) { - if (managing > 0) { - company_manage_actions(); - } - if (!text_bar) { - ui_manage_hotkeys(); - } - } - - if ((menu == 1) && (managing > 0 || managing < 0)) { - if (!mouse_check_button(mb_left)) { - drag_square = []; - rectangle_action = -1; - } - if (squad_sel_count > 0) { - squad_sel_count--; - } - if (squad_sel_count == 0) { - squad_sel = -1; - squad_sel_action = -1; - } - if (man_size < 1) { - selecting_location = ""; - selecting_ship = -1; - selecting_planet = 0; - man_size = 0; - } - var unit, x1, x2, x3, y1, y2, y3, text; - var tooltip_text = "", bionic_tooltip = "", tooltip_drawing = []; - var invalid_locations = ["Mechanicus Vessel", "Terra"]; - - var xx = __view_get(e__VW.XView, 0) + 0, yy = __view_get(e__VW.YView, 0) + 0, bb = "", img = 0; - - // Draw BG - draw_set_alpha(1); - draw_sprite(spr_rock_bg, 0, xx, yy); - draw_set_font(fnt_40k_30b); - draw_set_halign(fa_center); - draw_set_color(c_gray); // 38144 - - // Var declarations - var c = 0, fx = "", skin = obj_ini.skin_color; - static stats_displayed = false; - - if (managing > 0) { - if (managing > 20) { - c = managing - 10; - } else if ((managing >= 1) && (managing <= 10)) { - fx = int_to_roman(managing) + " Company"; - c = managing; - } else if (managing > 10) { - switch (managing) { - case 11: - fx = "Headquarters"; - break; - case 12: - fx = "Apothecarion"; - break; - case 13: - fx = "Librarium"; - break; - case 14: - fx = "Reclusium"; - break; - case 15: - fx = "Armamentarium"; - break; - } - } - // Draw the company followed by chapters name - draw_text(xx + 800, yy + 74, string(fx) + ", " + string(global.chapter_name)); - } else if (managing < 0) { - if (struct_exists(selection_data, "purpose")) { - draw_text(xx + 800, yy + 74, $"{selection_data.purpose}"); - } - } - if (managing <= 10 && managing > 0) { - var bar_wid = 0, click_check, string_h; - draw_set_alpha(0.25); - if (obj_ini.company_title[managing] != "") { - bar_wid = max(400, string_width(obj_ini.company_title[managing])); - } - if (obj_ini.company_title[managing] == "") { - bar_wid = 400; - } - string_h = string_height("LOL"); - draw_rectangle(xx + 800 - (bar_wid / 2), yy + 108, xx + 800 + (bar_wid / 2), yy + 100 + string_h, 1); - click_check = point_and_click([xx + 800 - (bar_wid / 2), yy + 108, xx + 800 + (bar_wid / 2), yy + 100 + string_h]); - obj_cursor.image_index = 0; - text_bar = false; - if (click_check) { - obj_cursor.image_index = 2; - text_bar = true; - keyboard_string = obj_ini.company_title[managing]; - } - draw_set_alpha(1); - - if ((obj_ini.company_title[managing] != "") || (text_bar > 0)) { - draw_set_font(fnt_fancy); - if ((text_bar == 0) || (text_bar > 31)) { - draw_text(xx + 800, yy + 110, $"''{obj_ini.company_title[managing]} {(text_bar > 0 && text_bar <= 31) ? "|" : ""}'' "); - } - } - } - - // var we;we=string_width(string(global.chapter_name)+" "+string(fx))/2; - - if (managing > 0) { - // Draw arrows - draw_sprite_ext(spr_arrow, 0, xx + 25, yy + 70, 2, 2, 0, c_white, 1); // Back - draw_sprite_ext(spr_arrow, 0, xx + 429, yy + 70, 2, 2, 0, c_white, 1); // Left - draw_sprite_ext(spr_arrow, 1, xx + 1110, yy + 70, 2, 2, 0, c_white, 1); // Right - } else { - scr_manage_task_selector(); - } - var right_ui_block = { - x1: xx + 1008, - y1: yy + 141, - w: 568, - h: 681 - }; - right_ui_block.x2 = right_ui_block.x1 + right_ui_block.w; - right_ui_block.y2 = right_ui_block.y1 + right_ui_block.h; - - var actions_block = { - x1: right_ui_block.x1, - y1: yy + 520, - w: 569, - h: 302 - }; - actions_block.x2 = actions_block.x1 + actions_block.w; - actions_block.y2 = actions_block.y1 + actions_block.h; - - draw_sprite_stretched(spr_data_slate_back, 0, actions_block.x1, actions_block.y1, actions_block.w, actions_block.h); - draw_rectangle_color_simple(actions_block.x1, actions_block.y1, actions_block.x2, actions_block.y2, 1, c_gray); - draw_rectangle_color_simple(actions_block.x1 + 1, actions_block.y1 + 1, actions_block.x2 - 1, actions_block.y2 - 1, 1, c_black); - draw_rectangle_color_simple(actions_block.x1 + 2, actions_block.y1 + 2, actions_block.x2 - 2, actions_block.y2 - 2, 1, c_gray); - - //TODO remove if no longer needed - /*var unit_view_block = { - x1: right_ui_block.x1, - y1: yy + 140, - w: 571, - h: 380, - }; - unit_view_block.x2 = unit_view_block.x1 + unit_view_block.w; - unit_view_block.y2 = unit_view_block.y1 + unit_view_block.h;*/ - - draw_set_color(c_white); - draw_sprite_stretched(spr_data_slate_back, 0, xx + 1008 - 1, yy + 140, 572, 378); - // draw_sprite_stretched(spr_data_slate_border, 0, xx+1008-1, yy+140, 572, 378); Old Location - // draw_rectangle_color_simple(xx+1007, yy+140, xx+1579, yy+519, 0, c_white, 0.05); - draw_rectangle_color_simple(xx + 1007, yy + 140, xx + 1579, yy + 519, 0, 5998382, 0.05); - // Swap between squad view and normal view +function draw_sprite_and_unit_equip_data(){ + draw_set_font(fnt_40k_14); + draw_set_halign(fa_left); + // Swap between squad view and normal view + company_data.unit_ui_panel.inside_method = function(){ + var _unit_tooltips = []; draw_set_color(c_gray); + var xx = company_data.unit_ui_panel.XX; + var yy = company_data.unit_ui_panel.YY; // draw_line(xx+1005,yy+519,xx+1576,yy+519); draw_set_font(fnt_40k_14b); - if (instance_exists(obj_controller) && is_struct(obj_controller.temp[120])) { + if (is_struct(obj_controller.temp[120])) { var selected_unit = obj_controller.temp[120]; //unit struct ///tooltip_text stacks hover over type tooltips into an array and draws them last so as not to create drawing order issues draw_set_color(c_red); @@ -347,7 +194,7 @@ function scr_ui_manage() { _allow_alternative_views = selection_data.purpose_code == "manage"; } if (_allow_alternative_views) { - alternative_manage_views(right_ui_block.x1 + 5, right_ui_block.y1 + 6); + alternative_manage_views(xx + 5, yy + 6); } if (!_allow_alternative_views) { @@ -355,37 +202,37 @@ function scr_ui_manage() { } //TODO Implement company report /*var x6=x5+string_width(stat_tool_tip_text)+4; - var y6=y5+string_height(stat_tool_tip_text)+2; - draw_unit_buttons([x5,y5,x6,y6], stat_tool_tip_text,[1,1],c_red); - if (company_data!={}){ - array_push(tooltip_drawing, ["click or press R to show Company Report", [x5,y5,x6,y6]]); - if ((keyboard_check_pressed(ord("R"))|| (point_in_rectangle(mouse_x, mouse_y,x5,y5,x6,y6) && mouse_check_button_pressed(mb_left))) && !instance_exists(obj_temp3) && !instance_exists(obj_popup)){ - view_squad =false; - unit_profile=false; - company_report = !company_report; - } - }else{ - draw_set_alpha(0.5); - draw_set_color(c_black); - draw_rectangle(x5,y5,x6,y6,0); - draw_set_alpha(1); - } - */ + var y6=y5+string_height(stat_tool_tip_text)+2; + draw_unit_buttons([x5,y5,x6,y6], stat_tool_tip_text,[1,1],c_red); + if (company_data!={}){ + array_push(company_data.tooltip_drawing, ["click or press R to show Company Report", [x5,y5,x6,y6]]); + if ((keyboard_check_pressed(ord("R"))|| (point_in_rectangle(mouse_x, mouse_y,x5,y5,x6,y6) && mouse_check_button_pressed(mb_left))) && !instance_exists(obj_temp3) && !instance_exists(obj_popup)){ + view_squad =false; + unit_profile=false; + company_report = !company_report; + } + }else{ + draw_set_alpha(0.5); + draw_set_color(c_black); + draw_rectangle(x5,y5,x6,y6,0); + draw_set_alpha(1); + } + */ // Draw unit image draw_set_color(c_white); if (is_struct(obj_controller.temp[121])) { - obj_controller.temp[121].draw(xx + 1328, yy + 250); + obj_controller.temp[121].draw(xx + 320, yy + 109); } //TODO implement tooltip explaining potential loyalty hit of demoting a sgt // Sergeant promotion button - if (view_squad && company_data != {}) { + if (view_squad && company_data.has_squads) { if (company_data.cur_squad != 0) { var cur_squad = company_data.grab_current_squad(); var sgt_possible = cur_squad.type != "command_squad" && !selected_unit.IsSpecialist(SPECIALISTS_SQUAD_LEADERS); if (selected_unit != cur_squad.squad_leader) { - if (point_and_click(draw_unit_buttons([xx + 1208 + 50, yy + 210 + 260], "Make Sgt", [1, 1], #50a076, , , sgt_possible ? 1 : 0.5)) && sgt_possible) { + if (point_and_click(draw_unit_buttons([xx + 200 + 50, yy + 329], "Make Sgt", [1, 1], #50a076, , , sgt_possible ? 1 : 0.5)) && sgt_possible) { cur_squad.change_sgt(selected_unit); } } @@ -398,8 +245,8 @@ function scr_ui_manage() { // Draw unit name and role var _name_box = { - x1: xx + 1410, - y1: yy + 177, + x1: xx + 402, + y1: yy + 36, text1: "", text2: "", text3: selected_unit.name() @@ -426,7 +273,7 @@ function scr_ui_manage() { draw_set_font(fnt_40k_14); // Left side of the screen draw_set_halign(fa_left); - var x_left = xx + 1030; + var x_left = xx + 22; // Equipment var armour = selected_unit.armour(); @@ -434,12 +281,12 @@ function scr_ui_manage() { text = selected_unit.equipments_qual_string("armour", true); tooltip_text = obj_controller.temp[103]; x1 = x_left; - y1 = yy + 320; + y1 = yy + 179; x2 = x1 + string_width_ext(text, -1, 187); y2 = y1 + string_height_ext(text, -1, 187); draw_set_alpha(1); draw_text_ext_outline(x1, y1, text, -1, 187, 0, quality_color(selected_unit.armour_quality)); - array_push(tooltip_drawing, [tooltip_text, [x1, y1, x2, y2], "Armour"]); + array_push(_unit_tooltips, [tooltip_text, [x1, y1, x2, y2], "Armour"]); } var gear = selected_unit.gear(); @@ -447,11 +294,11 @@ function scr_ui_manage() { text = selected_unit.equipments_qual_string("gear", true); tooltip_text = obj_controller.temp[105]; x1 = x_left; - y1 = yy + 446; + y1 = yy + 305; x2 = x1 + string_width_ext(text, -1, 187); y2 = y1 + string_height_ext(text, -1, 187); draw_text_ext_outline(x1, y1, text, -1, 187, 0, quality_color(selected_unit.gear_quality)); - array_push(tooltip_drawing, [tooltip_text, [x1, y1, x2, y2], "Gear"]); + array_push(_unit_tooltips, [tooltip_text, [x1, y1, x2, y2], "Gear"]); } var mobi = selected_unit.mobility_item(); @@ -459,11 +306,11 @@ function scr_ui_manage() { text = selected_unit.equipments_qual_string("mobi", true); tooltip_text = obj_controller.temp[107]; x1 = x_left; - y1 = yy + 467; + y1 = yy + 326; x2 = x1 + string_width_ext(text, -1, 187); y2 = y1 + string_height_ext(text, -1, 187); draw_text_ext_outline(x1, y1, text, -1, 187, 0, quality_color(selected_unit.mobility_item_quality)); - array_push(tooltip_drawing, [tooltip_text, [x1, y1, x2, y2], "Back/Mobilitiy"]); + array_push(_unit_tooltips, [tooltip_text, [x1, y1, x2, y2], "Back/Mobilitiy"]); } var wep1 = selected_unit.weapon_one(); @@ -471,11 +318,11 @@ function scr_ui_manage() { text = selected_unit.equipments_qual_string("wep1", true); tooltip_text = obj_controller.temp[109]; x1 = x_left; - y1 = yy + 345; + y1 = yy + 204; x2 = x1 + string_width_ext(text, -1, 187); y2 = y1 + string_height_ext(text, -1, 187); draw_text_ext_outline(x1, y1, text, -1, 187, 0, quality_color(selected_unit.weapon_one_quality)); - array_push(tooltip_drawing, [tooltip_text, [x1, y1, x2, y2], "First Weapon"]); + array_push(_unit_tooltips, [tooltip_text, [x1, y1, x2, y2], "First Weapon"]); } var wep2 = selected_unit.weapon_two(); @@ -483,20 +330,20 @@ function scr_ui_manage() { text = selected_unit.equipments_qual_string("wep2", true); tooltip_text = obj_controller.temp[111]; x1 = x_left; - y1 = yy + 395; + y1 = yy + 254; x2 = x1 + string_width_ext(text, -1, 187); y2 = y1 + string_height_ext(text, -1, 187); draw_text_ext_outline(x1, y1, text, -1, 187, 0, quality_color(selected_unit.weapon_two_quality)); - array_push(tooltip_drawing, [tooltip_text, [x1, y1, x2, y2], "Second Weapon"]); + array_push(_unit_tooltips, [tooltip_text, [x1, y1, x2, y2], "Second Weapon"]); } // Stats - // Bionics tracker + // Bionics trackers if (obj_controller.temp[128] != "") { text = obj_controller.temp[128]; tooltip_text = obj_controller.temp[129]; x1 = x_left + 110; - y1 = yy + 208; + y1 = yy + 67; x2 = x1 + string_width(text); y2 = y1 + string_height(text); x3 = x1 - 26; @@ -504,7 +351,7 @@ function scr_ui_manage() { draw_sprite_stretched(spr_icon_bionics, 0, x3, y3, 24, 24); draw_text_outline(x1, y1, text); - array_push(tooltip_drawing, [tooltip_text, [x3, y1, x2, y2], "Bionics Installed"]); + array_push(_unit_tooltips, [tooltip_text, [x3, y1, x2, y2], "Bionics Installed"]); } // Armour Rating @@ -512,14 +359,14 @@ function scr_ui_manage() { text = obj_controller.temp[126]; tooltip_text = obj_controller.temp[127]; x1 = x_left + 20; - y1 = yy + 232; + y1 = yy + 91; x2 = x1 + string_width(text); y2 = y1 + string_height(text); x3 = x1 - 26; y3 = y1 - 4; draw_sprite_stretched(spr_icon_shield2, 0, x3, y3, 24, 24); draw_text_outline(x1, y1, text); - array_push(tooltip_drawing, [tooltip_text, [x3, y1, x2, y2], "Armour Rating"]); + array_push(_unit_tooltips, [tooltip_text, [x3, y1, x2, y2], "Armour Rating"]); } // Health @@ -527,14 +374,14 @@ function scr_ui_manage() { text = obj_controller.temp[124]; tooltip_text = obj_controller.temp[125]; x1 = x_left + 20; - y1 = yy + 208; + y1 = yy + 67; x2 = x1 + string_width(text); y2 = y1 + string_height(text); x3 = x1 - 26; y3 = y1 - 4; draw_sprite_stretched(spr_icon_health, 0, x3, y3, 24, 24); draw_text_outline(x1, y1, text); - array_push(tooltip_drawing, [tooltip_text, [x3, y1, x2, y2], "Health"]); + array_push(_unit_tooltips, [tooltip_text, [x3, y1, x2, y2], "Health"]); } // Experience @@ -542,13 +389,13 @@ function scr_ui_manage() { text = obj_controller.temp[113]; tooltip_text = "A measureme of how battle-hardened the unit is. Provides a lot of various bonuses across the board."; x1 = x_left + 20; - y1 = yy + 184; + y1 = yy + 43; x2 = x1 + string_width(text); y2 = y1 + string_height(text); x3 = x1 - 26; y3 = y1 - 4; - array_push(tooltip_drawing, [tooltip_text, [x3, y1, x2, y2], "Experience"]); - draw_sprite_stretched(spr_icon_veteran, 0, x_left - 6, yy + 180, 24, 24); + array_push(_unit_tooltips, [tooltip_text, [x3, y1, x2, y2], "Experience"]); + draw_sprite_stretched(spr_icon_veteran, 0, x_left - 6, yy + 39, 24, 24); draw_text_outline(x1, y1, text); } @@ -556,14 +403,14 @@ function scr_ui_manage() { text = obj_controller.temp[118]; // Damage Resistance tooltip_text = obj_controller.temp[130]; x1 = x_left + 110; - y1 = yy + 232; + y1 = yy + 91; x2 = x1 + string_width(text); y2 = y1 + string_height(text); x3 = x1 - 26; y3 = y1 - 4; draw_sprite_stretched(spr_icon_iron_halo, 0, x3, y3, 24, 24); draw_text_outline(x1, y1, text); - array_push(tooltip_drawing, [tooltip_text, [x3, y1, x2, y2], "Damage Resistance"]); + array_push(_unit_tooltips, [tooltip_text, [x3, y1, x2, y2], "Damage Resistance"]); } // Psyker things @@ -571,21 +418,21 @@ function scr_ui_manage() { text = obj_controller.temp[119]; tooltip_text = obj_controller.temp[123]; x1 = x_left + 110; - y1 = yy + 184; + y1 = yy + 43; x2 = x1 + string_width(text); y2 = y1 + string_height(text); x3 = x1 - 26; y3 = y1 - 4; draw_sprite_stretched(spr_icon_psyker, 0, x3, y3, 24, 24); draw_text_outline(x1, y1, text); - array_push(tooltip_drawing, [tooltip_text, [x3, y1, x2, y2], "Psychic Stats"]); + array_push(_unit_tooltips, [tooltip_text, [x3, y1, x2, y2], "Psychic Stats"]); } - if (is_array(obj_controller.temp[117])) { + if (is_array(obj_controller.temp[116])) { text = $"{round(obj_controller.temp[116][0])}"; // melee attack tooltip_text = string(obj_controller.temp[116][1]); x1 = x_left + 20; - y1 = yy + 256; + y1 = yy + 115; x2 = x1 + string_width(text); y2 = y1 + string_height(text); if (selected_unit.encumbered_melee) { @@ -597,14 +444,14 @@ function scr_ui_manage() { draw_sprite_stretched(spr_icon_weapon_skill, 0, x3, y3, 24, 24); draw_text_outline(x1, y1, text); draw_set_color(line_color); - array_push(tooltip_drawing, [tooltip_text, [x3, y1, x2, y2], "Melee Attack"]); + array_push(_unit_tooltips, [tooltip_text, [x3, y1, x2, y2], "Melee Attack"]); } if (is_array(obj_controller.temp[117])) { text = $"{round(obj_controller.temp[117][0])}"; // ranged attack tooltip_text = string(obj_controller.temp[117][1]); x1 = x_left + 20; - y1 = yy + 280; + y1 = yy + 139; x2 = x1 + string_width(text); y2 = y1 + string_height(text); if (selected_unit.encumbered_ranged) { @@ -614,7 +461,7 @@ function scr_ui_manage() { y3 = y1 - 4; draw_sprite_stretched(spr_icon_ballistic_skill, 0, x3, y3, 24, 24); draw_text_outline(x1, y1, text); - array_push(tooltip_drawing, [tooltip_text, [x3, y1, x2, y2], "Ranged Attack"]); + array_push(_unit_tooltips, [tooltip_text, [x3, y1, x2, y2], "Ranged Attack"]); draw_set_color(line_color); } @@ -622,7 +469,7 @@ function scr_ui_manage() { var carry_data = obj_controller.temp[116][2]; var carry_string = $"{carry_data[0]}/{carry_data[1]}"; // Melee Burden x1 = x_left + 110; - y1 = yy + 256; + y1 = yy + 115; x2 = x1 + string_width(carry_string); y2 = y1 + string_height(carry_string); if (selected_unit.encumbered_melee) { @@ -633,7 +480,7 @@ function scr_ui_manage() { draw_sprite_stretched(spr_icon_weight, 0, x3, y3, 24, 24); draw_text_outline(x1, y1, carry_string); tooltip_text = carry_data[2]; - array_push(tooltip_drawing, [tooltip_text, [x3, y1, x2, y2], "Melee Burden"]); + array_push(_unit_tooltips, [tooltip_text, [x3, y1, x2, y2], "Melee Burden"]); draw_set_color(line_color); } @@ -641,7 +488,7 @@ function scr_ui_manage() { var carry_data = obj_controller.temp[117][2]; var carry_string = $"{carry_data[0]}/{carry_data[1]}"; // Ranged Burden x1 = x_left + 110; - y1 = yy + 280; + y1 = yy + 139; x2 = x1 + string_width(carry_string); y2 = y1 + string_height(carry_string); if (selected_unit.encumbered_ranged) { @@ -652,19 +499,168 @@ function scr_ui_manage() { draw_sprite_stretched(spr_icon_weight, 0, x3, y3, 24, 24); draw_text_outline(x1, y1, carry_string); tooltip_text = carry_data[2]; - array_push(tooltip_drawing, [tooltip_text, [x3, y1, x2, y2], "Ranged Burden"]); + array_push(_unit_tooltips, [tooltip_text, [x3, y1, x2, y2], "Ranged Burden"]); draw_set_color(line_color); } - // Animated scanline - draw_animated_scanline(xx + 1013, yy + 140 + 4, 558, 368); - draw_sprite_stretched(spr_data_slate_border, 0, xx + 1008 - 1, yy + 140, 572, 378); + } + setup_tooltip_list(_unit_tooltips) + } + company_data.unit_ui_panel.draw_with_dimensions(); +} +/// @mixin +function scr_ui_manage() { + if (combat != 0) { + exit; + } + // This is the draw script for showing the main management screen or individual company screens + + if ((zoomed == 0) && (menu == 1) && (managing >= 0)) { + if (managing > 0) { + company_manage_actions(); + } + if (!text_bar) { + ui_manage_hotkeys(); + } + } + + if ((menu == 1) && (managing > 0 || managing < 0)) { + if (!mouse_check_button(mb_left)) { + drag_square = []; + rectangle_action = -1; + } + if (squad_sel_count > 0) { + squad_sel_count--; + } + if (squad_sel_count == 0) { + squad_sel = -1; + squad_sel_action = -1; + } + if (man_size < 1) { + selecting_location = ""; + selecting_ship = -1; + selecting_planet = 0; + man_size = 0; + } + var unit, x1, x2, x3, y1, y2, y3, text; + var tooltip_text = "", bionic_tooltip = ""; + company_data.tooltip_drawing = []; + var invalid_locations = ["Mechanicus Vessel", "Terra"]; + + var xx = __view_get(e__VW.XView, 0) + 0, yy = __view_get(e__VW.YView, 0) + 0, bb = "", img = 0; + + // Draw BG + draw_set_alpha(1); + draw_sprite(spr_rock_bg, 0, xx, yy); + draw_set_font(fnt_40k_30b); + draw_set_halign(fa_center); + draw_set_color(c_gray); // 38144 + + // Var declarations + var c = 0, fx = "", skin = obj_ini.skin_color; + static stats_displayed = false; + + if (managing > 0) { + if (managing > 20) { + c = managing - 10; + } else if ((managing >= 1) && (managing <= 10)) { + fx = int_to_roman(managing) + " Company"; + c = managing; + } else if (managing > 10) { + switch (managing) { + case 11: + fx = "Headquarters"; + break; + case 12: + fx = "Apothecarion"; + break; + case 13: + fx = "Librarium"; + break; + case 14: + fx = "Reclusium"; + break; + case 15: + fx = "Armamentarium"; + break; + } + } + // Draw the company followed by chapters name + draw_text(xx + 800, yy + 74, string(fx) + ", " + string(global.chapter_name)); + } else if (managing < 0) { + if (struct_exists(selection_data, "purpose")) { + draw_text(xx + 800, yy + 74, $"{selection_data.purpose}"); + } + } + + if (managing <= 10 && managing > 0) { + var bar_wid = 0, click_check, string_h; + draw_set_alpha(0.25); + if (obj_ini.company_title[managing] != "") { + bar_wid = max(400, string_width(obj_ini.company_title[managing])); + } + if (obj_ini.company_title[managing] == "") { + bar_wid = 400; + } + string_h = string_height("LOL"); + draw_rectangle(xx + 800 - (bar_wid / 2), yy + 108, xx + 800 + (bar_wid / 2), yy + 100 + string_h, 1); + click_check = point_and_click([xx + 800 - (bar_wid / 2), yy + 108, xx + 800 + (bar_wid / 2), yy + 100 + string_h]); + obj_cursor.image_index = 0; + text_bar = false; + if (click_check) { + obj_cursor.image_index = 2; + text_bar = true; + keyboard_string = obj_ini.company_title[managing]; + } + draw_set_alpha(1); + + if ((obj_ini.company_title[managing] != "") || (text_bar > 0)) { + draw_set_font(fnt_fancy); + if ((text_bar == 0) || (text_bar > 31)) { + draw_text(xx + 800, yy + 110, $"''{obj_ini.company_title[managing]} {(text_bar > 0 && text_bar <= 31) ? "|" : ""}'' "); + } + } } - draw_set_font(fnt_40k_14); - draw_set_halign(fa_left); + // var we;we=string_width(string(global.chapter_name)+" "+string(fx))/2; + if (managing > 0) { + // Draw arrows + draw_sprite_ext(spr_arrow, 0, xx + 25, yy + 70, 2, 2, 0, c_white, 1); // Back + draw_sprite_ext(spr_arrow, 0, xx + 429, yy + 70, 2, 2, 0, c_white, 1); // Left + draw_sprite_ext(spr_arrow, 1, xx + 1110, yy + 70, 2, 2, 0, c_white, 1); // Right + } else { + scr_manage_task_selector(); + } + var right_ui_block = { + x1: xx + 1008, + y1: yy + 141, + w: 568, + h: 681 + }; + right_ui_block.x2 = right_ui_block.x1 + right_ui_block.w; + right_ui_block.y2 = right_ui_block.y1 + right_ui_block.h; + + var actions_block = { + x1: right_ui_block.x1, + y1: yy + 520, + w: 569, + h: 302 + }; + actions_block.x2 = actions_block.x1 + actions_block.w; + actions_block.y2 = actions_block.y1 + actions_block.h; + + draw_sprite_stretched(spr_data_slate_back, 0, actions_block.x1, actions_block.y1, actions_block.w, actions_block.h); + draw_rectangle_color_simple(actions_block.x1, actions_block.y1, actions_block.x2, actions_block.y2, 1, c_gray); + draw_rectangle_color_simple(actions_block.x1 + 1, actions_block.y1 + 1, actions_block.x2 - 1, actions_block.y2 - 1, 1, c_black); + draw_rectangle_color_simple(actions_block.x1 + 2, actions_block.y1 + 2, actions_block.x2 - 2, actions_block.y2 - 2, 1, c_gray); + + + draw_set_color(c_white); + draw_sprite_and_unit_equip_data(); // Back + + draw_set_halign(fa_left); var top = man_current, sel = top, temp1 = "", temp2 = "", temp3 = "", temp4 = "", temp5 = ""; // Var creation @@ -740,7 +736,7 @@ function scr_ui_manage() { }, { search_params: { - companies: [managing, 0] + companies: [managing, 0], }, role_group_params: { group: [SPECIALISTS_APOTHECARIES, false, false], @@ -754,7 +750,7 @@ function scr_ui_manage() { }, { search_params: { - companies: [managing, 0] + companies: [managing, 0], }, role_group_params: { group: [SPECIALISTS_TECHS, false, false], @@ -1234,21 +1230,14 @@ function scr_ui_manage() { if (managing > 10) { view_squad = false; unit_profile = false; - } else if (company_data != {}) { + } else if (company_data.has_squads) { company_data.draw_squad_view(); } } } } } - var tip, coords; - for (var i = 0; i < array_length(tooltip_drawing); i++) { - tip = tooltip_drawing[i]; - coords = tip[1]; - if (scr_hit(coords)) { - tooltip_draw(tip[0], 350, , , , tip[2]); - } - } + setup_tooltip_list(company_data.tooltip_drawing); } else if (menu == 30 && (managing > 0 || managing == -1)) { // Load to ships @@ -1343,11 +1332,11 @@ function scr_ui_manage() { draw_rectangle(main_rect[0], main_rect[1], main_rect[2], main_rect[3], 0); draw_set_color(c_gray); draw_rectangle(xx + 25, yy + 64, xx + 974, yy + 85, 1); - draw_text_transformed(xx + 27, yy + 66, string_hash_to_newline(string(temp1)), 1, 1, 0); - draw_text_transformed(xx + 27.5, yy + 66.5, string_hash_to_newline(string(temp1)), 1, 1, 0); - draw_text_transformed(xx + 364, yy + 66, string_hash_to_newline(string(temp2)), 1, 1, 0); - draw_text_transformed(xx + 580, yy + 66, string_hash_to_newline(string(temp3)), 1, 1, 0); - draw_text_transformed(xx + 730, yy + 66, string_hash_to_newline(string(temp4)), 1, 1, 0); + draw_text_transformed(xx + 27, yy + 66, temp1, 1, 1, 0); + draw_text_transformed(xx + 27.5, yy + 66.5, temp1, 1, 1, 0); + draw_text_transformed(xx + 364, yy + 66, string(temp2), 1, 1, 0); + draw_text_transformed(xx + 580, yy + 66, string(temp3), 1, 1, 0); + draw_text_transformed(xx + 730, yy + 66, string(temp4), 1, 1, 0); if (point_and_click(main_rect)) { load_marines_into_ship(selecting_location, sel, display_unit); } diff --git a/scripts/scr_unit_quick_find_pane/scr_unit_quick_find_pane.gml b/scripts/scr_unit_quick_find_pane/scr_unit_quick_find_pane.gml index e99ae95245..950d7997ac 100644 --- a/scripts/scr_unit_quick_find_pane/scr_unit_quick_find_pane.gml +++ b/scripts/scr_unit_quick_find_pane/scr_unit_quick_find_pane.gml @@ -466,12 +466,11 @@ function update_general_manage_view(){ if (managing>0){ if (managing<=10) and (managing!=0){ scr_company_view(managing); - company_data = new CompanyStruct(managing); } if (managing>10) or (managing=0){ scr_special_view(managing); - company_data={}; - } + } + new_company_struct(); cooldown=10; sel_loading=-1; unload=0; diff --git a/sprites/spr_data_slate_back/spr_data_slate_back.yy b/sprites/spr_data_slate_back/spr_data_slate_back.yy index 77b93c212a..587e11486b 100644 --- a/sprites/spr_data_slate_back/spr_data_slate_back.yy +++ b/sprites/spr_data_slate_back/spr_data_slate_back.yy @@ -63,12 +63,16 @@ "playbackSpeedType":0, "resourceType":"GMSequence", "resourceVersion":"2.0", + "seqHeight":829.0, + "seqWidth":789.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":"2e9c4567-f36d-4e75-b4e7-bb07392211bb","path":"sprites/spr_data_slate_back/spr_data_slate_back.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"61ca2dde-8655-4e62-b665-c297b142ca5a","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"2e9c4567-f36d-4e75-b4e7-bb07392211bb","path":"sprites/spr_data_slate_back/spr_data_slate_back.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"61ca2dde-8655-4e62-b665-c297b142ca5a","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_data_slate_corner_decoration/88d208ab-efc3-4c8a-a23a-ac1685249362.png b/sprites/spr_data_slate_corner_decoration/88d208ab-efc3-4c8a-a23a-ac1685249362.png new file mode 100644 index 0000000000000000000000000000000000000000..e12271d97341fe0a0eadf375b173824c7f76df6c GIT binary patch literal 5901 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 literal 0 HcmV?d00001 diff --git a/sprites/spr_data_slate_corner_decoration/layers/88d208ab-efc3-4c8a-a23a-ac1685249362/0c20ae10-2b03-43f4-b05e-7cb2256d0b71.png b/sprites/spr_data_slate_corner_decoration/layers/88d208ab-efc3-4c8a-a23a-ac1685249362/0c20ae10-2b03-43f4-b05e-7cb2256d0b71.png new file mode 100644 index 0000000000000000000000000000000000000000..e12271d97341fe0a0eadf375b173824c7f76df6c GIT binary patch literal 5901 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 literal 0 HcmV?d00001 diff --git a/sprites/spr_data_slate_corner_decoration/spr_data_slate_corner_decoration.yy b/sprites/spr_data_slate_corner_decoration/spr_data_slate_corner_decoration.yy new file mode 100644 index 0000000000..2817066adf --- /dev/null +++ b/sprites/spr_data_slate_corner_decoration/spr_data_slate_corner_decoration.yy @@ -0,0 +1,92 @@ +{ + "$GMSprite":"v2", + "%Name":"spr_data_slate_corner_decoration", + "bboxMode":0, + "bbox_bottom":119, + "bbox_left":0, + "bbox_right":69, + "bbox_top":0, + "collisionKind":1, + "collisionTolerance":0, + "DynamicTexturePage":false, + "edgeFiltering":false, + "For3D":false, + "frames":[ + {"$GMSpriteFrame":"v1","%Name":"88d208ab-efc3-4c8a-a23a-ac1685249362","name":"88d208ab-efc3-4c8a-a23a-ac1685249362","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + ], + "gridX":0, + "gridY":0, + "height":120, + "HTile":false, + "layers":[ + {"$GMImageLayer":"","%Name":"0c20ae10-2b03-43f4-b05e-7cb2256d0b71","blendMode":0,"displayName":"default","isLocked":false,"name":"0c20ae10-2b03-43f4-b05e-7cb2256d0b71","opacity":100.0,"resourceType":"GMImageLayer","resourceVersion":"2.0","visible":true,}, + ], + "name":"spr_data_slate_corner_decoration", + "nineSlice":null, + "origin":0, + "parent":{ + "name":"Menu and Load", + "path":"folders/Sprites/UI/New UI/Menu and Load.yy", + }, + "preMultiplyAlpha":false, + "resourceType":"GMSprite", + "resourceVersion":"2.0", + "sequence":{ + "$GMSequence":"v1", + "%Name":"spr_data_slate_corner_decoration", + "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_data_slate_corner_decoration", + "playback":1, + "playbackSpeed":30.0, + "playbackSpeedType":0, + "resourceType":"GMSequence", + "resourceVersion":"2.0", + "seqHeight":120.0, + "seqWidth":70.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":"88d208ab-efc3-4c8a-a23a-ac1685249362","path":"sprites/spr_data_slate_corner_decoration/spr_data_slate_corner_decoration.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"04c63da1-0ff3-4f5f-96b4-c76aef79bd9a","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":"Default", + "path":"texturegroups/Default", + }, + "type":0, + "VTile":false, + "width":70, +} \ No newline at end of file diff --git a/sprites/spr_shutter_button/b15ff156-9439-4de5-a856-2c34927170fc.png b/sprites/spr_shutter_button/b15ff156-9439-4de5-a856-2c34927170fc.png new file mode 100644 index 0000000000000000000000000000000000000000..2beb9c24fba3ccdef7a314500fb5e76d6d717cae GIT binary patch literal 26388 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 GO#df&r%0Fp literal 0 HcmV?d00001 diff --git a/sprites/spr_shutter_button/layers/b15ff156-9439-4de5-a856-2c34927170fc/b201671b-7405-4bb4-ab4e-e9c0d0be9fe7.png b/sprites/spr_shutter_button/layers/b15ff156-9439-4de5-a856-2c34927170fc/b201671b-7405-4bb4-ab4e-e9c0d0be9fe7.png new file mode 100644 index 0000000000000000000000000000000000000000..2beb9c24fba3ccdef7a314500fb5e76d6d717cae GIT binary patch literal 26388 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 GO#df&r%0Fp literal 0 HcmV?d00001 diff --git a/sprites/spr_shutter_button/spr_shutter_button.yy b/sprites/spr_shutter_button/spr_shutter_button.yy index f2087345f2..bdc868d099 100644 --- a/sprites/spr_shutter_button/spr_shutter_button.yy +++ b/sprites/spr_shutter_button/spr_shutter_button.yy @@ -15,6 +15,7 @@ {"$GMSpriteFrame":"v1","%Name":"76267b7c-4ed6-4e13-80f8-12d83c354c19","name":"76267b7c-4ed6-4e13-80f8-12d83c354c19","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, {"$GMSpriteFrame":"v1","%Name":"a33f3820-f817-47b2-93f6-e09657a03620","name":"a33f3820-f817-47b2-93f6-e09657a03620","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, {"$GMSpriteFrame":"v1","%Name":"aea54f21-da01-4b3e-9c86-4eea4991976a","name":"aea54f21-da01-4b3e-9c86-4eea4991976a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"b15ff156-9439-4de5-a856-2c34927170fc","name":"b15ff156-9439-4de5-a856-2c34927170fc","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, {"$GMSpriteFrame":"v1","%Name":"2b44ab3a-cd61-4236-9265-0539c255cabf","name":"2b44ab3a-cd61-4236-9265-0539c255cabf","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, {"$GMSpriteFrame":"v1","%Name":"b34f158b-68fc-4c52-a2e1-539e6e07fb3b","name":"b34f158b-68fc-4c52-a2e1-539e6e07fb3b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, {"$GMSpriteFrame":"v1","%Name":"42138070-4e1e-4bfb-97a2-79941ef72bc0","name":"42138070-4e1e-4bfb-97a2-79941ef72bc0","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, @@ -55,7 +56,7 @@ }, "eventStubScript":null, "eventToFunction":{}, - "length":7.0, + "length":8.0, "lockOrigin":false, "moments":{ "$KeyframeStore":"", @@ -69,18 +70,37 @@ "playbackSpeedType":0, "resourceType":"GMSequence", "resourceVersion":"2.0", + "seqHeight":1080.0, + "seqWidth":1000.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":"76267b7c-4ed6-4e13-80f8-12d83c354c19","path":"sprites/spr_shutter_button/spr_shutter_button.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"131c5b6e-7e6d-4009-9f41-8c682fdbe6fa","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"a33f3820-f817-47b2-93f6-e09657a03620","path":"sprites/spr_shutter_button/spr_shutter_button.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"8b2f33da-9466-442e-9b49-a8be14781d23","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"aea54f21-da01-4b3e-9c86-4eea4991976a","path":"sprites/spr_shutter_button/spr_shutter_button.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"42f184d7-359c-409a-86f2-4fb35d8de685","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"2b44ab3a-cd61-4236-9265-0539c255cabf","path":"sprites/spr_shutter_button/spr_shutter_button.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"f847a9bf-64e9-41a5-8c31-b4b1085f5841","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"b34f158b-68fc-4c52-a2e1-539e6e07fb3b","path":"sprites/spr_shutter_button/spr_shutter_button.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"2b65eff6-9705-4575-b40b-fe35ca5b6b5e","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"42138070-4e1e-4bfb-97a2-79941ef72bc0","path":"sprites/spr_shutter_button/spr_shutter_button.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"4045f3a4-6d84-4fc7-aa09-6af816c64206","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"14089c53-1775-4c86-81db-815184b41de3","path":"sprites/spr_shutter_button/spr_shutter_button.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"f8850346-d50b-45ab-a5d3-417dcfbe9311","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"76267b7c-4ed6-4e13-80f8-12d83c354c19","path":"sprites/spr_shutter_button/spr_shutter_button.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"131c5b6e-7e6d-4009-9f41-8c682fdbe6fa","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"a33f3820-f817-47b2-93f6-e09657a03620","path":"sprites/spr_shutter_button/spr_shutter_button.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"8b2f33da-9466-442e-9b49-a8be14781d23","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"aea54f21-da01-4b3e-9c86-4eea4991976a","path":"sprites/spr_shutter_button/spr_shutter_button.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"42f184d7-359c-409a-86f2-4fb35d8de685","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"b15ff156-9439-4de5-a856-2c34927170fc","path":"sprites/spr_shutter_button/spr_shutter_button.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"0a228cdb-c153-462e-b5cc-f9d8a24e6b2d","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"2b44ab3a-cd61-4236-9265-0539c255cabf","path":"sprites/spr_shutter_button/spr_shutter_button.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"f847a9bf-64e9-41a5-8c31-b4b1085f5841","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"b34f158b-68fc-4c52-a2e1-539e6e07fb3b","path":"sprites/spr_shutter_button/spr_shutter_button.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"2b65eff6-9705-4575-b40b-fe35ca5b6b5e","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"42138070-4e1e-4bfb-97a2-79941ef72bc0","path":"sprites/spr_shutter_button/spr_shutter_button.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"4045f3a4-6d84-4fc7-aa09-6af816c64206","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"14089c53-1775-4c86-81db-815184b41de3","path":"sprites/spr_shutter_button/spr_shutter_button.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"f8850346-d50b-45ab-a5d3-417dcfbe9311","IsCreationKey":false,"Key":7.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_slate_side/88d208ab-efc3-4c8a-a23a-ac1685249362.png b/sprites/spr_slate_side/88d208ab-efc3-4c8a-a23a-ac1685249362.png new file mode 100644 index 0000000000000000000000000000000000000000..e64de1343ab60977211e4dc92b81eed4c85b9da1 GIT binary patch literal 3799 zcmds4X;hPE7QTQ=6@lYY)S@_c*gA?0P)UIxGXqg02)5cmhqB2gEiuZHkbs0^DLINQ zbASOXt6D&Zqp5_&VILVx10u>IlVB21goc<11Ofs{=KX?`9_lhPzs55sKfZJFz4v|Z z``qVw?)}al^x12?>b+F}U`*QQ`6+-t0YH!O&IXB+uU+P7uh1K@@YpWbV+1 zysJ-TBk!*@T7RV4C#6Y4>ouagZaWuE()ZZTq}tusu$g~# z?NOEXuYi*|{k#7@roP*ZpSM&0`p+vp24km%#m)6oYX@o5#p0&K=_`fJ8wimTx$ZFT z%&881y?T`rL*jmy2vj zbroN)G=+o3gL=@ujsU-TW76s-O6#cN!y=6T>as70}yyW{Qq2j3u zQK}(a(S2zF5Nl6Gs*R^~gft1gq=2sxSlnZskQ>jm;BN8R?dQd=avNbkGFczDvv(jhj6uOFmvT`*j3-wp0j4< z6ZN3%m{Wc@el_3NBXeSrL=E(qyr)$?g`+`aJxG!(=T%oi1WoqZM5SHK&c}}*r+4j1 zOz@^6oEY^9KdM;sNs7+;I}x1w1KYJUd>);XVY)RanJQ`1g9WpZbh@a4u6Q&mL4>&y z((K#cm~=K36GwvN(LGO;7BMcJID%-u2TSpx`;Lbw?Ovr9O-sErl{5nb^44SZL|{LKEJDZBMin)jF0E>TU*n+8oKpie_mH4 z9ph*?hcBJa*~_jH_!H|Zkd>7Ut6N#VZas3X*!Rzt#wOH-5%?q%VlR8ni){{rTWiEN zwYALl8L`F+;rpV(X*P8)1?Pa!ELdaa~8%eyehu9c=u77uyI1qotir9r;pA-_t#8 z#!_1CsV%LoJxBFR=P)-xi{(MiYkw}#`MofR=aPeynDa|pRNzyyb~L-6Cb;^ zYn7`Q#_^-dUAvkE`jB^~<^{Ri&1FOO{KX5%7J2-0i+e*_4LhCPLg%QA#Wse)9sk!3{4$}mmE&KNpuT<$Kj3R)w{^ZOXd0u) zY28E-FEi!(6SG=7FQK|15@DX7kWr}}0SM0CRDtBKf?b1*q=cMTL(%r5e_5le(tBRn zj#XDTXuOF~Y%d?*BY~8f+`tXc!heuYMxzm_XzrzqzB%DVdC~vPQUCwnOe?SJw+nG$_|>G_ ziP;CRnQDX=QrY7}D`HkJ2i$UUYt`vcZEF#@oraGnQtoIcTrR&*s z0C#Id(VT|A`k+x%^%p#9Lt{E+QsVp>i516b)ivyoGUT1bydO#SxFhg@we0yM)GsqX#(P z9Cq2^ob2o!4?EbqI6Au6@7j*Tx!`c$Z(Q}&k^nL#EGmNj`hY%Sr8^3+)twL*MGlXR Z3n8C;eaxAIS%WABNJJmc>%R{^^G|7*f^Gl+ literal 0 HcmV?d00001 diff --git a/sprites/spr_slate_side/layers/88d208ab-efc3-4c8a-a23a-ac1685249362/0c20ae10-2b03-43f4-b05e-7cb2256d0b71.png b/sprites/spr_slate_side/layers/88d208ab-efc3-4c8a-a23a-ac1685249362/0c20ae10-2b03-43f4-b05e-7cb2256d0b71.png new file mode 100644 index 0000000000000000000000000000000000000000..e64de1343ab60977211e4dc92b81eed4c85b9da1 GIT binary patch literal 3799 zcmds4X;hPE7QTQ=6@lYY)S@_c*gA?0P)UIxGXqg02)5cmhqB2gEiuZHkbs0^DLINQ zbASOXt6D&Zqp5_&VILVx10u>IlVB21goc<11Ofs{=KX?`9_lhPzs55sKfZJFz4v|Z z``qVw?)}al^x12?>b+F}U`*QQ`6+-t0YH!O&IXB+uU+P7uh1K@@YpWbV+1 zysJ-TBk!*@T7RV4C#6Y4>ouagZaWuE()ZZTq}tusu$g~# z?NOEXuYi*|{k#7@roP*ZpSM&0`p+vp24km%#m)6oYX@o5#p0&K=_`fJ8wimTx$ZFT z%&881y?T`rL*jmy2vj zbroN)G=+o3gL=@ujsU-TW76s-O6#cN!y=6T>as70}yyW{Qq2j3u zQK}(a(S2zF5Nl6Gs*R^~gft1gq=2sxSlnZskQ>jm;BN8R?dQd=avNbkGFczDvv(jhj6uOFmvT`*j3-wp0j4< z6ZN3%m{Wc@el_3NBXeSrL=E(qyr)$?g`+`aJxG!(=T%oi1WoqZM5SHK&c}}*r+4j1 zOz@^6oEY^9KdM;sNs7+;I}x1w1KYJUd>);XVY)RanJQ`1g9WpZbh@a4u6Q&mL4>&y z((K#cm~=K36GwvN(LGO;7BMcJID%-u2TSpx`;Lbw?Ovr9O-sErl{5nb^44SZL|{LKEJDZBMin)jF0E>TU*n+8oKpie_mH4 z9ph*?hcBJa*~_jH_!H|Zkd>7Ut6N#VZas3X*!Rzt#wOH-5%?q%VlR8ni){{rTWiEN zwYALl8L`F+;rpV(X*P8)1?Pa!ELdaa~8%eyehu9c=u77uyI1qotir9r;pA-_t#8 z#!_1CsV%LoJxBFR=P)-xi{(MiYkw}#`MofR=aPeynDa|pRNzyyb~L-6Cb;^ zYn7`Q#_^-dUAvkE`jB^~<^{Ri&1FOO{KX5%7J2-0i+e*_4LhCPLg%QA#Wse)9sk!3{4$}mmE&KNpuT<$Kj3R)w{^ZOXd0u) zY28E-FEi!(6SG=7FQK|15@DX7kWr}}0SM0CRDtBKf?b1*q=cMTL(%r5e_5le(tBRn zj#XDTXuOF~Y%d?*BY~8f+`tXc!heuYMxzm_XzrzqzB%DVdC~vPQUCwnOe?SJw+nG$_|>G_ ziP;CRnQDX=QrY7}D`HkJ2i$UUYt`vcZEF#@oraGnQtoIcTrR&*s z0C#Id(VT|A`k+x%^%p#9Lt{E+QsVp>i516b)ivyoGUT1bydO#SxFhg@we0yM)GsqX#(P z9Cq2^ob2o!4?EbqI6Au6@7j*Tx!`c$Z(Q}&k^nL#EGmNj`hY%Sr8^3+)twL*MGlXR Z3n8C;eaxAIS%WABNJJmc>%R{^^G|7*f^Gl+ literal 0 HcmV?d00001 diff --git a/sprites/spr_slate_side/spr_slate_side.yy b/sprites/spr_slate_side/spr_slate_side.yy new file mode 100644 index 0000000000..5f838d12ab --- /dev/null +++ b/sprites/spr_slate_side/spr_slate_side.yy @@ -0,0 +1,92 @@ +{ + "$GMSprite":"v2", + "%Name":"spr_slate_side", + "bboxMode":0, + "bbox_bottom":377, + "bbox_left":0, + "bbox_right":571, + "bbox_top":0, + "collisionKind":1, + "collisionTolerance":0, + "DynamicTexturePage":false, + "edgeFiltering":false, + "For3D":false, + "frames":[ + {"$GMSpriteFrame":"v1","%Name":"88d208ab-efc3-4c8a-a23a-ac1685249362","name":"88d208ab-efc3-4c8a-a23a-ac1685249362","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + ], + "gridX":0, + "gridY":0, + "height":378, + "HTile":false, + "layers":[ + {"$GMImageLayer":"","%Name":"0c20ae10-2b03-43f4-b05e-7cb2256d0b71","blendMode":0,"displayName":"default","isLocked":false,"name":"0c20ae10-2b03-43f4-b05e-7cb2256d0b71","opacity":100.0,"resourceType":"GMImageLayer","resourceVersion":"2.0","visible":true,}, + ], + "name":"spr_slate_side", + "nineSlice":null, + "origin":0, + "parent":{ + "name":"Menu and Load", + "path":"folders/Sprites/UI/New UI/Menu and Load.yy", + }, + "preMultiplyAlpha":false, + "resourceType":"GMSprite", + "resourceVersion":"2.0", + "sequence":{ + "$GMSequence":"v1", + "%Name":"spr_slate_side", + "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_slate_side", + "playback":1, + "playbackSpeed":30.0, + "playbackSpeedType":0, + "resourceType":"GMSequence", + "resourceVersion":"2.0", + "seqHeight":378.0, + "seqWidth":572.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":"88d208ab-efc3-4c8a-a23a-ac1685249362","path":"sprites/spr_slate_side/spr_slate_side.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"04c63da1-0ff3-4f5f-96b4-c76aef79bd9a","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":"Default", + "path":"texturegroups/Default", + }, + "type":0, + "VTile":false, + "width":572, +} \ No newline at end of file From 1058fc7e2ac89caf13a2daad69e62677784535ef Mon Sep 17 00:00:00 2001 From: Nelsonh <81228864+OH296@users.noreply.github.com> Date: Sun, 15 Jun 2025 23:57:13 +0100 Subject: [PATCH 092/286] fix: typo add_corruption used instead of unit specific edit_corruption (#876) --- scripts/scr_enemy_ai_d/scr_enemy_ai_d.gml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/scr_enemy_ai_d/scr_enemy_ai_d.gml b/scripts/scr_enemy_ai_d/scr_enemy_ai_d.gml index 54c572797b..65f9860bb8 100644 --- a/scripts/scr_enemy_ai_d/scr_enemy_ai_d.gml +++ b/scripts/scr_enemy_ai_d/scr_enemy_ai_d.gml @@ -208,7 +208,7 @@ function scr_enemy_ai_d() { for (me=0;me Date: Mon, 16 Jun 2025 23:49:29 +0200 Subject: [PATCH 093/286] feat: New Volkite and Bolt weapons HH era (#878) Co-authored-by: EttyKitty <20323032+EttyKitty@users.noreply.github.com> --- ChapterMaster.yyp | 8 + .../scr_culture_visuals.gml | 97 ++++++++++++ scripts/scr_weapon/scr_weapon.gml | 138 ++++++++++++++++++ .../473a7284-a688-484d-91d4-96d25b326cfd.png | Bin 0 -> 7510 bytes .../cb2bbe01-35ef-4dc1-b409-a1cbfe34ce5a.png | Bin 0 -> 7510 bytes .../spr_weapon_mars_hbolt.yy | 92 ++++++++++++ .../7bf54d5b-eb4f-4225-8043-c7bbdfefe28f.png | Bin 0 -> 3207 bytes .../874c87bf-544a-4c32-a371-509dc9981ec4.png | Bin 0 -> 3207 bytes .../spr_weapon_phobos_bolt_pistol.yy | 111 ++++++++++++++ .../0feb2b87-1efd-47dd-9f23-14a4113b369c.png | Bin 0 -> 3464 bytes .../664d1dec-58bd-4b0a-abf0-6249a1377b2b.png | Bin 0 -> 3464 bytes .../spr_weapon_phobos_bolter.yy | 111 ++++++++++++++ .../7078d58a-3619-44c5-bbe0-4449064aeaa4.png | Bin 0 -> 4885 bytes .../c71b0c2f-0e0d-4b9e-aa10-73d13c7796a6.png | Bin 0 -> 4885 bytes .../spr_weapon_tigris_combi.yy | 111 ++++++++++++++ .../746312be-a5f0-47ac-a783-e19dcde061a8.png | Bin 0 -> 6168 bytes .../7661b2ed-1571-406e-8395-989f5935e303.png | Bin 0 -> 6168 bytes .../spr_weapon_volkite_caliver.yy | 92 ++++++++++++ .../b91b3e74-91d9-46d1-b954-65c7a49d8b7d.png | Bin 0 -> 4872 bytes .../e98a4021-39fb-45ff-81e5-78fc2e913c77.png | Bin 0 -> 4872 bytes .../spr_weapon_volkite_charger.yy | 111 ++++++++++++++ .../27b95a4c-b7c0-4f2e-aa03-ece8e4e50432.png | Bin 0 -> 13243 bytes .../7e7d708c-6c89-45d1-b800-7d518f4ba3cd.png | Bin 0 -> 13243 bytes .../spr_weapon_volkite_culverin.yy | 92 ++++++++++++ .../73214df0-5c58-4848-aae2-d68778f0fe65.png | Bin 0 -> 3779 bytes .../9b9d7ab4-6736-4bc5-b3cc-4d650606eedb.png | Bin 0 -> 3779 bytes .../spr_weapon_volkite_serpenta.yy | 111 ++++++++++++++ 27 files changed, 1074 insertions(+) create mode 100644 sprites/spr_weapon_mars_hbolt/473a7284-a688-484d-91d4-96d25b326cfd.png create mode 100644 sprites/spr_weapon_mars_hbolt/layers/473a7284-a688-484d-91d4-96d25b326cfd/cb2bbe01-35ef-4dc1-b409-a1cbfe34ce5a.png create mode 100644 sprites/spr_weapon_mars_hbolt/spr_weapon_mars_hbolt.yy create mode 100644 sprites/spr_weapon_phobos_bolt_pistol/7bf54d5b-eb4f-4225-8043-c7bbdfefe28f.png create mode 100644 sprites/spr_weapon_phobos_bolt_pistol/layers/7bf54d5b-eb4f-4225-8043-c7bbdfefe28f/874c87bf-544a-4c32-a371-509dc9981ec4.png create mode 100644 sprites/spr_weapon_phobos_bolt_pistol/spr_weapon_phobos_bolt_pistol.yy create mode 100644 sprites/spr_weapon_phobos_bolter/0feb2b87-1efd-47dd-9f23-14a4113b369c.png create mode 100644 sprites/spr_weapon_phobos_bolter/layers/0feb2b87-1efd-47dd-9f23-14a4113b369c/664d1dec-58bd-4b0a-abf0-6249a1377b2b.png create mode 100644 sprites/spr_weapon_phobos_bolter/spr_weapon_phobos_bolter.yy create mode 100644 sprites/spr_weapon_tigris_combi/7078d58a-3619-44c5-bbe0-4449064aeaa4.png create mode 100644 sprites/spr_weapon_tigris_combi/layers/7078d58a-3619-44c5-bbe0-4449064aeaa4/c71b0c2f-0e0d-4b9e-aa10-73d13c7796a6.png create mode 100644 sprites/spr_weapon_tigris_combi/spr_weapon_tigris_combi.yy create mode 100644 sprites/spr_weapon_volkite_caliver/746312be-a5f0-47ac-a783-e19dcde061a8.png create mode 100644 sprites/spr_weapon_volkite_caliver/layers/746312be-a5f0-47ac-a783-e19dcde061a8/7661b2ed-1571-406e-8395-989f5935e303.png create mode 100644 sprites/spr_weapon_volkite_caliver/spr_weapon_volkite_caliver.yy create mode 100644 sprites/spr_weapon_volkite_charger/b91b3e74-91d9-46d1-b954-65c7a49d8b7d.png create mode 100644 sprites/spr_weapon_volkite_charger/layers/b91b3e74-91d9-46d1-b954-65c7a49d8b7d/e98a4021-39fb-45ff-81e5-78fc2e913c77.png create mode 100644 sprites/spr_weapon_volkite_charger/spr_weapon_volkite_charger.yy create mode 100644 sprites/spr_weapon_volkite_culverin/27b95a4c-b7c0-4f2e-aa03-ece8e4e50432.png create mode 100644 sprites/spr_weapon_volkite_culverin/layers/27b95a4c-b7c0-4f2e-aa03-ece8e4e50432/7e7d708c-6c89-45d1-b800-7d518f4ba3cd.png create mode 100644 sprites/spr_weapon_volkite_culverin/spr_weapon_volkite_culverin.yy create mode 100644 sprites/spr_weapon_volkite_serpenta/73214df0-5c58-4848-aae2-d68778f0fe65.png create mode 100644 sprites/spr_weapon_volkite_serpenta/layers/73214df0-5c58-4848-aae2-d68778f0fe65/9b9d7ab4-6736-4bc5-b3cc-4d650606eedb.png create mode 100644 sprites/spr_weapon_volkite_serpenta/spr_weapon_volkite_serpenta.yy diff --git a/ChapterMaster.yyp b/ChapterMaster.yyp index 932ca3b52a..45b7e1b39d 100644 --- a/ChapterMaster.yyp +++ b/ChapterMaster.yyp @@ -1660,9 +1660,12 @@ {"id":{"name":"spr_weapon_lightning1","path":"sprites/spr_weapon_lightning1/spr_weapon_lightning1.yy",},}, {"id":{"name":"spr_weapon_lightning2","path":"sprites/spr_weapon_lightning2/spr_weapon_lightning2.yy",},}, {"id":{"name":"spr_weapon_mace_of_absolution","path":"sprites/spr_weapon_mace_of_absolution/spr_weapon_mace_of_absolution.yy",},}, + {"id":{"name":"spr_weapon_mars_hbolt","path":"sprites/spr_weapon_mars_hbolt/spr_weapon_mars_hbolt.yy",},}, {"id":{"name":"spr_weapon_melta","path":"sprites/spr_weapon_melta/spr_weapon_melta.yy",},}, {"id":{"name":"spr_weapon_missile","path":"sprites/spr_weapon_missile/spr_weapon_missile.yy",},}, {"id":{"name":"spr_weapon_mmelta","path":"sprites/spr_weapon_mmelta/spr_weapon_mmelta.yy",},}, + {"id":{"name":"spr_weapon_phobos_bolt_pistol","path":"sprites/spr_weapon_phobos_bolt_pistol/spr_weapon_phobos_bolt_pistol.yy",},}, + {"id":{"name":"spr_weapon_phobos_bolter","path":"sprites/spr_weapon_phobos_bolter/spr_weapon_phobos_bolter.yy",},}, {"id":{"name":"spr_weapon_plasc","path":"sprites/spr_weapon_plasc/spr_weapon_plasc.yy",},}, {"id":{"name":"spr_weapon_plasg","path":"sprites/spr_weapon_plasg/spr_weapon_plasg.yy",},}, {"id":{"name":"spr_weapon_plasma_cannon_term","path":"sprites/spr_weapon_plasma_cannon_term/spr_weapon_plasma_cannon_term.yy",},}, @@ -1693,6 +1696,11 @@ {"id":{"name":"spr_weapon_sword_oriental","path":"sprites/spr_weapon_sword_oriental/spr_weapon_sword_oriental.yy",},}, {"id":{"name":"spr_weapon_sword_turk","path":"sprites/spr_weapon_sword_turk/spr_weapon_sword_turk.yy",},}, {"id":{"name":"spr_weapon_thhammer","path":"sprites/spr_weapon_thhammer/spr_weapon_thhammer.yy",},}, + {"id":{"name":"spr_weapon_tigris_combi","path":"sprites/spr_weapon_tigris_combi/spr_weapon_tigris_combi.yy",},}, + {"id":{"name":"spr_weapon_volkite_caliver","path":"sprites/spr_weapon_volkite_caliver/spr_weapon_volkite_caliver.yy",},}, + {"id":{"name":"spr_weapon_volkite_charger","path":"sprites/spr_weapon_volkite_charger/spr_weapon_volkite_charger.yy",},}, + {"id":{"name":"spr_weapon_volkite_culverin","path":"sprites/spr_weapon_volkite_culverin/spr_weapon_volkite_culverin.yy",},}, + {"id":{"name":"spr_weapon_volkite_serpenta","path":"sprites/spr_weapon_volkite_serpenta/spr_weapon_volkite_serpenta.yy",},}, {"id":{"name":"spr_weapon_xenophase_blade_var1","path":"sprites/spr_weapon_xenophase_blade_var1/spr_weapon_xenophase_blade_var1.yy",},}, {"id":{"name":"spr_weapoon_powso_flamberge","path":"sprites/spr_weapoon_powso_flamberge/spr_weapoon_powso_flamberge.yy",},}, {"id":{"name":"spr_welcome_bg","path":"sprites/spr_welcome_bg/spr_welcome_bg.yy",},}, diff --git a/scripts/scr_culture_visuals/scr_culture_visuals.gml b/scripts/scr_culture_visuals/scr_culture_visuals.gml index 3efd248ade..83395d65f7 100644 --- a/scripts/scr_culture_visuals/scr_culture_visuals.gml +++ b/scripts/scr_culture_visuals/scr_culture_visuals.gml @@ -1254,6 +1254,103 @@ function format_weapon_visuals(weapon_name){ return return_options; } global.weapon_visual_data = { + //30k weapons + //Volkitepack + "Volkite Charger": { + base: { + weapon_data: { + display_type: "normal_ranged", + new_weapon_draw: true + }, + }, + variants: [{ + sprite: spr_weapon_volkite_charger, + }] +}, + +"Volkite Serpenta": { + base: { + weapon_data: { + display_type: "normal_ranged", + new_weapon_draw: true + }, + }, + variants: [{ + sprite: spr_weapon_volkite_serpenta, + }] +}, + +"Volkite Caliver": { + base: { + weapon_data: { + display_type: "ranged_twohand", + new_weapon_draw: true + }, + }, + variants: [{ + sprite: spr_weapon_volkite_caliver, + }] +}, + +"Volkite Culverin": { + base: { + weapon_data: { + display_type: "ranged_twohand", + new_weapon_draw: true + }, + }, + variants: [{ + sprite: spr_weapon_volkite_culverin, + }] +}, +//Bolter Pack +"Phobos pattern Bolter": { + base: { + weapon_data: { + display_type: "normal_ranged", + new_weapon_draw: true + }, + }, + variants: [{ + sprite: spr_weapon_phobos_bolter, + }] +}, +"Phobos pattern Bolt Pistol": { + base: { + weapon_data: { + display_type: "normal_ranged", + new_weapon_draw: true + }, + }, + variants: [{ + sprite: spr_weapon_phobos_bolt_pistol, + }] +}, +"Mars pattern Heavy Bolter": { + base: { + weapon_data: { + display_type: "ranged_twohand", + new_weapon_draw: true + }, + }, + variants: [{ + sprite: spr_weapon_mars_hbolt, + }] +}, +"Tigris pattern Combi Bolter": { + base: { + weapon_data: { + display_type: "normal_ranged", + new_weapon_draw: true + }, + }, + variants: [{ + sprite: spr_weapon_tigris_combi, + }] +}, + + + //40k weapons "Assault Cannon": { base : { weapon_data:{ diff --git a/scripts/scr_weapon/scr_weapon.gml b/scripts/scr_weapon/scr_weapon.gml index 7fc42eda13..93fc2c2853 100644 --- a/scripts/scr_weapon/scr_weapon.gml +++ b/scripts/scr_weapon/scr_weapon.gml @@ -1,4 +1,142 @@ global.weapons = { + //30k Weapons + //Volkite Pack + "Volkite Culverin": { + "abbreviation": "VolkCul", + "attack": { + "standard": 700, + "master_crafted": 720, + "artifact": 740 + }, + "description": "Ancient thermal ray weapon, heaviest man portable variant of its class.", + "melee_hands": 1, + "ranged_hands": 2.2, + "ammo": 4, + "range": 22, + "spli": 12, + "arp": 0, + "tags": ["Volkite", "energy"] +}, + +"Volkite Caliver": { + "abbreviation": "VolkCal", + "attack": { + "standard": 550, + "master_crafted": 570, + "artifact": 590 + }, + "description": "Ancient thermal ray weapon, an uncommon sight during ancient times, now a precious relic for every chapter that can claim one.", + "melee_hands": 1, + "ranged_hands": 2, + "ammo": 6, + "range": 16, + "spli": 10, + "arp": 0, + "tags": ["Volkite", "energy"] +}, + +"Volkite Charger": { + "abbreviation": "VolkCharg", + "attack": { + "standard": 400, + "master_crafted": 420, + "artifact": 440 + }, + "description": "Ancient thermal ray weapon, smaller, yet still deadly brother of caliver.", + "melee_hands": 1, + "ranged_hands": 2, + "ammo": 10, + "range": 10, + "spli": 6, + "arp": 0, + "tags": ["Volkite", "energy"] +}, + +"Volkite Serpenta": { + "abbreviation": "VolkSerp", + "attack": { + "standard": 250, + "master_crafted": 270, + "artifact": 290 + }, + "description": "Ancient one handed thermal ray weapon, preferred by melee specialists, and officers .", + "melee_hands": 0, + "ranged_hands": 1, + "ammo": 10, + "range": 3, + "spli": 4, + "arp": 0, + "tags": ["Volkite", "energy"] + +}, +//Bolt Pack +"Phobos pattern Bolt Pistol": { + "abbreviation": "PhBltPis", + "attack": { + "standard": 38, + "master_crafted": 43, + "artifact": 48 + }, + "description":"Once primary personal weapon of ancient astartes legions, now an uncommon sight on the battlefield.This weapon was hand-crafted by the Fabricators of Mars at the very birth of the Imperium during the Great Crusade.", + "melee_hands": 0, + "ranged_hands": 1, + "ammo": 20, + "range": 3.5, + "spli": 2, + "arp": 0, + "tags": ["bolt", "pistol"] + }, + +"Phobos pattern Bolter": { + "abbreviation": "PhBltr", + "attack": { + "standard": 75, + "master_crafted": 80, + "artifact": 85 + }, + "description": "Ancient pattern of boltgun made during times of the Great Crusade for the Astartes Legions. It uses different ammunition, has larger magazine and is slightly bigger than its modern counterparts.", + "melee_hands": 1, + "ranged_hands": 2, + "ammo": 20, + "range": 13, + "spli": 3, + "arp": 0, + "tags": ["bolt"] +}, + +"Mars pattern Heavy Bolter": { + "abbreviation": "MarsHvyBltr", + "attack": { + "standard": 400, + "master_crafted": 430, + "artifact": 460 + }, + "description": " Rare variant of heavy bolter, uncommon even during times of it's production. Made in forges of Mars itself, it's more lightweight and compact in comparison to modern patterns.", + "melee_hands": 1, + "ranged_hands": 2, + "ammo": 12, + "range": 17, + "spli": 9, + "arp": 1, + "tags": ["heavy_ranged", "bolt"] +}, +"Tigris pattern Combi Bolter": { + "abbreviation": "TigComBltr", + "attack": { + "standard": 100, + "master_crafted": 120, + "artifact": 140 + }, + "description": "Once primary weapon of ancient terminator squads, now precious relic of any chapter that still can field it.", + "melee_hands": 1.1, + "ranged_hands": 1.1, + "ammo": 14, + "range": 19, + "spli": 11, + "arp": 1, + "tags": ["heavy_ranged", "bolt"] +}, + //40K Weapons "Storm Shield": { "description": "Protects twice as well when boarding. A powered shield that must be held with a hand. While powered by the marines armour it shimmers with blue energy.", "abbreviation": "StrmShld", diff --git a/sprites/spr_weapon_mars_hbolt/473a7284-a688-484d-91d4-96d25b326cfd.png b/sprites/spr_weapon_mars_hbolt/473a7284-a688-484d-91d4-96d25b326cfd.png new file mode 100644 index 0000000000000000000000000000000000000000..ec16396eafa43f92ef094e495cb02570d9f79f60 GIT binary patch literal 7510 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":"", + "Keyframes":[], + "resourceType":"KeyframeStore", + "resourceVersion":"2.0", + }, + "eventStubScript":null, + "eventToFunction":{}, + "length":1.0, + "lockOrigin":false, + "moments":{ + "$KeyframeStore":"", + "Keyframes":[], + "resourceType":"KeyframeStore", + "resourceVersion":"2.0", + }, + "name":"spr_weapon_mars_hbolt", + "playback":1, + "playbackSpeed":1.0, + "playbackSpeedType":1, + "resourceType":"GMSequence", + "resourceVersion":"2.0", + "seqHeight":272.0, + "seqWidth":301.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":"473a7284-a688-484d-91d4-96d25b326cfd","path":"sprites/spr_weapon_mars_hbolt/spr_weapon_mars_hbolt.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"a1388382-acc0-40ab-8fda-87d712ffca54","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":39, + "yorigin":21, + }, + "swatchColours":null, + "swfPrecision":2.525, + "textureGroupId":{ + "name":"MarineViewer", + "path":"texturegroups/MarineViewer", + }, + "type":0, + "VTile":false, + "width":301, +} \ No newline at end of file diff --git a/sprites/spr_weapon_phobos_bolt_pistol/7bf54d5b-eb4f-4225-8043-c7bbdfefe28f.png b/sprites/spr_weapon_phobos_bolt_pistol/7bf54d5b-eb4f-4225-8043-c7bbdfefe28f.png new file mode 100644 index 0000000000000000000000000000000000000000..2f1285f5f9941bd93f914447b429594c5302c619 GIT binary patch literal 3207 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 F{u=~*2W":"", + "Keyframes":[], + "resourceType":"KeyframeStore", + "resourceVersion":"2.0", + }, + "eventStubScript":null, + "eventToFunction":{}, + "length":1.0, + "lockOrigin":false, + "moments":{ + "$KeyframeStore":"", + "Keyframes":[], + "resourceType":"KeyframeStore", + "resourceVersion":"2.0", + }, + "name":"spr_weapon_phobos_bolt_pistol", + "playback":1, + "playbackSpeed":1.0, + "playbackSpeedType":1, + "resourceType":"GMSequence", + "resourceVersion":"2.0", + "seqHeight":231.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":"7bf54d5b-eb4f-4225-8043-c7bbdfefe28f","path":"sprites/spr_weapon_phobos_bolt_pistol/spr_weapon_phobos_bolt_pistol.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"2bc5e8a7-0d4d-416c-a6e4-608bded7e2ae","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_weapon_phobos_bolter/0feb2b87-1efd-47dd-9f23-14a4113b369c.png b/sprites/spr_weapon_phobos_bolter/0feb2b87-1efd-47dd-9f23-14a4113b369c.png new file mode 100644 index 0000000000000000000000000000000000000000..9b571ba670d47994f69150edbb417aaabbeea82b GIT binary patch literal 3464 zcmc&%c{o&U8$V>rk|jIMG)S_HA!H{zG4^%Hk|F!p3XP>VOTD7-8iXcZr zRvUc5;&a8+2sr-xdeT;z0|1=2%#AKP#7zB|y%H?;8N#v^){R`Rs9!Q&S95R(JSXGG zyIS*57FIGX;PXL3F8QI&Z8N4U!G^kUSTk%HW&^i*HucQTb%vP(lKve2XGKOPoD3Xv@RM5pWT=R)$|*u@H~%+23ylPE7H+JC8d$rp#}$0{d9qeg$DppX=AzzO+W46T*0?>p&im z_w1^CXO>r1L_P_A&1?uQt(Ij^VZ`b}`HkO$E~qn<+Ky8I8_S&=iqfjLDa0zdTnk|+ zw8z;qK7~X=f=-Ln!x;??4LSYOF&?gY7ornoe{eL(MeI&E380=TGIN2z~2fO|Y{!@vTpzqbC3p*Gth#8uTMut_@j=flKJ=)2ExG zDL87QZUle&hcCSIj57ix3r~GqhSIK2JzK{-cgOrtajD=!YY379hPj-*H4`}`!kuez zu52LZO-nmDnWs61T3Y^gKE9E!C1<Hs4R8zgZ)On#_+1E9-A|Su8@a27ib0fqiv-S;sslRn-#Slzxy-V`YO6S_z z+IScr;}R+*e-+Bdt@o==zvbd=+-V<*nAW1l;P=7w=>3M8u*ToH$qTU?@Rj`#WT0o} z{Bp2MnSz3bAPO1rqBvMXi(zZQVyek6H8N6XwwDh@czze%hE|a)`U>U~$0{u?eFM7) zjs3>kzX@)0G&529$78=_d%%kG8iBOUPVmu&umS@E11fa9;clQxQQ=7V;ZDHyM=Y@9 zaK+?zEs-m-$0?d7p;u$c0y{JsOf*9xuYd7qv!iFiGqEjpv5hb>sV}zX@rDt|?tOYL z`B4RopB?O%M^*X>xXv_gF+ED9(`v#2Sx6oZcY|=GbqXA3_ADuN&(eAYs}b2K7C$7(!}hnt4>@CtdzNlbP*N%a96L_}!`JyQh0fG%A6rf@FrUrt zm2zf3lqJJnRCv%i7Vh>?r7ib zGdDcfV(W;mI&^V!eVqvyAd#G~b4yfV1^8KH@+R>b0AGZ*#r9GT9Cw(sf)ZB8#vBG$bRgUkS!_B-+Z{K{$)+%X1g(X(f zIga?}W87jHCJaeusBrr#X5Ioz7LaR?DlXgd7imPYbl&ONn(LWBC@V9`q zN2d3ae)_TrppfPUvbn_7)zw{MO9sv!3iEmX9iH1gUT!1-Q!e0y#4Ip;Y`8x>Yzu<- zbTpvfW*M6Ji@|DiYj-+q;`d*o*Vd=0`%4d;<2U+p<#6*fClCPqBi01pm#$q);h+S_ z*^1`bynUbxdO3;^X&%wvbAab{lKb;0t|k%rZgQ5s$|5_vyC79nv&_yG zBgLF84C!+2tDX1*EacYS#%zLX*y?m{zh>um7 zWHldoeM|k`dDn}{olDgo|5}pD+1K9`*q=8&$Of|EY1uXuBceu zsjfzmnk-4zuBhLPEVOrYOdTzsDt$p=ICnFk5Ys@8!sECr=K}vZn1_wr5#eM}Qc+>r zT8){wet@%Aq`dcfSU!s`8a`PIjUM~h99z6O+*##mnLbk%;)ZOaVZWE>0k|8^b?1r- zkz9hM)Uu2=WBRiw;`{`mL`#WZ1IVFWzu40{R>8`G!h>2#1A zDJjeYgM%Wkw^xRyTYfci1j|tlb0-GCNF|18JP&$Gs%0(8`IeWLfxpiCH1Eyb${O^e zZV%~AA6l2qdZX0Qu51 zVY=vMo;^J{)RXCnTY>5N7MQ$h#SG*kSt6yIfeK|@bZD0mLTY%g2Ac=2N4 z^?broeoP_8L4C8r(@qRHF_|hZfHbz{VNbD<;r}!_c`ru$6fD`cnqV> zeilNqxJIe2CN5DIK9v|gL>FA6gml>|RK^C=cYjRBtW{NRb)B|;($N9^vlOh8o#48z zd#7(G%Kl*NNr`-3PphecWA|on{@YB@L`}V1m6f_|kvQu7MN1me83v+REugoOD9_{IKr1E*V?IM6`m hUlF1LLeP;>-XWO(Zo?2tG6!t{b7Q1Yje*x6{{UqrT}1!@ literal 0 HcmV?d00001 diff --git a/sprites/spr_weapon_phobos_bolter/layers/0feb2b87-1efd-47dd-9f23-14a4113b369c/664d1dec-58bd-4b0a-abf0-6249a1377b2b.png b/sprites/spr_weapon_phobos_bolter/layers/0feb2b87-1efd-47dd-9f23-14a4113b369c/664d1dec-58bd-4b0a-abf0-6249a1377b2b.png new file mode 100644 index 0000000000000000000000000000000000000000..9b571ba670d47994f69150edbb417aaabbeea82b GIT binary patch literal 3464 zcmc&%c{o&U8$V>rk|jIMG)S_HA!H{zG4^%Hk|F!p3XP>VOTD7-8iXcZr zRvUc5;&a8+2sr-xdeT;z0|1=2%#AKP#7zB|y%H?;8N#v^){R`Rs9!Q&S95R(JSXGG zyIS*57FIGX;PXL3F8QI&Z8N4U!G^kUSTk%HW&^i*HucQTb%vP(lKve2XGKOPoD3Xv@RM5pWT=R)$|*u@H~%+23ylPE7H+JC8d$rp#}$0{d9qeg$DppX=AzzO+W46T*0?>p&im z_w1^CXO>r1L_P_A&1?uQt(Ij^VZ`b}`HkO$E~qn<+Ky8I8_S&=iqfjLDa0zdTnk|+ zw8z;qK7~X=f=-Ln!x;??4LSYOF&?gY7ornoe{eL(MeI&E380=TGIN2z~2fO|Y{!@vTpzqbC3p*Gth#8uTMut_@j=flKJ=)2ExG zDL87QZUle&hcCSIj57ix3r~GqhSIK2JzK{-cgOrtajD=!YY379hPj-*H4`}`!kuez zu52LZO-nmDnWs61T3Y^gKE9E!C1<Hs4R8zgZ)On#_+1E9-A|Su8@a27ib0fqiv-S;sslRn-#Slzxy-V`YO6S_z z+IScr;}R+*e-+Bdt@o==zvbd=+-V<*nAW1l;P=7w=>3M8u*ToH$qTU?@Rj`#WT0o} z{Bp2MnSz3bAPO1rqBvMXi(zZQVyek6H8N6XwwDh@czze%hE|a)`U>U~$0{u?eFM7) zjs3>kzX@)0G&529$78=_d%%kG8iBOUPVmu&umS@E11fa9;clQxQQ=7V;ZDHyM=Y@9 zaK+?zEs-m-$0?d7p;u$c0y{JsOf*9xuYd7qv!iFiGqEjpv5hb>sV}zX@rDt|?tOYL z`B4RopB?O%M^*X>xXv_gF+ED9(`v#2Sx6oZcY|=GbqXA3_ADuN&(eAYs}b2K7C$7(!}hnt4>@CtdzNlbP*N%a96L_}!`JyQh0fG%A6rf@FrUrt zm2zf3lqJJnRCv%i7Vh>?r7ib zGdDcfV(W;mI&^V!eVqvyAd#G~b4yfV1^8KH@+R>b0AGZ*#r9GT9Cw(sf)ZB8#vBG$bRgUkS!_B-+Z{K{$)+%X1g(X(f zIga?}W87jHCJaeusBrr#X5Ioz7LaR?DlXgd7imPYbl&ONn(LWBC@V9`q zN2d3ae)_TrppfPUvbn_7)zw{MO9sv!3iEmX9iH1gUT!1-Q!e0y#4Ip;Y`8x>Yzu<- zbTpvfW*M6Ji@|DiYj-+q;`d*o*Vd=0`%4d;<2U+p<#6*fClCPqBi01pm#$q);h+S_ z*^1`bynUbxdO3;^X&%wvbAab{lKb;0t|k%rZgQ5s$|5_vyC79nv&_yG zBgLF84C!+2tDX1*EacYS#%zLX*y?m{zh>um7 zWHldoeM|k`dDn}{olDgo|5}pD+1K9`*q=8&$Of|EY1uXuBceu zsjfzmnk-4zuBhLPEVOrYOdTzsDt$p=ICnFk5Ys@8!sECr=K}vZn1_wr5#eM}Qc+>r zT8){wet@%Aq`dcfSU!s`8a`PIjUM~h99z6O+*##mnLbk%;)ZOaVZWE>0k|8^b?1r- zkz9hM)Uu2=WBRiw;`{`mL`#WZ1IVFWzu40{R>8`G!h>2#1A zDJjeYgM%Wkw^xRyTYfci1j|tlb0-GCNF|18JP&$Gs%0(8`IeWLfxpiCH1Eyb${O^e zZV%~AA6l2qdZX0Qu51 zVY=vMo;^J{)RXCnTY>5N7MQ$h#SG*kSt6yIfeK|@bZD0mLTY%g2Ac=2N4 z^?broeoP_8L4C8r(@qRHF_|hZfHbz{VNbD<;r}!_c`ru$6fD`cnqV> zeilNqxJIe2CN5DIK9v|gL>FA6gml>|RK^C=cYjRBtW{NRb)B|;($N9^vlOh8o#48z zd#7(G%Kl*NNr`-3PphecWA|on{@YB@L`}V1m6f_|kvQu7MN1me83v+REugoOD9_{IKr1E*V?IM6`m hUlF1LLeP;>-XWO(Zo?2tG6!t{b7Q1Yje*x6{{UqrT}1!@ literal 0 HcmV?d00001 diff --git a/sprites/spr_weapon_phobos_bolter/spr_weapon_phobos_bolter.yy b/sprites/spr_weapon_phobos_bolter/spr_weapon_phobos_bolter.yy new file mode 100644 index 0000000000..4caa33666e --- /dev/null +++ b/sprites/spr_weapon_phobos_bolter/spr_weapon_phobos_bolter.yy @@ -0,0 +1,111 @@ +{ + "$GMSprite":"v2", + "%Name":"spr_weapon_phobos_bolter", + "bboxMode":0, + "bbox_bottom":198, + "bbox_left":0, + "bbox_right":64, + "bbox_top":95, + "collisionKind":1, + "collisionTolerance":0, + "DynamicTexturePage":false, + "edgeFiltering":false, + "For3D":false, + "frames":[ + {"$GMSpriteFrame":"v1","%Name":"0feb2b87-1efd-47dd-9f23-14a4113b369c","name":"0feb2b87-1efd-47dd-9f23-14a4113b369c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + ], + "gridX":0, + "gridY":0, + "height":231, + "HTile":false, + "layers":[ + {"$GMImageLayer":"","%Name":"664d1dec-58bd-4b0a-abf0-6249a1377b2b","blendMode":0,"displayName":"default","isLocked":false,"name":"664d1dec-58bd-4b0a-abf0-6249a1377b2b","opacity":100.0,"resourceType":"GMImageLayer","resourceVersion":"2.0","visible":true,}, + ], + "name":"spr_weapon_phobos_bolter", + "nineSlice":{ + "$GMNineSliceData":"", + "bottom":0, + "enabled":false, + "guideColour":[4294902015,4294902015,4294902015,4294902015,], + "highlightColour":1728023040, + "highlightStyle":0, + "left":0, + "resourceType":"GMNineSliceData", + "resourceVersion":"2.0", + "right":0, + "tileMode":[ + 0, + 0, + 0, + 0, + 0, + ], + "top":0, + }, + "origin":9, + "parent":{ + "name":"ranged", + "path":"folders/Sprites/Marine Viewer/weapons/ranged.yy", + }, + "preMultiplyAlpha":false, + "resourceType":"GMSprite", + "resourceVersion":"2.0", + "sequence":{ + "$GMSequence":"v1", + "%Name":"spr_weapon_phobos_bolter", + "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_weapon_phobos_bolter", + "playback":1, + "playbackSpeed":1.0, + "playbackSpeedType":1, + "resourceType":"GMSequence", + "resourceVersion":"2.0", + "seqHeight":231.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":"0feb2b87-1efd-47dd-9f23-14a4113b369c","path":"sprites/spr_weapon_phobos_bolter/spr_weapon_phobos_bolter.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"549bcfaa-6460-412e-b475-43070065cdc3","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":4, + "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_weapon_tigris_combi/7078d58a-3619-44c5-bbe0-4449064aeaa4.png b/sprites/spr_weapon_tigris_combi/7078d58a-3619-44c5-bbe0-4449064aeaa4.png new file mode 100644 index 0000000000000000000000000000000000000000..26a2536c5284e35ee10c0a72c614ebe2e50a3dbc GIT binary patch literal 4885 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":"", + "Keyframes":[], + "resourceType":"KeyframeStore", + "resourceVersion":"2.0", + }, + "eventStubScript":null, + "eventToFunction":{}, + "length":1.0, + "lockOrigin":false, + "moments":{ + "$KeyframeStore":"", + "Keyframes":[], + "resourceType":"KeyframeStore", + "resourceVersion":"2.0", + }, + "name":"spr_weapon_tigris_combi", + "playback":1, + "playbackSpeed":1.0, + "playbackSpeedType":1, + "resourceType":"GMSequence", + "resourceVersion":"2.0", + "seqHeight":231.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":"7078d58a-3619-44c5-bbe0-4449064aeaa4","path":"sprites/spr_weapon_tigris_combi/spr_weapon_tigris_combi.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"edd0737e-fb8c-439a-88d5-d55cb9bea077","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_weapon_volkite_caliver/746312be-a5f0-47ac-a783-e19dcde061a8.png b/sprites/spr_weapon_volkite_caliver/746312be-a5f0-47ac-a783-e19dcde061a8.png new file mode 100644 index 0000000000000000000000000000000000000000..951feb5a719ce84eaec1149a255f10cc58358f31 GIT binary patch literal 6168 zcmc&&XEa>h*O!7M9z>!<&tHq)2{L#*QDQLqV30|4hA5fQ%_LF;gD9i71eq{~D5D!B zQAQ0>f-ne13(-68eZIVFy&vAs|9kIQXRUMAK47b-?a_v|Gd-4QVKY>AEzB~M4U@`#R3Bb|