diff --git a/Resources/Changelog/ChangelogADT.yml b/Resources/Changelog/ChangelogADT.yml index 4fbb78a06fe..39c1da526c6 100644 --- a/Resources/Changelog/ChangelogADT.yml +++ b/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' diff --git a/Resources/Locale/ru-RU/ADT/Markings/tajaranmarkings.ftl b/Resources/Locale/ru-RU/ADT/Markings/tajaranmarkings.ftl index 4de34737c31..b2c75423172 100644 --- a/Resources/Locale/ru-RU/ADT/Markings/tajaranmarkings.ftl +++ b/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 = Наружное ухо diff --git a/Resources/Prototypes/ADT/Tajaran/Entities/Mobs/Customization/Markings/Tajaran.yml b/Resources/Prototypes/ADT/Tajaran/Entities/Mobs/Customization/Markings/Tajaran.yml index 236dc0e8a95..1db1d491cf5 100644 --- a/Resources/Prototypes/ADT/Tajaran/Entities/Mobs/Customization/Markings/Tajaran.yml +++ b/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 diff --git a/Resources/Prototypes/ADT/Tajaran/Species/Tajaran.yml b/Resources/Prototypes/ADT/Tajaran/Species/Tajaran.yml index bc6d1ca729c..b3d0b173ab6 100644 --- a/Resources/Prototypes/ADT/Tajaran/Species/Tajaran.yml +++ b/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 diff --git a/Resources/Textures/Mobs/Customization/Tajaran/tajaran_overlay.rsi/meta.json b/Resources/Textures/Mobs/Customization/Tajaran/tajaran_overlay.rsi/meta.json index d0d93e078f4..b378d9e5384 100644 --- a/Resources/Textures/Mobs/Customization/Tajaran/tajaran_overlay.rsi/meta.json +++ b/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 } ] } diff --git a/Resources/Textures/Mobs/Customization/Tajaran/tajaran_overlay.rsi/points.png b/Resources/Textures/Mobs/Customization/Tajaran/tajaran_overlay.rsi/points.png new file mode 100644 index 00000000000..02d96d38022 Binary files /dev/null and b/Resources/Textures/Mobs/Customization/Tajaran/tajaran_overlay.rsi/points.png differ diff --git a/Resources/Textures/Mobs/Customization/Tajaran/tajaran_parts.rsi/gradient_LHand.png b/Resources/Textures/Mobs/Customization/Tajaran/tajaran_parts.rsi/gradient_LHand.png index 0b37298bf2a..78e0b4d55cb 100644 Binary files a/Resources/Textures/Mobs/Customization/Tajaran/tajaran_parts.rsi/gradient_LHand.png and b/Resources/Textures/Mobs/Customization/Tajaran/tajaran_parts.rsi/gradient_LHand.png differ diff --git a/Resources/Textures/Mobs/Customization/Tajaran/tajaran_parts.rsi/gradient_LLeg.png b/Resources/Textures/Mobs/Customization/Tajaran/tajaran_parts.rsi/gradient_LLeg.png index 80be83f4844..ee58994e29d 100644 Binary files a/Resources/Textures/Mobs/Customization/Tajaran/tajaran_parts.rsi/gradient_LLeg.png and b/Resources/Textures/Mobs/Customization/Tajaran/tajaran_parts.rsi/gradient_LLeg.png differ diff --git a/Resources/Textures/Mobs/Customization/Tajaran/tajaran_parts.rsi/gradient_RHand.png b/Resources/Textures/Mobs/Customization/Tajaran/tajaran_parts.rsi/gradient_RHand.png index bbd33034af4..c2608dce1e7 100644 Binary files a/Resources/Textures/Mobs/Customization/Tajaran/tajaran_parts.rsi/gradient_RHand.png and b/Resources/Textures/Mobs/Customization/Tajaran/tajaran_parts.rsi/gradient_RHand.png differ diff --git a/Resources/Textures/Mobs/Customization/Tajaran/tajaran_parts.rsi/gradient_RLeg.png b/Resources/Textures/Mobs/Customization/Tajaran/tajaran_parts.rsi/gradient_RLeg.png index 58e56a87d74..2c813edba83 100644 Binary files a/Resources/Textures/Mobs/Customization/Tajaran/tajaran_parts.rsi/gradient_RLeg.png and b/Resources/Textures/Mobs/Customization/Tajaran/tajaran_parts.rsi/gradient_RLeg.png differ diff --git a/Resources/Textures/Mobs/Customization/Tajaran/tajaran_parts.rsi/meta.json b/Resources/Textures/Mobs/Customization/Tajaran/tajaran_parts.rsi/meta.json index e8bbd93d8f2..4bd468badb2 100644 --- a/Resources/Textures/Mobs/Customization/Tajaran/tajaran_parts.rsi/meta.json +++ b/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 } ] } diff --git a/Resources/Textures/Mobs/Customization/Tajaran/tajaran_parts.rsi/points.png b/Resources/Textures/Mobs/Customization/Tajaran/tajaran_parts.rsi/points.png deleted file mode 100644 index 9011f7f6e77..00000000000 Binary files a/Resources/Textures/Mobs/Customization/Tajaran/tajaran_parts.rsi/points.png and /dev/null differ diff --git a/Resources/Textures/Mobs/Species/CatSkin/parts.rsi/l_leg.png b/Resources/Textures/Mobs/Species/CatSkin/parts.rsi/l_leg.png index 46256b7a42c..ba434cf61e1 100644 Binary files a/Resources/Textures/Mobs/Species/CatSkin/parts.rsi/l_leg.png and b/Resources/Textures/Mobs/Species/CatSkin/parts.rsi/l_leg.png differ diff --git a/Resources/Textures/Mobs/Species/CatSkin/parts.rsi/r_foot.png b/Resources/Textures/Mobs/Species/CatSkin/parts.rsi/r_foot.png index 961bd62f4b3..bdf64f4a9dd 100644 Binary files a/Resources/Textures/Mobs/Species/CatSkin/parts.rsi/r_foot.png and b/Resources/Textures/Mobs/Species/CatSkin/parts.rsi/r_foot.png differ diff --git a/Resources/Textures/Mobs/Species/CatSkin/parts.rsi/r_leg.png b/Resources/Textures/Mobs/Species/CatSkin/parts.rsi/r_leg.png index 3b752aa7186..20de31b06a5 100644 Binary files a/Resources/Textures/Mobs/Species/CatSkin/parts.rsi/r_leg.png and b/Resources/Textures/Mobs/Species/CatSkin/parts.rsi/r_leg.png differ