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

Cyberpunk themed clothes and armor #1262

Merged
merged 123 commits into from
Jun 16, 2024

Conversation

ErhardSteinhauer
Copy link
Contributor

@ErhardSteinhauer ErhardSteinhauer commented Apr 23, 2024

About the PR

In draft until #1329 and #1338 merged

Things added:

  • More jackets and coats with somewhat (cyber)punkish/bladerunnery vibes.
  • Procedurally generated punkish jumpsuits, jackets, armor vests, belts gas masks, glasses and boots. No helmets though - messes up hair and y'all know how expensive that space hair gel is out here.
  • New clothes are available through loadouts system.
  • Vandalized versions of ClothesMate (ThreadsChoom) and BountyVend (BonanzaMatic) filled with new clothing articles and armor.
  • Space punk gangoons.
  • Holograffities and special projector that allows you to put graffities on walls, windows, vendomats, terminals.
  • New accent, based on slang terms from Cyberpunk 2020 TTRPG, Cyberpunk 2077, Shadowrun 5e TTRPG and Informal Contractions.

Bundled changes:

  • Moved full auto capable guns from T2 to T3+ expedition spawners

To Do

  • New vendomat where one can get new clothes.
  • More clothes.
  • Graffiti holoprojector.
  • More graffiti. Pushed the number to 43 in total. Should suffice for now.
  • Goggles.
  • Glowing gas masks.
  • Improve procedural armor visuals.
  • More loadout variants for gangers.
  • Salvage expedition faction.
  • Further randomize loot from expedition mobs.
  • Add some clothes to loadouts.

Why / Balance

More drip

How to test

Spawn new items, wear.
Spawn graffiti holoprojector, apply it to various surfaces.

Media

Clothes and armor

Jackets
image
Armor and jumpsuits
image
Goggles, infoshades, halfmasks, webbings and boots
image

Graffiti

2024-5-07_15 10 33
2024-5-08_10 36 34

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

Breaking changes

none afaik

Known issues

  • Randomized visuals don't support icons and inhand sprites (or rather there is no way of synchronizing randomly picked colors between worn sprites and icons/inhand sprites afaik), so procedurally generated clothing articles don't come with normal icons or inhand sprites.

Changelog
🆑 erhardsteinhauer

  • add: Added more questionable clothing choices for fashion enjoyers: jumpsuits, jackets, armor vests, glasses, gasmasks and belts. Check your loadouts.
  • add: Added holograffiti projector.
  • add: It is now possible to encounter bands of gangers planetside.
  • add: Added new accent - Street Punk.

Copy link
Contributor

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

@github-actions github-actions bot added S: Merge Conflict This PR has conflicts that prevent merging Sprites YML C# FTL and removed S: Merge Conflict This PR has conflicts that prevent merging labels Apr 23, 2024
Copy link
Contributor

github-actions bot commented Apr 23, 2024

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

Resources/Textures/_NF/Clothing/Belt/punk.rsi

State Old New Status
base_belt_01 Added
decor_base_belt_01 Added
decor_base_belt_02 Added
decor_base_belt_03 Added
decor_base_belt_04 Added
decor_base_belt_05 Added
inhand-left Added
inhand-right Added
mask_null Added

Resources/Textures/_NF/Clothing/Eyes/Glasses/punk_glasses.rsi

State Old New Status
base_glasses_01 Added
base_glasses_02 Added
decor_base_glasses_01 Added
decor_base_glasses_02 Added
icon_base_glasses_01 Added
icon_base_glasses_02 Added
icon_decor_base_glasses_01 Added
icon_decor_base_glasses_02 Added
inhand-left Added
inhand-right Added

Resources/Textures/_NF/Clothing/Head/Hoods/Coat/acid_raincoat.rsi

State Old New Status
equipped-HELMET Added
icon Added

Resources/Textures/_NF/Clothing/Head/Hoods/Coat/acid_raincoat_blue.rsi

State Old New Status
equipped-HELMET Added
icon Added

Resources/Textures/_NF/Clothing/Head/Hoods/Coat/acid_raincoat_green.rsi

State Old New Status
equipped-HELMET Added
icon Added

Resources/Textures/_NF/Clothing/Head/Hoods/Coat/acid_raincoat_magenta.rsi

State Old New Status
equipped-HELMET Added
icon Added

Resources/Textures/_NF/Clothing/Head/Hoods/Coat/acid_raincoat_yellow.rsi

State Old New Status
equipped-HELMET Added
icon Added

Resources/Textures/_NF/Clothing/Mask/punkhalfmask.rsi

State Old New Status
base_halfmask_01 Added
decor_base_halfmask_01 Added
inhand-left Added
inhand-right Added

Resources/Textures/_NF/Clothing/OuterClothing/Armor/bulletproof_vest_green.rsi

State Old New Status
equipped-OUTERCLOTHING Added
icon Added
inhand-left Added
inhand-right Added

Resources/Textures/_NF/Clothing/OuterClothing/Armor/bulletproof_vest_orange.rsi

State Old New Status
equipped-OUTERCLOTHING Added
icon Added
inhand-left Added
inhand-right Added

Resources/Textures/_NF/Clothing/OuterClothing/Armor/bulletproof_vest_procedural.rsi

State Old New Status
base_OuterClothing_armor_01 Added
base_OuterClothing_armor_02 Added
base_OuterClothing_armor_03 Added
base_OuterClothing_armor_04 Added
base_OuterClothing_armor_05 Added
decor_base_OuterClothing_armor_01 Added
decor_base_OuterClothing_armor_02 Added
decor_base_OuterClothing_armor_03 Added
decor_base_OuterClothing_armor_04 Added
decor_base_OuterClothing_armor_05 Added
decor_base_OuterClothing_armor_06 Added
icon_armor_01 Added
icon_armor_02 Added
icon_armor_03 Added
icon_armor_04 Added
icon_armor_05 Added
inhand-left Added
inhand-right Added
mask_null Added
overlay_base_OuterClothing_armor_01 Added
overlay_base_OuterClothing_armor_02 Added
overlay_base_OuterClothing_armor_03 Added
overlay_base_OuterClothing_armor_04 Added

Resources/Textures/_NF/Clothing/OuterClothing/Armor/bulletproof_vest_procedural_elite.rsi

State Old New Status
base_OuterClothing_armor_01 Added
decor_base_OuterClothing_armor_01 Added
decor_base_OuterClothing_armor_02 Added
decor_base_OuterClothing_armor_03 Added
decor_base_OuterClothing_armor_04 Added
decor_base_OuterClothing_armor_05 Added
mask_null Added
overlay_base_OuterClothing_armor_01 Added

Resources/Textures/_NF/Clothing/OuterClothing/Armor/bulletproof_vest_red.rsi

State Old New Status
equipped-OUTERCLOTHING Added
icon Added
inhand-left Added
inhand-right Added

Resources/Textures/_NF/Clothing/OuterClothing/Coats/acid_raincoat.rsi

State Old New Status
equipped-OUTERCLOTHING Added
icon Added
inhand-left Added
inhand-right Added

Resources/Textures/_NF/Clothing/OuterClothing/Coats/acid_raincoat_blue.rsi

State Old New Status
equipped-OUTERCLOTHING Added
icon Added
inhand-left Added
inhand-right Added

Resources/Textures/_NF/Clothing/OuterClothing/Coats/acid_raincoat_green.rsi

State Old New Status
equipped-OUTERCLOTHING Added
icon Added
inhand-left Added
inhand-right Added

Resources/Textures/_NF/Clothing/OuterClothing/Coats/acid_raincoat_magenta.rsi

State Old New Status
equipped-OUTERCLOTHING Added
icon Added
inhand-left Added
inhand-right Added

Resources/Textures/_NF/Clothing/OuterClothing/Coats/acid_raincoat_yellow.rsi

State Old New Status
equipped-OUTERCLOTHING Added
icon Added
inhand-left Added
inhand-right Added

Resources/Textures/_NF/Clothing/OuterClothing/Coats/blazer_jamrock.rsi

State Old New Status
equipped-OUTERCLOTHING Added
icon Added
inhand-left Added
inhand-right Added

Resources/Textures/_NF/Clothing/OuterClothing/Coats/bomber_aerostatic.rsi

State Old New Status
equipped-OUTERCLOTHING Added
icon Added
inhand-left Added
inhand-right Added

Resources/Textures/_NF/Clothing/OuterClothing/Coats/bomber_pinksleeves.rsi

State Old New Status
equipped-OUTERCLOTHING Added
icon Added
inhand-left Added
inhand-right Added

Resources/Textures/_NF/Clothing/OuterClothing/Coats/bomber_punk_red.rsi

State Old New Status
equipped-OUTERCLOTHING Added
icon Added
inhand-left Added
inhand-right Added

Resources/Textures/_NF/Clothing/OuterClothing/Coats/jacket_biker.rsi

State Old New Status
equipped-OUTERCLOTHING Added
icon Added
inhand-left Added
inhand-right Added

Resources/Textures/_NF/Clothing/OuterClothing/Coats/jacket_leather.rsi

State Old New Status
equipped-OUTERCLOTHING Added
icon Added
inhand-left Added
inhand-right Added

Resources/Textures/_NF/Clothing/OuterClothing/Coats/jacket_letterman_blue.rsi

State Old New Status
equipped-OUTERCLOTHING Added
icon Added
inhand-left Added
inhand-right Added

Resources/Textures/_NF/Clothing/OuterClothing/Coats/jacket_letterman_brown.rsi

State Old New Status
equipped-OUTERCLOTHING Added
icon Added
inhand-left Added
inhand-right Added

Resources/Textures/_NF/Clothing/OuterClothing/Coats/jacket_letterman_magenta.rsi

State Old New Status
equipped-OUTERCLOTHING Added
icon Added
inhand-left Added
inhand-right Added

Resources/Textures/_NF/Clothing/OuterClothing/Coats/jacket_letterman_red.rsi

State Old New Status
equipped-OUTERCLOTHING Added
icon Added
inhand-left Added
inhand-right Added

Resources/Textures/_NF/Clothing/OuterClothing/Coats/jacket_procedural.rsi

State Old New Status
base_OuterClothing_jacket_01 Added
base_OuterClothing_jacket_02 Added
base_OuterClothing_jacket_03 Added
base_OuterClothing_jacket_04 Added
base_OuterClothing_letterman Added
decor_base_OuterClothing_jacket_01 Added
decor_base_OuterClothing_jacket_02 Added
decor_base_OuterClothing_letterman Added
inhand-left Added
inhand-right Added
mask_null Added
overlay_base_OuterClothing_jacket_01 Added
overlay_base_OuterClothing_jacket_02 Added
overlay_base_OuterClothing_jacket_03 Added
overlay_base_OuterClothing_jacket_04 Added
overlay_base_OuterClothing_jacket_05 Added
overlay_base_OuterClothing_jacket_06 Added
overlay_base_OuterClothing_jacket_07 Added

Resources/Textures/_NF/Clothing/Shoes/Boots/punk.rsi

State Old New Status
base_boots_01 Added
decor_base_boots_01 Added
decor_base_boots_02 Added
inhand-left Added
inhand-right Added
mask_null Added

Resources/Textures/_NF/Clothing/Uniforms/punk_procedural.rsi

State Old New Status
base_leg_short Added
base_leg_standard Added
base_torso_armless Added
base_torso_croptop_armless Added
decor_base_leg_short_01 Added
decor_base_leg_short_02 Added
decor_base_leg_short_03 Added
decor_base_leg_short_04 Added
decor_base_leg_standard_01 Added
decor_base_leg_standard_02 Added
decor_base_leg_standard_03 Added
decor_base_leg_standard_04 Added
decor_base_leg_standard_05 Added
decor_base_torso_croptop_armless_01 Added
decor_base_torso_croptop_armless_02 Added
decor_base_torso_croptop_armless_03 Added
inhand-left Added
inhand-right Added
mask_null Added

Resources/Textures/_NF/Objects/Devices/Holoprojectors/graffiti.rsi

State Old New Status
icon Added

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

State Old New Status
flashlight-on Added
flashlight-overlay Added
flashlight Added
folded Added
inhand-left-light Added
inhand-left Added
inhand-right-light Added
inhand-right Added

Resources/Textures/_NF/Structures/Holo/graffiti/highlighted.rsi

State Old New Status
holograffiti01 Added
holograffiti02 Added
holograffiti03 Added
holograffiti04 Added
holograffiti05 Added
holograffiti06 Added
holograffiti07 Added
holograffiti08 Added
holograffiti09 Added
holograffiti10 Added
holograffiti11 Added
holograffiti12 Added
holograffiti13 Added
holograffiti14 Added
holograffiti15 Added
holograffiti16 Added
holograffiti17 Added
holograffiti18 Added
holograffiti19 Added
holograffiti20 Added

Edit: diff updated after f5d3e1a

Copy link
Contributor

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

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

I'm digging the letterman jackets. Good stuff

@ErhardSteinhauer
Copy link
Contributor Author

ErhardSteinhauer commented Apr 23, 2024

I'm digging the letterman jackets. Good stuff

ngl, out of all things I've added in this PR so far, my personal fav is magenta letterman jacket

@ErhardSteinhauer ErhardSteinhauer changed the title More drip (PRing to resolve merge conflicts after upstream merge) Cyberpunk themed clothes and armor (WIP) Apr 25, 2024
Copy link
Contributor

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

@github-actions github-actions bot added the S: Merge Conflict This PR has conflicts that prevent merging label Apr 27, 2024
@github-actions github-actions bot removed the S: Merge Conflict This PR has conflicts that prevent merging label Apr 27, 2024
@ErhardSteinhauer
Copy link
Contributor Author

I'd also say that picking the goggles/belt up when they get put on the ground is a little annoying, but not awful.

It is, yeah. I probably can add generic icons for glasses/belt, but I don't think there is a way to sync colors between sprites.

@ErhardSteinhauer
Copy link
Contributor Author

I'd also say that picking the goggles/belt up when they get put on the ground is a little annoying, but not awful.

It is, yeah. I probably can add generic icons for glasses/belt, but I don't think there is a way to sync colors between sprites.

But I don't know really. The problem with generic icons in their current state that those wont represent how the item will look on the character, which imo when it comes to drip is more important than anything.

@ErhardSteinhauer
Copy link
Contributor Author

I'd also say that picking the goggles/belt up when they get put on the ground is a little annoying, but not awful.

It is, yeah. I probably can add generic icons for glasses/belt, but I don't think there is a way to sync colors between sprites.

Right, I got the idea: I can increase the scale of the icon sprite. That way it'll become more visible while retaining the colors.

@ErhardSteinhauer
Copy link
Contributor Author

I'd also say that picking the goggles/belt up when they get put on the ground is a little annoying, but not awful.

It is, yeah. I probably can add generic icons for glasses/belt, but I don't think there is a way to sync colors between sprites.

Right, I got the idea: I can increase the scale of the icon sprite. That way it'll become more visible while retaining the colors.

A bit junky, but easier to see and interact I believe:
image

@ErhardSteinhauer
Copy link
Contributor Author

@whatston3 biggest thanks for proofreading, I appreciate that a lot

@whatston3
Copy link
Contributor

It is, yeah. I probably can add generic icons for glasses/belt, but I don't think there is a way to sync colors between sprites.

Just as an idea, could the GenericVisualizer be used here? I know mail edits the layers based off of the state of a mail package, but I haven't played around with it. If you were to create a component with the colours/visible layers of your clothing and then pull that into the visualizer somehow, split it between the icon and sprite, that'd be neat.

Not suggesting to put that in this PR, but it might be interesting.

Retesting, thanks for the changes.

Copy link
Contributor

@whatston3 whatston3 left a comment

Choose a reason for hiding this comment

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

Left a few small suggestions (two descriptions and a possibly unintended change to factions), but this looks good, happy to approve once you take a look at those suggestions.

Tried to test the change to NavSmash for the hostile mob base, didn't really notice much smashing, though I was checking with punks - maybe if they had better weapons they'd be more inclined to smash things to come towards me - unsure.

Still excited to see these items used in-game. Hope the holograffiti's straightforward enough to remove.

Resources/Prototypes/ai_factions.yml Outdated Show resolved Hide resolved
Copy link
Contributor

@whatston3 whatston3 left a comment

Choose a reason for hiding this comment

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

Faction changes seem good, liking the consistent order. Approving this, would like a second opinion given the amount of changes here.

@dvir001 dvir001 merged commit 4883e44 into new-frontiers-14:master Jun 16, 2024
14 checks passed
FrontierATC added a commit that referenced this pull request Jun 16, 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.

5 participants