Skip to content

Commit

Permalink
feat(sprite): Mk8 components (#356)
Browse files Browse the repository at this point in the history
- add gorget component to mk8 and make some variants
- remove gorget from base mk8 so that more mk7 helms are compatible to
be drawn with mk8
- add mk8 chest components that can extend variation with mk7 chest
components

## Summary by Sourcery

New Features:
- Added new gorget and chest pieces for the Mk 8 armour set.

---------

Co-authored-by: EttyKitty <20323032+EttyKitty@users.noreply.github.com>
  • Loading branch information
OH296 and EttyKitty authored Dec 31, 2024
1 parent 02b60d4 commit 4d1e843
Show file tree
Hide file tree
Showing 44 changed files with 107 additions and 242 deletions.
5 changes: 1 addition & 4 deletions ChapterMaster.yyp
Original file line number Diff line number Diff line change
Expand Up @@ -566,7 +566,6 @@
{"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_loadbar_empty","path":"sprites/spr_loadbar_empty/spr_loadbar_empty.yy",},},
{"id":{"name":"spr_mk8_right_arm","path":"sprites/spr_mk8_right_arm/spr_mk8_right_arm.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",},},
{"id":{"name":"spr_load_text","path":"sprites/spr_load_text/spr_load_text.yy",},},
Expand Down Expand Up @@ -757,7 +756,6 @@
{"id":{"name":"spr_ship_castellan","path":"sprites/spr_ship_castellan/spr_ship_castellan.yy",},},
{"id":{"name":"spr_manta","path":"sprites/spr_manta/spr_manta.yy",},},
{"id":{"name":"spr_ship_leviathan","path":"sprites/spr_ship_leviathan/spr_ship_leviathan.yy",},},
{"id":{"name":"spr_mk8_complex","path":"sprites/spr_mk8_complex/spr_mk8_complex.yy",},},
{"id":{"name":"spr_ship_razorfiend","path":"sprites/spr_ship_razorfiend/spr_ship_razorfiend.yy",},},
{"id":{"name":"spr_mk7_right_arm","path":"sprites/spr_mk7_right_arm/spr_mk7_right_arm.yy",},},
{"id":{"name":"spr_artificer_left_trim","path":"sprites/spr_artificer_left_trim/spr_artificer_left_trim.yy",},},
Expand Down Expand Up @@ -993,7 +991,6 @@
{"id":{"name":"scr_specialist_points","path":"scripts/scr_specialist_points/scr_specialist_points.yy",},},
{"id":{"name":"spr_constitution_icon","path":"sprites/spr_constitution_icon/spr_constitution_icon.yy",},},
{"id":{"name":"scr_battle_sort","path":"scripts/scr_battle_sort/scr_battle_sort.yy",},},
{"id":{"name":"spr_mk8_left_arm","path":"sprites/spr_mk8_left_arm/spr_mk8_left_arm.yy",},},
{"id":{"name":"spr_gear_combat_shield","path":"sprites/spr_gear_combat_shield/spr_gear_combat_shield.yy",},},
{"id":{"name":"spr_um_mk6_helm","path":"sprites/spr_um_mk6_helm/spr_um_mk6_helm.yy",},},
{"id":{"name":"scr_count_forces","path":"scripts/scr_count_forces/scr_count_forces.yy",},},
Expand Down Expand Up @@ -1065,7 +1062,6 @@
{"id":{"name":"spr_dreadnought_chasis_colors","path":"sprites/spr_dreadnought_chasis_colors/spr_dreadnought_chasis_colors.yy",},},
{"id":{"name":"scr_vehicle_count","path":"scripts/scr_vehicle_count/scr_vehicle_count.yy",},},
{"id":{"name":"scr_bionics_count","path":"scripts/scr_bionics_count/scr_bionics_count.yy",},},
{"id":{"name":"spr_mk8_complex_backpack","path":"sprites/spr_mk8_complex_backpack/spr_mk8_complex_backpack.yy",},},
{"id":{"name":"scr_ship_count","path":"scripts/scr_ship_count/scr_ship_count.yy",},},
{"id":{"name":"scr_ship_occupants","path":"scripts/scr_ship_occupants/scr_ship_occupants.yy",},},
{"id":{"name":"spr_leopard_sprite","path":"sprites/spr_leopard_sprite/spr_leopard_sprite.yy",},},
Expand Down Expand Up @@ -1227,6 +1223,7 @@
{"id":{"name":"spr_mk4_complex","path":"sprites/spr_mk4_complex/spr_mk4_complex.yy",},},
{"id":{"name":"obj_fleet_spawner","path":"objects/obj_fleet_spawner/obj_fleet_spawner.yy",},},
{"id":{"name":"spr_tartaros_gorget","path":"sprites/spr_tartaros_gorget/spr_tartaros_gorget.yy",},},
{"id":{"name":"spr_mk8_gorget","path":"sprites/spr_mk8_gorget/spr_mk8_gorget.yy",},},
{"id":{"name":"obj_fleet_controller","path":"objects/obj_fleet_controller/obj_fleet_controller.yy",},},
{"id":{"name":"obj_p_ship","path":"objects/obj_p_ship/obj_p_ship.yy",},},
{"id":{"name":"scr_kill_unit","path":"scripts/scr_kill_unit/scr_kill_unit.yy",},},
Expand Down
18 changes: 11 additions & 7 deletions scripts/scr_draw_unit_image/scr_draw_unit_image.gml
Original file line number Diff line number Diff line change
Expand Up @@ -118,14 +118,18 @@ function get_complex_set(set = eARMOUR_SET.MK7){
});
}else if (set == eARMOUR_SET.MK8){
set_pieces.add_group({
armour : spr_mk8_complex,
backpack : spr_mk8_complex_backpack,
left_arm : spr_mk8_left_arm,
right_arm : spr_mk8_right_arm,
leg_variants : spr_mk7_leg_variants,
armour : spr_mk7_complex,
backpack : spr_mk7_complex_backpack,
left_arm : spr_mk7_left_arm,
right_arm : spr_mk7_right_arm,
left_trim : spr_mk7_left_trim,
right_trim : spr_mk7_right_trim,
});
right_trim : spr_mk7_right_trim,
mouth_variants : spr_mk7_mouth_variants,
thorax_variants : spr_mk7_thorax_variants,
chest_variants : spr_mk7_chest_variants,
leg_variants : spr_mk7_leg_variants,
gorget : spr_mk8_gorget,
});
}else if (set == eARMOUR_SET.Indomitus){
set_pieces.add_group({
armour : spr_indomitus_complex,
Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file not shown.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file not shown.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
6 changes: 4 additions & 2 deletions sprites/spr_mk7_chest_variants/spr_mk7_chest_variants.yy

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
74 changes: 0 additions & 74 deletions sprites/spr_mk8_complex_backpack/spr_mk8_complex_backpack.yy

This file was deleted.

Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
84 changes: 84 additions & 0 deletions sprites/spr_mk8_gorget/spr_mk8_gorget.yy

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Diff not rendered.
Diff not rendered.
Loading

0 comments on commit 4d1e843

Please sign in to comment.