Skip to content

Commit

Permalink
Better Tail Wagging pt1
Browse files Browse the repository at this point in the history
Moves the tail wagging to the lizard system because its so much better
Still need to make sure there isn't extra localisation, I need to localize the new markings and trim the ones we technically removed from the character selector
  • Loading branch information
PursuitInAshes committed Apr 7, 2024
1 parent c3a4845 commit b236ed1
Show file tree
Hide file tree
Showing 7 changed files with 121 additions and 75 deletions.
13 changes: 13 additions & 0 deletions Resources/Prototypes/_CD/Actions/types.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
# Vulpkanin Tail Wagging
- type: entity
id: ActionToggleVulpakinWagging
name: action-name-toggle-wagging
description: action-description-toggle-wagging
noSpawn: true
components:
- type: InstantAction
icon: { sprite: _CD/Mobs/Customization/Vulpkanin/tail_markings.rsi, state: tail-wag-icon }
iconOn: { sprite: _CD/Mobs/Customization/Vulpkanin/tail_markings.rsi, state: tail-wag-icon }
itemIconStyle: NoItem
useDelay: 1 # Prevents Emote Spam
event: !type:ToggleActionEvent
Original file line number Diff line number Diff line change
Expand Up @@ -290,28 +290,6 @@
- sprite: _CD/Mobs/Customization/Vulpkanin/tail_markings.rsi
state: vulp-tip

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

- type: marking
id: VulpTailWagTip
bodyPart: Tail
markingCategory: Tail
speciesRestriction: [Vulpkanin]
sprites:
- sprite: _CD/Mobs/Customization/Vulpkanin/tail_markings.rsi
state: vulp_wag
- sprite: _CD/Mobs/Customization/Vulpkanin/tail_markings.rsi
state: vulp_wag-tip

- type: marking
id: VulpTailAlt
bodyPart: Tail
Expand Down Expand Up @@ -367,28 +345,6 @@
- sprite: _CD/Mobs/Customization/Vulpkanin/tail_markings.rsi
state: fox-tip

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

- type: marking
id: VulpTailFoxWagTip
bodyPart: Tail
markingCategory: Tail
speciesRestriction: [Vulpkanin]
sprites:
- sprite: _CD/Mobs/Customization/Vulpkanin/tail_markings.rsi
state: fox_wag
- sprite: _CD/Mobs/Customization/Vulpkanin/tail_markings.rsi
state: fox_wag-tip

- type: marking
id: VulpTailBushy
bodyPart: Tail
Expand All @@ -398,15 +354,6 @@
- sprite: _CD/Mobs/Customization/Vulpkanin/tail_markings.rsi
state: bushfluff

- type: marking
id: VulpTailBushyWag
bodyPart: Tail
markingCategory: Tail
speciesRestriction: [Vulpkanin]
sprites:
- sprite: _CD/Mobs/Customization/Vulpkanin/tail_markings.rsi
state: bushfluff_wag

- type: marking
id: VulpTailCoyote
bodyPart: Tail
Expand All @@ -416,24 +363,6 @@
- sprite: _CD/Mobs/Customization/Vulpkanin/tail_markings.rsi
state: coyote

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

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

- type: marking
id: VulpTailHusky
bodyPart: Tail
Expand Down Expand Up @@ -502,13 +431,22 @@
state: fluffy

- type: marking
id: VulpTailDalmatianWag
id: VulpTailCorgi #These will need locale
bodyPart: Tail
markingCategory: Tail
speciesRestriction: [Vulpkanin]
sprites:
- sprite: _CD/Mobs/Customization/Vulpkanin/tail_markings.rsi
state: dalmatian_wag
state: corgi

- type: marking
id: VulpTailDalmation #These will need locale
bodyPart: Tail
markingCategory: Tail
speciesRestriction: [Vulpkanin]
sprites:
- sprite: _CD/Mobs/Customization/Vulpkanin/tail_markings.rsi
state: dalmation

# Body Markings (Chest)
- type: marking
Expand Down Expand Up @@ -867,3 +805,85 @@
sprites:
- sprite: _CD/Mobs/Customization/Vulpkanin/facial_hair.rsi
state: kita

# Animated Markings

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

- type: marking
id: VulpTailTipAnimated
bodyPart: Tail
markingCategory: Tail
speciesRestriction: [Vulpkanin]
sprites:
- sprite: _CD/Mobs/Customization/Vulpkanin/tail_markings.rsi
state: vulp_wag
- sprite: _CD/Mobs/Customization/Vulpkanin/tail_markings.rsi
state: vulp_wag-tip

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

- type: marking
id: VulpTailFoxTipAnimated
bodyPart: Tail
markingCategory: Tail
speciesRestriction: [Vulpkanin]
sprites:
- sprite: _CD/Mobs/Customization/Vulpkanin/tail_markings.rsi
state: fox_wag
- sprite: _CD/Mobs/Customization/Vulpkanin/tail_markings.rsi
state: fox_wag-tip

- type: marking
id: VulpTailBushyAnimated
bodyPart: Tail
markingCategory: Tail
speciesRestriction: [Vulpkanin]
sprites:
- sprite: _CD/Mobs/Customization/Vulpkanin/tail_markings.rsi
state: bushfluff_wag

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

- type: marking
id: VulpTailCorgiAnimated
bodyPart: Tail
markingCategory: Tail
speciesRestriction: [Vulpkanin]
sprites:
- sprite: _CD/Mobs/Customization/Vulpkanin/tail_markings.rsi
state: corgi_wag

- type: marking
id: VulpTailDalmatianAnimated
bodyPart: Tail
markingCategory: Tail
speciesRestriction: [Vulpkanin]
sprites:
- sprite: _CD/Mobs/Customization/Vulpkanin/tail_markings.rsi
state: dalmatian_wag
2 changes: 2 additions & 0 deletions Resources/Prototypes/_CD/Entities/Mobs/Species/vulpkanin.yml
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,8 @@
heatDamage:
types:
Heat : 3 #per second, scales with temperature & other constants
- type: Wagging
action: ActionToggleVulpakinWagging

- type: entity
parent: BaseSpeciesDummy
Expand Down
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.
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 https://github.com/ParadiseSS13/Paradise edited by Floofers",
"copyright": "Taken from https://github.com/ParadiseSS13/Paradise edited by Floofers, tail-wag-icon and corgi and dalmation created by PursuitInAshes based off of 'vulp'.",
"size": {"x": 32, "y": 32},
"states": [
{
Expand Down Expand Up @@ -140,7 +140,18 @@
{
"name": "dalmatian_wag",
"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]]
"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]] },
{
"name": "tail-wag-icon",
"directions": 1
},
{
"name": "corgi",
"directions": 4
},
{
"name": "dalmatian",
"directions": 4
}
]
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit b236ed1

Please sign in to comment.