diff --git a/Resources/Locale/en-US/_ADT/markings/demon.ftl b/Resources/Locale/en-US/_ADT/markings/demon.ftl index 8090d0df433..837f69a37c8 100644 --- a/Resources/Locale/en-US/_ADT/markings/demon.ftl +++ b/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 diff --git a/Resources/Prototypes/_ADT/Mobs/Customization/demon/demon.yml b/Resources/Prototypes/_ADT/Mobs/Customization/demon/demon.yml index d12f8dc3ab9..18a6d9eadfd 100644 --- a/Resources/Prototypes/_ADT/Mobs/Customization/demon/demon.yml +++ b/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 diff --git a/Resources/Textures/_ADT/Mobs/Customization/Demon/custom.rsi/demon_tail_base.png b/Resources/Textures/_ADT/Mobs/Customization/Demon/custom.rsi/demon_tail_base.png new file mode 100644 index 00000000000..cd8f833d5d3 Binary files /dev/null and b/Resources/Textures/_ADT/Mobs/Customization/Demon/custom.rsi/demon_tail_base.png differ diff --git a/Resources/Textures/_ADT/Mobs/Customization/Demon/custom.rsi/demon_tail_waggin.png b/Resources/Textures/_ADT/Mobs/Customization/Demon/custom.rsi/demon_tail_waggin.png new file mode 100644 index 00000000000..97a31b56645 Binary files /dev/null and b/Resources/Textures/_ADT/Mobs/Customization/Demon/custom.rsi/demon_tail_waggin.png differ diff --git a/Resources/Textures/_ADT/Mobs/Customization/Demon/custom.rsi/long_waggin.png b/Resources/Textures/_ADT/Mobs/Customization/Demon/custom.rsi/long_waggin.png new file mode 100644 index 00000000000..df6010e4191 Binary files /dev/null and b/Resources/Textures/_ADT/Mobs/Customization/Demon/custom.rsi/long_waggin.png differ diff --git a/Resources/Textures/_ADT/Mobs/Customization/Demon/custom.rsi/meta.json b/Resources/Textures/_ADT/Mobs/Customization/Demon/custom.rsi/meta.json index b407f01caad..6591a69526e 100644 --- a/Resources/Textures/_ADT/Mobs/Customization/Demon/custom.rsi/meta.json +++ b/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 ] + ] } ] } diff --git a/Resources/Textures/_ADT/Mobs/Customization/Demon/custom.rsi/tail_waggin.png b/Resources/Textures/_ADT/Mobs/Customization/Demon/custom.rsi/tail_waggin.png new file mode 100644 index 00000000000..7f7af429130 Binary files /dev/null and b/Resources/Textures/_ADT/Mobs/Customization/Demon/custom.rsi/tail_waggin.png differ diff --git a/Resources/Textures/_ADT/Mobs/Customization/Demon/custom.rsi/up_waggin.png b/Resources/Textures/_ADT/Mobs/Customization/Demon/custom.rsi/up_waggin.png new file mode 100644 index 00000000000..03a5dfbde19 Binary files /dev/null and b/Resources/Textures/_ADT/Mobs/Customization/Demon/custom.rsi/up_waggin.png differ