Skip to content

Commit e4f54d7

Browse files
feat: Most of Tartaros shadow packets (#1033)
Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com>
1 parent 870ef65 commit e4f54d7

60 files changed

Lines changed: 781 additions & 27 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

ChapterMaster.yyp

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1640,12 +1640,19 @@
16401640
{"id":{"name":"spr_tartaros_colors","path":"sprites/spr_tartaros_colors/spr_tartaros_colors.yy",},},
16411641
{"id":{"name":"spr_tartaros_complex","path":"sprites/spr_tartaros_complex/spr_tartaros_complex.yy",},},
16421642
{"id":{"name":"spr_tartaros_faceplate","path":"sprites/spr_tartaros_faceplate/spr_tartaros_faceplate.yy",},},
1643+
{"id":{"name":"spr_tartaros_forehead_shadows","path":"sprites/spr_tartaros_forehead_shadows/spr_tartaros_forehead_shadows.yy",},},
1644+
{"id":{"name":"spr_tartaros_forehead_variants","path":"sprites/spr_tartaros_forehead_variants/spr_tartaros_forehead_variants.yy",},},
1645+
{"id":{"name":"spr_tartaros_gorget_shadows","path":"sprites/spr_tartaros_gorget_shadows/spr_tartaros_gorget_shadows.yy",},},
16431646
{"id":{"name":"spr_tartaros_gorget","path":"sprites/spr_tartaros_gorget/spr_tartaros_gorget.yy",},},
1647+
{"id":{"name":"spr_tartaros_head_shadows","path":"sprites/spr_tartaros_head_shadows/spr_tartaros_head_shadows.yy",},},
16441648
{"id":{"name":"spr_tartaros_head_variants","path":"sprites/spr_tartaros_head_variants/spr_tartaros_head_variants.yy",},},
16451649
{"id":{"name":"spr_tartaros_left_arm","path":"sprites/spr_tartaros_left_arm/spr_tartaros_left_arm.yy",},},
16461650
{"id":{"name":"spr_tartaros_left_leg","path":"sprites/spr_tartaros_left_leg/spr_tartaros_left_leg.yy",},},
16471651
{"id":{"name":"spr_tartaros_left_trim","path":"sprites/spr_tartaros_left_trim/spr_tartaros_left_trim.yy",},},
1652+
{"id":{"name":"spr_tartaros_leg_rivets","path":"sprites/spr_tartaros_leg_rivets/spr_tartaros_leg_rivets.yy",},},
1653+
{"id":{"name":"spr_tartaros_right_arm_shadows","path":"sprites/spr_tartaros_right_arm_shadows/spr_tartaros_right_arm_shadows.yy",},},
16481654
{"id":{"name":"spr_tartaros_right_arm","path":"sprites/spr_tartaros_right_arm/spr_tartaros_right_arm.yy",},},
1655+
{"id":{"name":"spr_tartaros_right_leg_shadows","path":"sprites/spr_tartaros_right_leg_shadows/spr_tartaros_right_leg_shadows.yy",},},
16491656
{"id":{"name":"spr_tartaros_right_leg","path":"sprites/spr_tartaros_right_leg/spr_tartaros_right_leg.yy",},},
16501657
{"id":{"name":"spr_tartaros_right_trim","path":"sprites/spr_tartaros_right_trim/spr_tartaros_right_trim.yy",},},
16511658
{"id":{"name":"spr_tartaros_shadows","path":"sprites/spr_tartaros_shadows/spr_tartaros_shadows.yy",},},

scripts/scr_ComplexSet/scr_ComplexSet.gml

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1342,14 +1342,8 @@ function ComplexSet(_unit) constructor {
13421342
break;
13431343
case "Tartaros":
13441344
add_group({
1345-
left_arm: spr_tartaros_left_arm,
1346-
right_arm: spr_tartaros_right_arm,
1347-
right_leg: spr_tartaros_right_leg,
1348-
left_leg: spr_tartaros_left_leg,
13491345
chest_variants: spr_tartaros_chest,
1350-
gorget: spr_tartaros_gorget,
13511346
mouth_variants: spr_tartaros_faceplate,
1352-
head: spr_tartaros_head_variants,
13531347
left_trim: spr_tartaros_left_trim,
13541348
right_trim: spr_tartaros_right_trim
13551349
});

scripts/scr_culture_visuals/scr_culture_visuals.gml

Lines changed: 42 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -329,6 +329,7 @@ function set_up_visual_overides(){
329329
shader_set(right_left_swap_shader);
330330

331331
_flip_mod.sprite = return_sprite_mirrored(_mod.sprite, false);
332+
//sprite_set_offset(_flip_mod.sprite,sprite_get_xoffset(_mod.sprite),sprite_get_yoffset(_mod.sprite));
332333

333334

334335
if (struct_exists(_flip_mod, "subcomponents")){
@@ -1434,7 +1435,47 @@ global.modular_drawing_items = [
14341435
sprite : spr_tartaros_complex,
14351436
shadows : spr_tartaros_shadows,
14361437
body_types : [2],
1437-
}
1438+
},
1439+
{
1440+
position : "right_arm",
1441+
armours : ["Tartaros"],
1442+
sprite : spr_tartaros_right_arm,
1443+
shadows : spr_tartaros_right_arm_shadows,
1444+
body_types : [2],
1445+
flip : true,
1446+
},
1447+
{
1448+
position : "gorget",
1449+
armours : ["Tartaros"],
1450+
sprite : spr_tartaros_gorget,
1451+
shadows : spr_tartaros_gorget_shadows,
1452+
body_types : [2],
1453+
},
1454+
{
1455+
position : "head",
1456+
armours : ["Tartaros"],
1457+
sprite : spr_tartaros_head_variants,
1458+
shadows : spr_tartaros_head_shadows,
1459+
body_types : [2],
1460+
},
1461+
{
1462+
position : "forehead",
1463+
armours : ["Tartaros"],
1464+
sprite : spr_tartaros_forehead_variants,
1465+
shadows : spr_tartaros_forehead_shadows,
1466+
body_types : [2],
1467+
},
1468+
{
1469+
position : "right_leg",
1470+
armours : ["Tartaros"],
1471+
sprite : spr_tartaros_right_leg,
1472+
shadows : spr_tartaros_right_leg_shadows,
1473+
body_types : [2],
1474+
flip : true,
1475+
subcomponents : [
1476+
[spr_blank, spr_blank,spr_blank,spr_tartaros_leg_rivets],
1477+
],
1478+
},
14381479

14391480
];
14401481

557 Bytes
Loading
729 Bytes
Loading
668 Bytes
Loading
482 Bytes
Loading
557 Bytes
Loading
729 Bytes
Loading
668 Bytes
Loading

0 commit comments

Comments
 (0)