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

bedrolls #2332

Merged
merged 11 commits into from
Nov 1, 2024
Merged

Conversation

ErhardSteinhauer
Copy link
Contributor

@ErhardSteinhauer ErhardSteinhauer commented Oct 26, 2024

About the PR

Added craftable bedrolls, functions just like you'd expect: can be folded, can't be anchored. Added special version for McHobo. Sprites (with minor edits) were taken from cmss13 (see meta file for more details).

Why / Balance

camping!

How to test

Spawn, craft a bedroll

Media

image

Example of how McHobo could look if one made a yml swap Mattress <- McHoboBedsRandom
image

Requirements

Breaking changes

Changelog

🆑 erhardsteinhauer

  • add: Added craftable bedrolls.

Copy link
Contributor

github-actions bot commented Oct 26, 2024

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

Resources/Textures/_NF/Structures/Furniture/bedroll.rsi

State Old New Status
bedroll01 Added
bedroll01_folded Added
bedroll02 Added
bedroll02_folded Added
overlay_stain_01 Added
overlay_stain_02 Added
overlay_stain_03 Added
overlay_stain_04 Added

Edit: diff updated after 3c5a90b

@dustylens
Copy link
Contributor

I might suggest adding at least a nominal amount of cold damage recovery as well for jumping into the sleeping bag.

@ErhardSteinhauer
Copy link
Contributor Author

I might suggest adding at least a nominal amount of cold damage recovery as well for jumping into the sleeping bag.

I'm sorry, you didn't pick "bedroll proficiency" at chargen, so don't know how to actually use it - that's why you sleep on top of it, instead of inside of it. So you aren't getting warmer.

@ErhardSteinhauer ErhardSteinhauer marked this pull request as ready for review October 26, 2024 04:09
@github-actions github-actions bot added the YML label Oct 26, 2024
@ErhardSteinhauer ErhardSteinhauer removed the Map-POI Map - POI label Oct 26, 2024
@ErhardSteinhauer
Copy link
Contributor Author

Removed Map-POI label because I reverted changes made to McHobo (wasn't meant to be a part of this PR, forgor to revert before publishing)

@dustylens
Copy link
Contributor

I might suggest adding at least a nominal amount of cold damage recovery as well for jumping into the sleeping bag.

I'm sorry, you didn't pick "bedroll proficiency" at chargen, so don't know how to actually use it - that's why you sleep on top of it, instead of inside of it. So you aren't getting warmer.

Which bed do you not sleep on top of?

@ErhardSteinhauer
Copy link
Contributor Author

Which bed do you not sleep on top of?

Do you use blankets to shield yourself from the elements? With how bedrolls (beds) work right now, your character clearly decides against using blanket built in the bedroll.

@Tych0theSynth
Copy link
Contributor

Not quite sure how I feel about the sprite. The dirty mattresses fit the vibe of the McHobo so well...
Maybe we could map a few of them, but honestly I think they look too clean!

@ErhardSteinhauer
Copy link
Contributor Author

Can adjust percentage on the spawner in favor of stained bedrolls and see how that'll look.

@ErhardSteinhauer
Copy link
Contributor Author

Can adjust percentage on the spawner in favor of stained bedrolls and see how that'll look.

image

@dvir001 dvir001 self-requested a review October 29, 2024 10:56
@github-actions github-actions bot added the Status: Needs Review This PR is awaiting reviews label Oct 29, 2024
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.

MFW "Yellow"

@Tych0theSynth Any comments to add on the PR after the changes?

@ErhardSteinhauer
Copy link
Contributor Author

MFW "Yellow"

@Tych0theSynth Any comments to add on the PR after the changes?

Should've been more honest, like wizden here:
image

@Tych0theSynth
Copy link
Contributor

These are fantastically awful. Perfect >;D
I approve!

@whatston3
Copy link
Contributor

Minor suggestion - I think the stain overlays look better with a slightly lower alpha. This is with an alpha of 0xBB.
image
image

vs. 0xFF
image
image

0xBB might not be opaque enough but I do think the effect is nice.

@ErhardSteinhauer
Copy link
Contributor Author

... stain ... look better ...

  • Whatston3, 2024.

@whatston3
Copy link
Contributor

whatston3 commented Nov 1, 2024

Also, for what it's worth, if you add the PlaceableSurface component (and scooch the bed down a few pixels), you can get comfy bedsheets for your crack den:
image

Edit: I'll see if I can wrangle up something that doesn't behave terribly.

@ErhardSteinhauer
Copy link
Contributor Author

But, yeah, it actually looks better

@ErhardSteinhauer
Copy link
Contributor Author

I'll give it a try later today

@ErhardSteinhauer
Copy link
Contributor Author

I'll give it a try later today

Well, somehow I borked my local branch, so I'm not going to touch this I think. Can web edit "alpha: 0.75" to the stain layer, not sure if it worth it though.

@ErhardSteinhauer
Copy link
Contributor Author

Sorted out my local bs, moved sprite added alpha to stains. Kinda works, I think.
image
image

@whatston3
Copy link
Contributor

whatston3 commented Nov 1, 2024

Might be a dingus but I don't think the alpha field actually exists in the Layer; can't find any alpha field. I might move the alpha into the colours in LiquidBiological.

Also, editing the placement offset to be slightly negative (0, -0.0001 works fine) gets the blanket to show up on top - seems to be going under the bedroll for me.

@whatston3
Copy link
Contributor

image

image

Pushed a minor set of changes, revert if needed, but the palette is now slightly transparent (fixed the same issue with the glass shard bolt), and added a slight offset to the placeable surface.

@ErhardSteinhauer
Copy link
Contributor Author

Might be a dingus but I don't think the alpha field actually exists in the Layer;

You might be right.

seems to be going under the bedroll for me.

Doesn't seem to change anything for me, but sure.
Anyways, good shit, thanks.

@whatston3 whatston3 merged commit e459747 into new-frontiers-14:master Nov 1, 2024
14 checks passed
FrontierATC added a commit that referenced this pull request Nov 1, 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