добавил эмоции и ревью

AdventureTimeSS14 · Aug 4, 2024 · 16eed8b · 16eed8b
1 parent a5c2e29
commit 16eed8b
Show file tree

Hide file tree

Showing 11 changed files with 102 additions and 28 deletions.
diff --git a/Resources/Audio/ADT/Moth/moth_buzz.ogg b/Resources/Audio/ADT/Moth/moth_buzz.ogg
diff --git a/Resources/Audio/ADT/Moth/moth_scream.ogg → Resources/Audio/ADT/Moth/moth_screm.ogg b/Resources/Audio/ADT/Moth/moth_scream.ogg → Resources/Audio/ADT/Moth/moth_screm.ogg
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/mobs/player/moth.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/mobs/player/moth.ftl
@@ -1,2 +1,2 @@
-ent-MobMoth = Urist McFluff
-    .desc = { ent-BaseMobMoth.desc }
+#ent-MobMoth = Urist McFluff
+#    .desc = { ent-BaseMobMoth.desc }
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/mobs/species/moth.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/mobs/species/moth.ftl
@@ -1,4 +1,4 @@
-ent-BaseMobMoth = Urist McFluff
-    .desc = { ent-BaseMobSpeciesOrganic.desc }
-ent-MobMothDummy = { ent-BaseSpeciesDummy }
-    .desc = { ent-BaseSpeciesDummy.desc }
+#ent-BaseMobMoth = Urist McFluff
+#    .desc = { ent-BaseMobSpeciesOrganic.desc }
+#ent-MobMothDummy = { ent-BaseSpeciesDummy }
+#    .desc = { ent-BaseSpeciesDummy.desc }
diff --git a/Resources/Locale/ru-RU/ADT/prototypes/Entities/Mobs/Species/moth.ftl b/Resources/Locale/ru-RU/ADT/prototypes/Entities/Mobs/Species/moth.ftl
@@ -1,5 +1,5 @@
 ent-BaseMobMoth = Урист МакНиан
     .desc = { ent-BaseMobSpeciesOrganic.desc }
     .suffix = Ниан
-ent-MobMothDummy = { ent-BaseSpeciesDummy }
-    .desc = { ent-BaseSpeciesDummy.desc }
+ent-MobMothDummy = { ent-BaseMobMoth }
+    .desc = { ent-BaseMobMoth.desc }
diff --git a/Resources/Locale/ru-RU/ADT/Moth/species.ftl → ...ale/ru-RU/ADT/prototypes/Species/moth.ftl b/Resources/Locale/ru-RU/ADT/Moth/species.ftl → ...ale/ru-RU/ADT/prototypes/Species/moth.ftl
diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/mobs/player/moth.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/mobs/player/moth.ftl
@@ -1,2 +1,2 @@
-ent-MobMoth = Урист МакФлафф
-    .desc = { ent-BaseMobMoth.desc }
+#ent-MobMoth = Урист МакФлафф
+#    .desc = { ent-BaseMobMoth.desc }
diff --git a/Resources/Prototypes/ADT/Entities/Mobs/Species/moth.yml b/Resources/Prototypes/ADT/Entities/Mobs/Species/moth.yml
@@ -43,9 +43,9 @@
   - type: MothAccent
   - type: Vocal
     sounds:
-      Male: UnisexMoth
-      Female: UnisexMoth
-      Unsexed: UnisexMoth
+      Male: MaleMoth
+      Female: FemaleMoth
+      Unsexed: MaleMoth
   - type: MovementSpeedModifier
     weightlessAcceleration: 1.5 # Move around more easily in space.
     weightlessFriction: 1

diff --git a/Resources/Prototypes/ADT/SoundCollections/emotes.yml b/Resources/Prototypes/ADT/SoundCollections/emotes.yml
@@ -42,4 +42,29 @@
 - type: soundCollection
   id: TajaranPurrs
   files:
-  - /Audio/ADT/Felinid/cat_purr1.ogg
+  - /Audio/ADT/Felinid/cat_purr1.ogg
+
+- type: soundCollection
+  id: MothBuzz
+  files:
+  - /Audio/ADT/Moth/moth_squeak.ogg
+
+- type: soundCollection
+  id: MothScream
+  files:
+  - /Audio/ADT/Moth/moth_screm.ogg
+
+- type: soundCollection
+  id: MothLaugh
+  files:
+  - /Audio/ADT/Moth/moth_laugh.ogg
+
+- type: soundCollection
+  id: MothChitter
+  files:
+  - /Audio/ADT/Moth/moth_chitter.ogg
+
+- type: soundCollection
+  id: MothSqueak
+  files:
+  - /Audio/ADT/Moth/moth_squeak.ogg
diff --git a/Resources/Prototypes/ADT/Voice/speech_emote_sounds.yml b/Resources/Prototypes/ADT/Voice/speech_emote_sounds.yml
@@ -67,28 +67,77 @@
       collection: Whistles
 
 - type: emoteSounds
-  id: UnisexMoth
+  id: MaleMoth
   params:
     variation: 0.125
   sounds:
     Buzz:
-      path: /Audio/ADT/Moth/moth_scream.ogg
+      collection: MothBuzz
     Scream:
-      path: /Audio/ADT/Moth/moth_scream.ogg
+      collection: MothScream
     Laugh:
-      path: /Audio/ADT/Moth/moth_laugh.ogg
+      collection: MothLaugh
     Chitter:
-      path: /Audio/ADT/Moth/moth_chitter.ogg
+      collection: MothChitter
     Squeak:
-      path: /Audio/ADT/Moth/moth_squeak.ogg
+      collection: MothSqueak
     Weh:
       collection: Weh
-    # ADT-Apathy Sounds.
-    #Scream-apathy:
-    #  path: /Audio/Voice/Moth/moth_scream.ogg
-    #Laugh-apathy:
-    #  path: /Audio/Voice/Moth/moth_laugh.ogg
+    Sneeze:
+      collection: MaleSneezes
+    Cough:
+      collection: MaleCoughs
+    MonkeyScreeches:
+      collection: MonkeyScreeches
+    Yawn:
+      collection: MaleYawn
+    Snore:
+      collection: Snores
+    Honk:
+      collection: BikeHorn
+    Sigh:
+      collection: MaleSigh
+    Crying:
+      collection: MaleCry
+    Whistle:
+      collection: Whistles
 
+- type: emoteSounds
+  id: FemaleMoth
+  params:
+    variation: 0.125
+  sounds:
+    Buzz:
+      collection: MothBuzz
+    Scream:
+      collection: MothScream
+    Laugh:
+      collection: MothLaugh
+    Chitter:
+      collection: MothChitter
+    Squeak:
+      collection: MothSqueak
+    Weh:
+      collection: Weh
+    Sneeze:
+      collection: MaleSneezes
+    Cough:
+      collection: MaleCoughs
+    MonkeyScreeches:
+      collection: MonkeyScreeches
+    Yawn:
+      collection: MaleYawn
+    Snore:
+      collection: Snores
+    Honk:
+      collection: BikeHorn
+    Sigh:
+      collection: MaleSigh
+    Crying:
+      collection: MaleCry
+    Whistle:
+      collection: Whistles
+
 - type: emoteSounds
   id: ADTMaleTajaran
   params:

diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml b/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml
@@ -511,9 +511,9 @@
     accent: zombieMoth
   - type: Vocal
     sounds:
-      Male: UnisexMoth
-      Female: UnisexMoth
-      Unsexed: UnisexMoth
+      Male: MaleMoth
+      Female: FemaleMoth
+      Unsexed: MaleMoth
     wilhelmProbability: 0.001
   - type: MobPrice
     price: 150