Skip to content

Commit

Permalink
Виляние хвостом Вульп и Таяр через Action (AdventureTimeSS14#376)
Browse files Browse the repository at this point in the history
<!-- ЭТО ШАБЛОН ВАШЕГО PULL REQUEST. Текст между стрелками - это
комментарии - они не будут видны в PR. -->

## Описание PR
<!-- Ниже опишите ваш Pull Request. Что он изменяет? На что еще это
может повлиять? Постарайтесь описать все внесённые вами изменения! -->

**Ссылка на публикацию в Discord**
<!-- Укажите ссылки на соответствующие обсуждения, проблемы, баги,
заказы в разработку или предложения

Если ссылки отсутствуют или этот PR ваша личная инициатива, данный
раздел описания можно удалить. -->

- [Перенос
контента](https://discord.com/channels/901772674865455115/1273207343412412551)

**Медиа**


https://github.com/user-attachments/assets/ba6c4d92-495c-4d4f-89c4-c9fc847e77e0


**Проверки**
<!-- Выполнение всех следующих действий, если это приемлемо для вида
изменений сильно ускорит разбор вашего PR -->
- [x] PR полностью завершён и мне не нужна помощь чтобы его закончить.
- [x] Я внимательно просмотрел все свои изменения и багов в них не
нашёл.
- [x] Я запускал локальный сервер со своими изменениями и всё
протестировал.
- [x] Я добавил скриншот/видео демонстрации PR в игре, **или** этот PR
этого не требует.

**Изменения**
<!--
Здесь вы можете написать список изменений, который будет автоматически
добавлен в игру, когда ваш PR будет принят.

В журнал изменений следует помещать только то, что действительно важно
игрокам.

В списке изменений тип значка не является часть предложения, поэтому
явно указывайте - Добавлен, Удалён, Изменён.
плохо: - add: Новый инструмент для инженеров
хорошо: - add: Добавлен новый инструмент для инженеров

Вы можете указать своё имя после символа 🆑 именно оно будет
отображаться в журнале изменений (иначе будет использоваться ваше имя на
GitHub)
Например: 🆑 Ian

-->

🆑 Nezervou
- fix: Вульпканины и Таяры теперь могут контролировать свои хвосты.
  • Loading branch information
Lonkuk authored Aug 30, 2024
1 parent 525e033 commit 8000278
Show file tree
Hide file tree
Showing 34 changed files with 199 additions and 14 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand All @@ -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

Expand All @@ -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

Expand All @@ -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

Expand All @@ -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

Expand All @@ -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

Expand All @@ -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

#Голова.

##Голова (верх)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand All @@ -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

Expand All @@ -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
Expand Down
1 change: 1 addition & 0 deletions Resources/Prototypes/ADT/Entities/Mobs/Species/Tajaran.yml
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,7 @@
noRot: true
drawdepth: Mobs
scale: 0.95, 0.95
- type: Wagging

- type: entity
save: false
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,7 @@
noRot: true
drawdepth: Mobs
scale: 0.95, 0.95
- type: Wagging

- type: entity
save: false
Expand Down
5 changes: 3 additions & 2 deletions Resources/Prototypes/ADT/Species/Tajaran.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
RLeg: MobTajaranRLeg
LFoot: MobTajaranLFoot
RFoot: MobTajaranRFoot
Tail: MobTajaranTail
Tail: MobHumanoidAnyMarking

- type: markingPoints
id: MobTajaranMarkingLimits
Expand All @@ -46,7 +46,8 @@
required: false
Tail:
points: 1
required: false
required: true
defaultMarkings: [ TailColor ]
Head:
points: 3
required: false
Expand Down
5 changes: 3 additions & 2 deletions Resources/Prototypes/ADT/Species/Vulpkanin.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
RLeg: MobVulpkaninRLeg
LFoot: MobVulpkaninLFoot
RFoot: MobVulpkaninRFoot
Tail: MobVulpkaninTail
Tail: MobHumanoidAnyMarking

- type: markingPoints
id: MobVulpkaninMarkingLimits
Expand All @@ -43,7 +43,8 @@
required: false
Tail:
points: 1
required: false
required: true
defaultMarkings: [ ADTVulpkanintailAll ]
Head:
points: 4
required: false
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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],
Expand All @@ -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],
Expand All @@ -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],
Expand All @@ -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],
Expand All @@ -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],
Expand All @@ -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],
Expand All @@ -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
}
]
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading

0 comments on commit 8000278

Please sign in to comment.