Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: Tartaros face plate and and helm variants #354

Merged
merged 14 commits into from
Dec 29, 2024
Merged
4 changes: 4 additions & 0 deletions ChapterMaster.yyp
Original file line number Diff line number Diff line change
Expand Up @@ -817,6 +817,7 @@
{"id":{"name":"spr_dread_plasma_cannon","path":"sprites/spr_dread_plasma_cannon/spr_dread_plasma_cannon.yy",},},
{"id":{"name":"spr_melta","path":"sprites/spr_melta/spr_melta.yy",},},
{"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_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",},},
Expand Down Expand Up @@ -888,6 +889,7 @@
{"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",},},
{"id":{"name":"spr_mar_walk_body3","path":"sprites/spr_mar_walk_body3/spr_mar_walk_body3.yy",},},
{"id":{"name":"spr_tartaros_faceplate","path":"sprites/spr_tartaros_faceplate/spr_tartaros_faceplate.yy",},},
{"id":{"name":"spr_mar_walk_pauldron1","path":"sprites/spr_mar_walk_pauldron1/spr_mar_walk_pauldron1.yy",},},
{"id":{"name":"spr_mar_walk_pauldron2","path":"sprites/spr_mar_walk_pauldron2/spr_mar_walk_pauldron2.yy",},},
{"id":{"name":"spr_mar_walk_legs1","path":"sprites/spr_mar_walk_legs1/spr_mar_walk_legs1.yy",},},
Expand Down Expand Up @@ -1056,6 +1058,7 @@
{"id":{"name":"spr_chap_area_pad","path":"sprites/spr_chap_area_pad/spr_chap_area_pad.yy",},},
{"id":{"name":"scr_master_loc","path":"scripts/scr_master_loc/scr_master_loc.yy",},},
{"id":{"name":"scr_creation","path":"scripts/scr_creation/scr_creation.yy",},},
{"id":{"name":"spr_tartaros_right_trim","path":"sprites/spr_tartaros_right_trim/spr_tartaros_right_trim.yy",},},
{"id":{"name":"scr_unit_size","path":"scripts/scr_unit_size/scr_unit_size.yy",},},
{"id":{"name":"scr_item_count","path":"scripts/scr_item_count/scr_item_count.yy",},},
{"id":{"name":"scr_marine_count","path":"scripts/scr_marine_count/scr_marine_count.yy",},},
Expand Down Expand Up @@ -1163,6 +1166,7 @@
{"id":{"name":"scr_add_artifact","path":"scripts/scr_add_artifact/scr_add_artifact.yy",},},
{"id":{"name":"scr_add_stc_fragment","path":"scripts/scr_add_stc_fragment/scr_add_stc_fragment.yy",},},
{"id":{"name":"action_another_room","path":"scripts/action_another_room/action_another_room.yy",},},
{"id":{"name":"spr_tartaros_head","path":"sprites/spr_tartaros_head/spr_tartaros_head.yy",},},
{"id":{"name":"action_color","path":"scripts/action_color/action_color.yy",},},
{"id":{"name":"action_draw_ellipse","path":"scripts/action_draw_ellipse/action_draw_ellipse.yy",},},
{"id":{"name":"action_if_number","path":"scripts/action_if_number/action_if_number.yy",},},
Expand Down
5 changes: 5 additions & 0 deletions scripts/scr_draw_unit_image/scr_draw_unit_image.gml
Original file line number Diff line number Diff line change
Expand Up @@ -144,6 +144,11 @@ function get_complex_set(set = eARMOUR_SET.MK7){
left_leg : spr_tartaros_left_leg,
chest_variants : spr_tartaros_chest,
gorget : spr_tartaros_gorget,
mouth_variants : spr_tartaros_faceplate,
head : spr_tartaros_head,
left_trim : spr_tartaros_left_trim,
right_trim : spr_tartaros_right_trim,

});
}

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.
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.
145 changes: 134 additions & 11 deletions sprites/spr_tartaros_chest/spr_tartaros_chest.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.
Binary file not shown.
4 changes: 2 additions & 2 deletions sprites/spr_tartaros_complex/spr_tartaros_complex.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.
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.
76 changes: 76 additions & 0 deletions sprites/spr_tartaros_faceplate/spr_tartaros_faceplate.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.
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.
Diff not rendered.
Diff not rendered.
Loading
Loading