fix: Boarder sprites and fleet sprites being wrong (#358)

- Correct the display of boarder and fleet sprites by adjusting the image indexing in `scr_image` calls.
Adeptus-Dominus · Dec 31, 2024 · fea4e83 · fea4e83
1 parent 6afa0f9
commit fea4e83
Show file tree

Hide file tree

Showing 17 changed files with 7 additions and 8 deletions.
diff --git a/ChapterMaster.yyp b/ChapterMaster.yyp
@@ -173,7 +173,6 @@
     {"resourceType":"GMIncludedFile","resourceVersion":"1.0","name":"daemon7.png","CopyToMask":-1,"filePath":"datafiles/images/diplomacy",},
     {"resourceType":"GMIncludedFile","resourceVersion":"1.0","name":"daemon8.png","CopyToMask":-1,"filePath":"datafiles/images/diplomacy",},
     {"resourceType":"GMIncludedFile","resourceVersion":"1.0","name":"daemon9.png","CopyToMask":-1,"filePath":"datafiles/images/diplomacy",},
-    {"resourceType":"GMIncludedFile","resourceVersion":"1.0","name":"diplomacy_icons.png","CopyToMask":-1,"filePath":"datafiles/images/diplomacy",},
     {"resourceType":"GMIncludedFile","resourceVersion":"1.0","name":"diplomacy10.png","CopyToMask":-1,"filePath":"datafiles/images/diplomacy",},
     {"resourceType":"GMIncludedFile","resourceVersion":"1.0","name":"diplomacy11.png","CopyToMask":-1,"filePath":"datafiles/images/diplomacy",},
     {"resourceType":"GMIncludedFile","resourceVersion":"1.0","name":"diplomacy12.png","CopyToMask":-1,"filePath":"datafiles/images/diplomacy",},
@@ -184,6 +183,7 @@
     {"resourceType":"GMIncludedFile","resourceVersion":"1.0","name":"diplomacy6.png","CopyToMask":-1,"filePath":"datafiles/images/diplomacy",},
     {"resourceType":"GMIncludedFile","resourceVersion":"1.0","name":"diplomacy7.png","CopyToMask":-1,"filePath":"datafiles/images/diplomacy",},
     {"resourceType":"GMIncludedFile","resourceVersion":"1.0","name":"diplomacy8.png","CopyToMask":-1,"filePath":"datafiles/images/diplomacy",},
+    {"resourceType":"GMIncludedFile","resourceVersion":"1.0","name":"diplomacy_icons.png","CopyToMask":-1,"filePath":"datafiles/images/diplomacy",},
     {"resourceType":"GMIncludedFile","resourceVersion":"1.0","name":"instructions.txt","CopyToMask":9223372036854775807,"filePath":"datafiles/images/diplomacy",},
     {"resourceType":"GMIncludedFile","resourceVersion":"1.0","name":"symbol1.png","CopyToMask":-1,"filePath":"datafiles/images/diplomacy",},
     {"resourceType":"GMIncludedFile","resourceVersion":"1.0","name":"symbol2.png","CopyToMask":-1,"filePath":"datafiles/images/diplomacy",},
@@ -279,11 +279,10 @@
     {"resourceType":"GMIncludedFile","resourceVersion":"1.0","name":"11.png","CopyToMask":-1,"filePath":"datafiles/images/ui/force",},
     {"resourceType":"GMIncludedFile","resourceVersion":"1.0","name":"12.png","CopyToMask":-1,"filePath":"datafiles/images/ui/force",},
     {"resourceType":"GMIncludedFile","resourceVersion":"1.0","name":"13.png","CopyToMask":-1,"filePath":"datafiles/images/ui/force",},
-    {"resourceType":"GMIncludedFile","resourceVersion":"1.0","name":"14.png","CopyToMask":-1,"filePath":"datafiles/images/ui/force",},
-    {"resourceType":"GMIncludedFile","resourceVersion":"1.0","name":"16.png","CopyToMask":-1,"filePath":"datafiles/images/ui/force",},
+    {"resourceType":"GMIncludedFile","resourceVersion":"1.0","name":"15.png","CopyToMask":-1,"filePath":"datafiles/images/ui/force",},
     {"resourceType":"GMIncludedFile","resourceVersion":"1.0","name":"2.png","CopyToMask":-1,"filePath":"datafiles/images/ui/force",},
     {"resourceType":"GMIncludedFile","resourceVersion":"1.0","name":"3.png","CopyToMask":-1,"filePath":"datafiles/images/ui/force",},
-    {"resourceType":"GMIncludedFile","resourceVersion":"1.0","name":"31.png","CopyToMask":-1,"filePath":"datafiles/images/ui/force",},
+    {"resourceType":"GMIncludedFile","resourceVersion":"1.0","name":"30.png","CopyToMask":-1,"filePath":"datafiles/images/ui/force",},
     {"resourceType":"GMIncludedFile","resourceVersion":"1.0","name":"4.png","CopyToMask":-1,"filePath":"datafiles/images/ui/force",},
     {"resourceType":"GMIncludedFile","resourceVersion":"1.0","name":"5.png","CopyToMask":-1,"filePath":"datafiles/images/ui/force",},
     {"resourceType":"GMIncludedFile","resourceVersion":"1.0","name":"6.png","CopyToMask":-1,"filePath":"datafiles/images/ui/force",},
@@ -397,10 +396,10 @@
     {"resourceType":"GMIncludedFile","resourceVersion":"1.0","name":"eldar.json","CopyToMask":-1,"filePath":"datafiles/main/names",},
     {"resourceType":"GMIncludedFile","resourceVersion":"1.0","name":"genestealercult.json","CopyToMask":-1,"filePath":"datafiles/main/names",},
     {"resourceType":"GMIncludedFile","resourceVersion":"1.0","name":"hulk.json","CopyToMask":-1,"filePath":"datafiles/main/names",},
-    {"resourceType":"GMIncludedFile","resourceVersion":"1.0","name":"imperial_ship.json","CopyToMask":-1,"filePath":"datafiles/main/names",},
     {"resourceType":"GMIncludedFile","resourceVersion":"1.0","name":"imperial.json","CopyToMask":-1,"filePath":"datafiles/main/names",},
-    {"resourceType":"GMIncludedFile","resourceVersion":"1.0","name":"ork_ship.json","CopyToMask":-1,"filePath":"datafiles/main/names",},
+    {"resourceType":"GMIncludedFile","resourceVersion":"1.0","name":"imperial_ship.json","CopyToMask":-1,"filePath":"datafiles/main/names",},
     {"resourceType":"GMIncludedFile","resourceVersion":"1.0","name":"ork.json","CopyToMask":-1,"filePath":"datafiles/main/names",},
+    {"resourceType":"GMIncludedFile","resourceVersion":"1.0","name":"ork_ship.json","CopyToMask":-1,"filePath":"datafiles/main/names",},
     {"resourceType":"GMIncludedFile","resourceVersion":"1.0","name":"sector.json","CopyToMask":-1,"filePath":"datafiles/main/names",},
     {"resourceType":"GMIncludedFile","resourceVersion":"1.0","name":"space_marine.json","CopyToMask":-1,"filePath":"datafiles/main/names",},
     {"resourceType":"GMIncludedFile","resourceVersion":"1.0","name":"star.json","CopyToMask":-1,"filePath":"datafiles/main/names",},
@@ -1447,6 +1446,6 @@
   ],
   "templateType": null,
   "TextureGroups": [
-    {"resourceType":"GMTextureGroup","resourceVersion":"1.3","name":"Default","autocrop":true,"border":2,"compressFormat":"bz2","directory":"","groupParent":null,"isScaled":false,"loadType":"default","mipsToGenerate":0,"targets":-1,},
+    {"resourceType":"GMTextureGroup","resourceVersion":"1.3","name":"Default","autocrop":true,"border":2,"compressFormat":"bz2","customOptions":"","directory":"","groupParent":null,"isScaled":false,"loadType":"default","mipsToGenerate":0,"targets":-1,},
   ],
 }
diff --git a/datafiles/images/ui/force/10.png b/datafiles/images/ui/force/10.png
diff --git a/datafiles/images/ui/force/11.png b/datafiles/images/ui/force/11.png
diff --git a/datafiles/images/ui/force/12.png b/datafiles/images/ui/force/12.png
diff --git a/datafiles/images/ui/force/13.png b/datafiles/images/ui/force/13.png
diff --git a/datafiles/images/ui/force/14.png b/datafiles/images/ui/force/14.png
diff --git a/datafiles/images/ui/force/16.png → datafiles/images/ui/force/15.png b/datafiles/images/ui/force/16.png → datafiles/images/ui/force/15.png
diff --git a/datafiles/images/ui/force/2.png b/datafiles/images/ui/force/2.png
diff --git a/datafiles/images/ui/force/3.png b/datafiles/images/ui/force/3.png
diff --git a/datafiles/images/ui/force/31.png → datafiles/images/ui/force/30.png b/datafiles/images/ui/force/31.png → datafiles/images/ui/force/30.png
diff --git a/datafiles/images/ui/force/4.png b/datafiles/images/ui/force/4.png
diff --git a/datafiles/images/ui/force/5.png b/datafiles/images/ui/force/5.png
diff --git a/datafiles/images/ui/force/6.png b/datafiles/images/ui/force/6.png
diff --git a/datafiles/images/ui/force/7.png b/datafiles/images/ui/force/7.png
diff --git a/datafiles/images/ui/force/8.png b/datafiles/images/ui/force/8.png
diff --git a/datafiles/images/ui/force/9.png b/datafiles/images/ui/force/9.png
diff --git a/objects/obj_p_ship/Draw_0.gml b/objects/obj_p_ship/Draw_0.gml
@@ -45,7 +45,7 @@ draw_set_halign(fa_center);
 
 if (boarders>0){
     // draw_sprite(spr_force_icon,0,x-16,y+12);
-    scr_image("ui/force",0,x-16-32,y+12-32,64,64);
+    scr_image("ui/force",1,x-16-32,y+12-32,64,64);
 
     draw_set_color(0);
     draw_text(x-16,y+12,string_hash_to_newline(string(boarders)));