diff --git a/ChapterMaster.yyp b/ChapterMaster.yyp index 02b8be4401..89847a1b62 100644 --- a/ChapterMaster.yyp +++ b/ChapterMaster.yyp @@ -101,6 +101,7 @@ {"resourceType":"GMFolder","resourceVersion":"1.0","name":"Menu and Load","folderPath":"folders/Sprites/New UI/Menu and Load.yy",}, {"resourceType":"GMFolder","resourceVersion":"1.0","name":"Purge","folderPath":"folders/Sprites/New UI/Purge.yy",}, {"resourceType":"GMFolder","resourceVersion":"1.0","name":"tooltips","folderPath":"folders/Sprites/New UI/tooltips.yy",}, + {"resourceType":"GMFolder","resourceVersion":"1.0","name":"data_slate_icons","folderPath":"folders/Sprites/New UI/data_slate_icons.yy",}, {"resourceType":"GMFolder","resourceVersion":"1.0","name":"Primary","folderPath":"folders/Sprites/Primary.yy",}, {"resourceType":"GMFolder","resourceVersion":"1.0","name":"Ships","folderPath":"folders/Sprites/Ships.yy",}, {"resourceType":"GMFolder","resourceVersion":"1.0","name":"Chaos","folderPath":"folders/Sprites/Ships/Chaos.yy",}, @@ -193,7 +194,6 @@ {"resourceType":"GMIncludedFile","resourceVersion":"1.0","name":"daemon7.png","CopyToMask":-1,"filePath":"datafiles/images/diplomacy",}, {"resourceType":"GMIncludedFile","resourceVersion":"1.0","name":"daemon8.png","CopyToMask":-1,"filePath":"datafiles/images/diplomacy",}, {"resourceType":"GMIncludedFile","resourceVersion":"1.0","name":"daemon9.png","CopyToMask":-1,"filePath":"datafiles/images/diplomacy",}, - {"resourceType":"GMIncludedFile","resourceVersion":"1.0","name":"diplomacy_icons.png","CopyToMask":-1,"filePath":"datafiles/images/diplomacy",}, {"resourceType":"GMIncludedFile","resourceVersion":"1.0","name":"diplomacy10.png","CopyToMask":-1,"filePath":"datafiles/images/diplomacy",}, {"resourceType":"GMIncludedFile","resourceVersion":"1.0","name":"diplomacy11.png","CopyToMask":-1,"filePath":"datafiles/images/diplomacy",}, {"resourceType":"GMIncludedFile","resourceVersion":"1.0","name":"diplomacy12.png","CopyToMask":-1,"filePath":"datafiles/images/diplomacy",}, @@ -204,6 +204,7 @@ {"resourceType":"GMIncludedFile","resourceVersion":"1.0","name":"diplomacy6.png","CopyToMask":-1,"filePath":"datafiles/images/diplomacy",}, {"resourceType":"GMIncludedFile","resourceVersion":"1.0","name":"diplomacy7.png","CopyToMask":-1,"filePath":"datafiles/images/diplomacy",}, {"resourceType":"GMIncludedFile","resourceVersion":"1.0","name":"diplomacy8.png","CopyToMask":-1,"filePath":"datafiles/images/diplomacy",}, + {"resourceType":"GMIncludedFile","resourceVersion":"1.0","name":"diplomacy_icons.png","CopyToMask":-1,"filePath":"datafiles/images/diplomacy",}, {"resourceType":"GMIncludedFile","resourceVersion":"1.0","name":"1.png","CopyToMask":-1,"filePath":"datafiles/images/diplomacy/icons",}, {"resourceType":"GMIncludedFile","resourceVersion":"1.0","name":"10.png","CopyToMask":-1,"filePath":"datafiles/images/diplomacy/icons",}, {"resourceType":"GMIncludedFile","resourceVersion":"1.0","name":"11.png","CopyToMask":-1,"filePath":"datafiles/images/diplomacy/icons",}, @@ -458,10 +459,10 @@ {"resourceType":"GMIncludedFile","resourceVersion":"1.0","name":"eldar.json","CopyToMask":-1,"filePath":"datafiles/main/names",}, {"resourceType":"GMIncludedFile","resourceVersion":"1.0","name":"genestealercult.json","CopyToMask":-1,"filePath":"datafiles/main/names",}, {"resourceType":"GMIncludedFile","resourceVersion":"1.0","name":"hulk.json","CopyToMask":-1,"filePath":"datafiles/main/names",}, - {"resourceType":"GMIncludedFile","resourceVersion":"1.0","name":"imperial_ship.json","CopyToMask":-1,"filePath":"datafiles/main/names",}, {"resourceType":"GMIncludedFile","resourceVersion":"1.0","name":"imperial.json","CopyToMask":-1,"filePath":"datafiles/main/names",}, - {"resourceType":"GMIncludedFile","resourceVersion":"1.0","name":"ork_ship.json","CopyToMask":-1,"filePath":"datafiles/main/names",}, + {"resourceType":"GMIncludedFile","resourceVersion":"1.0","name":"imperial_ship.json","CopyToMask":-1,"filePath":"datafiles/main/names",}, {"resourceType":"GMIncludedFile","resourceVersion":"1.0","name":"ork.json","CopyToMask":-1,"filePath":"datafiles/main/names",}, + {"resourceType":"GMIncludedFile","resourceVersion":"1.0","name":"ork_ship.json","CopyToMask":-1,"filePath":"datafiles/main/names",}, {"resourceType":"GMIncludedFile","resourceVersion":"1.0","name":"sector.json","CopyToMask":-1,"filePath":"datafiles/main/names",}, {"resourceType":"GMIncludedFile","resourceVersion":"1.0","name":"space_marine.json","CopyToMask":-1,"filePath":"datafiles/main/names",}, {"resourceType":"GMIncludedFile","resourceVersion":"1.0","name":"star.json","CopyToMask":-1,"filePath":"datafiles/main/names",}, @@ -486,7 +487,6 @@ {"resourceType":"GMIncludedFile","resourceVersion":"1.0","name":"data.json","CopyToMask":-1,"filePath":"datafiles/main/visual_sets/Test_set",}, {"resourceType":"GMIncludedFile","resourceVersion":"1.0","name":"1.png","CopyToMask":-1,"filePath":"datafiles/main/visual_sets/Test_set/test_sprite",}, {"resourceType":"GMIncludedFile","resourceVersion":"1.0","name":"use_sets.json","CopyToMask":-1,"filePath":"datafiles/main/visual_sets",}, - {"resourceType":"GMIncludedFile","resourceVersion":"1.0","name":"README.md","CopyToMask":-1,"filePath":"datafiles",}, ], "isEcma": false, "LibraryEmitters": [], @@ -513,6 +513,7 @@ {"id":{"name":"spr_creation_founding","path":"sprites/spr_creation_founding/spr_creation_founding.yy",},}, {"id":{"name":"spr_creation_existing","path":"sprites/spr_creation_existing/spr_creation_existing.yy",},}, {"id":{"name":"scr_draw_armentarium","path":"scripts/scr_draw_armentarium/scr_draw_armentarium.yy",},}, + {"id":{"name":"spr_icon_iron_halo","path":"sprites/spr_icon_iron_halo/spr_icon_iron_halo.yy",},}, {"id":{"name":"spr_creation_other","path":"sprites/spr_creation_other/spr_creation_other.yy",},}, {"id":{"name":"spr_generic_sgt_mk4","path":"sprites/spr_generic_sgt_mk4/spr_generic_sgt_mk4.yy",},}, {"id":{"name":"spr_creation_nosplash","path":"sprites/spr_creation_nosplash/spr_creation_nosplash.yy",},}, @@ -553,6 +554,7 @@ {"id":{"name":"spr_noarmour_colors","path":"sprites/spr_noarmour_colors/spr_noarmour_colors.yy",},}, {"id":{"name":"spr_da_mk8","path":"sprites/spr_da_mk8/spr_da_mk8.yy",},}, {"id":{"name":"spr_mk7_head_variants","path":"sprites/spr_mk7_head_variants/spr_mk7_head_variants.yy",},}, + {"id":{"name":"spr_icon_health","path":"sprites/spr_icon_health/spr_icon_health.yy",},}, {"id":{"name":"spr_scout_colors","path":"sprites/spr_scout_colors/spr_scout_colors.yy",},}, {"id":{"name":"spr_tartaros_colors","path":"sprites/spr_tartaros_colors/spr_tartaros_colors.yy",},}, {"id":{"name":"spr_generic_sgt_mk5","path":"sprites/spr_generic_sgt_mk5/spr_generic_sgt_mk5.yy",},}, @@ -579,6 +581,7 @@ {"id":{"name":"scr_draw_rectangle","path":"scripts/scr_draw_rectangle/scr_draw_rectangle.yy",},}, {"id":{"name":"spr_mk7_mongol_chest_variants","path":"sprites/spr_mk7_mongol_chest_variants/spr_mk7_mongol_chest_variants.yy",},}, {"id":{"name":"spr_mk6_forehead_knightly","path":"sprites/spr_mk6_forehead_knightly/spr_mk6_forehead_knightly.yy",},}, + {"id":{"name":"spr_icon_iron_hands","path":"sprites/spr_icon_iron_hands/spr_icon_iron_hands.yy",},}, {"id":{"name":"scr_buttons","path":"scripts/scr_buttons/scr_buttons.yy",},}, {"id":{"name":"spr_mk6_complex","path":"sprites/spr_mk6_complex/spr_mk6_complex.yy",},}, {"id":{"name":"spr_purity_s","path":"sprites/spr_purity_s/spr_purity_s.yy",},}, @@ -590,6 +593,7 @@ {"id":{"name":"spr_weapon_sbolter","path":"sprites/spr_weapon_sbolter/spr_weapon_sbolter.yy",},}, {"id":{"name":"spr_terminator_complex_arm_hidden_right","path":"sprites/spr_terminator_complex_arm_hidden_right/spr_terminator_complex_arm_hidden_right.yy",},}, {"id":{"name":"spr_weapon_comflamer","path":"sprites/spr_weapon_comflamer/spr_weapon_comflamer.yy",},}, + {"id":{"name":"spr_icon_iron_hands2","path":"sprites/spr_icon_iron_hands2/spr_icon_iron_hands2.yy",},}, {"id":{"name":"spr_weapon_flamer","path":"sprites/spr_weapon_flamer/spr_weapon_flamer.yy",},}, {"id":{"name":"spr_weapon_missile","path":"sprites/spr_weapon_missile/spr_weapon_missile.yy",},}, {"id":{"name":"spr_weapon_melta","path":"sprites/spr_weapon_melta/spr_weapon_melta.yy",},}, @@ -664,6 +668,7 @@ {"id":{"name":"spr_loadbar","path":"sprites/spr_loadbar/spr_loadbar.yy",},}, {"id":{"name":"scr_mission_functions","path":"scripts/scr_mission_functions/scr_mission_functions.yy",},}, {"id":{"name":"spr_mk6_knightly_mouth_variants","path":"sprites/spr_mk6_knightly_mouth_variants/spr_mk6_knightly_mouth_variants.yy",},}, + {"id":{"name":"spr_icon_bionics","path":"sprites/spr_icon_bionics/spr_icon_bionics.yy",},}, {"id":{"name":"spr_loadbar_empty","path":"sprites/spr_loadbar_empty/spr_loadbar_empty.yy",},}, {"id":{"name":"spr_loadbar_cover","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},}, {"id":{"name":"scr_ground_ai_helpers","path":"scripts/scr_ground_ai_helpers/scr_ground_ai_helpers.yy",},}, @@ -729,6 +734,7 @@ {"id":{"name":"obj_timer","path":"objects/obj_timer/obj_timer.yy",},}, {"id":{"name":"spr_popup_select","path":"sprites/spr_popup_select/spr_popup_select.yy",},}, {"id":{"name":"spr_ih_mk7_helm","path":"sprites/spr_ih_mk7_helm/spr_ih_mk7_helm.yy",},}, + {"id":{"name":"spr_icon_librarius","path":"sprites/spr_icon_librarius/spr_icon_librarius.yy",},}, {"id":{"name":"spr_company_title","path":"sprites/spr_company_title/spr_company_title.yy",},}, {"id":{"name":"spr_master_title","path":"sprites/spr_master_title/spr_master_title.yy",},}, {"id":{"name":"spr_loc_icon","path":"sprites/spr_loc_icon/spr_loc_icon.yy",},}, @@ -793,12 +799,14 @@ {"id":{"name":"sprite267","path":"sprites/sprite267/sprite267.yy",},}, {"id":{"name":"spr_mk4_left_arm","path":"sprites/spr_mk4_left_arm/spr_mk4_left_arm.yy",},}, {"id":{"name":"scr_sprite_functions","path":"scripts/scr_sprite_functions/scr_sprite_functions.yy",},}, + {"id":{"name":"spr_icon_weight","path":"sprites/spr_icon_weight/spr_icon_weight.yy",},}, {"id":{"name":"spr_master_splash","path":"sprites/spr_master_splash/spr_master_splash.yy",},}, {"id":{"name":"spr_saveload","path":"sprites/spr_saveload/spr_saveload.yy",},}, {"id":{"name":"spr_sw_mk5_helm","path":"sprites/spr_sw_mk5_helm/spr_sw_mk5_helm.yy",},}, {"id":{"name":"spr_diplomacy_small","path":"sprites/spr_diplomacy_small/spr_diplomacy_small.yy",},}, {"id":{"name":"scr_ComplexSet","path":"scripts/scr_ComplexSet/scr_ComplexSet.yy",},}, {"id":{"name":"spr_diplomacy_med","path":"sprites/spr_diplomacy_med/spr_diplomacy_med.yy",},}, + {"id":{"name":"spr_icon_apothecarion","path":"sprites/spr_icon_apothecarion/spr_icon_apothecarion.yy",},}, {"id":{"name":"spr_diplomacy_defeated","path":"sprites/spr_diplomacy_defeated/spr_diplomacy_defeated.yy",},}, {"id":{"name":"sprite266","path":"sprites/sprite266/sprite266.yy",},}, {"id":{"name":"spr_mk3_complex_backpack","path":"sprites/spr_mk3_complex_backpack/spr_mk3_complex_backpack.yy",},}, @@ -914,6 +922,7 @@ {"id":{"name":"spr_skulls_belt","path":"sprites/spr_skulls_belt/spr_skulls_belt.yy",},}, {"id":{"name":"spr_ship_veng","path":"sprites/spr_ship_veng/spr_ship_veng.yy",},}, {"id":{"name":"spr_ship_daemon","path":"sprites/spr_ship_daemon/spr_ship_daemon.yy",},}, + {"id":{"name":"spr_icon_telepatica2","path":"sprites/spr_icon_telepatica2/spr_icon_telepatica2.yy",},}, {"id":{"name":"spr_da_backpack","path":"sprites/spr_da_backpack/spr_da_backpack.yy",},}, {"id":{"name":"spr_ship_carnage","path":"sprites/spr_ship_carnage/spr_ship_carnage.yy",},}, {"id":{"name":"spr_ship_icono","path":"sprites/spr_ship_icono/spr_ship_icono.yy",},}, @@ -947,6 +956,7 @@ {"id":{"name":"spr_postbattle","path":"sprites/spr_postbattle/spr_postbattle.yy",},}, {"id":{"name":"spr_postbattle_space","path":"sprites/spr_postbattle_space/spr_postbattle_space.yy",},}, {"id":{"name":"spr_hero_skull","path":"sprites/spr_hero_skull/spr_hero_skull.yy",},}, + {"id":{"name":"spr_icon_shield2","path":"sprites/spr_icon_shield2/spr_icon_shield2.yy",},}, {"id":{"name":"spr_hero","path":"sprites/spr_hero/spr_hero.yy",},}, {"id":{"name":"spr_lion_belt","path":"sprites/spr_lion_belt/spr_lion_belt.yy",},}, {"id":{"name":"spr_flame","path":"sprites/spr_flame/spr_flame.yy",},}, @@ -957,6 +967,7 @@ {"id":{"name":"spr_carrion_breath","path":"sprites/spr_carrion_breath/spr_carrion_breath.yy",},}, {"id":{"name":"spr_tartaros_left_trim","path":"sprites/spr_tartaros_left_trim/spr_tartaros_left_trim.yy",},}, {"id":{"name":"spr_mk7_prussia_chest","path":"sprites/spr_mk7_prussia_chest/spr_mk7_prussia_chest.yy",},}, + {"id":{"name":"spr_icon_iron_hands3","path":"sprites/spr_icon_iron_hands3/spr_icon_iron_hands3.yy",},}, {"id":{"name":"spr_bullet","path":"sprites/spr_bullet/spr_bullet.yy",},}, {"id":{"name":"Sprite544","path":"sprites/Sprite544/Sprite544.yy",},}, {"id":{"name":"spr_tech_area_pad","path":"sprites/spr_tech_area_pad/spr_tech_area_pad.yy",},}, @@ -968,7 +979,7 @@ {"id":{"name":"spr_ground_las","path":"sprites/spr_ground_las/spr_ground_las.yy",},}, {"id":{"name":"spr_weapon_standard2","path":"sprites/spr_weapon_standard2/spr_weapon_standard2.yy",},}, {"id":{"name":"spr_mk7_right_trim","path":"sprites/spr_mk7_right_trim/spr_mk7_right_trim.yy",},}, - {"id":{"name":"spr_unit_card_icons","path":"sprites/spr_unit_card_icons/spr_unit_card_icons.yy",},}, + {"id":{"name":"spr_icon_veteran","path":"sprites/spr_icon_veteran/spr_icon_veteran.yy",},}, {"id":{"name":"spr_pixel_button_right","path":"sprites/spr_pixel_button_right/spr_pixel_button_right.yy",},}, {"id":{"name":"spr_pixel_button_middle","path":"sprites/spr_pixel_button_middle/spr_pixel_button_middle.yy",},}, {"id":{"name":"spr_pixel_button_left","path":"sprites/spr_pixel_button_left/spr_pixel_button_left.yy",},}, @@ -1008,6 +1019,7 @@ {"id":{"name":"spr_mk6_mouth_prussian","path":"sprites/spr_mk6_mouth_prussian/spr_mk6_mouth_prussian.yy",},}, {"id":{"name":"spr_mk6_mouth_variants","path":"sprites/spr_mk6_mouth_variants/spr_mk6_mouth_variants.yy",},}, {"id":{"name":"spr_fleet_alert","path":"sprites/spr_fleet_alert/spr_fleet_alert.yy",},}, + {"id":{"name":"spr_icon_telepatica","path":"sprites/spr_icon_telepatica/spr_icon_telepatica.yy",},}, {"id":{"name":"spr_cloak_scale","path":"sprites/spr_cloak_scale/spr_cloak_scale.yy",},}, {"id":{"name":"spr_fleet_civilian","path":"sprites/spr_fleet_civilian/spr_fleet_civilian.yy",},}, {"id":{"name":"spr_ih_mk5_helm","path":"sprites/spr_ih_mk5_helm/spr_ih_mk5_helm.yy",},}, @@ -1036,6 +1048,7 @@ {"id":{"name":"spr_mar_fire_body3","path":"sprites/spr_mar_fire_body3/spr_mar_fire_body3.yy",},}, {"id":{"name":"spr_mar_fire_pauldron1","path":"sprites/spr_mar_fire_pauldron1/spr_mar_fire_pauldron1.yy",},}, {"id":{"name":"spr_mar_fire_pauldron2","path":"sprites/spr_mar_fire_pauldron2/spr_mar_fire_pauldron2.yy",},}, + {"id":{"name":"spr_icon_ballistic_skill","path":"sprites/spr_icon_ballistic_skill/spr_icon_ballistic_skill.yy",},}, {"id":{"name":"spr_mk7_complex_backpack","path":"sprites/spr_mk7_complex_backpack/spr_mk7_complex_backpack.yy",},}, {"id":{"name":"spr_mar_walk_body1","path":"sprites/spr_mar_walk_body1/spr_mar_walk_body1.yy",},}, {"id":{"name":"spr_mar_walk_body2","path":"sprites/spr_mar_walk_body2/spr_mar_walk_body2.yy",},}, @@ -1297,6 +1310,7 @@ {"id":{"name":"scr_quest","path":"scripts/scr_quest/scr_quest.yy",},}, {"id":{"name":"scr_audience","path":"scripts/scr_audience/scr_audience.yy",},}, {"id":{"name":"spr_ba_mk7_helm","path":"sprites/spr_ba_mk7_helm/spr_ba_mk7_helm.yy",},}, + {"id":{"name":"spr_icon_psyker","path":"sprites/spr_icon_psyker/spr_icon_psyker.yy",},}, {"id":{"name":"spr_sister_hospitaler","path":"sprites/spr_sister_hospitaler/spr_sister_hospitaler.yy",},}, {"id":{"name":"spr_intelligence_icon","path":"sprites/spr_intelligence_icon/spr_intelligence_icon.yy",},}, {"id":{"name":"spr_dread_heavy_bolter","path":"sprites/spr_dread_heavy_bolter/spr_dread_heavy_bolter.yy",},}, @@ -1455,6 +1469,7 @@ {"id":{"name":"scr_log","path":"scripts/scr_log/scr_log.yy",},}, {"id":{"name":"obj_nfort","path":"objects/obj_nfort/obj_nfort.yy",},}, {"id":{"name":"spr_artificer_right_leg","path":"sprites/spr_artificer_right_leg/spr_artificer_right_leg.yy",},}, + {"id":{"name":"spr_icon_weapon_skill","path":"sprites/spr_icon_weapon_skill/spr_icon_weapon_skill.yy",},}, {"id":{"name":"scr_livery_setup","path":"scripts/scr_livery_setup/scr_livery_setup.yy",},}, {"id":{"name":"obj_temp1","path":"objects/obj_temp1/obj_temp1.yy",},}, {"id":{"name":"obj_temp2","path":"objects/obj_temp2/obj_temp2.yy",},}, @@ -1512,6 +1527,7 @@ {"id":{"name":"obj_turn_end","path":"objects/obj_turn_end/obj_turn_end.yy",},}, {"id":{"name":"obj_saveload","path":"objects/obj_saveload/obj_saveload.yy",},}, {"id":{"name":"spr_da_term_honor","path":"sprites/spr_da_term_honor/spr_da_term_honor.yy",},}, + {"id":{"name":"spr_icon_wounds","path":"sprites/spr_icon_wounds/spr_icon_wounds.yy",},}, {"id":{"name":"obj_cursor","path":"objects/obj_cursor/obj_cursor.yy",},}, {"id":{"name":"obj_all_fleet","path":"objects/obj_all_fleet/obj_all_fleet.yy",},}, {"id":{"name":"obj_p_fleet","path":"objects/obj_p_fleet/obj_p_fleet.yy",},}, @@ -1554,6 +1570,7 @@ {"id":{"name":"Game","path":"rooms/Game/Game.yy",},}, {"id":{"name":"Tutorial","path":"rooms/Tutorial/Tutorial.yy",},}, {"id":{"name":"spr_mk3_head_variants","path":"sprites/spr_mk3_head_variants/spr_mk3_head_variants.yy",},}, + {"id":{"name":"spr_icon_shield","path":"sprites/spr_icon_shield/spr_icon_shield.yy",},}, {"id":{"name":"scr_draw_text","path":"scripts/scr_draw_text/scr_draw_text.yy",},}, {"id":{"name":"spr_data_slate_border","path":"sprites/spr_data_slate_border/spr_data_slate_border.yy",},}, {"id":{"name":"spr_terminator_arms","path":"sprites/spr_terminator_arms/spr_terminator_arms.yy",},}, @@ -1642,6 +1659,6 @@ ], "templateType": null, "TextureGroups": [ - {"resourceType":"GMTextureGroup","resourceVersion":"1.3","name":"Default","autocrop":true,"border":2,"compressFormat":"bz2","directory":"","groupParent":null,"isScaled":false,"loadType":"default","mipsToGenerate":0,"targets":-1,}, + {"resourceType":"GMTextureGroup","resourceVersion":"1.3","name":"Default","autocrop":true,"border":2,"compressFormat":"bz2","customOptions":"","directory":"","groupParent":null,"isScaled":false,"loadType":"default","mipsToGenerate":0,"targets":-1,}, ], } \ No newline at end of file diff --git a/objects/obj_controller/Step_0.gml b/objects/obj_controller/Step_0.gml index 3347c1fe87..63c79461fa 100644 --- a/objects/obj_controller/Step_0.gml +++ b/objects/obj_controller/Step_0.gml @@ -327,15 +327,15 @@ if (menu==1 && (managing>0 || managing<0)){ if (_psy_powers_count > 0){ var _psy_discipline = unit.psy_discipline(); var _psy_discipline_name = get_discipline_data(_psy_discipline, "name"); - temp[119]=$"Psyker: {_psy_discipline_name} {_psy_powers_count}"; + temp[119]=$"{unit.psionic}/{_psy_powers_count}"; - var _tooltip = ""; + var _tooltip = $"Main Discipline: {_psy_discipline_name}\n"; + _tooltip += $"Psychic Rating: {unit.psionic}\n"; + _tooltip += $"Known Powers: "; for (var i = 0; i < _psy_powers_count; i++) { _tooltip += get_power_data(_psy_powers_known[i], "name"); if (i < _psy_powers_count - 1) { _tooltip += ", "; - } else { - _tooltip += "."; } } temp[123] = _tooltip; diff --git a/scripts/scr_marine_struct/scr_marine_struct.gml b/scripts/scr_marine_struct/scr_marine_struct.gml index a3ad03c173..56a543d414 100644 --- a/scripts/scr_marine_struct/scr_marine_struct.gml +++ b/scripts/scr_marine_struct/scr_marine_struct.gml @@ -374,6 +374,19 @@ function TTRPG_stats(faction, comp, mar, class = "marine", other_spawn_data={}) return obj_ini.role[company][marine_number]; }; + static squad_role = function(){ + var temp_role = role(); + if (squad != "none"){ + if (struct_exists(obj_ini.squad_types[$ obj_ini.squads[squad].type], temp_role)){ + var role_info = obj_ini.squad_types[$ obj_ini.squads[squad].type][$ temp_role] + if (struct_exists(role_info, "role")){ + temp_role = role_info[$ "role"]; + } + } + } + return string(temp_role) + }; + static IsSpecialist = function(search_type="standard",include_trainee=false){ return is_specialist(role(), search_type,include_trainee) } @@ -1659,7 +1672,11 @@ function TTRPG_stats(faction, comp, mar, class = "marine", other_spawn_data={}) } static full_title = function(){ - return $"{name_role()} of the {scr_roman_numerals()[company-1]}co."; + return $"{squad_role()} of the {company_roman} Company"; + } + + static company_roman = function(){ + return $"{scr_roman_numerals()[company-1]}"; } static load_marine = function(ship, star="none"){ diff --git a/scripts/scr_ui_manage/scr_ui_manage.gml b/scripts/scr_ui_manage/scr_ui_manage.gml index 725a75c604..c96d611d4f 100644 --- a/scripts/scr_ui_manage/scr_ui_manage.gml +++ b/scripts/scr_ui_manage/scr_ui_manage.gml @@ -103,7 +103,7 @@ function scr_ui_manage() { selecting_planet=0; man_size=0; } - var unit,x1,x2,y1,y2, var_text; + var unit,x1,x2,x3,y1,y2,y3,text; var romanNumerals=scr_roman_numerals(); var tooltip_text="",bionic_tooltip="",tooltip_drawing=[]; var invalid_locations = ["Mechanicus Vessel", "Terra"]; @@ -147,7 +147,7 @@ function scr_ui_manage() { } } // Draw the company followed by chapters name - draw_text(xx+800,yy+74,string_hash_to_newline(string(fx)+", "+string(global.chapter_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}"); @@ -159,7 +159,7 @@ function scr_ui_manage() { draw_set_alpha(0.25); if (obj_ini.company_title[managing]!="") then bar_wid=max(400,string_width(obj_ini.company_title[managing])); if (obj_ini.company_title[managing]="") then bar_wid=400; - string_h = string_height(string_hash_to_newline("LOL")); + 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 = scr_hit(xx+800-(bar_wid/2),yy+108,xx+800+(bar_wid/2),yy+100+string_h); obj_cursor.image_index=0; @@ -228,7 +228,6 @@ function scr_ui_manage() { draw_set_color(c_white); draw_sprite_stretched(spr_data_slate_back, 0, xx+1008-1, yy+140, 572, 378); - draw_sprite_stretched(spr_unit_card_icons, 0, xx+1007-1, yy+140, 166, 167); // draw_sprite_stretched(spr_data_slate_border, 0, xx+1008-1, yy+140, 572, 378); Old Location // draw_rectangle_color_simple(xx+1007, yy+140, xx+1579, yy+519, 0, c_white, 0.05); draw_rectangle_color_simple(xx+1007, yy+140, xx+1579, yy+519, 0, 5998382, 0.05); @@ -310,10 +309,11 @@ function scr_ui_manage() { // Draw unit image draw_set_color(c_white); if (is_struct(temp[121])){ - temp[121].draw(xx+1328, yy+240) + temp[121].draw(xx+1328, yy+250) } //TODO implement tooltip explaining potential loyalty hit of demoting a sgt + // Sergeant promotion button if (view_squad && company_data!={}){ if (company_data.cur_squad!=0){ var cur_squad = company_data.grab_current_squad(); @@ -331,9 +331,30 @@ function scr_ui_manage() { draw_set_color(line_color); // Draw unit name and role + var _name_box = { + x1: xx + 1410, + y1: yy + 177, + text1: "", + text2: "", + text3: selected_unit.name() + } + _name_box.y2 = _name_box.y1 + 20; + _name_box.y3 = _name_box.y2 + 20; + if (selected_unit.company <= 0) { + _name_box.text2 = $"{selected_unit.squad_role()}"; + } else if (selected_unit.IsSpecialist()) { + _name_box.text1 = $"{selected_unit.company_roman()} Company"; + _name_box.text2 = $"{selected_unit.role()}"; + } else { + _name_box.text1 = $"{selected_unit.company_roman()} Company"; + _name_box.text2 = $"{selected_unit.squad_role()}"; + } draw_set_halign(fa_center); + draw_set_font(fnt_40k_14b); + draw_text_transformed_outline(_name_box.x1,_name_box.y1,_name_box.text1,1,1,0); + draw_text_transformed_outline(_name_box.x1,_name_box.y2,_name_box.text2,1,1,0); draw_set_font(fnt_40k_30b); - draw_text_transformed_outline(xx+1290,yy+182,selected_unit.name_role(),0.7,0.7,0); + draw_text_transformed_outline(_name_box.x1,_name_box.y3,_name_box.text3,0.7,0.7,0); // Draw unit info draw_set_font(fnt_40k_14); @@ -344,51 +365,82 @@ function scr_ui_manage() { // Equipment var armour = selected_unit.armour(); if (armour!=""){ - var_text= string_hash_to_newline(selected_unit.equipments_qual_string("armour", true)); + text= selected_unit.equipments_qual_string("armour", true); tooltip_text = cn.temp[103]; x1 = x_left; y1 = yy+320; - x2 = x1+string_width_ext(var_text, -1,187); - y2 = y1+string_height_ext(var_text, -1,187); + 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,var_text,-1,187, 0, quality_color(selected_unit.armour_quality)); - array_push(tooltip_drawing, [tooltip_text, [x1,y1,x2,y2]]); + 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"]); } var gear = selected_unit.gear(); if (selected_unit.gear()!=""){ - var_text= string_hash_to_newline(selected_unit.equipments_qual_string("gear", true)); + text= selected_unit.equipments_qual_string("gear", true); tooltip_text = cn.temp[105]; x1 = x_left; y1 = yy+446; - x2 = x1+string_width_ext(var_text, -1,187); - y2 = y1+string_height_ext(var_text, -1,187); - draw_text_ext_outline(x1,y1,var_text,-1,187, 0, quality_color(selected_unit.gear_quality)); - array_push(tooltip_drawing, [tooltip_text, [x1,y1,x2,y2]]); + 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"]); } var mobi = selected_unit.mobility_item(); if (mobi!=""){ - var_text= string_hash_to_newline(selected_unit.equipments_qual_string("mobi", true)); + text= selected_unit.equipments_qual_string("mobi", true); tooltip_text = cn.temp[107]; x1 = x_left; y1 = yy+467; - x2 = x1+string_width_ext(var_text, -1,187); - y2 = y1+string_height_ext(var_text, -1,187); - draw_text_ext_outline(x1,y1,var_text,-1,187, 0, quality_color(selected_unit.mobility_item_quality)); - array_push(tooltip_drawing, [tooltip_text, [x1,y1,x2,y2]]); + 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"]); } + var wep1= selected_unit.weapon_one(); + if (wep1!=""){ + text= selected_unit.equipments_qual_string("wep1", true); + tooltip_text = cn.temp[109]; + x1 = x_left; + y1 = yy+345; + 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"]); + } + + var wep2 = selected_unit.weapon_two(); + if (wep2!=""){ + text= selected_unit.equipments_qual_string("wep2", true); + tooltip_text = cn.temp[111]; + x1 = x_left; + y1 = yy+395; + 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"]); + } + // Stats - var_text = string_hash_to_newline(string(" {0}",selected_unit.bionics)); // Bionics tracker - x1 = x_left+82; - y1 = yy+209; - x2 = x1+string_width(var_text); - y2 = y1+string_height(var_text); - draw_text_outline(x1,y1,var_text); + text = $"{selected_unit.bionics}"; // Bionics tracker + x1 = x_left+110; + y1 = yy+208; + x2 = x1+string_width(text); + y2 = y1+string_height(text); + x3 = x1 - 26; + y3 = y1 - 4; + + draw_sprite_stretched(spr_icon_bionics, 0, x3, y3, 24, 24); + draw_text_outline(x1,y1,text); var _body_parts = ARR_body_parts; var _body_parts_display = ARR_body_parts_display; - bionic_tooltip = "Bionic Augmentation is something a unit can do to both enhance their capabilities, but also replace a missing limb to get back into the fight. There is a limit of 10 Bionic augmentations. After that the damage is so extensive that a marine requires a dreadnought to keep going. For everyone else? It's time for the emperor's mercy.##Current Bionic Augmentations:#"; + bionic_tooltip = "Bionic Augmentation is something a unit can do to both enhance their capabilities, but also replace a missing limb to get back into the fight."; + bionic_tooltip += "\nThere is a limit of 10 Bionic augmentations. After that the damage is so extensive that a marine requires a dreadnought to keep going."; + bionic_tooltip += "\nFor everyone else? It's time for the emperor's mercy."; + bionic_tooltip += "\n\nCurrent Bionic Augmentations:\n"; for (var part = 0; part= 0 && managing <= 10) { if (obj_ini.company_title[managing] != "") { draw_set_font(fnt_fancy); - draw_text(xx + 800, yy + 110, string_hash_to_newline($"''{obj_ini.company_title[managing]}''")); + draw_text(xx + 800, yy + 110, $"''{obj_ini.company_title[managing]}''"); } } @@ -1315,7 +1370,7 @@ function scr_ui_manage() { // Load to selected draw_set_font(fnt_40k_14b); - draw_text_transformed(xx + 320, yy + 402, string_hash_to_newline($"Click a Ship to Load Selection (Req. {man_size} Space)"), 1, 1, 0); + draw_text_transformed(xx + 320, yy + 402, $"Click a Ship to Load Selection (Req. {man_size} Space)", 1, 1, 0); xx = __view_get(e__VW.XView, 0) + 0; yy = __view_get(e__VW.YView, 0) + 0; diff --git a/sprites/spr_icon_apothecarion/8c420298-afa1-4414-ae6e-dcdf955885f3.png b/sprites/spr_icon_apothecarion/8c420298-afa1-4414-ae6e-dcdf955885f3.png new file mode 100644 index 0000000000..665fe1c870 Binary files /dev/null and b/sprites/spr_icon_apothecarion/8c420298-afa1-4414-ae6e-dcdf955885f3.png differ diff --git a/sprites/spr_icon_apothecarion/layers/8c420298-afa1-4414-ae6e-dcdf955885f3/1940a4aa-ba4d-49be-861f-76f4068cc53c.png b/sprites/spr_icon_apothecarion/layers/8c420298-afa1-4414-ae6e-dcdf955885f3/1940a4aa-ba4d-49be-861f-76f4068cc53c.png new file mode 100644 index 0000000000..665fe1c870 Binary files /dev/null and b/sprites/spr_icon_apothecarion/layers/8c420298-afa1-4414-ae6e-dcdf955885f3/1940a4aa-ba4d-49be-861f-76f4068cc53c.png differ diff --git a/sprites/spr_icon_apothecarion/spr_icon_apothecarion.yy b/sprites/spr_icon_apothecarion/spr_icon_apothecarion.yy new file mode 100644 index 0000000000..216c21f4dc --- /dev/null +++ b/sprites/spr_icon_apothecarion/spr_icon_apothecarion.yy @@ -0,0 +1,74 @@ +{ + "resourceType": "GMSprite", + "resourceVersion": "1.0", + "name": "spr_icon_apothecarion", + "bbox_bottom": 127, + "bbox_left": 36, + "bbox_right": 91, + "bbox_top": 0, + "bboxMode": 0, + "collisionKind": 1, + "collisionTolerance": 0, + "DynamicTexturePage": false, + "edgeFiltering": false, + "For3D": false, + "frames": [ + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"8c420298-afa1-4414-ae6e-dcdf955885f3",}, + ], + "gridX": 0, + "gridY": 0, + "height": 128, + "HTile": false, + "layers": [ + {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"1940a4aa-ba4d-49be-861f-76f4068cc53c","blendMode":0,"displayName":"default","isLocked":false,"opacity":100.0,"visible":true,}, + ], + "nineSlice": null, + "origin": 0, + "parent": { + "name": "data_slate_icons", + "path": "folders/Sprites/New UI/data_slate_icons.yy", + }, + "preMultiplyAlpha": false, + "sequence": { + "resourceType": "GMSequence", + "resourceVersion": "1.4", + "name": "spr_icon_apothecarion", + "autoRecord": true, + "backdropHeight": 768, + "backdropImageOpacity": 0.5, + "backdropImagePath": "", + "backdropWidth": 1366, + "backdropXOffset": 0.0, + "backdropYOffset": 0.0, + "events": {"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[],}, + "eventStubScript": null, + "eventToFunction": {}, + "length": 1.0, + "lockOrigin": false, + "moments": {"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[],}, + "playback": 1, + "playbackSpeed": 30.0, + "playbackSpeedType": 0, + "showBackdrop": true, + "showBackdropImage": false, + "timeUnits": 1, + "tracks": [ + {"resourceType":"GMSpriteFramesTrack","resourceVersion":"1.0","name":"frames","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[ + {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"8c420298-afa1-4414-ae6e-dcdf955885f3","path":"sprites/spr_icon_apothecarion/spr_icon_apothecarion.yy",},},},"Disabled":false,"id":"2232c4f0-83bb-414e-b240-877fb4da7576","IsCreationKey":false,"Key":0.0,"Length":1.0,"Stretch":false,}, + ],},"modifiers":[],"spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, + ], + "visibleRange": null, + "volume": 1.0, + "xorigin": 0, + "yorigin": 0, + }, + "swatchColours": null, + "swfPrecision": 2.525, + "textureGroupId": { + "name": "Default", + "path": "texturegroups/Default", + }, + "type": 0, + "VTile": false, + "width": 128, +} \ No newline at end of file diff --git a/sprites/spr_icon_ballistic_skill/175bd7b9-849b-46ce-8efe-940114991cfe.png b/sprites/spr_icon_ballistic_skill/175bd7b9-849b-46ce-8efe-940114991cfe.png new file mode 100644 index 0000000000..8943876458 Binary files /dev/null and b/sprites/spr_icon_ballistic_skill/175bd7b9-849b-46ce-8efe-940114991cfe.png differ diff --git a/sprites/spr_icon_ballistic_skill/layers/175bd7b9-849b-46ce-8efe-940114991cfe/b84342ed-e4b9-4815-a4ea-d68382306a0f.png b/sprites/spr_icon_ballistic_skill/layers/175bd7b9-849b-46ce-8efe-940114991cfe/b84342ed-e4b9-4815-a4ea-d68382306a0f.png new file mode 100644 index 0000000000..8943876458 Binary files /dev/null and b/sprites/spr_icon_ballistic_skill/layers/175bd7b9-849b-46ce-8efe-940114991cfe/b84342ed-e4b9-4815-a4ea-d68382306a0f.png differ diff --git a/sprites/spr_icon_ballistic_skill/spr_icon_ballistic_skill.yy b/sprites/spr_icon_ballistic_skill/spr_icon_ballistic_skill.yy new file mode 100644 index 0000000000..c116c9c144 --- /dev/null +++ b/sprites/spr_icon_ballistic_skill/spr_icon_ballistic_skill.yy @@ -0,0 +1,74 @@ +{ + "resourceType": "GMSprite", + "resourceVersion": "1.0", + "name": "spr_icon_ballistic_skill", + "bbox_bottom": 127, + "bbox_left": 0, + "bbox_right": 127, + "bbox_top": 0, + "bboxMode": 0, + "collisionKind": 1, + "collisionTolerance": 0, + "DynamicTexturePage": false, + "edgeFiltering": false, + "For3D": false, + "frames": [ + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"175bd7b9-849b-46ce-8efe-940114991cfe",}, + ], + "gridX": 0, + "gridY": 0, + "height": 128, + "HTile": false, + "layers": [ + {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"b84342ed-e4b9-4815-a4ea-d68382306a0f","blendMode":0,"displayName":"default","isLocked":false,"opacity":100.0,"visible":true,}, + ], + "nineSlice": null, + "origin": 0, + "parent": { + "name": "data_slate_icons", + "path": "folders/Sprites/New UI/data_slate_icons.yy", + }, + "preMultiplyAlpha": false, + "sequence": { + "resourceType": "GMSequence", + "resourceVersion": "1.4", + "name": "spr_icon_ballistic_skill", + "autoRecord": true, + "backdropHeight": 768, + "backdropImageOpacity": 0.5, + "backdropImagePath": "", + "backdropWidth": 1366, + "backdropXOffset": 0.0, + "backdropYOffset": 0.0, + "events": {"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[],}, + "eventStubScript": null, + "eventToFunction": {}, + "length": 1.0, + "lockOrigin": false, + "moments": {"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[],}, + "playback": 1, + "playbackSpeed": 30.0, + "playbackSpeedType": 0, + "showBackdrop": true, + "showBackdropImage": false, + "timeUnits": 1, + "tracks": [ + {"resourceType":"GMSpriteFramesTrack","resourceVersion":"1.0","name":"frames","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[ + {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"175bd7b9-849b-46ce-8efe-940114991cfe","path":"sprites/spr_icon_ballistic_skill/spr_icon_ballistic_skill.yy",},},},"Disabled":false,"id":"79b5a674-3dee-46f0-9590-19df26ad27c5","IsCreationKey":false,"Key":0.0,"Length":1.0,"Stretch":false,}, + ],},"modifiers":[],"spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, + ], + "visibleRange": null, + "volume": 1.0, + "xorigin": 0, + "yorigin": 0, + }, + "swatchColours": null, + "swfPrecision": 2.525, + "textureGroupId": { + "name": "Default", + "path": "texturegroups/Default", + }, + "type": 0, + "VTile": false, + "width": 128, +} \ No newline at end of file diff --git a/sprites/spr_icon_bionics/4847858a-0725-4a81-831e-e621066a51a0.png b/sprites/spr_icon_bionics/4847858a-0725-4a81-831e-e621066a51a0.png new file mode 100644 index 0000000000..bddd20e88e Binary files /dev/null and b/sprites/spr_icon_bionics/4847858a-0725-4a81-831e-e621066a51a0.png differ diff --git a/sprites/spr_icon_bionics/layers/4847858a-0725-4a81-831e-e621066a51a0/b54f1199-11ed-42e0-a11d-e3324888d46f.png b/sprites/spr_icon_bionics/layers/4847858a-0725-4a81-831e-e621066a51a0/b54f1199-11ed-42e0-a11d-e3324888d46f.png new file mode 100644 index 0000000000..bddd20e88e Binary files /dev/null and b/sprites/spr_icon_bionics/layers/4847858a-0725-4a81-831e-e621066a51a0/b54f1199-11ed-42e0-a11d-e3324888d46f.png differ diff --git a/sprites/spr_icon_bionics/spr_icon_bionics.yy b/sprites/spr_icon_bionics/spr_icon_bionics.yy new file mode 100644 index 0000000000..269f10603e --- /dev/null +++ b/sprites/spr_icon_bionics/spr_icon_bionics.yy @@ -0,0 +1,74 @@ +{ + "resourceType": "GMSprite", + "resourceVersion": "1.0", + "name": "spr_icon_bionics", + "bbox_bottom": 123, + "bbox_left": 0, + "bbox_right": 127, + "bbox_top": 3, + "bboxMode": 0, + "collisionKind": 1, + "collisionTolerance": 0, + "DynamicTexturePage": false, + "edgeFiltering": false, + "For3D": false, + "frames": [ + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"4847858a-0725-4a81-831e-e621066a51a0",}, + ], + "gridX": 0, + "gridY": 0, + "height": 128, + "HTile": false, + "layers": [ + {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"b54f1199-11ed-42e0-a11d-e3324888d46f","blendMode":0,"displayName":"default","isLocked":false,"opacity":100.0,"visible":true,}, + ], + "nineSlice": null, + "origin": 0, + "parent": { + "name": "data_slate_icons", + "path": "folders/Sprites/New UI/data_slate_icons.yy", + }, + "preMultiplyAlpha": false, + "sequence": { + "resourceType": "GMSequence", + "resourceVersion": "1.4", + "name": "spr_icon_bionics", + "autoRecord": true, + "backdropHeight": 768, + "backdropImageOpacity": 0.5, + "backdropImagePath": "", + "backdropWidth": 1366, + "backdropXOffset": 0.0, + "backdropYOffset": 0.0, + "events": {"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[],}, + "eventStubScript": null, + "eventToFunction": {}, + "length": 1.0, + "lockOrigin": false, + "moments": {"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[],}, + "playback": 1, + "playbackSpeed": 30.0, + "playbackSpeedType": 0, + "showBackdrop": true, + "showBackdropImage": false, + "timeUnits": 1, + "tracks": [ + {"resourceType":"GMSpriteFramesTrack","resourceVersion":"1.0","name":"frames","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[ + {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"4847858a-0725-4a81-831e-e621066a51a0","path":"sprites/spr_icon_bionics/spr_icon_bionics.yy",},},},"Disabled":false,"id":"bba9627e-71ba-49db-a8bb-02863d834290","IsCreationKey":false,"Key":0.0,"Length":1.0,"Stretch":false,}, + ],},"modifiers":[],"spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, + ], + "visibleRange": null, + "volume": 1.0, + "xorigin": 0, + "yorigin": 0, + }, + "swatchColours": null, + "swfPrecision": 2.525, + "textureGroupId": { + "name": "Default", + "path": "texturegroups/Default", + }, + "type": 0, + "VTile": false, + "width": 128, +} \ No newline at end of file diff --git a/sprites/spr_icon_health/bc87ff96-289a-4158-8d2e-07149fb4a405.png b/sprites/spr_icon_health/bc87ff96-289a-4158-8d2e-07149fb4a405.png new file mode 100644 index 0000000000..e6c0f84870 Binary files /dev/null and b/sprites/spr_icon_health/bc87ff96-289a-4158-8d2e-07149fb4a405.png differ diff --git a/sprites/spr_icon_health/layers/bc87ff96-289a-4158-8d2e-07149fb4a405/2434f318-8665-42bd-830c-d45bbc4370ac.png b/sprites/spr_icon_health/layers/bc87ff96-289a-4158-8d2e-07149fb4a405/2434f318-8665-42bd-830c-d45bbc4370ac.png new file mode 100644 index 0000000000..e6c0f84870 Binary files /dev/null and b/sprites/spr_icon_health/layers/bc87ff96-289a-4158-8d2e-07149fb4a405/2434f318-8665-42bd-830c-d45bbc4370ac.png differ diff --git a/sprites/spr_icon_health/spr_icon_health.yy b/sprites/spr_icon_health/spr_icon_health.yy new file mode 100644 index 0000000000..2dc11c57bb --- /dev/null +++ b/sprites/spr_icon_health/spr_icon_health.yy @@ -0,0 +1,74 @@ +{ + "resourceType": "GMSprite", + "resourceVersion": "1.0", + "name": "spr_icon_health", + "bbox_bottom": 121, + "bbox_left": 6, + "bbox_right": 121, + "bbox_top": 6, + "bboxMode": 0, + "collisionKind": 1, + "collisionTolerance": 0, + "DynamicTexturePage": false, + "edgeFiltering": false, + "For3D": false, + "frames": [ + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"bc87ff96-289a-4158-8d2e-07149fb4a405",}, + ], + "gridX": 0, + "gridY": 0, + "height": 128, + "HTile": false, + "layers": [ + {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"2434f318-8665-42bd-830c-d45bbc4370ac","blendMode":0,"displayName":"default","isLocked":false,"opacity":100.0,"visible":true,}, + ], + "nineSlice": null, + "origin": 0, + "parent": { + "name": "data_slate_icons", + "path": "folders/Sprites/New UI/data_slate_icons.yy", + }, + "preMultiplyAlpha": false, + "sequence": { + "resourceType": "GMSequence", + "resourceVersion": "1.4", + "name": "spr_icon_health", + "autoRecord": true, + "backdropHeight": 768, + "backdropImageOpacity": 0.5, + "backdropImagePath": "", + "backdropWidth": 1366, + "backdropXOffset": 0.0, + "backdropYOffset": 0.0, + "events": {"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[],}, + "eventStubScript": null, + "eventToFunction": {}, + "length": 1.0, + "lockOrigin": false, + "moments": {"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[],}, + "playback": 1, + "playbackSpeed": 30.0, + "playbackSpeedType": 0, + "showBackdrop": true, + "showBackdropImage": false, + "timeUnits": 1, + "tracks": [ + {"resourceType":"GMSpriteFramesTrack","resourceVersion":"1.0","name":"frames","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[ + {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"bc87ff96-289a-4158-8d2e-07149fb4a405","path":"sprites/spr_icon_health/spr_icon_health.yy",},},},"Disabled":false,"id":"f2bd0248-1537-4bfe-8c66-33384bd00df6","IsCreationKey":false,"Key":0.0,"Length":1.0,"Stretch":false,}, + ],},"modifiers":[],"spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, + ], + "visibleRange": null, + "volume": 1.0, + "xorigin": 0, + "yorigin": 0, + }, + "swatchColours": null, + "swfPrecision": 2.525, + "textureGroupId": { + "name": "Default", + "path": "texturegroups/Default", + }, + "type": 0, + "VTile": false, + "width": 128, +} \ No newline at end of file diff --git a/sprites/spr_icon_iron_halo/45765e6b-00d8-4316-988d-daca2372308f.png b/sprites/spr_icon_iron_halo/45765e6b-00d8-4316-988d-daca2372308f.png new file mode 100644 index 0000000000..cf5bc009d0 Binary files /dev/null and b/sprites/spr_icon_iron_halo/45765e6b-00d8-4316-988d-daca2372308f.png differ diff --git a/sprites/spr_icon_iron_halo/layers/45765e6b-00d8-4316-988d-daca2372308f/a161c2c2-a9c9-4ede-8f5f-94a9302a567e.png b/sprites/spr_icon_iron_halo/layers/45765e6b-00d8-4316-988d-daca2372308f/a161c2c2-a9c9-4ede-8f5f-94a9302a567e.png new file mode 100644 index 0000000000..cf5bc009d0 Binary files /dev/null and b/sprites/spr_icon_iron_halo/layers/45765e6b-00d8-4316-988d-daca2372308f/a161c2c2-a9c9-4ede-8f5f-94a9302a567e.png differ diff --git a/sprites/spr_icon_iron_halo/spr_icon_iron_halo.yy b/sprites/spr_icon_iron_halo/spr_icon_iron_halo.yy new file mode 100644 index 0000000000..4f79498b30 --- /dev/null +++ b/sprites/spr_icon_iron_halo/spr_icon_iron_halo.yy @@ -0,0 +1,74 @@ +{ + "resourceType": "GMSprite", + "resourceVersion": "1.0", + "name": "spr_icon_iron_halo", + "bbox_bottom": 127, + "bbox_left": 0, + "bbox_right": 127, + "bbox_top": 0, + "bboxMode": 0, + "collisionKind": 1, + "collisionTolerance": 0, + "DynamicTexturePage": false, + "edgeFiltering": false, + "For3D": false, + "frames": [ + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"45765e6b-00d8-4316-988d-daca2372308f",}, + ], + "gridX": 0, + "gridY": 0, + "height": 128, + "HTile": false, + "layers": [ + {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"a161c2c2-a9c9-4ede-8f5f-94a9302a567e","blendMode":0,"displayName":"default","isLocked":false,"opacity":100.0,"visible":true,}, + ], + "nineSlice": null, + "origin": 0, + "parent": { + "name": "data_slate_icons", + "path": "folders/Sprites/New UI/data_slate_icons.yy", + }, + "preMultiplyAlpha": false, + "sequence": { + "resourceType": "GMSequence", + "resourceVersion": "1.4", + "name": "spr_icon_iron_halo", + "autoRecord": true, + "backdropHeight": 768, + "backdropImageOpacity": 0.5, + "backdropImagePath": "", + "backdropWidth": 1366, + "backdropXOffset": 0.0, + "backdropYOffset": 0.0, + "events": {"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[],}, + "eventStubScript": null, + "eventToFunction": {}, + "length": 1.0, + "lockOrigin": false, + "moments": {"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[],}, + "playback": 1, + "playbackSpeed": 30.0, + "playbackSpeedType": 0, + "showBackdrop": true, + "showBackdropImage": false, + "timeUnits": 1, + "tracks": [ + {"resourceType":"GMSpriteFramesTrack","resourceVersion":"1.0","name":"frames","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[ + {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"45765e6b-00d8-4316-988d-daca2372308f","path":"sprites/spr_icon_iron_halo/spr_icon_iron_halo.yy",},},},"Disabled":false,"id":"9993fbbb-7bcd-43e9-b367-1c5b57522dab","IsCreationKey":false,"Key":0.0,"Length":1.0,"Stretch":false,}, + ],},"modifiers":[],"spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, + ], + "visibleRange": null, + "volume": 1.0, + "xorigin": 0, + "yorigin": 0, + }, + "swatchColours": null, + "swfPrecision": 2.525, + "textureGroupId": { + "name": "Default", + "path": "texturegroups/Default", + }, + "type": 0, + "VTile": false, + "width": 128, +} \ No newline at end of file diff --git a/sprites/spr_icon_iron_hands/87ee8039-2984-40e8-bacb-57ff8740fd19.png b/sprites/spr_icon_iron_hands/87ee8039-2984-40e8-bacb-57ff8740fd19.png new file mode 100644 index 0000000000..e5769c721c Binary files /dev/null and b/sprites/spr_icon_iron_hands/87ee8039-2984-40e8-bacb-57ff8740fd19.png differ diff --git a/sprites/spr_icon_iron_hands/layers/87ee8039-2984-40e8-bacb-57ff8740fd19/265c6011-729b-4dcc-85ef-eadf37c2db48.png b/sprites/spr_icon_iron_hands/layers/87ee8039-2984-40e8-bacb-57ff8740fd19/265c6011-729b-4dcc-85ef-eadf37c2db48.png new file mode 100644 index 0000000000..e5769c721c Binary files /dev/null and b/sprites/spr_icon_iron_hands/layers/87ee8039-2984-40e8-bacb-57ff8740fd19/265c6011-729b-4dcc-85ef-eadf37c2db48.png differ diff --git a/sprites/spr_unit_card_icons/spr_unit_card_icons.yy b/sprites/spr_icon_iron_hands/spr_icon_iron_hands.yy similarity index 76% rename from sprites/spr_unit_card_icons/spr_unit_card_icons.yy rename to sprites/spr_icon_iron_hands/spr_icon_iron_hands.yy index 6c66b41ed2..9f0ec0e4e9 100644 --- a/sprites/spr_unit_card_icons/spr_unit_card_icons.yy +++ b/sprites/spr_icon_iron_hands/spr_icon_iron_hands.yy @@ -1,11 +1,11 @@ { "resourceType": "GMSprite", "resourceVersion": "1.0", - "name": "spr_unit_card_icons", - "bbox_bottom": 162, - "bbox_left": 15, - "bbox_right": 124, - "bbox_top": 44, + "name": "spr_icon_iron_hands", + "bbox_bottom": 127, + "bbox_left": 27, + "bbox_right": 99, + "bbox_top": 0, "bboxMode": 0, "collisionKind": 1, "collisionTolerance": 0, @@ -13,26 +13,26 @@ "edgeFiltering": false, "For3D": false, "frames": [ - {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"43e88041-0bdc-4640-969f-8072a760ffb8",}, + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"87ee8039-2984-40e8-bacb-57ff8740fd19",}, ], "gridX": 0, "gridY": 0, - "height": 167, + "height": 128, "HTile": false, "layers": [ - {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"6678ebe2-e37c-439c-978e-072e4d89fc24","blendMode":0,"displayName":"default","isLocked":false,"opacity":100.0,"visible":true,}, + {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"265c6011-729b-4dcc-85ef-eadf37c2db48","blendMode":0,"displayName":"default","isLocked":false,"opacity":100.0,"visible":true,}, ], "nineSlice": null, "origin": 0, "parent": { - "name": "Menu and Load", - "path": "folders/Sprites/New UI/Menu and Load.yy", + "name": "data_slate_icons", + "path": "folders/Sprites/New UI/data_slate_icons.yy", }, "preMultiplyAlpha": false, "sequence": { "resourceType": "GMSequence", "resourceVersion": "1.4", - "name": "spr_unit_card_icons", + "name": "spr_icon_iron_hands", "autoRecord": true, "backdropHeight": 768, "backdropImageOpacity": 0.5, @@ -54,7 +54,7 @@ "timeUnits": 1, "tracks": [ {"resourceType":"GMSpriteFramesTrack","resourceVersion":"1.0","name":"frames","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[ - {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"43e88041-0bdc-4640-969f-8072a760ffb8","path":"sprites/spr_unit_card_icons/spr_unit_card_icons.yy",},},},"Disabled":false,"id":"da1b7991-b1ea-473c-ab79-2afdf9c5df6b","IsCreationKey":false,"Key":0.0,"Length":1.0,"Stretch":false,}, + {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"87ee8039-2984-40e8-bacb-57ff8740fd19","path":"sprites/spr_icon_iron_hands/spr_icon_iron_hands.yy",},},},"Disabled":false,"id":"6c18301a-894e-4feb-942f-4e8cdbc700f4","IsCreationKey":false,"Key":0.0,"Length":1.0,"Stretch":false,}, ],},"modifiers":[],"spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange": null, @@ -70,5 +70,5 @@ }, "type": 0, "VTile": false, - "width": 166, + "width": 128, } \ No newline at end of file diff --git a/sprites/spr_icon_iron_hands2/3c24869b-4466-4bfe-9253-6ac5b898f203.png b/sprites/spr_icon_iron_hands2/3c24869b-4466-4bfe-9253-6ac5b898f203.png new file mode 100644 index 0000000000..ac99c7316f Binary files /dev/null and b/sprites/spr_icon_iron_hands2/3c24869b-4466-4bfe-9253-6ac5b898f203.png differ diff --git a/sprites/spr_icon_iron_hands2/layers/3c24869b-4466-4bfe-9253-6ac5b898f203/eede1a08-4335-4623-b60d-88b668ba055f.png b/sprites/spr_icon_iron_hands2/layers/3c24869b-4466-4bfe-9253-6ac5b898f203/eede1a08-4335-4623-b60d-88b668ba055f.png new file mode 100644 index 0000000000..ac99c7316f Binary files /dev/null and b/sprites/spr_icon_iron_hands2/layers/3c24869b-4466-4bfe-9253-6ac5b898f203/eede1a08-4335-4623-b60d-88b668ba055f.png differ diff --git a/sprites/spr_icon_iron_hands2/spr_icon_iron_hands2.yy b/sprites/spr_icon_iron_hands2/spr_icon_iron_hands2.yy new file mode 100644 index 0000000000..e75081327c --- /dev/null +++ b/sprites/spr_icon_iron_hands2/spr_icon_iron_hands2.yy @@ -0,0 +1,74 @@ +{ + "resourceType": "GMSprite", + "resourceVersion": "1.0", + "name": "spr_icon_iron_hands2", + "bbox_bottom": 127, + "bbox_left": 3, + "bbox_right": 123, + "bbox_top": 0, + "bboxMode": 0, + "collisionKind": 1, + "collisionTolerance": 0, + "DynamicTexturePage": false, + "edgeFiltering": false, + "For3D": false, + "frames": [ + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"3c24869b-4466-4bfe-9253-6ac5b898f203",}, + ], + "gridX": 0, + "gridY": 0, + "height": 128, + "HTile": false, + "layers": [ + {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"eede1a08-4335-4623-b60d-88b668ba055f","blendMode":0,"displayName":"default","isLocked":false,"opacity":100.0,"visible":true,}, + ], + "nineSlice": null, + "origin": 0, + "parent": { + "name": "data_slate_icons", + "path": "folders/Sprites/New UI/data_slate_icons.yy", + }, + "preMultiplyAlpha": false, + "sequence": { + "resourceType": "GMSequence", + "resourceVersion": "1.4", + "name": "spr_icon_iron_hands2", + "autoRecord": true, + "backdropHeight": 768, + "backdropImageOpacity": 0.5, + "backdropImagePath": "", + "backdropWidth": 1366, + "backdropXOffset": 0.0, + "backdropYOffset": 0.0, + "events": {"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[],}, + "eventStubScript": null, + "eventToFunction": {}, + "length": 1.0, + "lockOrigin": false, + "moments": {"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[],}, + "playback": 1, + "playbackSpeed": 30.0, + "playbackSpeedType": 0, + "showBackdrop": true, + "showBackdropImage": false, + "timeUnits": 1, + "tracks": [ + {"resourceType":"GMSpriteFramesTrack","resourceVersion":"1.0","name":"frames","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[ + {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"3c24869b-4466-4bfe-9253-6ac5b898f203","path":"sprites/spr_icon_iron_hands2/spr_icon_iron_hands2.yy",},},},"Disabled":false,"id":"3f40cabf-70e1-4e42-8746-6d9dd7255888","IsCreationKey":false,"Key":0.0,"Length":1.0,"Stretch":false,}, + ],},"modifiers":[],"spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, + ], + "visibleRange": null, + "volume": 1.0, + "xorigin": 0, + "yorigin": 0, + }, + "swatchColours": null, + "swfPrecision": 2.525, + "textureGroupId": { + "name": "Default", + "path": "texturegroups/Default", + }, + "type": 0, + "VTile": false, + "width": 128, +} \ No newline at end of file diff --git a/sprites/spr_icon_iron_hands3/372c9370-897b-4991-9628-fd531cc75d05.png b/sprites/spr_icon_iron_hands3/372c9370-897b-4991-9628-fd531cc75d05.png new file mode 100644 index 0000000000..40cab9f52a Binary files /dev/null and b/sprites/spr_icon_iron_hands3/372c9370-897b-4991-9628-fd531cc75d05.png differ diff --git a/sprites/spr_icon_iron_hands3/layers/372c9370-897b-4991-9628-fd531cc75d05/d81fa2cd-57e7-4d08-99be-47ebefaae61f.png b/sprites/spr_icon_iron_hands3/layers/372c9370-897b-4991-9628-fd531cc75d05/d81fa2cd-57e7-4d08-99be-47ebefaae61f.png new file mode 100644 index 0000000000..2962067a0d Binary files /dev/null and b/sprites/spr_icon_iron_hands3/layers/372c9370-897b-4991-9628-fd531cc75d05/d81fa2cd-57e7-4d08-99be-47ebefaae61f.png differ diff --git a/sprites/spr_icon_iron_hands3/spr_icon_iron_hands3.yy b/sprites/spr_icon_iron_hands3/spr_icon_iron_hands3.yy new file mode 100644 index 0000000000..3c5ea572da --- /dev/null +++ b/sprites/spr_icon_iron_hands3/spr_icon_iron_hands3.yy @@ -0,0 +1,74 @@ +{ + "resourceType": "GMSprite", + "resourceVersion": "1.0", + "name": "spr_icon_iron_hands3", + "bbox_bottom": 127, + "bbox_left": 0, + "bbox_right": 127, + "bbox_top": 0, + "bboxMode": 0, + "collisionKind": 1, + "collisionTolerance": 0, + "DynamicTexturePage": false, + "edgeFiltering": false, + "For3D": false, + "frames": [ + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"372c9370-897b-4991-9628-fd531cc75d05",}, + ], + "gridX": 0, + "gridY": 0, + "height": 128, + "HTile": false, + "layers": [ + {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"d81fa2cd-57e7-4d08-99be-47ebefaae61f","blendMode":0,"displayName":"default","isLocked":false,"opacity":100.0,"visible":true,}, + ], + "nineSlice": null, + "origin": 0, + "parent": { + "name": "data_slate_icons", + "path": "folders/Sprites/New UI/data_slate_icons.yy", + }, + "preMultiplyAlpha": false, + "sequence": { + "resourceType": "GMSequence", + "resourceVersion": "1.4", + "name": "spr_icon_iron_hands3", + "autoRecord": true, + "backdropHeight": 768, + "backdropImageOpacity": 0.5, + "backdropImagePath": "", + "backdropWidth": 1366, + "backdropXOffset": 0.0, + "backdropYOffset": 0.0, + "events": {"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[],}, + "eventStubScript": null, + "eventToFunction": {}, + "length": 1.0, + "lockOrigin": false, + "moments": {"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[],}, + "playback": 1, + "playbackSpeed": 30.0, + "playbackSpeedType": 0, + "showBackdrop": true, + "showBackdropImage": false, + "timeUnits": 1, + "tracks": [ + {"resourceType":"GMSpriteFramesTrack","resourceVersion":"1.0","name":"frames","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[ + {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"372c9370-897b-4991-9628-fd531cc75d05","path":"sprites/spr_icon_iron_hands3/spr_icon_iron_hands3.yy",},},},"Disabled":false,"id":"39bf6dba-f4a6-490b-ba05-cf47f615a5f5","IsCreationKey":false,"Key":0.0,"Length":1.0,"Stretch":false,}, + ],},"modifiers":[],"spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, + ], + "visibleRange": null, + "volume": 1.0, + "xorigin": 0, + "yorigin": 0, + }, + "swatchColours": null, + "swfPrecision": 2.525, + "textureGroupId": { + "name": "Default", + "path": "texturegroups/Default", + }, + "type": 0, + "VTile": false, + "width": 128, +} \ No newline at end of file diff --git a/sprites/spr_icon_librarius/ec084bd7-b124-4b5f-b9e2-ba4a50309829.png b/sprites/spr_icon_librarius/ec084bd7-b124-4b5f-b9e2-ba4a50309829.png new file mode 100644 index 0000000000..caa2fcea5f Binary files /dev/null and b/sprites/spr_icon_librarius/ec084bd7-b124-4b5f-b9e2-ba4a50309829.png differ diff --git a/sprites/spr_icon_librarius/layers/ec084bd7-b124-4b5f-b9e2-ba4a50309829/3d58b50a-bbbf-489a-b1fc-3a67dd7e6559.png b/sprites/spr_icon_librarius/layers/ec084bd7-b124-4b5f-b9e2-ba4a50309829/3d58b50a-bbbf-489a-b1fc-3a67dd7e6559.png new file mode 100644 index 0000000000..caa2fcea5f Binary files /dev/null and b/sprites/spr_icon_librarius/layers/ec084bd7-b124-4b5f-b9e2-ba4a50309829/3d58b50a-bbbf-489a-b1fc-3a67dd7e6559.png differ diff --git a/sprites/spr_icon_librarius/spr_icon_librarius.yy b/sprites/spr_icon_librarius/spr_icon_librarius.yy new file mode 100644 index 0000000000..a8c9767a9e --- /dev/null +++ b/sprites/spr_icon_librarius/spr_icon_librarius.yy @@ -0,0 +1,74 @@ +{ + "resourceType": "GMSprite", + "resourceVersion": "1.0", + "name": "spr_icon_librarius", + "bbox_bottom": 110, + "bbox_left": 0, + "bbox_right": 127, + "bbox_top": 16, + "bboxMode": 0, + "collisionKind": 1, + "collisionTolerance": 0, + "DynamicTexturePage": false, + "edgeFiltering": false, + "For3D": false, + "frames": [ + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"ec084bd7-b124-4b5f-b9e2-ba4a50309829",}, + ], + "gridX": 0, + "gridY": 0, + "height": 128, + "HTile": false, + "layers": [ + {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"3d58b50a-bbbf-489a-b1fc-3a67dd7e6559","blendMode":0,"displayName":"default","isLocked":false,"opacity":100.0,"visible":true,}, + ], + "nineSlice": null, + "origin": 0, + "parent": { + "name": "data_slate_icons", + "path": "folders/Sprites/New UI/data_slate_icons.yy", + }, + "preMultiplyAlpha": false, + "sequence": { + "resourceType": "GMSequence", + "resourceVersion": "1.4", + "name": "spr_icon_librarius", + "autoRecord": true, + "backdropHeight": 768, + "backdropImageOpacity": 0.5, + "backdropImagePath": "", + "backdropWidth": 1366, + "backdropXOffset": 0.0, + "backdropYOffset": 0.0, + "events": {"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[],}, + "eventStubScript": null, + "eventToFunction": {}, + "length": 1.0, + "lockOrigin": false, + "moments": {"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[],}, + "playback": 1, + "playbackSpeed": 30.0, + "playbackSpeedType": 0, + "showBackdrop": true, + "showBackdropImage": false, + "timeUnits": 1, + "tracks": [ + {"resourceType":"GMSpriteFramesTrack","resourceVersion":"1.0","name":"frames","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[ + {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"ec084bd7-b124-4b5f-b9e2-ba4a50309829","path":"sprites/spr_icon_librarius/spr_icon_librarius.yy",},},},"Disabled":false,"id":"b274634c-f2d4-4dfc-9370-f0b342c2cd10","IsCreationKey":false,"Key":0.0,"Length":1.0,"Stretch":false,}, + ],},"modifiers":[],"spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, + ], + "visibleRange": null, + "volume": 1.0, + "xorigin": 0, + "yorigin": 0, + }, + "swatchColours": null, + "swfPrecision": 2.525, + "textureGroupId": { + "name": "Default", + "path": "texturegroups/Default", + }, + "type": 0, + "VTile": false, + "width": 128, +} \ No newline at end of file diff --git a/sprites/spr_icon_psyker/100d817f-b993-4588-bcf6-a6db6c63e96d.png b/sprites/spr_icon_psyker/100d817f-b993-4588-bcf6-a6db6c63e96d.png new file mode 100644 index 0000000000..fb7998cee6 Binary files /dev/null and b/sprites/spr_icon_psyker/100d817f-b993-4588-bcf6-a6db6c63e96d.png differ diff --git a/sprites/spr_icon_psyker/layers/100d817f-b993-4588-bcf6-a6db6c63e96d/e1963d6b-a68c-469f-a026-57adc4accc07.png b/sprites/spr_icon_psyker/layers/100d817f-b993-4588-bcf6-a6db6c63e96d/e1963d6b-a68c-469f-a026-57adc4accc07.png new file mode 100644 index 0000000000..fb7998cee6 Binary files /dev/null and b/sprites/spr_icon_psyker/layers/100d817f-b993-4588-bcf6-a6db6c63e96d/e1963d6b-a68c-469f-a026-57adc4accc07.png differ diff --git a/sprites/spr_icon_psyker/spr_icon_psyker.yy b/sprites/spr_icon_psyker/spr_icon_psyker.yy new file mode 100644 index 0000000000..4033372c52 --- /dev/null +++ b/sprites/spr_icon_psyker/spr_icon_psyker.yy @@ -0,0 +1,74 @@ +{ + "resourceType": "GMSprite", + "resourceVersion": "1.0", + "name": "spr_icon_psyker", + "bbox_bottom": 124, + "bbox_left": 0, + "bbox_right": 127, + "bbox_top": 2, + "bboxMode": 0, + "collisionKind": 1, + "collisionTolerance": 0, + "DynamicTexturePage": false, + "edgeFiltering": false, + "For3D": false, + "frames": [ + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"100d817f-b993-4588-bcf6-a6db6c63e96d",}, + ], + "gridX": 0, + "gridY": 0, + "height": 128, + "HTile": false, + "layers": [ + {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"e1963d6b-a68c-469f-a026-57adc4accc07","blendMode":0,"displayName":"default","isLocked":false,"opacity":100.0,"visible":true,}, + ], + "nineSlice": null, + "origin": 0, + "parent": { + "name": "data_slate_icons", + "path": "folders/Sprites/New UI/data_slate_icons.yy", + }, + "preMultiplyAlpha": false, + "sequence": { + "resourceType": "GMSequence", + "resourceVersion": "1.4", + "name": "spr_icon_psyker", + "autoRecord": true, + "backdropHeight": 768, + "backdropImageOpacity": 0.5, + "backdropImagePath": "", + "backdropWidth": 1366, + "backdropXOffset": 0.0, + "backdropYOffset": 0.0, + "events": {"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[],}, + "eventStubScript": null, + "eventToFunction": {}, + "length": 1.0, + "lockOrigin": false, + "moments": {"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[],}, + "playback": 1, + "playbackSpeed": 30.0, + "playbackSpeedType": 0, + "showBackdrop": true, + "showBackdropImage": false, + "timeUnits": 1, + "tracks": [ + {"resourceType":"GMSpriteFramesTrack","resourceVersion":"1.0","name":"frames","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[ + {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"100d817f-b993-4588-bcf6-a6db6c63e96d","path":"sprites/spr_icon_psyker/spr_icon_psyker.yy",},},},"Disabled":false,"id":"8fb3e588-63d7-49a0-ab99-4bd52fdbb678","IsCreationKey":false,"Key":0.0,"Length":1.0,"Stretch":false,}, + ],},"modifiers":[],"spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, + ], + "visibleRange": null, + "volume": 1.0, + "xorigin": 0, + "yorigin": 0, + }, + "swatchColours": null, + "swfPrecision": 2.525, + "textureGroupId": { + "name": "Default", + "path": "texturegroups/Default", + }, + "type": 0, + "VTile": false, + "width": 128, +} \ No newline at end of file diff --git a/sprites/spr_icon_shield/52d29a79-1164-4e74-a115-73a3753c0552.png b/sprites/spr_icon_shield/52d29a79-1164-4e74-a115-73a3753c0552.png new file mode 100644 index 0000000000..298f75c5c2 Binary files /dev/null and b/sprites/spr_icon_shield/52d29a79-1164-4e74-a115-73a3753c0552.png differ diff --git a/sprites/spr_icon_shield/layers/52d29a79-1164-4e74-a115-73a3753c0552/9aaff82d-a983-409e-bcc5-d66d6352590d.png b/sprites/spr_icon_shield/layers/52d29a79-1164-4e74-a115-73a3753c0552/9aaff82d-a983-409e-bcc5-d66d6352590d.png new file mode 100644 index 0000000000..708dc0de08 Binary files /dev/null and b/sprites/spr_icon_shield/layers/52d29a79-1164-4e74-a115-73a3753c0552/9aaff82d-a983-409e-bcc5-d66d6352590d.png differ diff --git a/sprites/spr_icon_shield/spr_icon_shield.yy b/sprites/spr_icon_shield/spr_icon_shield.yy new file mode 100644 index 0000000000..e3a8f4aa99 --- /dev/null +++ b/sprites/spr_icon_shield/spr_icon_shield.yy @@ -0,0 +1,74 @@ +{ + "resourceType": "GMSprite", + "resourceVersion": "1.0", + "name": "spr_icon_shield", + "bbox_bottom": 119, + "bbox_left": 19, + "bbox_right": 108, + "bbox_top": 9, + "bboxMode": 0, + "collisionKind": 1, + "collisionTolerance": 0, + "DynamicTexturePage": false, + "edgeFiltering": false, + "For3D": false, + "frames": [ + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"52d29a79-1164-4e74-a115-73a3753c0552",}, + ], + "gridX": 0, + "gridY": 0, + "height": 128, + "HTile": false, + "layers": [ + {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"9aaff82d-a983-409e-bcc5-d66d6352590d","blendMode":0,"displayName":"default","isLocked":false,"opacity":100.0,"visible":true,}, + ], + "nineSlice": null, + "origin": 0, + "parent": { + "name": "data_slate_icons", + "path": "folders/Sprites/New UI/data_slate_icons.yy", + }, + "preMultiplyAlpha": false, + "sequence": { + "resourceType": "GMSequence", + "resourceVersion": "1.4", + "name": "spr_icon_shield", + "autoRecord": true, + "backdropHeight": 768, + "backdropImageOpacity": 0.5, + "backdropImagePath": "", + "backdropWidth": 1366, + "backdropXOffset": 0.0, + "backdropYOffset": 0.0, + "events": {"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[],}, + "eventStubScript": null, + "eventToFunction": {}, + "length": 1.0, + "lockOrigin": false, + "moments": {"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[],}, + "playback": 1, + "playbackSpeed": 30.0, + "playbackSpeedType": 0, + "showBackdrop": true, + "showBackdropImage": false, + "timeUnits": 1, + "tracks": [ + {"resourceType":"GMSpriteFramesTrack","resourceVersion":"1.0","name":"frames","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[ + {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"52d29a79-1164-4e74-a115-73a3753c0552","path":"sprites/spr_icon_shield/spr_icon_shield.yy",},},},"Disabled":false,"id":"0e5f8e2e-b061-4eca-86ba-6f413b5c413d","IsCreationKey":false,"Key":0.0,"Length":1.0,"Stretch":false,}, + ],},"modifiers":[],"spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, + ], + "visibleRange": null, + "volume": 1.0, + "xorigin": 0, + "yorigin": 0, + }, + "swatchColours": null, + "swfPrecision": 2.525, + "textureGroupId": { + "name": "Default", + "path": "texturegroups/Default", + }, + "type": 0, + "VTile": false, + "width": 128, +} \ No newline at end of file diff --git a/sprites/spr_icon_shield2/8369f543-dbf8-4595-af8c-2ed911ca4cc4.png b/sprites/spr_icon_shield2/8369f543-dbf8-4595-af8c-2ed911ca4cc4.png new file mode 100644 index 0000000000..1bb1e733d3 Binary files /dev/null and b/sprites/spr_icon_shield2/8369f543-dbf8-4595-af8c-2ed911ca4cc4.png differ diff --git a/sprites/spr_icon_shield2/layers/8369f543-dbf8-4595-af8c-2ed911ca4cc4/39f16c8e-32d3-4a07-9f4c-6dd959e96bba.png b/sprites/spr_icon_shield2/layers/8369f543-dbf8-4595-af8c-2ed911ca4cc4/39f16c8e-32d3-4a07-9f4c-6dd959e96bba.png new file mode 100644 index 0000000000..1bb1e733d3 Binary files /dev/null and b/sprites/spr_icon_shield2/layers/8369f543-dbf8-4595-af8c-2ed911ca4cc4/39f16c8e-32d3-4a07-9f4c-6dd959e96bba.png differ diff --git a/sprites/spr_icon_shield2/spr_icon_shield2.yy b/sprites/spr_icon_shield2/spr_icon_shield2.yy new file mode 100644 index 0000000000..12a232b6d0 --- /dev/null +++ b/sprites/spr_icon_shield2/spr_icon_shield2.yy @@ -0,0 +1,74 @@ +{ + "resourceType": "GMSprite", + "resourceVersion": "1.0", + "name": "spr_icon_shield2", + "bbox_bottom": 124, + "bbox_left": 18, + "bbox_right": 109, + "bbox_top": 3, + "bboxMode": 0, + "collisionKind": 1, + "collisionTolerance": 0, + "DynamicTexturePage": false, + "edgeFiltering": false, + "For3D": false, + "frames": [ + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"8369f543-dbf8-4595-af8c-2ed911ca4cc4",}, + ], + "gridX": 0, + "gridY": 0, + "height": 128, + "HTile": false, + "layers": [ + {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"39f16c8e-32d3-4a07-9f4c-6dd959e96bba","blendMode":0,"displayName":"default","isLocked":false,"opacity":100.0,"visible":true,}, + ], + "nineSlice": null, + "origin": 0, + "parent": { + "name": "data_slate_icons", + "path": "folders/Sprites/New UI/data_slate_icons.yy", + }, + "preMultiplyAlpha": false, + "sequence": { + "resourceType": "GMSequence", + "resourceVersion": "1.4", + "name": "spr_icon_shield2", + "autoRecord": true, + "backdropHeight": 768, + "backdropImageOpacity": 0.5, + "backdropImagePath": "", + "backdropWidth": 1366, + "backdropXOffset": 0.0, + "backdropYOffset": 0.0, + "events": {"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[],}, + "eventStubScript": null, + "eventToFunction": {}, + "length": 1.0, + "lockOrigin": false, + "moments": {"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[],}, + "playback": 1, + "playbackSpeed": 30.0, + "playbackSpeedType": 0, + "showBackdrop": true, + "showBackdropImage": false, + "timeUnits": 1, + "tracks": [ + {"resourceType":"GMSpriteFramesTrack","resourceVersion":"1.0","name":"frames","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[ + {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"8369f543-dbf8-4595-af8c-2ed911ca4cc4","path":"sprites/spr_icon_shield2/spr_icon_shield2.yy",},},},"Disabled":false,"id":"07012a80-3fb0-404b-8bad-c1b776cac4ce","IsCreationKey":false,"Key":0.0,"Length":1.0,"Stretch":false,}, + ],},"modifiers":[],"spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, + ], + "visibleRange": null, + "volume": 1.0, + "xorigin": 0, + "yorigin": 0, + }, + "swatchColours": null, + "swfPrecision": 2.525, + "textureGroupId": { + "name": "Default", + "path": "texturegroups/Default", + }, + "type": 0, + "VTile": false, + "width": 128, +} \ No newline at end of file diff --git a/sprites/spr_icon_telepatica/b216b4d3-4604-4d5e-9507-2a70874b7ffa.png b/sprites/spr_icon_telepatica/b216b4d3-4604-4d5e-9507-2a70874b7ffa.png new file mode 100644 index 0000000000..11cba0131e Binary files /dev/null and b/sprites/spr_icon_telepatica/b216b4d3-4604-4d5e-9507-2a70874b7ffa.png differ diff --git a/sprites/spr_icon_telepatica/layers/b216b4d3-4604-4d5e-9507-2a70874b7ffa/de89b174-35e4-42e8-8199-908541a93240.png b/sprites/spr_icon_telepatica/layers/b216b4d3-4604-4d5e-9507-2a70874b7ffa/de89b174-35e4-42e8-8199-908541a93240.png new file mode 100644 index 0000000000..11cba0131e Binary files /dev/null and b/sprites/spr_icon_telepatica/layers/b216b4d3-4604-4d5e-9507-2a70874b7ffa/de89b174-35e4-42e8-8199-908541a93240.png differ diff --git a/sprites/spr_icon_telepatica/spr_icon_telepatica.yy b/sprites/spr_icon_telepatica/spr_icon_telepatica.yy new file mode 100644 index 0000000000..0e5127cfe7 --- /dev/null +++ b/sprites/spr_icon_telepatica/spr_icon_telepatica.yy @@ -0,0 +1,74 @@ +{ + "resourceType": "GMSprite", + "resourceVersion": "1.0", + "name": "spr_icon_telepatica", + "bbox_bottom": 122, + "bbox_left": 29, + "bbox_right": 98, + "bbox_top": 5, + "bboxMode": 0, + "collisionKind": 1, + "collisionTolerance": 0, + "DynamicTexturePage": false, + "edgeFiltering": false, + "For3D": false, + "frames": [ + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"b216b4d3-4604-4d5e-9507-2a70874b7ffa",}, + ], + "gridX": 0, + "gridY": 0, + "height": 128, + "HTile": false, + "layers": [ + {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"de89b174-35e4-42e8-8199-908541a93240","blendMode":0,"displayName":"default","isLocked":false,"opacity":100.0,"visible":true,}, + ], + "nineSlice": null, + "origin": 0, + "parent": { + "name": "data_slate_icons", + "path": "folders/Sprites/New UI/data_slate_icons.yy", + }, + "preMultiplyAlpha": false, + "sequence": { + "resourceType": "GMSequence", + "resourceVersion": "1.4", + "name": "spr_icon_telepatica", + "autoRecord": true, + "backdropHeight": 768, + "backdropImageOpacity": 0.5, + "backdropImagePath": "", + "backdropWidth": 1366, + "backdropXOffset": 0.0, + "backdropYOffset": 0.0, + "events": {"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[],}, + "eventStubScript": null, + "eventToFunction": {}, + "length": 1.0, + "lockOrigin": false, + "moments": {"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[],}, + "playback": 1, + "playbackSpeed": 30.0, + "playbackSpeedType": 0, + "showBackdrop": true, + "showBackdropImage": false, + "timeUnits": 1, + "tracks": [ + {"resourceType":"GMSpriteFramesTrack","resourceVersion":"1.0","name":"frames","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[ + {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"b216b4d3-4604-4d5e-9507-2a70874b7ffa","path":"sprites/spr_icon_telepatica/spr_icon_telepatica.yy",},},},"Disabled":false,"id":"19274f90-7f8d-4764-9066-671a72532c31","IsCreationKey":false,"Key":0.0,"Length":1.0,"Stretch":false,}, + ],},"modifiers":[],"spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, + ], + "visibleRange": null, + "volume": 1.0, + "xorigin": 0, + "yorigin": 0, + }, + "swatchColours": null, + "swfPrecision": 2.525, + "textureGroupId": { + "name": "Default", + "path": "texturegroups/Default", + }, + "type": 0, + "VTile": false, + "width": 128, +} \ No newline at end of file diff --git a/sprites/spr_icon_telepatica2/38c9167a-ee5a-4729-8a71-6963ab98a018.png b/sprites/spr_icon_telepatica2/38c9167a-ee5a-4729-8a71-6963ab98a018.png new file mode 100644 index 0000000000..c09c24c9e4 Binary files /dev/null and b/sprites/spr_icon_telepatica2/38c9167a-ee5a-4729-8a71-6963ab98a018.png differ diff --git a/sprites/spr_icon_telepatica2/layers/38c9167a-ee5a-4729-8a71-6963ab98a018/968ae293-815f-480b-a2dd-8b9b39807d11.png b/sprites/spr_icon_telepatica2/layers/38c9167a-ee5a-4729-8a71-6963ab98a018/968ae293-815f-480b-a2dd-8b9b39807d11.png new file mode 100644 index 0000000000..c09c24c9e4 Binary files /dev/null and b/sprites/spr_icon_telepatica2/layers/38c9167a-ee5a-4729-8a71-6963ab98a018/968ae293-815f-480b-a2dd-8b9b39807d11.png differ diff --git a/sprites/spr_icon_telepatica2/spr_icon_telepatica2.yy b/sprites/spr_icon_telepatica2/spr_icon_telepatica2.yy new file mode 100644 index 0000000000..78d3c538a2 --- /dev/null +++ b/sprites/spr_icon_telepatica2/spr_icon_telepatica2.yy @@ -0,0 +1,74 @@ +{ + "resourceType": "GMSprite", + "resourceVersion": "1.0", + "name": "spr_icon_telepatica2", + "bbox_bottom": 126, + "bbox_left": 19, + "bbox_right": 108, + "bbox_top": 0, + "bboxMode": 0, + "collisionKind": 1, + "collisionTolerance": 0, + "DynamicTexturePage": false, + "edgeFiltering": false, + "For3D": false, + "frames": [ + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"38c9167a-ee5a-4729-8a71-6963ab98a018",}, + ], + "gridX": 0, + "gridY": 0, + "height": 128, + "HTile": false, + "layers": [ + {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"968ae293-815f-480b-a2dd-8b9b39807d11","blendMode":0,"displayName":"default","isLocked":false,"opacity":100.0,"visible":true,}, + ], + "nineSlice": null, + "origin": 0, + "parent": { + "name": "data_slate_icons", + "path": "folders/Sprites/New UI/data_slate_icons.yy", + }, + "preMultiplyAlpha": false, + "sequence": { + "resourceType": "GMSequence", + "resourceVersion": "1.4", + "name": "spr_icon_telepatica2", + "autoRecord": true, + "backdropHeight": 768, + "backdropImageOpacity": 0.5, + "backdropImagePath": "", + "backdropWidth": 1366, + "backdropXOffset": 0.0, + "backdropYOffset": 0.0, + "events": {"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[],}, + "eventStubScript": null, + "eventToFunction": {}, + "length": 1.0, + "lockOrigin": false, + "moments": {"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[],}, + "playback": 1, + "playbackSpeed": 30.0, + "playbackSpeedType": 0, + "showBackdrop": true, + "showBackdropImage": false, + "timeUnits": 1, + "tracks": [ + {"resourceType":"GMSpriteFramesTrack","resourceVersion":"1.0","name":"frames","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[ + {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"38c9167a-ee5a-4729-8a71-6963ab98a018","path":"sprites/spr_icon_telepatica2/spr_icon_telepatica2.yy",},},},"Disabled":false,"id":"fdc039bc-8374-4edc-83dd-446e17ebb408","IsCreationKey":false,"Key":0.0,"Length":1.0,"Stretch":false,}, + ],},"modifiers":[],"spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, + ], + "visibleRange": null, + "volume": 1.0, + "xorigin": 0, + "yorigin": 0, + }, + "swatchColours": null, + "swfPrecision": 2.525, + "textureGroupId": { + "name": "Default", + "path": "texturegroups/Default", + }, + "type": 0, + "VTile": false, + "width": 128, +} \ No newline at end of file diff --git a/sprites/spr_icon_veteran/6d818433-1ab6-4818-aee1-badbac0b7712.png b/sprites/spr_icon_veteran/6d818433-1ab6-4818-aee1-badbac0b7712.png new file mode 100644 index 0000000000..2aa37e205d Binary files /dev/null and b/sprites/spr_icon_veteran/6d818433-1ab6-4818-aee1-badbac0b7712.png differ diff --git a/sprites/spr_icon_veteran/layers/6d818433-1ab6-4818-aee1-badbac0b7712/d779bd7a-2b63-48fd-958c-bde4e8d187b7.png b/sprites/spr_icon_veteran/layers/6d818433-1ab6-4818-aee1-badbac0b7712/d779bd7a-2b63-48fd-958c-bde4e8d187b7.png new file mode 100644 index 0000000000..b42199ba4c Binary files /dev/null and b/sprites/spr_icon_veteran/layers/6d818433-1ab6-4818-aee1-badbac0b7712/d779bd7a-2b63-48fd-958c-bde4e8d187b7.png differ diff --git a/sprites/spr_icon_veteran/spr_icon_veteran.yy b/sprites/spr_icon_veteran/spr_icon_veteran.yy new file mode 100644 index 0000000000..82e51c68e6 --- /dev/null +++ b/sprites/spr_icon_veteran/spr_icon_veteran.yy @@ -0,0 +1,74 @@ +{ + "resourceType": "GMSprite", + "resourceVersion": "1.0", + "name": "spr_icon_veteran", + "bbox_bottom": 113, + "bbox_left": 14, + "bbox_right": 113, + "bbox_top": 14, + "bboxMode": 0, + "collisionKind": 1, + "collisionTolerance": 0, + "DynamicTexturePage": false, + "edgeFiltering": false, + "For3D": false, + "frames": [ + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"6d818433-1ab6-4818-aee1-badbac0b7712",}, + ], + "gridX": 0, + "gridY": 0, + "height": 128, + "HTile": false, + "layers": [ + {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"d779bd7a-2b63-48fd-958c-bde4e8d187b7","blendMode":0,"displayName":"default","isLocked":false,"opacity":100.0,"visible":true,}, + ], + "nineSlice": null, + "origin": 0, + "parent": { + "name": "data_slate_icons", + "path": "folders/Sprites/New UI/data_slate_icons.yy", + }, + "preMultiplyAlpha": false, + "sequence": { + "resourceType": "GMSequence", + "resourceVersion": "1.4", + "name": "spr_icon_veteran", + "autoRecord": true, + "backdropHeight": 768, + "backdropImageOpacity": 0.5, + "backdropImagePath": "", + "backdropWidth": 1366, + "backdropXOffset": 0.0, + "backdropYOffset": 0.0, + "events": {"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[],}, + "eventStubScript": null, + "eventToFunction": {}, + "length": 1.0, + "lockOrigin": false, + "moments": {"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[],}, + "playback": 1, + "playbackSpeed": 30.0, + "playbackSpeedType": 0, + "showBackdrop": true, + "showBackdropImage": false, + "timeUnits": 1, + "tracks": [ + {"resourceType":"GMSpriteFramesTrack","resourceVersion":"1.0","name":"frames","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[ + {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"6d818433-1ab6-4818-aee1-badbac0b7712","path":"sprites/spr_icon_veteran/spr_icon_veteran.yy",},},},"Disabled":false,"id":"879e18a1-ac47-4a1f-9231-529f71b21cb0","IsCreationKey":false,"Key":0.0,"Length":1.0,"Stretch":false,}, + ],},"modifiers":[],"spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, + ], + "visibleRange": null, + "volume": 1.0, + "xorigin": 0, + "yorigin": 0, + }, + "swatchColours": null, + "swfPrecision": 2.525, + "textureGroupId": { + "name": "Default", + "path": "texturegroups/Default", + }, + "type": 0, + "VTile": false, + "width": 128, +} \ No newline at end of file diff --git a/sprites/spr_icon_weapon_skill/5507e490-eb5e-4f75-8ab8-b839bdc67871.png b/sprites/spr_icon_weapon_skill/5507e490-eb5e-4f75-8ab8-b839bdc67871.png new file mode 100644 index 0000000000..e1f632b2f5 Binary files /dev/null and b/sprites/spr_icon_weapon_skill/5507e490-eb5e-4f75-8ab8-b839bdc67871.png differ diff --git a/sprites/spr_icon_weapon_skill/layers/5507e490-eb5e-4f75-8ab8-b839bdc67871/0c4a6405-bf43-4356-ab51-9de9651d11f8.png b/sprites/spr_icon_weapon_skill/layers/5507e490-eb5e-4f75-8ab8-b839bdc67871/0c4a6405-bf43-4356-ab51-9de9651d11f8.png new file mode 100644 index 0000000000..e1f632b2f5 Binary files /dev/null and b/sprites/spr_icon_weapon_skill/layers/5507e490-eb5e-4f75-8ab8-b839bdc67871/0c4a6405-bf43-4356-ab51-9de9651d11f8.png differ diff --git a/sprites/spr_icon_weapon_skill/spr_icon_weapon_skill.yy b/sprites/spr_icon_weapon_skill/spr_icon_weapon_skill.yy new file mode 100644 index 0000000000..31a6dc3c05 --- /dev/null +++ b/sprites/spr_icon_weapon_skill/spr_icon_weapon_skill.yy @@ -0,0 +1,74 @@ +{ + "resourceType": "GMSprite", + "resourceVersion": "1.0", + "name": "spr_icon_weapon_skill", + "bbox_bottom": 127, + "bbox_left": 3, + "bbox_right": 124, + "bbox_top": 0, + "bboxMode": 0, + "collisionKind": 1, + "collisionTolerance": 0, + "DynamicTexturePage": false, + "edgeFiltering": false, + "For3D": false, + "frames": [ + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"5507e490-eb5e-4f75-8ab8-b839bdc67871",}, + ], + "gridX": 0, + "gridY": 0, + "height": 128, + "HTile": false, + "layers": [ + {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"0c4a6405-bf43-4356-ab51-9de9651d11f8","blendMode":0,"displayName":"default","isLocked":false,"opacity":100.0,"visible":true,}, + ], + "nineSlice": null, + "origin": 0, + "parent": { + "name": "data_slate_icons", + "path": "folders/Sprites/New UI/data_slate_icons.yy", + }, + "preMultiplyAlpha": false, + "sequence": { + "resourceType": "GMSequence", + "resourceVersion": "1.4", + "name": "spr_icon_weapon_skill", + "autoRecord": true, + "backdropHeight": 768, + "backdropImageOpacity": 0.5, + "backdropImagePath": "", + "backdropWidth": 1366, + "backdropXOffset": 0.0, + "backdropYOffset": 0.0, + "events": {"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[],}, + "eventStubScript": null, + "eventToFunction": {}, + "length": 1.0, + "lockOrigin": false, + "moments": {"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[],}, + "playback": 1, + "playbackSpeed": 30.0, + "playbackSpeedType": 0, + "showBackdrop": true, + "showBackdropImage": false, + "timeUnits": 1, + "tracks": [ + {"resourceType":"GMSpriteFramesTrack","resourceVersion":"1.0","name":"frames","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[ + {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"5507e490-eb5e-4f75-8ab8-b839bdc67871","path":"sprites/spr_icon_weapon_skill/spr_icon_weapon_skill.yy",},},},"Disabled":false,"id":"fa7e868a-9b98-4831-94a0-d4135318d307","IsCreationKey":false,"Key":0.0,"Length":1.0,"Stretch":false,}, + ],},"modifiers":[],"spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, + ], + "visibleRange": null, + "volume": 1.0, + "xorigin": 0, + "yorigin": 0, + }, + "swatchColours": null, + "swfPrecision": 2.525, + "textureGroupId": { + "name": "Default", + "path": "texturegroups/Default", + }, + "type": 0, + "VTile": false, + "width": 128, +} \ No newline at end of file diff --git a/sprites/spr_icon_weight/9221b377-916e-498d-bc28-a2e999f17843.png b/sprites/spr_icon_weight/9221b377-916e-498d-bc28-a2e999f17843.png new file mode 100644 index 0000000000..b67e29abec Binary files /dev/null and b/sprites/spr_icon_weight/9221b377-916e-498d-bc28-a2e999f17843.png differ diff --git a/sprites/spr_icon_weight/layers/9221b377-916e-498d-bc28-a2e999f17843/82bc643c-e334-4d54-bebb-6f62e328db69.png b/sprites/spr_icon_weight/layers/9221b377-916e-498d-bc28-a2e999f17843/82bc643c-e334-4d54-bebb-6f62e328db69.png new file mode 100644 index 0000000000..b67e29abec Binary files /dev/null and b/sprites/spr_icon_weight/layers/9221b377-916e-498d-bc28-a2e999f17843/82bc643c-e334-4d54-bebb-6f62e328db69.png differ diff --git a/sprites/spr_icon_weight/spr_icon_weight.yy b/sprites/spr_icon_weight/spr_icon_weight.yy new file mode 100644 index 0000000000..cf23178f8f --- /dev/null +++ b/sprites/spr_icon_weight/spr_icon_weight.yy @@ -0,0 +1,74 @@ +{ + "resourceType": "GMSprite", + "resourceVersion": "1.0", + "name": "spr_icon_weight", + "bbox_bottom": 112, + "bbox_left": 10, + "bbox_right": 117, + "bbox_top": 15, + "bboxMode": 0, + "collisionKind": 1, + "collisionTolerance": 0, + "DynamicTexturePage": false, + "edgeFiltering": false, + "For3D": false, + "frames": [ + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"9221b377-916e-498d-bc28-a2e999f17843",}, + ], + "gridX": 0, + "gridY": 0, + "height": 128, + "HTile": false, + "layers": [ + {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"82bc643c-e334-4d54-bebb-6f62e328db69","blendMode":0,"displayName":"default","isLocked":false,"opacity":100.0,"visible":true,}, + ], + "nineSlice": null, + "origin": 0, + "parent": { + "name": "data_slate_icons", + "path": "folders/Sprites/New UI/data_slate_icons.yy", + }, + "preMultiplyAlpha": false, + "sequence": { + "resourceType": "GMSequence", + "resourceVersion": "1.4", + "name": "spr_icon_weight", + "autoRecord": true, + "backdropHeight": 768, + "backdropImageOpacity": 0.5, + "backdropImagePath": "", + "backdropWidth": 1366, + "backdropXOffset": 0.0, + "backdropYOffset": 0.0, + "events": {"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[],}, + "eventStubScript": null, + "eventToFunction": {}, + "length": 1.0, + "lockOrigin": false, + "moments": {"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[],}, + "playback": 1, + "playbackSpeed": 30.0, + "playbackSpeedType": 0, + "showBackdrop": true, + "showBackdropImage": false, + "timeUnits": 1, + "tracks": [ + {"resourceType":"GMSpriteFramesTrack","resourceVersion":"1.0","name":"frames","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[ + {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"9221b377-916e-498d-bc28-a2e999f17843","path":"sprites/spr_icon_weight/spr_icon_weight.yy",},},},"Disabled":false,"id":"2a57d19e-374a-48c1-8955-53e45e4020ba","IsCreationKey":false,"Key":0.0,"Length":1.0,"Stretch":false,}, + ],},"modifiers":[],"spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, + ], + "visibleRange": null, + "volume": 1.0, + "xorigin": 0, + "yorigin": 0, + }, + "swatchColours": null, + "swfPrecision": 2.525, + "textureGroupId": { + "name": "Default", + "path": "texturegroups/Default", + }, + "type": 0, + "VTile": false, + "width": 128, +} \ No newline at end of file diff --git a/sprites/spr_icon_wounds/07486fe4-76e6-481f-9ca9-94952463ecb4.png b/sprites/spr_icon_wounds/07486fe4-76e6-481f-9ca9-94952463ecb4.png new file mode 100644 index 0000000000..44e89c56a9 Binary files /dev/null and b/sprites/spr_icon_wounds/07486fe4-76e6-481f-9ca9-94952463ecb4.png differ diff --git a/sprites/spr_icon_wounds/layers/07486fe4-76e6-481f-9ca9-94952463ecb4/bc224ab1-d602-4d6a-ba0d-29771d0c69cd.png b/sprites/spr_icon_wounds/layers/07486fe4-76e6-481f-9ca9-94952463ecb4/bc224ab1-d602-4d6a-ba0d-29771d0c69cd.png new file mode 100644 index 0000000000..44e89c56a9 Binary files /dev/null and b/sprites/spr_icon_wounds/layers/07486fe4-76e6-481f-9ca9-94952463ecb4/bc224ab1-d602-4d6a-ba0d-29771d0c69cd.png differ diff --git a/sprites/spr_icon_wounds/spr_icon_wounds.yy b/sprites/spr_icon_wounds/spr_icon_wounds.yy new file mode 100644 index 0000000000..f3350071f1 --- /dev/null +++ b/sprites/spr_icon_wounds/spr_icon_wounds.yy @@ -0,0 +1,74 @@ +{ + "resourceType": "GMSprite", + "resourceVersion": "1.0", + "name": "spr_icon_wounds", + "bbox_bottom": 112, + "bbox_left": 0, + "bbox_right": 127, + "bbox_top": 15, + "bboxMode": 0, + "collisionKind": 1, + "collisionTolerance": 0, + "DynamicTexturePage": false, + "edgeFiltering": false, + "For3D": false, + "frames": [ + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"07486fe4-76e6-481f-9ca9-94952463ecb4",}, + ], + "gridX": 0, + "gridY": 0, + "height": 128, + "HTile": false, + "layers": [ + {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"bc224ab1-d602-4d6a-ba0d-29771d0c69cd","blendMode":0,"displayName":"default","isLocked":false,"opacity":100.0,"visible":true,}, + ], + "nineSlice": null, + "origin": 0, + "parent": { + "name": "data_slate_icons", + "path": "folders/Sprites/New UI/data_slate_icons.yy", + }, + "preMultiplyAlpha": false, + "sequence": { + "resourceType": "GMSequence", + "resourceVersion": "1.4", + "name": "spr_icon_wounds", + "autoRecord": true, + "backdropHeight": 768, + "backdropImageOpacity": 0.5, + "backdropImagePath": "", + "backdropWidth": 1366, + "backdropXOffset": 0.0, + "backdropYOffset": 0.0, + "events": {"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[],}, + "eventStubScript": null, + "eventToFunction": {}, + "length": 1.0, + "lockOrigin": false, + "moments": {"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[],}, + "playback": 1, + "playbackSpeed": 30.0, + "playbackSpeedType": 0, + "showBackdrop": true, + "showBackdropImage": false, + "timeUnits": 1, + "tracks": [ + {"resourceType":"GMSpriteFramesTrack","resourceVersion":"1.0","name":"frames","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[ + {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"07486fe4-76e6-481f-9ca9-94952463ecb4","path":"sprites/spr_icon_wounds/spr_icon_wounds.yy",},},},"Disabled":false,"id":"7833cd98-7681-4fe5-b5bb-8aeab0dba461","IsCreationKey":false,"Key":0.0,"Length":1.0,"Stretch":false,}, + ],},"modifiers":[],"spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, + ], + "visibleRange": null, + "volume": 1.0, + "xorigin": 0, + "yorigin": 0, + }, + "swatchColours": null, + "swfPrecision": 2.525, + "textureGroupId": { + "name": "Default", + "path": "texturegroups/Default", + }, + "type": 0, + "VTile": false, + "width": 128, +} \ No newline at end of file diff --git a/sprites/spr_unit_card_icons/43e88041-0bdc-4640-969f-8072a760ffb8.png b/sprites/spr_unit_card_icons/43e88041-0bdc-4640-969f-8072a760ffb8.png deleted file mode 100644 index 9d0e73f67f..0000000000 Binary files a/sprites/spr_unit_card_icons/43e88041-0bdc-4640-969f-8072a760ffb8.png and /dev/null differ diff --git a/sprites/spr_unit_card_icons/layers/43e88041-0bdc-4640-969f-8072a760ffb8/6678ebe2-e37c-439c-978e-072e4d89fc24.png b/sprites/spr_unit_card_icons/layers/43e88041-0bdc-4640-969f-8072a760ffb8/6678ebe2-e37c-439c-978e-072e4d89fc24.png deleted file mode 100644 index 9d0e73f67f..0000000000 Binary files a/sprites/spr_unit_card_icons/layers/43e88041-0bdc-4640-969f-8072a760ffb8/6678ebe2-e37c-439c-978e-072e4d89fc24.png and /dev/null differ