Refund expensive POH decoration items when removed + fix tiny xp and hotspot issues
What has been done in this MR?
-
Made the following hotspots refund their non-plank items when torn down: any quest item, any guild trophy, any armor stand. This would technically include the mounted glory, but since ours is inauthentic and consequently lacks a proper "Remove" option, I propose a different solution instead: #1922
-
To make this possible, added a new field in Decoration.java called
refundItems
, giving a list of items to be refunded when the object is removed. Updated API definitions within that file as needed. Makeexperience
always anint
, because it always is but the previous function signatures mixedint
s anddouble
s, which only worked out for reasons of coincidence. -
To make the above possible, converted all variable-argument
Item
definitions to single-position array definitions. To make doing that easier in my text editor, completely reformatted whitespace in Decoration.java (this was needed for text-editor reasons only, but the result is nice, I'd say). -
Removed decorations and hotspots for "Menagerie" rooms, which seem to be inauthentic OSRS-only
-
Changed the following hotspots to be recursive: Decoration (e.g. in throne room, dining room, etc), Tool space (workshop), Wall chart (study)
-
Corrected xp for all crafting tables (source: https://runescape.wiki/w/Crafting_table_1 through _4). Known issue that is not in scope: you can immediately build crafting table 4 because "Upgrade" is not implemented
-
Fixed #1556
-
Fixed #1832, also audit and correct xp for the other kinds of this furniture piece using the provided source
-
Audited and corrected xp awards for items requiring planks, which Arios sometimes awarded 30 rather than 29 ea of: https://runescape.wiki/w/Crude_wooden_chair https://runescape.wiki/w/Wooden_chair https://runescape.wiki/w/Rocking_chair https://runescape.wiki/w/Wooden_workbench (if you cannot test chairs, that's because of #1841)
Sources:
- getting quest items and guild trophies back: https://runescape.wiki/w/Quest_hall?oldid=861049
- getting glory back: https://runescape.wiki/w/Amulet_of_Glory\_(mounted)?oldid=3382741
- getting armor back: https://runescape.wiki/w/Skill_hall?oldid=855674
- before you ask, monster heads and big fish cannot be gotten back, as explicitly stated here: https://oldschool.runescape.wiki/w/Kalphite_Queen_head\_(mounted) https://oldschool.runescape.wiki/w/Mounted_shark
What should testers check?
- Hotspots continue to work normally
- You get the above-mentioned items back when you remove them
- For hotspots that became recursive, building one now builds all
- Correct xp is awarded
-
I have tested these changes thoroughly. -
I used the relevant Zaros tool for any JSON edits where possible, and have attached screenshots of any changes.