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.

Sign up for GitHub

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

Jump to bottom

Adding fish oil. #4677

Open
wants to merge 2 commits into
base: dev
Choose a base branch
from
Open

Adding fish oil. #4677

wants to merge 2 commits into from

Conversation

MistakeNot4892
Copy link
Contributor

@MistakeNot4892 MistakeNot4892 commented Dec 27, 2024 •
edited
Loading

Description of changes

  • Adds cave fish and lantern fish to the Shaded Hills cave river.
  • Adds a base lantern fuel oil type which is the parent type of plant oil and corn oil.
  • Adds fish oil.
  • Adds recipes to make fuel oil from fish, plant or corn oil and powdered coal.

Why and what will this PR improve

  • More characterful fishes for the cave river.
  • More sources of fuel on the medieval map.

Authorship

Code is mine, sprites are @PlayerDeer <3

Changelog

🆑
tweak: Raw plant oil no longer works as lantern fuel; it must be mixed with powdered graphite first.
/:cl:

@MistakeNot4892 MistakeNot4892 added ready for review This PR is ready for review and merge. help wanted Extra attention is needed work in progress This PR is under development and shouldn't be merged. sprites This is an issue with a sprite or sprites. and removed ready for review This PR is ready for review and merge. labels Dec 27, 2024
@MistakeNot4892
Copy link
Contributor Author

MistakeNot4892 commented Dec 27, 2024 •
edited
Loading

I do not have decent sprites for the cave fish/lantern fish, I will kitbash some when I'm back home after the 1st but if anyone with more artistic skills than me wants to have a crack, it would be appreciated. Thank you Doe!

@MistakeNot4892 MistakeNot4892 force-pushed the feature/lanternfish branch 3 times, most recently from 62a8205 to cbfeecf Compare December 27, 2024 05:44
@MistakeNot4892 MistakeNot4892 added ready for review This PR is ready for review and merge. and removed help wanted Extra attention is needed work in progress This PR is under development and shouldn't be merged. sprites This is an issue with a sprite or sprites. labels Dec 27, 2024
@MistakeNot4892 MistakeNot4892 force-pushed the feature/lanternfish branch 2 times, most recently from b0d53f6 to 45b3d0c Compare December 27, 2024 10:39
out-of-phaze
out-of-phaze requested changes Dec 27, 2024
View reviewed changes
code/modules/mob/living/simple_animal/aquatic/aquatic_fish_lantern.dm Outdated
@@ -0,0 +1,26 @@
/mob/living/simple_animal/aquatic/fish/large/lantern
name = "lantern fish"
desc = "An oily, glowing fish with a habit of nipping people. They are sometimes caught in cave rivers, and are rumoured to have cousins in the deep ocean."
Copy link
Member

@out-of-phaze out-of-phaze Dec 27, 2024 •
edited
Loading

Choose a reason for hiding this comment

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

technically I think the original joke with the lanternfish was that it was the supposed explanation for someone being inexplicably covered in oil (because they'd actually fallen into the slaughterhouse water pit, which mixed their lantern's oil with the water. this then set them on fire

basically: it would be really funny if they got oil on you when they attack you

edit: not a requested change btw i was gonna approve but then i saw the other thing

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Fish don't attack currently, but we could consider a lantern carp?

code/modules/organs/internal/_internal.dm Outdated
@@ -171,7 +171,7 @@

// We clamp/round here so that we don't accidentally heal past the threshold and
// cheat our way into a full second threshold of healing.
damage = clamp(damage-get_organ_heal_amount(), min_heal_val, absolute_max_damage)
damage = clamp(damage - max(0, get_organ_heal_amount() * GET_CHEMICAL_EFFECT(owner, CE_BRAIN_REGEN)), min_heal_val, absolute_max_damage)
Copy link
Member

Choose a reason for hiding this comment

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

doesn't this apply to all organs and not just the brain? i'm pretty sure this turns fish oil/neuroannealer into budget peridaxon. also it means it won't regenerate at all without any in your system, you might want like. * (1 + GET_CHEMICAL_EFFECT(owner, CE_BRAIN_REGEN)) or something

if that's not desired my proposal would be to give organs a var like healing_chem_effect and do something like

		var/healing_multiplier = 1 + (healing_effect ? GET_CHEMICAL_EFFECT(owner, healing_effect) : 0)
		damage = clamp(damage - max(0, get_organ_heal_amount() * healing_multiplier), min_heal_val, absolute_max_damage)

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Might just move it into a proc and override it on the brain.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Made CE_BRAIN_REGEN modify get_organ_heal_amount() directly.

out-of-phaze
out-of-phaze approved these changes Dec 28, 2024
View reviewed changes
code/modules/organs/internal/brain.dm Outdated

/obj/item/organ/internal/brain/get_organ_heal_amount()
return 1
return owner ? GET_CHEMICAL_EFFECT(owner, CE_BRAIN_REGEN) : 1
Copy link
Member

Choose a reason for hiding this comment

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

oh, so it is intended that it never heals on its own if you don't have fish oil? otherwise you should probably be adding 1 to the effect

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I forgor brains regen a little without neuroannealer. Dammit.

Copy link
Member

Choose a reason for hiding this comment

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

well, I guess thats a change to request?

Suggested change
return owner ? GET_CHEMICAL_EFFECT(owner, CE_BRAIN_REGEN) : 1
return 1 + (owner ? GET_CHEMICAL_EFFECT(owner, CE_BRAIN_REGEN) : 0)

this will mean it heals 1 base, and then gains more based on the regen effect strength.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Okay, getting it to heal 1 + brain heal if not under a threshold, brain heal only if over damage threshold.

out-of-phaze
out-of-phaze requested changes Dec 29, 2024
View reviewed changes
code/modules/organs/internal/brain.dm Outdated

/obj/item/organ/internal/brain/get_organ_heal_amount()
return 1
return owner ? GET_CHEMICAL_EFFECT(owner, CE_BRAIN_REGEN) : 1
Copy link
Member

Choose a reason for hiding this comment

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

well, I guess thats a change to request?

Suggested change
return owner ? GET_CHEMICAL_EFFECT(owner, CE_BRAIN_REGEN) : 1
return 1 + (owner ? GET_CHEMICAL_EFFECT(owner, CE_BRAIN_REGEN) : 0)

this will mean it heals 1 base, and then gains more based on the regen effect strength.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@out-of-phaze out-of-phaze out-of-phaze approved these changes

Assignees
No one assigned
Labels
ready for review This PR is ready for review and merge.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@MistakeNot4892 @out-of-phaze