Adds fishing #3790

MistakeNot4892 · 2024-03-12T15:03:46Z

Description of changes

Ports several fish icons from Polaris and adds subtypes to use them.
Adds craftable fishing rods and fishing line.
Adds infrastructure for fishing in submerged turfs.

Why and what will this PR improve

Fishing good.

TODO

Add some fish or other item rewards for fishing to exoplanets as an example for main code.
Add sound effects and visuals to fishing.

Authorship

Code is mine, icons are adapted from Polaris.

Changelog

🆑
add: Added fishing!
/:cl:

MistakeNot4892 · 2024-03-17T08:08:09Z

Calling this ready to go. It'll need some playtesting and refinement, and I'd like to make the actual minigame more interesting, but it'll do for the time being.

MistakeNot4892 · 2024-03-17T08:51:23Z

If I keep messing with this I'm never going to stop.

MistakeNot4892 · 2024-03-17T08:51:51Z

code/game/area/area_fishing.dm

+
+	. = new loot_type(origin)
+
+	// This is pretty rancid but we're limited in our ability to actually refine a


Calling this block out for review as in general I don't like it, but I can't think of anything less bad.

Could potentially make it use /datum/atom_creator like closets?

Per my other comment I'm not sure I see how that would be an improvement.
EDIT: I think I get what you mean but I don't think it's a suitable solution.

MistakeNot4892 · 2024-03-17T08:53:35Z

code/game/objects/random/random.dm

+	if(!SSatoms.initialized || !length(spawned_atoms))
+		return INITIALIZE_HINT_QDEL
+
+	// Hang around for a tick in case someone wants our spawn results.


See comment about re: bad.

I don't like this! /datum/atom_creator/weighted() is better for things where code might need to access the results, in my opinion.

I don't see how you can access results from datum/atom_creator/weighted, it just seems to dump stuff into the loc the same as a random spawner does.

Okay, I see what you mean, but it's not really what I want. It would lock the fishing results to a single type unless I regenerated the list every time I wanted to get a result from it.

code/modules/blob/blob.dm

out-of-phaze · 2024-03-23T02:02:27Z

code/game/area/area_fishing.dm

+
+	. = new loot_type(origin)
+
+	// This is pretty rancid but we're limited in our ability to actually refine a


Could potentially make it use /datum/atom_creator like closets?

out-of-phaze · 2024-03-23T02:03:20Z

code/game/objects/random/random.dm

+	if(!SSatoms.initialized || !length(spawned_atoms))
+		return INITIALIZE_HINT_QDEL
+
+	// Hang around for a tick in case someone wants our spawn results.


I don't like this! /datum/atom_creator/weighted() is better for things where code might need to access the results, in my opinion.

MistakeNot4892 · 2024-03-30T10:25:46Z

I just rolled back the random item handling, it can get sorted out in another PR.

PlayerDeer · 2024-04-02T15:36:57Z

Does this feature the stardew valley style fishing minigame? If not and you need icons for that later feel free to hit me up MistakeNot :)

MistakeNot4892 · 2024-04-02T15:47:55Z

No minigame currently, but it would be nice...

out-of-phaze · 2024-04-03T21:01:30Z

code/modules/fishing/fishing_rod.dm

+	var/is_fishing = FALSE
+	var/obj/item/bait
+	var/obj/item/fishing_line/line
+	var/line_integrity


this variable is unused

out-of-phaze · 2024-04-03T22:13:17Z

code/modules/fishing/fishing_rod.dm

+	if(!target.submerged())
+		to_chat(user, SPAN_WARNING("The water is not deep enough to fish there."))
+		return FISHING_FAILED_WARNING
+	return FISHING_POSSIBLE


this doesn't check if something is blocking our path, and doing so is currently nontrivial. i have a commit that fixes this pretty well if you'd like, ask about it on Discord and i'll link it to you assuming i've pushed it by then

out-of-phaze · 2024-04-03T22:14:57Z

code/modules/fishing/fishing_rod.dm

+			if(QDELETED(line))
+				to_chat(user, SPAN_DANGER("Your fishing line snaps!"))
+				line = null
+			update_icon()


Suggested change

update_icon()

update_icon()

result.throw_at(get_turf(user), get_dist(src, result), 0.5, user, FALSE)

This way, you actually 'reel' the catch in and don't have to wade out into the water to collect your fish.

out-of-phaze · 2024-04-03T22:15:57Z

code/modules/fishing/fishing_rod.dm

+
+// TODO: more interesting fishing minigame.
+/obj/item/fishing_rod/proc/do_fishing_minigame(mob/user, turf/target)
+	user.visible_message(SPAN_NOTICE("\The [user] casts \the [src] into \the [target]."))


Suggested change

user.visible_message(SPAN_NOTICE("\The [user] casts \the [src] into \the [target]."))

user.visible_message(SPAN_NOTICE("\The [user] casts \the [src] into \the [target.get_fluid_name()]."))

ideally you cast it into the water (lava, blood, etc), not into the mud

MistakeNot4892 · 2024-04-04T03:18:07Z

Grabbed your commits and put some time into the minigame. Need to add some sounds and visual cues but the logic seems to be working.

out-of-phaze

I missed some cases of [target], but the minigame looks fine!

out-of-phaze · 2024-04-04T17:15:24Z

code/modules/fishing/fishing_rod.dm

+
+	if(is_fishing)
+		if(isnull(is_fishing.hooked))
+			to_chat(user, SPAN_NOTICE("You reel your line back in and abandon fishing in \the [is_fishing.target]."))


Suggested change

to_chat(user, SPAN_NOTICE("You reel your line back in and abandon fishing in \the [is_fishing.target]."))

to_chat(user, SPAN_NOTICE("You reel your line back in and abandon fishing in \the [is_fishing.target.get_fluid_name()]."))

Missed one, sorry.

out-of-phaze · 2024-04-04T17:16:04Z

code/modules/fishing/fishing_rod.dm

+		return FISHING_FAILED_WARNING
+	var/list/hit = check_trajectory(target, src, pass_flags=PASS_FLAG_TABLE, lifespan = get_dist(target, src))
+	if(length(hit))
+		to_chat(user, SPAN_WARNING("Your fishing line is blocked from reaching \the [target] by \the [hit[1]]."))


Suggested change

to_chat(user, SPAN_WARNING("Your fishing line is blocked from reaching \the [target] by \the [hit[1]]."))

to_chat(user, SPAN_WARNING("Your fishing line is blocked from reaching \the [target.get_fluid_name()] by \the [hit[1]]."))

MistakeNot4892 added the work in progress This PR is under development and shouldn't be merged. label Mar 12, 2024

MistakeNot4892 changed the title ~~Feature/fishes~~ Adds fishing Mar 12, 2024

MistakeNot4892 force-pushed the feature/fishes branch from 95b55d5 to 57a411f Compare March 17, 2024 08:07

MistakeNot4892 added ready for review This PR is ready for review and merge. and removed work in progress This PR is under development and shouldn't be merged. labels Mar 17, 2024

MistakeNot4892 force-pushed the feature/fishes branch 4 times, most recently from 9b8e6aa to 1ff3644 Compare March 17, 2024 08:51

MistakeNot4892 commented Mar 17, 2024

View reviewed changes

code/modules/blob/blob.dm Show resolved Hide resolved

MistakeNot4892 force-pushed the feature/fishes branch 5 times, most recently from 995a742 to 402fc83 Compare March 19, 2024 06:25

out-of-phaze requested changes Mar 24, 2024

View reviewed changes

MistakeNot4892 force-pushed the feature/fishes branch from 402fc83 to b128a1f Compare March 30, 2024 10:20

MistakeNot4892 force-pushed the feature/fishes branch from 8b35592 to ec1f24a Compare April 2, 2024 12:57

MistakeNot4892 mentioned this pull request Apr 2, 2024

Adds compost bins. #3851

Merged

out-of-phaze previously approved these changes Apr 2, 2024

View reviewed changes

MistakeNot4892 dismissed out-of-phaze’s stale review via b95a433 April 4, 2024 01:42

MistakeNot4892 force-pushed the feature/fishes branch from 36391e8 to b95a433 Compare April 4, 2024 01:42

out-of-phaze requested changes Apr 4, 2024

View reviewed changes

MistakeNot4892 added work in progress This PR is under development and shouldn't be merged. and removed ready for review This PR is ready for review and merge. labels Apr 4, 2024

MistakeNot4892 force-pushed the feature/fishes branch from d166761 to b9a01a0 Compare April 4, 2024 03:35

MistakeNot4892 added ready for review This PR is ready for review and merge. and removed work in progress This PR is under development and shouldn't be merged. labels Apr 4, 2024

out-of-phaze requested changes Apr 4, 2024

View reviewed changes

MistakeNot4892 force-pushed the feature/fishes branch 5 times, most recently from ca2ab5c to 012509c Compare April 6, 2024 08:28

out-of-phaze previously approved these changes Apr 6, 2024

View reviewed changes

MistakeNot4892 dismissed out-of-phaze’s stale review via 7c39f0f April 7, 2024 07:02

MistakeNot4892 force-pushed the feature/fishes branch from 012509c to 7c39f0f Compare April 7, 2024 07:02

MistakeNot4892 and others added 10 commits April 8, 2024 13:35

Porting several fish icons from Polaris.

798fb43

Adding a version of the fishing system on Polaris.

904459a

Removing accidental inclusion of debris item.

1e7aba4

Cleaning up fishing PR.

0dc1ccb

Rolled back /obj/random handling in fishing.

0de039a

Reimplement life_span variable on projectiles

7901078

Improve fishing UX

b60e699

Making fishing more complicated.

82896fc

Moving fishing minigame logic back onto the rod.

a0f0b49

Post-rebase update.

2068c84

MistakeNot4892 force-pushed the feature/fishes branch from 7c39f0f to 2068c84 Compare April 8, 2024 03:35

out-of-phaze approved these changes Apr 8, 2024

View reviewed changes

out-of-phaze merged commit 040de0a into NebulaSS13:dev Apr 8, 2024
12 checks passed

MistakeNot4892 deleted the feature/fishes branch May 23, 2024 02:42

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Adds fishing #3790

Adds fishing #3790

MistakeNot4892 commented Mar 12, 2024 •

edited

Loading

MistakeNot4892 commented Mar 17, 2024

MistakeNot4892 commented Mar 17, 2024

MistakeNot4892 Mar 17, 2024

out-of-phaze Mar 23, 2024

MistakeNot4892 Mar 30, 2024 •

edited

Loading

MistakeNot4892 Mar 17, 2024

out-of-phaze Mar 23, 2024

MistakeNot4892 Mar 30, 2024

MistakeNot4892 Mar 30, 2024

out-of-phaze Mar 23, 2024

out-of-phaze Mar 23, 2024

MistakeNot4892 commented Mar 30, 2024

PlayerDeer commented Apr 2, 2024

MistakeNot4892 commented Apr 2, 2024

out-of-phaze Apr 3, 2024

out-of-phaze Apr 3, 2024

out-of-phaze Apr 3, 2024

out-of-phaze Apr 3, 2024

MistakeNot4892 commented Apr 4, 2024

out-of-phaze left a comment

out-of-phaze Apr 4, 2024

out-of-phaze Apr 4, 2024


		. = new loot_type(origin)

		// This is pretty rancid but we're limited in our ability to actually refine a

	update_icon()
	update_icon()
	result.throw_at(get_turf(user), get_dist(src, result), 0.5, user, FALSE)

	user.visible_message(SPAN_NOTICE("\The [user] casts \the [src] into \the [target]."))
	user.visible_message(SPAN_NOTICE("\The [user] casts \the [src] into \the [target.get_fluid_name()]."))

	to_chat(user, SPAN_NOTICE("You reel your line back in and abandon fishing in \the [is_fishing.target]."))
	to_chat(user, SPAN_NOTICE("You reel your line back in and abandon fishing in \the [is_fishing.target.get_fluid_name()]."))

	to_chat(user, SPAN_WARNING("Your fishing line is blocked from reaching \the [target] by \the [hit[1]]."))
	to_chat(user, SPAN_WARNING("Your fishing line is blocked from reaching \the [target.get_fluid_name()] by \the [hit[1]]."))

Adds fishing #3790

Adds fishing #3790

Conversation

MistakeNot4892 commented Mar 12, 2024 • edited Loading

Description of changes

Why and what will this PR improve

TODO

Authorship

Changelog

MistakeNot4892 commented Mar 17, 2024

MistakeNot4892 commented Mar 17, 2024

Choose a reason for hiding this comment

Choose a reason for hiding this comment

MistakeNot4892 Mar 30, 2024 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

MistakeNot4892 commented Mar 30, 2024

PlayerDeer commented Apr 2, 2024

MistakeNot4892 commented Apr 2, 2024

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

MistakeNot4892 commented Apr 4, 2024

out-of-phaze left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

MistakeNot4892 commented Mar 12, 2024 •

edited

Loading

MistakeNot4892 Mar 30, 2024 •

edited

Loading