Skip to content

Commit

Permalink
add start of white scar specific stuff
Browse files Browse the repository at this point in the history
  • Loading branch information
OH296 committed Jan 19, 2025
1 parent b74908b commit a94029c
Show file tree
Hide file tree
Showing 17 changed files with 245 additions and 1 deletion.
3 changes: 3 additions & 0 deletions ChapterMaster.yyp
Original file line number Diff line number Diff line change
Expand Up @@ -588,6 +588,7 @@
{"id":{"name":"spr_weapon_powfist_old","path":"sprites/spr_weapon_powfist_old/spr_weapon_powfist_old.yy",},},
{"id":{"name":"scr_distribute_experience","path":"scripts/scr_distribute_experience/scr_distribute_experience.yy",},},
{"id":{"name":"spr_weapon_powmaul","path":"sprites/spr_weapon_powmaul/spr_weapon_powmaul.yy",},},
{"id":{"name":"spr_mongol_hat","path":"sprites/spr_mongol_hat/spr_mongol_hat.yy",},},
{"id":{"name":"spr_weapon_lightning1","path":"sprites/spr_weapon_lightning1/spr_weapon_lightning1.yy",},},
{"id":{"name":"spr_weapon_lightning2","path":"sprites/spr_weapon_lightning2/spr_weapon_lightning2.yy",},},
{"id":{"name":"spr_weapon_frcstaff","path":"sprites/spr_weapon_frcstaff/spr_weapon_frcstaff.yy",},},
Expand Down Expand Up @@ -705,6 +706,7 @@
{"id":{"name":"spr_requisition","path":"sprites/spr_requisition/spr_requisition.yy",},},
{"id":{"name":"spr_icon_change","path":"sprites/spr_icon_change/spr_icon_change.yy",},},
{"id":{"name":"spr_bar","path":"sprites/spr_bar/spr_bar.yy",},},
{"id":{"name":"spr_mongol_topknots","path":"sprites/spr_mongol_topknots/spr_mongol_topknots.yy",},},
{"id":{"name":"spr_disposition","path":"sprites/spr_disposition/spr_disposition.yy",},},
{"id":{"name":"spr_laurel","path":"sprites/spr_laurel/spr_laurel.yy",},},
{"id":{"name":"spr_disposition_small","path":"sprites/spr_disposition_small/spr_disposition_small.yy",},},
Expand Down Expand Up @@ -1215,6 +1217,7 @@
{"id":{"name":"scr_ruins_reward","path":"scripts/scr_ruins_reward/scr_ruins_reward.yy",},},
{"id":{"name":"scr_return_ship","path":"scripts/scr_return_ship/scr_return_ship.yy",},},
{"id":{"name":"scr_purge_world","path":"scripts/scr_purge_world/scr_purge_world.yy",},},
{"id":{"name":"spr_mk5_samuri_faceplate","path":"sprites/spr_mk5_samuri_faceplate/spr_mk5_samuri_faceplate.yy",},},
{"id":{"name":"scr_bomb_world","path":"scripts/scr_bomb_world/scr_bomb_world.yy",},},
{"id":{"name":"spr_ws_mk7_helm","path":"sprites/spr_ws_mk7_helm/spr_ws_mk7_helm.yy",},},
{"id":{"name":"scr_loyalty","path":"scripts/scr_loyalty/scr_loyalty.yy",},},
Expand Down
15 changes: 14 additions & 1 deletion scripts/scr_draw_unit_image/scr_draw_unit_image.gml
Original file line number Diff line number Diff line change
Expand Up @@ -841,6 +841,9 @@ function scr_draw_unit_image(_background=false){
complex_set = get_complex_set(eARMOUR_SET.MK5);
complex_livery = true;
//TODO sort this mess out streamline system somehow
if (progenitor_map() == 2){
complex_set.add_to_area("mouth_variants", spr_mk5_samuri_faceplate);
}
if (unit_progenitor == ePROGENITOR.DARK_ANGELS){
complex_set.add_relative_to_status("crest", spr_da_mk5_helm_crests, 2, get_body_data("crest_variation","head"), self);
if (unit_role==_role[eROLE.Captain]){
Expand Down Expand Up @@ -889,6 +892,7 @@ function scr_draw_unit_image(_background=false){
complex_set = get_complex_set(eARMOUR_SET.MK8);
complex_livery = true;
if (unit_progenitor == ePROGENITOR.DARK_ANGELS) {
complex_set.add_relative_to_status("crest", spr_da_mk7_helm_crests, 2, get_body_data("crest_variation","head"), self);
if (unit_role==_role[eROLE.Captain]){
// specific_armour_sprite = spr_da_mk8;
armour_draw=[spr_da_mk8,0];
Expand Down Expand Up @@ -981,6 +985,12 @@ function scr_draw_unit_image(_background=false){
}
}
}
if (armour_type == ArmourType.Normal){
if (progenitor_map() == 2){
complex_set.add_to_area("crest", spr_mongol_topknots);
complex_set.add_to_area("forehead", spr_mongol_hat);
}
}
if (unit_specialization == UnitSpecialization.Techmarine){
if array_contains(["MK5 Heresy", "MK6 Corvus","MK7 Aquila", "MK8 Errant", "Artificer Armour"], unit_armour){
if (has_trait("tinkerer") && complex_livery){
Expand Down Expand Up @@ -1204,6 +1214,10 @@ function scr_draw_unit_image(_background=false){
}
var choice = get_body_data("variation","head")%sprite_get_number(complex_set.head);
draw_sprite(complex_set.head,choice,x_surface_offset,y_surface_offset);
if (struct_exists(complex_set, "forehead")){
var choice = get_body_data("forehead_variation","head")%sprite_get_number(complex_set.forehead);
draw_sprite(complex_set.forehead,choice,x_surface_offset,y_surface_offset);
}
}
if (struct_exists(complex_set, "mouth_variants")){
var choice = get_body_data("variant","jaw")%sprite_get_number(complex_set.mouth_variants);
Expand Down Expand Up @@ -1470,7 +1484,6 @@ function scr_draw_unit_image(_background=false){
}
else if (unit_armour=="Terminator Armour" && !armour_bypass){
if (unit_role == _role[eROLE.Champion]) {
draw_sprite(spr_laurel,0,x_surface_offset,y_surface_offset-8);
draw_sprite(spr_helm_decorations,0,x_surface_offset,y_surface_offset-10);
}
if (unit_role == _role[eROLE.Sergeant] || unit_role == _role[eROLE.VeteranSergeant]) {
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.
74 changes: 74 additions & 0 deletions sprites/spr_mk5_samuri_faceplate/spr_mk5_samuri_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.
76 changes: 76 additions & 0 deletions sprites/spr_mongol_hat/spr_mongol_hat.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.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
78 changes: 78 additions & 0 deletions sprites/spr_mongol_topknots/spr_mongol_topknots.yy

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

0 comments on commit a94029c

Please sign in to comment.