Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Animation for vulpa tails #2071

Merged
merged 8 commits into from
May 23, 2024
Merged

Animation for vulpa tails #2071

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
5fd281a
Start of vulpa animation
Litogin Apr 22, 2024
bc18d6b
fix
Litogin Apr 27, 2024
8892e23
Animation for a wolf's tail
Litogin Apr 27, 2024
1e4ef19
Merge branch 'space-syndicate:master' into anim_vulp_tail
Litogin May 8, 2024
6857313
Small changes
Litogin May 8, 2024
492703d
wolf tail animation
Litogin May 21, 2024
c7c0135
oops, forgot
Litogin May 21, 2024
d26320e
Merge branch 'space-syndicate:master' into anim_vulp_tail
Litogin May 23, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions Resources/Locale/ru-RU/corvax/markings/vulpkanin.ftl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
marking-PawSocks-pawsocks = Носки на лапах
marking-PawSocks = Носки на лапах
marking-FoxTail-vulp_tail = Лисий хвост
marking-FoxTail = Лисий хвост
marking-FoxTail-vulp_tail = Лисий хвост (основа)
marking-FoxTail = Лисий хвост (конец)
marking-FoxTail-vulp_tail_inner = Лисий хвост (конец)
marking-FoxEar-vulp_ear = Лисье ухо (внешнее)
marking-FoxEar-vulp_ear_inner = Лисье ухо (внутреннее)
marking-FoxEar = Лисье ухо (внутреннее)
Expand Down
25 changes: 25 additions & 0 deletions Resources/Prototypes/Corvax/Entities/Mobs/Customization/Markings/vulpkanin.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,8 @@
sprites:
- sprite: Corvax/Mobs/Customization/vulpkanin.rsi
state: vulp_tail
- sprite: Corvax/Mobs/Customization/vulpkanin.rsi
state: vulp_tail_inner

- type: marking
id: FoxEar
Expand Down Expand Up @@ -55,3 +57,26 @@
sprites:
- sprite: Corvax/Mobs/Customization/vulpkanin.rsi
state: vulp_face

# Animated
- type: marking
id: FoxTailAnimated
bodyPart: Tail
markingCategory: Tail
speciesRestriction: []
sprites:
- sprite: Corvax/Mobs/Customization/vulpkanin.rsi
state: tail_fox_waggin
- sprite: Corvax/Mobs/Customization/vulpkanin.rsi
state: tail_fox_inner_waggin

- type: marking
id: WolfTailAnimated
bodyPart: Tail
markingCategory: Tail
speciesRestriction: []
sprites:
- sprite: Corvax/Mobs/Customization/vulpkanin.rsi
state: tail_wolf_waggin
- sprite: Corvax/Mobs/Customization/vulpkanin.rsi
state: tail_wolf_inner_waggin
1 change: 1 addition & 0 deletions Resources/Prototypes/Corvax/Entities/Mobs/Species/vulpkanin.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,7 @@
damageRecovery:
types:
Asphyxiation: -2.0
- type: Wagging

- type: entity
save: false
Expand Down
318 changes: 317 additions & 1 deletion Resources/Textures/Corvax/Mobs/Customization/vulpkanin.rsi/meta.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "Taken from Occulus-Eris (https://github.com/Occulus-Server/Occulus-Eris), modified by Ko4erga",
"copyright": "Taken from Occulus-Eris (https://github.com/Occulus-Server/Occulus-Eris), modified and addendum by Ko4erga and MureixIoL",
"size": {
"x": 32,
"y": 32
Expand All @@ -19,6 +19,10 @@
"name": "vulp_tail",
"directions": 4
},
{
"name": "vulp_tail_inner",
"directions": 4
},
{
"name": "vulp_ear",
"directions": 4
Expand All @@ -42,6 +46,318 @@
{
"name": "wolf_tail_inner",
"directions": 4
},
{
"name": "tail_fox_waggin",
"directions": 4,
"delays": [
[
0.1,
0.1,
0.1,
0.1,
0.1,
0.1,
0.1,
0.1,
0.1,
0.1,
0.1,
0.1,
0.1,
0.1,
0.1,
0.1
],
[
0.1,
0.1,
0.1,
0.1,
0.1,
0.1,
0.1,
0.1,
0.1,
0.1,
0.1,
0.1,
0.1,
0.1,
0.1,
0.1
],
[
0.1,
0.1,
0.1,
0.1,
0.1,
0.1,
0.1,
0.1,
0.1,
0.1,
0.1,
0.1,
0.1,
0.1,
0.1,
0.1
],
[
0.1,
0.1,
0.1,
0.1,
0.1,
0.1,
0.1,
0.1,
0.1,
0.1,
0.1,
0.1,
0.1,
0.1,
0.1,
0.1
]
]
},
{
"name": "tail_fox_inner_waggin",
"directions": 4,
"delays": [
[
0.1,
0.1,
0.1,
0.1,
0.1,
0.1,
0.1,
0.1,
0.1,
0.1,
0.1,
0.1,
0.1,
0.1,
0.1,
0.1
],
[
0.1,
0.1,
0.1,
0.1,
0.1,
0.1,
0.1,
0.1,
0.1,
0.1,
0.1,
0.1,
0.1,
0.1,
0.1,
0.1
],
[
0.1,
0.1,
0.1,
0.1,
0.1,
0.1,
0.1,
0.1,
0.1,
0.1,
0.1,
0.1,
0.1,
0.1,
0.1,
0.1
],
[
0.1,
0.1,
0.1,
0.1,
0.1,
0.1,
0.1,
0.1,
0.1,
0.1,
0.1,
0.1,
0.1,
0.1,
0.1,
0.1
]
]
},
{
"name": "tail_wolf_waggin",
"directions": 4,
"delays": [
[
0.1,
0.1,
0.1,
0.1,
0.1,
0.1,
0.1,
0.1,
0.1,
0.1,
0.1,
0.1,
0.1,
0.1,
0.1,
0.1
],
[
0.1,
0.1,
0.1,
0.1,
0.1,
0.1,
0.1,
0.1,
0.1,
0.1,
0.1,
0.1,
0.1,
0.1,
0.1,
0.1
],
[
0.1,
0.1,
0.1,
0.1,
0.1,
0.1,
0.1,
0.1,
0.1,
0.1,
0.1,
0.1,
0.1,
0.1,
0.1,
0.1
],
[
0.1,
0.1,
0.1,
0.1,
0.1,
0.1,
0.1,
0.1,
0.1,
0.1,
0.1,
0.1,
0.1,
0.1,
0.1,
0.1
]
]
},
{
"name": "tail_wolf_inner_waggin",
"directions": 4,
"delays": [
[
0.1,
0.1,
0.1,
0.1,
0.1,
0.1,
0.1,
0.1,
0.1,
0.1,
0.1,
0.1,
0.1,
0.1,
0.1,
0.1
],
[
0.1,
0.1,
0.1,
0.1,
0.1,
0.1,
0.1,
0.1,
0.1,
0.1,
0.1,
0.1,
0.1,
0.1,
0.1,
0.1
],
[
0.1,
0.1,
0.1,
0.1,
0.1,
0.1,
0.1,
0.1,
0.1,
0.1,
0.1,
0.1,
0.1,
0.1,
0.1,
0.1
],
[
0.1,
0.1,
0.1,
0.1,
0.1,
0.1,
0.1,
0.1,
0.1,
0.1,
0.1,
0.1,
0.1,
0.1,
0.1,
0.1
]
]
}
]
}
Binary file added ...rces/Textures/Corvax/Mobs/Customization/vulpkanin.rsi/tail_fox_inner_waggin.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Resources/Textures/Corvax/Mobs/Customization/vulpkanin.rsi/tail_fox_waggin.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added ...ces/Textures/Corvax/Mobs/Customization/vulpkanin.rsi/tail_wolf_inner_waggin.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Resources/Textures/Corvax/Mobs/Customization/vulpkanin.rsi/tail_wolf_waggin.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified Resources/Textures/Corvax/Mobs/Customization/vulpkanin.rsi/vulp_tail.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Resources/Textures/Corvax/Mobs/Customization/vulpkanin.rsi/vulp_tail_inner.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading