Исправления и дополнения на Таяров

Resources/Changelog/ChangelogADT.yml

@@ -478,3 +478,9 @@ Entries:
   - {message: Фиксы и добавления некоторых локализаций, type: Fix}
   id: 55598 #костыль отображения в Обновлениях
   time: '2023-11-04T14:20:00.0000000+00:00'
+
+- author: JustKekc
+  changes:
+  - {message: Небольшие исправления черт Таяранов, type: Fix}
+  id: 55599 #костыль отображения в Обновлениях
+  time: '2023-11-05T04:20:00.0000000+00:00'

Resources/Locale/ru-RU/ADT/Markings/tajaranmarkings.ftl

@@ -45,6 +45,8 @@ marking-TailSkeleton = Рисунок скелета (хвост)
 marking-TailSkeleton-tail_skeleton = Скелет
 marking-TailFluffy = Пушистый (хвост)
 marking-TailFluffy-tail_fluffy = Хвост
+marking-TailColor = Хвост (цвет)
+marking-Tail-tail_m = Хвост
 
 marking-Head1 = Ушки
 marking-Head1-outears = Наружное ухо

Resources/Prototypes/ADT/Tajaran/Entities/Mobs/Customization/Markings/Tajaran.yml

@@ -47,7 +47,7 @@
 
 - type: marking
   id: BodyBlots
-  bodyPart: [ Chest, RArm, LArm, RLeg, LLeg ] #глянуть почему не работает.
+  bodyPart: [ Chest, RArm, LArm, RLeg, LLeg ] 
   markingCategory: Overlay
   speciesRestriction: [TajaranSpecies]
   sprites:
@@ -56,7 +56,7 @@
 
 - type: marking
   id: patch2
-  bodyPart: [ Chest, RArm, LArm, RLeg, LLeg, RFoot ]
+  bodyPart: [ Chest, RLeg, LLeg ]
   markingCategory: Overlay
   speciesRestriction: [TajaranSpecies]
   sprites:
@@ -74,11 +74,11 @@
 
 - type: marking
   id: arm1
-  bodyPart: [ RHand, LHand, RLeg, LLeg ]
+  bodyPart: [ RArm, LArm, RLeg, LLeg ] #честно, я без малейшего понятия, почему это не работает. Черта либо клипается сквозь одежду, либо обрезает руки.
   markingCategory: Overlay
   speciesRestriction: [TajaranSpecies]
   sprites:
-    - sprite: Mobs/Customization/Tajaran/tajaran_parts.rsi
+    - sprite: Mobs/Customization/Tajaran/tajaran_overlay.rsi
       state: points
 
 #Части тел.
@@ -121,7 +121,7 @@
 
 - type: marking
   id: LLegGradient
-  bodyPart: LFoot 
+  bodyPart: RFoot
   markingCategory: Legs
   speciesRestriction: [TajaranSpecies]
   sprites:
@@ -145,7 +145,7 @@
   speciesRestriction: [TajaranSpecies]
   sprites:
     - sprite: Mobs/Customization/Tajaran/tajaran_tail.rsi #Спрайты от moroz_3
-      state: wingler_3 #исправить спрайты
+      state: wingler_3 
 
 - type: marking
   id: TailWingler2
@@ -154,7 +154,7 @@
   speciesRestriction: [TajaranSpecies]
   sprites:
     - sprite: Mobs/Customization/Tajaran/tajaran_tail.rsi #Спрайты от moroz_3
-      state: wingler_2 #исправить спрайты
+      state: wingler_2 
 
 - type: marking
   id: TailWingler1
@@ -163,7 +163,7 @@
   speciesRestriction: [TajaranSpecies]
   sprites:
     - sprite: Mobs/Customization/Tajaran/tajaran_tail.rsi #Спрайты от moroz_3
-      state: wingler_1 #исправить спрайты
+      state: wingler_1 
 
 - type: marking
   id: TailTip
@@ -201,6 +201,15 @@
     - sprite: Mobs/Customization/Tajaran/tajaran_tail.rsi #Спрайты от moroz_3
       state: tail_fluffy
 
+- type: marking
+  id: TailColor
+  bodyPart: Tail
+  markingCategory: Tail
+  speciesRestriction: [TajaranSpecies]
+  sprites:
+    - sprite: Mobs/Species/CatSkin/parts.rsi
+      state: tail_m
+
 #Голова.
 
 ##Голова (верх)
@@ -289,6 +298,15 @@
     - sprite: Mobs/Customization/Tajaran/tajaran_head.rsi #Спрайты от moroz_3
       state: mane_head
 
+- type: marking
+  id: HairEyebrows
+  bodyPart: Head
+  markingCategory: Head
+  speciesRestriction: [TajaranSpecies]
+  sprites:
+    - sprite: Mobs/Customization/Tajaran/tajaran_hairs.rsi #Спрайты от moroz_3
+      state: eyebrows
+
 #Морда.
 - type: marking
   id: Head4  
@@ -462,15 +480,6 @@
     - sprite: Mobs/Customization/Tajaran/tajaran_hairs.rsi
       state: victory
 
-- type: marking
-  id: HairEyebrows
-  bodyPart: Hair
-  markingCategory: Hair
-  speciesRestriction: [TajaranSpecies]
-  sprites:
-    - sprite: Mobs/Customization/Tajaran/tajaran_hairs.rsi #Спрайты от moroz_3
-      state: eyebrows
-
 - type: marking
   id: HairPigtail
   bodyPart: Hair

Resources/Prototypes/ADT/Tajaran/Species/Tajaran.yml

@@ -36,7 +36,7 @@
   onlyWhitelisted: true
   points:
     Hair:
-      points: 10
+      points: 1
       required: false
     FacialHair:
       points: 1
@@ -45,7 +45,7 @@
       points: 1
       required: false
     Tail:
-      points: 1
+      points: 2
       required: false
     Head:
       points: 3

Resources/Textures/Mobs/Customization/Tajaran/tajaran_overlay.rsi/meta.json

@@ -10,6 +10,7 @@
         { "name": "stripes_body", "directions": 4 },
         { "name": "skeleton_body", "directions": 4 },
         { "name": "patch", "directions": 4 },
-        { "name": "blots_body", "directions": 4 }
+        { "name": "blots_body", "directions": 4 },
+        { "name": "points", "directions": 4 }
     ]
 }

Resources/Textures/Mobs/Customization/Tajaran/tajaran_parts.rsi/meta.json

@@ -12,7 +12,6 @@
         { "name": "gradient_LHand", "directions": 4 },
         { "name": "gradient_RHand", "directions": 4 },
         { "name": "gradient_LLeg", "directions": 4 },
-        { "name": "gradient_RLeg", "directions": 4 },
-        { "name": "points", "directions": 4 }
+        { "name": "gradient_RLeg", "directions": 4 }
     ]
 }