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

Special fishing fix #849

Open
wants to merge 3 commits into
base: main
Choose a base branch
from

Conversation

girafe969
Copy link

@girafe969 girafe969 commented Feb 26, 2025

About The Pull Request

Fixes fishing handling to properly support special rarities, sizes, types and catch location.
Changes fishes iconstates from [fishname]com to [fishname], which fixes missing sprites on default fishes (R.I.P. invisible clownfish) and prevents further problems.
Puts catched fish in the hands.
Makes deluxe bait work as intended, although tunes it down a little (20% chance to catch 6400 mammon fish is NOT OKAY. now it's 5% for 480 mammon).
Fixes inability to catch anything using fish as bait.

fish.dmi is ported from #703 , if it's reverted after testing ping me to fix it

Why It's Good For The Game

It's a fix?.. I think having the ability to make special fish rarities/sizes/types for certain baits is super cool, and it should work as it was intended
Imagine reeling an alive bog troll when fishing using sinew bait💀 hope someone makes something like that

Pre-Merge Checklist

  • You tested this on a local server.
  • This code did not runtime during testing.
  • You documented all of your changes.

Fix special fish handling in rod.dm

fixes turfcatching, adds put_in_hands, gives sprites to specialrarity, name and sellprice to special fish

Update /obj/item/fishing/bait/deluxe in tackle.dm

makes enchanted bait less broken by lowering specialchance from 20 to 5 and specialfish cost from 6400 to 480
fixes capital letters in types

Prepare fish.dm for sprite reroute

reroute default fish icon_state
adds cooked swordfish icon_state just for fun

Change icon_states in fish.dmi

uses Vanderlin-Tales-Of-Wine#703 sprites, changes [fishname]com states to [fishname]

Update swordfish icon_state in abyssor.dm
reroutes outdated spritepath in swordfish icon_state
adds baitpenalty to fish, fixing the inability to fish with it
@girafe969
Copy link
Author

fishtest
All good, @tontyGH , tested everything

@tontyGH tontyGH added the fix This PR is for fixing bugs label Feb 27, 2025
@dwasint
Copy link

dwasint commented Feb 27, 2025

fish sprites merged so update the pull so it no longer conflicts

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
fix This PR is for fixing bugs
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants