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 #373] [MERGED] Range/Specials/Clean up #3237

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

📋 Pull Request Information

Original PR: https://github.com/2006-Scape/2006Scape/pull/373
Author: @mrextremez
Created: 2/10/2020
Status: ✅ Merged
Merged: 2/11/2020
Merged by: @dginovker

Base: master ← Head: newchanges

📝 Commits (2)

📊 Changes

28 files changed (+1419 additions, -1959 deletions)

View changed files

📝 2006Redone Client/bin/ClientSettings.class (+0 -0)
📝 2006Redone Client/bin/Main.class (+0 -0)
📝 2006Redone Client/src/ClientSettings.java (+1 -1)
📝 2006Redone Client/src/Main.java (+1 -1)
📝 2006Redone Server/data/cfg/npc.cfg (+115 -115)
➕ 2006Redone Server/data/logs/commands/andrew55.txt (+2 -0)
📝 2006Redone Server/src/main/java/com/rebotted/GameConstants.java (+1 -1)
📝 2006Redone Server/src/main/java/com/rebotted/game/content/combat/CombatAssistant.java (+811 -1263)
📝 2006Redone Server/src/main/java/com/rebotted/game/content/combat/Specials.java (+8 -10)
📝 2006Redone Server/src/main/java/com/rebotted/game/content/combat/npcs/NpcCombat.java (+22 -50)
📝 2006Redone Server/src/main/java/com/rebotted/game/content/combat/range/RangeData.java (+37 -14)
📝 2006Redone Server/src/main/java/com/rebotted/game/content/skills/SkillHandler.java (+3 -3)
📝 2006Redone Server/src/main/java/com/rebotted/game/content/skills/cooking/Cooking.java (+42 -80)
📝 2006Redone Server/src/main/java/com/rebotted/game/content/skills/firemaking/Firemaking.java (+2 -2)
📝 2006Redone Server/src/main/java/com/rebotted/game/content/skills/runecrafting/Runecrafting.java (+0 -1)
📝 2006Redone Server/src/main/java/com/rebotted/game/content/skills/smithing/Smithing.java (+153 -168)
📝 2006Redone Server/src/main/java/com/rebotted/game/objects/ObjectsActions.java (+0 -2)
📝 2006Redone Server/src/main/java/com/rebotted/game/objects/impl/SpecialObjects.java (+0 -1)
📝 2006Redone Server/src/main/java/com/rebotted/game/players/Player.java (+103 -79)
📝 2006Redone Server/src/main/java/com/rebotted/game/players/PlayerAssistant.java (+0 -13)

...and 8 more files

📄 Description

  • Added correct range distance for all range weapons
  • Fixed whip special attack when using on npcs
  • Removed some warnings
  • Refactored combat some
  • Fixed a few typos
  • Deleted some dead code
  • Fixed bug where you could kill players with auto retaliate outside of the wilderness if you were already fighting them when they ran out

Closes #146
Closes #352

Also from a previous patch
Closes #329

🔄 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/373 **Author:** [@mrextremez](https://github.com/mrextremez) **Created:** 2/10/2020 **Status:** ✅ Merged **Merged:** 2/11/2020 **Merged by:** [@dginovker](https://github.com/dginovker) **Base:** `master` ← **Head:** `newchanges` --- ### 📝 Commits (2) - [`5ab79b1`](https://github.com/2006-Scape/2006Scape/commit/5ab79b112835c0436d4cd5f619243c80ef8a086c) Range/Specials/Clean up - [`217f341`](https://github.com/2006-Scape/2006Scape/commit/217f341d7dd8ce32d92ff0545d3c096b1eb876dc) quick ### 📊 Changes **28 files changed** (+1419 additions, -1959 deletions) <details> <summary>View changed files</summary> 📝 `2006Redone Client/bin/ClientSettings.class` (+0 -0) 📝 `2006Redone Client/bin/Main.class` (+0 -0) 📝 `2006Redone Client/src/ClientSettings.java` (+1 -1) 📝 `2006Redone Client/src/Main.java` (+1 -1) 📝 `2006Redone Server/data/cfg/npc.cfg` (+115 -115) ➕ `2006Redone Server/data/logs/commands/andrew55.txt` (+2 -0) 📝 `2006Redone Server/src/main/java/com/rebotted/GameConstants.java` (+1 -1) 📝 `2006Redone Server/src/main/java/com/rebotted/game/content/combat/CombatAssistant.java` (+811 -1263) 📝 `2006Redone Server/src/main/java/com/rebotted/game/content/combat/Specials.java` (+8 -10) 📝 `2006Redone Server/src/main/java/com/rebotted/game/content/combat/npcs/NpcCombat.java` (+22 -50) 📝 `2006Redone Server/src/main/java/com/rebotted/game/content/combat/range/RangeData.java` (+37 -14) 📝 `2006Redone Server/src/main/java/com/rebotted/game/content/skills/SkillHandler.java` (+3 -3) 📝 `2006Redone Server/src/main/java/com/rebotted/game/content/skills/cooking/Cooking.java` (+42 -80) 📝 `2006Redone Server/src/main/java/com/rebotted/game/content/skills/firemaking/Firemaking.java` (+2 -2) 📝 `2006Redone Server/src/main/java/com/rebotted/game/content/skills/runecrafting/Runecrafting.java` (+0 -1) 📝 `2006Redone Server/src/main/java/com/rebotted/game/content/skills/smithing/Smithing.java` (+153 -168) 📝 `2006Redone Server/src/main/java/com/rebotted/game/objects/ObjectsActions.java` (+0 -2) 📝 `2006Redone Server/src/main/java/com/rebotted/game/objects/impl/SpecialObjects.java` (+0 -1) 📝 `2006Redone Server/src/main/java/com/rebotted/game/players/Player.java` (+103 -79) 📝 `2006Redone Server/src/main/java/com/rebotted/game/players/PlayerAssistant.java` (+0 -13) _...and 8 more files_ </details> ### 📄 Description - Added correct range distance for all range weapons - Fixed whip special attack when using on npcs - Removed some warnings - Refactored combat some - Fixed a few typos - Deleted some dead code - Fixed bug where you could kill players with auto retaliate outside of the wilderness if you were already fighting them when they ran out Closes #146 Closes #352 Also from a previous patch Closes #329 --- <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-24 12:21:07 +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#3237
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?