Bunch of bugfixes (#1165)

* watcher fix

* fix #1162

* fix #1111

* make watcher move smoothly

* s

* Delete test_xeno.yml

Resources/Prototypes/_CP14/Entities/Markers/Spawners/Constrained/test_xeno.yml

@@ -1,45 +0,0 @@
-- type: entity
-  id: CP14ConstrainedSpawnerBase
-  abstract: true
-  parent: MarkerBase
-  description: lol
-  categories: [ ForkFiltered ]
-  components:
-  - type: Sprite
-    layers:
-      - state: red
-  - type: Physics
-    bodyType: Static
-    fixedRotation: true
-  - type: Fixtures
-    fixtures:
-      spawn:
-        shape:
-          !type:PhysShapeCircle
-          radius: 15
-        hard: false
-        layer:
-          - AllMask
-  - type: TriggerOnCollide
-    fixtureID: spawn
-  - type: StepTrigger
-    requiredTriggeredSpeed: 0
-    stepOn: true
-
-- type: entity
-  parent: CP14ConstrainedSpawnerBase
-  id: CP14ConstrainedSpawnerXeno
-  name: xeno constrained spawner
-  components:
-  - type: TriggerOnCollide
-    fixtureID: spawn
-  - type: CP14ConstrainedSpawnerOnTrigger
-    prototypes:
-    - CP14MobXeno
-    - CP14MobXenoDrone
-    - CP14MobSpaceCobra
-    - CP14MobSmallPurpleSnake
-    - CP14MobPurpleSnake
-    - MobLuminousEntity
-    - MobLuminousObject
-    - CP14MobWatcherMagmawing

Resources/Prototypes/_CP14/Entities/Mobs/NPC/watcher.yml

@@ -45,8 +45,10 @@
       0: Alive
       50: Dead
   - type: MovementSpeedModifier
-    baseWalkSpeed: 5
-    baseSprintSpeed: 7
+    baseWalkSpeed: 2
+    baseSprintSpeed: 4
+    friction: 0.5
+    acceleration: 3
   - type: ProjectileBatteryAmmoProvider
     proto: WatcherBolt
     fireCost: 50

Resources/Prototypes/_CP14/Entities/Mobs/NPC/xeno_test.yml

@@ -1,84 +0,0 @@
-- type: entity
-  id: CP14MobXeno
-  parent: MobXeno
-  categories: [ ForkFiltered ]
-  components:
-  - type: NpcFactionMember
-    factions:
-    - CP14Monster
-
-- type: entity
-  id: CP14MobXenoDrone
-  parent: MobXenoDrone
-  categories: [ ForkFiltered ]
-  components:
-  - type: NpcFactionMember
-    factions:
-    - CP14Monster
-
-- type: entity
-  id: CP14MobSpaceCobra
-  name: cobra
-  parent: MobCobraSpace
-  categories: [ ForkFiltered ]
-  components:
-  - type: NpcFactionMember
-    factions:
-    - CP14Monster
-  - type: MeleeChemicalInjector
-    transferAmount: 2
-  - type: MeleeWeapon
-    hidden: true
-    soundHit:
-      path: /Audio/Effects/bite.ogg
-    angle: 0
-    animation: WeaponArcBite
-    damage:
-      types:
-        Piercing: 2
-        Poison: 2
-
-- type: entity
-  id: CP14MobPurpleSnake
-  parent: MobPurpleSnake
-  categories: [ ForkFiltered ]
-  components:
-  - type: NpcFactionMember
-    factions:
-    - CP14Monster
-  - type: MeleeWeapon
-    angle: 0
-    animation: WeaponArcBite
-    damage:
-      types:
-        Piercing: 1
-  - type: MeleeChemicalInjector
-    transferAmount: 3
-
-- type: entity
-  id: CP14MobSmallPurpleSnake
-  parent: MobSmallPurpleSnake
-  categories: [ ForkFiltered ]
-  components:
-  - type: NpcFactionMember
-    factions:
-    - CP14Monster
-  - type: SolutionTransfer
-    maxTransferAmount: 0.2
-  - type: MeleeWeapon
-    angle: 0
-    animation: WeaponArcBite
-    damage:
-      types:
-        Piercing: 0.5
-  - type: MeleeChemicalInjector
-    transferAmount: 2
-
-- type: entity
-  id: CP14MobWatcherMagmawing
-  parent: MobWatcherMagmawing
-  categories: [ ForkFiltered ]
-  components:
-  - type: NpcFactionMember
-    factions:
-    - CP14Monster

Resources/Prototypes/_CP14/Entities/Structures/Floor/floorWater.yml

@@ -71,7 +71,6 @@
   suffix: Deep, Air damage
   components:
   - type: Sprite
-    drawdepth: OverMobs
     color: "#869dc2"
   - type: SpeedModifierContacts
     walkSpeedModifier: 0.2

Resources/Prototypes/_CP14/Procedural/Demiplane/Modifiers/Danger/mobs.yml

@@ -220,7 +220,7 @@
   - CP14DemiplaneHot
   layers:
     - !type:OreDunGen
-      entity: CP14MobSlimeBase
+      entity: CP14MobWatcherIce
       count: 2
       minGroupSize: 2
       maxGroupSize: 3
@@ -239,7 +239,7 @@
   - CP14DemiplaneCold
   layers:
     - !type:OreDunGen
-      entity: CP14MobSlimeBase
+      entity: CP14MobWatcherMagma
       count: 2
       minGroupSize: 2
       maxGroupSize: 3

Resources/Prototypes/_CP14/Species/silva.yml

@@ -10,6 +10,7 @@
   defaultSkinTone: "#6c741d"
   maleFirstNames: CP14_Names_Silva_Male_First
   femaleFirstNames: CP14_Names_Silva_Female_First
+  naming: First
 
 - type: speciesBaseSprites
   id: CP14MobSilvaSprites