Shooting NPCs and more (#18042)

* Add pirate shooting * Shooting working * Basics working * Refactor time * More conversion * Update primitives * Update yml * weh * Building again * Draft * weh * b * Start shutdown * Starting to take form * Code side done * is it worky * Fix prototypes * stuff * Shitty working * Juke events working * Even more cleanup * RTX * Fix interaction combat mode and compquery * GetAmmoCount relays * Fix rotation speed * Juke fixes * fixes * weh * The collision avoidance never ends * Fixes * Pause support * framework * lazy * Fix idling * Fix drip * goobed * Fix takeover shutdown bug * Merge fixes * shitter * Fix carpos
2023-08-02 10:48:56 +10:00
parent 018e465fad
commit c31c848afd
103 changed files with 2089 additions and 810 deletions
--- a/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml
@@ -133,7 +133,8 @@
  - type: InputMover
  - type: MobMover
  - type: HTN
-    rootTask: SimpleHostileCompound
+    rootTask:
+      task: SimpleHostileCompound
  - type: NpcFactionMember
    factions:
    - SimpleHostile
@@ -470,7 +471,8 @@
  - type: Body
    prototype: AnimalRuminant
  - type: HTN
-    rootTask: RuminantCompound
+    rootTask:
+      task: RuminantCompound
  - type: GuideHelp
    guides:
    - Chef
@@ -588,7 +590,8 @@
  - type: Body
    prototype: AnimalRuminant
  - type: HTN
-    rootTask: RuminantCompound
+    rootTask:
+      task: RuminantCompound

 # Note that we gotta make this bitch vomit someday when you feed it anthrax or sumthin. Needs to be a small item thief too and aggressive if attacked.
 - type: entity
@@ -763,7 +766,8 @@
  - type: Loadout
    prototypes: [ BoxingKangarooGear ]
  - type: HTN
-    rootTask: SimpleHostileCompound
+    rootTask:
+      task: SimpleHostileCompound
  - type: NpcFactionMember
    factions:
    - SimpleHostile
@@ -906,7 +910,8 @@
    factions:
      - Mouse
  - type: HTN
-    rootTask: MouseCompound
+    rootTask:
+      task: MouseCompound
  - type: Physics
  - type: Fixtures
    fixtures:
@@ -1286,7 +1291,8 @@
  - type: InputMover
  - type: MobMover
  - type: HTN
-    rootTask: SimpleHostileCompound
+    rootTask:
+      task: SimpleHostileCompound
  - type: NpcFactionMember
    factions:
    - Syndicate
@@ -1562,7 +1568,8 @@
    - type: InputMover
    - type: MobMover
    - type: HTN
-      rootTask: SimpleHostileCompound
+      rootTask:
+        task: SimpleHostileCompound
    - type: GhostRole
      makeSentient: true
      name: ghost-role-information-giant-spider-name
@@ -1866,7 +1873,8 @@
  - type: InputMover
  - type: MobMover
  - type: HTN
-    rootTask: SimpleHostileCompound
+    rootTask:
+      task: SimpleHostileCompound
  - type: NpcFactionMember
    factions:
    - SimpleHostile
--- a/Resources/Prototypes/Entities/Mobs/NPCs/behonker.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/behonker.yml
@@ -12,7 +12,8 @@
      description: ghost-role-information-behonker-description
    - type: GhostTakeoverAvailable
    - type: HTN
-      rootTask: SimpleHostileCompound
+      rootTask:
+        task: SimpleHostileCompound
    - type: NpcFactionMember
      factions:
        - SimpleHostile
--- a/Resources/Prototypes/Entities/Mobs/NPCs/carp.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/carp.yml
@@ -8,7 +8,8 @@
    - type: InputMover
    - type: MobMover
    - type: HTN
-      rootTask: SimpleHostileCompound
+      rootTask:
+        task: SimpleHostileCompound
      blackboard:
        NavSmash: !type:Bool
          true
@@ -20,7 +21,7 @@
      sprite: Mobs/Aliens/Carps/space.rsi
      layers:
      - map: [ "enum.DamageStateVisualLayers.Base" ]
-        state: base
+        state: alive
    - type: CombatMode
    - type: Physics
    - type: Fixtures
@@ -45,10 +46,10 @@
    - type: DamageStateVisuals
      states:
        Alive:
-          Base: base
+          Base: alive
          BaseUnshaded: mouth
        Dead:
-          Base: base_dead
+          Base: dead
          BaseUnshaded: dead_mouth
    - type: Butcherable
      spawned:
@@ -82,14 +83,14 @@
  - type: Sprite
    layers:
    - map: [ "enum.DamageStateVisualLayers.Base" ]
-      state: base
+      state: alive
    - map: [ "enum.DamageStateVisualLayers.BaseUnshaded" ]
      state: mouth
      shader: unshaded
  - type: RandomSprite
    available:
    - enum.DamageStateVisualLayers.Base:
-        base: Rainbow
+        alive: Rainbow
      enum.DamageStateVisualLayers.BaseUnshaded:
        mouth: ""

@@ -145,7 +146,7 @@
  name: space carp
  id: MobCarpDragon
  suffix: DragonBrood
-  parent: BaseMobCarp
+  parent: MobCarp
  components:
    - type: GhostRole
      allowMovement: true
@@ -155,7 +156,8 @@
      description: ghost-role-information-sentient-carp-description
    - type: GhostTakeoverAvailable
    - type: HTN
-      rootTask: DragonCarpCompound
+      rootTask:
+        task: DragonCarpCompound

 - type: entity
  id: MobCarpDungeon
--- a/Resources/Prototypes/Entities/Mobs/NPCs/flesh.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/flesh.yml
@@ -6,7 +6,8 @@
  abstract: true
  components:
  - type: HTN
-    rootTask: SimpleHostileCompound
+    rootTask:
+      task: SimpleHostileCompound
    blackboard:
      NavSmash: !type:Bool
        true
--- a/Resources/Prototypes/Entities/Mobs/NPCs/human.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/human.yml
@@ -12,6 +12,23 @@
    factions:
    - NanoTrasen

+- type: entity
+  name: Salvager
+  parent: BaseMobHuman
+  id: MobSalvager
+  components:
+    - type: NpcFactionMember
+      factions:
+        - Syndicate
+    - type: Loadout
+      prototypes:
+        - SalvageSpecialistGear
+    - type: InputMover
+    - type: MobMover
+    - type: HTN
+      rootTask:
+        task: SimpleHumanoidHostileCompound
+
 - type: entity
  name: Spirate
  parent: BaseMobHuman
@@ -21,10 +38,14 @@
  - type: NpcFactionMember
    factions:
      - Syndicate
+  - type: Loadout
+    prototypes:
+      - PirateGear
  - type: InputMover
  - type: MobMover
  - type: HTN
-    rootTask: RangedCombatCompound
+    rootTask:
+      task: SimpleHumanoidHostileCompound

 - type: entity
  parent: BaseMobHuman
--- a/Resources/Prototypes/Entities/Mobs/NPCs/pets.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/pets.yml
@@ -90,7 +90,8 @@
    factions:
      - PetsNT
  - type: HTN
-    rootTask: SimpleHostileCompound
+    rootTask:
+      task: SimpleHostileCompound
  - type: Grammar
    attributes:
      gender: female
@@ -487,7 +488,8 @@
      state: shiva
      sprite: Mobs/Pets/shiva.rsi
  - type: HTN
-    rootTask: SimpleHostileCompound
+    rootTask:
+      task: SimpleHostileCompound
  - type: Physics
  - type: Fixtures
    fixtures:
--- a/Resources/Prototypes/Entities/Mobs/NPCs/regalrat.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/regalrat.yml
@@ -11,7 +11,8 @@
  - type: InputMover
  - type: MobMover
  - type: HTN
-    rootTask: SimpleHostileCompound
+    rootTask:
+      task: SimpleHostileCompound
  - type: Reactive
    groups:
      Flammable: [Touch]
@@ -176,7 +177,8 @@
  - type: InputMover
  - type: MobMover
  - type: HTN
-    rootTask: SimpleHostileCompound
+    rootTask:
+      task: SimpleHostileCompound
  - type: Reactive
    groups:
      Flammable: [Touch]
--- a/Resources/Prototypes/Entities/Mobs/NPCs/silicon.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/silicon.yml
@@ -227,7 +227,8 @@
    baseSprintSpeed: 3
  - type: NoSlip
  - type: HTN
-    rootTask: CleanbotCompound
+    rootTask:
+      task: CleanbotCompound
  - type: DrainableSolution
    solution: drainBuffer
  - type: InteractionPopup
@@ -256,7 +257,8 @@
    state: medibot
  - type: Speech
  - type: HTN
-    rootTask: MedibotCompound
+    rootTask:
+      task: MedibotCompound
  - type: Construction
    graph: MediBot
    node: bot
--- a/Resources/Prototypes/Entities/Mobs/NPCs/simplemob.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/simplemob.yml
@@ -16,7 +16,8 @@
  - type: InputMover
  - type: MobMover
  - type: HTN
-    rootTask: IdleCompound
+    rootTask:
+      task: IdleCompound
  - type: Input
    context: "human"
  - type: NpcFactionMember
--- a/Resources/Prototypes/Entities/Mobs/NPCs/slimes.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/slimes.yml
@@ -9,7 +9,8 @@
    factions:
    - SimpleNeutral
  - type: HTN
-    rootTask: SimpleHostileCompound
+    rootTask:
+      task: SimpleHostileCompound
  - type: Sprite
    drawdepth: Mobs
    sprite: Mobs/Aliens/slimes.rsi
--- a/Resources/Prototypes/Entities/Mobs/NPCs/space.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/space.yml
@@ -6,7 +6,8 @@
  description: It looks friendly. Why don't you give it a hug?
  components:
  - type: HTN
-    rootTask: SimpleHostileCompound
+    rootTask:
+      task: SimpleHostileCompound
  - type: NpcFactionMember
    factions:
    - SimpleHostile
--- a/Resources/Prototypes/Entities/Mobs/NPCs/spacetick.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/spacetick.yml
@@ -7,7 +7,8 @@
  - type: InputMover
  - type: MobMover
  - type: HTN
-    rootTask: SimpleHostileCompound
+    rootTask:
+      task: SimpleHostileCompound
  - type: NpcFactionMember
    factions:
    - SimpleHostile
--- a/Resources/Prototypes/Entities/Mobs/NPCs/xeno.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/xeno.yml
@@ -10,7 +10,8 @@
  - type: InputMover
  - type: MobMover
  - type: HTN
-    rootTask: XenoCompound
+    rootTask:
+      task: XenoCompound
    blackboard:
      NavInteract: !type:Bool
        true
@@ -330,8 +331,24 @@
    thresholds:
      0: Alive
      75: Dead
+  - type: HTN
+    rootTask:
+      task: SimpleRangedHostileCompound
  - type: Stamina
    excess: 300
+  - type: RechargeBasicEntityAmmo
+    rechargeCooldown: 0.75
+  - type: BasicEntityAmmoProvider
+    proto: BulletAcid
+    capacity: 1
+    count: 1
+  - type: Gun
+    fireRate: 0.75
+    useKey: false
+    selectedMode: FullAuto
+    availableModes:
+      - FullAuto
+    soundGunshot: /Audio/Weapons/Xeno/alien_spitacid.ogg
  - type: SlowOnDamage
    speedModifierThresholds:
      50: 0.4
@@ -374,7 +391,8 @@
  - type: InputMover
  - type: MobMover
  - type: HTN
-    rootTask: SimpleHostileCompound
+    rootTask:
+      task: SimpleHostileCompound
  - type: NpcFactionMember
    factions:
    - Xeno
--- a/Resources/Prototypes/Entities/Mobs/Player/dragon.yml
+++ b/Resources/Prototypes/Entities/Mobs/Player/dragon.yml
@@ -14,7 +14,8 @@
    description: ghost-role-information-space-dragon-description
  - type: GhostTakeoverAvailable
  - type: HTN
-    rootTask: XenoCompound
+    rootTask:
+      task: XenoCompound
    blackboard:
      NavInteract: !type:Bool
        true
--- a/Resources/Prototypes/Entities/Mobs/Species/base.yml
+++ b/Resources/Prototypes/Entities/Mobs/Species/base.yml
@@ -94,9 +94,6 @@
  - type: InventorySlots
  - type: Clickable
  - type: InteractionOutline
-  - type: Icon
-    sprite: Mobs/Species/Human/parts.rsi
-    state: full
  - type: Sprite
    noRot: true
    drawdepth: Mobs
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/turrets.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/turrets.yml
@@ -106,7 +106,8 @@
      proto: CartridgeCaselessRifle
      capacity: 500
    - type: HTN
-      rootTask: TurretCompound
+      rootTask:
+        task: TurretCompound
      blackboard:
        SoundTargetInLOS: !type:SoundPathSpecifier
          path: /Audio/Effects/double_beep.ogg
@@ -211,7 +212,8 @@
      selectedMode: FullAuto
      soundGunshot: /Audio/Weapons/Xeno/alien_spitacid.ogg
    - type: HTN
-      rootTask: TurretCompound
+      rootTask:
+        task: TurretCompound
      blackboard:
        SoundTargetInLOS: !type:SoundPathSpecifier
          path: /Audio/Animals/snake_hiss.ogg