Cleanup factions code (#11075)

Co-authored-by: Kara <lunarautomaton6@gmail.com>
2022-09-15 04:45:02 +10:00
parent 356a6b8d2e
commit 8871c445b8
34 changed files with 311 additions and 287 deletions
--- a/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml
@@ -143,7 +143,7 @@
  - type: MobMover
  - type: HTN
    rootTask: SimpleHostileCompound
-  - type: AiFactionTag
+  - type: Faction
    factions:
    - SimpleHostile
  - type: Bloodstream
@@ -668,7 +668,7 @@
  - type: MobMover
  - type: HTN
    rootTask: SimpleHostileCompound
-  - type: AiFactionTag
+  - type: Faction
    factions:
    - SimpleHostile

@@ -1151,7 +1151,7 @@
  - type: MobMover
  - type: HTN
    rootTask: SimpleHostileCompound
-  - type: AiFactionTag
+  - type: Faction
    factions:
    - Syndicate
  - type: Sprite
@@ -1309,7 +1309,7 @@
  id: MobGiantSpiderAngry
  suffix: Angry
  components:
-    - type: AiFactionTag
+    - type: Faction
      factions:
        - Xeno
    - type: InputMover
--- a/Resources/Prototypes/Entities/Mobs/NPCs/bear.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/bear.yml
@@ -6,7 +6,7 @@
  components:
  - type: InputMover
  - type: MobMover
-  - type: AiFactionTag
+  - type: Faction
    factions:
    - SimpleHostile
  - type: Sprite
--- a/Resources/Prototypes/Entities/Mobs/NPCs/carp.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/carp.yml
@@ -9,7 +9,7 @@
    - type: MobMover
    - type: HTN
      rootTask: SimpleHostileCompound
-    - type: AiFactionTag
+    - type: Faction
      factions:
        - SimpleHostile
    - type: Sprite
--- a/Resources/Prototypes/Entities/Mobs/NPCs/human.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/human.yml
@@ -8,7 +8,7 @@
  - type: MobMover
  - type: Loadout
    prototype: PassengerGear
-  - type: AiFactionTag
+  - type: Faction
    factions:
    - NanoTrasen

@@ -18,7 +18,7 @@
  id: MobSpirate
  description: Yarr!
  components:
-  - type: AiFactionTag
+  - type: Faction
    factions:
      - Syndicate
  - type: InputMover
--- a/Resources/Prototypes/Entities/Mobs/NPCs/mimic.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/mimic.yml
@@ -9,7 +9,7 @@
    - FootstepSound
  - type: InputMover
  - type: MobMover
-  - type: AiFactionTag
+  - type: Faction
    factions:
    - SimpleHostile
  - type: Hands
--- a/Resources/Prototypes/Entities/Mobs/NPCs/pets.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/pets.yml
@@ -87,7 +87,7 @@
  - type: MobMover
  - type: HTN
    rootTask: SimpleHostileCompound
-  - type: AiFactionTag
+  - type: Faction
    factions:
    - SimpleHostile
  - type: InteractionPopup
--- a/Resources/Prototypes/Entities/Mobs/NPCs/regalrat.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/regalrat.yml
@@ -14,7 +14,7 @@
    groups:
      Flammable: [Touch]
      Extinguish: [Touch]
-  - type: AiFactionTag
+  - type: Faction
    factions:
    - SimpleHostile
  - type: Sprite
@@ -177,7 +177,7 @@
    groups:
      Flammable: [Touch]
      Extinguish: [Touch]
-  - type: AiFactionTag
+  - type: Faction
    factions:
    - SimpleHostile
  - type: Sprite
--- a/Resources/Prototypes/Entities/Mobs/NPCs/silicon.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/silicon.yml
@@ -39,7 +39,7 @@
    netsync: false
  - type: Recyclable
    safe: false
-  - type: AiFactionTag
+  - type: Faction
    factions:
    - SimpleNeutral
  - type: HealthExaminable
--- a/Resources/Prototypes/Entities/Mobs/NPCs/simplemob.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/simplemob.yml
@@ -18,7 +18,7 @@
    rootTask: IdleCompound
  - type: Input
    context: "human"
-  - type: AiFactionTag
+  - type: Faction
    factions:
    - SimpleNeutral
  - type: MovementSpeedModifier
--- a/Resources/Prototypes/Entities/Mobs/NPCs/spacetick.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/spacetick.yml
@@ -6,7 +6,7 @@
  components:
  - type: InputMover
  - type: MobMover
-  - type: AiFactionTag
+  - type: Faction
    factions:
    - SimpleHostile
  - type: Sprite
--- a/Resources/Prototypes/Entities/Mobs/NPCs/xeno.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/xeno.yml
@@ -24,7 +24,7 @@
    groups:
      Flammable: [Touch]
      Extinguish: [Touch]
-  - type: AiFactionTag
+  - type: Faction
    factions:
    - Xeno
  - type: Hands
@@ -357,7 +357,7 @@
  - type: MobMover
  - type: HTN
    rootTask: SimpleHostileCompound
-  - type: AiFactionTag
+  - type: Faction
    factions:
    - Xeno
  - type: MeleeWeapon
--- a/Resources/Prototypes/Entities/Mobs/Player/dragon.yml
+++ b/Resources/Prototypes/Entities/Mobs/Player/dragon.yml
@@ -13,7 +13,7 @@
      description: Call in 3 carp rifts and take over this quadrant! You have only 5 minutes in between each rift before you will disappear.
    - type: HTN
      rootTask: XenoCompound
-    - type: AiFactionTag
+    - type: Faction
      factions:
        - Dragon
    - type: Speech
--- a/Resources/Prototypes/Entities/Mobs/Player/dwarf.yml
+++ b/Resources/Prototypes/Entities/Mobs/Player/dwarf.yml
@@ -24,6 +24,6 @@
    - type: CameraRecoil
    - type: Examiner
    - type: CanHostGuardian
-    - type: AiFactionTag
+    - type: Faction
      factions:
        - NanoTrasen
--- a/Resources/Prototypes/Entities/Mobs/Player/familiars.yml
+++ b/Resources/Prototypes/Entities/Mobs/Player/familiars.yml
@@ -50,7 +50,7 @@
        Slash: 7
  - type: InputMover
  - type: MobMover
-  - type: AiFactionTag
+  - type: Faction
    factions:
    - SimpleNeutral
  - type: InteractionPopup
--- a/Resources/Prototypes/Entities/Mobs/Player/human.yml
+++ b/Resources/Prototypes/Entities/Mobs/Player/human.yml
@@ -30,7 +30,7 @@
  - type: CameraRecoil
  - type: Examiner
  - type: CanHostGuardian
-  - type: AiFactionTag
+  - type: Faction
    factions:
    - NanoTrasen

--- a/Resources/Prototypes/Entities/Mobs/Player/reptilian.yml
+++ b/Resources/Prototypes/Entities/Mobs/Player/reptilian.yml
@@ -25,7 +25,7 @@
    - type: CameraRecoil
    - type: Examiner
    - type: CanHostGuardian
-    - type: AiFactionTag
+    - type: Faction
      factions:
        - NanoTrasen
    - type: Respirator
--- a/Resources/Prototypes/Entities/Mobs/Player/skeleton.yml
+++ b/Resources/Prototypes/Entities/Mobs/Player/skeleton.yml
@@ -23,6 +23,6 @@
    - type: CameraRecoil
    - type: Examiner
    - type: CanHostGuardian
-    - type: AiFactionTag
+    - type: Faction
      factions:
        - NanoTrasen
--- a/Resources/Prototypes/Entities/Mobs/Player/slime.yml
+++ b/Resources/Prototypes/Entities/Mobs/Player/slime.yml
@@ -22,6 +22,6 @@
    - type: CameraRecoil
    - type: Examiner
    - type: CanHostGuardian
-    - type: AiFactionTag
+    - type: Faction
      factions:
        - NanoTrasen
--- a/Resources/Prototypes/Entities/Mobs/Player/vox.yml
+++ b/Resources/Prototypes/Entities/Mobs/Player/vox.yml
@@ -25,7 +25,7 @@
    - type: CameraRecoil
    - type: Examiner
    - type: CanHostGuardian
-    - type: AiFactionTag
+    - type: Faction
      factions:
        - NanoTrasen
    - type: Respirator
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/turrets.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/turrets.yml
@@ -72,6 +72,6 @@
      blackboard:
        SoundTargetInLOS: !type:SoundPathSpecifier
          path: /Audio/Effects/double_beep.ogg
-    - type: AiFactionTag
+    - type: Faction
      factions:
        - Syndicate
--- a/Resources/Prototypes/ai_factions.yml
+++ b/Resources/Prototypes/ai_factions.yml
@@ -1,34 +1,34 @@
- type: aiFaction
+- type: faction
  id: Dragon
  hostile:
    - NanoTrasen
    - Syndicate
    - Xeno

- type: aiFaction
+- type: faction
  id: NanoTrasen
  hostile:
  - SimpleHostile
  - Syndicate
  - Xeno

- type: aiFaction
+- type: faction
  id: SimpleHostile
  hostile:
  - NanoTrasen
  - Syndicate

- type: aiFaction
+- type: faction
  id: SimpleNeutral

- type: aiFaction
+- type: faction
  id: Syndicate
  hostile:
  - NanoTrasen
  - SimpleHostile
  - Xeno

- type: aiFaction
+- type: faction
  id: Xeno
  hostile:
  - NanoTrasen