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 #313] [MERGED] Cats/kalphite queen/random #7371

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

📋 Pull Request Information

Original PR: https://github.com/2006-Scape/2006Scape/pull/313
Author: @mrextremez
Created: 12/22/2019
Status: ✅ Merged
Merged: 12/22/2019
Merged by: @dginovker

Base: master ← Head: updates

📝 Commits (1)

  • f9e07ed Cats/kalphite queen/random

📊 Changes

30 files changed (+368 additions, -1580 deletions)

View changed files

📝 2006Redone Client/bin/ClientSettings.class (+0 -0)
📝 2006Redone Client/bin/Flo.class (+0 -0)
📝 2006Redone Client/bin/Game.class (+0 -0)
➖ 2006Redone Server/data/cfg/doors.cfg (+0 -68)
➖ 2006Redone Server/data/cfg/global-objects.cfg (+0 -3)
📝 2006Redone Server/data/cfg/npc.cfg (+3 -0)
➖ 2006Redone Server/data/doorsbackup.txt (+0 -1023)
📝 2006Redone Server/data/doubledoors.txt (+0 -2)
📝 2006Redone Server/data/logs/commands/andrew5.txt (+4 -0)
📝 2006Redone Server/src/com/rebotted/game/content/combat/npcs/NpcCombat.java (+50 -34)
📝 2006Redone Server/src/com/rebotted/game/content/combat/npcs/NpcEmotes.java (+9 -1)
📝 2006Redone Server/src/com/rebotted/game/content/minigames/PestControl.java (+2 -2)
📝 2006Redone Server/src/com/rebotted/game/dialogues/DialogueHandler.java (+4 -3)
📝 2006Redone Server/src/com/rebotted/game/globalworldobjects/Doors.java (+5 -1)
📝 2006Redone Server/src/com/rebotted/game/globalworldobjects/DoubleDoors.java (+3 -1)
📝 2006Redone Server/src/com/rebotted/game/items/ItemAssistant.java (+1 -1)
📝 2006Redone Server/src/com/rebotted/game/npcs/Npc.java (+1 -0)
📝 2006Redone Server/src/com/rebotted/game/npcs/NpcActions.java (+22 -29)
📝 2006Redone Server/src/com/rebotted/game/npcs/NpcData.java (+3 -8)
📝 2006Redone Server/src/com/rebotted/game/npcs/NpcHandler.java (+132 -23)

...and 10 more files

📄 Description

  • Deleted a few unnecessary files/cleaned up a couple minor things
  • Worked on improving cats
    (Added cat following, fixed any pet that was not working, fixes some bugs, and added rat catching (still needs more testing but seems good)
  • Did some work with the kalphite queen, seems pretty solid now. Needs more testing though
  • Increased rate of healing for healers at jad
  • Replaced all _ with blank when grabbing npc names
  • Party room chest no longer deletes bank items

Closes #258
Closes #288
Closes #238
Closes #277

🔄 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/313 **Author:** [@mrextremez](https://github.com/mrextremez) **Created:** 12/22/2019 **Status:** ✅ Merged **Merged:** 12/22/2019 **Merged by:** [@dginovker](https://github.com/dginovker) **Base:** `master` ← **Head:** `updates` --- ### 📝 Commits (1) - [`f9e07ed`](https://github.com/2006-Scape/2006Scape/commit/f9e07edb74eddcaa51d15f5d83503d462abc8260) Cats/kalphite queen/random ### 📊 Changes **30 files changed** (+368 additions, -1580 deletions) <details> <summary>View changed files</summary> 📝 `2006Redone Client/bin/ClientSettings.class` (+0 -0) 📝 `2006Redone Client/bin/Flo.class` (+0 -0) 📝 `2006Redone Client/bin/Game.class` (+0 -0) ➖ `2006Redone Server/data/cfg/doors.cfg` (+0 -68) ➖ `2006Redone Server/data/cfg/global-objects.cfg` (+0 -3) 📝 `2006Redone Server/data/cfg/npc.cfg` (+3 -0) ➖ `2006Redone Server/data/doorsbackup.txt` (+0 -1023) 📝 `2006Redone Server/data/doubledoors.txt` (+0 -2) 📝 `2006Redone Server/data/logs/commands/andrew5.txt` (+4 -0) 📝 `2006Redone Server/src/com/rebotted/game/content/combat/npcs/NpcCombat.java` (+50 -34) 📝 `2006Redone Server/src/com/rebotted/game/content/combat/npcs/NpcEmotes.java` (+9 -1) 📝 `2006Redone Server/src/com/rebotted/game/content/minigames/PestControl.java` (+2 -2) 📝 `2006Redone Server/src/com/rebotted/game/dialogues/DialogueHandler.java` (+4 -3) 📝 `2006Redone Server/src/com/rebotted/game/globalworldobjects/Doors.java` (+5 -1) 📝 `2006Redone Server/src/com/rebotted/game/globalworldobjects/DoubleDoors.java` (+3 -1) 📝 `2006Redone Server/src/com/rebotted/game/items/ItemAssistant.java` (+1 -1) 📝 `2006Redone Server/src/com/rebotted/game/npcs/Npc.java` (+1 -0) 📝 `2006Redone Server/src/com/rebotted/game/npcs/NpcActions.java` (+22 -29) 📝 `2006Redone Server/src/com/rebotted/game/npcs/NpcData.java` (+3 -8) 📝 `2006Redone Server/src/com/rebotted/game/npcs/NpcHandler.java` (+132 -23) _...and 10 more files_ </details> ### 📄 Description - Deleted a few unnecessary files/cleaned up a couple minor things - Worked on improving cats (Added cat following, fixed any pet that was not working, fixes some bugs, and added rat catching (still needs more testing but seems good) - Did some work with the kalphite queen, seems pretty solid now. Needs more testing though - Increased rate of healing for healers at jad - Replaced all _ with blank when grabbing npc names - Party room chest no longer deletes bank items Closes #258 Closes #288 Closes #238 Closes #277 --- <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-30 12:21:40 +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#7371
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?