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 63bf10b5733..f934fe80eb5 100644 --- a/Resources/Prototypes/_NF/Catalog/Fills/Backpacks/npc_loot_explorers.yml +++ b/Resources/Prototypes/_NF/Catalog/Fills/Backpacks/npc_loot_explorers.yml @@ -263,9 +263,9 @@ - id: SpaceCash2500 prob: 0.2 # Weapons - - id: WeaponProtoKineticAcceleratorSawn - prob: 0.4 - amount: 2 + - id: EnergyPickaxeNF + prob: 0.1 + amount: 1 # Armor - id: ClothingOuterHardsuitMaximPrototype prob: 0.1 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 e3e1f80bb7e..e350bea8d2c 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 @@ -409,3 +409,20 @@ state: inhand-left - sprite: _NF/Objects/Weapons/Guns/Basic/sawn_kinetic_accelerator.rsi state: inhand-right + +- type: entity + parent: ClothingHandsGlovesColorBlackSMG + id: ClothingHandsGlovesWeaponEnergyPickaxe + name: wielded weapon + suffix: energy pickaxe + noSpawn: true + 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" 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 458f047703a..d28b841b419 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 @@ -427,10 +427,13 @@ name: explorer captain parent: - MobExplorerBase + - MobHumanoidHostileAISimpleMelee id: MobExplorerBoss description: Fearless and battle-hardened salvage team leaders, it takes years picking through the darkest corners of space and navigating the galaxy's criminal underbelly of the galaxy before you can become a captain. Not to be underestimated. noSpawn: true components: + - type: Reflect # Emulating holopickaxe to a degree + reflectProb: 0.025 - type: Loadout prototypes: - MobHumanoidExplorerGearBoss @@ -447,23 +450,6 @@ state: equipped-head-light shader: unshaded color: "#47f8ff" - - type: RechargeBasicEntityAmmo - rechargeCooldown: 0.375 - rechargeSound: - path: /Audio/Weapons/Guns/MagIn/kinetic_reload.ogg - - type: BasicEntityAmmoProvider - proto: BulletKinetic - capacity: 2 - count: 2 - - type: Gun - showExamineText: false - fireRate: 5 - selectedMode: FullAuto - minAngle: 41 - maxAngle: 55 - availableModes: - - FullAuto - soundGunshot: /Audio/Weapons/Guns/Gunshots/kinetic_accel.ogg - type: PointLight enabled: true autoRot: true @@ -472,3 +458,27 @@ energy: 3 mask: /Textures/Effects/LightMasks/cone.png color: "#47f8ff" + - type: MobThresholds + thresholds: + 120: Critical + 150: Dead + - type: SlowOnDamage + speedModifierThresholds: + 60: 0.7 + 80: 0.5 + - type: MovementSpeedModifier + baseWalkSpeed: 4 + baseSprintSpeed: 5.25 + - type: MeleeWeapon + hidden: true + attackRate: 0.8 + damage: + types: + Heat: 12.5 + Piercing: 2.5 + Structural: 40 + soundHit: + path: /Audio/Weapons/eblade1.ogg + params: + variation: 0.250 + volume: -10 diff --git a/Resources/Prototypes/_NF/Entities/Objects/Weapons/Melee/e_pickaxe.yml b/Resources/Prototypes/_NF/Entities/Objects/Weapons/Melee/e_pickaxe.yml new file mode 100644 index 00000000000..a1128bebfe6 --- /dev/null +++ b/Resources/Prototypes/_NF/Entities/Objects/Weapons/Melee/e_pickaxe.yml @@ -0,0 +1,53 @@ +- type: entity + id: EnergyPickaxeNF + parent: EnergySword # 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. + components: + - type: ItemToggleSize + activatedSize: Huge + activatedShape: + - 0,0,2,0 + - 1,1,1,2 + - type: ItemToggleMeleeWeapon + activatedDamage: + types: # Slightly less total damage than wielded crusher glaive has + Heat: 8 + Piercing: 2 + Structural: 40 # +10 damage compared to crusher glaive + deactivatedSecret: true + - type: Sprite + sprite: _NF/Objects/Weapons/Melee/energy_pickaxe.rsi + layers: + - state: e-pickaxe + - state: e-pickaxe-blade + color: "#e95151" + visible: false + shader: unshaded + map: [ "blade" ] + - type: Item + sprite: _NF/Objects/Weapons/Melee/energy_pickaxe.rsi + storedRotation: -45 + - type: Clothing + sprite: _NF/Objects/Weapons/Melee/energy_pickaxe.rsi + quickEquip: false + slots: + - Belt + - back + - suitStorage + - type: ToggleableLightVisuals + spriteLayer: blade + inhandVisuals: + left: + - state: inhand-left-blade + shader: unshaded + right: + - state: inhand-right-blade + shader: unshaded + - type: Reflect # Explicitly specified the value (the default one from the parent might be too high) + reflectProb: 0.05 + - type: Tag + tags: + - Pickaxe + - type: StaticPrice + price: 200 diff --git a/Resources/Prototypes/_NF/Roles/Jobs/Hostile/explorers.yml b/Resources/Prototypes/_NF/Roles/Jobs/Hostile/explorers.yml index 512c92c279b..52302cd4d94 100644 --- a/Resources/Prototypes/_NF/Roles/Jobs/Hostile/explorers.yml +++ b/Resources/Prototypes/_NF/Roles/Jobs/Hostile/explorers.yml @@ -71,7 +71,7 @@ - type: startingGear id: MobHumanoidExplorerGearBoss equipment: - gloves: ClothingHandsGlovesWeaponSawnOffPkas + gloves: ClothingHandsGlovesWeaponEnergyPickaxe outerClothing: ClothingOuterHardsuitMaximPrototype back: ClothingBackpackExplorerBoss belt: ConstructionBag diff --git a/Resources/ServerInfo/_NF/Guidebook/MobsHostileExpedition/explorers.xml b/Resources/ServerInfo/_NF/Guidebook/MobsHostileExpedition/explorers.xml index 4264fc3e935..25219e1e812 100644 --- a/Resources/ServerInfo/_NF/Guidebook/MobsHostileExpedition/explorers.xml +++ b/Resources/ServerInfo/_NF/Guidebook/MobsHostileExpedition/explorers.xml @@ -1,15 +1,15 @@ # Explorers - + These foolhardy souls scavenge through ruins for the promise of loot and high adventure, similar to you. Unlike you, however, they do not possess the license to operate in NT-controlled space. Exterminate with prejudice. - + [bold][color=#a4885c]________________________________________________________________________[/color] - + # Known Variants # "Looter" - + Armed with a trusty pickaxe and greed, every group needs its grunts. - + @@ -18,30 +18,30 @@ - [bold][color=#a4885c]Damage (type):[/color][/bold] 7.5 [color=red]Blunt[/color], 7.5 [color=yellow]Piercing[/color] - [bold][color=#a4885c]Damage resistances:[/color][/bold] none - [bold][color=#a4885c]Special abilities:[/color][/bold] none - + [bold][color=#a4885c]*[/color][/bold] - [italic]an average human can run at 4.5 m/s and walk at 2.5 m/s.[/italic] - + [bold][color=#a4885c]________________________________________________________________________[/color] - + # "Scrapper" - + Proto-kinetic accelerator in one hand, flashlight in the other, beer in the belly. That's how you explore. - + - [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 (type):[/color][/bold] 20 [color=red]Blunt[/color] - [bold][color=#a4885c]Damage resistances:[/color][/bold] none - [bold][color=#a4885c]Special abilities:[/color][/bold] Shooter (unwielded PKA) - + [bold][color=#a4885c]________________________________________________________________________[/color] - + # "Scavenger" - + A looter that scavenged enough coins to afford some decent equipment. - + @@ -50,28 +50,28 @@ - [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]Special abilities:[/color][/bold] none - + [bold][color=#a4885c]________________________________________________________________________[/color] - + # "Salvager" - + 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. - + - [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 (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]________________________________________________________________________[/color] - + # "Miner" - + Drilling in the name of... drilling. No rock formation can withstand the power of dual-wielded mining drills - good thing you aren't a rock. - + @@ -80,30 +80,30 @@ - [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]Special abilities:[/color][/bold] none - + [bold][color=#a4885c]________________________________________________________________________[/color] - + # "Explorer" - + Veteran scrappers, these salvagers are wealthy enough to explore abandoned ruins for the adrenaline rush and adventure alone. - + - [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 (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]Special abilities:[/color][/bold] Shooter (wielded PKA) - + [bold][color=#a4885c]________________________________________________________________________[/color] - + # "Hauler" - + Loaded with heavy equipment for industrial-scale looting. Pardon me, "asset recovery". - + [color=#a4885c]Immunity[/color]: invulnerable to specific types of damage. - + @@ -113,34 +113,34 @@ - [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]) - + [bold][color=#a4885c]________________________________________________________________________[/color] - + # "Explorer captain" Fearless and battle-hardened salvage team leaders, it takes years picking through the darkest corners of space and navigating the galaxy's criminal underbelly of the galaxy before you can become a captain. Not to be underestimated. - + - - [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] 25%; [color=orange]Heat[/color] 20%; [color=orange]Caustic[/color] 10% - - [bold][color=#a4885c]Special abilities:[/color][/bold] Shooter (dual sawn-off PKA) - + - [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]Special abilities: Deflection (2.5%) + [bold][color=#a4885c]________________________________________________________________________[/color] - + # Mission Objectives ## Elimination Eliminate a large and dangerous creature - an [color=#a4885c]explorer captain[/color] within given time constraints to earn a monetary reward. - + ## Destruction Destroy a certain number of [color=#a4885c]salvage radars[/color] within given time constraints to earn a monetary reward. - \ No newline at end of file + diff --git a/Resources/Textures/_NF/Objects/Weapons/Melee/energy_pickaxe.rsi/e-pickaxe-blade.png b/Resources/Textures/_NF/Objects/Weapons/Melee/energy_pickaxe.rsi/e-pickaxe-blade.png new file mode 100644 index 00000000000..6f1c5747bd8 Binary files /dev/null and b/Resources/Textures/_NF/Objects/Weapons/Melee/energy_pickaxe.rsi/e-pickaxe-blade.png differ diff --git a/Resources/Textures/_NF/Objects/Weapons/Melee/energy_pickaxe.rsi/e-pickaxe.png b/Resources/Textures/_NF/Objects/Weapons/Melee/energy_pickaxe.rsi/e-pickaxe.png new file mode 100644 index 00000000000..a1313c24197 Binary files /dev/null and b/Resources/Textures/_NF/Objects/Weapons/Melee/energy_pickaxe.rsi/e-pickaxe.png differ diff --git a/Resources/Textures/_NF/Objects/Weapons/Melee/energy_pickaxe.rsi/equipped-BACKPACK.png b/Resources/Textures/_NF/Objects/Weapons/Melee/energy_pickaxe.rsi/equipped-BACKPACK.png new file mode 100644 index 00000000000..2989f6964f4 Binary files /dev/null and b/Resources/Textures/_NF/Objects/Weapons/Melee/energy_pickaxe.rsi/equipped-BACKPACK.png differ diff --git a/Resources/Textures/_NF/Objects/Weapons/Melee/energy_pickaxe.rsi/equipped-BELT.png b/Resources/Textures/_NF/Objects/Weapons/Melee/energy_pickaxe.rsi/equipped-BELT.png new file mode 100644 index 00000000000..bc68efa1fe8 Binary files /dev/null and b/Resources/Textures/_NF/Objects/Weapons/Melee/energy_pickaxe.rsi/equipped-BELT.png differ diff --git a/Resources/Textures/_NF/Objects/Weapons/Melee/energy_pickaxe.rsi/equipped-SUITSTORAGE.png b/Resources/Textures/_NF/Objects/Weapons/Melee/energy_pickaxe.rsi/equipped-SUITSTORAGE.png new file mode 100644 index 00000000000..533d0293b72 Binary files /dev/null and b/Resources/Textures/_NF/Objects/Weapons/Melee/energy_pickaxe.rsi/equipped-SUITSTORAGE.png differ diff --git a/Resources/Textures/_NF/Objects/Weapons/Melee/energy_pickaxe.rsi/icon.png b/Resources/Textures/_NF/Objects/Weapons/Melee/energy_pickaxe.rsi/icon.png new file mode 100644 index 00000000000..e2427659778 Binary files /dev/null and b/Resources/Textures/_NF/Objects/Weapons/Melee/energy_pickaxe.rsi/icon.png differ diff --git a/Resources/Textures/_NF/Objects/Weapons/Melee/energy_pickaxe.rsi/inhand-left-blade.png b/Resources/Textures/_NF/Objects/Weapons/Melee/energy_pickaxe.rsi/inhand-left-blade.png new file mode 100644 index 00000000000..d319a5e41e4 Binary files /dev/null and b/Resources/Textures/_NF/Objects/Weapons/Melee/energy_pickaxe.rsi/inhand-left-blade.png differ diff --git a/Resources/Textures/_NF/Objects/Weapons/Melee/energy_pickaxe.rsi/inhand-left.png b/Resources/Textures/_NF/Objects/Weapons/Melee/energy_pickaxe.rsi/inhand-left.png new file mode 100644 index 00000000000..739cffe6d46 Binary files /dev/null and b/Resources/Textures/_NF/Objects/Weapons/Melee/energy_pickaxe.rsi/inhand-left.png differ diff --git a/Resources/Textures/_NF/Objects/Weapons/Melee/energy_pickaxe.rsi/inhand-right-blade.png b/Resources/Textures/_NF/Objects/Weapons/Melee/energy_pickaxe.rsi/inhand-right-blade.png new file mode 100644 index 00000000000..f87cac2c3b5 Binary files /dev/null and b/Resources/Textures/_NF/Objects/Weapons/Melee/energy_pickaxe.rsi/inhand-right-blade.png differ diff --git a/Resources/Textures/_NF/Objects/Weapons/Melee/energy_pickaxe.rsi/inhand-right.png b/Resources/Textures/_NF/Objects/Weapons/Melee/energy_pickaxe.rsi/inhand-right.png new file mode 100644 index 00000000000..d1684dd1040 Binary files /dev/null and b/Resources/Textures/_NF/Objects/Weapons/Melee/energy_pickaxe.rsi/inhand-right.png differ diff --git a/Resources/Textures/_NF/Objects/Weapons/Melee/energy_pickaxe.rsi/meta.json b/Resources/Textures/_NF/Objects/Weapons/Melee/energy_pickaxe.rsi/meta.json new file mode 100644 index 00000000000..0298bb6e8d8 --- /dev/null +++ b/Resources/Textures/_NF/Objects/Weapons/Melee/energy_pickaxe.rsi/meta.json @@ -0,0 +1,66 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/pull/29929/commits/8c0509a4725602d0be2e9a7b29b556a39fb5cca2 | Resprited by erhardsteinhauer (discord/github)", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "e-pickaxe" + }, + { + "name": "e-pickaxe-blade", + "delays": + [ + [ 0.1, 0.1 ] + ] + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-left-blade", + "directions": 4, + "delays": + [ + [ 0.1, 0.1 ], + [ 0.1, 0.1 ], + [ 0.1, 0.1 ], + [ 0.1, 0.1 ] + ] + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "inhand-right-blade", + "directions": 4, + "delays": + [ + [ 0.1, 0.1 ], + [ 0.1, 0.1 ], + [ 0.1, 0.1 ], + [ 0.1, 0.1 ] + ] + }, + { + "name": "equipped-BACKPACK", + "directions": 4 + }, + { + "name": "equipped-BELT", + "directions": 4 + }, + { + "name": "equipped-SUITSTORAGE", + "directions": 4 + } + ] +}