From f75e975bf3958d6f4b5433fa9f9ead8087cc45a6 Mon Sep 17 00:00:00 2001 From: LostQuasar Date: Tue, 9 Apr 2024 16:55:14 -0400 Subject: [PATCH] Fix cat & Add Latte --- assets/holding/cup_liquid/latte_color.toml | 1 + assets/holding/cup_liquid/latte_heart.svg | 6 ++ assets/mouth/cat_downturned.toml | 4 + assets/mouth/cat_upset.toml | 4 + assets/mouth/cat_w_mouth.toml | 4 + definitions.toml | 59 ++++++++----- designs.toml | 97 ++++++++++++++++------ 7 files changed, 128 insertions(+), 47 deletions(-) create mode 100644 assets/holding/cup_liquid/latte_color.toml create mode 100644 assets/holding/cup_liquid/latte_heart.svg create mode 100644 assets/mouth/cat_downturned.toml create mode 100644 assets/mouth/cat_upset.toml create mode 100644 assets/mouth/cat_w_mouth.toml diff --git a/assets/holding/cup_liquid/latte_color.toml b/assets/holding/cup_liquid/latte_color.toml new file mode 100644 index 0000000..42c775d --- /dev/null +++ b/assets/holding/cup_liquid/latte_color.toml @@ -0,0 +1 @@ +CUPLIQUID = "987d6d" \ No newline at end of file diff --git a/assets/holding/cup_liquid/latte_heart.svg b/assets/holding/cup_liquid/latte_heart.svg new file mode 100644 index 0000000..2211951 --- /dev/null +++ b/assets/holding/cup_liquid/latte_heart.svg @@ -0,0 +1,6 @@ + + + \ No newline at end of file diff --git a/assets/mouth/cat_downturned.toml b/assets/mouth/cat_downturned.toml new file mode 100644 index 0000000..4976740 --- /dev/null +++ b/assets/mouth/cat_downturned.toml @@ -0,0 +1,4 @@ +file = "mouth/downturned.svg" +scale = 1 +rotate = -2 +translate = [7, -11] \ No newline at end of file diff --git a/assets/mouth/cat_upset.toml b/assets/mouth/cat_upset.toml new file mode 100644 index 0000000..37b55c1 --- /dev/null +++ b/assets/mouth/cat_upset.toml @@ -0,0 +1,4 @@ +file = "mouth/upset.svg" +scale = 1 +rotate = -2 +translate = [7, -11] \ No newline at end of file diff --git a/assets/mouth/cat_w_mouth.toml b/assets/mouth/cat_w_mouth.toml new file mode 100644 index 0000000..9ef8198 --- /dev/null +++ b/assets/mouth/cat_w_mouth.toml @@ -0,0 +1,4 @@ +file = "mouth/w_mouth.svg" +scale = 1 +rotate = -2 +translate = [7, -11] \ No newline at end of file diff --git a/definitions.toml b/definitions.toml index 2a7c4ee..8a93a4a 100644 --- a/definitions.toml +++ b/definitions.toml @@ -1,30 +1,35 @@ -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", "hand/left.svg"] - -knife_right = ["holding/knife_right.toml", "hand/right.svg"] -egg = ["holding/egg.svg"] -blanket_fox = ["overlay/blanket.svg", "overlay/blanket_ear/fox.svg"] -arctic = ["colors/arcticfox.toml"] -red_fox = ["colors/fox.toml"] -fox_color = ["colors/fox.toml"] - fox_fur = ["fur/fox/base.svg"] fox_pat = ["fur/fox/pat.svg"] fox_snug = ["fur/fox/snug.svg"] +arctic_fox = ["colors/arcticfox.toml"] +red_fox = ["colors/fox.toml"] +fox_face_base = ["eyes/left/base.svg", "eyes/right/base.svg", "nose/base.svg", "mouth/w_mouth.svg"] +fox_blush = ["eyes/left/squint.svg", "eyes/right/squint.svg", "nose/base.svg", "mouth/downturned.svg", "overlay/blush.svg"] +fox_happy = ["eyes/left/happy.svg", "eyes/right/happy.svg", "nose/happy.svg", "mouth/w_mouth.svg"] +fox_shock = ["eyes/left/small.svg", "eyes/right/small.svg", "nose/no_outline.svg", "mouth/w_mouth.svg"] +fox_upset = ["eyes/left/squint.svg", "eyes/right/squint.svg", "nose/squint.svg", "mouth/upset.svg"] +fox_upset_mild = ["eyes/left/squint.svg", "eyes/right/squint.svg", "nose/squint.svg", "mouth/downturned.svg"] +fox_evil = ["eyes/left/evil.svg", "eyes/right/evil.svg", "nose/evil.svg", "mouth/w_mouth.svg"] +fox_aww = ["eyes/left/aww.svg", "eyes/right/aww.svg", "nose/aww.svg", "mouth/w_mouth.svg"] +fox_snug_happy = ["eyes/left/happy.svg", "eyes/right/happy.svg", "nose/happy.svg"] +fox_snug_aww = ["eyes/left/aww.svg", "eyes/right/aww.svg", "nose/aww.svg"] +fox_blanket = ["overlay/blanket.svg", "overlay/blanket_ear/fox.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"] -shock = ["eyes/left/small.svg", "eyes/right/small.svg", "nose/no_outline.svg", "mouth/w_mouth.svg"] -upset = ["eyes/left/squint.svg", "eyes/right/squint.svg", "nose/squint.svg", "mouth/upset.svg"] -upset_mild = ["eyes/left/squint.svg", "eyes/right/squint.svg", "nose/squint.svg", "mouth/downturned.svg"] -evil = ["eyes/left/evil.svg", "eyes/right/evil.svg", "nose/evil.svg", "mouth/w_mouth.svg"] -aww = ["eyes/left/aww.svg", "eyes/right/aww.svg", "nose/aww.svg", "mouth/w_mouth.svg"] -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"] +cat_fur = ["fur/cat/base.svg"] +cat_pat = ["fur/fox/pat.svg"] +#cat_snug = ["fur/fox/snug.svg"] DOES NOT EXIST +yellow_cat = ["colors/cat.toml"] +cat_face_base = ["eyes/left/base.svg", "eyes/right/base.svg", "mouth/cat_w_mouth.toml"] +cat_blush = ["eyes/left/squint.svg", "eyes/right/squint.svg", "mouth/downturned.svg", "overlay/blush.svg"] +cat_happy = ["eyes/left/happy.svg", "eyes/right/happy.svg", "mouth/cat_w_mouth.toml"] +cat_shock = ["eyes/left/small.svg", "eyes/right/small.svg", "mouth/cat_w_mouth.toml"] +cat_upset = ["eyes/left/squint.svg", "eyes/right/squint.svg", "mouth/cat_upset.toml"] +cat_upset_mild = ["eyes/left/squint.svg", "eyes/right/squint.svg", "mouth/cat_downturned.toml"] +cat_evil = ["eyes/left/evil.svg", "eyes/right/evil.svg", "mouth/cat_w_mouth.toml"] +cat_aww = ["eyes/left/aww.svg", "eyes/right/aww.svg", "mouth/cat_w_mouth.toml"] +cat_snug_happy = ["eyes/left/happy.svg", "eyes/right/happy.svg"] +cat_snug_aww = ["eyes/left/aww.svg", "eyes/right/aww.svg"] +cat_blanket = ["overlay/blanket.svg", "overlay/blanket_ear/cat.svg"] holding_heart = ["hand/big_left.svg", "hand/big_right.svg"] @@ -37,7 +42,15 @@ pan_heart = ["holding/hearts/pan.svg"] pride_heart = ["holding/hearts/progress.svg"] red_heart = ["holding/hearts/heart.svg"] trans_heart = ["holding/hearts/trans.svg"] +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_latte = ["overlay/steam.svg","holding/cup.svg","holding/cup_liquid/liquid.svg", "holding/cup_liquid/latte_color.toml", "holding/cup_liquid/latte_heart.svg", "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", "hand/left.svg"] +knife_right = ["holding/knife_right.toml", "hand/right.svg"] +egg = ["holding/egg.svg"] +eyes_base = ["eyes/left/base.svg", "eyes/right/base.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 9871765..09ca891 100644 --- a/designs.toml +++ b/designs.toml @@ -1,26 +1,75 @@ -arctic_blush = ["arctic", "fox_fur", "blush"] -arctic_extra_blush = ["arctic", "fox_fur", "squint_eyes", "extra_blush"] -arctic_happy = ["arctic", "fox_fur", "happy"] -arctic_shock = ["arctic", "fox_fur", "shock", "knife_right"] -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"] +arctic_fox_blush = ["arctic_fox", "fox_fur", "fox_blush"] +arctic_fox_extra_blush = ["arctic_fox", "fox_fur", "squint_eyes", "extra_blush"] +arctic_fox_happy = ["arctic_fox", "fox_fur", "fox_happy"] +arctic_fox_shock = ["arctic_fox", "fox_fur", "fox_shock", "knife_right"] +arctic_fox_upset = ["arctic_fox", "fox_fur", "fox_upset"] +arctic_fox_upset_mild = ["arctic_fox", "fox_fur", "fox_upset_mild"] +arctic_fox_evil = ["arctic_fox", "fox_fur", "fox_evil"] +arctic_fox_aww = ["arctic_fox", "fox_fur", "fox_aww"] +arctic_fox_egg = ["arctic_fox", "fox_fur", "eyes_base", "egg", "holding_heart"] +arctic_fox_blanket = ["arctic_fox", "fox_fur", "fox_aww", "fox_blanket", "base_blush"] +arctic_fox_evil_knife = ["arctic_fox", "fox_fur", "fox_evil", "knife"] +arctic_fox_snug_aww = ["arctic_fox", "fox_snug", "fox_snug_aww"] +arctic_fox_snug_happy = ["arctic_fox", "fox_snug", "fox_snug_happy", "base_blush"] +arctic_fox_blue_heart = ["arctic_fox", "fox_fur", "eyes_base", "blue_heart", "holding_heart"] +arctic_fox_red_heart = ["arctic_fox", "fox_fur", "eyes_base", "red_heart", "holding_heart"] +arctic_fox_ace_heart = ["arctic_fox", "fox_fur", "eyes_base", "ace_heart", "holding_heart"] +arctic_fox_agender_heart = ["arctic_fox", "fox_fur", "eyes_base", "agender_heart", "holding_heart"] +arctic_fox_demi_heart = ["arctic_fox", "fox_fur", "eyes_base", "demi_heart", "holding_heart"] +arctic_fox_enby_heart = ["arctic_fox", "fox_fur", "eyes_base", "enby_heart", "holding_heart"] +arctic_fox_trans_heart = ["arctic_fox", "fox_fur", "eyes_base", "trans_heart", "holding_heart"] +arctic_fox_coffee_happy = ["arctic_fox", "fox_fur", "fox_happy", "cup_coffee"] +arctic_fox_coffee = ["arctic_fox", "fox_fur", "fox_face_base", "cup_coffee"] +arctic_fox_latte = ["arctic_fox", "fox_fur", "fox_face_base", "cup_latte"] +arctic_fox_hot_coco = ["arctic_fox", "fox_fur", "fox_face_base", "cup_hot_coco"] +arctic_fox_no_coffee = ["arctic_fox", "fox_fur", "fox_upset_mild", "cup_empty"] -arctic_blue_heart = ["arctic", "fox_fur", "eyes_base", "blue_heart", "holding_heart"] -arctic_red_heart = ["arctic", "fox_fur", "eyes_base", "red_heart", "holding_heart"] -arctic_ace_heart = ["arctic", "fox_fur", "eyes_base", "ace_heart", "holding_heart"] -arctic_agender_heart = ["arctic", "fox_fur", "eyes_base", "agender_heart", "holding_heart"] -arctic_demi_heart = ["arctic", "fox_fur", "eyes_base", "demi_heart", "holding_heart"] -arctic_enby_heart = ["arctic", "fox_fur", "eyes_base", "enby_heart", "holding_heart"] -arctic_trans_heart = ["arctic", "fox_fur", "eyes_base", "trans_heart", "holding_heart"] +red_fox_blush = ["red_fox", "fox_fur", "fox_blush"] +red_fox_extra_blush = ["red_fox", "fox_fur", "squint_eyes", "extra_blush"] +red_fox_happy = ["red_fox", "fox_fur", "fox_happy"] +red_fox_shock = ["red_fox", "fox_fur", "fox_shock", "knife_right"] +red_fox_upset = ["red_fox", "fox_fur", "fox_upset"] +red_fox_upset_mild = ["red_fox", "fox_fur", "fox_upset_mild"] +red_fox_evil = ["red_fox", "fox_fur", "fox_evil"] +red_fox_aww = ["red_fox", "fox_fur", "fox_aww"] +red_fox_egg = ["red_fox", "fox_fur", "eyes_base", "egg", "holding_heart"] +red_fox_blanket = ["red_fox", "fox_fur", "fox_aww", "fox_blanket", "base_blush"] +red_fox_evil_knife = ["red_fox", "fox_fur", "fox_evil", "knife"] +red_fox_snug_aww = ["red_fox", "fox_snug", "fox_snug_aww"] +red_fox_snug_happy = ["red_fox", "fox_snug", "fox_snug_happy", "base_blush"] +red_fox_blue_heart = ["red_fox", "fox_fur", "eyes_base", "blue_heart", "holding_heart"] +red_fox_red_heart = ["red_fox", "fox_fur", "eyes_base", "red_heart", "holding_heart"] +red_fox_ace_heart = ["red_fox", "fox_fur", "eyes_base", "ace_heart", "holding_heart"] +red_fox_agender_heart = ["red_fox", "fox_fur", "eyes_base", "agender_heart", "holding_heart"] +red_fox_demi_heart = ["red_fox", "fox_fur", "eyes_base", "demi_heart", "holding_heart"] +red_fox_enby_heart = ["red_fox", "fox_fur", "eyes_base", "enby_heart", "holding_heart"] +red_fox_trans_heart = ["red_fox", "fox_fur", "eyes_base", "trans_heart", "holding_heart"] +red_fox_coffee_happy = ["red_fox", "fox_fur", "fox_happy", "cup_coffee"] +red_fox_coffee = ["red_fox", "fox_fur", "fox_face_base", "cup_coffee"] +red_fox_hot_coco = ["red_fox", "fox_fur", "fox_face_base", "cup_hot_coco"] +red_fox_no_coffee = ["red_fox", "fox_fur", "fox_upset_mild", "cup_empty"] -arctic_coffee_happy = ["arctic", "fox_fur", "happy", "cup_coffee"] -arctic_coffee = ["arctic", "fox_fur", "face_base", "cup_coffee"] -arctic_hot_coco = ["arctic", "fox_fur", "face_base", "cup_hot_coco"] -arctic_no_coffee = ["arctic", "fox_fur", "upset_mild", "cup_empty"] +cat_blush = ["yellow_cat", "cat_fur", "cat_blush"] +cat_extra_blush = ["yellow_cat", "cat_fur", "squint_eyes", "extra_blush"] +cat_happy = ["yellow_cat", "cat_fur", "cat_happy"] +cat_shock = ["yellow_cat", "cat_fur", "cat_shock", "knife_right"] +cat_upset = ["yellow_cat", "cat_fur", "cat_upset"] +cat_upset_mild = ["yellow_cat", "cat_fur", "cat_upset_mild"] +cat_evil = ["yellow_cat", "cat_fur", "cat_evil"] +cat_aww = ["yellow_cat", "cat_fur", "cat_aww"] +cat_egg = ["yellow_cat", "cat_fur", "eyes_base", "egg", "holding_heart"] +cat_blanket = ["yellow_cat", "cat_fur", "cat_aww", "cat_blanket", "base_blush"] +cat_evil_knife = ["yellow_cat", "cat_fur", "cat_evil", "knife"] +#cat_snug_aww = ["yellow_cat", "cat_snug", "cat_snug_aww"] DOES NOT EXIST +#cat_snug_happy = ["yellow_cat", "cat_snug", "cat_snug_happy", "base_blush"] DOESNOT EXIST +cat_blue_heart = ["yellow_cat", "cat_fur", "eyes_base", "blue_heart", "holding_heart"] +cat_red_heart = ["yellow_cat", "cat_fur", "eyes_base", "red_heart", "holding_heart"] +cat_ace_heart = ["yellow_cat", "cat_fur", "eyes_base", "ace_heart", "holding_heart"] +cat_agender_heart = ["yellow_cat", "cat_fur", "eyes_base", "agender_heart", "holding_heart"] +cat_demi_heart = ["yellow_cat", "cat_fur", "eyes_base", "demi_heart", "holding_heart"] +cat_enby_heart = ["yellow_cat", "cat_fur", "eyes_base", "enby_heart", "holding_heart"] +cat_trans_heart = ["yellow_cat", "cat_fur", "eyes_base", "trans_heart", "holding_heart"] +cat_coffee_happy = ["yellow_cat", "cat_fur", "cat_happy", "cup_coffee"] +cat_coffee = ["yellow_cat", "cat_fur", "cat_face_base", "cup_coffee"] +cat_hot_coco = ["yellow_cat", "cat_fur", "cat_face_base", "cup_hot_coco"] +cat_no_coffee = ["yellow_cat", "cat_fur", "cat_upset_mild", "cup_empty"] \ No newline at end of file