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

fix(content): thessalia dialogue, bunny_ears, scythe #1203

Merged
merged 1 commit into from
Feb 9, 2025

Conversation

dhemms
Copy link
Contributor

@dhemms dhemms commented Feb 5, 2025

untradeable_holiday_items.rs2:

New file, as there doesn't seem to be anywhere else appropriate. Any suggestions welcome. It's in data\src\scripts\player\scripts which also contains pickup.rs2, cracker.rs2, which are semi-related and is personal to the player. Is there a better place for this? I considered renaming cracker.rs2 to holiday_items.rs2, and merge together to reduce clutter and cover any future items (rubber_chicken hype??).

The intention is, which is tested as working:

  • scythe:

    • If you try pick up a scythe, and you don't already have one, pick it up and set %scythe_unlocked = 1
    • If you try pick up a scythe, and you do already have one, don't allow it
  • bunny_ears:

    • If you try pick up bunny_ears, and you don't already them, pick it up and set %bunny_ears_unlocked = 1
    • If you try pick up a bunny_ears, and you do already have one, don't allow it

Example, picking up a scythe after resetting the varp:
image

Setting these varps means the items are retrievable from Thessalia once you've unlocked them. If they are introduced in any other way, other than picking them up off the ground, these varps need to be set in a different way.


varp.pack / all.varp

I'm not sure how to create a new varp without getting an error. I noticed in a recent PR that existing varps were replaced and used. So for this I replaced varp_7 and varp_8. If this should be done differently please let me know.
Example varp_133 and varp_138 replacement: 7d2c20a#diff-9073420bf978748137737c1955094de93363739ad59d436e43a8165cc6fa34dd

which is why I used varp_7 and varp_8


cheat_reset.rs2

Clear the new %bunny_ears_unlocked and %scythe_unlocked varps


telegrab.rs2:

Cannot telegrab Bunny ears or Scythe:
https://classic.runescape.wiki/w/Scythe
https://classic.runescape.wiki/w/Bunny_ears


thessalia.rs2:

Dialogue is different in RSC, but the rest of the dialogue currently matches OSRS so I went with that:
https://oldschool.runescape.wiki/w/Transcript:Thessalia

Facial animations also updated

@dhemms dhemms force-pushed the thessalia-bunny-ears-scythe branch 2 times, most recently from 0e54dd5 to 98031ee Compare February 6, 2025 00:16
@dhemms dhemms force-pushed the thessalia-bunny-ears-scythe branch from eac5733 to f182e04 Compare February 6, 2025 00:22
@dhemms dhemms marked this pull request as ready for review February 6, 2025 00:28
@Pazaz Pazaz merged commit 9a1ae0d into 2004Scape:main Feb 9, 2025
3 checks passed
Pazaz added a commit that referenced this pull request Feb 10, 2025
## Content Changes

### Features

* #1099

### Fixes

* #1203
* #1223
* #1234
* #1236
* #1242
* #1243
* #1244
* #1245
* #1247

## Engine Changes

### Features

* #1237
* Login server abuse protection

### Fixes

* #1233
* #1235
* #1238
* #1240
* #1241
* #1249
* Obj command validation
@dhemms dhemms deleted the thessalia-bunny-ears-scythe branch February 10, 2025 17:51
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants