Cull unused sprites from FCW sprite sheets

Lexxie9952 · Feb 17, 2024 · bd2b559 · bd2b559
1 parent 04daa67
commit bd2b559
Show file tree

Hide file tree

Showing 3 changed files with 60 additions and 61 deletions.
diff --git a/freeciv/freeciv/data/amplio2.tilespec b/freeciv/freeciv/data/amplio2.tilespec
@@ -15,7 +15,7 @@ priority = 25
 summary = _("Large isometric tileset.")
 ;description = ""
 
-; TODO: add more overall information fields on tiles, 
+; TODO: add more overall information fields on tiles,
 ; eg, authors, colors, etc.
 
 ; What is the primary ruleset this tileset is meant for.
@@ -128,8 +128,8 @@ tilelabel_offset_y = 15
 ; This is special because it gets freed and reloaded as required:
 main_intro_file    = "misc/intro"
 
-; Below, the graphics spec files; must be somewhere (anywhere) in 
-; the data path. Order may be important for color allocation on 
+; Below, the graphics spec files; must be somewhere (anywhere) in
+; the data path. Order may be important for color allocation on
 ; low-color systems, and if there are any duplicate tags (lattermost
 ; tag is used).
 files =
@@ -141,12 +141,12 @@ files =
   "amplio2/ocean.spec",
   "amplio2/water.spec",
   "amplio2/tiles.spec",
-  "amplio2/upkeep.spec",
+;  "amplio2/upkeep.spec",               ** UNUSED BY FCW
   "amplio2/activities.spec",
   "amplio2/fog.spec",
   "amplio2/canal.spec",
   "misc/small.spec",
-  "misc/events.spec",
+;  "misc/events.spec",                  ** UNUSED BY FCW
   "misc/governments.spec",
   "misc/specialists.spec",
   "amplio2/units.spec",
@@ -158,7 +158,7 @@ files =
   "misc/flags-large.spec",
   "misc/buildings-large.spec",
   "misc/wonders-large.spec",
-  "misc/space.spec",
+;  "misc/space.spec",                   ** UNUSED BY FCW
   "misc/techs.spec",
   "misc/treaty.spec",
   "amplio2/nuke.spec",
@@ -168,12 +168,12 @@ files =
   "amplio2/bases.spec",
   "amplio2/select.spec",
   "amplio2/grid.spec",
-  "misc/cursors.spec",
-  "misc/overlays.spec",
+;  "misc/cursors.spec",                 ** UNUSED BY FCW
+;  "misc/overlays.spec",                ** UNUSED BY FCW
   "misc/citybar.spec",
   "misc/shields-large.spec",
-  "misc/editor.spec",
-  "misc/icons.spec"
+;  "misc/editor.spec",                  ** UNUSED BY FCW
+;  "misc/icons.spec"                    ** UNUSED BY FCW
 
 
 ; Include color definitions

diff --git a/freeciv/freeciv/data/misc/small.spec b/freeciv/freeciv/data/misc/small.spec
@@ -24,60 +24,59 @@ dy = 20
 
 tiles = { "row", "column", "tag"
 
-; Science progress indicators:
-
-  0,  0, "s.science_bulb_0"
-  0,  1, "s.science_bulb_1"
-  0,  2, "s.science_bulb_2"
-  0,  3, "s.science_bulb_3"
-  0,  4, "s.science_bulb_4"
-  0,  5, "s.science_bulb_5"
-  0,  6, "s.science_bulb_6"
-  0,  7, "s.science_bulb_7"
-
-; Global warming progress indicators:
-
-  0,  8, "s.warming_sun_0"
-  0,  9, "s.warming_sun_1"
-  0, 10, "s.warming_sun_2"
-  0, 11, "s.warming_sun_3"
-  0, 12, "s.warming_sun_4"
-  0, 13, "s.warming_sun_5"
-  0, 14, "s.warming_sun_6"
-  0, 15, "s.warming_sun_7"
-
-; Nuclear winter progress indicators:
-
-  0, 27, "s.cooling_flake_0"
-  0, 28, "s.cooling_flake_1"
-  0, 29, "s.cooling_flake_2"
-  0, 30, "s.cooling_flake_3"
-  0, 31, "s.cooling_flake_4"
-  0, 32, "s.cooling_flake_5"
-  0, 33, "s.cooling_flake_6"
-  0, 34, "s.cooling_flake_7"
-
-; Panel tax icons
-
-  0, 16, "s.tax_luxury"
-  0, 17, "s.tax_science"
-  0, 18, "s.tax_gold"
+; Science progress indicators:                             UNUSED BY FCW
+
+;  0,  0, "s.science_bulb_0"
+;  0,  1, "s.science_bulb_1"
+;  0,  2, "s.science_bulb_2"
+;  0,  3, "s.science_bulb_3"
+;  0,  4, "s.science_bulb_4"
+;  0,  5, "s.science_bulb_5"
+;  0,  6, "s.science_bulb_6"
+;  0,  7, "s.science_bulb_7"
+
+; Global warming progress indicators:                       UNUSED BY FCW
+
+;  0,  8, "s.warming_sun_0"
+;  0,  9, "s.warming_sun_1"
+;  0, 10, "s.warming_sun_2"
+;  0, 11, "s.warming_sun_3"
+;  0, 12, "s.warming_sun_4"
+;  0, 13, "s.warming_sun_5"
+;  0, 14, "s.warming_sun_6"
+;  0, 15, "s.warming_sun_7"
+
+; Nuclear winter progress indicators:                       UNUSED BY FCW
+
+;  0, 27, "s.cooling_flake_0"
+;  0, 28, "s.cooling_flake_1"
+;  0, 29, "s.cooling_flake_2"
+;  0, 30, "s.cooling_flake_3"
+;  0, 31, "s.cooling_flake_4"
+;  0, 32, "s.cooling_flake_5"
+;  0, 33, "s.cooling_flake_6"
+;  0, 34, "s.cooling_flake_7"
+
+; Panel tax icons                                           UNUSED BY FCW
+
+;  0, 16, "s.tax_luxury"
+;  0, 17, "s.tax_science"
+;  0, 18, "s.tax_gold"
 
 ; Citizen icons:
 
   0, 19, "citizen.content_0"
   0, 20, "citizen.content_1"
   0, 21, "citizen.happy_0"
   0, 22, "citizen.happy_1"
-  0, 23, "citizen.unhappy_0" 
-  0, 24, "citizen.unhappy_1" 
-  0, 25, "citizen.angry_0" 
-  0, 26, "citizen.angry_1" 
+  0, 23, "citizen.unhappy_0"
+  0, 24, "citizen.unhappy_1"
+  0, 25, "citizen.angry_0"
+  0, 26, "citizen.angry_1"
 
-; Right arrow icon:
+; Right arrow icon:                                         UNUSED BY FCW
 
-  0, 35, "s.right_arrow"
-
-  1,  0, "s.plus"
-  1,  1, "s.minus"
+;  0, 35, "s.right_arrow"
+;  1,  0, "s.plus"
+;  1,  1, "s.minus"
 }
diff --git a/freeciv/freeciv/data/misc/specialists.spec b/freeciv/freeciv/data/misc/specialists.spec
@@ -21,8 +21,8 @@ dx = 15
 dy = 20
 
 tiles = { "row", "column", "tag"
-  0,  0, "specialist.elvis_0"
-  0,  1, "specialist.elvis_1"
+;  0,  0, "specialist.elvis_0"              all rulesets now use entertainer, not elvis
+;  0,  1, "specialist.elvis_1"
   0,  0, "specialist.entertainer_0"
   0,  1, "specialist.entertainer_1"
   0,  2, "specialist.scientist_0"
@@ -35,6 +35,6 @@ tiles = { "row", "column", "tag"
   0,  9, "specialist.farmer_1"
   0, 10, "specialist.merchant_0"
   0, 11, "specialist.merchant_1"
-  0, 12, "specialist.police_0"  
-  0, 13, "specialist.police_1"   
+;  0, 12, "specialist.police_0"         not used currently
+;  0, 13, "specialist.police_1"
 }