Skip to content

Vulpkanin Tail Wagging #588

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

Merged
VMSolidus merged 5 commits into from
Aug 1, 2024
Merged

Vulpkanin Tail Wagging #588

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
14bf38a
Wagging
ShadesMars Jul 24, 2024
f0c5cfe
action
ShadesMars Jul 24, 2024
76d0f50
Textures
ShadesMars Jul 24, 2024
1a51f9a
Merge branch 'master' into Tail-Wags
ShadesMars Jul 24, 2024
f086570
Apply suggestions from code review
ShadesMars Jul 27, 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
2 changes: 2 additions & 0 deletions Content.Server/Wagging/WaggingSystem.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,8 @@ public bool TryToggleWagging(EntityUid uid, WaggingComponent? wagging = null, Hu

wagging.Wagging = !wagging.Wagging;

_actions.SetToggled(wagging.ActionEntity, wagging.Wagging);

for (var idx = 0; idx < markings.Count; idx++) // Animate all possible tails
{
var currentMarkingId = markings[idx].MarkingId;
Expand Down
32 changes: 5 additions & 27 deletions Resources/Locale/en-US/deltav/markings/vulpkanin.ftl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,14 +102,6 @@ marking-VulpTailTip-vulp = Vulpkanin tail (base)
marking-VulpTailTip-vulp-tip = Vulpkanin tail (tip)
marking-VulpTailTip = Vulpkanin (tip)

marking-VulpTailWag-vulp_wag = Vulpkanin tail (base)
marking-VulpTailWag-vulp_wag-fade = Vulpkanin tail (fade)
marking-VulpTailWag = Vulpkanin (wag)

marking-VulpTailWagTip-vulp_wag = Vulpkanin tail (base)
marking-VulpTailWagTip-vulp_wag-tip = Vulpkanin tail (tip)
marking-VulpTailWagTip = Vulpkanin (wag, tip)

marking-VulpTailAlt-vulp_alt = Vulpkanin tail (base)
marking-VulpTailAlt-vulp_alt-fade = Vulpkanin tail (fade)
marking-VulpTailAlt = Vulpkanin (alt)
Expand All @@ -130,29 +122,12 @@ marking-VulpTailFoxTip-fox = Fox tail (base)
marking-VulpTailFoxTip-fox-tip = Fox tail (fade)
marking-VulpTailFoxTip = Vulpkanin Fox (tip)

marking-VulpTailFoxWag-fox_wag = Fox tail (base)
marking-VulpTailFoxWag-fox_wag-fade = Fox tail (fade)
marking-VulpTailFoxWag = Vulpkanin Fox (wag)

marking-VulpTailFoxWagTip-fox_wag = Fox tail (base)
marking-VulpTailFoxWagTip-fox_wag-tip = Fox tail (tip)
marking-VulpTailFoxWagTip = Vulpkanin Fox (wag, tip)

marking-VulpTailBushy-bushfluff = Bush tail
marking-VulpTailBushy = Vulpkanin Bush

marking-VulpTailBushyWag-bushfluff_wag = Bush tail
marking-VulpTailBushyWag = Vulpkanin Bush (wag)

marking-VulpTailCoyote-coyote = Coyote tail
marking-VulpTailCoyote = Vulpkanin Coyote

marking-VulpTailCoyoteWag-coyote_wag = Coyote tail
marking-VulpTailCoyoteWag = Vulpkanin Coyote (wag)

marking-VulpTailCorgiWag-corgi_wag = Crogi tail
marking-VulpTailCorgiWag = Vulpkanin Corgi (wag)

marking-VulpTailHusky-husky-inner = Husky tail (inner)
marking-VulpTailHusky-husky-outer = Husky tail (outer)
marking-VulpTailHusky = Vulpkanin Husky
Expand All @@ -176,8 +151,11 @@ marking-VulpTailOtie = Vulpkanin Otie
marking-VulpTailFluffy-fluffy = Fluffy tail
marking-VulpTailFluffy = Vulpkanin Fluffy

marking-VulpTailDalmatianWag-dalmatian_wag = Dalmatian tail
marking-VulpTailDalmatianWag = Vulpkanin Dalmatian (wag)
marking-VulpTailCorgi-corgi = Crogi tail
marking-VulpTailCorgi = Vulpkanin Corgi

marking-VulpTailDalmatian-dalmatian = Dalmatian tail
marking-VulpTailDalmatian = Vulpkanin Dalmatian


marking-VulpBellyCrest-belly_crest = Belly
Expand Down
4 changes: 2 additions & 2 deletions Resources/Prototypes/Actions/types.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -345,8 +345,8 @@
noSpawn: true
components:
- type: InstantAction
icon: { sprite: Mobs/Customization/reptilian_parts.rsi, state: tail_smooth_behind }
iconOn: { sprite: Mobs/Customization/reptilian_parts.rsi, state: tail_smooth_behind }
icon: { sprite: Interface/Actions/wagging.rsi, state: icon }
iconOn: { sprite: Interface/Actions/wagging.rsi, state: icon-on }
itemIconStyle: NoItem
useDelay: 1 # emote spam
event: !type:ToggleActionEvent
Expand Down
66 changes: 42 additions & 24 deletions Resources/Prototypes/DeltaV/Entities/Mobs/Customization/Markings/vulpkanin.yml
View file
Open in desktop
Copy link
Copy Markdown
Member

@DEATHB4DEFEAT DEATHB4DEFEAT Jul 27, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why'd you remove the Vulpkanin species restrictions on these?

Copy link
Copy Markdown
Contributor Author

@ShadesMars ShadesMars Jul 27, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Having them removed mean they cannot be selected in the creation menu and they should not be selected by default as "Animated".

Original file line number Diff line number Diff line change
Expand Up @@ -280,32 +280,32 @@
state: vulp-fade

- type: marking
id: VulpTailTip
id: VulpTailAnimated
bodyPart: Tail
markingCategory: Tail
speciesRestriction: [Vulpkanin]
speciesRestriction: []
sprites:
- sprite: DeltaV/Mobs/Customization/Vulpkanin/tail_markings.rsi
state: vulp
state: vulp_wag
- sprite: DeltaV/Mobs/Customization/Vulpkanin/tail_markings.rsi
state: vulp-tip
state: vulp_wag-tip #fade

- type: marking
id: VulpTailWag
id: VulpTailTip
bodyPart: Tail
markingCategory: Tail
speciesRestriction: [Vulpkanin]
sprites:
- sprite: DeltaV/Mobs/Customization/Vulpkanin/tail_markings.rsi
state: vulp_wag
state: vulp
- sprite: DeltaV/Mobs/Customization/Vulpkanin/tail_markings.rsi
state: vulp_wag-tip #fade
state: vulp-tip

- type: marking
id: VulpTailWagTip
id: VulpTailTipAnimated
bodyPart: Tail
markingCategory: Tail
speciesRestriction: [Vulpkanin]
speciesRestriction: []
sprites:
- sprite: DeltaV/Mobs/Customization/Vulpkanin/tail_markings.rsi
state: vulp_wag
Expand Down Expand Up @@ -357,32 +357,32 @@
state: fox-fade

- type: marking
id: VulpTailFoxTip
id: VulpTailFoxAnimated
bodyPart: Tail
markingCategory: Tail
speciesRestriction: [Vulpkanin]
speciesRestriction: []
sprites:
- sprite: DeltaV/Mobs/Customization/Vulpkanin/tail_markings.rsi
state: fox
state: fox_wag
- sprite: DeltaV/Mobs/Customization/Vulpkanin/tail_markings.rsi
state: fox-tip
state: fox_wag-fade

- type: marking
id: VulpTailFoxWag
id: VulpTailFoxTip
bodyPart: Tail
markingCategory: Tail
speciesRestriction: [Vulpkanin]
sprites:
- sprite: DeltaV/Mobs/Customization/Vulpkanin/tail_markings.rsi
state: fox_wag
state: fox
- sprite: DeltaV/Mobs/Customization/Vulpkanin/tail_markings.rsi
state: fox_wag-fade
state: fox-tip

- type: marking
id: VulpTailFoxWagTip
id: VulpTailFoxTipAnimated
bodyPart: Tail
markingCategory: Tail
speciesRestriction: [Vulpkanin]
speciesRestriction: []
sprites:
- sprite: DeltaV/Mobs/Customization/Vulpkanin/tail_markings.rsi
state: fox_wag
Expand All @@ -399,10 +399,10 @@
state: bushfluff

- type: marking
id: VulpTailBushyWag
id: VulpTailBushyAnimated
bodyPart: Tail
markingCategory: Tail
speciesRestriction: [Vulpkanin]
speciesRestriction: []
sprites:
- sprite: DeltaV/Mobs/Customization/Vulpkanin/tail_markings.rsi
state: bushfluff_wag
Expand All @@ -417,19 +417,28 @@
state: coyote

- type: marking
id: VulpTailCoyoteWag
id: VulpTailCoyoteAnimated
bodyPart: Tail
markingCategory: Tail
speciesRestriction: [Vulpkanin]
speciesRestriction: []
sprites:
- sprite: DeltaV/Mobs/Customization/Vulpkanin/tail_markings.rsi
state: coyote_wag

- type: marking
id: VulpTailCorgiWag
id: VulpTailCorgi
bodyPart: Tail
markingCategory: Tail
speciesRestriction: [Vulpkanin]
sprites:
- sprite: DeltaV/Mobs/Customization/Vulpkanin/tail_markings.rsi
state: corgi

- type: marking
id: VulpTailCorgiAnimated
bodyPart: Tail
markingCategory: Tail
speciesRestriction: []
sprites:
- sprite: DeltaV/Mobs/Customization/Vulpkanin/tail_markings.rsi
state: corgi_wag
Expand Down Expand Up @@ -502,10 +511,19 @@
state: fluffy

- type: marking
id: VulpTailDalmatianWag
id: VulpTailDalmatian
bodyPart: Tail
markingCategory: Tail
speciesRestriction: [Vulpkanin]
sprites:
- sprite: DeltaV/Mobs/Customization/Vulpkanin/tail_markings.rsi
state: dalmatian

- type: marking
id: VulpTailDalmatianAnimated
bodyPart: Tail
markingCategory: Tail
speciesRestriction: []
sprites:
- sprite: DeltaV/Mobs/Customization/Vulpkanin/tail_markings.rsi
state: dalmatian_wag
Expand Down
1 change: 1 addition & 0 deletions Resources/Prototypes/DeltaV/Entities/Mobs/Species/vulpkanin.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,6 +97,7 @@
Female: FemaleVulpkanin
Unsexed: MaleVulpkanin
- type: DogVision
- type: Wagging
Copy link
Copy Markdown
Member

@DEATHB4DEFEAT DEATHB4DEFEAT Jul 27, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is that really the component name? Stupid.

Copy link
Copy Markdown
Contributor

@DangerRevolution DangerRevolution Jul 29, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Real.

- type: LanguageKnowledge
speaks:
- GalacticCommon
Expand Down
Binary file added Resources/Textures/DeltaV/Mobs/Customization/Vulpkanin/tail_markings.rsi/corgi.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 ...es/Textures/DeltaV/Mobs/Customization/Vulpkanin/tail_markings.rsi/dalmatian.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.
8 changes: 8 additions & 0 deletions Resources/Textures/DeltaV/Mobs/Customization/Vulpkanin/tail_markings.rsi/meta.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,6 +96,10 @@
"directions": 4,
"delays": [[0.2, 0.2, 0.2, 0.2, 0.2, 0.2, 0.2, 0.2], [0.2, 0.2, 0.2, 0.2, 0.2, 0.2, 0.2, 0.2], [0.2, 0.2, 0.2, 0.2, 0.2, 0.2, 0.2, 0.2], [0.2, 0.2, 0.2, 0.2, 0.2, 0.2, 0.2, 0.2]]
},
{
"name": "corgi",
"directions": 4
},
{
"name": "corgi_wag",
"directions": 4,
Expand Down Expand Up @@ -137,6 +141,10 @@
"name": "fluffy",
"directions": 4
},
{
"name": "dalmatian",
"directions": 4
},
{
"name": "dalmatian_wag",
"directions": 4,
Expand Down
Binary file added Resources/Textures/Interface/Actions/wagging.rsi/icon-on.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/Interface/Actions/wagging.rsi/icon.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.
17 changes: 17 additions & 0 deletions Resources/Textures/Interface/Actions/wagging.rsi/meta.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
{
"version": 1,
"license": "CC0-1.0",
"copyright": "Created by dootythefrooty (Discord 273243513800622090)",
"size": {
"x": 32,
"y": 32
},
"states": [
{
"name": "icon"
},
{
"name": "icon-on"
}
]
}