From 5aaa95c5d1ec97edab22f1080bf6002e7af8b729 Mon Sep 17 00:00:00 2001 From: Angelo Fallaria Date: Mon, 12 Aug 2024 16:34:31 +0800 Subject: [PATCH 1/5] tweak(languages): add Oni mention to Nekomimetic description --- Resources/Locale/en-US/language/languages.ftl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Locale/en-US/language/languages.ftl b/Resources/Locale/en-US/language/languages.ftl index 4b0c1248f28..a047a0b6d1c 100644 --- a/Resources/Locale/en-US/language/languages.ftl +++ b/Resources/Locale/en-US/language/languages.ftl @@ -11,7 +11,7 @@ language-RootSpeak-name = Rootspeak language-RootSpeak-description = The strange whistling-style language spoken by the Diona. language-Nekomimetic-name = Nekomimetic -language-Nekomimetic-description = To the casual observer, this language is an incomprehensible mess of broken Japanese. To the felinids, it's somehow comprehensible. +language-Nekomimetic-description = To the casual observer, this language is an incomprehensible mess of broken Japanese. To the felinids and onis, it's somehow comprehensible. language-Draconic-name = Draconic language-Draconic-description = The common language of lizard-people, composed of sibilant hisses and rattles. From 0bf93947f7967a70eb3d5005c990c54ddc3a61fc Mon Sep 17 00:00:00 2001 From: Angelo Fallaria Date: Mon, 12 Aug 2024 16:35:48 +0800 Subject: [PATCH 2/5] feat: add unique Oni speech verbs --- Resources/Locale/en-US/chat/managers/chat-manager.ftl | 6 ++++++ .../Nyanotrasen/Entities/Mobs/Species/Oni.yml | 1 + Resources/Prototypes/Voice/speech_verbs.yml | 11 ++++++++++- Resources/Prototypes/typing_indicator.yml | 5 +++++ 4 files changed, 22 insertions(+), 1 deletion(-) diff --git a/Resources/Locale/en-US/chat/managers/chat-manager.ftl b/Resources/Locale/en-US/chat/managers/chat-manager.ftl index 6fbeb83ed41..589d79e6ea9 100644 --- a/Resources/Locale/en-US/chat/managers/chat-manager.ftl +++ b/Resources/Locale/en-US/chat/managers/chat-manager.ftl @@ -112,6 +112,12 @@ chat-speech-verb-vox-1 = screeches chat-speech-verb-vox-2 = shrieks chat-speech-verb-vox-3 = croaks +chat-speech-verb-name-oni = Oni +chat-speech-verb-oni-1 = grunts +chat-speech-verb-oni-2 = bellows +chat-speech-verb-oni-3 = blares +chat-speech-verb-oni-4 = rumbles + chat-speech-verb-name-canine = Canine chat-speech-verb-canine-1 = barks chat-speech-verb-canine-2 = woofs diff --git a/Resources/Prototypes/Nyanotrasen/Entities/Mobs/Species/Oni.yml b/Resources/Prototypes/Nyanotrasen/Entities/Mobs/Species/Oni.yml index e93117b1aad..c5d6a3a28dd 100644 --- a/Resources/Prototypes/Nyanotrasen/Entities/Mobs/Species/Oni.yml +++ b/Resources/Prototypes/Nyanotrasen/Entities/Mobs/Species/Oni.yml @@ -6,6 +6,7 @@ components: - type: Speech speechSounds: Baritone + speechVerb: Oni - type: HumanoidAppearance species: Oni - type: Sprite diff --git a/Resources/Prototypes/Voice/speech_verbs.yml b/Resources/Prototypes/Voice/speech_verbs.yml index 9879cefb75d..3f0a4c10fce 100644 --- a/Resources/Prototypes/Voice/speech_verbs.yml +++ b/Resources/Prototypes/Voice/speech_verbs.yml @@ -1,4 +1,4 @@ -- type: speechVerb +- type: speechVerb id: Default name: chat-speech-verb-name-default speechVerbStrings: @@ -94,6 +94,15 @@ - chat-speech-verb-vox-2 - chat-speech-verb-vox-3 +- type: speechVerb + id: Oni + name: chat-speech-verb-name-oni + speechVerbStrings: + - chat-speech-verb-oni-1 + - chat-speech-verb-oni-2 + - chat-speech-verb-oni-3 + - chat-speech-verb-oni-4 + - type: speechVerb id: Plant name: chat-speech-verb-name-plant diff --git a/Resources/Prototypes/typing_indicator.yml b/Resources/Prototypes/typing_indicator.yml index 7271770ef50..7e8c92787fe 100644 --- a/Resources/Prototypes/typing_indicator.yml +++ b/Resources/Prototypes/typing_indicator.yml @@ -48,3 +48,8 @@ id: slime typingState: slime0 offset: 0, 0.125 + +- type: typingIndicator + id: oni + typingState: oni0 + offset: 0, 0.0625 From d62dafc41b350597c7cb3e1d2954928f2ef296d7 Mon Sep 17 00:00:00 2001 From: Angelo Fallaria Date: Mon, 12 Aug 2024 16:37:57 +0800 Subject: [PATCH 3/5] feat: add unique speech bubble for Onis --- .../Nyanotrasen/Entities/Mobs/Species/Oni.yml | 2 ++ .../Textures/Effects/speech.rsi/meta.json | 19 +++++++++++++++++- .../Textures/Effects/speech.rsi/oni0.png | Bin 0 -> 715 bytes .../Textures/Effects/speech.rsi/oni1.png | Bin 0 -> 741 bytes .../Textures/Effects/speech.rsi/oni2.png | Bin 0 -> 742 bytes 5 files changed, 20 insertions(+), 1 deletion(-) create mode 100644 Resources/Textures/Effects/speech.rsi/oni0.png create mode 100644 Resources/Textures/Effects/speech.rsi/oni1.png create mode 100644 Resources/Textures/Effects/speech.rsi/oni2.png diff --git a/Resources/Prototypes/Nyanotrasen/Entities/Mobs/Species/Oni.yml b/Resources/Prototypes/Nyanotrasen/Entities/Mobs/Species/Oni.yml index c5d6a3a28dd..c1655287fdc 100644 --- a/Resources/Prototypes/Nyanotrasen/Entities/Mobs/Species/Oni.yml +++ b/Resources/Prototypes/Nyanotrasen/Entities/Mobs/Species/Oni.yml @@ -36,6 +36,8 @@ - MobLayer - type: Stamina critThreshold: 115 + - type: TypingIndicator + proto: oni - type: LanguageKnowledge speaks: - GalacticCommon diff --git a/Resources/Textures/Effects/speech.rsi/meta.json b/Resources/Textures/Effects/speech.rsi/meta.json index 98dd3b20607..4ed22e6e74f 100644 --- a/Resources/Textures/Effects/speech.rsi/meta.json +++ b/Resources/Textures/Effects/speech.rsi/meta.json @@ -5,7 +5,7 @@ "y": 32 }, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c6e3401f2e7e1e55c57060cdf956a98ef1fefc24 | Moth sprites made by PuroSlavKing (Github) | Spider sprites made by PixelTheKermit (Github) | Lizard sprites made by AmalgoMyte (Github)", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c6e3401f2e7e1e55c57060cdf956a98ef1fefc24 | Moth sprites made by PuroSlavKing (Github) | Spider sprites made by PixelTheKermit (Github) | Lizard sprites made by AmalgoMyte (Github) | Oni sprites made by angelofallars (Github)", "states": [ { "name": "alien0", @@ -422,6 +422,23 @@ 0.4 ] ] + }, + { + "name": "oni0", + "delays": [ + [ + 0.2, + 0.3, + 0.3, + 0.5 + ] + ] + }, + { + "name": "oni1" + }, + { + "name": "oni2" } ] } diff --git a/Resources/Textures/Effects/speech.rsi/oni0.png b/Resources/Textures/Effects/speech.rsi/oni0.png new file mode 100644 index 0000000000000000000000000000000000000000..cae529b35c2cf0ab1fa384fcfda2e626e327f52c GIT binary patch literal 715 zcmV;+0yO=JP)EX>4Tx04R}tkv&MmKpe$iQ%j3f9PA+CkfA!+MMWHI6^c+H)C#RSm|Xe=O&XFE z7e~Rh;NZt%)xpJCR|i)?5c~jfc5qU3krMxx6k5c1aNLh~_a1le0HIZ5n$?#CG~G6{ z>6Dl+tcu}RL=c655W+IEj5$flz;}GzBf!_Y1kdt6_vaW;ixvX{B5{%#rcJy-JhN#V zocD=itRkz#=fo2xU6A;Z>x##3oXai?JTqqIvh&0-VzJ!AN)NM&sS!^T$5loiA^#v+y=L4<+^s;I$6f>xar3t8Gv`S?d%zeFyDTvae~ zET9ezvg-%`gWug+rKw3TDVhR8FOKsu284HkcGGdbj~%Cd0tBCdE4}Nlw}9DC(wki^ zegq6|0~gm_P1yr3cYxt1LpEhs3eprxCE)#xzNr8V-2(kX!oIU_K>MC;s92^4U zWy)Und3U6@w|~!c`uhR$&~kHCs7&wx009F@L_t(|+U?rW4TB&M#_`km*iE`X;~LK4 zG|u4~gaO)39H0-i4WVkOkvn4kzr;7mRX)mk%DjfBt@Sqb@#@R5-um5~$uBB*}UrS+z zVYq7M6*mBV-#;|-s`y)6*@PyglR!N`J_c{jxz91QwJGJ=3ykv@XXKvo53uxn5$o^* z@&Nz<00000oDlT^DX0(7Ta9Y@)CYv4PJO^{=dTZV-_L8`)34>{?nih%?h}?^&dtyy xpZb9K8>2qpdq$`aDBw38000000000E@dQjOu6&_V?cD$X002ovPDHLkV1nCON45X} literal 0 HcmV?d00001 diff --git a/Resources/Textures/Effects/speech.rsi/oni1.png b/Resources/Textures/Effects/speech.rsi/oni1.png new file mode 100644 index 0000000000000000000000000000000000000000..03da318f1d915f3b705706ef3cd097e7e4c623aa GIT binary patch literal 741 zcmVEX>4Tx04R}tkv&MmKpe$iQ%j3f9PA+CkfA!+MMWHI6^c+H)C#RSm|Xe=O&XFE z7e~Rh;NZt%)xpJCR|i)?5c~jfc5qU3krMxx6k5c1aNLh~_a1le0HIZ5n$?#CG~G6{ z>6Dl+tcu}RL=c655W+IEj5$flz;}GzBf!_Y1kdt6_vaW;ixvX{B5{%#rcJy-JhN#V zocD=itRkz#=fo2xU6A;Z>x##3oXai?JTqqIvh&0-VzJ!AN)NM&sS!^T$5loiA^#v+y=L4<+^s;I$6f>xar3t8Gv`S?d%zeFyDTvae~ zET9ezvg-%`gWug+rKw3TDVhR8FOKsu284HkcGGdbj~%Cd0tBCdE4}Nlw}9DC(wki^ zegq6|0~gm_P1yr3cYxt1LpEhs3eprxCE)#xzNr8V-2(kX!oIU_K>MC;s92^4U zWy)Und3U6@w|~!c`uhR$&~kHCs7&wx00A9IL_t(|+U?ri34<^chT&uJvYWU-IcsDN zcM&p&Ye)uYH|YSqs6w=AEf|m0_W|z$F<*WZPDI{9`^;I==I>lYB-C}isBznF^$>pS ze^vR!Ob^}Upz=6f=Uh#$MNG$BR$dyvJm-VNS+Uxlv%)a-&=t5`%NV*lq1|Nrz>JS`NRaFtMfTOy|$z{VYz{DY#eEC~#fo$$G z*oCoG08=5P8vGJLRqs}RfT}vXDmDwjvhzIz0000000000$6{HZx9EX>4Tx04R}tkv&MmKpe$iQ%j3f9PA+CkfA!+MMWHI6^c+H)C#RSm|Xe=O&XFE z7e~Rh;NZt%)xpJCR|i)?5c~jfc5qU3krMxx6k5c1aNLh~_a1le0HIZ5n$?#CG~G6{ z>6Dl+tcu}RL=c655W+IEj5$flz;}GzBf!_Y1kdt6_vaW;ixvX{B5{%#rcJy-JhN#V zocD=itRkz#=fo2xU6A;Z>x##3oXai?JTqqIvh&0-VzJ!AN)NM&sS!^T$5loiA^#v+y=L4<+^s;I$6f>xar3t8Gv`S?d%zeFyDTvae~ zET9ezvg-%`gWug+rKw3TDVhR8FOKsu284HkcGGdbj~%Cd0tBCdE4}Nlw}9DC(wki^ zegq6|0~gm_P1yr3cYxt1LpEhs3eprxCE)#xzNr8V-2(kX!oIU_K>MC;s92^4U zWy)Und3U6@w|~!c`uhR$&~kHCs7&wx00ACJL_t(|+U?ri4Z;Ph*_9` zNt+TY;GVg+i)@83sHMS&@3$U!db%707*qoM6N<$g5dE-uK)l5 literal 0 HcmV?d00001 From e24010a4ceb7b4314c6cf914ae7b32cbbf4650cb Mon Sep 17 00:00:00 2001 From: Angelo Fallaria Date: Mon, 12 Aug 2024 22:28:51 +0800 Subject: [PATCH 4/5] tweak(languages): tweak Nekomimetic description Co-authored-by: Danger Revolution! <142105406+DangerRevolution@users.noreply.github.com> Signed-off-by: Angelo Fallaria --- Resources/Locale/en-US/language/languages.ftl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Locale/en-US/language/languages.ftl b/Resources/Locale/en-US/language/languages.ftl index a047a0b6d1c..68dc80f51da 100644 --- a/Resources/Locale/en-US/language/languages.ftl +++ b/Resources/Locale/en-US/language/languages.ftl @@ -11,7 +11,7 @@ language-RootSpeak-name = Rootspeak language-RootSpeak-description = The strange whistling-style language spoken by the Diona. language-Nekomimetic-name = Nekomimetic -language-Nekomimetic-description = To the casual observer, this language is an incomprehensible mess of broken Japanese. To the felinids and onis, it's somehow comprehensible. +language-Nekomimetic-description = To the casual observer, this language is an incomprehensible mess of broken Japanese. To the Felinids and Oni, it's somehow comprehensible. language-Draconic-name = Draconic language-Draconic-description = The common language of lizard-people, composed of sibilant hisses and rattles. From aa50a1067c595e909158b3ad6a449b61311104fb Mon Sep 17 00:00:00 2001 From: Angelo Fallaria Date: Mon, 12 Aug 2024 22:30:45 +0800 Subject: [PATCH 5/5] docs: update credits for speech.rsi --- Resources/Textures/Effects/speech.rsi/meta.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Textures/Effects/speech.rsi/meta.json b/Resources/Textures/Effects/speech.rsi/meta.json index 4ed22e6e74f..1ec1219b0f8 100644 --- a/Resources/Textures/Effects/speech.rsi/meta.json +++ b/Resources/Textures/Effects/speech.rsi/meta.json @@ -5,7 +5,7 @@ "y": 32 }, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c6e3401f2e7e1e55c57060cdf956a98ef1fefc24 | Moth sprites made by PuroSlavKing (Github) | Spider sprites made by PixelTheKermit (Github) | Lizard sprites made by AmalgoMyte (Github) | Oni sprites made by angelofallars (Github)", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c6e3401f2e7e1e55c57060cdf956a98ef1fefc24 | Moth sprites made by PuroSlavKing (Github) | Spider sprites made by PixelTheKermit (Github) | Lizard sprites made by AmalgoMyte (Github) | Oni sprites made by angelofallars and leonardo-dabepis (Github)", "states": [ { "name": "alien0",