From b236ed1304e5e83c0121bc83f945fc609b4df5d5 Mon Sep 17 00:00:00 2001 From: PursuitInAshes <91865152+PursuitInAshes@users.noreply.github.com> Date: Sun, 7 Apr 2024 14:11:29 -0600 Subject: [PATCH] Better Tail Wagging pt1 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 --- Resources/Prototypes/_CD/Actions/types.yml | 13 ++ .../Mobs/Customization/Markings/vulpkanin.yml | 166 ++++++++++-------- .../_CD/Entities/Mobs/Species/vulpkanin.yml | 2 + .../Vulpkanin/tail_markings.rsi/corgi.png | Bin 0 -> 165 bytes .../Vulpkanin/tail_markings.rsi/dalmatian.png | Bin 0 -> 240 bytes .../Vulpkanin/tail_markings.rsi/meta.json | 15 +- .../tail_markings.rsi/tail-wag-icon.png | Bin 0 -> 242 bytes 7 files changed, 121 insertions(+), 75 deletions(-) create mode 100644 Resources/Prototypes/_CD/Actions/types.yml create mode 100644 Resources/Textures/_CD/Mobs/Customization/Vulpkanin/tail_markings.rsi/corgi.png create mode 100644 Resources/Textures/_CD/Mobs/Customization/Vulpkanin/tail_markings.rsi/dalmatian.png create mode 100644 Resources/Textures/_CD/Mobs/Customization/Vulpkanin/tail_markings.rsi/tail-wag-icon.png diff --git a/Resources/Prototypes/_CD/Actions/types.yml b/Resources/Prototypes/_CD/Actions/types.yml new file mode 100644 index 0000000000..58f621cbbb --- /dev/null +++ b/Resources/Prototypes/_CD/Actions/types.yml @@ -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 diff --git a/Resources/Prototypes/_CD/Entities/Mobs/Customization/Markings/vulpkanin.yml b/Resources/Prototypes/_CD/Entities/Mobs/Customization/Markings/vulpkanin.yml index 693298bf8a..abd6a57d3c 100644 --- a/Resources/Prototypes/_CD/Entities/Mobs/Customization/Markings/vulpkanin.yml +++ b/Resources/Prototypes/_CD/Entities/Mobs/Customization/Markings/vulpkanin.yml @@ -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 @@ -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 @@ -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 @@ -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 @@ -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 @@ -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 diff --git a/Resources/Prototypes/_CD/Entities/Mobs/Species/vulpkanin.yml b/Resources/Prototypes/_CD/Entities/Mobs/Species/vulpkanin.yml index 5e2f8995d4..d18114b224 100644 --- a/Resources/Prototypes/_CD/Entities/Mobs/Species/vulpkanin.yml +++ b/Resources/Prototypes/_CD/Entities/Mobs/Species/vulpkanin.yml @@ -52,6 +52,8 @@ heatDamage: types: Heat : 3 #per second, scales with temperature & other constants + - type: Wagging + action: ActionToggleVulpakinWagging - type: entity parent: BaseSpeciesDummy diff --git a/Resources/Textures/_CD/Mobs/Customization/Vulpkanin/tail_markings.rsi/corgi.png b/Resources/Textures/_CD/Mobs/Customization/Vulpkanin/tail_markings.rsi/corgi.png new file mode 100644 index 0000000000000000000000000000000000000000..1dc864e456f9a39d490c3c533e5cf04026417fef GIT binary patch literal 165 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=Ii4<#Ar*7p-aN?LpdjGtXfn-J zRAg7^1@UbQID{t6WSS&j776#tQ@xRyMlChy85}S Ib4q9e01NpykpKVy literal 0 HcmV?d00001 diff --git a/Resources/Textures/_CD/Mobs/Customization/Vulpkanin/tail_markings.rsi/dalmatian.png b/Resources/Textures/_CD/Mobs/Customization/Vulpkanin/tail_markings.rsi/dalmatian.png new file mode 100644 index 0000000000000000000000000000000000000000..7423e44aaa761f9732d9cf16219db65dac251b3e GIT binary patch literal 240 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=+dW+zLn`LHy|t0I#ek>v;c;K4 z#T)vjr-&H0RL2*3F|(FCSuy|IZxpm7UE6g^1QSpT5ab;{W29uHw8`r9eOH%V)%C63 zbH(**`|3*Df=+Mxau=wg!MN?M)3ajz@WUIl!`C;-Om|{l#T>Gj@hao0iw&>9hOARm z`jokUU2emp<-YIges^|X{>=QY?)K$`w0P0|^=fxB>OVZT@S3zN)9Oy}Qqeu@R;y&r gdwx2Nm4QLyJKG%oU~5^Yf;5mxp00i_>zopr07TzgssI20 literal 0 HcmV?d00001 diff --git a/Resources/Textures/_CD/Mobs/Customization/Vulpkanin/tail_markings.rsi/meta.json b/Resources/Textures/_CD/Mobs/Customization/Vulpkanin/tail_markings.rsi/meta.json index 15211a3bda..a963588dd6 100644 --- a/Resources/Textures/_CD/Mobs/Customization/Vulpkanin/tail_markings.rsi/meta.json +++ b/Resources/Textures/_CD/Mobs/Customization/Vulpkanin/tail_markings.rsi/meta.json @@ -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": [ { @@ -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 } ] } diff --git a/Resources/Textures/_CD/Mobs/Customization/Vulpkanin/tail_markings.rsi/tail-wag-icon.png b/Resources/Textures/_CD/Mobs/Customization/Vulpkanin/tail_markings.rsi/tail-wag-icon.png new file mode 100644 index 0000000000000000000000000000000000000000..c7e544012da137348feed0958069864c42e8976f GIT binary patch literal 242 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=ffJot`d^ArY-_CmRYKR^VZARkL5P z_yPa-|L!mNwO&*-2Ol}5(ei*(>r#fc^s!yDt!HX*G${bl597?|i?2x;er9~ITyp7@ z{>``h7?u6b)Vw)UAgQ4AYHxK({GGkbS!+*=Fz9F(NuRLvpWiu8b8cy^>BiVbt`#3N z);$mB%#~!A;PT|`ksZR{YEuuzHg-Lovs}$Y($r>CY@@H^Q5_{GrJ|qPca$ZVBpzi{ q*&9EzAe=#=_wTK>^Y5}xWB;);@mCp_&3>RK7(8A5T-G@yGywoY>tO!? literal 0 HcmV?d00001