Skip to content

Commit b9cd8c7

Browse files
authored
feat: New sprites for Adeptas (Adeptus-Dominus#469)
1 parent 655ebdd commit b9cd8c7

File tree

19 files changed

+168
-18
lines changed

19 files changed

+168
-18
lines changed

ChapterMaster.yyp

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@
9393
{"resourceType":"GMFolder","resourceVersion":"1.0","name":"ranged","folderPath":"folders/Sprites/Marine Viewer/weapons/ranged.yy",},
9494
{"resourceType":"GMFolder","resourceVersion":"1.0","name":"New Ground","folderPath":"folders/Sprites/New Ground.yy",},
9595
{"resourceType":"GMFolder","resourceVersion":"1.0","name":"New UI","folderPath":"folders/Sprites/New UI.yy",},
96-
{"resourceType":"GMFolder","resourceVersion":"1.0","name":"Ally Splash","folderPath":"folders/Sprites/New UI/Ally Splash.yy",},
96+
{"resourceType":"GMFolder","resourceVersion":"1.0","name":"allies","folderPath":"folders/Sprites/Marine Viewer/allies.yy",},
9797
{"resourceType":"GMFolder","resourceVersion":"1.0","name":"buttons","folderPath":"folders/Sprites/New UI/buttons.yy",},
9898
{"resourceType":"GMFolder","resourceVersion":"1.0","name":"Icons","folderPath":"folders/Sprites/New UI/Icons.yy",},
9999
{"resourceType":"GMFolder","resourceVersion":"1.0","name":"Menu and Load","folderPath":"folders/Sprites/New UI/Menu and Load.yy",},
@@ -603,7 +603,7 @@
603603
{"id":{"name":"spr_techpriest","path":"sprites/spr_techpriest/spr_techpriest.yy",},},
604604
{"id":{"name":"spr_mm_butts_small","path":"sprites/spr_mm_butts_small/spr_mm_butts_small.yy",},},
605605
{"id":{"name":"spr_crusader","path":"sprites/spr_crusader/spr_crusader.yy",},},
606-
{"id":{"name":"spr_sororitas","path":"sprites/spr_sororitas/spr_sororitas.yy",},},
606+
{"id":{"name":"spr_sister_of_battle","path":"sprites/spr_sister_of_battle/spr_sister_of_battle.yy",},},
607607
{"id":{"name":"scr_choose_weighted","path":"scripts/scr_choose_weighted/scr_choose_weighted.yy",},},
608608
{"id":{"name":"spr_eldar_hire","path":"sprites/spr_eldar_hire/spr_eldar_hire.yy",},},
609609
{"id":{"name":"spr_save_header","path":"sprites/spr_save_header/spr_save_header.yy",},},
@@ -1200,6 +1200,7 @@
12001200
{"id":{"name":"scr_quest","path":"scripts/scr_quest/scr_quest.yy",},},
12011201
{"id":{"name":"scr_audience","path":"scripts/scr_audience/scr_audience.yy",},},
12021202
{"id":{"name":"spr_ba_mk7_helm","path":"sprites/spr_ba_mk7_helm/spr_ba_mk7_helm.yy",},},
1203+
{"id":{"name":"spr_sister_hospitaler","path":"sprites/spr_sister_hospitaler/spr_sister_hospitaler.yy",},},
12031204
{"id":{"name":"spr_intelligence_icon","path":"sprites/spr_intelligence_icon/spr_intelligence_icon.yy",},},
12041205
{"id":{"name":"spr_dread_heavy_bolter","path":"sprites/spr_dread_heavy_bolter/spr_dread_heavy_bolter.yy",},},
12051206
{"id":{"name":"spr_purity_seal","path":"sprites/spr_purity_seal/spr_purity_seal.yy",},},
@@ -1292,6 +1293,7 @@
12921293
{"id":{"name":"spr_dreadnought_decorations","path":"sprites/spr_dreadnought_decorations/spr_dreadnought_decorations.yy",},},
12931294
{"id":{"name":"spr_weapon_mace_of_absolution","path":"sprites/spr_weapon_mace_of_absolution/spr_weapon_mace_of_absolution.yy",},},
12941295
{"id":{"name":"fnt_info","path":"fonts/fnt_info/fnt_info.yy",},},
1296+
{"id":{"name":"spr_sororitas1","path":"sprites/spr_sororitas1/spr_sororitas1.yy",},},
12951297
{"id":{"name":"fnt_tiny","path":"fonts/fnt_tiny/fnt_tiny.yy",},},
12961298
{"id":{"name":"scr_necron_tombs","path":"scripts/scr_necron_tombs/scr_necron_tombs.yy",},},
12971299
{"id":{"name":"fnt_small","path":"fonts/fnt_small/fnt_small.yy",},},

scripts/scr_draw_unit_image/scr_draw_unit_image.gml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1627,8 +1627,8 @@ function scr_draw_unit_image(_background=false){
16271627
}else if (race()=="4"){
16281628
if (string_count("Crusader",name_role())>0) then draw_sprite(spr_crusader,0,x_surface_offset,y_surface_offset);
16291629
}else if (race()=="5"){
1630-
if (string_count("Sister of Battle",name_role())>0) then draw_sprite(spr_sororitas,0,x_surface_offset,y_surface_offset);
1631-
if (string_count("Sister Hospitaler",name_role())>0) then draw_sprite(spr_sororitas,1,x_surface_offset,y_surface_offset);
1630+
if (string_count("Sister of Battle",name_role())>0) then draw_sprite(spr_sister_of_battle,0,x_surface_offset,y_surface_offset);
1631+
if (string_count("Sister Hospitaler",name_role())>0) then draw_sprite(spr_sister_hospitaler,0,x_surface_offset,y_surface_offset);
16321632
}else if (race()=="6"){
16331633
if (string_count("Ranger",name_role())>0) then draw_sprite(spr_eldar_hire,0,x_surface_offset,y_surface_offset);
16341634
if (string_count("Howling Banshee",name_role())>0) then draw_sprite(spr_eldar_hire,1,x_surface_offset,y_surface_offset);

sprites/spr_crusader/spr_crusader.yy

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

sprites/spr_eldar_hire/spr_eldar_hire.yy

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
23.7 KB
Loading
23.7 KB
Loading

sprites/spr_sister_hospitaler/spr_sister_hospitaler.yy

Lines changed: 74 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
22.8 KB
Loading
22.8 KB
Loading

sprites/spr_sister_of_battle/spr_sister_of_battle.yy

Lines changed: 74 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)