2006-Scape/2006Scape
1
0
Fork 0
mirror of https://github.com/2006-Scape/2006Scape.git synced 2026-07-02 16:49:03 +00:00
Code Issues 4.5k Packages Projects Releases 10 Wiki Activity

[PR #504] [MERGED] Mage Training Arena and stuff #5442

New Issue
Closed
opened 2026-05-27 12:22:30 +00:00 by Dark98 · 0 comments
Dark98 commented 2026-05-27 12:22:30 +00:00
Owner
Copy Link
Copy Source

📋 Pull Request Information

Original PR: https://github.com/2006-Scape/2006Scape/pull/504
Author: @RedSparr0w
Created: 9/30/2021
Status: ✅ Merged
Merged: 9/30/2021
Merged by: @Dark98

Base: master ← Head: stuff-n-things

📝 Commits (10+)

  • 44df34f Fixup door/stairs in mage training arena
  • 56e76a1 Fixup bedsheets, should be worn on head, not weapon slot
  • e75275e [Mage Training Arena] spawn rewards guardian
  • dce1012 [Mage Training Arena] Add arena teleports (non functioning)
  • cd6eda9 Just adding some comments
  • f523951 [Mage Training Arena] Basic mage training arena stuff
  • de4d059 [Mage Training Arena] Allow shop to open and show items correctly
  • 723682e [Mage Training Arena] Show shop prices when clicked
  • 936e73b noclip
  • d9ad718 [Mage Training Arena] Add 2nd option handler (filler)

📊 Changes

23 files changed (+821 additions, -418 deletions)

View changed files

📝 2006Scape Client/src/main/java/CollisionMap.java (+2 -0)
📝 2006Scape Client/src/main/java/Game.java (+6 -0)
📝 2006Scape Server/data/cfg/spawns.json (+51 -1)
📝 2006Scape Server/src/main/java/com/rs2/GameEngine.java (+2 -0)
📝 2006Scape Server/src/main/java/com/rs2/game/content/combat/magic/Enchanting.java (+30 -32)
📝 2006Scape Server/src/main/java/com/rs2/game/content/combat/magic/MagicRequirements.java (+16 -27)
➖ 2006Scape Server/src/main/java/com/rs2/game/content/minigames/MageArena.java (+0 -267)
➕ 2006Scape Server/src/main/java/com/rs2/game/content/minigames/magetrainingarena/Alchemy.java (+148 -0)
➕ 2006Scape Server/src/main/java/com/rs2/game/content/minigames/magetrainingarena/Enchanting.java (+36 -0)
➕ 2006Scape Server/src/main/java/com/rs2/game/content/minigames/magetrainingarena/MageTrainingArena.java (+288 -0)
📝 2006Scape Server/src/main/java/com/rs2/game/content/skills/smithing/Superheat.java (+1 -1)
📝 2006Scape Server/src/main/java/com/rs2/game/items/ItemAssistant.java (+3 -0)
📝 2006Scape Server/src/main/java/com/rs2/game/items/ItemData.java (+10 -1)
📝 2006Scape Server/src/main/java/com/rs2/game/npcs/NpcActions.java (+5 -1)
📝 2006Scape Server/src/main/java/com/rs2/game/objects/ObjectsActions.java (+59 -1)
📝 2006Scape Server/src/main/java/com/rs2/game/players/Player.java (+16 -3)
📝 2006Scape Server/src/main/java/com/rs2/game/players/PlayerAssistant.java (+94 -78)
📝 2006Scape Server/src/main/java/com/rs2/game/players/PlayerSave.java (+26 -0)
📝 2006Scape Server/src/main/java/com/rs2/net/PacketSender.java (+2 -2)
📝 2006Scape Server/src/main/java/com/rs2/net/packets/impl/Bank5.java (+4 -0)

...and 3 more files

📄 Description

Mage Training Arena:

  • Fixed stairs/door/teleports.
  • Teleports disabled still currently.
  • Added rewards guardian.
  • Added rewards shop correctly.
  • Lock bones to peaches behind shop.
  • Fully functional Alchemy arena

Other:

  • Allow bedsheets to be worn on head instead of in weapon slot
    • need to figure out how to apply the transform into "ghost" (1707 bedsheet, 1708 ecto bedsheet) with correct animations and be able to transform back once taken off

🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.

## 📋 Pull Request Information **Original PR:** https://github.com/2006-Scape/2006Scape/pull/504 **Author:** [@RedSparr0w](https://github.com/RedSparr0w) **Created:** 9/30/2021 **Status:** ✅ Merged **Merged:** 9/30/2021 **Merged by:** [@Dark98](https://github.com/Dark98) **Base:** `master` ← **Head:** `stuff-n-things` --- ### 📝 Commits (10+) - [`44df34f`](https://github.com/2006-Scape/2006Scape/commit/44df34f1ce272ce1468f6c08ba638e560fd4b7d7) Fixup door/stairs in mage training arena - [`56e76a1`](https://github.com/2006-Scape/2006Scape/commit/56e76a1c2c33dab0ed29de5da54edb180320bbdd) Fixup bedsheets, should be worn on head, not weapon slot - [`e75275e`](https://github.com/2006-Scape/2006Scape/commit/e75275e55cc53fef1ba78af258ba477a00d504a9) [Mage Training Arena] spawn rewards guardian - [`dce1012`](https://github.com/2006-Scape/2006Scape/commit/dce101237c9ed14d93d9d64e537c36dc779d53e5) [Mage Training Arena] Add arena teleports (non functioning) - [`cd6eda9`](https://github.com/2006-Scape/2006Scape/commit/cd6eda94c8cf577bc2a51924a7f56cb4613348ba) Just adding some comments - [`f523951`](https://github.com/2006-Scape/2006Scape/commit/f523951775cc20900bba1a3acc1ff5ab6443c42f) [Mage Training Arena] Basic mage training arena stuff - [`de4d059`](https://github.com/2006-Scape/2006Scape/commit/de4d059cadc3d188ab0fd2a8e0b8a97e16e8542e) [Mage Training Arena] Allow shop to open and show items correctly - [`723682e`](https://github.com/2006-Scape/2006Scape/commit/723682e30c10357f6693f41e6b48e545a970cd25) [Mage Training Arena] Show shop prices when clicked - [`936e73b`](https://github.com/2006-Scape/2006Scape/commit/936e73bf742cfaf1879061fd41bb17e9df88d1fc) noclip - [`d9ad718`](https://github.com/2006-Scape/2006Scape/commit/d9ad718358ae5fb38f8a2c8ad2b1f3da9bc3f623) [Mage Training Arena] Add 2nd option handler (filler) ### 📊 Changes **23 files changed** (+821 additions, -418 deletions) <details> <summary>View changed files</summary> 📝 `2006Scape Client/src/main/java/CollisionMap.java` (+2 -0) 📝 `2006Scape Client/src/main/java/Game.java` (+6 -0) 📝 `2006Scape Server/data/cfg/spawns.json` (+51 -1) 📝 `2006Scape Server/src/main/java/com/rs2/GameEngine.java` (+2 -0) 📝 `2006Scape Server/src/main/java/com/rs2/game/content/combat/magic/Enchanting.java` (+30 -32) 📝 `2006Scape Server/src/main/java/com/rs2/game/content/combat/magic/MagicRequirements.java` (+16 -27) ➖ `2006Scape Server/src/main/java/com/rs2/game/content/minigames/MageArena.java` (+0 -267) ➕ `2006Scape Server/src/main/java/com/rs2/game/content/minigames/magetrainingarena/Alchemy.java` (+148 -0) ➕ `2006Scape Server/src/main/java/com/rs2/game/content/minigames/magetrainingarena/Enchanting.java` (+36 -0) ➕ `2006Scape Server/src/main/java/com/rs2/game/content/minigames/magetrainingarena/MageTrainingArena.java` (+288 -0) 📝 `2006Scape Server/src/main/java/com/rs2/game/content/skills/smithing/Superheat.java` (+1 -1) 📝 `2006Scape Server/src/main/java/com/rs2/game/items/ItemAssistant.java` (+3 -0) 📝 `2006Scape Server/src/main/java/com/rs2/game/items/ItemData.java` (+10 -1) 📝 `2006Scape Server/src/main/java/com/rs2/game/npcs/NpcActions.java` (+5 -1) 📝 `2006Scape Server/src/main/java/com/rs2/game/objects/ObjectsActions.java` (+59 -1) 📝 `2006Scape Server/src/main/java/com/rs2/game/players/Player.java` (+16 -3) 📝 `2006Scape Server/src/main/java/com/rs2/game/players/PlayerAssistant.java` (+94 -78) 📝 `2006Scape Server/src/main/java/com/rs2/game/players/PlayerSave.java` (+26 -0) 📝 `2006Scape Server/src/main/java/com/rs2/net/PacketSender.java` (+2 -2) 📝 `2006Scape Server/src/main/java/com/rs2/net/packets/impl/Bank5.java` (+4 -0) _...and 3 more files_ </details> ### 📄 Description **_Mage Training Arena:_** - Fixed stairs/door/teleports. - Teleports disabled still currently. - Added rewards guardian. - Added rewards shop correctly. - Lock bones to peaches behind shop. - Fully functional Alchemy arena **_Other:_** - Allow bedsheets to be worn on head instead of in weapon slot - _need to figure out how to apply the transform into "ghost" (1707 bedsheet, 1708 ecto bedsheet) with correct animations and be able to transform back once taken off_ --- <sub>🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.</sub>
Dark98 added the pull-request label 2026-05-27 12:22:30 +00:00
Sign in to join this conversation.
No Branch/Tag Specified
Branches Tags
Labels
Clear labels
Cannot Reproduce
Difficulty: Easy
Difficulty: Easy
Difficulty: Hard
Difficulty: Medium
Documentation
enhancement
Highest Priority of Type
New Content
New Content
pull-request
Mirrored from GitHub Pull Request
 QoL
No Label pull-request
Milestone
No items
No Milestone
Projects
Clear projects
No project
Assignees
Clear assignees
Dark98
No Assignees
1 Participants
Notifications
Due Date
No due date set.
Dependencies

No dependencies set.

Reference: 2006-Scape/2006Scape#5442
Delete Branch "%!s()"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?