Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 12 additions & 1 deletion ChapterMaster.yyp
Original file line number Diff line number Diff line change
Expand Up @@ -579,7 +579,7 @@
"isEcma":false,
"LibraryEmitters":[],
"MetaData":{
"IDEVersion":"2024.1400.0.904",
"IDEVersion":"2024.1400.0.901",
},
"name":"ChapterMaster",
"resources":[
Expand Down Expand Up @@ -1295,7 +1295,9 @@
{"id":{"name":"spr_indomitus_complex_psy_hood_cables","path":"sprites/spr_indomitus_complex_psy_hood_cables/spr_indomitus_complex_psy_hood_cables.yy",},},
{"id":{"name":"spr_indomitus_complex_psy_hood_crown","path":"sprites/spr_indomitus_complex_psy_hood_crown/spr_indomitus_complex_psy_hood_crown.yy",},},
{"id":{"name":"spr_indomitus_complex_psy_hood","path":"sprites/spr_indomitus_complex_psy_hood/spr_indomitus_complex_psy_hood.yy",},},
{"id":{"name":"spr_indomitus_complex_shadows","path":"sprites/spr_indomitus_complex_shadows/spr_indomitus_complex_shadows.yy",},},
{"id":{"name":"spr_indomitus_complex","path":"sprites/spr_indomitus_complex/spr_indomitus_complex.yy",},},
{"id":{"name":"spr_indomitus_head_variants_shadows","path":"sprites/spr_indomitus_head_variants_shadows/spr_indomitus_head_variants_shadows.yy",},},
{"id":{"name":"spr_indomitus_head_variants","path":"sprites/spr_indomitus_head_variants/spr_indomitus_head_variants.yy",},},
{"id":{"name":"spr_indomitus_knightly_robe","path":"sprites/spr_indomitus_knightly_robe/spr_indomitus_knightly_robe.yy",},},
{"id":{"name":"spr_indomitus_left_arm_bionic","path":"sprites/spr_indomitus_left_arm_bionic/spr_indomitus_left_arm_bionic.yy",},},
Expand All @@ -1305,12 +1307,15 @@
{"id":{"name":"spr_indomitus_left_leg_bionic","path":"sprites/spr_indomitus_left_leg_bionic/spr_indomitus_left_leg_bionic.yy",},},
{"id":{"name":"spr_indomitus_left_shin_shadow","path":"sprites/spr_indomitus_left_shin_shadow/spr_indomitus_left_shin_shadow.yy",},},
{"id":{"name":"spr_indomitus_left_shin","path":"sprites/spr_indomitus_left_shin/spr_indomitus_left_shin.yy",},},
{"id":{"name":"spr_indomitus_leg_variants_shadows","path":"sprites/spr_indomitus_leg_variants_shadows/spr_indomitus_leg_variants_shadows.yy",},},
{"id":{"name":"spr_indomitus_leg_variants","path":"sprites/spr_indomitus_leg_variants/spr_indomitus_leg_variants.yy",},},
{"id":{"name":"spr_indomitus_right_arm_bionic","path":"sprites/spr_indomitus_right_arm_bionic/spr_indomitus_right_arm_bionic.yy",},},
{"id":{"name":"spr_indomitus_right_arm_shadows","path":"sprites/spr_indomitus_right_arm_shadows/spr_indomitus_right_arm_shadows.yy",},},
{"id":{"name":"spr_indomitus_right_arm","path":"sprites/spr_indomitus_right_arm/spr_indomitus_right_arm.yy",},},
{"id":{"name":"spr_indomitus_right_eye_bionic","path":"sprites/spr_indomitus_right_eye_bionic/spr_indomitus_right_eye_bionic.yy",},},
{"id":{"name":"spr_indomitus_right_knee_crux","path":"sprites/spr_indomitus_right_knee_crux/spr_indomitus_right_knee_crux.yy",},},
{"id":{"name":"spr_indomitus_right_leg_bionic","path":"sprites/spr_indomitus_right_leg_bionic/spr_indomitus_right_leg_bionic.yy",},},
{"id":{"name":"spr_indomitus_right_shin_shadows","path":"sprites/spr_indomitus_right_shin_shadows/spr_indomitus_right_shin_shadows.yy",},},
{"id":{"name":"spr_indomitus_right_shin","path":"sprites/spr_indomitus_right_shin/spr_indomitus_right_shin.yy",},},
{"id":{"name":"spr_ingame_menu","path":"sprites/spr_ingame_menu/spr_ingame_menu.yy",},},
{"id":{"name":"spr_inspect_small","path":"sprites/spr_inspect_small/spr_inspect_small.yy",},},
Expand Down Expand Up @@ -1649,6 +1654,7 @@
{"id":{"name":"spr_sw_mk7_helm","path":"sprites/spr_sw_mk7_helm/spr_sw_mk7_helm.yy",},},
{"id":{"name":"spr_sword_pendant","path":"sprites/spr_sword_pendant/spr_sword_pendant.yy",},},
{"id":{"name":"spr_tartaros_arms","path":"sprites/spr_tartaros_arms/spr_tartaros_arms.yy",},},
{"id":{"name":"spr_tartaros_chest_shadows","path":"sprites/spr_tartaros_chest_shadows/spr_tartaros_chest_shadows.yy",},},
{"id":{"name":"spr_tartaros_chest","path":"sprites/spr_tartaros_chest/spr_tartaros_chest.yy",},},
{"id":{"name":"spr_tartaros_colors","path":"sprites/spr_tartaros_colors/spr_tartaros_colors.yy",},},
{"id":{"name":"spr_tartaros_complex","path":"sprites/spr_tartaros_complex/spr_tartaros_complex.yy",},},
Expand All @@ -1667,6 +1673,7 @@
{"id":{"name":"spr_tartaros_right_arm","path":"sprites/spr_tartaros_right_arm/spr_tartaros_right_arm.yy",},},
{"id":{"name":"spr_tartaros_right_leg_shadows","path":"sprites/spr_tartaros_right_leg_shadows/spr_tartaros_right_leg_shadows.yy",},},
{"id":{"name":"spr_tartaros_right_leg","path":"sprites/spr_tartaros_right_leg/spr_tartaros_right_leg.yy",},},
{"id":{"name":"spr_tartaros_right_trim_shadows","path":"sprites/spr_tartaros_right_trim_shadows/spr_tartaros_right_trim_shadows.yy",},},
{"id":{"name":"spr_tartaros_right_trim","path":"sprites/spr_tartaros_right_trim/spr_tartaros_right_trim.yy",},},
{"id":{"name":"spr_tartaros_shadows","path":"sprites/spr_tartaros_shadows/spr_tartaros_shadows.yy",},},
{"id":{"name":"spr_tartaros_wep_fix","path":"sprites/spr_tartaros_wep_fix/spr_tartaros_wep_fix.yy",},},
Expand Down Expand Up @@ -1734,8 +1741,10 @@
{"id":{"name":"spr_weapon_boarding","path":"sprites/spr_weapon_boarding/spr_weapon_boarding.yy",},},
{"id":{"name":"spr_weapon_bolter","path":"sprites/spr_weapon_bolter/spr_weapon_bolter.yy",},},
{"id":{"name":"spr_weapon_boltpis","path":"sprites/spr_weapon_boltpis/spr_weapon_boltpis.yy",},},
{"id":{"name":"spr_weapon_boltstorm_gauntlet_shadows","path":"sprites/spr_weapon_boltstorm_gauntlet_shadows/spr_weapon_boltstorm_gauntlet_shadows.yy",},},
{"id":{"name":"spr_weapon_boltstorm_gauntlet_small","path":"sprites/spr_weapon_boltstorm_gauntlet_small/spr_weapon_boltstorm_gauntlet_small.yy",},},
{"id":{"name":"spr_weapon_boltstorm_gauntlet","path":"sprites/spr_weapon_boltstorm_gauntlet/spr_weapon_boltstorm_gauntlet.yy",},},
{"id":{"name":"spr_weapon_chainfist_shadows","path":"sprites/spr_weapon_chainfist_shadows/spr_weapon_chainfist_shadows.yy",},},
{"id":{"name":"spr_weapon_chainfist_small","path":"sprites/spr_weapon_chainfist_small/spr_weapon_chainfist_small.yy",},},
{"id":{"name":"spr_weapon_chainfist","path":"sprites/spr_weapon_chainfist/spr_weapon_chainfist.yy",},},
{"id":{"name":"spr_weapon_chaxe","path":"sprites/spr_weapon_chaxe/spr_weapon_chaxe.yy",},},
Expand Down Expand Up @@ -1766,6 +1775,7 @@
{"id":{"name":"spr_weapon_knife","path":"sprites/spr_weapon_knife/spr_weapon_knife.yy",},},
{"id":{"name":"spr_weapon_lasca","path":"sprites/spr_weapon_lasca/spr_weapon_lasca.yy",},},
{"id":{"name":"spr_weapon_lightning1","path":"sprites/spr_weapon_lightning1/spr_weapon_lightning1.yy",},},
{"id":{"name":"spr_weapon_lightning2_shadows","path":"sprites/spr_weapon_lightning2_shadows/spr_weapon_lightning2_shadows.yy",},},
{"id":{"name":"spr_weapon_lightning2","path":"sprites/spr_weapon_lightning2/spr_weapon_lightning2.yy",},},
{"id":{"name":"spr_weapon_mace_of_absolution","path":"sprites/spr_weapon_mace_of_absolution/spr_weapon_mace_of_absolution.yy",},},
{"id":{"name":"spr_weapon_mars_hbolt","path":"sprites/spr_weapon_mars_hbolt/spr_weapon_mars_hbolt.yy",},},
Expand All @@ -1784,6 +1794,7 @@
{"id":{"name":"spr_weapon_powfist_old","path":"sprites/spr_weapon_powfist_old/spr_weapon_powfist_old.yy",},},
{"id":{"name":"spr_weapon_powfist","path":"sprites/spr_weapon_powfist/spr_weapon_powfist.yy",},},
{"id":{"name":"spr_weapon_powfist2","path":"sprites/spr_weapon_powfist2/spr_weapon_powfist2.yy",},},
{"id":{"name":"spr_weapon_powfist4_shadows","path":"sprites/spr_weapon_powfist4_shadows/spr_weapon_powfist4_shadows.yy",},},
{"id":{"name":"spr_weapon_powfist4","path":"sprites/spr_weapon_powfist4/spr_weapon_powfist4.yy",},},
{"id":{"name":"spr_weapon_powmace","path":"sprites/spr_weapon_powmace/spr_weapon_powmace.yy",},},
{"id":{"name":"spr_weapon_powmaul","path":"sprites/spr_weapon_powmaul/spr_weapon_powmaul.yy",},},
Expand Down
8 changes: 0 additions & 8 deletions scripts/scr_ComplexSet/scr_ComplexSet.gml
Original file line number Diff line number Diff line change
Expand Up @@ -1329,23 +1329,15 @@ function ComplexSet(_unit) constructor {
break;
case "Terminator Armour":
add_group({
armour: spr_indomitus_complex,
left_arm: spr_indomitus_left_arm,
right_arm: spr_indomitus_right_arm,
backpack: spr_indomitus_backpack_variants,
chest_variants: spr_indomitus_chest_variants,
leg_variants: spr_indomitus_leg_variants,
head: spr_indomitus_head_variants,
belt: spr_indomitus_belt
});
armour_type = ArmourType.Terminator;
break;
case "Tartaros":
add_group({
chest_variants: spr_tartaros_chest,
mouth_variants: spr_tartaros_faceplate,
left_trim: spr_tartaros_left_trim,
right_trim: spr_tartaros_right_trim
});
armour_type = ArmourType.Terminator;
break;
Expand Down
84 changes: 74 additions & 10 deletions scripts/scr_culture_visuals/scr_culture_visuals.gml
Original file line number Diff line number Diff line change
Expand Up @@ -699,6 +699,11 @@ global.modular_drawing_items = [
sprite : spr_mk7_complex_crux_belt,
body_types :[0, 2],
position : "belt",
offsets : {
"Tartaros" : {
x : 7
}
},
armours : ["MK5 Heresy", "MK6 Corvus","MK7 Aquila", "MK8 Errant", "Artificer Armour", "Tartaros"],
exp : {
min : 100,
Expand All @@ -708,6 +713,11 @@ global.modular_drawing_items = [
sprite : spr_crux_belt_fancy,
body_types :[0, 2],
position : "belt",
offsets : {
"Tartaros" : {
x : 7
}
},
armours : ["MK5 Heresy", "MK6 Corvus","MK7 Aquila", "MK8 Errant", "Artificer Armour", "Tartaros"],
assign_by_rank : 3,
exp : {
Expand Down Expand Up @@ -1121,14 +1131,6 @@ global.modular_drawing_items = [
body_types: [0],
shadows : spr_mk8_gorgot_shadows
},
{
position: "right_shin",
body_types: [2],
sprite: spr_indomitus_right_shin,
armours : ["Terminator Armour"],
// shadows : spr_indomitus_left_shin_shadow
flip : true,
},
{
position: "right_shin",
body_types: [0],
Expand Down Expand Up @@ -1429,6 +1431,47 @@ global.modular_drawing_items = [
body_types : [0],
flip : true,
},
//Indomitus Sprites
{
position : "armour",
armours : ["Terminator Armour"],
sprite : spr_indomitus_complex,
shadows : spr_indomitus_complex_shadows,
body_types : [2],
},
{
position : "head",
armours : ["Terminator Armour"],
sprite : spr_indomitus_head_variants,
shadows : spr_indomitus_head_variants_shadows,
body_types : [2],
},
{
position : "right_arm",
armours : ["Terminator Armour"],
sprite : spr_indomitus_right_arm,
shadows : spr_indomitus_right_arm_shadows,
body_types : [2],
flip : true,
},
{
position : "right_leg",
armours : ["Terminator Armour"],
sprite : spr_indomitus_leg_variants,
shadows : spr_indomitus_leg_variants_shadows,
body_types : [2],
},
{
position: "right_shin",
body_types: [2],
sprite: spr_indomitus_right_shin,
armours : ["Terminator Armour"],
shadows: spr_indomitus_right_shin_shadows,
flip : true,
},


//Tartaros Sprites
{
position : "armour",
armours : ["Tartaros"],
Expand Down Expand Up @@ -1476,6 +1519,21 @@ global.modular_drawing_items = [
[spr_blank, spr_blank,spr_blank,spr_tartaros_leg_rivets],
],
},
{
position : "right_trim",
armours : ["Tartaros"],
sprite : spr_tartaros_right_trim,
shadows : spr_tartaros_right_trim_shadows,
body_types : [2],
flip : true,
},
{
position : "chest_variants",
armours : ["Tartaros"],
sprite : spr_tartaros_chest,
shadows : spr_tartaros_chest_shadows,
body_types : [2],
},

];

Expand Down Expand Up @@ -2534,8 +2592,11 @@ base: {
},
variants: [
{
sprite: spr_weapon_powfist4
sprite: spr_weapon_powfist4,
shadows : spr_weapon_powfist4_shadows,

},

{
sprite: spr_weapon_powfist,
body_types: [0, 1],
Expand All @@ -2555,7 +2616,8 @@ base: {
},
variants: [
{
sprite: spr_weapon_lightning2
sprite: spr_weapon_lightning2,
shadows : spr_weapon_lightning2_shadows,
},

{
Expand All @@ -2581,6 +2643,7 @@ base: {
},
{
sprite: spr_weapon_boltstorm_gauntlet,
shadows : spr_weapon_boltstorm_gauntlet_shadows,
body_types: [2],
weapon_data: {
display_type: "terminator_fist",
Expand Down Expand Up @@ -2617,6 +2680,7 @@ base: {
},
{
sprite: spr_weapon_chainfist,
shadows : spr_weapon_chainfist_shadows,
weapon_data: {
display_type: "terminator_fist",
},
Expand Down
2 changes: 1 addition & 1 deletion sprites/spr_cata_belt/spr_cata_belt.yy

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

2 changes: 1 addition & 1 deletion sprites/spr_cata_complex/spr_cata_complex.yy

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

2 changes: 1 addition & 1 deletion sprites/spr_cata_cowl_trim/spr_cata_cowl_trim.yy

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

2 changes: 1 addition & 1 deletion sprites/spr_cata_cowl_trim_1/spr_cata_cowl_trim_1.yy

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

2 changes: 1 addition & 1 deletion sprites/spr_cata_gorget/spr_cata_gorget.yy

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

2 changes: 1 addition & 1 deletion sprites/spr_cata_head/spr_cata_head.yy

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

2 changes: 1 addition & 1 deletion sprites/spr_cata_heavy_toe_left/spr_cata_heavy_toe_left.yy

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

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

2 changes: 1 addition & 1 deletion sprites/spr_cata_left_arm/spr_cata_left_arm.yy

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

2 changes: 1 addition & 1 deletion sprites/spr_cata_left_armtrim/spr_cata_left_armtrim.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.
2 changes: 1 addition & 1 deletion sprites/spr_cata_left_knee/spr_cata_left_knee.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.
2 changes: 1 addition & 1 deletion sprites/spr_cata_left_leg/spr_cata_left_leg.yy

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

2 changes: 1 addition & 1 deletion sprites/spr_cata_left_trim/spr_cata_left_trim.yy

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

2 changes: 1 addition & 1 deletion sprites/spr_cata_left_trim_1/spr_cata_left_trim_1.yy

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

2 changes: 1 addition & 1 deletion sprites/spr_cata_left_trim_2/spr_cata_left_trim_2.yy

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

2 changes: 1 addition & 1 deletion sprites/spr_cata_right_arm/spr_cata_right_arm.yy

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

Loading