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

Refactor currency and change fishing tokens to currency #14491

Merged
merged 24 commits into from Jun 18, 2023
Merged

Refactor currency and change fishing tokens to currency #14491

merged 24 commits into from Jun 18, 2023

Conversation

Glamurio
Copy link
Contributor

@Glamurio Glamurio commented Jun 9, 2023

[Secret] [QoL] [Code Quality] [Internal]

About the PR

This PR changes /obj/item/spacecash to /obj/item/currency/spacecash, and does the same for all other variants.
Additionally, it changes /obj/item/requisition_token/fishing to /obj/item/currency/fishing.

Why's this needed?

Currency has a lot of old, copy pasted code that was in need of a refactor. This was spurned on by the fact that fishing tokens right now do not stack, and are handled much more like a currency than a token. Because I wanted to avoid copy-pasting currency code another time, I felt it smarter to make a currency parent type for all existing and future currencies.

Changelog 

(u)Glamurio (Ryou)
(+)Fishing tokens now stack.

@Glamurio
Update master
e569a2a
@Glamurio
Merge branch 'master' of https://github.com/goonstation/goonstation
e6a2421
@Glamurio
Merge branch 'master' of https://github.com/goonstation/goonstation
96b2011
@Glamurio
Merge branch 'master' of https://github.com/goonstation/goonstation
04f1fa1
@Glamurio
Merge branch 'master' of https://github.com/goonstation/goonstation
4fd0295
@Glamurio
Merge branch 'master' of https://github.com/goonstation/goonstation
805cecc
@Glamurio
Merge branch 'master' of https://github.com/goonstation/goonstation
2647f69
@Glamurio
Merge branch 'master' of https://github.com/goonstation/goonstation
b085b6c
@Glamurio
Merge branch 'master' of https://github.com/goonstation/goonstation
cbeee4d
@Glamurio
Merge branch 'master' of https://github.com/goonstation/goonstation
a825c79
@Glamurio
Merge branch 'master' of https://github.com/goonstation/goonstation
8203290
@Glamurio
Merge branch 'master' of https://github.com/goonstation/goonstation i…
756ab5d 
…nto fishing_qol
@Glamurio
Refactor currency & change fishing tokens
65dc3b6
@Glamurio
Merge branch 'master' of https://github.com/goonstation/goonstation i…
c9df551 
…nto fishing_qol
@Glamurio
Fix currency type
edeef74
@Glamurio
Fix infinite money glitch
ade50b2
@Glamurio
Merge branch 'master' of https://github.com/goonstation/goonstation i…
54b1f8e 
…nto fishing_qol
@boring-cyborg boring-cyborg bot added the A-Mapping A mapping change label Jun 9, 2023
@keywordlabeler keywordlabeler bot added A-Internal Deals with major internal, generally non-player facing code - e.g. types A-Secret Deals with secret content ⚿ C-Code-Quality Cleans up code, refactors things to be more readable or intuitive C-QoL A quality of life improvement that makes the game easier to play labels Jun 9, 2023
@github-actions github-actions bot added the size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. label Jun 9, 2023
@Glamurio
Copy link
Contributor Author

Glamurio commented Jun 9, 2023

One day I will learn not to have 10 merge commits. One day.

@Gannets
Copy link
Contributor

Gannets commented Jun 10, 2023

Thanks for this! I'll try and find time to test it.

@frawhst frawhst self-assigned this Jun 10, 2023
frawhst
frawhst reviewed Jun 11, 2023
View reviewed changes
code/obj/item/space_cash.dm Outdated Show resolved Hide resolved
code/obj/item/space_cash.dm Outdated Show resolved Hide resolved
code/obj/item/space_cash.dm Outdated Show resolved Hide resolved
code/obj/item/space_cash.dm Outdated Show resolved Hide resolved
code/obj/item/space_cash.dm Outdated Show resolved Hide resolved
code/obj/item/space_cash.dm Outdated Show resolved Hide resolved
code/obj/item/space_cash.dm Outdated Show resolved Hide resolved
code/obj/item/space_cash.dm Outdated Show resolved Hide resolved
_std/copy.dm Outdated Show resolved Hide resolved
frawhst
frawhst approved these changes Jun 13, 2023
View reviewed changes
Copy link
Member

@frawhst frawhst left a comment

Choose a reason for hiding this comment

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

should just set display_name on the other types, otherwise lgtm. Gonna testmerge for a bit in case anything wacky happens.

code/obj/item/space_cash.dm Show resolved Hide resolved
code/obj/item/space_cash.dm Show resolved Hide resolved
code/obj/item/space_cash.dm Show resolved Hide resolved
@frawhst frawhst added the S-Testmerged [Dev Only] Testmerged for extended testing (applied by bot) label Jun 13, 2023
@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 Jun 13, 2023
@Sord213 Sord213 removed their request for review June 13, 2023 14:21
@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 13, 2023
@frawhst frawhst merged commit 3d7445f into goonstation:master Jun 18, 2023
20 checks passed
@frawhst frawhst removed the S-Testmerged [Dev Only] Testmerged for extended testing (applied by bot) label Jun 18, 2023
github-actions bot pushed a commit that referenced this pull request Jun 18, 2023
@robuddybot
Changelog for #14491 [skip ci]
3e6d506
@Glamurio Glamurio deleted the fishing_qol branch June 20, 2023 18:52
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@frawhst frawhst frawhst approved these changes

@pali6 pali6 Awaiting requested review from pali6 pali6 is a code owner

@Kyle2143 Kyle2143 Awaiting requested review from Kyle2143 Kyle2143 is a code owner

@flrsh flrsh Awaiting requested review from flrsh flrsh is a code owner

Assignees

@frawhst frawhst

Labels
A-Internal Deals with major internal, generally non-player facing code - e.g. types A-Mapping A mapping change A-Secret Deals with secret content ⚿ C-Code-Quality Cleans up code, refactors things to be more readable or intuitive C-QoL A quality of life improvement that makes the game easier to play size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@Glamurio @Gannets @frawhst