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

Expanded fishing content 🎣 #13460

Merged
merged 43 commits into from Jun 6, 2023
Merged

Conversation

Gannets
Copy link
Contributor

@Gannets Gannets commented Mar 27, 2023

About the PR

This PR builds on Adhara's excellent fishing system by adding a pile of new content and introducing a rudimentary progression system.

It currently adds:

  • ~30 new fish & ~30 fishing spots on-station, out in the debris field and away in adventure zones.
  • A machine that will convert caught fish in to a new currency and a new vendor which accepts this currency in exchange for fishing equipment.
  • The "Fish fear me, women want me" hat only every word is randomly selected.
  • Added Angler as a random gimmick job.
  • Fish added to the shipping market.
  • Full suite of Angler's tools avaliable to purchase from QM.
  • A rarity system to support different fish being more valuable than others.
  • Some fishing spots require upgraded or specific rods before you can fish in them.
  • Angler Job XP, I think.

Sprites:

terminal fish_anim fish_vend
fishes
coins
newrods

Why's this needed?

Adhara's fishing system is really cool and has a bunch of potential, it just needs a bunch of content for folks to explore. Luckily, it's really easy to add new fishing spots and fish so I've decided to abandon Nuke Ops forever and take up retirement as a space angler.

Changelog

(u)Gannets & Mora & Adhara & Wolfolotl
(*)Fishing has been expanded with new fish, fishing spots, equipment and a progression system. More details in minor changes below:
(+)~30 new fish & ~30 fishing spots on-station, out in the debris field and away in adventure zones. Some fishing spots require upgraded or specific rods before you can fish in them.
(+)A machine that will convert caught fish in to a new currency and a new vendor which accepts this currency in exchange for fishing equipment. A rarity system to support different fish being more valuable than others.
(+)Added Angler as a random gimmick job. 
(+)Fish added to the shipping market. 
(+)Full suite of Angler's tools avaliable to purchase from QM. 
(+)Angler Job XP, I think. 

@Gannets Gannets added C-Feature A new feature or enhancements to existing features A-Game-Objects The point of this PR is to deal with a specific game object A-Hydroponics Deals with plants, hydro, etc. labels Mar 27, 2023
@github-actions github-actions bot added the size/XL Denotes a PR that changes 500-999 lines, ignoring generated files. label Mar 27, 2023
@Gannets Gannets changed the title Expanded fishing content Expanded fishing content 🎣 Mar 27, 2023
@Sord213 Sord213 added the E-Freeze-Exempt🧊 Exempt from the current feature freeze label Mar 27, 2023
@ThatFiveGuys
Copy link
Contributor

Fishing has been a system that has always been underdeveloped, and adding more stuff to it sounds great. I dont know if it would work as its own job, fear itd become telerush the job, but I’d need to see the whole thing to say.

One thing id like to see expanded on is the actual core of fishing itself. This does not have to be in this pr but personally I wouldnt feel comfortable with fisher being a station job without the core of fishing being solid. Currently fishing itself is pretty dull, its just clicking then waiting. Something like stardew valley’s system using tgui would be wonderful. Also the amount system for fish always struck me as odd, itd feel better if it was a probability system. (Ie 20% chance to catch bait,

For some misc fishing thoughts, I think it be more fitting if generally speaking the fish got from station items like water coolers were smalller. Also if bait gets implemented maybe make them a source of bait with things like food crumbs from the water cooler? (May be too gross dunno). Also some fish adapted for nanotrasens fishing systems would be cool (maybe a fish genetically modified to clean pipes or something?).

@RelentlessGarbage
Copy link

Going to agree with ThatFiveGuys, fishing itself should be reworked to be made more interesting. Adding more things to fish for is fine, but it seems like a missed opportunity if the act of fishing itself is not improved in some way. Lifting the fishing minigame from Stardew Valley would also be fine by me, since it's pretty enjoyable, but having any kind of more active component to fishing would be good.

Not sure if we need a full-on fishing department, though. Why not make fishing something that anyone can do? Might make it so that the bored staffies stop trying to break into engineering every round.

Gannets and others added 3 commits March 29, 2023 15:46
Co-authored-by: Zonespace <41448081+Zonespace27@users.noreply.github.com>
@github-actions github-actions bot added the S-Merge-Conflict Applied and removed when a PR has or no longer has a merge conflict label Apr 1, 2023
@github-actions
Copy link
Contributor

This PR has been inactive for two weeks, and has been automatically marked as stale. This means it is at risk of being auto closed in another week. Please address any outstanding review items and ensure your PR is finished. If you are auto-staled anyway, ask developers if your PR will be merged. Once you have done any of the previous actions then you should request a developer remove the stale label on your PR, to reset the stale timer. If you feel no developer will respond in that time, you may wish to close this PR youself, while you seek developer comment, as you will then be able to reopen the PR yourself.

@github-actions github-actions bot added the S-Stale An inactive PR that has had no updates in the past two weeks label Apr 22, 2023
@github-actions github-actions bot closed this Apr 30, 2023
@flappybatpal flappybatpal added E-Certified-Organic Will not be marked stale. and removed S-Stale An inactive PR that has had no updates in the past two weeks E-Freeze-Exempt🧊 Exempt from the current feature freeze labels Apr 30, 2023
@Gannets Gannets reopened this Jun 2, 2023
@github-actions github-actions bot added size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. and removed size/XL Denotes a PR that changes 500-999 lines, ignoring generated files. labels Jun 2, 2023
@Gannets Gannets marked this pull request as ready for review June 6, 2023 11:09
@github-actions github-actions bot removed the S-Merge-Conflict Applied and removed when a PR has or no longer has a merge conflict label Jun 6, 2023
@pali6
Copy link
Member

pali6 commented Jun 6, 2023

The __build.dm changes should be removed

@Gannets Gannets merged commit 08936fb into goonstation:master Jun 6, 2023
22 checks passed
github-actions bot pushed a commit that referenced this pull request Jun 6, 2023
@Studenterhue Studenterhue added the E-Add-To-Wiki A PR that will require changes to the wiki label Jun 7, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
A-Game-Objects The point of this PR is to deal with a specific game object A-Hydroponics Deals with plants, hydro, etc. C-Feature A new feature or enhancements to existing features C-Sprites Automatically applied on any .dmi or icons folder change E-Add-To-Wiki A PR that will require changes to the wiki E-Certified-Organic Will not be marked stale. size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

8 participants