more mobs, shanged the ship a bit

new-frontiers-14 · Feb 2, 2024 · 228baf4 · 228baf4
1 parent 9557ea8
commit 228baf4
Show file tree

Hide file tree

Showing 6 changed files with 833 additions and 469 deletions.
diff --git a/Resources/Maps/_NF/Bluespace/syndieftlintercept.yml b/Resources/Maps/_NF/Bluespace/syndieftlintercept.yml
diff --git a/Resources/Prototypes/_NF/Entities/Mobs/NPCs/base_npcs.yml b/Resources/Prototypes/_NF/Entities/Mobs/NPCs/base_npcs.yml
diff --git a/Resources/Prototypes/_NF/Entities/Mobs/NPCs/syndicatemob.yml b/Resources/Prototypes/_NF/Entities/Mobs/NPCs/syndicatemob.yml
@@ -10,13 +10,14 @@
   - BaseMobSpecies
   id: MobSyndicateNavalBase
   components:
+    - type: ShoesRequiredStepTriggerImmune
     - type: NpcFactionMember
       factions:
         - Syndicate
     - type: AutoImplant
       implants:
       - DeathRattleImplant
-      - MicroBombImplant
+#      - MicroBombImplant
 
 # Humans
 - type: entity
@@ -32,7 +33,7 @@
     - type: MobMover
     - type: HTN
       rootTask:
-        task: SimpleRangedHostileCompound
+        task: SimpleHumanoidHostileCompound
     - type: RechargeBasicEntityAmmo
       rechargeCooldown: 0.75
     - type: BasicEntityAmmoProvider
@@ -165,6 +166,63 @@
         - FullAuto
       soundGunshot: /Audio/Weapons/Guns/Gunshots/smg.ogg
 
+- type: entity
+  name: Syndicate Grenadier
+  suffix: AI
+  parent: MobSyndicateNavalBase
+  id: MobSyndicateNavalGrenadier
+  components:
+    - type: Loadout
+      prototypes:
+        - SyndicateNavalGrenadierGear
+    - type: InputMover
+    - type: MobMover
+    - type: HTN
+      rootTask:
+        task: SimpleHumanoidHostileCompound
+    - type: RechargeBasicEntityAmmo
+      rechargeCooldown: 5
+    - type: BasicEntityAmmoProvider
+      proto: GrenadeFrag
+      capacity: 1
+      count: 1
+    - type: Gun
+      useKey: false
+      fireRate: 1
+      selectedMode: SemiAuto
+      availableModes:
+        - SemiAuto
+      soundGunshot: /Audio/Weapons/Guns/Gunshots/grenade_launcher.ogg
+
+- type: entity
+  name: Syndicate Saboteur
+  suffix: AI
+  parent: MobSyndicateNavalBase
+  id: MobSyndicateNavalSaboteur
+  components:
+    - type: Loadout
+      prototypes:
+        - SyndicateNavalSaboteurGear
+    - type: InputMover
+    - type: MobMover
+    - type: HTN
+      rootTask:
+        task: SimpleRangedHostileCompound
+    - type: RechargeBasicEntityAmmo
+      rechargeCooldown: 1
+    - type: BasicEntityAmmoProvider
+      proto: BulletPistolEmp
+      capacity: 4
+      count: 4
+    - type: Gun
+      fireRate: 6
+      useKey: false
+      selectedMode: FullAuto
+      availableModes:
+      - FullAuto
+      - SemiAuto
+      soundGunshot: /Audio/Weapons/Guns/Gunshots/pistol.ogg
+
 - type: entity
   name: Victim of Experimentation
   suffix: AI

diff --git a/Resources/Prototypes/_NF/Entities/Objects/Weapons/Throwable/trowable_weapons.yml b/Resources/Prototypes/_NF/Entities/Objects/Weapons/Throwable/trowable_weapons.yml
@@ -31,4 +31,4 @@
     transferAmount: 4
     blockSlots: NONE #tranquillizer darts shouldn't be blocked by a mask
   - type: InjectableSolution
-    solution: ammo
+    solution: ammo
diff --git a/Resources/Prototypes/_NF/Entities/Spawners/syndicatemobs.yml b/Resources/Prototypes/_NF/Entities/Spawners/syndicatemobs.yml
@@ -63,6 +63,32 @@
     prototypes:
       - MobSyndicateNavalOperator
 
+- type: entity
+  name: Syndicate Naval Grenadier Spawner
+  id: SpawnMobSyndicateNavalGrenadier
+  parent: MarkerBase
+  components:
+  - type: Sprite
+    layers:
+      - state: red
+      - state: ai
+  - type: ConditionalSpawner
+    prototypes:
+      - MobSyndicateNavalGrenadier
+
+- type: entity
+  name: Syndicate Naval Saboteur Spawner
+  id: SpawnMobSyndicateNavalSaboteur
+  parent: MarkerBase
+  components:
+  - type: Sprite
+    layers:
+      - state: red
+      - state: ai
+  - type: ConditionalSpawner
+    prototypes:
+      - MobSyndicateNavalSaboteur
+
 - type: entity
   name: Victim of Experimentation Spawner
   id: SpawnMobExperimentationVictim

diff --git a/Resources/Prototypes/_NF/Roles/Jobs/Hostile/syndicate_naval_forces.yml b/Resources/Prototypes/_NF/Roles/Jobs/Hostile/syndicate_naval_forces.yml
@@ -50,7 +50,7 @@
     ears: ClothingHeadsetAltSyndicate
     neck: ClothingNeckStethoscope
     mask: ClothingMaskGasSyndicate
-    outerClothing: ClothingOuterArmorBasic
+    outerClothing: ClothingOuterCoatAMG
   inhand:
 #    - DartSindicateTranquilizer
     - SawAdvanced
@@ -92,6 +92,41 @@
 #    - WeaponSubMachineGunAtreides
 #    - RiotShield
 
+# Syndicate Grenadier
+- type: startingGear
+  id: SyndicateNavalGrenadierGear
+  equipment:
+    head: ClothingHeadHelmetBombSuit
+    jumpsuit: ClothingUniformJumpsuitRecruitSyndie
+    shoes: ClothingShoesBootsCombat
+    gloves: ClothingHandsGlovesCombat
+    id: SyndiPDA
+    belt: ClothingBeltMilitaryWebbing
+    ears: ClothingHeadsetAltSyndicate
+    mask: ClothingMaskGasSyndicate
+    outerClothing: ClothingOuterSuitBomb
+  inhand:
+    - WeaponLauncherChinaLake
+#    - WeaponSubMachineGunAtreides
+#    - RiotShield
+
+# Syndicate Saboteur
+- type: startingGear
+  id: SyndicateNavalSaboteurGear
+  equipment:
+    head: ClothingHeadHatSyndie
+    back: JetpackBlackFilled
+    jumpsuit: ClothingUniformJumpsuitOperative
+    shoes: ClothingShoesBootsCombat
+    gloves: ClothingHandsGlovesCombat
+    id: SyndiPDA
+    eyes: ClothingEyesGlassesSunglasses
+    ears: ClothingHeadsetAltSyndicate
+    mask: ClothingMaskNeckGaiter
+    outerClothing: ClothingOuterArmorBasicSlim
+  inhand:
+    - CombatKnife
+
 # Syndicate Victim: Driven Insane Victim of Experimentation
 - type: startingGear
   id: SyndicateVictimInsaneGear