From d814facb78200e16a018eac80ea45744d4df147b Mon Sep 17 00:00:00 2001 From: pissdemon <165581243+pissdemon@users.noreply.github.com> Date: Mon, 29 Apr 2024 17:40:29 +0000 Subject: [PATCH] Add vulp wag toggle like the lizard one --- .../en-US/deltav/markings/vulpkanin.ftl | 30 ++------- Resources/Prototypes/DeltaV/Actions/types.yml | 13 ++++ .../Mobs/Customization/Markings/vulpkanin.yml | 60 ++++++++++++------ .../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 | 13 +++- .../tail_markings.rsi/tail-wag-icon.png | Bin 0 -> 242 bytes 8 files changed, 70 insertions(+), 48 deletions(-) create mode 100644 Resources/Prototypes/DeltaV/Actions/types.yml create mode 100644 Resources/Textures/DeltaV/Mobs/Customization/Vulpkanin/tail_markings.rsi/corgi.png create mode 100644 Resources/Textures/DeltaV/Mobs/Customization/Vulpkanin/tail_markings.rsi/dalmatian.png create mode 100644 Resources/Textures/DeltaV/Mobs/Customization/Vulpkanin/tail_markings.rsi/tail-wag-icon.png diff --git a/Resources/Locale/en-US/deltav/markings/vulpkanin.ftl b/Resources/Locale/en-US/deltav/markings/vulpkanin.ftl index 857cc711570..a36a1654b31 100644 --- a/Resources/Locale/en-US/deltav/markings/vulpkanin.ftl +++ b/Resources/Locale/en-US/deltav/markings/vulpkanin.ftl @@ -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) @@ -130,28 +122,14 @@ 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-VulpTailCorgi-corgi = Corgi tail +marking-VulpTailCorgi = Vulpkanin Corgi marking-VulpTailHusky-husky-inner = Husky tail (inner) marking-VulpTailHusky-husky-outer = Husky tail (outer) @@ -176,8 +154,8 @@ 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-VulpTailDalmatian-dalmatian = Dalmatian tail +marking-VulpTailDalmatian = Vulpkanin Dalmatian marking-VulpBellyCrest-belly_crest = Belly diff --git a/Resources/Prototypes/DeltaV/Actions/types.yml b/Resources/Prototypes/DeltaV/Actions/types.yml new file mode 100644 index 00000000000..368ec4eb06f --- /dev/null +++ b/Resources/Prototypes/DeltaV/Actions/types.yml @@ -0,0 +1,13 @@ +# Vulpkanin Tail Wagging +- type: entity + id: ActionToggleVulpkaninWagging + name: action-name-toggle-wagging + description: action-description-toggle-wagging + noSpawn: true + components: + - type: InstantAction + icon: { sprite: DeltaV/Mobs/Customization/Vulpkanin/tail_markings.rsi, state: tail-wag-icon } + iconOn: { sprite: DeltaV/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/DeltaV/Entities/Mobs/Customization/Markings/vulpkanin.yml b/Resources/Prototypes/DeltaV/Entities/Mobs/Customization/Markings/vulpkanin.yml index 502ddf35498..ea10462f7fc 100644 --- a/Resources/Prototypes/DeltaV/Entities/Mobs/Customization/Markings/vulpkanin.yml +++ b/Resources/Prototypes/DeltaV/Entities/Mobs/Customization/Markings/vulpkanin.yml @@ -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 - - sprite: DeltaV/Mobs/Customization/Vulpkanin/tail_markings.rsi - state: vulp-tip + - sprite: DeltaV/Mobs/Customization/Vulpkanin/tail_markings.rsi + state: vulp_wag + - sprite: DeltaV/Mobs/Customization/Vulpkanin/tail_markings.rsi + 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 @@ -368,10 +368,10 @@ state: fox-tip - type: marking - id: VulpTailFoxWag + id: VulpTailFoxAnimated bodyPart: Tail markingCategory: Tail - speciesRestriction: [Vulpkanin] + speciesRestriction: [] sprites: - sprite: DeltaV/Mobs/Customization/Vulpkanin/tail_markings.rsi state: fox_wag @@ -379,10 +379,10 @@ state: fox_wag-fade - 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 @@ -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 @@ -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 @@ -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 diff --git a/Resources/Prototypes/DeltaV/Entities/Mobs/Species/vulpkanin.yml b/Resources/Prototypes/DeltaV/Entities/Mobs/Species/vulpkanin.yml index 4a187d51b33..e5963afc0ca 100644 --- a/Resources/Prototypes/DeltaV/Entities/Mobs/Species/vulpkanin.yml +++ b/Resources/Prototypes/DeltaV/Entities/Mobs/Species/vulpkanin.yml @@ -97,6 +97,8 @@ Female: FemaleVulpkanin Unsexed: MaleVulpkanin - type: DogVision + - type: Wagging + action: ActionToggleVulpkaninWagging - type: entity save: false diff --git a/Resources/Textures/DeltaV/Mobs/Customization/Vulpkanin/tail_markings.rsi/corgi.png b/Resources/Textures/DeltaV/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/DeltaV/Mobs/Customization/Vulpkanin/tail_markings.rsi/dalmatian.png b/Resources/Textures/DeltaV/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/DeltaV/Mobs/Customization/Vulpkanin/tail_markings.rsi/meta.json b/Resources/Textures/DeltaV/Mobs/Customization/Vulpkanin/tail_markings.rsi/meta.json index 15211a3bda6..681b082953b 100644 --- a/Resources/Textures/DeltaV/Mobs/Customization/Vulpkanin/tail_markings.rsi/meta.json +++ b/Resources/Textures/DeltaV/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'. Fluffy created by Skarletto (Github).", "size": {"x": 32, "y": 32}, "states": [ { @@ -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, @@ -137,10 +141,17 @@ "name": "fluffy", "directions": 4 }, + { + "name": "dalmatian", + "directions": 4 + }, { "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]] + }, + { + "name": "tail-wag-icon" } ] } diff --git a/Resources/Textures/DeltaV/Mobs/Customization/Vulpkanin/tail_markings.rsi/tail-wag-icon.png b/Resources/Textures/DeltaV/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