From dea11368c78d646886234a375cbd654e78a6a3cc Mon Sep 17 00:00:00 2001 From: "steinhauer.erhard" Date: Mon, 10 Jun 2024 09:33:06 +0300 Subject: [PATCH] tweaks --- .../_NF/Entities/Clothing/Neck/misc.yml | 44 ++++++++++++++++- .../NPCs/mob_hostile_expeditions_argocyte.yml | 6 +-- .../mob_hostile_expeditions_explorers.yml | 46 +++++++++++++++--- .../Entities/Structures/Machines/lathe.yml | 3 ++ .../Prototypes/_NF/Recipes/Lathes/misc.yml | 30 ++++++++++++ .../mercenary_iff.rsi/equipped-NECK-off.png | Bin 629 -> 5789 bytes .../mercenary_iff.rsi/equipped-NECK-on.png | Bin 638 -> 5896 bytes 7 files changed, 117 insertions(+), 12 deletions(-) diff --git a/Resources/Prototypes/_NF/Entities/Clothing/Neck/misc.yml b/Resources/Prototypes/_NF/Entities/Clothing/Neck/misc.yml index 100acc8da8f..3d3c204ee99 100644 --- 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 index 7e818029228..60fd2ed389f 100644 --- 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 index b65ca40f8b8..33e7367b5c9 100644 --- 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 index 6bcaa5e859e..edf6cfc488f 100644 --- 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 index 193bf4d94b9..3f97a16438e 100644 --- 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 index 096f087f6c1aa6a569b488b2c65da718d59f3856..6995cd03803c9c6a272614a47c672feec60c042e 100644 GIT binary patch literal 5789 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 ciM7q^ha__CrbZ64ml8vHq)$ delta 560 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 HFNpg$ef7VE delta 569 zcmeCs`^Pdtxt_5#)7d$|)7e>}peR2rGbfdSL1SX=L|c!;0V1vb!P%}_N@W6t9RYK7 zI=U>pM7t9fZV`eeZ_?AAv)y9#Q?2Z8C*vhfWuMMm7tE{J z=c+QHg+nqlX8{j);4RboAfF{KY@R)oFZttHbn?k92Ib>6S^{+#TscT=uz1#-3xnPom*SkcbQ$md2`e*Mn1mAi%O~MEB6TPUR|5_ z|6b;~_w3fIizf1~nsaHgwU|*oD;ERr-|F+*7#J9;JY5_^DsH{KZp5`}OaE>KyuKdVbcu oGfy5N*Rb~w-v)6QUmDDa+p#~wEZ4i0j~T@EboFyt=akR{00a@~#sB~S