From 7d698b70a1594224e36f1b32e2edbf995f4bcd39 Mon Sep 17 00:00:00 2001 From: Nix Silvam Date: Thu, 4 Jul 2024 21:50:08 +0300 Subject: [PATCH] path fixes --- Resources/Locale/en-US/species/namepreset.ftl | 2 + .../Chemistry}/metabolizer-types.ftl | 0 .../Entities/Mobs/Player}/drask.ftl | 0 .../Entities/Mobs/Species}/drask.ftl | 0 .../{ => ADT}/Chemistry/metabolizer_types.yml | 0 .../ADT/Entities/Mobs/Species/Drask.yml | 91 +------------------ .../ADT/SoundCollections/emotes.yml | 16 ++++ .../ADT/Voice/speech_emote_sounds.yml | 67 ++++++++++++++ .../Prototypes/ADT/Voice/speech_sounds.yml | 8 ++ 9 files changed, 94 insertions(+), 90 deletions(-) rename Resources/Locale/ru-RU/{metabolism => ADT/Chemistry}/metabolizer-types.ftl (100%) rename Resources/Locale/ru-RU/{ss14-ru/prototypes/adt/entities/mobs/player => ADT/Entities/Mobs/Player}/drask.ftl (100%) rename Resources/Locale/ru-RU/{ss14-ru/prototypes/adt/entities/mobs/species => ADT/Entities/Mobs/Species}/drask.ftl (100%) rename Resources/Prototypes/{ => ADT}/Chemistry/metabolizer_types.yml (100%) create mode 100644 Resources/Prototypes/ADT/SoundCollections/emotes.yml create mode 100644 Resources/Prototypes/ADT/Voice/speech_emote_sounds.yml create mode 100644 Resources/Prototypes/ADT/Voice/speech_sounds.yml diff --git a/Resources/Locale/en-US/species/namepreset.ftl b/Resources/Locale/en-US/species/namepreset.ftl index 162dbbd29c0..092d0b6d62c 100644 --- a/Resources/Locale/en-US/species/namepreset.ftl +++ b/Resources/Locale/en-US/species/namepreset.ftl @@ -1,5 +1,7 @@ namepreset-first = {$first} namepreset-firstlast = {$first} {$last} namepreset-firstdashfirst = {$first1}-{$first2} +# Start ADT tweak: Drask namepreset-firstdashfirstdashfirst = { $first1 }-{ $first2 }-{ $first3 } +# End ADT tweak namepreset-thefirstoflast = The {$first} of {$last} diff --git a/Resources/Locale/ru-RU/metabolism/metabolizer-types.ftl b/Resources/Locale/ru-RU/ADT/Chemistry/metabolizer-types.ftl similarity index 100% rename from Resources/Locale/ru-RU/metabolism/metabolizer-types.ftl rename to Resources/Locale/ru-RU/ADT/Chemistry/metabolizer-types.ftl diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/adt/entities/mobs/player/drask.ftl b/Resources/Locale/ru-RU/ADT/Entities/Mobs/Player/drask.ftl similarity index 100% rename from Resources/Locale/ru-RU/ss14-ru/prototypes/adt/entities/mobs/player/drask.ftl rename to Resources/Locale/ru-RU/ADT/Entities/Mobs/Player/drask.ftl diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/adt/entities/mobs/species/drask.ftl b/Resources/Locale/ru-RU/ADT/Entities/Mobs/Species/drask.ftl similarity index 100% rename from Resources/Locale/ru-RU/ss14-ru/prototypes/adt/entities/mobs/species/drask.ftl rename to Resources/Locale/ru-RU/ADT/Entities/Mobs/Species/drask.ftl diff --git a/Resources/Prototypes/Chemistry/metabolizer_types.yml b/Resources/Prototypes/ADT/Chemistry/metabolizer_types.yml similarity index 100% rename from Resources/Prototypes/Chemistry/metabolizer_types.yml rename to Resources/Prototypes/ADT/Chemistry/metabolizer_types.yml diff --git a/Resources/Prototypes/ADT/Entities/Mobs/Species/Drask.yml b/Resources/Prototypes/ADT/Entities/Mobs/Species/Drask.yml index 90a454dda25..72556b70a2d 100644 --- a/Resources/Prototypes/ADT/Entities/Mobs/Species/Drask.yml +++ b/Resources/Prototypes/ADT/Entities/Mobs/Species/Drask.yml @@ -75,96 +75,7 @@ - type: HumanoidAppearance species: DraskSpecies -- type: emoteSounds - id: MaleDrask - params: - variation: 0.125 - sounds: - Scream: - collection: DraskScream - Laugh: - collection: MaleLaugh - Sneeze: - collection: DraskSneeze - Cough: - collection: DraskCough - CatMeow: - collection: CatMeows - CatHisses: - collection: CatHisses - MonkeyScreeches: - collection: MonkeyScreeches - RobotBeep: - collection: RobotBeeps - Yawn: - collection: MaleYawn - Snore: - collection: Snores - Honk: - collection: BikeHorn - Sigh: - collection: MaleSigh - Crying: - collection: MaleCry - Whistle: - collection: Whistles -- type: emoteSounds - id: FemaleDrask - params: - variation: 0.125 - sounds: - Scream: - collection: DraskScream - Laugh: - collection: FemaleLaugh - Sneeze: - collection: DraskSneeze - Cough: - collection: DraskCough - CatMeow: - collection: CatMeows - CatHisses: - collection: CatHisses - MonkeyScreeches: - collection: MonkeyScreeches - RobotBeep: - collection: RobotBeeps - Yawn: - collection: FemaleYawn - Snore: - collection: Snores - Honk: - collection: CluwneHorn - Sigh: - collection: FemaleSigh - Crying: - collection: FemaleCry - Whistle: - collection: Whistles -- type: soundCollection - id: DraskCough - files: - - /Audio/ADT/Drask/draskcough.ogg -- type: soundCollection - id: DraskScream - files: - - /Audio/ADT/Drask/draskscream.ogg -- type: soundCollection - id: DraskSneeze - files: - - /Audio/ADT/Drask/drasksneeze.ogg -- type: soundCollection - id: DraskTalk - files: - - /Audio/ADT/Drask/drasktalk.ogg -- type: speechSounds - id: Drask - saySound: - path: /Audio/ADT/Drask/drasktalk.ogg - askSound: - path: /Audio/ADT/Drask/drasktalk.ogg - exclaimSound: - path: /Audio/ADT/Drask/drasktalk.ogg + diff --git a/Resources/Prototypes/ADT/SoundCollections/emotes.yml b/Resources/Prototypes/ADT/SoundCollections/emotes.yml new file mode 100644 index 00000000000..3f6d3245480 --- /dev/null +++ b/Resources/Prototypes/ADT/SoundCollections/emotes.yml @@ -0,0 +1,16 @@ +- type: soundCollection + id: DraskCough + files: + - /Audio/ADT/Drask/draskcough.ogg +- type: soundCollection + id: DraskScream + files: + - /Audio/ADT/Drask/draskscream.ogg +- type: soundCollection + id: DraskSneeze + files: + - /Audio/ADT/Drask/drasksneeze.ogg +- type: soundCollection + id: DraskTalk + files: + - /Audio/ADT/Drask/drasktalk.ogg diff --git a/Resources/Prototypes/ADT/Voice/speech_emote_sounds.yml b/Resources/Prototypes/ADT/Voice/speech_emote_sounds.yml new file mode 100644 index 00000000000..8eb673d93f3 --- /dev/null +++ b/Resources/Prototypes/ADT/Voice/speech_emote_sounds.yml @@ -0,0 +1,67 @@ +- type: emoteSounds + id: MaleDrask + params: + variation: 0.125 + sounds: + Scream: + collection: DraskScream + Laugh: + collection: MaleLaugh + Sneeze: + collection: DraskSneeze + Cough: + collection: DraskCough + CatMeow: + collection: CatMeows + CatHisses: + collection: CatHisses + MonkeyScreeches: + collection: MonkeyScreeches + RobotBeep: + collection: RobotBeeps + Yawn: + collection: MaleYawn + Snore: + collection: Snores + Honk: + collection: BikeHorn + Sigh: + collection: MaleSigh + Crying: + collection: MaleCry + Whistle: + collection: Whistles + +- type: emoteSounds + id: FemaleDrask + params: + variation: 0.125 + sounds: + Scream: + collection: DraskScream + Laugh: + collection: FemaleLaugh + Sneeze: + collection: DraskSneeze + Cough: + collection: DraskCough + CatMeow: + collection: CatMeows + CatHisses: + collection: CatHisses + MonkeyScreeches: + collection: MonkeyScreeches + RobotBeep: + collection: RobotBeeps + Yawn: + collection: FemaleYawn + Snore: + collection: Snores + Honk: + collection: CluwneHorn + Sigh: + collection: FemaleSigh + Crying: + collection: FemaleCry + Whistle: + collection: Whistles diff --git a/Resources/Prototypes/ADT/Voice/speech_sounds.yml b/Resources/Prototypes/ADT/Voice/speech_sounds.yml new file mode 100644 index 00000000000..224f49ef3a3 --- /dev/null +++ b/Resources/Prototypes/ADT/Voice/speech_sounds.yml @@ -0,0 +1,8 @@ +- type: speechSounds + id: Drask + saySound: + path: /Audio/ADT/Drask/drasktalk.ogg + askSound: + path: /Audio/ADT/Drask/drasktalk.ogg + exclaimSound: + path: /Audio/ADT/Drask/drasktalk.ogg