Fix and Expand Oni Demon Tail Markings

Resources/Locale/en-US/_ADT/markings/demon.ftl

@@ -5,11 +5,28 @@ marking-DemonEars-demon_ears = Demon Ears
 marking-DemonElfEars = Elf Ears
 marking-DemonElfEars-ears_elf = Elf Ears
 marking-DemomTail1 = Demon Tail 1
+marking-DemomTail1-demon_tail_base = Demon Tail 1
 marking-DemomTail1-demon_tail = Demon Tail 1
 marking-DemomTailLong = Long Demon Tail
+marking-DemomTailLong-demon_tail_base = Long Demon Tail
 marking-DemomTailLong-long = Long Demon Tail
 marking-DemomTailUp = Demon Tail Up
+marking-DemomTailUp-demon_tail_base = Demon Tail Up
 marking-DemomTailUp-up = Demon Tail Up
+# Triad: animated (waggin) variants + plain base-only tails, re-sourced from ADT
+marking-DemomTail1Animated = Demon Tail 1 (Animated)
+marking-DemomTail1Animated-tail_waggin = Demon Tail 1 (Animated)
+marking-DemomTail1Animated-demon_tail_waggin = Demon Tail 1 (Animated)
+marking-DemomTailLongAnimated = Long Demon Tail (Animated)
+marking-DemomTailLongAnimated-tail_waggin = Long Demon Tail (Animated)
+marking-DemomTailLongAnimated-long_waggin = Long Demon Tail (Animated)
+marking-DemomTailUpAnimated = Demon Tail Up (Animated)
+marking-DemomTailUpAnimated-tail_waggin = Demon Tail Up (Animated)
+marking-DemomTailUpAnimated-up_waggin = Demon Tail Up (Animated)
+marking-DemomTailPlain = Plain Demon Tail
+marking-DemomTailPlain-demon_tail_base = Plain Demon Tail
+marking-DemomTailPlainAnimated = Plain Demon Tail (Animated)
+marking-DemomTailPlainAnimated-tail_waggin = Plain Demon Tail (Animated)
 marking-DemonChestCowSpots = Cow Spots on Chest
 marking-DemonChestCowSpots-cow_spots = Cow Spots on Chest
 marking-DemonChestGuard = Chest Guard

Resources/Prototypes/_ADT/Mobs/Customization/demon/demon.yml

@@ -184,6 +184,9 @@
   markingCategory: Tail
   speciesRestriction: [Oni] #Triad
   sprites:
+  # Triad: base tail silhouette (sourced from ADT parts.rsi:tail; dropped during the original import, leaving only the overlay)
+  - sprite: _ADT/Mobs/Customization/Demon/custom.rsi
+    state: demon_tail_base
   - sprite: _ADT/Mobs/Customization/Demon/custom.rsi
     state: demon_tail
 
@@ -193,6 +196,9 @@
   markingCategory: Tail
   speciesRestriction: [Oni] #Triad
   sprites:
+  # Triad: base tail silhouette (sourced from ADT parts.rsi:tail; dropped during the original import, leaving only the overlay)
+  - sprite: _ADT/Mobs/Customization/Demon/custom.rsi
+    state: demon_tail_base
   - sprite: _ADT/Mobs/Customization/Demon/custom.rsi
     state: long
 
@@ -202,5 +208,62 @@
   markingCategory: Tail
   speciesRestriction: [Oni] #Triad
   sprites:
+  # Triad: base tail silhouette (sourced from ADT parts.rsi:tail; dropped during the original import, leaving only the overlay)
+  - sprite: _ADT/Mobs/Customization/Demon/custom.rsi
+    state: demon_tail_base
   - sprite: _ADT/Mobs/Customization/Demon/custom.rsi
     state: up
+
+# Triad: animated "waggin" demon tails (ADT / Corvax-Wega) + plain base-only options, re-sourced from AdventureTimeSS14.
+# Each animated tail layers the animated base silhouette (tail_waggin) under its animated pattern overlay, frame-for-frame.
+- type: marking
+  id: DemomTail1Animated
+  bodyPart: Tail
+  markingCategory: Tail
+  speciesRestriction: [Oni] #Triad
+  sprites:
+  - sprite: _ADT/Mobs/Customization/Demon/custom.rsi
+    state: tail_waggin
+  - sprite: _ADT/Mobs/Customization/Demon/custom.rsi
+    state: demon_tail_waggin
+
+- type: marking
+  id: DemomTailLongAnimated
+  bodyPart: Tail
+  markingCategory: Tail
+  speciesRestriction: [Oni] #Triad
+  sprites:
+  - sprite: _ADT/Mobs/Customization/Demon/custom.rsi
+    state: tail_waggin
+  - sprite: _ADT/Mobs/Customization/Demon/custom.rsi
+    state: long_waggin
+
+- type: marking
+  id: DemomTailUpAnimated
+  bodyPart: Tail
+  markingCategory: Tail
+  speciesRestriction: [Oni] #Triad
+  sprites:
+  - sprite: _ADT/Mobs/Customization/Demon/custom.rsi
+    state: tail_waggin
+  - sprite: _ADT/Mobs/Customization/Demon/custom.rsi
+    state: up_waggin
+
+# Plain base-only tails: the silhouette with no pattern overlay (single color).
+- type: marking
+  id: DemomTailPlain
+  bodyPart: Tail
+  markingCategory: Tail
+  speciesRestriction: [Oni] #Triad
+  sprites:
+  - sprite: _ADT/Mobs/Customization/Demon/custom.rsi
+    state: demon_tail_base
+
+- type: marking
+  id: DemomTailPlainAnimated
+  bodyPart: Tail
+  markingCategory: Tail
+  speciesRestriction: [Oni] #Triad
+  sprites:
+  - sprite: _ADT/Mobs/Customization/Demon/custom.rsi
+    state: tail_waggin

Resources/Textures/_ADT/Mobs/Customization/Demon/custom.rsi/meta.json

@@ -51,6 +51,10 @@
             "name": "trinity_spots",
             "directions": 4
         },
+        {
+            "name": "demon_tail_base",
+            "directions": 4
+        },
         {
             "name": "demon_tail",
             "directions": 4
@@ -98,6 +102,46 @@
         {
             "name": "horns_unicorn",
             "directions": 4
+        },
+        {
+            "name": "tail_waggin",
+            "directions": 4,
+            "delays": [
+                [ 0.125, 0.125, 0.125, 0.125, 0.125, 0.125, 0.125, 0.125, 0.125, 0.125, 0.125, 0.125, 0.125, 0.125, 0.125, 0.125, 0.125, 0.125, 0.125, 0.125, 0.125, 0.125, 0.125, 0.125, 0.125, 0.125 ],
+                [ 0.125, 0.125, 0.125, 0.125, 0.125, 0.125, 0.125, 0.125, 0.125, 0.125, 0.125, 0.125, 0.125, 0.125, 0.125, 0.125, 0.125, 0.125, 0.125, 0.125, 0.125, 0.125, 0.125, 0.125, 0.125, 0.125 ],
+                [ 0.125, 0.125, 0.125, 0.125, 0.125, 0.125, 0.125, 0.125, 0.125, 0.125, 0.125, 0.125, 0.125, 0.125, 0.125, 0.125, 0.125, 0.125, 0.125, 0.125, 0.125, 0.125, 0.125, 0.125, 0.125, 0.125 ],
+                [ 0.125, 0.125, 0.125, 0.125, 0.125, 0.125, 0.125, 0.125, 0.125, 0.125, 0.125, 0.125, 0.125, 0.125, 0.125, 0.125, 0.125, 0.125, 0.125, 0.125, 0.125, 0.125, 0.125, 0.125, 0.125, 0.125 ]
+            ]
+        },
+        {
+            "name": "demon_tail_waggin",
+            "directions": 4,
+            "delays": [
+                [ 0.125, 0.125, 0.125, 0.125, 0.125, 0.125, 0.125, 0.125, 0.125, 0.125, 0.125, 0.125, 0.125, 0.125, 0.125, 0.125, 0.125, 0.125, 0.125, 0.125, 0.125, 0.125, 0.125, 0.125, 0.125, 0.125 ],
+                [ 0.125, 0.125, 0.125, 0.125, 0.125, 0.125, 0.125, 0.125, 0.125, 0.125, 0.125, 0.125, 0.125, 0.125, 0.125, 0.125, 0.125, 0.125, 0.125, 0.125, 0.125, 0.125, 0.125, 0.125, 0.125, 0.125 ],
+                [ 0.125, 0.125, 0.125, 0.125, 0.125, 0.125, 0.125, 0.125, 0.125, 0.125, 0.125, 0.125, 0.125, 0.125, 0.125, 0.125, 0.125, 0.125, 0.125, 0.125, 0.125, 0.125, 0.125, 0.125, 0.125, 0.125 ],
+                [ 0.125, 0.125, 0.125, 0.125, 0.125, 0.125, 0.125, 0.125, 0.125, 0.125, 0.125, 0.125, 0.125, 0.125, 0.125, 0.125, 0.125, 0.125, 0.125, 0.125, 0.125, 0.125, 0.125, 0.125, 0.125, 0.125 ]
+            ]
+        },
+        {
+            "name": "long_waggin",
+            "directions": 4,
+            "delays": [
+                [ 0.125, 0.125, 0.125, 0.125, 0.125, 0.125, 0.125, 0.125, 0.125, 0.125, 0.125, 0.125, 0.125, 0.125, 0.125, 0.125, 0.125, 0.125, 0.125, 0.125, 0.125, 0.125, 0.125, 0.125, 0.125, 0.125 ],
+                [ 0.125, 0.125, 0.125, 0.125, 0.125, 0.125, 0.125, 0.125, 0.125, 0.125, 0.125, 0.125, 0.125, 0.125, 0.125, 0.125, 0.125, 0.125, 0.125, 0.125, 0.125, 0.125, 0.125, 0.125, 0.125, 0.125 ],
+                [ 0.125, 0.125, 0.125, 0.125, 0.125, 0.125, 0.125, 0.125, 0.125, 0.125, 0.125, 0.125, 0.125, 0.125, 0.125, 0.125, 0.125, 0.125, 0.125, 0.125, 0.125, 0.125, 0.125, 0.125, 0.125, 0.125 ],
+                [ 0.125, 0.125, 0.125, 0.125, 0.125, 0.125, 0.125, 0.125, 0.125, 0.125, 0.125, 0.125, 0.125, 0.125, 0.125, 0.125, 0.125, 0.125, 0.125, 0.125, 0.125, 0.125, 0.125, 0.125, 0.125, 0.125 ]
+            ]
+        },
+        {
+            "name": "up_waggin",
+            "directions": 4,
+            "delays": [
+                [ 0.125, 0.125, 0.125, 0.125, 0.125, 0.125, 0.125, 0.125, 0.125, 0.125, 0.125, 0.125, 0.125, 0.125, 0.125, 0.125, 0.125, 0.125, 0.125, 0.125, 0.125, 0.125, 0.125, 0.125, 0.125, 0.125 ],
+                [ 0.125, 0.125, 0.125, 0.125, 0.125, 0.125, 0.125, 0.125, 0.125, 0.125, 0.125, 0.125, 0.125, 0.125, 0.125, 0.125, 0.125, 0.125, 0.125, 0.125, 0.125, 0.125, 0.125, 0.125, 0.125, 0.125 ],
+                [ 0.125, 0.125, 0.125, 0.125, 0.125, 0.125, 0.125, 0.125, 0.125, 0.125, 0.125, 0.125, 0.125, 0.125, 0.125, 0.125, 0.125, 0.125, 0.125, 0.125, 0.125, 0.125, 0.125, 0.125, 0.125, 0.125 ],
+                [ 0.125, 0.125, 0.125, 0.125, 0.125, 0.125, 0.125, 0.125, 0.125, 0.125, 0.125, 0.125, 0.125, 0.125, 0.125, 0.125, 0.125, 0.125, 0.125, 0.125, 0.125, 0.125, 0.125, 0.125, 0.125, 0.125 ]
+            ]
         }
     ]
 }