Merge pull request #288 from Schrodinger71/new_sounds

New sounds for cyborg
AdventureTimeSS14 · Jan 7, 2024 · 7b769cc · 7b769cc
2 parents 1a1ffff + b4ce089
commit 7b769cc
Show file tree

Hide file tree

Showing 26 changed files with 50 additions and 5 deletions.
diff --git a/Resources/Audio/ADT/Footsteps/boots1.ogg b/Resources/Audio/ADT/Footsteps/boots1.ogg
diff --git a/Resources/Audio/ADT/Footsteps/boots2.ogg b/Resources/Audio/ADT/Footsteps/boots2.ogg
diff --git a/Resources/Audio/ADT/Footsteps/boots3.ogg b/Resources/Audio/ADT/Footsteps/boots3.ogg
diff --git a/Resources/Audio/ADT/Footsteps/borg_deathsound.ogg b/Resources/Audio/ADT/Footsteps/borg_deathsound.ogg
diff --git a/Resources/Audio/ADT/Footsteps/combine/die1.ogg b/Resources/Audio/ADT/Footsteps/combine/die1.ogg
diff --git a/Resources/Audio/ADT/Footsteps/combine/die2.ogg b/Resources/Audio/ADT/Footsteps/combine/die2.ogg
diff --git a/Resources/Audio/ADT/Footsteps/combine/die3.ogg b/Resources/Audio/ADT/Footsteps/combine/die3.ogg
diff --git a/Resources/Audio/ADT/Footsteps/combine/die4.ogg b/Resources/Audio/ADT/Footsteps/combine/die4.ogg
diff --git a/Resources/Audio/ADT/Footsteps/gear1.ogg b/Resources/Audio/ADT/Footsteps/gear1.ogg
diff --git a/Resources/Audio/ADT/Footsteps/gear2.ogg b/Resources/Audio/ADT/Footsteps/gear2.ogg
diff --git a/Resources/Audio/ADT/Footsteps/gear3.ogg b/Resources/Audio/ADT/Footsteps/gear3.ogg
diff --git a/Resources/Audio/ADT/Footsteps/gear4.ogg b/Resources/Audio/ADT/Footsteps/gear4.ogg
diff --git a/Resources/Audio/ADT/Footsteps/gear5.ogg b/Resources/Audio/ADT/Footsteps/gear5.ogg
diff --git a/Resources/Audio/ADT/Footsteps/gear6.ogg b/Resources/Audio/ADT/Footsteps/gear6.ogg
diff --git a/Resources/Audio/ADT/Footsteps/off.ogg b/Resources/Audio/ADT/Footsteps/off.ogg
diff --git a/Resources/Audio/ADT/Footsteps/off1.ogg b/Resources/Audio/ADT/Footsteps/off1.ogg
diff --git a/Resources/Audio/ADT/Footsteps/off2.ogg b/Resources/Audio/ADT/Footsteps/off2.ogg
diff --git a/Resources/Audio/ADT/Footsteps/off3.ogg b/Resources/Audio/ADT/Footsteps/off3.ogg
diff --git a/Resources/Audio/ADT/Footsteps/say/off1.ogg b/Resources/Audio/ADT/Footsteps/say/off1.ogg
diff --git a/Resources/Audio/ADT/Footsteps/say/off2.ogg b/Resources/Audio/ADT/Footsteps/say/off2.ogg
diff --git a/Resources/Audio/ADT/Footsteps/say/off3.ogg b/Resources/Audio/ADT/Footsteps/say/off3.ogg
diff --git a/Resources/Audio/ADT/Footsteps/say/off4.ogg b/Resources/Audio/ADT/Footsteps/say/off4.ogg
diff --git a/Resources/Locale/ru-RU/ADT/Objects/Mobs/cyborg_sec.ftl b/Resources/Locale/ru-RU/ADT/Objects/Mobs/cyborg_sec.ftl
@@ -16,6 +16,6 @@ ent-ADTEmitterBoltCyb = кинетический выстрел
     .desc = { ent-BaseBullet.desc }
 
 ent-ADtWeaponSecCyborg = Импульсный пистолет киборга
-    .desc = Импульсный пистолет, который входит в снаряжение киборга Службы Безопасности. Украшен яркими энергетическими всплеска, а также присутствует способность самостоятельно перезаряжаться с течением времени.
+    .desc = Импульсный пистолет, который входит в снаряжение киборга Службы Безопасности. Присутствует несколько режимов стрельбы. Украшен яркими энергетическими всплеска, а также присутствует способность самостоятельно перезаряжаться с течением времени.
 ent-ADTClothingBackpackSecurityCyb = рюкзак киборга
     .desc = Вместительный рюкзак с множеством карманов.
diff --git a/Resources/Prototypes/ADT/Entities/Mobs/SecurityCyborg/equipment.yml b/Resources/Prototypes/ADT/Entities/Mobs/SecurityCyborg/equipment.yml
@@ -25,7 +25,7 @@
   - type: Clothing
     sprite: ADT/Mobs/Silicon/Cyborg/cyb_gun.rsi
   - type: Gun
-    fireRate: 2
+    fireRate: 1.7
     soundGunshot:
       path: /Audio/Weapons/Guns/Gunshots/laser_cannon.ogg
   - type: ProjectileBatteryAmmoProvider
@@ -34,11 +34,11 @@
   - type: BatteryWeaponFireModes
     fireModes:
     - proto: BulletDisabler
-      fireCost: 60
+      fireCost: 70
     - proto: ADTEmitterBoltCyb
-      fireCost: 100
+      fireCost: 200
     - proto: ADTAnomalousParticleOmegaStrongCyb
-      fireCost: 100
+      fireCost: 200
   - type: Battery
     maxCharge: 2220
     startingCharge: 2220

diff --git a/Resources/Prototypes/ADT/Entities/Mobs/SecurityCyborg/sec_cyborg.yml b/Resources/Prototypes/ADT/Entities/Mobs/SecurityCyborg/sec_cyborg.yml
@@ -106,6 +106,18 @@
     nameSegments: [names_sec_cyb]
   - type: Damageable
     damageModifierSet: ADTSecurityCybDamagModSet
+  - type: TriggerOnMobstateChange
+    mobState:
+    - Critical
+  - type: EmitSoundOnTrigger
+    sound:
+      collection: SoldierDeath
+  - type: Speech
+    speechSounds: Metrocop
+    soundCooldownTime: 0.5
+  # - type: Speech
+  #   speechSounds: Combine
+  #   soundCooldownTime: 0.1
 
 - type: entity
   save: false

diff --git a/Resources/Prototypes/ADT/Entities/Mobs/SecurityCyborg/sounds.yml b/Resources/Prototypes/ADT/Entities/Mobs/SecurityCyborg/sounds.yml
@@ -0,0 +1,33 @@
+- type: speechSounds
+  id: Metrocop
+  saySound:
+    path: /Audio/ADT/Footsteps/say/off2.ogg
+  askSound:
+    path: /Audio/ADT/Footsteps/say/off1.ogg
+  exclaimSound:
+    path: /Audio/ADT/Footsteps/say/off3.ogg
+
+- type: speechSounds
+  id: Combine
+  saySound:
+    path: /Audio/ADT/Footsteps/off2.ogg
+  askSound:
+    path: /Audio/ADT/Footsteps/off3.ogg
+  exclaimSound:
+    path: /Audio/ADT/Footsteps/off1.ogg
+
+- type: soundCollection
+  id: Metrocop
+  files:
+  - /Audio/ADT/Footsteps/say/off1.ogg
+  - /Audio/ADT/Footsteps/say/off2.ogg
+  - /Audio/ADT/Footsteps/say/off3.ogg
+  - /Audio/ADT/Footsteps/say/off4.ogg
+
+- type: soundCollection
+  id: SoldierDeath
+  files:
+  - /Audio/ADT/Footsteps/combine/die1.ogg
+  - /Audio/ADT/Footsteps/combine/die2.ogg
+  - /Audio/ADT/Footsteps/combine/die3.ogg
+  - /Audio/ADT/Footsteps/combine/die4.ogg