Merge pull request #488 from fenndragon/Warden

Xenonid Update
Fansana · Jan 18, 2025 · 7491079 · 7491079
2 parents e028d07 + 1160a8c
commit 7491079
Show file tree

Hide file tree

Showing 592 changed files with 2,831 additions and 35 deletions.
diff --git a/Resources/Audio/Animals/alien_roar1.ogg b/Resources/Audio/Animals/alien_roar1.ogg
diff --git a/Resources/Prototypes/DeltaV/GameRules/events.yml b/Resources/Prototypes/DeltaV/GameRules/events.yml
@@ -9,29 +9,63 @@
     reoccurrenceDelay: 12
     minimumPlayers: 15
     weight: 6 # Really weak compared to other critters
-    duration: 60
+    duration: 80
   - type: VentCrittersRule
     entries:
     - id: MobXeno
       prob: 0.01
     - id: MobXenoRouny
-      prob: 0.005
+      prob: 0.002
     - id: MobXenoDrone
-      prob: 0.005
+      prob: 0.002
     - id: MobXenoSpitter
-      prob: 0.005
+      prob: 0.002
     - id: MobXenoRunner
-      prob: 0.005
+      prob: 0.002
     - id: MobXenoPraetorian
-      prob: 0.005
+      prob: 0.002
     - id: MobXenoRavager
-      prob: 0.005
+      prob: 0.002
+    - id: MobXenochargercrusher
+      prob: 0.002
+    - id: MobXenodancerpraetorian
+      prob: 0.002
+    - id: MobXenodefender
+      prob: 0.002
+    - id: MobXenosentinel
+      prob: 0.002
+    - id: MobXenohivelord
+      prob: 0.001
+    - id: MobXenoCarrier
+      prob: 0.002
+    - id: MobXenobloodylarva
+      prob: 0.003
+    - id: MobXenoparasite
+      prob: 0.003
+    - id: MobXenolurker
+      prob: 0.002
+    - id: MobXenowarrior
+      prob: 0.002
+    - id: MobXenoacidrunner
+      prob: 0.002
+    - id: MobXenoacidrunnerprimed
+      prob: 0.002
+    - id: MobXenolarva
+      prob: 0.003
+    - id: MobXenoboiler
+      prob: 0.002
+    - id: MobXenoboxerwarrior
+      prob: 0.002
+    - id: MobXenoCarrier
+      prob: 0.002
+    - id: MobXenocrusher
+      prob: 0.002
     - id: MobXenoQueen
-      prob: 0.005
+      prob: 0.001
     crawlTime: 3, 4 # Floof
     popup: station-event-xeno-vents-popup # Floof
     sound: # Floof
-      path: /Audio/Animals/space_dragon_roar.ogg
+      path: /Audio/Animals/alien_roar1.ogg
       params: {volume: 0.5}
 
 # Weaker version of xenos, meant to provide some dangers in low pop.
@@ -47,19 +81,55 @@
   - type: VentCrittersRule
     entries:
     - id: MobXeno
-      prob: 0.006
+      prob: 0.01
+    - id: MobXenoRouny
+      prob: 0.001
     - id: MobXenoDrone
-      prob: 0.004
+      prob: 0.001
     - id: MobXenoSpitter
-      prob: 0.003
-    - id: MobXenoRouny
       prob: 0.001
     - id: MobXenoRunner
       prob: 0.001
     - id: MobXenoPraetorian
       prob: 0.001
     - id: MobXenoRavager
       prob: 0.001
+    - id: MobXenochargercrusher
+      prob: 0.001
+    - id: MobXenodancerpraetorian
+      prob: 0.001
+    - id: MobXenodefender
+      prob: 0.001
+    - id: MobXenosentinel
+      prob: 0.001
+    - id: MobXenohivelord
+      prob: 0.001
+    - id: MobXenoCarrier
+      prob: 0.001
+    - id: MobXenobloodylarva
+      prob: 0.002
+    - id: MobXenoparasite
+      prob: 0.002
+    - id: MobXenolurker
+      prob: 0.001
+    - id: MobXenowarrior
+      prob: 0.001
+    - id: MobXenoacidrunner
+      prob: 0.001
+    - id: MobXenoacidrunnerprimed
+      prob: 0.001
+    - id: MobXenolarva
+      prob: 0.002
+    - id: MobXenoboiler
+      prob: 0.001
+    - id: MobXenoboxerwarrior
+      prob: 0.001
+    - id: MobXenoCarrier
+      prob: 0.001
+    - id: MobXenocrusher
+      prob: 0.001
+    - id: MobXenoQueen
+      prob: 0.001
 
 - type: entity
   id: MothroachSpawn

diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/xeno.yml b/Resources/Prototypes/Entities/Mobs/NPCs/xeno.yml
@@ -7,6 +7,8 @@
   components:
   - type: Insulated
   - type: CombatMode
+    canDisarm: true
+    disarmFailChance: 0.55
   - type: InputMover
   - type: MobMover
   - type: HTN
@@ -45,7 +47,7 @@
     sprite: Mobs/Aliens/Xenos/burrower.rsi
     layers:
     - map: ["enum.DamageStateVisualLayers.Base"]
-      state: running
+      state: alive
   - type: Fixtures
     fixtures:
       fix1:
@@ -78,8 +80,9 @@
   - type: Bloodstream
     bloodReagent: FluorosulfuricAcid
     bloodMaxVolume: 650
+  - type: LayingDown
   - type: MeleeWeapon
-    altDisarm: false
+    altDisarm: true
     angle: 0
     soundHit:
      collection: AlienClaw
@@ -91,7 +94,7 @@
     rotate: true
     states:
       Alive:
-        Base: running
+        Base: alive
       Critical:
         Base: crit
       Dead:
@@ -152,14 +155,17 @@
     offset: 0,0.4
     layers:
     - map: ["enum.DamageStateVisualLayers.Base"]
-      state: running
+      state: alive
   - type: MobThresholds
     thresholds:
       0: Alive
-      100: Critical
-      150: Dead
+      150: Critical
+      200: Dead
   - type: Stamina
     critThreshold: 300
+  - type: MovementSpeedModifier
+    baseWalkSpeed : 3
+    baseSprintSpeed : 3
   - type: SlowOnDamage
     speedModifierThresholds:
       50: 0.7
@@ -186,7 +192,7 @@
     offset: 0,0.2
     layers:
     - map: ["enum.DamageStateVisualLayers.Base"]
-      state: running
+      state: alive
   - type: MobThresholds
     thresholds:
       0: Alive
@@ -224,7 +230,7 @@
     offset: 0,0.4
     layers:
     - map: ["enum.DamageStateVisualLayers.Base"]
-      state: running
+      state: alive
   - type: MobThresholds
     thresholds:
       0: Alive
@@ -234,6 +240,8 @@
     speedModifierThresholds:
       150: 0.7
   - type: MovementSpeedModifier
+    baseWalkSpeed : 3
+    baseSprintSpeed : 3
   - type: MeleeWeapon
     damage:
      groups:
@@ -309,9 +317,10 @@
     offset: 0,0.6
     layers:
     - map: ["enum.DamageStateVisualLayers.Base"]
-      state: running
+      state: alive
   - type: MovementSpeedModifier
-    baseSprintSpeed: 6.0
+    baseWalkSpeed : 6
+    baseSprintSpeed : 6
   - type: MeleeWeapon
     damage:
      groups:
@@ -338,6 +347,12 @@
     sprite: Mobs/Aliens/Xenos/rouny.rsi
     offset: 0,0.6
     scale: 0.7, 0.7
+    layers:
+    - map: ["enum.DamageStateVisualLayers.Base"]
+      state: running
+  - type: MovementSpeedModifier
+    baseWalkSpeed : 5
+    baseSprintSpeed : 5
   - type: Butcherable
     butcheringType: Spike
     spawned:
@@ -355,7 +370,7 @@
     offset: 0,0.3
     layers:
     - map: ["enum.DamageStateVisualLayers.Base"]
-      state: running
+      state: alive
   - type: MobThresholds
     thresholds:
       0: Alive

diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/xenopet.yml b/Resources/Prototypes/Entities/Mobs/NPCs/xenopet.yml
@@ -12,6 +12,9 @@
     drawdepth: Mobs
     sprite: Mobs/Aliens/FXS/rouny.rsi
     scale: 0.6, 0.6
+    layers:
+    - map: ["enum.DamageStateVisualLayers.Base"]
+      state: running
   - type: PointLight
     radius: 2
     energy: 1
@@ -67,6 +70,9 @@
     drawdepth: Mobs
     sprite: Mobs/Aliens/FXS/praetorian.rsi
     scale: 0.8, 0.8
+    layers:
+    - map: ["enum.DamageStateVisualLayers.Base"]
+      state: running
   - type: PointLight
     radius: 2
     energy: 1
@@ -121,6 +127,9 @@
     drawdepth: Mobs
     sprite: Mobs/Aliens/FXS/drone.rsi
     scale: 0.8, 0.8
+    layers:
+    - map: ["enum.DamageStateVisualLayers.Base"]
+      state: running
   - type: PointLight
     radius: 2
     energy: 1
@@ -175,6 +184,9 @@
     drawdepth: Mobs
     sprite: Mobs/Aliens/FXS/ravager.rsi
     scale: 0.7, 0.7
+    layers:
+    - map: ["enum.DamageStateVisualLayers.Base"]
+      state: running
   - type: PointLight
     radius: 2
     energy: 1

diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml
@@ -823,6 +823,24 @@
     - type: Ammo
       muzzleFlash: null
 
+- type: entity
+  id: BulletAcid2
+  name: boileracid spit
+  parent: BaseBullet
+  noSpawn: true
+  components:
+    - type: Projectile
+      damage:
+        types:
+          Caustic: 8
+    - type: Sprite
+      sprite: Objects/Weapons/Guns/Projectiles/xeno_toxic.rsi
+      scale: 1.2, 1.2
+      layers:
+        - state: xeno_toxic
+    - type: Ammo
+      muzzleFlash: null
+
 - type: entity
   id: BulletWaterShot
   name: water