From eef27837d994f801d1fc35096aeaec13f2112499 Mon Sep 17 00:00:00 2001 From: "pocl.v" <24708225+Pinkbat5@users.noreply.github.com> Date: Sat, 14 Sep 2024 23:13:25 -0400 Subject: [PATCH 1/4] Added craftable doubleeyepatch item, causes blindness, craftable from two eyepatches --- .../Entities/Clothing/Eyes/misc.yml | 19 ++++++++++++++++ .../Graphs/improvised/double_eyepatch.yml | 21 ++++++++++++++++++ .../Recipes/Crafting/improvised.yml | 13 +++++++++++ Resources/Prototypes/tags.yml | 7 ++++-- .../Misc/doubleeyepatch.rsi/equipped-EYES.png | Bin 0 -> 315 bytes .../Eyes/Misc/doubleeyepatch.rsi/icon.png | Bin 0 -> 458 bytes .../Eyes/Misc/doubleeyepatch.rsi/meta.json | 18 +++++++++++++++ 7 files changed, 76 insertions(+), 2 deletions(-) create mode 100644 Resources/Prototypes/Recipes/Crafting/Graphs/improvised/double_eyepatch.yml create mode 100644 Resources/Textures/Clothing/Eyes/Misc/doubleeyepatch.rsi/equipped-EYES.png create mode 100644 Resources/Textures/Clothing/Eyes/Misc/doubleeyepatch.rsi/icon.png create mode 100644 Resources/Textures/Clothing/Eyes/Misc/doubleeyepatch.rsi/meta.json diff --git a/Resources/Prototypes/Entities/Clothing/Eyes/misc.yml b/Resources/Prototypes/Entities/Clothing/Eyes/misc.yml index 81de8a61bce76a..4ec1e6465615d0 100644 --- a/Resources/Prototypes/Entities/Clothing/Eyes/misc.yml +++ b/Resources/Prototypes/Entities/Clothing/Eyes/misc.yml @@ -16,6 +16,22 @@ node: blindfold - type: FlashImmunity +- type: entity + parent: ClothingEyesBase + id: ClothingEyesDoubleEyepatch + name: double eyepatch + description: Signature wear of the dread pirate Blindbeard. + components: + - type: Sprite + sprite: Clothing/Eyes/Misc/doubleeyepatch.rsi + - type: Clothing + sprite: Clothing/Eyes/Misc/doubleeyepatch.rsi + - type: Blindfold + - type: Construction + graph: DoubleEyepatch + node: doubleeyepatch + - type: FlashImmunity + - type: entity parent: ClothingHeadEyeBaseFlippable id: ClothingEyesEyepatch @@ -28,6 +44,9 @@ sprite: Clothing/Eyes/Misc/eyepatch.rsi - type: EyeProtection protectionTime: 5 + - type: Tag + tags: + - Eyepatch - type: entity parent: [ClothingEyesEyepatch, ClothingHeadEyeBaseFlipped] diff --git a/Resources/Prototypes/Recipes/Crafting/Graphs/improvised/double_eyepatch.yml b/Resources/Prototypes/Recipes/Crafting/Graphs/improvised/double_eyepatch.yml new file mode 100644 index 00000000000000..2937b5559f1d23 --- /dev/null +++ b/Resources/Prototypes/Recipes/Crafting/Graphs/improvised/double_eyepatch.yml @@ -0,0 +1,21 @@ +- type: constructionGraph + id: DoubleEyepatch + start: start + graph: + - node: start + edges: + - to: doubleeyepatch + steps: + - tag: Eyepatch + name: eyepatch + icon: + sprite: Clothing/Eyes/Misc/eyepatch.rsi + state: icon + - tag: Eyepatch + name: eyepatch + icon: + sprite: Clothing/Eyes/Misc/eyepatch.rsi + state: icon + doAfter: 1 + - node: doubleeyepatch + entity: ClothingEyesDoubleEyepatch diff --git a/Resources/Prototypes/Recipes/Crafting/improvised.yml b/Resources/Prototypes/Recipes/Crafting/improvised.yml index f1b02771eb5479..7dbac11b888779 100644 --- a/Resources/Prototypes/Recipes/Crafting/improvised.yml +++ b/Resources/Prototypes/Recipes/Crafting/improvised.yml @@ -98,6 +98,19 @@ sprite: Clothing/Eyes/Misc/blindfold.rsi state: icon +- type: construction + name: double eyepatch + id: doubleeyepatch + graph: DoubleEyepatch + startNode: start + targetNode: doubleeyepatch + category: construction-category-tools + objectType: Item + description: Two eyepatches, for twice the swashbuckling. + icon: + sprite: Clothing/Eyes/Misc/doubleeyepatch.rsi + state: icon + - type: construction name: flower wreath id: flowerwreath diff --git a/Resources/Prototypes/tags.yml b/Resources/Prototypes/tags.yml index 8d6bcd2ef5d0fa..887590b3512271 100644 --- a/Resources/Prototypes/tags.yml +++ b/Resources/Prototypes/tags.yml @@ -89,7 +89,7 @@ - type: Tag id: BorgCargoTorso - + - type: Tag id: BorgEngineerHead @@ -626,6 +626,9 @@ - type: Tag id: ExplosivePassable +- type: Tag + id: Eyepatch + - type: Tag id: Figurine @@ -1198,7 +1201,7 @@ - type: Tag id: SecureWindoor -- type: Tag +- type: Tag id: SecurityHelmet - type: Tag diff --git a/Resources/Textures/Clothing/Eyes/Misc/doubleeyepatch.rsi/equipped-EYES.png b/Resources/Textures/Clothing/Eyes/Misc/doubleeyepatch.rsi/equipped-EYES.png new file mode 100644 index 0000000000000000000000000000000000000000..7d76367f20285dccc1e4f67044e504b120ac827f GIT binary patch literal 315 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=oCO|{#S9F5M?jcysy3fAQ1Gp% zi(^Q|oVT|Q_BI;`v_703Bgndg(cFQxxcq#`fw_D!43FN}D)ydGixS>2>FR$^4+-YS zk~=C@7`C2S^P{k5qs{K`_iuFxIAzTHWB2S|^OYU4ocF%(RmqGL<2|h48FfAMu|?Sa z_1C7ou{qCQZ2A1vkMFnGYXs`=DOJj=Kd-sn_cuyU*h%AjU8S-1`#)XvAGMCH-pUAc z7X(%-nUhN&8fyzh?4Mu5aTUHx3vIVCg!0Fmi` AAOHXW literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/Eyes/Misc/doubleeyepatch.rsi/icon.png b/Resources/Textures/Clothing/Eyes/Misc/doubleeyepatch.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..1e261e44fd0c9975c5959d8f60240bb01f2d4dba GIT binary patch literal 458 zcmV;*0X6=KP)R9J=WR56Z&Fc2J0Cm}fvMdTFeY4Qs9el9()ph-`IQqaT_ zm9H9P%-T+YPC6Y^#m?@|?Ccug#EBFC9hG#cwf5n8nxnnx;x??Zd+JJOcolrr8xJ?Li62WC|dunf6yG(IN-yj8 z^;(6*wPOL|683$+?g2%RFuWtVQfiY=G1giy2`LH)UC>&4j)HgbY*SE5!8y078Kbzt z(le7B2wfm4f4|>v0P+%MKSVKE4k2lH&XEHjIPeKLYq~&k&OY@50O0Eg0VHzH?Z}Cg z1BXIdG-Hg Date: Sun, 15 Sep 2024 00:04:26 -0400 Subject: [PATCH 2/4] Adds chirping to adult diona --- Resources/Prototypes/Entities/Mobs/NPCs/animals.yml | 1 + Resources/Prototypes/Entities/Mobs/Species/diona.yml | 1 + Resources/Prototypes/Voice/speech_emote_sounds.yml | 2 ++ Resources/Prototypes/Voice/speech_emotes.yml | 6 +++++- 4 files changed, 9 insertions(+), 1 deletion(-) diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml b/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml index 6adc2c1ea1e3ec..be459e48ac87dc 100644 --- a/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml +++ b/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml @@ -3517,6 +3517,7 @@ gender: epicene - type: Speech speechVerb: Plant + allowedEmotes: ['Chirp'] - type: Tag tags: - DoorBumpOpener diff --git a/Resources/Prototypes/Entities/Mobs/Species/diona.yml b/Resources/Prototypes/Entities/Mobs/Species/diona.yml index 9cce3b89559a4c..982412d403aa91 100644 --- a/Resources/Prototypes/Entities/Mobs/Species/diona.yml +++ b/Resources/Prototypes/Entities/Mobs/Species/diona.yml @@ -87,6 +87,7 @@ - MobLayer - type: Speech speechVerb: Plant + allowedEmotes: ['Chirp'] - type: Vocal sounds: Male: UnisexDiona diff --git a/Resources/Prototypes/Voice/speech_emote_sounds.yml b/Resources/Prototypes/Voice/speech_emote_sounds.yml index deeaba9c12da85..82f01666644ba5 100644 --- a/Resources/Prototypes/Voice/speech_emote_sounds.yml +++ b/Resources/Prototypes/Voice/speech_emote_sounds.yml @@ -225,6 +225,8 @@ path: /Audio/Voice/Diona/diona_scream.ogg Laugh: collection: DionaLaugh + Chirp: + path: /Audio/Animals/nymph_chirp.ogg Honk: collection: BikeHorn Weh: diff --git a/Resources/Prototypes/Voice/speech_emotes.yml b/Resources/Prototypes/Voice/speech_emotes.yml index c39bf1f37919de..f84f40a4632bff 100644 --- a/Resources/Prototypes/Voice/speech_emotes.yml +++ b/Resources/Prototypes/Voice/speech_emotes.yml @@ -315,11 +315,15 @@ id: Chirp name: chat-emote-name-chirp category: Vocal + available: false icon: Interface/Emotes/chirp.png whitelist: - requireAll: true components: - Nymph + - Vocal + blacklist: + components: + - BorgChassis chatMessages: ["chat-emote-msg-chirp"] chatTriggers: - chirp From 9aab6d9545cc349ce180a7e716ec91d23b9a0deb Mon Sep 17 00:00:00 2001 From: "pocl.v" <24708225+Pinkbat5@users.noreply.github.com> Date: Sun, 15 Sep 2024 00:53:47 -0400 Subject: [PATCH 3/4] Added vocals for diona nymph --- Resources/Prototypes/Entities/Mobs/NPCs/animals.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml b/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml index be459e48ac87dc..55a06b30262614 100644 --- a/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml +++ b/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml @@ -3518,6 +3518,11 @@ - type: Speech speechVerb: Plant allowedEmotes: ['Chirp'] + - type: Vocal + sounds: + Male: UnisexDiona + Female: UnisexDiona + Unsexed: UnisexDiona - type: Tag tags: - DoorBumpOpener From 8528b488f29b3bf319e4855ec78da2df3ecd2d3c Mon Sep 17 00:00:00 2001 From: "pocl.v" <24708225+Pinkbat5@users.noreply.github.com> Date: Sun, 15 Sep 2024 15:14:12 -0400 Subject: [PATCH 4/4] Nymphs now have a speechsound --- Resources/Prototypes/Entities/Mobs/NPCs/animals.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml b/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml index 55a06b30262614..c96b84979830a7 100644 --- a/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml +++ b/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml @@ -3517,6 +3517,7 @@ gender: epicene - type: Speech speechVerb: Plant + speechSounds: Alto allowedEmotes: ['Chirp'] - type: Vocal sounds: