T V Tails

AdventureTimeSS14 · Aug 30, 2024 · c38c7e3 · c38c7e3
1 parent f852841
commit c38c7e3
Show file tree

Hide file tree

Showing 34 changed files with 199 additions and 14 deletions.
diff --git a/Resources/Prototypes/ADT/Entities/Mobs/Customization/Markings/Tajaran.yml b/Resources/Prototypes/ADT/Entities/Mobs/Customization/Markings/Tajaran.yml
@@ -144,6 +144,8 @@
   markingCategory: Tail
   speciesRestriction: [TajaranSpecies]
   sprites:
+    - sprite: ADT/Mobs/Species/Tajaran/parts.rsi
+      state: tail_m
     - sprite: ADT/Mobs/Customization/Tajaran/tajaran_tail.rsi #Спрайты от moroz_3
       state: wingler_3 
 
@@ -153,6 +155,8 @@
   markingCategory: Tail
   speciesRestriction: [TajaranSpecies]
   sprites:
+    - sprite: ADT/Mobs/Species/Tajaran/parts.rsi
+      state: tail_m
     - sprite: ADT/Mobs/Customization/Tajaran/tajaran_tail.rsi #Спрайты от moroz_3
       state: wingler_2 
 
@@ -162,6 +166,8 @@
   markingCategory: Tail
   speciesRestriction: [TajaranSpecies]
   sprites:
+    - sprite: ADT/Mobs/Species/Tajaran/parts.rsi
+      state: tail_m
     - sprite: ADT/Mobs/Customization/Tajaran/tajaran_tail.rsi #Спрайты от moroz_3
       state: wingler_1 
 
@@ -171,6 +177,8 @@
   markingCategory: Tail
   speciesRestriction: [TajaranSpecies]
   sprites:
+    - sprite: ADT/Mobs/Species/Tajaran/parts.rsi
+      state: tail_m
     - sprite: ADT/Mobs/Customization/Tajaran/tajaran_tail.rsi #Спрайты от moroz_3
       state: tail_tip
 
@@ -180,6 +188,8 @@
   markingCategory: Tail
   speciesRestriction: [TajaranSpecies]
   sprites:
+    - sprite: ADT/Mobs/Species/Tajaran/parts.rsi
+      state: tail_m
     - sprite: ADT/Mobs/Customization/Tajaran/tajaran_tail.rsi #Спрайты от moroz_3
       state: tail_ring
 
@@ -189,6 +199,8 @@
   markingCategory: Tail
   speciesRestriction: [TajaranSpecies]
   sprites:
+    - sprite: ADT/Mobs/Species/Tajaran/parts.rsi
+      state: tail_m
     - sprite: ADT/Mobs/Customization/Tajaran/tajaran_tail.rsi #Спрайты от prazat911
       state: tail_skeleton
 
@@ -210,6 +222,91 @@
     - sprite: ADT/Mobs/Species/Tajaran/parts.rsi
       state: tail_m
 
+#Хвосты Animated
+- type: marking
+  id: TailWingler3Animated
+  bodyPart: Tail
+  markingCategory: Tail
+  speciesRestriction: []
+  sprites:
+    - sprite: ADT/Mobs/Species/Tajaran/parts.rsi
+      state: tail_m_wagging
+    - sprite: ADT/Mobs/Customization/Tajaran/tajaran_tail.rsi #Спрайты от moroz_3
+      state: wingler_3_wagging
+
+- type: marking
+  id: TailWingler2Animated
+  bodyPart: Tail
+  markingCategory: Tail
+  speciesRestriction: []
+  sprites:
+    - sprite: ADT/Mobs/Species/Tajaran/parts.rsi
+      state: tail_m_wagging
+    - sprite: ADT/Mobs/Customization/Tajaran/tajaran_tail.rsi #Спрайты от moroz_3
+      state: wingler_2_wagging
+
+- type: marking
+  id: TailWingler1Animated
+  bodyPart: Tail
+  markingCategory: Tail
+  speciesRestriction: []
+  sprites:
+    - sprite: ADT/Mobs/Species/Tajaran/parts.rsi
+      state: tail_m_wagging
+    - sprite: ADT/Mobs/Customization/Tajaran/tajaran_tail.rsi #Спрайты от moroz_3
+      state: wingler_1_wagging
+
+- type: marking
+  id: TailTipAnimated
+  bodyPart: Tail
+  markingCategory: Tail
+  speciesRestriction: []
+  sprites:
+    - sprite: ADT/Mobs/Species/Tajaran/parts.rsi
+      state: tail_m_wagging
+    - sprite: ADT/Mobs/Customization/Tajaran/tajaran_tail.rsi #Спрайты от moroz_3
+      state: tail_tip_wagging
+
+- type: marking
+  id: TailRingAnimated
+  bodyPart: Tail
+  markingCategory: Tail
+  speciesRestriction: []
+  sprites:
+    - sprite: ADT/Mobs/Species/Tajaran/parts.rsi
+      state: tail_m_wagging
+    - sprite: ADT/Mobs/Customization/Tajaran/tajaran_tail.rsi #Спрайты от moroz_3
+      state: tail_ring_wagging
+
+- type: marking
+  id: TailSkeletonAnimated
+  bodyPart: Tail
+  markingCategory: Tail
+  speciesRestriction: []
+  sprites:
+    - sprite: ADT/Mobs/Species/Tajaran/parts.rsi
+      state: tail_m_wagging
+    - sprite: ADT/Mobs/Customization/Tajaran/tajaran_tail.rsi #Спрайты от prazat911
+      state: tail_skeleton_wagging
+
+- type: marking
+  id: TailFluffyAnimated
+  bodyPart: Tail
+  markingCategory: Tail
+  speciesRestriction: []
+  sprites:
+    - sprite: ADT/Mobs/Customization/Tajaran/tajaran_tail.rsi #Спрайты от moroz_3
+      state: tail_fluffy_wagging
+
+- type: marking
+  id: TailColorAnimated
+  bodyPart: Tail
+  markingCategory: Tail
+  speciesRestriction: []
+  sprites:
+    - sprite: ADT/Mobs/Species/Tajaran/parts.rsi
+      state: tail_m_wagging
+
 #Голова.
 
 ##Голова (верх)

diff --git a/Resources/Prototypes/ADT/Entities/Mobs/Customization/Markings/Vulpkanin.yml b/Resources/Prototypes/ADT/Entities/Mobs/Customization/Markings/Vulpkanin.yml
@@ -76,6 +76,8 @@
   markingCategory: Tail
   speciesRestriction: [VulpkaninSpecies]
   sprites:
+    - sprite: ADT/Mobs/Customization/Vulpkanin/vulpkanin_tail.rsi
+      state: tail_m
     - sprite: ADT/Mobs/Customization/Vulpkanin/vulpkanin_tail.rsi
       state: tail1
 
@@ -85,6 +87,8 @@
   markingCategory: Tail
   speciesRestriction: [VulpkaninSpecies]
   sprites:
+    - sprite: ADT/Mobs/Customization/Vulpkanin/vulpkanin_tail.rsi
+      state: tail_m
     - sprite: ADT/Mobs/Customization/Vulpkanin/vulpkanin_tail.rsi
       state: tail2
 
@@ -97,6 +101,38 @@
     - sprite: ADT/Mobs/Customization/Vulpkanin/vulpkanin_tail.rsi
       state: tail_m
 
+#Animated
+- type: marking
+  id: ADTVulpkanintail1Animated
+  bodyPart: Tail
+  markingCategory: Tail
+  speciesRestriction: []
+  sprites:
+    - sprite: ADT/Mobs/Customization/Vulpkanin/vulpkanin_tail.rsi
+      state: tail_m_wagging
+    - sprite: ADT/Mobs/Customization/Vulpkanin/vulpkanin_tail.rsi
+      state: tail1_wagging
+
+- type: marking
+  id: ADTVulpkanintail2Animated
+  bodyPart: Tail
+  markingCategory: Tail
+  speciesRestriction: []
+  sprites:
+    - sprite: ADT/Mobs/Customization/Vulpkanin/vulpkanin_tail.rsi
+      state: tail_m_wagging
+    - sprite: ADT/Mobs/Customization/Vulpkanin/vulpkanin_tail.rsi
+      state: tail2_wagging
+
+- type: marking
+  id: ADTVulpkanintailAllAnimated
+  bodyPart: Tail
+  markingCategory: Tail
+  speciesRestriction: []
+  sprites:
+    - sprite: ADT/Mobs/Customization/Vulpkanin/vulpkanin_tail.rsi
+      state: tail_m_wagging
+
 #- type: marking
 #  id: ADTVulpkanintail3
 #  bodyPart: Tail

diff --git a/Resources/Prototypes/ADT/Entities/Mobs/Species/Tajaran.yml b/Resources/Prototypes/ADT/Entities/Mobs/Species/Tajaran.yml
@@ -53,6 +53,7 @@
       noRot: true
       drawdepth: Mobs
       scale: 0.95, 0.95
+    - type: Wagging
 
 - type: entity
   save: false

diff --git a/Resources/Prototypes/ADT/Entities/Mobs/Species/Vulpkanin.yml b/Resources/Prototypes/ADT/Entities/Mobs/Species/Vulpkanin.yml
@@ -55,6 +55,7 @@
       noRot: true
       drawdepth: Mobs
       scale: 0.95, 0.95
+    - type: Wagging
 
 - type: entity
   save: false

diff --git a/Resources/Prototypes/ADT/Species/Tajaran.yml b/Resources/Prototypes/ADT/Species/Tajaran.yml
@@ -29,7 +29,7 @@
     RLeg: MobTajaranRLeg
     LFoot: MobTajaranLFoot
     RFoot: MobTajaranRFoot
-    Tail: MobTajaranTail
+    Tail: MobHumanoidAnyMarking
 
 - type: markingPoints
   id: MobTajaranMarkingLimits
@@ -46,7 +46,8 @@
       required: false
     Tail:
       points: 1
-      required: false
+      required: true
+      defaultMarkings: [ TailColor ]
     Head:
       points: 3
       required: false

diff --git a/Resources/Prototypes/ADT/Species/Vulpkanin.yml b/Resources/Prototypes/ADT/Species/Vulpkanin.yml
@@ -29,7 +29,7 @@
     RLeg: MobVulpkaninRLeg
     LFoot: MobVulpkaninLFoot
     RFoot: MobVulpkaninRFoot
-    Tail: MobVulpkaninTail
+    Tail: MobHumanoidAnyMarking
 
 - type: markingPoints
   id: MobVulpkaninMarkingLimits
@@ -43,7 +43,8 @@
       required: false
     Tail:
       points: 1
-      required: false
+      required: true
+      defaultMarkings: [ ADTVulpkanintailAll ]
     Head:
       points: 4
       required: false

diff --git a/Resources/Textures/ADT/Mobs/Customization/Tajaran/tajaran_tail.rsi/meta.json b/Resources/Textures/ADT/Mobs/Customization/Tajaran/tajaran_tail.rsi/meta.json
@@ -8,7 +8,7 @@
     },
     "states": [
         { 
-            "name": "wingler_1",
+            "name": "wingler_1_wagging",
             "directions": 4,
             "delays": [
                 [0.15, 0.15, 0.15, 0.15, 0.15, 0.15, 0.15, 0.15, 0.15, 0.15, 0.15, 0.15],
@@ -18,7 +18,7 @@
             ]
         },
         { 
-            "name": "wingler_2",
+            "name": "wingler_2_wagging",
             "directions": 4,
             "delays": [
                 [0.15, 0.15, 0.15, 0.15, 0.15, 0.15, 0.15, 0.15, 0.15, 0.15, 0.15, 0.15],
@@ -28,7 +28,7 @@
             ]
         },
         { 
-            "name": "wingler_3",
+            "name": "wingler_3_wagging",
             "directions": 4,
             "delays": [
                 [0.15, 0.15, 0.15, 0.15, 0.15, 0.15, 0.15, 0.15, 0.15, 0.15, 0.15, 0.15],
@@ -38,7 +38,7 @@
             ]
         },
         { 
-            "name": "tail_ring",
+            "name": "tail_ring_wagging",
             "directions": 4,
             "delays": [
                 [0.15, 0.15, 0.15, 0.15, 0.15, 0.15, 0.15, 0.15, 0.15, 0.15, 0.15, 0.15],
@@ -48,7 +48,7 @@
             ]
         },
         { 
-            "name": "tail_skeleton",
+            "name": "tail_skeleton_wagging",
             "directions": 4,
             "delays": [
                 [0.15, 0.15, 0.15, 0.15, 0.15, 0.15, 0.15, 0.15, 0.15, 0.15, 0.15, 0.15],
@@ -58,7 +58,7 @@
             ]
         },
         { 
-            "name": "tail_fluffy",
+            "name": "tail_fluffy_wagging",
             "directions": 4,
             "delays": [
                 [0.15, 0.15, 0.15, 0.15, 0.15, 0.15, 0.15, 0.15, 0.15, 0.15, 0.15, 0.15],
@@ -68,14 +68,42 @@
             ]
         },
         { 
-            "name": "tail_tip",
+            "name": "tail_tip_wagging",
             "directions": 4,
             "delays": [
                 [0.15, 0.15, 0.15, 0.15, 0.15, 0.15, 0.15, 0.15, 0.15, 0.15, 0.15, 0.15],
                 [0.15, 0.15, 0.15, 0.15, 0.15, 0.15, 0.15, 0.15, 0.15, 0.15, 0.15, 0.15],
                 [0.15, 0.15, 0.15, 0.15, 0.15, 0.15, 0.15, 0.15, 0.15, 0.15, 0.15, 0.15],
                 [0.15, 0.15, 0.15, 0.15, 0.15, 0.15, 0.15, 0.15, 0.15, 0.15, 0.15, 0.15]
             ]
+        },
+        { 
+            "name": "wingler_1",
+            "directions": 4
+        },
+        { 
+            "name": "wingler_2",
+            "directions": 4
+        },
+        { 
+            "name": "wingler_3",
+            "directions": 4
+        },
+        { 
+            "name": "tail_ring",
+            "directions": 4
+        },
+        { 
+            "name": "tail_skeleton",
+            "directions": 4
+        },
+        { 
+            "name": "tail_fluffy",
+            "directions": 4
+        },
+        { 
+            "name": "tail_tip",
+            "directions": 4
         }
     ]
 }
diff --git a/Resources/Textures/ADT/Mobs/Customization/Tajaran/tajaran_tail.rsi/tail_fluffy.png b/Resources/Textures/ADT/Mobs/Customization/Tajaran/tajaran_tail.rsi/tail_fluffy.png
diff --git a/...extures/ADT/Mobs/Customization/Tajaran/tajaran_tail.rsi/tail_fluffy_wagging.png b/...extures/ADT/Mobs/Customization/Tajaran/tajaran_tail.rsi/tail_fluffy_wagging.png
diff --git a/Resources/Textures/ADT/Mobs/Customization/Tajaran/tajaran_tail.rsi/tail_ring.png b/Resources/Textures/ADT/Mobs/Customization/Tajaran/tajaran_tail.rsi/tail_ring.png
diff --git a/.../Textures/ADT/Mobs/Customization/Tajaran/tajaran_tail.rsi/tail_ring_wagging.png b/.../Textures/ADT/Mobs/Customization/Tajaran/tajaran_tail.rsi/tail_ring_wagging.png
diff --git a/...rces/Textures/ADT/Mobs/Customization/Tajaran/tajaran_tail.rsi/tail_skeleton.png b/...rces/Textures/ADT/Mobs/Customization/Tajaran/tajaran_tail.rsi/tail_skeleton.png
diff --git a/...tures/ADT/Mobs/Customization/Tajaran/tajaran_tail.rsi/tail_skeleton_wagging.png b/...tures/ADT/Mobs/Customization/Tajaran/tajaran_tail.rsi/tail_skeleton_wagging.png
diff --git a/Resources/Textures/ADT/Mobs/Customization/Tajaran/tajaran_tail.rsi/tail_tip.png b/Resources/Textures/ADT/Mobs/Customization/Tajaran/tajaran_tail.rsi/tail_tip.png
diff --git a/...s/Textures/ADT/Mobs/Customization/Tajaran/tajaran_tail.rsi/tail_tip_wagging.png b/...s/Textures/ADT/Mobs/Customization/Tajaran/tajaran_tail.rsi/tail_tip_wagging.png
diff --git a/Resources/Textures/ADT/Mobs/Customization/Tajaran/tajaran_tail.rsi/wingler_1.png b/Resources/Textures/ADT/Mobs/Customization/Tajaran/tajaran_tail.rsi/wingler_1.png
diff --git a/.../Textures/ADT/Mobs/Customization/Tajaran/tajaran_tail.rsi/wingler_1_wagging.png b/.../Textures/ADT/Mobs/Customization/Tajaran/tajaran_tail.rsi/wingler_1_wagging.png
diff --git a/Resources/Textures/ADT/Mobs/Customization/Tajaran/tajaran_tail.rsi/wingler_2.png b/Resources/Textures/ADT/Mobs/Customization/Tajaran/tajaran_tail.rsi/wingler_2.png
diff --git a/.../Textures/ADT/Mobs/Customization/Tajaran/tajaran_tail.rsi/wingler_2_wagging.png b/.../Textures/ADT/Mobs/Customization/Tajaran/tajaran_tail.rsi/wingler_2_wagging.png
diff --git a/Resources/Textures/ADT/Mobs/Customization/Tajaran/tajaran_tail.rsi/wingler_3.png b/Resources/Textures/ADT/Mobs/Customization/Tajaran/tajaran_tail.rsi/wingler_3.png
diff --git a/.../Textures/ADT/Mobs/Customization/Tajaran/tajaran_tail.rsi/wingler_3_wagging.png b/.../Textures/ADT/Mobs/Customization/Tajaran/tajaran_tail.rsi/wingler_3_wagging.png