Merge pull request #102 from mihunia/fix_broken_definitions

Multiple fixes for broken definitions
sanderfrenken · Feb 4, 2024 · 5a6dbf1 · 5a6dbf1
2 parents 6d76831 + ef36f91
commit 5a6dbf1
Show file tree

Hide file tree

Showing 43 changed files with 353 additions and 242 deletions.
diff --git a/CREDITS.csv b/CREDITS.csv
@@ -3981,6 +3981,30 @@ hair/long_messy2/male/sandy.png,,"Yamilian, bluecarrot16","CC-BY-SA 3.0, GPL 3.0
 hair/long_messy2/male/strawberry.png,,"Yamilian, bluecarrot16","CC-BY-SA 3.0, GPL 3.0",https://opengameart.org/content/lpc-heroine-2,https://opengameart.org/content/lpc-hair,,,,,,,,,,,,,,OK
 hair/long_messy2/male/violet.png,,"Yamilian, bluecarrot16","CC-BY-SA 3.0, GPL 3.0",https://opengameart.org/content/lpc-heroine-2,https://opengameart.org/content/lpc-hair,,,,,,,,,,,,,,OK
 hair/long_messy2/male/white.png,,"Yamilian, bluecarrot16","CC-BY-SA 3.0, GPL 3.0",https://opengameart.org/content/lpc-heroine-2,https://opengameart.org/content/lpc-hair,,,,,,,,,,,,,,OK
+hair/long_straight/female/ashblonde.png,,"thecilekli",CC0,https://opengameart.org/content/lpc-long-straight-hair-with-12-colors,,,,,,,,,,,,,,,OK
+hair/long_straight/female/ashplatinum.png,,"thecilekli",CC0,https://opengameart.org/content/lpc-long-straight-hair-with-12-colors,,,,,,,,,,,,,,,OK
+hair/long_straight/female/black.png,,"thecilekli",CC0,https://opengameart.org/content/lpc-long-straight-hair-with-12-colors,,,,,,,,,,,,,,,OK
+hair/long_straight/female/blonde.png,,"thecilekli",CC0,https://opengameart.org/content/lpc-long-straight-hair-with-12-colors,,,,,,,,,,,,,,,OK
+hair/long_straight/female/blue.png,,"thecilekli",CC0,https://opengameart.org/content/lpc-long-straight-hair-with-12-colors,,,,,,,,,,,,,,,OK
+hair/long_straight/female/brown.png,,"thecilekli",CC0,https://opengameart.org/content/lpc-long-straight-hair-with-12-colors,,,,,,,,,,,,,,,OK
+hair/long_straight/female/brown2.png,,"thecilekli",CC0,https://opengameart.org/content/lpc-long-straight-hair-with-12-colors,,,,,,,,,,,,,,,OK
+hair/long_straight/female/green.png,,"thecilekli",CC0,https://opengameart.org/content/lpc-long-straight-hair-with-12-colors,,,,,,,,,,,,,,,OK
+hair/long_straight/female/orange.png,,"thecilekli",CC0,https://opengameart.org/content/lpc-long-straight-hair-with-12-colors,,,,,,,,,,,,,,,OK
+hair/long_straight/female/pink.png,,"thecilekli",CC0,https://opengameart.org/content/lpc-long-straight-hair-with-12-colors,,,,,,,,,,,,,,,OK
+hair/long_straight/female/purple.png,,"thecilekli",CC0,https://opengameart.org/content/lpc-long-straight-hair-with-12-colors,,,,,,,,,,,,,,,OK
+hair/long_straight/female/red.png,,"thecilekli",CC0,https://opengameart.org/content/lpc-long-straight-hair-with-12-colors,,,,,,,,,,,,,,,OK
+hair/long_straight/male/ashblonde.png,,"thecilekli",CC0,https://opengameart.org/content/lpc-long-straight-hair-with-12-colors,,,,,,,,,,,,,,,OK
+hair/long_straight/male/ashplatinum.png,,"thecilekli",CC0,https://opengameart.org/content/lpc-long-straight-hair-with-12-colors,,,,,,,,,,,,,,,OK
+hair/long_straight/male/black.png,,"thecilekli",CC0,https://opengameart.org/content/lpc-long-straight-hair-with-12-colors,,,,,,,,,,,,,,,OK
+hair/long_straight/male/blonde.png,,"thecilekli",CC0,https://opengameart.org/content/lpc-long-straight-hair-with-12-colors,,,,,,,,,,,,,,,OK
+hair/long_straight/male/blue.png,,"thecilekli",CC0,https://opengameart.org/content/lpc-long-straight-hair-with-12-colors,,,,,,,,,,,,,,,OK
+hair/long_straight/male/brown.png,,"thecilekli",CC0,https://opengameart.org/content/lpc-long-straight-hair-with-12-colors,,,,,,,,,,,,,,,OK
+hair/long_straight/male/brown2.png,,"thecilekli",CC0,https://opengameart.org/content/lpc-long-straight-hair-with-12-colors,,,,,,,,,,,,,,,OK
+hair/long_straight/male/green.png,,"thecilekli",CC0,https://opengameart.org/content/lpc-long-straight-hair-with-12-colors,,,,,,,,,,,,,,,OK
+hair/long_straight/male/orange.png,,"thecilekli",CC0,https://opengameart.org/content/lpc-long-straight-hair-with-12-colors,,,,,,,,,,,,,,,OK
+hair/long_straight/male/pink.png,,"thecilekli",CC0,https://opengameart.org/content/lpc-long-straight-hair-with-12-colors,,,,,,,,,,,,,,,OK
+hair/long_straight/male/purple.png,,"thecilekli",CC0,https://opengameart.org/content/lpc-long-straight-hair-with-12-colors,,,,,,,,,,,,,,,OK
+hair/long_straight/male/red.png,,"thecilekli",CC0,https://opengameart.org/content/lpc-long-straight-hair-with-12-colors,,,,,,,,,,,,,,,OK
 hair/long_tied,,"thecilekli, bluecarrot16",CC0,https://opengameart.org/content/lpc-long-tied-hair-with-12-colors,https://opengameart.org/content/lpc-hair,,,,,,,,,,,,,,
 hair/long_tied/female,,,,,,,,,,,,,,,,,,,
 hair/long_tied/female.png,,"thecilekli, bluecarrot16",CC0,https://opengameart.org/content/lpc-long-tied-hair-with-12-colors,https://opengameart.org/content/lpc-hair,,,,,,,,,,,,,,OK

diff --git a/index.html b/index.html
diff --git a/sheet_definitions/body_special.json b/sheet_definitions/body_special.json
diff --git a/sheet_definitions/feet_armour.json b/sheet_definitions/feet_armour.json
@@ -7,7 +7,7 @@
     "muscular" : "feet/armour/plate/male/",
     "female" : "feet/armour/plate/female/",
     "pregnant" : "feet/armour/plate/female/",
-    "teen" : "feet/armour/plate/teen/"
+    "teen" : "feet/armour/plate/female/"
   },
   "variants": [
     "steel",

diff --git a/sheet_definitions/hair_curly.json b/sheet_definitions/hair_curly.json
@@ -3,12 +3,7 @@
   "type_name": "hair",
   "layer_1": {
     "zPos": 120,
-    "male": "hair/curly/male/",
-    "muscular": "hair/curly/male/",
-    "female": "hair/curly/female/",
-    "pregnant": "hair/curly/female/",
-    "child": "hair/curly/child/",
-    "teen": "hair/curly/male/"
+    "child": "hair/curly/child/"
   },
   "variants": [
     "black",

diff --git a/sheet_definitions/hair_long_straight.json b/sheet_definitions/hair_long_straight.json
@@ -10,16 +10,17 @@
     "teen": "hair/long_straight/male/"
   },
   "variants": [
+    "ashblonde",
+    "ashplatinum",
     "black",
     "blonde",
     "blue",
     "brown",
+    "brown2",
     "green",
-    "lightblonde",
     "orange",
     "pink",
     "purple",
-    "red",
-    "white"
+    "red"
   ]
 }
diff --git a/sheet_definitions/hair_longest.json b/sheet_definitions/hair_longest.json
diff --git a/sheet_definitions/hair_mohawk.json b/sheet_definitions/hair_mohawk.json
diff --git a/sheet_definitions/hair_xlongknot.json b/sheet_definitions/hair_xlongknot.json
diff --git a/sheet_definitions/hat_tiara.json b/sheet_definitions/hat_tiara.json
@@ -3,8 +3,8 @@
   "type_name" : "hat",
   "layer_1" : {
     "zPos" : 130,
-    "female" : "hat/tiara/male/",
-    "pregnant" : "hat/tiara/male/"
+    "female" : "hat/tiara/female/",
+    "pregnant" : "hat/tiara/female/"
   },
   "variants": [
     "bronze",

diff --git a/sheet_definitions/legs_armour.json b/sheet_definitions/legs_armour.json
@@ -5,7 +5,7 @@
     "zPos" : 20,
     "male" : "legs/armour/plate/male/",
     "female" : "legs/armour/plate/female/",
-    "teen" : "legs/armour/plate/teen/"
+    "teen" : "legs/armour/plate/female/"
   },
   "variants": [
     "steel",

diff --git a/sheet_definitions/neck_capeclip.json b/sheet_definitions/neck_capeclip.json
@@ -6,7 +6,7 @@
     "male" : "neck/capeclip/male/",
     "muscular" : "neck/capeclip/male/",    
     "female" : "neck/capeclip/female/",
-    "teen" : "neck/capeclip/teen/",
+    "teen" : "neck/capeclip/female/",
     "pregnant" : "neck/capeclip/female/"
   },
   "variants": [

diff --git a/sheet_definitions/necklace.json → sheet_definitions/neck_necklace.json b/sheet_definitions/necklace.json → sheet_definitions/neck_necklace.json
@@ -3,9 +3,11 @@
   "type_name" : "necklace",
   "layer_1" : {
     "zPos" : 80,
-    "female" : "necklace/female/",
-    "teen" : "necklace/teen/",
-    "pregnant" : "necklace/female/"
+    "male" : "neck/necklace/female/",
+    "muscular": "neck/necklace/female/",
+    "female" : "neck/necklace/female/",
+    "teen" : "neck/necklace/female/",
+    "pregnant" : "neck/necklace/female/"
   },
   "variants": [
     "steel",

diff --git a/sheet_definitions/tail_lizard.json b/sheet_definitions/tail_lizard.json
@@ -36,8 +36,7 @@
     "fur_copper",
     "fur_gold",
     "fur_grey",
-    "fur_white",
-    "zombie"
+    "fur_white"
   ],
   "match_body_color": true
 }
diff --git a/sheet_definitions/weapon_misc.json b/sheet_definitions/weapon_misc.json
diff --git a/sheet_definitions/weapon_ranged_crossbow.json b/sheet_definitions/weapon_ranged_crossbow.json
@@ -3,17 +3,17 @@
   "type_name": "weapon",
   "layer_1": {
     "zPos": 140,
-    "male": "weapon/ranged/crossbow/background",
-    "muscular": "weapon/ranged/crossbow/background",
-    "female": "weapon/ranged/crossbow/background",
-    "pregnant": "weapon/ranged/crossbow/background"
+    "male": "weapon/ranged/crossbow/background/",
+    "muscular": "weapon/ranged/crossbow/background/",
+    "female": "weapon/ranged/crossbow/background/",
+    "pregnant": "weapon/ranged/crossbow/background/"
   },  
   "layer_2": {
     "zPos": 140,
-    "male": "weapon/ranged/crossbow/foreground",
-    "muscular": "weapon/ranged/crossbow/foreground",
-    "female": "weapon/ranged/crossbow/foreground",
-    "pregnant": "weapon/ranged/crossbow/foreground"
+    "male": "weapon/ranged/crossbow/foreground/",
+    "muscular": "weapon/ranged/crossbow/foreground/",
+    "female": "weapon/ranged/crossbow/foreground/",
+    "pregnant": "weapon/ranged/crossbow/foreground/"
   },
   "variants": [
     "crossbow"

diff --git a/sheet_definitions/wings_lizard.json b/sheet_definitions/wings_lizard.json
@@ -36,8 +36,7 @@
     "fur_copper",
     "fur_gold",
     "fur_grey",
-    "fur_white",
-    "zombie"
+    "fur_white"
   ],
   "match_body_color": true
 }
diff --git a/sheet_definitions/z_positions.csv b/sheet_definitions/z_positions.csv
@@ -251,7 +251,7 @@ neck_cravat.json,layer_1,90,neck/cravat/male/ neck/cravat/male/
 neck_jabot.json,layer_1,90,neck/jabot/male/ neck/jabot/male/
 neck_scarf.json,layer_1,90,neck/scarf/ neck/scarf/ neck/scarf/ neck/scarf/
 neck_tie.json,layer_1,90,neck/tie/ neck/tie/ neck/tie/ neck/tie/
-necklace.json,layer_1,80,necklace/female/ necklace/female/
+neck_necklace.json,layer_1,80,neck/necklace/female/ neck/necklace/female/ neck/necklace/female/ neck/necklace/female/
 prosthesis_hook.json,layer_1,100,body/prosthesis/hook/male/mask/
 prosthesis_hook.json,layer_2,100,body/prosthesis/hook/male/
 prosthesis_peg_leg.json,layer_1,100,body/prosthesis/peg_leg/male/mask/

diff --git a/source_index.html b/source_index.html
@@ -223,6 +223,7 @@ <h3>Head</h3>
 							div_sheet_hair_jewfro
 							div_sheet_hair_curly_short
 							div_sheet_hair_curly_long
+							div_sheet_hair_curly
 						</ul></li>
 						<li><span class="condensed">bald/shaved</span><ul>
 							div_sheet_hair_balding
@@ -296,6 +297,7 @@ <h3>Head</h3>
 							div_sheet_hair_curtains_long
 							div_sheet_hair_wavy
 							div_sheet_hair_long_center_part
+							div_sheet_hair_long_straight
 						</ul></li>
 						<li><span class="condensed">very long</span><ul>
 							div_sheet_hair_princess
@@ -444,7 +446,7 @@ <h3>Head</h3>
 				</li>
 
 				<!-- Neck -->
-				<li data-required="male,female,pregnant,muscular">
+				<li data-required="male,female,pregnant,muscular,teen">
 					<span class="condensed">Neck</span>
 					<ul>
 						div_sheet_neck_tie
@@ -453,7 +455,7 @@ <h3>Head</h3>
 						div_sheet_neck_capetie
 						div_sheet_neck_jabot
 						div_sheet_neck_cravat
-						div_sheet_necklace
+						div_sheet_neck_necklace
 					</ul>
 				</li>
 			</ul>

diff --git a/spritesheets/hair/long_straight/female/ashblonde.png b/spritesheets/hair/long_straight/female/ashblonde.png
diff --git a/spritesheets/hair/long_straight/female/ashplatinum.png b/spritesheets/hair/long_straight/female/ashplatinum.png
diff --git a/spritesheets/hair/long_straight/female/black.png b/spritesheets/hair/long_straight/female/black.png
diff --git a/spritesheets/hair/long_straight/female/blonde.png b/spritesheets/hair/long_straight/female/blonde.png
diff --git a/spritesheets/hair/long_straight/female/blue.png b/spritesheets/hair/long_straight/female/blue.png
diff --git a/spritesheets/hair/long_straight/female/brown.png b/spritesheets/hair/long_straight/female/brown.png
diff --git a/spritesheets/hair/long_straight/female/brown2.png b/spritesheets/hair/long_straight/female/brown2.png
diff --git a/spritesheets/hair/long_straight/female/green.png b/spritesheets/hair/long_straight/female/green.png
diff --git a/spritesheets/hair/long_straight/female/orange.png b/spritesheets/hair/long_straight/female/orange.png
diff --git a/spritesheets/hair/long_straight/female/pink.png b/spritesheets/hair/long_straight/female/pink.png
diff --git a/spritesheets/hair/long_straight/female/purple.png b/spritesheets/hair/long_straight/female/purple.png
diff --git a/spritesheets/hair/long_straight/female/red.png b/spritesheets/hair/long_straight/female/red.png
diff --git a/spritesheets/hair/long_straight/male/ashblonde.png b/spritesheets/hair/long_straight/male/ashblonde.png
diff --git a/spritesheets/hair/long_straight/male/ashplatinum.png b/spritesheets/hair/long_straight/male/ashplatinum.png
diff --git a/spritesheets/hair/long_straight/male/black.png b/spritesheets/hair/long_straight/male/black.png
diff --git a/spritesheets/hair/long_straight/male/blonde.png b/spritesheets/hair/long_straight/male/blonde.png
diff --git a/spritesheets/hair/long_straight/male/blue.png b/spritesheets/hair/long_straight/male/blue.png
diff --git a/spritesheets/hair/long_straight/male/brown.png b/spritesheets/hair/long_straight/male/brown.png
diff --git a/spritesheets/hair/long_straight/male/brown2.png b/spritesheets/hair/long_straight/male/brown2.png
diff --git a/spritesheets/hair/long_straight/male/green.png b/spritesheets/hair/long_straight/male/green.png
diff --git a/spritesheets/hair/long_straight/male/orange.png b/spritesheets/hair/long_straight/male/orange.png
diff --git a/spritesheets/hair/long_straight/male/pink.png b/spritesheets/hair/long_straight/male/pink.png
diff --git a/spritesheets/hair/long_straight/male/purple.png b/spritesheets/hair/long_straight/male/purple.png
diff --git a/spritesheets/hair/long_straight/male/red.png b/spritesheets/hair/long_straight/male/red.png