Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

More hostile species for expeditions #1329

Merged

Conversation

ErhardSteinhauer
Copy link
Contributor

@ErhardSteinhauer ErhardSteinhauer commented May 3, 2024

About the PR

New species to expedition faction pool:

  • Aberrant flesh. Features sprites by wax391 (discord). Expedition specific version don't breathe and are not affected by low pressure and shouldn't be affected by dangerous/volatile atmos.
  • Argocytes. Expedition specific version has lower health and damage than base game one (those were kinda bs imo), don't breath, shouldn't be affected by dangerous/volatile atmos, can path through airlocks.
  • Dinosaurs. Taken from Dinosaurs! space-wizards/space-station-14#26883 by @Vonsant (I edited ymls though a bit), sprites by belay5 (discord). Changes to original yml were made to allow dinosaurs to survive on planets: they don't breath, shouldn't be affected by dangerous/volatile atmos, can path through airlocks.
  • Mercenaries. Based on this idea thread. Armed with weapons one can obtain from LiberationStation. The mob visuals derived not from gear loadouts but from sprite layering in yml. If this proves to be a viable solution, in time, I'll rework syndicate/cultist/wizards mob in this fashion to cut down entity spam from those mobs.
  • Explorers. Based on this idea thread. Armed with mining tools and gear. The mob visuals derived is mix of loadouts and sprite layering in yml. Supposed to be a beginner friendly enemy, like aberrant flesh or carps.
  • Rogue AI. Challenging enemy: rogue machines can not be killed - only temporary incapacitated (it takes about 2-3 minutes for robot to raise from dead; word of advice keep that diagnostic hud ready), unlike other expedition enemies ranged rogue borgs deal heat damage. Reliable source of machine parts and circuit boards. Sprites for bots were taken from BayStation12 and Goonstation (both are under CC-BY-SA-3.0 afaict, but Goonstation sprite are also NC). Features sprite randomization.

Other major changes:

  • Made expedition specific versions of carps: they don't breath, shouldn't be affected by dangerous/volatile atmos, can path through airlocks and mob range includes sharkminnows.
  • Made expedition specific versions of xenos: they don't breath, shouldn't be affected by dangerous/volatile atmos, can path through airlocks and mob range includes runners.
  • Lowered the cost for Xeno salvageFaction to increase the chance for encountering them on minimal difficulty.
  • Removed artificial reflection from expedition mobs.
  • All expedition mobs now have all access and ability to pry open doors.
  • All expedition mobs and bluespace event mobs (syndicate agents, blood cultists and wizards) got MovementIgnoreGravity.
  • Most of the gear from hostile human NPCs can't be stripped off (in reasonable time).
  • Mobs that have ranged attack can now shoot over railings.

Bundled minor changes:

  • Fixed solution transfer from syndie darts.
  • Cleaned up NPC gloves: removed .rsi files - everything can be done through .yml.
  • Removed Gloves.rar someone left in game files.

New items:

  • IFF strobe: wearable tiny "strobe" - 1 to 3 blinking unshaded pixels. Can be printed from salvage techfab.
  • Turbo laser - 4 retro laser pistols in a single package. Requires 2 hands to wield, slows you down by 30%, has a bit of a spread, fun to shoot. 10% chance to loot one from boss enemies on rogue AI expeditions.
  • Salvage radar - destruction objective for expeditions with explorers enemy faction.
  • Rogue AI Node - destruction objective for expeditions with rogue silicons enemy faction.

Why / Balance

Some enemy variety for expeditions on low/mid difficulties.

How to test

Run expeditions or spawn new mobs.

Media

image
image
image
image
image
image
image
2024-6-05_21 25 12
image
image
image
image

  • I have added screenshots/videos to this PR showcasing its changes ingame

Breaking changes

  • edits to \Resources\Prototypes\Procedural\salvage_factions.yml
  • edits to \Resources\Prototypes\ai_factions.yml
  • moved \Resources\Prototypes\_NF\Entities\Mobs\NPCs\argocyte.yml to \Resources\Prototypes\_NF\Entities\Markers\Spawners\Random\argocyte_mobs.yml because it's spawner.

Changelog
🆑 erhardsteinhauer

  • add: Added hostile mercenaries to expedition enemy faction pool.
  • add: Added hostile salvagers to expedition enemy faction pool.
  • add: Added hostile robots to expedition enemy faction pool.
  • add: Added aberrant flesh to expedition enemy faction pool, new sprites by wax391 (discord).
  • add: Added argocytes to expedition enemy faction pool.
  • add: Added dinosaurs to expedition enemy faction pool. Original mobs by Vonsant, sprites by belay5 (discord).
  • add: Wearable IFF strobe. Can be printed from salvage techfab.
  • add: Turbo laser.
  • fix: Fixed solution transfer from syndie darts.

Copy link
Contributor

github-actions bot commented May 4, 2024

RSI Diff Bot; head commit 2c035df merging into b7822c8
This PR makes changes to 1 or more RSIs. Here is a summary of all changes:

Resources/Textures/_NF/Clothing/Hands/Gloves/npc_guns_visuals/npc_ak.rsi

State Old New Status
equipped-HAND Removed
icon Removed

Resources/Textures/_NF/Clothing/Hands/Gloves/npc_guns_visuals/npc_china_lake.rsi

State Old New Status
equipped-HAND Removed
icon Removed

Resources/Textures/_NF/Clothing/Hands/Gloves/npc_guns_visuals/npc_crossbow.rsi

State Old New Status
equipped-HAND Removed
icon Removed

Resources/Textures/_NF/Clothing/Hands/Gloves/npc_guns_visuals/npc_laser_pistol.rsi

State Old New Status
equipped-HAND Removed
icon Removed

Resources/Textures/_NF/Clothing/Hands/Gloves/npc_guns_visuals/npc_pistol.rsi

State Old New Status
icon Removed

Resources/Textures/_NF/Clothing/Hands/Gloves/npc_guns_visuals/npc_python.rsi

State Old New Status
equipped-HAND Removed
icon Removed

Resources/Textures/_NF/Clothing/Hands/Gloves/npc_guns_visuals/npc_shotgun.rsi

State Old New Status
equipped-HAND Removed
icon Removed

Resources/Textures/_NF/Clothing/Hands/Gloves/npc_guns_visuals/npc_smg.rsi

State Old New Status
equipped-HAND Removed
icon Removed

Resources/Textures/_NF/Clothing/Hands/Gloves/npc_guns_visuals/npc_spray_nozzle.rsi

State Old New Status
equipped-HAND Removed
icon Removed

Resources/Textures/_NF/Clothing/Neck/Misc/mercenary_iff.rsi

State Old New Status
equipped-NECK-off Added
equipped-NECK-on Added
icon-off Added
icon-on Added

Resources/Textures/_NF/Mobs/Aliens/flesh.rsi

State Old New Status
clamp Added
dead Added
golem Added
golem2 Added
horror Added
jared Added
lover Added
maw Added
spike Added

Resources/Textures/_NF/Mobs/Dinosaurs/anki.rsi

State Old New Status
anki Added
anki_dead Added

Resources/Textures/_NF/Mobs/Dinosaurs/compy.rsi

State Old New Status
compy Added
compy_dead Added

Resources/Textures/_NF/Mobs/Dinosaurs/dilo.rsi

State Old New Status
dilo Added
dilo_dead Added

Resources/Textures/_NF/Mobs/Dinosaurs/kentro.rsi

State Old New Status
kentro Added
kentro_dead Added

Resources/Textures/_NF/Mobs/Dinosaurs/para.rsi

State Old New Status
para Added
para_dead Added

Resources/Textures/_NF/Mobs/Dinosaurs/raptor.rsi

State Old New Status
raptor Added
raptor_dead Added

Resources/Textures/_NF/Mobs/Dinosaurs/spino.rsi

State Old New Status
spino Added
spino_dead Added

Resources/Textures/_NF/Mobs/Dinosaurs/stego.rsi

State Old New Status
stego Added
stego_dead Added

Resources/Textures/_NF/Mobs/Dinosaurs/trex.rsi

State Old New Status
trex Added
trex_dead Added

Resources/Textures/_NF/Mobs/Dinosaurs/trike.rsi

State Old New Status
trike Added
trike_dead Added

Resources/Textures/_NF/Mobs/RogueSilicons/ancient.rsi

State Old New Status
base Added
decor_01 Added
decor_02 Added
eyes Added

Resources/Textures/_NF/Mobs/RogueSilicons/drones.rsi

State Old New Status
base Added
base_eyes Added
decor_department Added
decor_department_accent Added
destroyed Added

Resources/Textures/_NF/Mobs/RogueSilicons/netguardian.rsi

State Old New Status
crash Added
netguardian Added
netguardian_emissive Added
rockets Added
scan Added

Resources/Textures/_NF/Mobs/RogueSilicons/robots.rsi

State Old New Status
body_generic Added
body_light Added
body_servo Added
decor_body_gibs Added
decor_head_body_gibs Added
decor_head_gibs Added
head_generic Added
head_generic_eye Added
head_heavy Added
head_heavy_eye Added
head_light Added
head_light_eye Added
head_servo Added
head_servo_eye Added
head_sturdy Added
head_sturdy_eye Added
l_arm_generic Added
l_arm_heavy Added
l_arm_light Added
l_arm_servo Added
l_arm_sturdy Added
l_leg_generic Added
l_leg_light Added
l_leg_servo Added
l_leg_thruster Added
l_leg_treads Added
leg_thruster Added
leg_treads Added
mask_null Added
overlay_critdmg Added
overlay_l_arm_claws Added
overlay_lr_arm_claws Added
overlay_meson Added
overlay_openbrain Added
overlay_openbrainless Added
overlay_opencell Added
overlay_openmodule Added
overlay_openpanel Added
overlay_openupgrade Added
overlay_openwires Added
overlay_r_arm_claws Added
overlay_thermal Added
r_arm_generic Added
r_arm_heavy Added
r_arm_light Added
r_arm_servo Added
r_arm_sturdy Added
r_leg_generic Added
r_leg_light Added
r_leg_servo Added
r_leg_thruster Added
r_leg_treads Added

Resources/Textures/_NF/Mobs/Species/Templates/human.rsi

State Old New Status
human Added
icon Added

Resources/Textures/_NF/Objects/Tools/bundles.rsi

State Old New Status
engi-base Added
engi-inhand-left Added
engi-inhand-right Added
mask_null Added

Resources/Textures/_NF/Objects/Weapons/Guns/Battery/turbo_laser.rsi

State Old New Status
charge-level-unshaded-0 Added
charge-level-unshaded-1 Added
charge-level-unshaded-2 Added
charge-level-unshaded-3 Added
charge-level-unshaded-4 Added
charge-level-unshaded-5 Added
equipped-back Added
equipped-unshaded Added
icon-base Added
inhand-left-unshaded Added
inhand-left Added
inhand-right-unshaded Added
inhand-right Added

Resources/Textures/_NF/Structures/Specific/Explorers/salvageradar.rsi

State Old New Status
base Added
unshaded Added

Resources/Textures/_NF/Structures/Specific/RogueSilicons/ai_node.rsi

State Old New Status
base Added
unshaded Added

Edit: diff updated after 2c035df

@ErhardSteinhauer ErhardSteinhauer marked this pull request as ready for review May 5, 2024 00:43
@ErhardSteinhauer
Copy link
Contributor Author

Come to think of it, going to wait until this PR is merged: #1333

@ErhardSteinhauer ErhardSteinhauer marked this pull request as draft May 5, 2024 01:40
@dvir001 dvir001 added the S: Awaiting Changes This PR has changes that need to be made before merging label May 5, 2024
@Vonsant
Copy link
Contributor

Vonsant commented May 8, 2024

May i add my closed PR from Wizard with Dinosaurs?
space-wizards/space-station-14#26883
I think they will be good at expeditions. Maybe.

@ErhardSteinhauer
Copy link
Contributor Author

May i add my closed PR from Wizard with Dinosaurs? space-wizards/space-station-14#26883 I think they will be good at expeditions. Maybe.

I like the idea of dinosaurs in expeds as alternative to xenos for example, but I'm not diggin' those sprites. I'm sure someone of volunteer spriters might be on board with redrawing them. But regardless I'll start preppin' ymls for dinos.

@dvir001
Copy link
Contributor

dvir001 commented May 8, 2024

May i add my closed PR from Wizard with Dinosaurs? space-wizards/space-station-14#26883 I think they will be good at expeditions. Maybe.

Please do, we will love to have them, but I agree with Erhard that they might need a bit of style edit.

Either way we can add them and edit later if need be.

@ErhardSteinhauer
Copy link
Contributor Author

Either way we can add them and edit later if need be.

True that. Guess I'll grab sprites then.

@Vonsant
Copy link
Contributor

Vonsant commented May 8, 2024

True that. Guess I'll grab sprites then.

Thanks a lot. What should i do right now? Redo my PR here, or you just take a sprite by youreself?
(My english not so good).

@ErhardSteinhauer
Copy link
Contributor Author

ErhardSteinhauer commented May 8, 2024

True that. Guess I'll grab sprites then.

Thanks a lot. What should i do right now? Redo my PR here, or you just take a sprite by youreself? (My english not so good).

I already took 'em. Gonna add to this PR. Naturally credits for dinos will go to you (although I'll change ymls a bit because I have general prototype for mobs).

@github-actions github-actions bot added the S: Merge Conflict This PR has conflicts that prevent merging label May 15, 2024
Copy link
Contributor

This pull request has conflicts, please resolve those before we can evaluate the pull request.

@ErhardSteinhauer
Copy link
Contributor Author

ErhardSteinhauer commented Jun 11, 2024

Added one more faction - Rogue AIs, well, rather crude draft of the faction, but functional in its current state and kinda fun from testing. Gonna flesh it out sometime later.

Probably should draw the line here - no more adding new stuff to this PR - only fixes, otherwise there will be no end to fiddling.

@Vonsant

This comment was marked as off-topic.

Copy link
Contributor

@dvir001 dvir001 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Cannot find any major issues with this 200+ files PR
After small fixups

@dvir001 dvir001 dismissed whatston3’s stale review June 12, 2024 10:42

All was updated

@dvir001 dvir001 merged commit 116945a into new-frontiers-14:master Jun 12, 2024
14 checks passed
FrontierATC added a commit that referenced this pull request Jun 12, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants