tweaks

new-frontiers-14 · Jun 10, 2024 · dea1136 · dea1136
1 parent aaf440b
commit dea1136
Show file tree

Hide file tree

Showing 7 changed files with 117 additions and 12 deletions.
diff --git a/Resources/Prototypes/_NF/Entities/Clothing/Neck/misc.yml b/Resources/Prototypes/_NF/Entities/Clothing/Neck/misc.yml
@@ -64,7 +64,7 @@
 - type: entity
   parent: ClothingNeckBase
   id: ClothingNeckIFFNeutral
-  name: IFF moon white strobe
+  name: IFF white strobe
   description: Visible LED IFF kit that consists of helmet and shoulder strobes.
   components:
   - type: Item
@@ -168,3 +168,45 @@
       - state: equipped-NECK-on
         color: "#47f8ff"
         shader: unshaded
+
+- type: entity
+  parent: ClothingNeckIFFNeutral
+  id: ClothingNeckIFFOrange
+  name: IFF orange strobe
+  components:
+  - type: Sprite
+    sprite: _NF/Clothing/Neck/Misc/mercenary_iff.rsi
+    layers:
+    - state: icon-off
+    - state: icon-on
+      color: "#ff8227"
+      shader: unshaded
+  - type: Clothing
+    sprite: _NF/Clothing/Neck/Misc/mercenary_iff.rsi
+    clothingVisuals:
+      neck:
+      - state: equipped-NECK-off
+      - state: equipped-NECK-on
+        color: "#ff8227"
+        shader: unshaded
+
+- type: entity
+  parent: ClothingNeckIFFNeutral
+  id: ClothingNeckIFFPurple
+  name: IFF purple strobe
+  components:
+  - type: Sprite
+    sprite: _NF/Clothing/Neck/Misc/mercenary_iff.rsi
+    layers:
+    - state: icon-off
+    - state: icon-on
+      color: "#9c0de1"
+      shader: unshaded
+  - type: Clothing
+    sprite: _NF/Clothing/Neck/Misc/mercenary_iff.rsi
+    clothingVisuals:
+      neck:
+      - state: equipped-NECK-off
+      - state: equipped-NECK-on
+        color: "#9c0de1"
+        shader: unshaded
diff --git a/Resources/Prototypes/_NF/Entities/Mobs/NPCs/mob_hostile_expeditions_argocyte.yml b/Resources/Prototypes/_NF/Entities/Mobs/NPCs/mob_hostile_expeditions_argocyte.yml
@@ -319,12 +319,12 @@
   - type: MobThresholds
     thresholds:
       0: Alive
-      90: Dead
+      60: Dead
   - type: MeleeWeapon
     damage:
       types:
-        Blunt: 8
-        Slash: 5
+        Blunt: 6
+        Slash: 4
         Structural: 20
   - type: MovementSpeedModifier
     baseSprintSpeed : 6.5

diff --git a/Resources/Prototypes/_NF/Entities/Mobs/NPCs/mob_hostile_expeditions_explorers.yml b/Resources/Prototypes/_NF/Entities/Mobs/NPCs/mob_hostile_expeditions_explorers.yml
@@ -51,10 +51,10 @@
   - type: AutoWakeUp
   - type: PointLight
     enabled: true
+    autoRot: false
+    netsync: false
     radius: 3
     energy: 1
-    autoRot: true
-    netsync: false
     color: "#47f8ff"
 
 # Variations
@@ -84,9 +84,6 @@
     - sprite: Objects/Tools/lantern.rsi
       state: on-equipped-BELT
       shader: unshaded
-  - type: PointLight
-    radius: 3
-    energy: 2.5
 
 - type: entity
   name: explorer
@@ -129,9 +126,13 @@
     - SemiAuto
     soundGunshot: /Audio/Weapons/Guns/Gunshots/kinetic_accel.ogg
   - type: PointLight
+    enabled: true
+    autoRot: true
+    netsync: false
     radius: 3
     energy: 1
     mask: /Textures/Effects/LightMasks/cone.png
+    color: "#47f8ff"
 
 ## Tier 2
 - type: entity
@@ -158,10 +159,15 @@
     - sprite: Clothing/Head/Hardsuits/spatiohelm.rsi
       state: equipped-head-light
       shader: unshaded
+      color: "#47f8ff"
   - type: PointLight
+    enabled: true
+    autoRot: true
+    netsync: false
     radius: 3
     energy: 1
     mask: /Textures/Effects/LightMasks/cone.png
+    color: "#47f8ff"
 
 - type: entity
   name: explorer
@@ -186,6 +192,7 @@
     - sprite: Clothing/Head/Hardsuits/spatiohelm.rsi
       state: equipped-head-light
       shader: unshaded
+      color: "#47f8ff"
   - type: RechargeBasicEntityAmmo
     rechargeCooldown: 0.75
     rechargeSound:
@@ -204,9 +211,13 @@
     - FullAuto
     soundGunshot: /Audio/Weapons/Guns/Gunshots/kinetic_accel.ogg
   - type: PointLight
+    enabled: true
+    autoRot: true
+    netsync: false
     radius: 3
     energy: 1
     mask: /Textures/Effects/LightMasks/cone.png
+    color: "#47f8ff"
 
 # Tier 3
 - type: entity
@@ -230,6 +241,7 @@
     - sprite: Clothing/Head/Hardsuits/spatiohelm.rsi
       state: equipped-head-light
       shader: unshaded
+      color: "#47f8ff"
   - type: MeleeWeapon
     autoAttack: true
     angle: 0
@@ -243,9 +255,13 @@
       types:
         Structural: 25
   - type: PointLight
+    enabled: true
+    autoRot: true
+    netsync: false
     radius: 7
     energy: 3
     mask: /Textures/Effects/LightMasks/cone.png
+    color: "#47f8ff"
 
 - type: entity
   name: explorer
@@ -267,6 +283,7 @@
     - sprite: Clothing/Head/Hardsuits/spatiohelm.rsi
       state: equipped-head-light
       shader: unshaded
+      color: "#47f8ff"
   - type: RechargeBasicEntityAmmo
     rechargeCooldown: 0.75
     rechargeSound:
@@ -283,13 +300,17 @@
     - SemiAuto
     soundGunshot: /Audio/Weapons/Guns/Gunshots/kinetic_accel.ogg
   - type: PointLight
+    enabled: true
+    autoRot: true
+    netsync: false
     radius: 7
     energy: 3
     mask: /Textures/Effects/LightMasks/cone.png
+    color: "#47f8ff"
 
 - type: entity
   name: hauler
-  #noSpawn: true
+  noSpawn: true
   parent:
   - MobExplorerBase
   id: MobExplorerHauler
@@ -341,9 +362,13 @@
     soundHit:
       collection: MetalThud
   - type: PointLight
+    enabled: true
+    autoRot: true
+    netsync: false
     radius: 5
     energy: 2
     mask: /Textures/Effects/LightMasks/cone.png
+    color: "#47f8ff"
 
 # Tier 4 - Boss
 - type: entity
@@ -366,6 +391,7 @@
     - sprite: Clothing/Head/Hardsuits/spatiohelm.rsi
       state: equipped-head-light
       shader: unshaded
+      color: "#47f8ff"
   - type: RechargeBasicEntityAmmo
     rechargeCooldown: 0.375
     rechargeSound:
@@ -378,12 +404,16 @@
     showExamineText: false
     fireRate: 8
     selectedMode: FullAuto
-    minAngle: 31
-    maxAngle: 45
+    minAngle: 41
+    maxAngle: 55
     availableModes:
     - FullAuto
     soundGunshot: /Audio/Weapons/Guns/Gunshots/kinetic_accel.ogg
   - type: PointLight
+    enabled: true
+    autoRot: true
+    netsync: false
     radius: 7
     energy: 3
     mask: /Textures/Effects/LightMasks/cone.png
+    color: "#47f8ff"
diff --git a/Resources/Prototypes/_NF/Entities/Structures/Machines/lathe.yml b/Resources/Prototypes/_NF/Entities/Structures/Machines/lathe.yml
@@ -308,9 +308,12 @@
       - OreBag
       - MiningDrill
       - WeaponProtoKineticAccelerator
+      - ClothingNeckIFFNeutral
       - ClothingNeckIFFGreen
       - ClothingNeckIFFRed
       - ClothingNeckIFFBlue
+      - ClothingNeckIFFOrange
+      - ClothingNeckIFFPurple
     dynamicRecipes:
       - Bucket
       - MopItem

diff --git a/Resources/Prototypes/_NF/Recipes/Lathes/misc.yml b/Resources/Prototypes/_NF/Recipes/Lathes/misc.yml
@@ -98,6 +98,16 @@
     Steel: 500
     Cloth: 500
 
+- type: latheRecipe
+  id: ClothingNeckIFFNeutral
+  result: ClothingNeckIFFNeutral
+  completetime: 1
+  category: Tools
+  materials:
+    Steel: 500
+    Plastic: 500
+    Silver: 100
+
 - type: latheRecipe
   id: ClothingNeckIFFGreen
   result: ClothingNeckIFFGreen
@@ -127,3 +137,23 @@
     Steel: 500
     Plastic: 500
     Silver: 100
+
+- type: latheRecipe
+  id: ClothingNeckIFFOrange
+  result: ClothingNeckIFFOrange
+  completetime: 1
+  category: Tools
+  materials:
+    Steel: 500
+    Plastic: 500
+    Silver: 100
+
+- type: latheRecipe
+  id: ClothingNeckIFFPurple
+  result: ClothingNeckIFFPurple
+  completetime: 1
+  category: Tools
+  materials:
+    Steel: 500
+    Plastic: 500
+    Silver: 100
diff --git a/Resources/Textures/_NF/Clothing/Neck/Misc/mercenary_iff.rsi/equipped-NECK-off.png b/Resources/Textures/_NF/Clothing/Neck/Misc/mercenary_iff.rsi/equipped-NECK-off.png
diff --git a/Resources/Textures/_NF/Clothing/Neck/Misc/mercenary_iff.rsi/equipped-NECK-on.png b/Resources/Textures/_NF/Clothing/Neck/Misc/mercenary_iff.rsi/equipped-NECK-on.png