From 56b4a0af5e2fb5fb3b978b3d993f169769f39760 Mon Sep 17 00:00:00 2001
From: ErhardSteinhauer <65374927+ErhardSteinhauer@users.noreply.github.com>
Date: Tue, 5 Nov 2024 01:19:30 +0300
Subject: [PATCH] Dungeon enemies rebalance: Explorers & Punks (#2273)
* initial
* clean up
* explorer ghost role, holopickaxe blueprint
* tweaks
* punk leader ghost role
* punks expanded
* punk stats tweaked
* punk guidebook upd
* clean up
* fixes
* fix 2
* fix mob_hostile_punkganger.yml
* softsuits for explorers
---------
Co-authored-by: Dvir <39403717+dvir001@users.noreply.github.com>
---
.../_NF/ghost/roles/ghost-role-component.ftl | 6 +
.../Procedural/salvage_factions.yml | 41 +-
.../Prototypes/_NF/Body/Prototypes/human.yml | 41 ++
.../Fills/Backpacks/npc_loot_explorers.yml | 7 +-
.../Fills/Backpacks/npc_loot_punks.yml | 60 ++-
.../Prototypes/_NF/Damage/modifier_sets.yml | 9 +
.../Hands/gloves_mob_hostile_npcs.yml | 151 ++++----
.../Spawners/Random/dungeon_items_weapons.yml | 34 --
.../Random/mobs_hostile_punkgangers.yml | 49 ++-
.../Entities/Mobs/NPCs/mob_hostile_base.yml | 8 +-
.../mob_hostile_expeditions_explorers.yml | 360 ++++++++++++------
.../Mobs/NPCs/mob_hostile_punkganger.yml | 176 +++++++--
.../blueprints/blueprints_expedition_loot.yml | 12 +
.../Weapons/Guns/Projectiles/energy.yml | 34 ++
.../Weapons/Guns/Projectiles/minirocket.yml | 59 +++
.../Objects/Weapons/Melee/e_sword.yml | 2 +-
...late.yml => npc_inventory_id_template.yml} | 0
...emplate.yml => npc_inventory_template.yml} | 3 -
... => npc_simplified_inventory_template.yml} | 0
.../Prototypes/_NF/Recipes/Lathes/tools.yml | 12 +
.../_NF/Roles/Jobs/Hostile/explorers.yml | 45 +--
.../Jobs/Hostile/guidebook_crewmates.yml | 4 +-
.../_NF/Roles/Jobs/Hostile/punk_gangers.yml | 60 ++-
.../MobsHostileExpedition/explorers.xml | 44 +--
.../MobsHostileExpedition/punk_gangers.xml | 62 ++-
25 files changed, 903 insertions(+), 376 deletions(-)
create mode 100644 Resources/Prototypes/_NF/Body/Prototypes/human.yml
rename Resources/Prototypes/_NF/InventoryTemplates/{hostile_nonhumanoid_inventory_template.yml => npc_inventory_id_template.yml} (100%)
rename Resources/Prototypes/_NF/InventoryTemplates/{hostile_humanoid_inventory_template.yml => npc_inventory_template.yml} (97%)
rename Resources/Prototypes/_NF/InventoryTemplates/{hostile_humanoid_simplified_inventory_template.yml => npc_simplified_inventory_template.yml} (100%)
diff --git a/Resources/Locale/en-US/_NF/ghost/roles/ghost-role-component.ftl b/Resources/Locale/en-US/_NF/ghost/roles/ghost-role-component.ftl
index f4ebc71ac45..1dc9d4f2969 100644
--- a/Resources/Locale/en-US/_NF/ghost/roles/ghost-role-component.ftl
+++ b/Resources/Locale/en-US/_NF/ghost/roles/ghost-role-component.ftl
@@ -47,6 +47,12 @@ ghost-role-information-yipyip-description = Notorious lounge lizard and bartende
ghost-role-information-aberrant-flesh-horror-dungeon-name = Aberrant flesh horror
ghost-role-information-aberrant-flesh-horror-dungeon-description = Defend the expedition dungeon with other flesh monstrosities!
+ghost-role-information-explorer-captain-dungeon-name = Explorer Captain
+ghost-role-information-explorer-captain-dungeon-description = You got to this facility first! Defend the expedition dungeon and your loot with other explorers!
+
+ghost-role-information-punk-boss-dungeon-name = Punk gang leader
+ghost-role-information-punk-boss-dungeon-description = Defend the expedition dungeon and your loot with other punks from NT squares!
+
ghost-role-information-dungeon-boss-rules = You are a [color=red][bold]Team Antagonist[/bold][/color] with all dungeon mobs.
Fight players within the dungeon, defend your dungeon.
Please note that [color=yellow]all server rules still apply.[/color] Additionally:
diff --git a/Resources/Prototypes/Procedural/salvage_factions.yml b/Resources/Prototypes/Procedural/salvage_factions.yml
index c090303b80a..14bf1c037be 100644
--- a/Resources/Prototypes/Procedural/salvage_factions.yml
+++ b/Resources/Prototypes/Procedural/salvage_factions.yml
@@ -469,31 +469,46 @@
- type: salvageFaction
id: Punks
- cost: 5
+ cost: 3
desc: salvage-faction-punks
groups:
- entries:
- - id: SpawnMobPunkMelee
- amount: 1
- maxAmount: 3
- - id: SpawnMobPunkMelee
+ - id: SpawnMobPunkT1
amount: 1
+ maxAmount: 2
- entries:
- - id: SpawnMobPunkRanged
+ - id: SpawnMobPunkT1
+ amount: 2
+ maxAmount: 4
+ prob: 0.75
+ - entries:
+ - id: SpawnMobPunkT2
amount: 1
- maxAmount: 1
+ maxAmount: 2
prob: 0.5
- entries:
- - id: SpawnMobPunkRanged
+ - id: SpawnMobPunkT2
+ amount: 2
+ maxAmount: 3
+ prob: 0.25
+ - entries:
+ - id: SpawnMobPunkT1
+ amount: 1
+ prob: 0.3
+ - entries:
+ - id: SpawnMobPunkT2
amount: 1
- maxAmount: 2
prob: 0.25
- entries:
- - id: SpawnMobPunkMelee
- amount: 3
- maxAmount: 6
+ - id: SpawnMobPunkT3
+ amount: 1
prob: 0.1
+ - entries:
+ - id: SpawnMobPunkT1
+ amount: 2
+ maxAmount: 4
+ prob: 0.05
configs:
DefenseStructure: PunkPartySupplies
Mining: Punks
- Megafauna: MobPunkGangerArmoredElite
+ Megafauna: MobPunkGangerLeader
diff --git a/Resources/Prototypes/_NF/Body/Prototypes/human.yml b/Resources/Prototypes/_NF/Body/Prototypes/human.yml
new file mode 100644
index 00000000000..dc50bfffaf7
--- /dev/null
+++ b/Resources/Prototypes/_NF/Body/Prototypes/human.yml
@@ -0,0 +1,41 @@
+- type: body
+ id: NFHumanNoHands
+ name: "human"
+ root: torso
+ slots:
+ head:
+ part: HeadHuman
+ connections:
+ - torso
+ organs:
+ brain: OrganHumanBrain
+ eyes: OrganHumanEyes
+ torso:
+ part: TorsoHuman
+ connections:
+ - right_arm
+ - left_arm
+ - right_leg
+ - left_leg
+ organs:
+ heart: OrganHumanHeart
+ lungs: OrganHumanLungs
+ stomach: OrganHumanStomach
+ liver: OrganHumanLiver
+ kidneys: OrganHumanKidneys
+ right_arm:
+ part: RightArmHuman
+ left_arm:
+ part: LeftArmHuman
+ right_leg:
+ part: RightLegHuman
+ connections:
+ - right_foot
+ left_leg:
+ part: LeftLegHuman
+ connections:
+ - left_foot
+ right_foot:
+ part: RightFootHuman
+ left_foot:
+ part: LeftFootHuman
diff --git a/Resources/Prototypes/_NF/Catalog/Fills/Backpacks/npc_loot_explorers.yml b/Resources/Prototypes/_NF/Catalog/Fills/Backpacks/npc_loot_explorers.yml
index a92dd642ab6..382fd666332 100644
--- a/Resources/Prototypes/_NF/Catalog/Fills/Backpacks/npc_loot_explorers.yml
+++ b/Resources/Prototypes/_NF/Catalog/Fills/Backpacks/npc_loot_explorers.yml
@@ -263,8 +263,11 @@
- id: SpaceCash2500
prob: 0.2
# Weapons
- - id: EnergyPickaxeNF
- prob: 0.1
+ - id: NFEnergyPickaxe
+ prob: 0.3
+ amount: 1
+ - id: NFBlueprintEnergyPickaxe
+ prob: 0.3
amount: 1
# Armor
- id: ClothingOuterHardsuitMaximPrototype
diff --git a/Resources/Prototypes/_NF/Catalog/Fills/Backpacks/npc_loot_punks.yml b/Resources/Prototypes/_NF/Catalog/Fills/Backpacks/npc_loot_punks.yml
index 7255de1a97a..f405ea6322a 100644
--- a/Resources/Prototypes/_NF/Catalog/Fills/Backpacks/npc_loot_punks.yml
+++ b/Resources/Prototypes/_NF/Catalog/Fills/Backpacks/npc_loot_punks.yml
@@ -188,7 +188,7 @@
components:
- type: SpawnItemsOnUse
items:
- - id: SpaceCash2500
+ - id: SpaceCash1000
prob: 0.95
amount: 1
- id: SpaceCash1000
@@ -215,6 +215,64 @@
- id: HoloGraffitiProjector
amount: 1
prob: 0.45
+ # Bonus Loot T3
+ - id: SpaceCash1000
+ prob: 0.9
+ - id: SpaceCash500
+ prob: 0.9
+ - id: SpaceCash1000
+ prob: 0.8
+ - id: SpawnDungeonLootMaterialsBasicFull
+ prob: 0.7
+ - id: SpawnDungeonLootMaterialsValuableFull
+ prob: 0.7
+ - id: SpawnDungeonLootPartsEngi
+ amount: 2
+ prob: 0.7
+ - id: SpawnDungeonLootFlatpacks
+ prob: 0.5
+ - id: SpawnDungeonLootToolsAdvancedEngineering
+ prob: 0.4
+ sound:
+ path: /Audio/Items/jumpsuit_equip.ogg
+
+- type: entity
+ parent: ClothingBackpackPunkLootA
+ id: ClothingBackpackPunkLootBoss
+ categories: [ HideSpawnMenu ]
+ components:
+ - type: SpawnItemsOnUse
+ items:
+ - id: SpaceCash2500
+ prob: 0.95
+ amount: 1
+ - id: SpaceCash1000
+ prob: 0.35
+ amount: 1
+ - id: GroundCannabis
+ prob: 0.35
+ amount: 3
+ - id: SpawnDungeonClutterSyringe
+ prob: 0.65
+ amount: 4
+ - id: SpawnDungeonLootCircuitBoard
+ prob: 0.35
+ amount: 2
+ - id: SpawnDungeonClutterHypospray
+ prob: 0.35
+ amount: 1
+ - id: DrinkWhiskeyBottleFull
+ prob: 0.35
+ amount: 1
+ - id: WeaponCaseLongLaserCarbineExpedition
+ amount: 1
+ prob: 0.55
+ - id: HoloGraffitiProjector
+ amount: 1
+ prob: 0.45
+ - id: NFBlueprintPortableRecharger
+ prob: 0.1
+ amount: 1
# Bonus Loot T4
- id: SpaceCash2500
prob: 0.9
diff --git a/Resources/Prototypes/_NF/Damage/modifier_sets.yml b/Resources/Prototypes/_NF/Damage/modifier_sets.yml
index d85bb253f95..0a93c686023 100644
--- a/Resources/Prototypes/_NF/Damage/modifier_sets.yml
+++ b/Resources/Prototypes/_NF/Damage/modifier_sets.yml
@@ -34,6 +34,15 @@
Heat: 0.9
Caustic: 0.85
+- type: damageModifierSet
+ id: MobHostileDamageModifierSetBoss
+ coefficients:
+ Blunt: 0.5
+ Slash: 0.5
+ Piercing: 0.5
+ Heat: 0.7
+ Caustic: 0.5
+
- type: damageModifierSet
id: MobMercenaryDamageModifierSet
coefficients:
diff --git a/Resources/Prototypes/_NF/Entities/Clothing/Hands/gloves_mob_hostile_npcs.yml b/Resources/Prototypes/_NF/Entities/Clothing/Hands/gloves_mob_hostile_npcs.yml
index d26b047ba71..5ee84c3bf4e 100644
--- a/Resources/Prototypes/_NF/Entities/Clothing/Hands/gloves_mob_hostile_npcs.yml
+++ b/Resources/Prototypes/_NF/Entities/Clothing/Hands/gloves_mob_hostile_npcs.yml
@@ -308,121 +308,112 @@
- sprite: Objects/Weapons/Guns/Battery/advancedlasergun.rsi
state: inhand-left
+# This is some proper cursed stuff: due to layering of clothes sprites, gloves displayed under outer clothes
+# So in order to make wielded weapon visible, I'm using neck slot which is drawn on top of outer suit layer.
- type: entity
- parent: ClothingHandsGlovesColorBlackSMG
- id: ClothingHandsGlovesWeaponWieldedGlaive
- name: wielded weapon
- suffix: crusher glaive
+ id: PunkHandsGlovesBaseballBat
+ parent: ClothingNeckBase
+ name: punk gloves
+ description: Colorful gloves that do not keep you from frying.
categories: [ HideSpawnMenu ]
components:
+ - type: Unremoveable
+ - type: Sprite
+ sprite: Clothing/Hands/Gloves/Color/color.rsi
+ layers:
+ - state: icon
+ map: [ "gloves_decor" ]
- type: Clothing
clothingVisuals:
- gloves:
- - sprite: Objects/Weapons/Melee/crusher_glaive.rsi
+ neck:
+ # Gloves
+ - sprite: Clothing/Hands/Gloves/Color/color.rsi
+ state: equipped-HAND
+ map: [ "gloves_decor" ]
+ # Weapon
+ - sprite: Objects/Weapons/Melee/baseball_bat.rsi
state: wielded-inhand-right
+ - type: RandomSprite
+ available:
+ - gloves_decor:
+ equipped-HAND: CyberpunkNeon
- type: entity
- parent: ClothingHandsGlovesColorBlackSMG
- id: ClothingHandsGlovesWeaponDrill
- name: wielded weapon
- suffix: mining drill
+ id: PunkHandsGlovesFireaxe
+ parent: PunkHandsGlovesBaseballBat
categories: [ HideSpawnMenu ]
components:
- type: Clothing
clothingVisuals:
- gloves:
- - sprite: Objects/Tools/handdrill.rsi
- state: inhand-right
- - sprite: Objects/Tools/handdrill.rsi
- state: inhand-left
-
-- type: entity
- parent: ClothingHandsGlovesColorBlackSMG
- id: ClothingHandsGlovesWeaponWieldedPickaxe
- name: wielded weapon
- suffix: Pickaxe
- categories: [ HideSpawnMenu ]
- components:
- - type: Clothing
- clothingVisuals:
- gloves:
- - sprite: Objects/Weapons/Melee/pickaxe.rsi
+ neck:
+ # Gloves
+ - sprite: Clothing/Hands/Gloves/Color/color.rsi
+ state: equipped-HAND
+ map: [ "gloves_decor" ]
+ # Weapon
+ - sprite: Objects/Weapons/Melee/fireaxe.rsi
state: wielded-inhand-right
- type: entity
- parent: ClothingHandsGlovesColorBlackSMG
- id: ClothingHandsGlovesWeaponPkaFlashlight
- name: wielded weapon
- suffix: PKA, flashlifght
+ id: PunkHandsGlovesSledgehammer
+ parent: PunkHandsGlovesBaseballBat
categories: [ HideSpawnMenu ]
components:
- type: Clothing
clothingVisuals:
- gloves:
- - sprite: Objects/Weapons/Guns/Basic/kinetic_accelerator.rsi
- state: inhand-right
- - sprite: Objects/Tools/flashlight.rsi
- state: inhand-left
- - sprite: Objects/Tools/flashlight.rsi
- state: inhand-left-light
- shader: unshaded
-
-- type: entity
- parent: ClothingHandsGlovesColorBlackSMG
- id: ClothingHandsGlovesWeaponWieldedPka
- name: wielded weapon
- suffix: PKA
- categories: [ HideSpawnMenu ]
- components:
- - type: Clothing
- clothingVisuals:
- gloves:
- - sprite: Objects/Weapons/Guns/Basic/kinetic_accelerator.rsi
+ neck:
+ # Gloves
+ - sprite: Clothing/Hands/Gloves/Color/color.rsi
+ state: equipped-HAND
+ map: [ "gloves_decor" ]
+ # Weapon
+ - sprite: Objects/Weapons/Melee/sledgehammer.rsi
state: wielded-inhand-right
- type: entity
- parent: ClothingHandsGlovesColorBlackSMG
- id: ClothingHandsGlovesWeaponSawnOffPkaDagger
- name: wielded weapon
- suffix: sawn-off PKA, crusher dagger
+ id: PunkHandsGlovesShotgun
+ parent: PunkHandsGlovesBaseballBat
categories: [ HideSpawnMenu ]
components:
- type: Clothing
clothingVisuals:
- gloves:
- - sprite: _NF/Objects/Weapons/Guns/Basic/sawn_kinetic_accelerator.rsi
- state: inhand-right
- - sprite: Objects/Weapons/Melee/crusher_dagger.rsi
- state: inhand-left
+ neck:
+ # Gloves
+ - sprite: Clothing/Hands/Gloves/Color/color.rsi
+ state: equipped-HAND
+ map: [ "gloves_decor" ]
+ # Weapon
+ - sprite: Objects/Weapons/Guns/Shotguns/pump_inhands_64x.rsi
+ state: wielded-inhand-right
- type: entity
- parent: ClothingHandsGlovesColorBlackSMG
- id: ClothingHandsGlovesWeaponSawnOffPkas
- name: wielded weapon
- suffix: double sawn-off PKAs
+ id: PunkHandsGlovesSmg
+ parent: PunkHandsGlovesBaseballBat
categories: [ HideSpawnMenu ]
components:
- type: Clothing
clothingVisuals:
- gloves:
- - sprite: _NF/Objects/Weapons/Guns/Basic/sawn_kinetic_accelerator.rsi
- state: inhand-left
- - sprite: _NF/Objects/Weapons/Guns/Basic/sawn_kinetic_accelerator.rsi
- state: inhand-right
+ neck:
+ # Gloves
+ - sprite: Clothing/Hands/Gloves/Color/color.rsi
+ state: equipped-HAND
+ map: [ "gloves_decor" ]
+ # Weapon
+ - sprite: Objects/Weapons/Guns/SMGs/drozd.rsi
+ state: wielded-inhand-right
- type: entity
- parent: ClothingHandsGlovesColorBlackSMG
- id: ClothingHandsGlovesWeaponEnergyPickaxe
- name: wielded weapon
- suffix: energy pickaxe
+ id: PunkHandsGlovesLaserGun
+ parent: PunkHandsGlovesBaseballBat
categories: [ HideSpawnMenu ]
components:
- type: Clothing
clothingVisuals:
- gloves:
- - sprite: _NF/Objects/Weapons/Melee/energy_pickaxe.rsi
- state: inhand-left
- - sprite: _NF/Objects/Weapons/Melee/energy_pickaxe.rsi
- state: inhand-left-blade
- shader: unshaded
- color: "#e95151"
+ neck:
+ # Gloves
+ - sprite: Clothing/Hands/Gloves/Color/color.rsi
+ state: equipped-HAND
+ map: [ "gloves_decor" ]
+ # Weapon
+ - sprite: Objects/Weapons/Guns/Battery/laser_gun.rsi
+ state: wielded-inhand-right
diff --git a/Resources/Prototypes/_NF/Entities/Markers/Spawners/Random/dungeon_items_weapons.yml b/Resources/Prototypes/_NF/Entities/Markers/Spawners/Random/dungeon_items_weapons.yml
index ac35606ea68..74e5b6a271d 100644
--- a/Resources/Prototypes/_NF/Entities/Markers/Spawners/Random/dungeon_items_weapons.yml
+++ b/Resources/Prototypes/_NF/Entities/Markers/Spawners/Random/dungeon_items_weapons.yml
@@ -1,38 +1,4 @@
# T1: common
-- type: entity
- name: random weapon
- id: SpawnInhandMeleeWeaponPunkGangLow
- parent: MarkerBase
- suffix: "Punk, Melee, T1"
- categories: [ HideSpawnMenu ]
- components:
- - type: Sprite
- layers:
- - state: green
- scale: 0.7, 0.7
- - sprite: Objects/Weapons/Melee/cult_blade.rsi
- state: icon
- - type: RandomSpawner
- prototypes:
- - BrokenBottle
- - ButchCleaver
- - Screwdriver
- - Crowbar
- - Shiv
- - ReinforcedShiv
- - PlasmaShiv
- - UraniumShiv
- - ScalpelShiv
- - BaseBallBat
- - Machete
- - KukriKnife
- chance: 1.0
- offset: 0.0
- rarePrototypes:
- - Katana
- - Truncheon
- rareChance: 0.05
-
- type: entity
name: random weapon
id: SpawnDungeonLootMeleeT1
diff --git a/Resources/Prototypes/_NF/Entities/Markers/Spawners/Random/mobs_hostile_punkgangers.yml b/Resources/Prototypes/_NF/Entities/Markers/Spawners/Random/mobs_hostile_punkgangers.yml
index da0aff9722d..a6ab6690dae 100644
--- a/Resources/Prototypes/_NF/Entities/Markers/Spawners/Random/mobs_hostile_punkgangers.yml
+++ b/Resources/Prototypes/_NF/Entities/Markers/Spawners/Random/mobs_hostile_punkgangers.yml
@@ -1,8 +1,8 @@
- type: entity
name: spawn punk
- id: SpawnMobPunkMelee
+ id: SpawnMobPunkT1
parent: MarkerBasePlaceFree
- suffix: AI, Hostile, Melee
+ suffix: AI, Hostile, T1
components:
- type: Sprite
layers:
@@ -12,18 +12,20 @@
- state: ai
- type: RandomSpawner
prototypes:
- - MobPunkGangerMelee
+ - MobPunkGangerMeleeT1
+ - MobPunkGangerMeleeT1
+ - MobPunkGangerPistol
chance: 1
offset: 0.0
rarePrototypes:
- - MobPunkGangerArmoredMelee
- rareChance: 0.2
+ - SpawnMobPunkT2
+ rareChance: 0.05
- type: entity
name: spawn punk
- id: SpawnMobPunkRanged
+ id: SpawnMobPunkT2
parent: MarkerBasePlaceFree
- suffix: AI, Hostile, Ranged
+ suffix: AI, Hostile, T2
components:
- type: Sprite
layers:
@@ -33,12 +35,37 @@
- state: ai
- type: RandomSpawner
prototypes:
- - MobPunkGangerPistol
+ - MobPunkGangerMeleeT2
+ - MobPunkGangerMeleeT2
+ - MobPunkGangerShotgun
chance: 1
offset: 0.0
rarePrototypes:
- - MobPunkGangerShotgun
- rareChance: 0.1
+ - SpawnMobPunkT3
+ rareChance: 0.05
+
+- type: entity
+ name: spawn punk
+ id: SpawnMobPunkT3
+ parent: MarkerBasePlaceFree
+ suffix: AI, Hostile, T3
+ components:
+ - type: Sprite
+ layers:
+ - state: red
+ - sprite: Objects/Weapons/Melee/baseball_bat.rsi
+ state: icon
+ - state: ai
+ - type: RandomSpawner
+ prototypes:
+ - MobPunkGangerMeleeT3
+ - MobPunkGangerMeleeT3
+ - MobPunkGangerSmg
+ chance: 1
+ offset: 0.0
+ #rarePrototypes:
+ #- SpawnMobPunkT3
+ #rareChance: 0.05
- type: entity
name: spawn punk leader
@@ -54,6 +81,6 @@
- state: ai
- type: RandomSpawner
prototypes:
- - MobPunkGangerArmoredElite
+ - MobPunkGangerLeader
chance: 1
offset: 0.0
diff --git a/Resources/Prototypes/_NF/Entities/Mobs/NPCs/mob_hostile_base.yml b/Resources/Prototypes/_NF/Entities/Mobs/NPCs/mob_hostile_base.yml
index e1bb4873889..3cf9cf73084 100644
--- a/Resources/Prototypes/_NF/Entities/Mobs/NPCs/mob_hostile_base.yml
+++ b/Resources/Prototypes/_NF/Entities/Mobs/NPCs/mob_hostile_base.yml
@@ -218,7 +218,7 @@
- type: FTLKnockdownImmune
# Inventories
-- type: entity
+- type: entity # All slots are fillable, most of them are "hidden"
save: false
id: MobHumanoidInvetory
abstract: true
@@ -232,7 +232,7 @@
enum.StrippingUiKey.Key:
type: StrippableBoundUserInterface
-- type: entity
+- type: entity # Slots for loot containers: pockets, belt, back
save: false
id: MobHumanoidInvetorySimplified
abstract: true
@@ -314,7 +314,7 @@
id: MobHumanoidHostileBase
components:
- type: MovementSpeedModifier
- baseWalkSpeed : 3.5
+ baseWalkSpeed : 4.5
baseSprintSpeed : 4.5
- type: NPCRetaliation
attackMemoryLength: 10
@@ -378,7 +378,7 @@
id: MobNonHumanHostileBase
components:
- type: MovementSpeedModifier
- baseWalkSpeed : 3.5
+ baseWalkSpeed : 4.5
baseSprintSpeed : 4.5
- type: NPCRetaliation
attackMemoryLength: 10
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 ef3131327d2..65573c675e7 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
@@ -5,7 +5,6 @@
parent:
- MobNonHumanHostileBase
- MobHumanoidInvetory
- - MobHumanoidHostileAISimpleRanged
- NFMobRestrictions
id: MobExplorerBase
components:
@@ -21,8 +20,6 @@
speedModifierThresholds:
60: 0.7
80: 0.5
- - type: Stamina
- critThreshold: 100
- type: DamageStateVisuals
rotate: true
- type: RotationVisuals
@@ -44,7 +41,7 @@
angle: 0
damage:
types:
- Slash: 15
+ Slash: 10
Structural: 30
soundHit:
collection: MetalThud
@@ -56,10 +53,11 @@
- type: AutoWakeUp
- type: PointLight
enabled: true
- autoRot: false
+ autoRot: true
netsync: false
radius: 3
energy: 1
+ mask: /Textures/Effects/LightMasks/cone.png
color: "#47f8ff"
# Variations
@@ -79,14 +77,40 @@
- type: Sprite
drawdepth: Mobs
layers:
+ # Body
- sprite: _NF/Mobs/Species/Templates/human.rsi
state: human
- - sprite: Clothing/Uniforms/Jumpsuit/salvage.rsi
- state: equipped-INNERCLOTHING
- - sprite: Clothing/Mask/gasexplorer.rsi
- state: equipped-MASK
- - sprite: _NF/Clothing/Head/Hats/pilot.rsi
- state: equipped-HELMET
+ # Softsuit
+ - sprite: _NF/Clothing/OuterClothing/Suits/eva_color.rsi
+ state: equipped-base
+ color: "#deb733"
+ - sprite: _NF/Clothing/OuterClothing/Suits/eva_color.rsi
+ state: equipped-decals-01
+ color: "#ad2aea"
+ - sprite: _NF/Clothing/OuterClothing/Suits/eva_color.rsi
+ state: equipped-reinforced-points
+ color: "#786243"
+ - sprite: _NF/Clothing/OuterClothing/Suits/eva_color.rsi
+ state: equipped-breathing-gear
+ - sprite: _NF/Clothing/OuterClothing/Suits/eva_color.rsi
+ state: equipped-unshaded
+ shader: unshaded
+ - sprite: _NF/Clothing/Head/Helmets/eva_color.rsi
+ state: equipped-head-base
+ color: "#deb733"
+ - sprite: _NF/Clothing/Head/Helmets/eva_color.rsi
+ state: equipped-head-reinforced-points
+ color: "#ad2aea"
+ - sprite: _NF/Clothing/Head/Helmets/eva_color.rsi
+ state: equipped-head-visor
+ color: "#adcfd5"
+ - sprite: _NF/Clothing/Head/Helmets/eva_color.rsi
+ state: equipped-head-light
+ color: "#47f8ff"
+ # Weapons
+ - sprite: Objects/Weapons/Melee/pickaxe.rsi
+ state: wielded-inhand-right
+ # Fluff
- sprite: Objects/Tools/lantern.rsi
state: on-equipped-BELT
shader: unshaded
@@ -97,8 +121,8 @@
angle: 0
damage:
types:
- Blunt: 7.5
- Piercing: 7.5
+ Blunt: 6
+ Piercing: 6
Structural: 30
soundHit:
collection: MetalThud
@@ -107,32 +131,69 @@
name: scrapper
parent:
- MobExplorerBase
+ - MobHumanoidHostileAISimpleRanged
id: MobExplorerRangedT1
description: Proto-kinetic accelerator in one hand, flashlight in the other, beer in the belly. That's how you explore.
categories: [ HideSpawnMenu ]
components:
+ - type: MovementSpeedModifier
+ baseWalkSpeed : 4
+ baseSprintSpeed : 4
- type: Loadout
prototypes:
- MobHumanoidExplorerGearRangedT1
- type: Sprite
drawdepth: Mobs
layers:
+ # Body
- sprite: _NF/Mobs/Species/Templates/human.rsi
state: human
- - sprite: Clothing/Uniforms/Jumpsuit/salvage.rsi
- state: equipped-INNERCLOTHING
- - sprite: Clothing/OuterClothing/WinterCoats/coat.rsi
- state: MINER-equipped-OUTERCLOTHING
- - sprite: Clothing/Mask/gasexplorer.rsi
- state: equipped-MASK
- - sprite: Clothing/Head/Hoods/Coat/hoodminer.rsi
- state: equipped-HELMET
+ # Softsuit
+ - sprite: _NF/Clothing/OuterClothing/Suits/eva_color.rsi
+ state: equipped-base
+ color: "#deb733"
+ - sprite: _NF/Clothing/OuterClothing/Suits/eva_color.rsi
+ state: equipped-decals-01
+ color: "#ad2aea"
+ - sprite: _NF/Clothing/OuterClothing/Suits/eva_color.rsi
+ state: equipped-reinforced-points
+ color: "#786243"
+ - sprite: _NF/Clothing/OuterClothing/Suits/eva_color.rsi
+ state: equipped-breathing-gear
+ - sprite: _NF/Clothing/OuterClothing/Suits/eva_color.rsi
+ state: equipped-unshaded
+ shader: unshaded
+ - sprite: _NF/Clothing/Head/Helmets/eva_color.rsi
+ state: equipped-head-base
+ color: "#deb733"
+ - sprite: _NF/Clothing/Head/Helmets/eva_color.rsi
+ state: equipped-head-reinforced-points
+ color: "#ad2aea"
+ - sprite: _NF/Clothing/Head/Helmets/eva_color.rsi
+ state: equipped-head-visor
+ color: "#adcfd5"
+ - sprite: _NF/Clothing/Head/Helmets/eva_color.rsi
+ state: equipped-head-light
+ color: "#47f8ff"
+ # Hands
+ - sprite: Clothing/Hands/Gloves/Color/color.rsi
+ state: equipped-HAND
+ color: "#535353"
+ # Weapons
+ - sprite: Objects/Weapons/Guns/Basic/kinetic_accelerator.rsi
+ state: inhand-right
+ # Fluff
+ - sprite: Objects/Tools/flashlight.rsi
+ state: inhand-left
+ - sprite: Objects/Tools/flashlight.rsi
+ state: inhand-left-light
+ shader: unshaded
- type: RechargeBasicEntityAmmo
- rechargeCooldown: 0.75
+ rechargeCooldown: 1
rechargeSound:
path: /Audio/Weapons/Guns/MagIn/kinetic_reload.ogg
- type: BasicEntityAmmoProvider
- proto: BulletKinetic
+ proto: BulletKineticLowPower
capacity: 1
count: 1
- type: Gun
@@ -144,14 +205,6 @@
availableModes:
- 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
@@ -167,12 +220,11 @@
prototypes:
- MobHumanoidExplorerGearMeleeT2
- type: Damageable
- damageModifierSet: MobHostileDamageModifierSetLow
+ damageModifierSet: MobHostileDamageModifierSetMedium
- type: Sprite
drawdepth: Mobs
layers:
- - sprite: _NF/Mobs/Species/Templates/human.rsi
- state: human
+ # Helmet
- sprite: Clothing/Head/Hardsuits/spatiohelm.rsi
state: equipped-head
- sprite: Clothing/Head/Hardsuits/spatiohelm.rsi
@@ -182,23 +234,22 @@
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"
+ # Suit
+ - sprite: Clothing/OuterClothing/Hardsuits/spatio.rsi
+ state: equipped-OUTERCLOTHING
+ # Weapons
+ - sprite: Objects/Weapons/Melee/crusher_glaive.rsi
+ state: wielded-inhand-right
+ # Fluff
- type: MeleeWeapon
- attackRate: 1.0
+ attackRate: 1.5
altDisarm: false
animation: WeaponArcPunch
angle: 0
damage:
types:
- Blunt: 7.5
- Slash: 5.5
+ Blunt: 7
+ Slash: 6
Structural: 30
soundHit:
collection: MetalThud
@@ -207,20 +258,23 @@
name: salvager
parent:
- MobExplorerBase
+ - MobHumanoidHostileAISimpleRanged
id: MobExplorerRangedT2
description: Sawn-off proto-kinetic accelerator in one hand, crusher dagger in the other, magm-ale both in the belly and in the hardsuit's boots.
categories: [ HideSpawnMenu ]
components:
+ - type: MovementSpeedModifier
+ baseWalkSpeed : 4
+ baseSprintSpeed : 4
- type: Loadout
prototypes:
- MobHumanoidExplorerGearRangedT2
- type: Damageable
- damageModifierSet: MobHostileDamageModifierSetLow
+ damageModifierSet: MobHostileDamageModifierSetMedium
- type: Sprite
drawdepth: Mobs
layers:
- - sprite: _NF/Mobs/Species/Templates/human.rsi
- state: human
+ # Helmet
- sprite: Clothing/Head/Hardsuits/spatiohelm.rsi
state: equipped-head
- sprite: Clothing/Head/Hardsuits/spatiohelm.rsi
@@ -230,31 +284,32 @@
state: equipped-head-light
shader: unshaded
color: "#47f8ff"
+ # Suit
+ - sprite: Clothing/OuterClothing/Hardsuits/spatio.rsi
+ state: equipped-OUTERCLOTHING
+ # Weapons
+ - sprite: _NF/Objects/Weapons/Guns/Basic/sawn_kinetic_accelerator.rsi
+ state: inhand-right
+ - sprite: Objects/Weapons/Melee/crusher_dagger.rsi
+ state: inhand-left
+ # Fluff
- type: RechargeBasicEntityAmmo
- rechargeCooldown: 0.75
+ rechargeCooldown: 1
rechargeSound:
path: /Audio/Weapons/Guns/MagIn/kinetic_reload.ogg
- type: BasicEntityAmmoProvider
- proto: BulletKinetic
+ proto: BulletKineticLowPower
capacity: 1
count: 1
- type: Gun
showExamineText: false
- fireRate: 6
+ fireRate: 0.75
selectedMode: FullAuto
minAngle: 31
maxAngle: 45
availableModes:
- 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
@@ -270,18 +325,29 @@
prototypes:
- MobHumanoidExplorerGearMeleeT3
- type: Damageable
- damageModifierSet: MobHostileDamageModifierSetMedium
+ damageModifierSet: MobHostileDamageModifierSetHigh
- type: Sprite
drawdepth: Mobs
layers:
- - sprite: _NF/Mobs/Species/Templates/human.rsi
- state: human
+ # Helmet
- sprite: Clothing/Head/Hardsuits/salvage.rsi
- state: off-equipped-HELMET
+ state: on-equipped-HELMET
- sprite: Clothing/Head/Hardsuits/spatiohelm.rsi
state: equipped-head-light
shader: unshaded
color: "#47f8ff"
+ # Suit
+ - sprite: Clothing/OuterClothing/Hardsuits/salvage.rsi
+ state: equipped-OUTERCLOTHING
+ # Weapons
+ - sprite: Objects/Tools/handdrill.rsi
+ state: inhand-right
+ - sprite: Objects/Tools/handdrill.rsi
+ state: inhand-left
+ # Fluff
+ - sprite: Objects/Tools/lantern.rsi
+ state: on-equipped-BELT
+ shader: unshaded
- type: MeleeWeapon
autoAttack: true
angle: 0
@@ -292,53 +358,61 @@
damage:
types:
Blunt: 2
- Slash: 1
+ Slash: 2
Piercing: 2
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
parent:
- MobExplorerBase
+ - MobHumanoidHostileAISimpleRanged
id: MobExplorerRangedT3
description: Veteran scrappers, these salvagers are wealthy enough to explore abandoned ruins for the adrenaline rush and adventure alone.
categories: [ HideSpawnMenu ]
components:
+ - type: MovementSpeedModifier
+ baseWalkSpeed : 4
+ baseSprintSpeed : 4
- type: Loadout
prototypes:
- MobHumanoidExplorerGearRangedT3
- type: Damageable
- damageModifierSet: MobHostileDamageModifierSetMedium
+ damageModifierSet: MobHostileDamageModifierSetHigh
- type: Sprite
drawdepth: Mobs
layers:
- - sprite: _NF/Mobs/Species/Templates/human.rsi
- state: human
+ # Helmet
- sprite: Clothing/Head/Hardsuits/luxury.rsi
state: off-equipped-HELMET
- sprite: Clothing/Head/Hardsuits/spatiohelm.rsi
state: equipped-head-light
shader: unshaded
color: "#47f8ff"
+ # Suit
+ - sprite: Clothing/OuterClothing/Hardsuits/luxury.rsi
+ state: equipped-OUTERCLOTHING
+ # Weapons
+ - sprite: Objects/Weapons/Guns/Basic/kinetic_accelerator.rsi
+ state: wielded-inhand-right
+ # Fluff
+ - sprite: Objects/Tools/lantern.rsi
+ state: on-equipped-BELT
+ shader: unshaded
- type: RechargeBasicEntityAmmo
- rechargeCooldown: 0.75
+ rechargeCooldown: 1
rechargeSound:
path: /Audio/Weapons/Guns/MagIn/kinetic_reload.ogg
- type: BasicEntityAmmoProvider
- proto: BulletKinetic
+ proto: BulletKineticMediumPower
capacity: 1
count: 1
- type: Gun
showExamineText: false
- fireRate: 0.5
+ fireRate: 0.75
minAngle: 1
maxAngle: 5
selectedMode: SemiAuto
@@ -346,22 +420,18 @@
- 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
categories: [ HideSpawnMenu ]
parent:
- MobExplorerBase
+ - MobHumanoidHostileAISimpleMelee
#- MobLaserReflect # Added to prevent laser abuse from players
id: MobExplorerHauler
- description: |-
+ description: |-
Loaded with heavy equipment for industrial-scale looting. Pardon me, "asset recovery".
components:
- type: Loadout
@@ -396,37 +466,52 @@
160: 0.5
- type: Stamina
critThreshold: 600
- - type: MovementSpeedModifier
- baseWalkSpeed: 2.75
- baseSprintSpeed: 4
+ - type: Destructible
+ thresholds:
+ - trigger:
+ !type:DamageTrigger
+ damage: 195
+ behaviors:
+ - !type:PlaySoundBehavior
+ sound:
+ collection: GlassBreak
+ - !type:SpawnEntitiesBehavior
+ spawn:
+ SpawnMobExplorerT2:
+ min: 1
+ max: 1
+ RipleyChassis:
+ min: 1
+ max: 1
+ RipleyCentralElectronics:
+ min: 1
+ max: 1
+ RipleyPeripheralsElectronics:
+ min: 1
+ max: 1
+ - !type:DoActsBehavior
+ acts: [ "Destruction" ]
- type: FootstepModifier
footstepSoundCollection:
path: /Audio/Mecha/sound_mecha_powerloader_step.ogg
- - type: Repairable
- fuelCost: 25
- doAfterDelay: 10
- type: MeleeWeapon
hidden: true
attackRate: 1
damage:
types:
- Blunt: 15
+ Blunt: 20
Structural: 20
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
name: explorer captain
parent:
+ - MobHostileBossBase
- MobExplorerBase
- MobHumanoidHostileAISimpleMelee
id: MobExplorerBoss
@@ -439,26 +524,34 @@
prototypes:
- MobHumanoidExplorerGearBoss
- type: Damageable
- damageModifierSet: MobHostileDamageModifierSetHigh
+ damageModifierSet: MobHostileDamageModifierSetBoss
- type: Sprite
drawdepth: Mobs
layers:
- - sprite: _NF/Mobs/Species/Templates/human.rsi
- state: human
+ # Helmet
- sprite: _NF/Clothing/Head/Hardsuits/maxim_prototype.rsi
state: off-equipped-HELMET
- sprite: Clothing/Head/Hardsuits/spatiohelm.rsi
state: equipped-head-light
shader: unshaded
color: "#47f8ff"
+ # Suit
+ - sprite: _NF/Clothing/OuterClothing/Hardsuits/maxim_prototype.rsi
+ state: equipped-OUTERCLOTHING
+ # Weapons
+ - sprite: _NF/Objects/Weapons/Melee/energy_pickaxe.rsi
+ state: inhand-left
+ - sprite: _NF/Objects/Weapons/Melee/energy_pickaxe.rsi
+ state: inhand-left-blade
+ shader: unshaded
+ color: "#e95151"
+ # Fluff
+ - sprite: Objects/Tools/lantern.rsi
+ state: on-equipped-BELT
+ shader: unshaded
- type: PointLight
- enabled: true
- autoRot: true
- netsync: false
radius: 7
energy: 3
- mask: /Textures/Effects/LightMasks/cone.png
- color: "#47f8ff"
- type: MobThresholds
thresholds:
120: Critical
@@ -467,19 +560,72 @@
speedModifierThresholds:
60: 0.7
80: 0.5
- - type: MovementSpeedModifier
- baseWalkSpeed: 4
- baseSprintSpeed: 5.25
- type: MeleeWeapon
hidden: true
- attackRate: 0.8
+ attackRate: 2
damage:
types:
- Heat: 12.5
- Piercing: 2.5
+ Heat: 16
+ Piercing: 4
Structural: 40
soundHit:
path: /Audio/Weapons/eblade1.ogg
params:
variation: 0.250
volume: -10
+ # Ghost role stuff
+ - type: GhostRole
+ allowMovement: true
+ name: ghost-role-information-explorer-captain-dungeon-name
+ description: ghost-role-information-explorer-captain-dungeon-description
+ rules: ghost-role-information-dungeon-boss-rules
+ raffle:
+ settings: default
+ - type: GhostTakeoverAvailable
+ - type: ActionGun
+ action: ActionSeismicCharge
+ gunProto: SeismicChargeGun
+
+- type: entity
+ id: SeismicChargeGun
+ name: seismic charge gun
+ description: Needed to shoot the charge.
+ categories: [ HideSpawnMenu ]
+ components:
+ - type: RechargeBasicEntityAmmo
+ rechargeCooldown: 50
+ rechargeSound:
+ path: /Audio/Weapons/Guns/MagIn/kinetic_reload.ogg
+ - type: BasicEntityAmmoProvider
+ proto: NFBulletSeismicCharge
+ capacity: 1
+ count: 1
+ - type: Gun
+ minAngle: 1
+ maxAngle: 5
+ fireRate: 1
+ selectedMode: FullAuto
+ availableModes:
+ - FullAuto
+ soundGunshot:
+ path: /Audio/Items/bow_pull.ogg
+ soundEmpty: null
+ projectileSpeed: 15
+ - type: UseDelay
+ delay: 50
+
+- type: entity
+ id: ActionSeismicCharge
+ categories: [ HideSpawnMenu ]
+ name: "[color=yellow]Throw Seismic Charge[/color]"
+ description: "Hurls activated seismic charge, that explodes on contact. [color=yellow]50 second cooldown.[/color]"
+ components:
+ - type: WorldTargetAction
+ icon: { sprite : Objects/Weapons/Bombs/seismic.rsi, state: icon }
+ event: !type:ActionGunShootEvent
+ priority: 2
+ checkCanAccess: false
+ range: 0
+ itemIconStyle: BigAction
+ - type: UseDelay
+ delay: 50
diff --git a/Resources/Prototypes/_NF/Entities/Mobs/NPCs/mob_hostile_punkganger.yml b/Resources/Prototypes/_NF/Entities/Mobs/NPCs/mob_hostile_punkganger.yml
index 907bf2f19b3..134e2c010d9 100644
--- a/Resources/Prototypes/_NF/Entities/Mobs/NPCs/mob_hostile_punkganger.yml
+++ b/Resources/Prototypes/_NF/Entities/Mobs/NPCs/mob_hostile_punkganger.yml
@@ -1,6 +1,6 @@
-- type: entity
- abstract: true
+- type: entity # Spawns random graffiti (even if the mob is dead)
id: MobVandalizer
+ abstract: true
components:
- type: Timer
- type: TimedSpawner
@@ -12,30 +12,25 @@
maximumEntitiesSpawned: 1
- type: entity
+ id: MobPunkBase
name: punk
abstract: true
parent:
- MobHumanoidHostileBase
- MobVandalizer
+ - MobHumanoidInvetory
- NFMobRestrictions
- id: MobPunkBase
description: |-
"Criminally-inclined individuals", as NT Security documents call them, these are armed with a variety of weapons. These weapons range from makeshift shivs and machined truncheons to rusty pistols and shotguns. Some may be armored, so plan appropriately.
components:
+ - type: RandomHumanoidAppearance
+ randomizeName: true
- type: NpcFactionMember
factions:
- StreetGangNF
- - type: MobThresholds
- thresholds:
- 0: Alive
- 100: Critical
- 130: Dead
- - type: SlowOnDamage
- speedModifierThresholds:
- 60: 0.7
- 80: 0.5
- - type: Stamina
- critThreshold: 100
+ - type: Body
+ prototype: NFHumanNoHands
+ requiredLegs: 2
- type: RechargeBasicEntityAmmo
rechargeCooldown: 1.5
rechargeSound:
@@ -47,8 +42,8 @@
animation: WeaponArcPunch
damage:
types:
- Slash: 10
- Structural: 20
+ Blunt: 12
+ Structural: 30
soundHit:
path: /Audio/Weapons/bladeslice.ogg
- type: ReplacementAccent
@@ -61,31 +56,35 @@
- type: AutoWakeUp
# Humans
+## Tier 1
- type: entity
+ id: MobPunkGangerMeleeT1
parent:
- MobPunkBase
- MobHumanoidHostileAISimpleMelee
- id: MobPunkGangerMelee
categories: [ HideSpawnMenu ]
components:
- type: Loadout
prototypes:
- - PunkGangerGearMelee
+ - PunkGangerGearMeleeT1
- type: entity
+ id: MobPunkGangerPistol
parent:
- MobPunkBase
- MobHumanoidHostileAISimpleRanged
- id: MobPunkGangerPistol
categories: [ HideSpawnMenu ]
components:
+ - type: MovementSpeedModifier
+ baseWalkSpeed : 4
+ baseSprintSpeed : 4
- type: Loadout
prototypes:
- PunkGangerGearPistol
- type: BasicEntityAmmoProvider
proto: BulletPistol
- capacity: 2
- count: 2
+ capacity: 1
+ count: 1
- type: Gun
showExamineText: false
fireRate: 0.5
@@ -94,13 +93,33 @@
- FullAuto
soundGunshot: /Audio/Weapons/Guns/Gunshots/pistol.ogg
+## Tier 2
- type: entity
+ id: MobPunkGangerMeleeT2
parent:
- MobPunkBase
- - MobHumanoidHostileAISimpleRanged
+ - MobHumanoidHostileAISimpleMelee
+ categories: [ HideSpawnMenu ]
+ components:
+ - type: Loadout
+ prototypes:
+ - PunkGangerGearMeleeT2
+ - type: MeleeWeapon
+ damage:
+ types:
+ Blunt: 16
+ Structural: 30
+
+- type: entity
id: MobPunkGangerShotgun
+ parent:
+ - MobPunkBase
+ - MobHumanoidHostileAISimpleRanged
categories: [ HideSpawnMenu ]
components:
+ - type: MovementSpeedModifier
+ baseWalkSpeed : 4
+ baseSprintSpeed : 4
- type: Loadout
prototypes:
- PunkGangerGearShotgun
@@ -116,29 +135,36 @@
- FullAuto
soundGunshot: /Audio/Weapons/Guns/Gunshots/pistol.ogg
+## Tier 3
- type: entity
+ id: MobPunkGangerMeleeT3
parent:
- MobPunkBase
- MobHumanoidHostileAISimpleMelee
- id: MobPunkGangerArmoredMelee
categories: [ HideSpawnMenu ]
components:
- type: Loadout
prototypes:
- - PunkGangerArmoredGearMelee
+ - PunkGangerGearMeleeT3
+ - type: MeleeWeapon
+ damage:
+ types:
+ Blunt: 18
+ Structural: 30
- type: entity
parent:
- MobPunkBase
- MobHumanoidHostileAISimpleRanged
- id: MobPunkGangerArmoredElite
- name: punk gang leader
- description: It takes a formidable figure to lead a pack of street trash. These leaders usually wield scavenged SMGs and wear armor taken from unfortunate security forces. Usually high on meth and booze.
+ id: MobPunkGangerSmg
categories: [ HideSpawnMenu ]
components:
+ - type: MovementSpeedModifier
+ baseWalkSpeed : 4
+ baseSprintSpeed : 4
- type: Loadout
prototypes:
- - PunkGangerArmoredEliteGear
+ - PunkGangerGearSmg
- type: BasicEntityAmmoProvider
proto: BulletPistol
capacity: 6
@@ -147,11 +173,103 @@
showExamineText: false
minAngle: 10
maxAngle: 30
- fireRate: 3
+ fireRate: 1
angleIncrease: 3
angleDecay: 6
selectedMode: FullAuto
availableModes:
- FullAuto
soundGunshot: /Audio/Weapons/Guns/Gunshots/smg.ogg
+
+## Tier 4 - Dungeon boss
+- type: entity
+ id: MobPunkGangerLeader
+ parent:
+ - MobHostileBossBase
+ - MobPunkBase
+ - MobHumanoidHostileAISimpleRanged
+ name: punk gang leader
+ description: It takes a formidable figure to lead a pack of street trash. These leaders usually wield scavenged SMGs and wear armor taken from unfortunate security forces. Usually high on meth and booze.
+ categories: [ HideSpawnMenu ]
+ components:
+ - type: MovementSpeedModifier
+ baseWalkSpeed : 4
+ baseSprintSpeed : 4
+ - type: Loadout
+ prototypes:
+ - PunkGangerGearLaser
+ - type: HitscanBatteryAmmoProvider
+ proto: RedLaser
+ fireCost: 100
+ - type: BatterySelfRecharger
+ autoRecharge: true
+ autoRechargeRate: 50
+ - type: Battery
+ maxCharge: 600
+ startingCharge: 600
+ - type: Gun
+ showExamineText: false
+ fireRate: 1
+ minAngle: 5
+ maxAngle: 10
+ selectedMode: SemiAuto
+ availableModes:
+ - SemiAuto
+ soundGunshot: /Audio/Weapons/Guns/Gunshots/laser_cannon.ogg
- type: Jittering
+ # Ghost role stuff
+ - type: GhostRole
+ allowMovement: true
+ name: ghost-role-information-punk-boss-dungeon-name
+ description: ghost-role-information-punk-boss-dungeon-description
+ rules: ghost-role-information-dungeon-boss-rules
+ raffle:
+ settings: default
+ - type: GhostTakeoverAvailable
+ - type: ActionGun
+ action: ActionThrowPartyNade
+ gunProto: PartyNadeGun
+
+- type: entity
+ id: PartyNadeGun
+ name: party nade gun
+ description: Needed to shoot a nade.
+ categories: [ HideSpawnMenu ]
+ components:
+ - type: RechargeBasicEntityAmmo
+ rechargeCooldown: 20
+ rechargeSound:
+ path: /Audio/Weapons/Guns/MagIn/kinetic_reload.ogg
+ - type: BasicEntityAmmoProvider
+ proto: NFBulletPartyNade
+ capacity: 1
+ count: 1
+ - type: Gun
+ minAngle: 1
+ maxAngle: 5
+ fireRate: 1
+ selectedMode: FullAuto
+ availableModes:
+ - FullAuto
+ soundGunshot:
+ path: /Audio/Items/bow_pull.ogg
+ soundEmpty: null
+ projectileSpeed: 15
+ - type: UseDelay
+ delay: 20
+
+- type: entity
+ id: ActionThrowPartyNade
+ categories: [ HideSpawnMenu ]
+ name: "[color=yellow]Throw a party 'nade[/color]"
+ description: "Hurls activated party 'nade filled with party chems, explodes on contact. [color=yellow]20 second cooldown.[/color]"
+ components:
+ - type: WorldTargetAction
+ icon: { sprite : Objects/Weapons/Grenades/metalfoam.rsi, state: primed }
+ event: !type:ActionGunShootEvent
+ priority: 2
+ checkCanAccess: false
+ range: 0
+ itemIconStyle: BigAction
+ - type: UseDelay
+ delay: 20
diff --git a/Resources/Prototypes/_NF/Entities/Objects/Tools/blueprints/blueprints_expedition_loot.yml b/Resources/Prototypes/_NF/Entities/Objects/Tools/blueprints/blueprints_expedition_loot.yml
index 2fa455a60c9..c1587242cea 100644
--- a/Resources/Prototypes/_NF/Entities/Objects/Tools/blueprints/blueprints_expedition_loot.yml
+++ b/Resources/Prototypes/_NF/Entities/Objects/Tools/blueprints/blueprints_expedition_loot.yml
@@ -125,3 +125,15 @@
- type: Blueprint
providedRecipes:
- WeaponXrayCannon
+
+# Tools
+
+- type: entity
+ parent: BaseBlueprintExpedition
+ id: NFBlueprintEnergyPickaxe
+ name: holopickaxe blueprint
+ description: A blueprint with a schematic of a holopickaxe. It can be inserted into an autolathe or a techfab.
+ components:
+ - type: Blueprint
+ providedRecipes:
+ - NFEnergyPickaxe
diff --git a/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Projectiles/energy.yml b/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Projectiles/energy.yml
index bc1df402a1a..33f4f5cd60b 100644
--- a/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Projectiles/energy.yml
+++ b/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Projectiles/energy.yml
@@ -12,3 +12,37 @@
soundHit:
collection: WeakHit
forceSound: true
+
+- type: entity
+ id: BulletKineticLowPower
+ name: kinetic bolt
+ parent: BulletKinetic
+ categories: [ HideSpawnMenu ]
+ components:
+ - type: Projectile
+ impactEffect: BulletImpactEffectKinetic
+ damage:
+ types:
+ Blunt: 12
+ Structural: 30
+ - type: Ammo
+ muzzleFlash: HitscanEffect
+ - type: TimedDespawn
+ lifetime: 1.5
+ - type: PointLight
+ radius: 2.5
+ color: white
+ energy: 0.5
+
+- type: entity
+ id: BulletKineticMediumPower
+ name: kinetic bolt
+ parent: BulletKineticLowPower
+ categories: [ HideSpawnMenu ]
+ components:
+ - type: Projectile
+ impactEffect: BulletImpactEffectKinetic
+ damage:
+ types:
+ Blunt: 16
+ Structural: 30
diff --git a/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Projectiles/minirocket.yml b/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Projectiles/minirocket.yml
index 1609550cc9d..b6a0bd2d8e6 100644
--- a/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Projectiles/minirocket.yml
+++ b/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Projectiles/minirocket.yml
@@ -37,3 +37,62 @@
state: frag
- type: StaticPrice
price: 20
+
+# Explorer Captain Seismic Charge
+- type: entity
+ parent: BaseBulletTrigger
+ id: NFBulletSeismicCharge
+ name: seismic charge
+ categories: [ HideSpawnMenu ]
+ components:
+ - type: Sprite
+ sprite: Objects/Weapons/Bombs/seismic.rsi
+ layers:
+ - state: primed
+ - type: ExplodeOnTrigger
+ - type: Explosive # Nerfed SeismicCharge
+ explosionType: Cryo
+ totalIntensity: 30
+ intensitySlope: 2
+ maxIntensity: 10
+ canCreateVacuum: false
+ - type: PointLight
+ radius: 3.5
+ color: "#47f8ff"
+ energy: 0.5
+
+# Punk leader grenade
+- type: entity
+ parent: BaseBulletTrigger
+ id: NFBulletPartyNade
+ name: party 'nade
+ categories: [ HideSpawnMenu ]
+ components:
+ - type: Sprite
+ sprite: Objects/Weapons/Grenades/metalfoam.rsi
+ layers:
+ - state: primed
+ - type: SmokeOnTrigger
+ duration: 20
+ spreadAmount: 110
+ solution:
+ reagents:
+ - ReagentId: Desoxyephedrine
+ Quantity: 10
+ - ReagentId: THC
+ Quantity: 30
+ - ReagentId: Happiness
+ Quantity: 5
+ - ReagentId: SpaceDrugs
+ Quantity: 5
+ - ReagentId: Absinthe
+ Quantity: 20
+ - ReagentId: TearGas
+ Quantity: 20
+ - ReagentId: Diphenhydramine # Heals toxin damage you get from all the sh.. stuff above
+ Quantity: 20
+ - type: PointLight
+ radius: 3.5
+ energy: 0.5
+ - type: RgbLightController
+ layers: [ 0 ]
diff --git a/Resources/Prototypes/_NF/Entities/Objects/Weapons/Melee/e_sword.yml b/Resources/Prototypes/_NF/Entities/Objects/Weapons/Melee/e_sword.yml
index 9edbb935c89..d7b9ea6299b 100644
--- a/Resources/Prototypes/_NF/Entities/Objects/Weapons/Melee/e_sword.yml
+++ b/Resources/Prototypes/_NF/Entities/Objects/Weapons/Melee/e_sword.yml
@@ -10,7 +10,7 @@
blockHacking: true
- type: entity
- id: EnergyPickaxeNF
+ id: NFEnergyPickaxe
parent: [EnergySword, BaseC1Contraband] # Has a reflect chance
name: holopickaxe
description: A holographic mining tool with blades comprised of hard light. Doesn't pack the same punch as an energy weapon, but more compact than most mining tools when turned off.
diff --git a/Resources/Prototypes/_NF/InventoryTemplates/hostile_nonhumanoid_inventory_template.yml b/Resources/Prototypes/_NF/InventoryTemplates/npc_inventory_id_template.yml
similarity index 100%
rename from Resources/Prototypes/_NF/InventoryTemplates/hostile_nonhumanoid_inventory_template.yml
rename to Resources/Prototypes/_NF/InventoryTemplates/npc_inventory_id_template.yml
diff --git a/Resources/Prototypes/_NF/InventoryTemplates/hostile_humanoid_inventory_template.yml b/Resources/Prototypes/_NF/InventoryTemplates/npc_inventory_template.yml
similarity index 97%
rename from Resources/Prototypes/_NF/InventoryTemplates/hostile_humanoid_inventory_template.yml
rename to Resources/Prototypes/_NF/InventoryTemplates/npc_inventory_template.yml
index 10129e68d3e..3d6b2e8ee84 100644
--- a/Resources/Prototypes/_NF/InventoryTemplates/hostile_humanoid_inventory_template.yml
+++ b/Resources/Prototypes/_NF/InventoryTemplates/npc_inventory_template.yml
@@ -9,7 +9,6 @@
stripTime: 3
uiWindowPos: 0,3
strippingWindowPos: 0,0
- dependsOn: jumpsuit
displayName: Pocket 1
- name: pocket2
@@ -20,7 +19,6 @@
stripTime: 3
uiWindowPos: 2,3
strippingWindowPos: 1,0
- dependsOn: jumpsuit
displayName: Pocket 2
- name: id
@@ -59,7 +57,6 @@
slotGroup: MainHotbar
uiWindowPos: 2,0
strippingWindowPos: 2,1
- dependsOn: outerClothing
displayName: Suit Storage
# "Not strippable", "hidden"
diff --git a/Resources/Prototypes/_NF/InventoryTemplates/hostile_humanoid_simplified_inventory_template.yml b/Resources/Prototypes/_NF/InventoryTemplates/npc_simplified_inventory_template.yml
similarity index 100%
rename from Resources/Prototypes/_NF/InventoryTemplates/hostile_humanoid_simplified_inventory_template.yml
rename to Resources/Prototypes/_NF/InventoryTemplates/npc_simplified_inventory_template.yml
diff --git a/Resources/Prototypes/_NF/Recipes/Lathes/tools.yml b/Resources/Prototypes/_NF/Recipes/Lathes/tools.yml
index 97afc17b626..01ed768f789 100644
--- a/Resources/Prototypes/_NF/Recipes/Lathes/tools.yml
+++ b/Resources/Prototypes/_NF/Recipes/Lathes/tools.yml
@@ -112,3 +112,15 @@
Steel: 650
Plastic: 150
Gold: 50
+
+# Holopickaxe
+- type: latheRecipe
+ id: NFEnergyPickaxe
+ result: NFEnergyPickaxe
+ category: Tools
+ completetime: 4
+ materials:
+ Steel: 1000
+ Plastic: 500
+ Glass: 500
+ Gold: 800
diff --git a/Resources/Prototypes/_NF/Roles/Jobs/Hostile/explorers.yml b/Resources/Prototypes/_NF/Roles/Jobs/Hostile/explorers.yml
index 52302cd4d94..727a315baff 100644
--- a/Resources/Prototypes/_NF/Roles/Jobs/Hostile/explorers.yml
+++ b/Resources/Prototypes/_NF/Roles/Jobs/Hostile/explorers.yml
@@ -2,9 +2,8 @@
- type: startingGear
id: MobHumanoidExplorerGearMeleeT1
equipment:
- gloves: ClothingHandsGlovesWeaponWieldedPickaxe
- back: ClothingBackpackExplorerMeleeT1
- belt: OreBag
+ pocket1: ClothingBackpackExplorerMeleeT1
+ pocket2: OreBag
shoes: ClothingShoesBootsSalvage
suitstorage: AirTankFilled
neck: ClothingNeckIFFCyan
@@ -12,9 +11,8 @@
- type: startingGear
id: MobHumanoidExplorerGearRangedT1
equipment:
- gloves: ClothingHandsGlovesWeaponPkaFlashlight
- back: ClothingBackpackExplorerRangedT1
- belt: ConstructionBag
+ pocket1: ClothingBackpackExplorerRangedT1
+ pocket2: ConstructionBag
shoes: ClothingShoesBootsSalvage
suitstorage: AirTankFilled
neck: ClothingNeckIFFCyan
@@ -23,42 +21,38 @@
- type: startingGear
id: MobHumanoidExplorerGearMeleeT2
equipment:
- gloves: ClothingHandsGlovesWeaponWieldedGlaive
- outerClothing: ClothingOuterHardsuitSpatio
- back: ClothingBackpackExplorerMeleeT2
- belt: OreBag
+ pocket1: ClothingBackpackExplorerMeleeT2
+ pocket2: OreBag
shoes: ClothingShoesBootsSalvage
+ suitstorage: AirTankFilled
neck: ClothingNeckIFFCyan
- type: startingGear
id: MobHumanoidExplorerGearRangedT2
equipment:
- gloves: ClothingHandsGlovesWeaponSawnOffPkaDagger
- outerClothing: ClothingOuterHardsuitSpatio
- back: ClothingBackpackExplorerRangedT2
- belt: ConstructionBag
+ pocket1: ClothingBackpackExplorerRangedT2
+ pocket2: ConstructionBag
shoes: ClothingShoesBootsSalvage
+ suitstorage: AirTankFilled
neck: ClothingNeckIFFCyan
# Tier 3
- type: startingGear
id: MobHumanoidExplorerGearMeleeT3
equipment:
- gloves: ClothingHandsGlovesWeaponDrill
- outerClothing: ClothingOuterHardsuitSalvage
- back: ClothingBackpackExplorerMeleeT3
- belt: OreBag
+ pocket1: ClothingBackpackExplorerMeleeT3
+ pocket2: OreBag
shoes: ClothingShoesBootsSalvage
+ suitstorage: AirTankFilled
neck: ClothingNeckIFFCyan
- type: startingGear
id: MobHumanoidExplorerGearRangedT3
equipment:
- gloves: ClothingHandsGlovesWeaponWieldedPka
- outerClothing: ClothingOuterHardsuitLuxury
- back: ClothingBackpackExplorerRangedT3
- belt: ConstructionBag
+ pocket1: ClothingBackpackExplorerRangedT3
+ pocket2: ConstructionBag
shoes: ClothingShoesBootsSalvage
+ suitstorage: AirTankFilled
neck: ClothingNeckIFFCyan
- type: startingGear
@@ -71,9 +65,8 @@
- type: startingGear
id: MobHumanoidExplorerGearBoss
equipment:
- gloves: ClothingHandsGlovesWeaponEnergyPickaxe
- outerClothing: ClothingOuterHardsuitMaximPrototype
- back: ClothingBackpackExplorerBoss
- belt: ConstructionBag
+ pocket1: ClothingBackpackExplorerBoss
+ pocket2: ConstructionBag
shoes: ClothingShoesBootsSalvage
+ suitstorage: AirTankFilled
neck: ClothingNeckIFFCyan
diff --git a/Resources/Prototypes/_NF/Roles/Jobs/Hostile/guidebook_crewmates.yml b/Resources/Prototypes/_NF/Roles/Jobs/Hostile/guidebook_crewmates.yml
index 0407033802f..3fd3a120c43 100644
--- a/Resources/Prototypes/_NF/Roles/Jobs/Hostile/guidebook_crewmates.yml
+++ b/Resources/Prototypes/_NF/Roles/Jobs/Hostile/guidebook_crewmates.yml
@@ -4,7 +4,7 @@
equipment:
jumpsuit: ClothingUniformJumpsuitSalvageSpecialist
shoes: ClothingShoesBootsSalvage
- gloves: ClothingHandsGlovesWeaponWieldedGlaive
+ neck: PunkHandsGlovesBaseballBat
mask: ClothingMaskGasExplorer
ear: ClothingHeadsetMining
belt: ClothingBeltSalvageWebbing
@@ -25,7 +25,7 @@
id: GuidebookMemeNpcUglyLoadout
equipment:
jumpsuit: ClothingUniformJumpskirtJanimaid
- gloves: ClothingHandsGlovesWeaponWieldedPickaxe
+ gloves: ClothingHandsGlovesColorMercMosin
back: ClothingBackpackDuffelSalvage
- type: startingGear
diff --git a/Resources/Prototypes/_NF/Roles/Jobs/Hostile/punk_gangers.yml b/Resources/Prototypes/_NF/Roles/Jobs/Hostile/punk_gangers.yml
index d9f870b06d1..cfe393595ac 100644
--- a/Resources/Prototypes/_NF/Roles/Jobs/Hostile/punk_gangers.yml
+++ b/Resources/Prototypes/_NF/Roles/Jobs/Hostile/punk_gangers.yml
@@ -1,14 +1,13 @@
+# Tier 1
- type: startingGear
- id: PunkGangerGearMelee
+ id: PunkGangerGearMeleeT1
equipment:
+ neck: PunkHandsGlovesBaseballBat
jumpsuit: ClothingUniformRandomPunkCroptop
belt: ClothingBeltPunkRandomized
shoes: ClothingShoesBootsPunkRandomized
- #gloves: ClothingHandsGlovesCombat
outerClothing: ClothingOuterCoatBomberRandomized
- back: ClothingBackpackPunkLootA
- inhand:
- - SpawnInhandMeleeWeaponPunkGangLow
+ pocket2: ClothingBackpackPunkLootA
- type: startingGear
id: PunkGangerGearPistol
@@ -19,46 +18,65 @@
shoes: ClothingShoesBootsPunkRandomized
gloves: ClothingHandsGlovesColorBlackPistol
outerClothing: ClothingOuterCoatBomberRandomized
- back: ClothingBackpackPunkLootB
- inhand:
- - SpawnInhandMeleeWeaponPunkGangLow
+ pocket2: ClothingBackpackPunkLootB
+
+# Tier 2
+- type: startingGear
+ id: PunkGangerGearMeleeT2
+ equipment:
+ neck: PunkHandsGlovesFireaxe
+ jumpsuit: ClothingUniformRandomPunkCroptop
+ belt: ClothingBeltPunkRandomized
+ shoes: ClothingShoesBootsPunkRandomized
+ outerClothing: ClothingOuterArmorPunkRandomized
+ pocket2: ClothingBackpackPunkLootA
- type: startingGear
id: PunkGangerGearShotgun
equipment:
+ neck: PunkHandsGlovesShotgun
mask: ClothingMaskPunkHalf
jumpsuit: ClothingUniformRandomPunkCroptop
belt: ClothingBeltPunkRandomized
shoes: ClothingShoesBootsPunkRandomized
- gloves: ClothingHandsGlovesColorBlackShotgun
outerClothing: ClothingOuterCoatBomberRandomized
- back: ClothingBackpackPunkLootC
- inhand:
- - SpawnInhandMeleeWeaponPunkGangLow
+ pocket2: ClothingBackpackPunkLootC
+
+# Tier 3
+- type: startingGear
+ id: PunkGangerGearMeleeT3
+ equipment:
+ neck: PunkHandsGlovesSledgehammer
+ eyes: ClothingEyesPunkGoggles
+ mask: ClothingMaskPunkHalf
+ jumpsuit: ClothingUniformRandomPunkTanktop
+ belt: ClothingBeltPunkRandomized
+ shoes: ClothingShoesBootsPunkRandomized
+ outerClothing: ClothingOuterArmorElitePunkRandomized
+ pocket2: ClothingBackpackPunkLootA
- type: startingGear
- id: PunkGangerArmoredGearMelee
+ id: PunkGangerGearSmg
equipment:
+ neck: PunkHandsGlovesSmg
eyes: ClothingEyesPunkGoggles
mask: ClothingMaskPunkHalf
jumpsuit: ClothingUniformRandomPunkTanktop
belt: ClothingBeltPunkRandomized
shoes: ClothingShoesBootsPunkRandomized
outerClothing: ClothingOuterArmorPunkRandomized
- back: ClothingBackpackPunkLootA
- inhand:
- - SpawnInhandMeleeWeaponPunkGangLow
+ pocket2: ClothingBackpackPunkLootD
+# Tier 4
- type: startingGear
- id: PunkGangerArmoredEliteGear
+ id: PunkGangerGearLaser
equipment:
+ neck: PunkHandsGlovesLaserGun
eyes: ClothingEyesPunkInfoShades
mask: ClothingMaskPunkHalf
jumpsuit: ClothingUniformRandomPunkTanktop
belt: ClothingBeltPunkRandomized
shoes: ClothingShoesBootsPunkRandomized
- gloves: ClothingHandsGlovesColorBlackSMG
outerClothing: ClothingOuterArmorElitePunkRandomized
- back: ClothingBackpackPunkLootD
- inhand:
- - SpawnInhandMeleeWeaponPunkGangLow
+ back: PortableRecharger
+ pocket2: ClothingBackpackPunkLootBoss
diff --git a/Resources/ServerInfo/_NF/Guidebook/MobsHostileExpedition/explorers.xml b/Resources/ServerInfo/_NF/Guidebook/MobsHostileExpedition/explorers.xml
index 25219e1e812..bb4a8393b24 100644
--- a/Resources/ServerInfo/_NF/Guidebook/MobsHostileExpedition/explorers.xml
+++ b/Resources/ServerInfo/_NF/Guidebook/MobsHostileExpedition/explorers.xml
@@ -14,8 +14,8 @@
- [bold][color=#a4885c]Health thresholds:[/color][/bold] 100 (crit), 130 (death)
- - [bold][color=#a4885c]Run (walk) speed:[/color][/bold] 4.5 m/s (2.5 m/s)[bold][color=#a4885c]*[/color][/bold]
- - [bold][color=#a4885c]Damage (type):[/color][/bold] 7.5 [color=red]Blunt[/color], 7.5 [color=yellow]Piercing[/color]
+ - [bold][color=#a4885c]Run speed:[/color][/bold] 4.5 m/s[bold][color=#a4885c]*[/color][/bold]
+ - [bold][color=#a4885c]Damage (type):[/color][/bold] 6 [color=red]Blunt[/color], 6 [color=yellow]Piercing[/color]
- [bold][color=#a4885c]Damage resistances:[/color][/bold] none
- [bold][color=#a4885c]Special abilities:[/color][/bold] none
@@ -31,8 +31,8 @@
- [bold][color=#a4885c]Health thresholds:[/color][/bold] 100 (crit), 130 (death)
- - [bold][color=#a4885c]Run (walk) speed:[/color][/bold] 4.5 m/s (2.5 m/s)
- - [bold][color=#a4885c]Damage (type):[/color][/bold] 20 [color=red]Blunt[/color]
+ - [bold][color=#a4885c]Run speed:[/color][/bold] 4 m/s
+ - [bold][color=#a4885c]Damage (type):[/color][/bold] 12 [color=red]Blunt[/color]
- [bold][color=#a4885c]Damage resistances:[/color][/bold] none
- [bold][color=#a4885c]Special abilities:[/color][/bold] Shooter (unwielded PKA)
@@ -46,9 +46,9 @@
- [bold][color=#a4885c]Health thresholds:[/color][/bold] 100 (crit), 130 (death)
- - [bold][color=#a4885c]Run (walk) speed:[/color][/bold] 4.5 m/s (2.5 m/s)
- - [bold][color=#a4885c]Damage (type):[/color][/bold] 7.5 [color=red]Blunt[/color], 5.5 [color=red]Slash[/color]
- - [bold][color=#a4885c]Damage resistances:[/color][/bold] [color=red]Blunt[/color], [color=red]Slash[/color] and [color=yellow]Piercing[/color] 5%; [color=orange]Caustic[/color] 10%
+ - [bold][color=#a4885c]Run speed:[/color][/bold] 4.5 m/s
+ - [bold][color=#a4885c]Damage (type):[/color][/bold] 7 [color=red]Blunt[/color], 6 [color=red]Slash[/color]
+ - [bold][color=#a4885c]Damage resistances:[/color][/bold] [color=red]Blunt[/color], [color=red]Slash[/color] and [color=yellow]Piercing[/color] 10%; [color=orange]Heat[/color] 5%; [color=orange]Caustic[/color] 10%
- [bold][color=#a4885c]Special abilities:[/color][/bold] none
[bold][color=#a4885c]________________________________________________________________________[/color]
@@ -61,10 +61,10 @@
- [bold][color=#a4885c]Health thresholds:[/color][/bold] 100 (crit), 130 (death)
- - [bold][color=#a4885c]Run (walk) speed:[/color][/bold] 4.5 m/s (2.5 m/s)
- - [bold][color=#a4885c]Damage (type):[/color][/bold] 20 [color=red]Blunt[/color]
- - [bold][color=#a4885c]Damage resistances:[/color][/bold] [color=red]Blunt[/color], [color=red]Slash[/color] and [color=yellow]Piercing[/color] 5%; [color=orange]Caustic[/color] 10%
- - [bold][color=#a4885c]Special abilities:[/color][/bold] Shooter (sawn-off PKA)
+ - [bold][color=#a4885c]Run speed:[/color][/bold] 4 m/s
+ - [bold][color=#a4885c]Damage (type):[/color][/bold] 12 [color=red]Blunt[/color]
+ - [bold][color=#a4885c]Damage resistances:[/color][/bold] [color=red]Blunt[/color], [color=red]Slash[/color] and [color=yellow]Piercing[/color] 10%; [color=orange]Heat[/color] 5%; [color=orange]Caustic[/color] 10%
+ - [bold][color=#a4885c]Special abilities:[/color][/bold] Shooter (unwielded PKA)
[bold][color=#a4885c]________________________________________________________________________[/color]
@@ -76,9 +76,9 @@
- [bold][color=#a4885c]Health thresholds:[/color][/bold] 100 (crit), 130 (death)
- - [bold][color=#a4885c]Run (walk) speed:[/color][/bold] 4.5 m/s (2.5 m/s)
- - [bold][color=#a4885c]Damage (type):[/color][/bold] 2 [color=red]Blunt[/color], 1 [color=red]Slash[/color], 2 [color=yellow]Piercing[/color]
- - [bold][color=#a4885c]Damage resistances:[/color][/bold] [color=red]Blunt[/color], [color=red]Slash[/color] and [color=yellow]Piercing[/color] 10%; [color=orange]Heat[/color] 5%; [color=orange]Caustic[/color] 10%
+ - [bold][color=#a4885c]Run speed:[/color][/bold] 4.5 m/s
+ - [bold][color=#a4885c]Damage (type):[/color][/bold] 2 [color=red]Blunt[/color], 2 [color=red]Slash[/color], 2 [color=yellow]Piercing[/color]
+ - [bold][color=#a4885c]Damage resistances:[/color][/bold] [color=red]Blunt[/color], [color=red]Slash[/color] and [color=yellow]Piercing[/color] 15%; [color=orange]Heat[/color] 10%; [color=orange]Caustic[/color] 15%
- [bold][color=#a4885c]Special abilities:[/color][/bold] none
[bold][color=#a4885c]________________________________________________________________________[/color]
@@ -91,9 +91,9 @@
- [bold][color=#a4885c]Health thresholds:[/color][/bold] 100 (crit), 130 (death)
- - [bold][color=#a4885c]Run (walk) speed:[/color][/bold] 4.5 m/s (2.5 m/s)
- - [bold][color=#a4885c]Damage (type):[/color][/bold] 20 [color=red]Blunt[/color]
- - [bold][color=#a4885c]Damage resistances:[/color][/bold] [color=red]Blunt[/color], [color=red]Slash[/color] and [color=yellow]Piercing[/color] 10%; [color=orange]Heat[/color] 5%; [color=orange]Caustic[/color] 10%
+ - [bold][color=#a4885c]Run speed:[/color][/bold] 4 m/s
+ - [bold][color=#a4885c]Damage (type):[/color][/bold] 16 [color=red]Blunt[/color]
+ - [bold][color=#a4885c]Damage resistances:[/color][/bold] [color=red]Blunt[/color], [color=red]Slash[/color] and [color=yellow]Piercing[/color] 15%; [color=orange]Heat[/color] 10%; [color=orange]Caustic[/color] 15%
- [bold][color=#a4885c]Special abilities:[/color][/bold] Shooter (wielded PKA)
[bold][color=#a4885c]________________________________________________________________________[/color]
@@ -108,8 +108,8 @@
- [bold][color=#a4885c]Health thresholds:[/color][/bold] 200 (death)
- - [bold][color=#a4885c]Run (walk) speed:[/color][/bold] 4 m/s (2.75 m/s)
- - [bold][color=#a4885c]Damage (type):[/color][/bold] 15 [color=red]Blunt[/color]
+ - [bold][color=#a4885c]Run speed:[/color][/bold] 4.5 m/s
+ - [bold][color=#a4885c]Damage (type):[/color][/bold] 20 [color=red]Blunt[/color]
- [bold][color=#a4885c]Damage resistances:[/color][/bold] [color=red]Blunt[/color] 30%; [color=red]Slash[/color] 50%; [color=yellow]Piercing[/color] 30%; [color=orange]Caustic[/color] 10%
- [bold][color=#a4885c]Damage weaknesses:[/color][/bold] [color=orange]Structural[/color] 20%; [color=orange]Shock[/color] 50%; [color=lime]Radiation[/color] 20%
- [bold][color=#a4885c]Special abilities:[/color][/bold] Immunity ([color=orange]Cold[/color], [color=lime]Poison[/color], [color=#9A54BF]Asphyxiation[/color], [color=#9A54BF]Bloodloss[/color], [color=#da8b8b]Cellular[/color])
@@ -124,9 +124,9 @@
- [bold][color=#a4885c]Health thresholds:[/color][/bold] 120 (crit), 150 (death)
- - [bold][color=#a4885c]Run (walk) speed:[/color][/bold] 4.725 m/s (3.2 m/s)
- - [bold][color=#a4885c]Damage (type):[/color][/bold] 12.5 [color=orange]Heat[/color], 2.5 [color=yellow]Piercing[/color]
- - [bold][color=#a4885c]Damage resistances:[/color][/bold] [color=red]Blunt[/color] and [color=red]Slash[/color] 30%; [color=yellow]Piercing[/color] 50%; [color=orange]Heat[/color] 20%; [color=orange]Caustic[/color] 50%; [color=lime]Radiation[/color] 70%
+ - [bold][color=#a4885c]Run speed:[/color][/bold] 4.5 m/s
+ - [bold][color=#a4885c]Damage (type):[/color][/bold] 16 [color=orange]Heat[/color], 4 [color=yellow]Piercing[/color]
+ - [bold][color=#a4885c]Damage resistances:[/color][/bold] [color=red]Blunt[/color] and [color=red]Slash[/color] 50%; [color=yellow]Piercing[/color] 50%; [color=orange]Heat[/color] 30%; [color=orange]Caustic[/color] 50%
- [bold][color=#a4885c]Special abilities: Deflection (2.5%)
[bold][color=#a4885c]________________________________________________________________________[/color]
diff --git a/Resources/ServerInfo/_NF/Guidebook/MobsHostileExpedition/punk_gangers.xml b/Resources/ServerInfo/_NF/Guidebook/MobsHostileExpedition/punk_gangers.xml
index 039ee1b0557..5dde7ea1196 100644
--- a/Resources/ServerInfo/_NF/Guidebook/MobsHostileExpedition/punk_gangers.xml
+++ b/Resources/ServerInfo/_NF/Guidebook/MobsHostileExpedition/punk_gangers.xml
@@ -11,11 +11,11 @@
"Criminally-inclined individuals", as NT Security documents call them, these are armed with a variety of weapons. These weapons range from makeshift shivs and machined truncheons to rusty pistols and shotguns. Some may be armored, so plan appropriately.
-
+
- - [bold][color=#a4885c]Health thresholds:[/color][/bold] 100 (crit), 130 (death)
- - [bold][color=#a4885c]Run (walk) speed:[/color][/bold] 4.5 m/s (2.5 m/s)[bold][color=#a4885c]*[/color][/bold]
- - [bold][color=#a4885c]Damage (type):[/color][/bold] varied 5-20 [color=red]Blunt[/color]/[color=red]Slash[/color]/[color=yellow]Piercing[/color]
+ - [bold][color=#a4885c]Health thresholds:[/color][/bold] 100 (crit), 140 (death)
+ - [bold][color=#a4885c]Run speed:[/color][/bold] 4.5 m/s[bold][color=#a4885c]*[/color][/bold]
+ - [bold][color=#a4885c]Damage (type):[/color][/bold] 12 [color=red]Blunt[/color]
- [bold][color=#a4885c]Damage resistances:[/color][/bold] none
- [bold][color=#a4885c]Special abilities:[/color][/bold] none
@@ -23,11 +23,33 @@
[bold][color=#a4885c]________________________________________________________________________[/color]
+
+
+
+ - [bold][color=#a4885c]Health thresholds:[/color][/bold] 100 (crit), 140 (death)
+ - [bold][color=#a4885c]Run speed:[/color][/bold] 4.5 m/s
+ - [bold][color=#a4885c]Damage (type):[/color][/bold] 16 [color=red]Blunt[/color]
+ - [bold][color=#a4885c]Damage resistances:[/color][/bold] [color=red]Blunt[/color], [color=red]Slash[/color] and [color=yellow]Piercing[/color] 25%; [color=orange]Heat[/color] 20%; [color=orange]Caustic[/color] 10%; [color=orange]Explosion[/color] 10% (punk armor)
+ - [bold][color=#a4885c]Special abilities:[/color][/bold] none
+
+ [bold][color=#a4885c]________________________________________________________________________[/color]
+
+
+
+
+ - [bold][color=#a4885c]Health thresholds:[/color][/bold] 100 (crit), 140 (death)
+ - [bold][color=#a4885c]Run speed:[/color][/bold] 4.5 m/s
+ - [bold][color=#a4885c]Damage (type):[/color][/bold] 18 [color=red]Blunt[/color]
+ - [bold][color=#a4885c]Damage resistances:[/color][/bold] [color=red]Blunt[/color], [color=red]Slash[/color] 10%; [color=yellow]Piercing[/color] 60%; [color=orange]Heat[/color] 10%; [color=orange]Explosion[/color] 20% (punk heavy armor)
+ - [bold][color=#a4885c]Special abilities:[/color][/bold] none
+
+ [bold][color=#a4885c]________________________________________________________________________[/color]
+
- - [bold][color=#a4885c]Health thresholds:[/color][/bold] 100 (crit), 130 (death)
- - [bold][color=#a4885c]Run (walk) speed:[/color][/bold] 4.5 m/s (2.5 m/s)
+ - [bold][color=#a4885c]Health thresholds:[/color][/bold] 100 (crit), 140 (death)
+ - [bold][color=#a4885c]Run speed:[/color][/bold] 4 m/s
- [bold][color=#a4885c]Damage (type):[/color][/bold] 16 [color=yellow]Piercing[/color] (.35 round)
- [bold][color=#a4885c]Damage resistances:[/color][/bold] none
- [bold][color=#a4885c]Special abilities:[/color][/bold] Shooter (mk 58)
@@ -37,22 +59,22 @@
- - [bold][color=#a4885c]Health thresholds:[/color][/bold] 100 (crit), 130 (death)
- - [bold][color=#a4885c]Run (walk) speed:[/color][/bold] 4.5 m/s (2.5 m/s)
- - [bold][color=#a4885c]Damage (type):[/color][/bold] 10 [color=yellow]Piercing[/color] (shotgun cartridge)
+ - [bold][color=#a4885c]Health thresholds:[/color][/bold] 100 (crit), 140 (death)
+ - [bold][color=#a4885c]Run speed:[/color][/bold] 4 m/s
+ - [bold][color=#a4885c]Damage (type):[/color][/bold] 10-60 [color=yellow]Piercing[/color] (10 per shotgun pellet)
- [bold][color=#a4885c]Damage resistances:[/color][/bold] none
- [bold][color=#a4885c]Special abilities:[/color][/bold] Shooter (shotgun)
[bold][color=#a4885c]________________________________________________________________________[/color]
-
+
- - [bold][color=#a4885c]Health thresholds:[/color][/bold] 100 (crit), 130 (death)
- - [bold][color=#a4885c]Run (walk) speed:[/color][/bold] 4.5 m/s (2.5 m/s)
- - [bold][color=#a4885c]Damage (type):[/color][/bold] varied 5-20 [color=red]Blunt[/color]/[color=red]Slash[/color]/[color=yellow]Piercing[/color]
+ - [bold][color=#a4885c]Health thresholds:[/color][/bold] 100 (crit), 140 (death)
+ - [bold][color=#a4885c]Run speed:[/color][/bold] 4 m/s
+ - [bold][color=#a4885c]Damage (type):[/color][/bold] 16 [color=yellow]Piercing[/color] (.35 round)
- [bold][color=#a4885c]Damage resistances:[/color][/bold] [color=red]Blunt[/color], [color=red]Slash[/color] and [color=yellow]Piercing[/color] 25%; [color=orange]Heat[/color] 20%; [color=orange]Caustic[/color] 10%; [color=orange]Explosion[/color] 10% (punk armor)
- - [bold][color=#a4885c]Special abilities:[/color][/bold] none
+ - [bold][color=#a4885c]Special abilities:[/color][/bold] Shooter (drozd)
[bold][color=#a4885c]________________________________________________________________________[/color]
@@ -61,20 +83,20 @@
It takes a formidable figure to lead a pack of street trash. These leaders usually wield scavenged SMGs and wear armor taken from unfortunate security forces. Usually high on meth and booze.
-
+
- - [bold][color=#a4885c]Health thresholds:[/color][/bold] 100 (crit), 130 (death)
- - [bold][color=#a4885c]Run (walk) speed:[/color][/bold] 4.5 m/s (2.5 m/s)
- - [bold][color=#a4885c]Damage (type):[/color][/bold] 16 [color=yellow]Piercing[/color] (.35 round)
+ - [bold][color=#a4885c]Health thresholds:[/color][/bold] 100 (crit), 140 (death)
+ - [bold][color=#a4885c]Run speed:[/color][/bold] 4 m/s
+ - [bold][color=#a4885c]Damage (type):[/color][/bold] 17 [color=orange]Heat[/color]
- [bold][color=#a4885c]Damage resistances:[/color][/bold] [color=red]Blunt[/color], [color=red]Slash[/color] 10%; [color=yellow]Piercing[/color] 60%; [color=orange]Heat[/color] 10%; [color=orange]Explosion[/color] 20% (punk heavy armor)
- - [bold][color=#a4885c]Special abilities:[/color][/bold] Shooter (SMG)
+ - [bold][color=#a4885c]Special abilities:[/color][/bold] Shooter (laser rifle)
[bold][color=#a4885c]________________________________________________________________________[/color]
# Mission Objectives
## Elimination
-
+
Eliminate a large and dangerous creature - a [color=#a4885c]punk gang leader[/color] within given time constraints to earn a monetary reward.