2009Scape/Server
1
0
Fork 1
mirror of https://gitlab.com/2009scape/2009scape.git synced 2025-12-21 09:02:07 -07:00
Code Issues Projects Releases Packages Wiki Activity

Fix: Rats, Shades and their Robes, misc fixes

Browse source 
- Rats now have corrected stats, attack speed and bonuses (should no longer be able to hit players at all, like they do authentically)
- Rats now correctly respawn at a high rate (quite close to 1 game tick now!)
- Rats can now correctly count as Rat slayer monsters for tasks
- Rats (Stronghold of Security) now correctly count as Rat slayer monsters for tasks

- Bloodveld respawn delay corrected

- Shade robe top and Shade robe bottom are now correctly obtainable, as a low% drop from Shades in the Stronghold of Security
- Shades now correctly count as Shade slayer monsters for the Shade Task
- Shade stats corrected
- Shade NPCs repopulated where they should be inside the Lv4 Stronghold of Security
- Small typo correction to a string printed when cooking with an iron spit (StandardCookingPulse.java)

- Dwarven rock cake now has correct, authentic text when trying to consume it
This commit is contained in:
skelsoft 2021-08-06 10:19:11 +10:00
parent 5bf5ef4f97
commit 25f08378a3
5 changed files with 443 additions and 391 deletions
Download patch file Download diff file Expand all files Collapse all files

26
Server/data/configs/drop_tables.json
View file

@ -62767,5 +62767,31 @@
"maxAmount": "1"
}
]
},
{
"default": [],
"charm": [],
"ids": "428, 429",
"description": "Shade (Stronghold of Security) (So Shade Robes can drop)",
"main": [
{
"minAmount": "1",
"weight": "0.1",
"id": "546",
"maxAmount": "1"
},
{
"minAmount": "1",
"weight": "0.1",
"id": "548",
"maxAmount": "1"
},
{
"minAmount": "1",
"weight": "1.0",
"id": "0",
"maxAmount": "1"
}
]
}
]

40
Server/data/configs/npc_configs.json
View file

@ -846,11 +846,15 @@
},
{
"examine": "A popular dwarven delicacy.",
"slayer_task": "67",
"melee_animation": "2705",
"range_animation": "2705",
"combat_audio": "3102,3104,3103",
"attack_speed": "5",
"attack_speed": "4",
"magic_level": "1",
"respawn_delay": "3",
"defence_animation": "2706",
"slayer_exp": "2",
"magic_animation": "2705",
"death_animation": "2707",
"name": "Rat",
@ -859,6 +863,7 @@
"lifepoints": "2",
"strength_level": "1",
"id": "47",
"bonuses": "-47,-47,-47,0,0,-42,-42,-42,-42,-42,-42,-53,0,0,0",
"range_level": "1",
"attack_level": "1"
},
@ -5446,10 +5451,13 @@
},
{
"examine": "Dead but not gone.",
"slayer_task": "73",
"melee_animation": "390",
"range_animation": "0",
"respawn_delay": "60",
"defence_animation": "0",
"weakness": "9",
"slayer_exp": "4.2",
"magic_animation": "0",
"death_animation": "836",
"name": "Shade",
@ -5463,20 +5471,25 @@
},
{
"examine": "Dead but not gone.",
"slayer_task": "73",
"melee_animation": "390",
"range_animation": "0",
"magic_level": "1",
"respawn_delay": "60",
"defence_animation": "0",
"weakness": "9",
"slayer_exp": "4.2",
"magic_animation": "0",
"death_animation": "836",
"name": "Shade",
"defence_level": "90",
"defence_level": "130",
"safespot": null,
"lifepoints": "71",
"lifepoints": "170",
"strength_level": "90",
"id": "429",
"bonuses": "0,0,0,0,0,0,0,0,0,0,0,0,0,0,0",
"range_level": "1",
"attack_level": "90"
"attack_level": "130"
},
{
"examine": "Dead but not gone.",
@ -16514,6 +16527,7 @@
"melee_animation": "9130",
"range_animation": "1552",
"attack_speed": "4",
"respawn_delay": "60",
"defence_animation": "9132",
"slayer_exp": "120",
"magic_animation": "1552",
@ -16534,6 +16548,7 @@
"melee_animation": "9130",
"range_animation": "1552",
"attack_speed": "4",
"respawn_delay": "60",
"defence_animation": "9132",
"slayer_exp": "120",
"magic_animation": "1552",
@ -37309,11 +37324,15 @@
},
{
"examine": "A popular dwarven delicacy.",
"slayer_task": "67",
"melee_animation": "2705",
"range_animation": "2705",
"combat_audio": "3102,3104,3103",
"attack_speed": "5",
"attack_speed": "4",
"magic_level": "1",
"respawn_delay": "3",
"defence_animation": "2706",
"slayer_exp": "2",
"magic_animation": "2705",
"death_animation": "2707",
"name": "Rat",
@ -37322,6 +37341,7 @@
"lifepoints": "2",
"strength_level": "1",
"id": "4415",
"bonuses": "-47,-47,-47,0,0,-42,-42,-42,-42,-42,-42,-53,0,0,0",
"range_level": "1",
"attack_level": "1"
},
@ -53453,6 +53473,7 @@
"melee_animation": "9130",
"range_animation": "1552",
"attack_speed": "4",
"respawn_delay": "60",
"defence_animation": "9132",
"slayer_exp": "120",
"magic_animation": "1552",
@ -90753,6 +90774,7 @@
"melee_animation": "9130",
"range_animation": "1552",
"attack_speed": "4",
"respawn_delay": "60",
"defence_animation": "9132",
"slayer_exp": "120",
"magic_animation": "1552",
@ -90773,6 +90795,7 @@
"melee_animation": "9130",
"range_animation": "1552",
"attack_speed": "4",
"respawn_delay": "60",
"defence_animation": "9132",
"slayer_exp": "120",
"magic_animation": "1552",
@ -127865,6 +127888,7 @@
"melee_animation": "9130",
"range_animation": "1552",
"attack_speed": "4",
"respawn_delay": "60",
"defence_animation": "9132",
"slayer_exp": "120",
"magic_animation": "1552",
@ -165173,6 +165197,7 @@
"melee_animation": "9130",
"range_animation": "1552",
"attack_speed": "4",
"respawn_delay": "60",
"defence_animation": "9132",
"slayer_exp": "120",
"magic_animation": "1552",
@ -165193,6 +165218,7 @@
"melee_animation": "9130",
"range_animation": "1552",
"attack_speed": "4",
"respawn_delay": "60",
"defence_animation": "9132",
"slayer_exp": "120",
"magic_animation": "1552",
@ -202037,6 +202063,7 @@
"melee_animation": "9130",
"range_animation": "1552",
"attack_speed": "4",
"respawn_delay": "60",
"defence_animation": "9132",
"slayer_exp": "120",
"magic_animation": "1552",
@ -239337,6 +239364,7 @@
"melee_animation": "9130",
"range_animation": "1552",
"attack_speed": "4",
"respawn_delay": "60",
"defence_animation": "9132",
"slayer_exp": "120",
"magic_animation": "1552",
@ -239357,6 +239385,7 @@
"melee_animation": "9130",
"range_animation": "1552",
"attack_speed": "4",
"respawn_delay": "60",
"defence_animation": "9132",
"slayer_exp": "120",
"magic_animation": "1552",
@ -276449,6 +276478,7 @@
"melee_animation": "9130",
"range_animation": "1552",
"attack_speed": "4",
"respawn_delay": "60",
"defence_animation": "9132",
"slayer_exp": "120",
"magic_animation": "1552",

6
Server/data/configs/npc_spawns.json
View file

@ -1119,13 +1119,9 @@
"npc_id": "425",
"loc_data": "{2717,5332,0,1,7}"
},
{
"npc_id": "428",
"loc_data": "{2361,5209,0,1,4}-{2359,5213,0,1,1}-{2364,5215,0,1,6}-{2361,5216,0,1,1}-{2361,5212,0,1,0}"
},
{
"npc_id": "429",
"loc_data": "{2363,5214,0,1,6}-{2358,5214,0,1,7}-{2361,5212,0,1,6}"
"loc_data": "{2363,5214,0,1,6}-{2358,5214,0,1,7}-{2361,5212,0,1,6}-{2361,5209,0,1,4}-{2359,5213,0,1,1}-{2364,5215,0,1,6}-{2361,5216,0,1,1}-{2361,5212,0,1,0}"
},
{
"npc_id": "437",

4
Server/src/main/java/core/game/content/consumable/Consumables.java
View file

@ -97,8 +97,8 @@ public enum Consumables {
CAKE(new Cake(new int[] {1891, 1893, 1895}, new HealingEffect(4), "You eat part of the cake.", "You eat some more cake.", "You eat the slice of cake.")),
CHOCOLATE_CAKE(new Cake(new int[] {1897, 1899, 1901}, new HealingEffect(5), "You eat part of the chocolate cake.", "You eat some more of the chocolate cake.", "You eat the slice of cake.")),
ROCK_CAKE(new Food(new int[] {2379}, new RockCakeEffect(), "The rock cake resists all attempts to eat it.")),
DWARVEN_ROCK_CAKE(new Food(new int[] {7510, 7510}, new DwarvenRockCakeEffect())),
HOT_DWARVEN_ROCK_CAKE(new Food(new int[] {7509, 7509}, new DwarvenRockCakeEffect())),
DWARVEN_ROCK_CAKE(new Food(new int[] {7510, 7510}, new DwarvenRockCakeEffect(), "Ow! You nearly broke a tooth!", "The rock cake resists all attempts to eat it.")),
HOT_DWARVEN_ROCK_CAKE(new Food(new int[] {7509, 7509}, new DwarvenRockCakeEffect(), "Ow! You nearly broke a tooth!", "The rock cake resists all attempts to eat it.")),
COOKED_FISHCAKE(new Food(new int[] {7530}, new HealingEffect(11))),
MINT_CAKE(new Food(new int[] {9475}, new EnergyEffect(50))),

2
Server/src/main/java/core/game/node/entity/skill/cooking/StandardCookingPulse.java
View file

@ -150,7 +150,7 @@ public class StandardCookingPulse extends Pulse {
case Items.RAW_RABBIT_3226: // Iron spits
case Items.IRON_SPIT_7225:
if (RandomFunction.random(15) == 5) {
player.getPacketDispatch().sendMessage("Your iron spit seems to have broken in the proccess.");
player.getPacketDispatch().sendMessage("Your iron spit seems to have broken in the process.");
} else {
if (!player.getInventory().add(new Item(Items.IRON_SPIT_7225))) {
GroundItemManager.create(new Item(Items.IRON_SPIT_7225), player.getLocation(), player);