From 5f2c005969a2f3f1c04c1575338c87789abccdf5 Mon Sep 17 00:00:00 2001 From: LostQuasar Date: Wed, 16 Nov 2022 19:41:27 -0500 Subject: [PATCH] More fixes --- assets/eyes/left/evil.svg | 2 +- assets/eyes/left/small.svg | 4 ++-- assets/eyes/right/aww.svg | 4 ++-- assets/eyes/right/base.svg | 2 +- assets/eyes/right/evil.svg | 2 +- assets/eyes/right/small.svg | 4 ++-- assets/fur/cat/base.svg | 6 +++--- assets/fur/cat/pat.svg | 6 +++--- assets/fur/fox/base.svg | 10 +++++----- assets/fur/fox/pat.svg | 12 ++++++------ assets/fur/fox/snug.svg | 6 +++--- assets/holding/crowbar.svg | 6 +++--- assets/holding/cup.svg | 4 ++-- assets/holding/cup_liquid/liquid.svg | 2 +- assets/holding/egg.svg | 4 ++-- assets/holding/hearts/ace.svg | 2 +- assets/holding/hearts/agender.svg | 2 +- assets/holding/hearts/demisexual.svg | 2 +- assets/holding/hearts/enby.svg | 2 +- assets/holding/hearts/heart.svg | 2 +- assets/holding/hearts/pan.svg | 2 +- assets/holding/hearts/progress.svg | 2 +- assets/holding/hearts/trans.svg | 2 +- assets/holding/knife.svg | 4 ++-- assets/mouth/w_mouth.svg | 2 +- assets/nose/aww.svg | 2 +- assets/nose/base.svg | 2 +- assets/nose/evil.svg | 2 +- assets/nose/happy.svg | 2 +- assets/nose/no_outline.svg | 2 +- assets/nose/squint.svg | 2 +- assets/overlay/blanket.svg | 2 +- assets/overlay/blanket_ear/arcticfox.svg | 4 ---- assets/overlay/blanket_ear/cat.svg | 2 +- assets/overlay/blanket_ear/fox.svg | 4 ++-- assets/overlay/blush.svg | 4 ++-- assets/overlay/more_blush.svg | 4 ++-- assets/overlay/steam.svg | 2 +- definitions.toml | 10 +++++++++- designs.toml | 4 +++- 40 files changed, 75 insertions(+), 69 deletions(-) delete mode 100644 assets/overlay/blanket_ear/arcticfox.svg diff --git a/assets/eyes/left/evil.svg b/assets/eyes/left/evil.svg index 13d1ab9..76cba86 100644 --- a/assets/eyes/left/evil.svg +++ b/assets/eyes/left/evil.svg @@ -1,3 +1,3 @@ - + diff --git a/assets/eyes/left/small.svg b/assets/eyes/left/small.svg index 3d26830..d14a25d 100644 --- a/assets/eyes/left/small.svg +++ b/assets/eyes/left/small.svg @@ -1,6 +1,6 @@ - - + + diff --git a/assets/eyes/right/aww.svg b/assets/eyes/right/aww.svg index e36a713..2ffdf2d 100644 --- a/assets/eyes/right/aww.svg +++ b/assets/eyes/right/aww.svg @@ -1,4 +1,4 @@ - - + + diff --git a/assets/eyes/right/base.svg b/assets/eyes/right/base.svg index 6cd9f9e..b7cb304 100644 --- a/assets/eyes/right/base.svg +++ b/assets/eyes/right/base.svg @@ -1,3 +1,3 @@ - + diff --git a/assets/eyes/right/evil.svg b/assets/eyes/right/evil.svg index 45357ba..f9c34c1 100644 --- a/assets/eyes/right/evil.svg +++ b/assets/eyes/right/evil.svg @@ -1,3 +1,3 @@ - + diff --git a/assets/eyes/right/small.svg b/assets/eyes/right/small.svg index fb2322f..96784a5 100644 --- a/assets/eyes/right/small.svg +++ b/assets/eyes/right/small.svg @@ -1,4 +1,4 @@ - - + + diff --git a/assets/fur/cat/base.svg b/assets/fur/cat/base.svg index 106989c..d0b2dd8 100644 --- a/assets/fur/cat/base.svg +++ b/assets/fur/cat/base.svg @@ -1,9 +1,9 @@ - - + + - + diff --git a/assets/fur/cat/pat.svg b/assets/fur/cat/pat.svg index 286bbe1..5f25954 100644 --- a/assets/fur/cat/pat.svg +++ b/assets/fur/cat/pat.svg @@ -1,9 +1,9 @@ - - + + - + diff --git a/assets/fur/fox/base.svg b/assets/fur/fox/base.svg index 864c690..d0b699d 100644 --- a/assets/fur/fox/base.svg +++ b/assets/fur/fox/base.svg @@ -1,10 +1,10 @@ - + - - - - + + + + diff --git a/assets/fur/fox/pat.svg b/assets/fur/fox/pat.svg index 4afe57e..455db9d 100644 --- a/assets/fur/fox/pat.svg +++ b/assets/fur/fox/pat.svg @@ -1,15 +1,15 @@ - + - - - - + + + + - + diff --git a/assets/fur/fox/snug.svg b/assets/fur/fox/snug.svg index 2dc34ef..320087f 100644 --- a/assets/fur/fox/snug.svg +++ b/assets/fur/fox/snug.svg @@ -1,11 +1,11 @@ - + - + - + diff --git a/assets/holding/crowbar.svg b/assets/holding/crowbar.svg index 5313100..2954705 100644 --- a/assets/holding/crowbar.svg +++ b/assets/holding/crowbar.svg @@ -1,5 +1,5 @@ - - - + + + diff --git a/assets/holding/cup.svg b/assets/holding/cup.svg index 45db395..7bfc312 100644 --- a/assets/holding/cup.svg +++ b/assets/holding/cup.svg @@ -1,5 +1,5 @@ - + - + diff --git a/assets/holding/cup_liquid/liquid.svg b/assets/holding/cup_liquid/liquid.svg index ce17f80..cc526fb 100644 --- a/assets/holding/cup_liquid/liquid.svg +++ b/assets/holding/cup_liquid/liquid.svg @@ -1,3 +1,3 @@ - + diff --git a/assets/holding/egg.svg b/assets/holding/egg.svg index 099aace..204a4ec 100644 --- a/assets/holding/egg.svg +++ b/assets/holding/egg.svg @@ -1,4 +1,4 @@ - - + + diff --git a/assets/holding/hearts/ace.svg b/assets/holding/hearts/ace.svg index 6166dc3..6c2588c 100644 --- a/assets/holding/hearts/ace.svg +++ b/assets/holding/hearts/ace.svg @@ -1,7 +1,7 @@ - + diff --git a/assets/holding/hearts/agender.svg b/assets/holding/hearts/agender.svg index efe52ea..a7d942c 100644 --- a/assets/holding/hearts/agender.svg +++ b/assets/holding/hearts/agender.svg @@ -1,7 +1,7 @@ - + diff --git a/assets/holding/hearts/demisexual.svg b/assets/holding/hearts/demisexual.svg index a6d8c16..6ca3eab 100644 --- a/assets/holding/hearts/demisexual.svg +++ b/assets/holding/hearts/demisexual.svg @@ -1,7 +1,7 @@ - + diff --git a/assets/holding/hearts/enby.svg b/assets/holding/hearts/enby.svg index 5a66c7f..2adc2a5 100644 --- a/assets/holding/hearts/enby.svg +++ b/assets/holding/hearts/enby.svg @@ -1,7 +1,7 @@ - + diff --git a/assets/holding/hearts/heart.svg b/assets/holding/hearts/heart.svg index 6561a2e..ff7a305 100644 --- a/assets/holding/hearts/heart.svg +++ b/assets/holding/hearts/heart.svg @@ -1,4 +1,4 @@ - + diff --git a/assets/holding/hearts/pan.svg b/assets/holding/hearts/pan.svg index 5632da5..507452a 100644 --- a/assets/holding/hearts/pan.svg +++ b/assets/holding/hearts/pan.svg @@ -1,7 +1,7 @@ - + diff --git a/assets/holding/hearts/progress.svg b/assets/holding/hearts/progress.svg index 530aa70..1835db1 100644 --- a/assets/holding/hearts/progress.svg +++ b/assets/holding/hearts/progress.svg @@ -1,7 +1,7 @@ - + diff --git a/assets/holding/hearts/trans.svg b/assets/holding/hearts/trans.svg index e64d04f..db92d84 100644 --- a/assets/holding/hearts/trans.svg +++ b/assets/holding/hearts/trans.svg @@ -1,7 +1,7 @@ - + diff --git a/assets/holding/knife.svg b/assets/holding/knife.svg index 03dbe43..558f8c0 100644 --- a/assets/holding/knife.svg +++ b/assets/holding/knife.svg @@ -1,7 +1,7 @@ - - + + diff --git a/assets/mouth/w_mouth.svg b/assets/mouth/w_mouth.svg index 646c1db..ed2ce40 100644 --- a/assets/mouth/w_mouth.svg +++ b/assets/mouth/w_mouth.svg @@ -1,3 +1,3 @@ - + diff --git a/assets/nose/aww.svg b/assets/nose/aww.svg index 9c224bf..67835fa 100644 --- a/assets/nose/aww.svg +++ b/assets/nose/aww.svg @@ -1,4 +1,4 @@ - + diff --git a/assets/nose/base.svg b/assets/nose/base.svg index 3e20c8a..1ab7dbf 100644 --- a/assets/nose/base.svg +++ b/assets/nose/base.svg @@ -1,4 +1,4 @@ - + diff --git a/assets/nose/evil.svg b/assets/nose/evil.svg index baf0b61..30cdb86 100644 --- a/assets/nose/evil.svg +++ b/assets/nose/evil.svg @@ -1,4 +1,4 @@ - + diff --git a/assets/nose/happy.svg b/assets/nose/happy.svg index 1af922c..8a67451 100644 --- a/assets/nose/happy.svg +++ b/assets/nose/happy.svg @@ -1,4 +1,4 @@ - + diff --git a/assets/nose/no_outline.svg b/assets/nose/no_outline.svg index f97e47d..fab7a8d 100644 --- a/assets/nose/no_outline.svg +++ b/assets/nose/no_outline.svg @@ -1,3 +1,3 @@ - + diff --git a/assets/nose/squint.svg b/assets/nose/squint.svg index 9ecdaca..1232aa0 100644 --- a/assets/nose/squint.svg +++ b/assets/nose/squint.svg @@ -1,4 +1,4 @@ - + diff --git a/assets/overlay/blanket.svg b/assets/overlay/blanket.svg index c98a451..706fa46 100644 --- a/assets/overlay/blanket.svg +++ b/assets/overlay/blanket.svg @@ -1,4 +1,4 @@ - + diff --git a/assets/overlay/blanket_ear/arcticfox.svg b/assets/overlay/blanket_ear/arcticfox.svg deleted file mode 100644 index 002d991..0000000 --- a/assets/overlay/blanket_ear/arcticfox.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/assets/overlay/blanket_ear/cat.svg b/assets/overlay/blanket_ear/cat.svg index 6ef3c54..d142fd6 100644 --- a/assets/overlay/blanket_ear/cat.svg +++ b/assets/overlay/blanket_ear/cat.svg @@ -1,4 +1,4 @@ - + diff --git a/assets/overlay/blanket_ear/fox.svg b/assets/overlay/blanket_ear/fox.svg index 4376bda..2e086c7 100644 --- a/assets/overlay/blanket_ear/fox.svg +++ b/assets/overlay/blanket_ear/fox.svg @@ -1,4 +1,4 @@ - - + + diff --git a/assets/overlay/blush.svg b/assets/overlay/blush.svg index bf7221c..d0877ec 100644 --- a/assets/overlay/blush.svg +++ b/assets/overlay/blush.svg @@ -9,8 +9,8 @@ - - + + diff --git a/assets/overlay/more_blush.svg b/assets/overlay/more_blush.svg index 68d7db7..4f2c615 100644 --- a/assets/overlay/more_blush.svg +++ b/assets/overlay/more_blush.svg @@ -9,8 +9,8 @@ - - + + diff --git a/assets/overlay/steam.svg b/assets/overlay/steam.svg index 613626f..3d86fce 100644 --- a/assets/overlay/steam.svg +++ b/assets/overlay/steam.svg @@ -1,3 +1,3 @@ - + diff --git a/definitions.toml b/definitions.toml index 28c0eb8..6ebc2d8 100644 --- a/definitions.toml +++ b/definitions.toml @@ -1,12 +1,17 @@ cup_empty = ["holding/cup_lower.toml", "hand/right_lower.toml"] cup_coffee = ["overlay/steam.svg","holding/cup.svg","holding/cup_liquid/liquid.svg", "holding/cup_liquid/coffee_color.toml", "hand/right.svg"] cup_hot_coco = ["overlay/steam.svg","holding/cup.svg","holding/cup_liquid/liquid.svg", "holding/cup_liquid/hot_coco_color.toml", "hand/right.svg"] -knife = ["holding/knife.svg"] + +knife = ["holding/knife.svg", "hand/left.svg"] +egg = ["holding/egg.svg"] +blanket_fox = ["overlay/blanket.svg", "overlay/blanket_ear/fox.svg"] arctic = ["colors/arcticfox.toml"] fox_color = ["colors/fox.toml"] + fox_fur = ["fur/fox/base.svg"] fox_pat = ["fur/fox/pat.svg"] fox_snug = ["fur/fox/snug.svg"] + face_base = ["eyes/left/base.svg", "eyes/right/base.svg", "nose/base.svg", "mouth/w_mouth.svg"] blush = ["eyes/left/squint.svg", "eyes/right/squint.svg", "nose/base.svg", "mouth/downturned.svg", "overlay/blush.svg"] happy = ["eyes/left/happy.svg", "eyes/right/happy.svg", "nose/happy.svg", "mouth/w_mouth.svg"] @@ -18,7 +23,9 @@ aww = ["eyes/left/aww.svg", "eyes/right/aww.svg", "nose/aww.svg", "mouth/w_mouth snug_happy = ["eyes/left/happy.svg", "eyes/right/happy.svg", "nose/happy.svg"] snug_aww = ["eyes/left/aww.svg", "eyes/right/aww.svg", "nose/aww.svg"] eyes_base = ["eyes/left/base.svg", "eyes/right/base.svg"] + holding_heart = ["hand/big_left.svg", "hand/big_right.svg"] + ace_heart = ["holding/hearts/ace.svg"] agender_heart = ["holding/hearts/agender.svg"] blue_heart = ["holding/hearts/heart.svg", "holding/hearts/colors/blue.toml"] @@ -28,6 +35,7 @@ pan_heart = ["holding/hearts/pan.svg"] pride_heart = ["holding/hearts/progress.svg"] red_heart = ["holding/hearts/heart.svg", "holding/hearts/colors/red.toml"] trans_heart = ["holding/hearts/trans.svg"] + pat_blush = ["overlay/blush_pat.toml"] squint_eyes = ["eyes/left/squint.svg", "eyes/right/squint.svg"] extra_blush = ["overlay/more_blush.svg"] diff --git a/designs.toml b/designs.toml index 60c72c9..5ef25b1 100644 --- a/designs.toml +++ b/designs.toml @@ -6,7 +6,9 @@ arctic_upset = ["arctic", "fox_fur", "upset"] arctic_upset_mild = ["arctic", "fox_fur", "upset_mild"] arctic_evil = ["arctic", "fox_fur", "evil"] arctic_aww = ["arctic", "fox_fur", "aww"] - +arctic_egg = ["arctic", "fox_fur", "eyes_base", "egg", "holding_heart"] +arctic_blanket = ["arctic", "fox_fur", "aww", "blanket_fox", "base_blush"] +arctic_evil_knife = ["arctic", "fox_fur", "evil", "knife"] arctic_snug_aww = ["arctic", "fox_snug", "snug_aww"] arctic_snug_happy = ["arctic", "fox_snug", "snug_happy", "base_blush"]