Skip to content

Commit

Permalink
fix(content): Small drop table fixes (#1114)
Browse files Browse the repository at this point in the history 
item name fix shadow warrior drop table.

item name fix shadow warrior drop table.

monk of zamorak
https://oldschool.runescape.wiki/w/Update:F2P_Castle_Wars
  • Loading branch information
@thesuddensilent
thesuddensilent authored Jan 30, 2025
1 parent 48807fc commit 1eacbd3
Show file tree
Hide file tree
Showing 13 changed files with 91 additions and 70 deletions.
2 changes: 1 addition & 1 deletion data/src/scripts/drop tables/scripts/barbarian.rs2
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ if ($random < 6) {
} else if ($random < 26) {
obj_add(npc_coord, mindrune, 5, ^lootdrop_duration);
} else if ($random < 27) {
obj_add(npc_coord, lawrune, 1, ^lootdrop_duration);
obj_add(npc_coord, lawrune, 2, ^lootdrop_duration);
} else if ($random < 69) {
obj_add(npc_coord, coins, 5, ^lootdrop_duration);
} else if ($random < 78) {
Expand Down
2 changes: 1 addition & 1 deletion data/src/scripts/drop tables/scripts/black_knight.rs2
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ if ($random < 4) {
} else if ($random < 25) {
obj_add(npc_coord, cosmicrune, 7, ^lootdrop_duration);
} else if ($random < 26) {
obj_add(npc_coord, mindrune, 1, ^lootdrop_duration);
obj_add(npc_coord, mindrune, 2, ^lootdrop_duration);
} else if ($random < 29) {
obj_add(npc_coord, ~randomherb, ^lootdrop_duration);
} else if ($random < 35) {
Expand Down
6 changes: 3 additions & 3 deletions data/src/scripts/drop tables/scripts/chaos_druid_warrior.rs2
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ if ($random < 1) {
} else if ($random < 6) {
obj_add(npc_coord, firerune, 12, ^lootdrop_duration);
} else if ($random < 10) {
obj_add(npc_coord, lawrune, 22, ^lootdrop_duration);
obj_add(npc_coord, lawrune, 2, ^lootdrop_duration);
} else if ($random < 12) {
obj_add(npc_coord, earthrune, 9, ^lootdrop_duration);
} else if ($random < 13) {
Expand All @@ -37,9 +37,9 @@ if ($random < 1) {
} else if ($random < 68) {
obj_add(npc_coord, snape_grass, 1, ^lootdrop_duration);
} else if ($random < 69) {
obj_add(npc_coord, vial_water, 2, ^lootdrop_duration);
obj_add(npc_coord, vial_water, 1, ^lootdrop_duration);
} else if ($random < 84) {
obj_add(npc_coord, coins, 13, ^lootdrop_duration);
obj_add(npc_coord, coins, 3, ^lootdrop_duration);
} else if ($random < 87) {
obj_add(npc_coord, coins, 29, ^lootdrop_duration);
} else if ($random < 88) {
Expand Down
2 changes: 1 addition & 1 deletion data/src/scripts/drop tables/scripts/dark_wizard.rs2
View file
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ if ($random < 4) {
} else if ($random < 61) {
obj_add(npc_coord, cosmicrune, 2, ^lootdrop_duration);
} else if ($random < 62) {
obj_add(npc_coord, lawrune, 2, ^lootdrop_duration);
obj_add(npc_coord, lawrune, 3, ^lootdrop_duration);
} else if ($random < 79) {
obj_add(npc_coord, coins, 1, ^lootdrop_duration);
} else if ($random < 95) {
Expand Down
2 changes: 1 addition & 1 deletion data/src/scripts/drop tables/scripts/earth_warrior.rs2
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ if ($random < 3) {
} else if ($random < 5) {
obj_add(npc_coord, staff_of_earth, 1, ^lootdrop_duration);
} else if ($random < 18) {
obj_add(npc_coord, earthrune, 13, ^lootdrop_duration);
obj_add(npc_coord, earthrune, 12, ^lootdrop_duration);
} else if ($random < 27) {
obj_add(npc_coord, naturerune, 3, ^lootdrop_duration);
} else if ($random < 34) {
Expand Down
4 changes: 2 additions & 2 deletions data/src/scripts/drop tables/scripts/hobgoblin.rs2
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ if ($random < 3) {
obj_add(npc_coord, goblin_mail, 1, ^lootdrop_duration);
}
} else if ($random < 6) {
obj_add(npc_coord, iron_dagger, 1, ^lootdrop_duration);
obj_add(npc_coord, iron_sword, 1, ^lootdrop_duration);
} else if ($random < 9) {
obj_add(npc_coord, steel_dagger, 1, ^lootdrop_duration);
} else if ($random < 11) {
Expand Down Expand Up @@ -45,7 +45,7 @@ if ($random < 3) {
} else if ($random < 27) {
obj_add(npc_coord, naturerune, 4, ^lootdrop_duration);
} else if ($random < 28) {
obj_add(npc_coord, cosmicrune, 1, ^lootdrop_duration);
obj_add(npc_coord, cosmicrune, 2, ^lootdrop_duration);
} else if ($random < 35) {
obj_add(npc_coord, ~randomherb, ^lootdrop_duration);
} else if ($random < 51) {
Expand Down
18 changes: 0 additions & 18 deletions data/src/scripts/drop tables/scripts/monk_of_zamorak.rs2
View file

This file was deleted.

2 changes: 1 addition & 1 deletion data/src/scripts/drop tables/scripts/paladin.rs2
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ if ($random < 2) {
} else if ($random < 96) {
obj_add(npc_coord, coins, 15, ^lootdrop_duration);
} else if ($random < 112) {
obj_add(npc_coord, coins, 1, ^lootdrop_duration);
obj_add(npc_coord, coins, 2, ^lootdrop_duration);
} else if ($random < 122) {
obj_add(npc_coord, coins, 8, ^lootdrop_duration);
} else if ($random < 124) {
Expand Down
6 changes: 2 additions & 4 deletions data/src/scripts/drop tables/scripts/pirate.rs2
View file
Original file line number Diff line number Diff line change
Expand Up @@ -49,10 +49,8 @@ if ($random < 6) {
}
} else if ($random < 108) {
obj_add(npc_coord, chefshat, 1, ^lootdrop_duration);
} else if ($random < 109) {
if (map_members = true) {
obj_add(npc_coord, iron_bar, 1, ^lootdrop_duration);
}
} else if ($random < 109) { // recheck drop rate %
obj_add(npc_coord, iron_bar, 1, ^lootdrop_duration);
} else if ($random < 110) {
obj_add(npc_coord, ~randomjewel, ^lootdrop_duration);
}
2 changes: 1 addition & 1 deletion data/src/scripts/drop tables/scripts/salarin_the_twisted.rs2
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ if ($random < 1) {
} else if ($random < 10) {
obj_add(npc_coord, lawrune, 2, ^lootdrop_duration);
} else if ($random < 11) {
obj_add(npc_coord, naturerune, 1, ^lootdrop_duration);
obj_add(npc_coord, naturerune, 3, ^lootdrop_duration);
} else if ($random < 12) {
obj_add(npc_coord, firerune, 36, ^lootdrop_duration);
} else if ($random < 51) {
Expand Down
41 changes: 41 additions & 0 deletions data/src/scripts/drop tables/scripts/shadow_warrior.rs2
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
[ai_queue3,shadow_warrior]
gosub(npc_death);
if (npc_findhero = false) {
return;
}

// Default drop from config.
obj_add(npc_coord, npc_param(death_drop), 1, ^lootdrop_duration);

def_int $random = random(128);

if ($random < 128) {
// obj_add(npc_coord, adamantite_spear, 1, ^lootdrop_duration);
//} else if ($random < ?) {
// obj_add(npc_coord, black_dagger_p, 1, ^lootdrop_duration);
//} else if ($random < ?) {
// obj_add(npc_coord, black_knife, 1, ^lootdrop_duration);
//} else if ($random < ?) {
// obj_add(npc_coord, black_longsword, 1, ^lootdrop_duration);
//} else if ($random < ?) {
// obj_add(npc_coord, wizards_robe_black, 1, ^lootdrop_duration);
//} else if ($random < ?) {
// obj_add(npc_coord, cosmicrune, 3, ^lootdrop_duration);
//} else if ($random < ?) {
// obj_add(npc_coord, bloodrune, 2, ^lootdrop_duration);
//} else if ($random < ?) {
// obj_add(npc_coord, airrune, 45, ^lootdrop_duration);
//} else if ($random < ?) {
// obj_add(npc_coord, deathrune, 2, ^lootdrop_duration);
//} else if ($random < ?) {
// obj_add(npc_coord, ~randomherb, ^lootdrop_duration);
//} else if ($random < ?) {
// obj_add(npc_coord, coins, 8, ^lootdrop_duration);
//} else if ($random < ?) {
// obj_add(npc_coord, mithril_bar, 1, ^lootdrop_duration);
//} else if ($random < ?) {
// obj_add(npc_coord, weapon_poison, 1, ^lootdrop_duration);
//} else if ($random < ?) {
// obj_add(npc_coord, ~randomjewel, ^lootdrop_duration);
}
// TODO drop table %
2 changes: 1 addition & 1 deletion data/src/scripts/drop tables/scripts/skeleton.rs2
View file
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ if ($random < 6) {
} else if ($random < 108) {
obj_add(npc_coord, coins, 45, ^lootdrop_duration);
} else if ($random < 111) {
obj_add(npc_coord, coins, 64, ^lootdrop_duration);
obj_add(npc_coord, coins, 65, ^lootdrop_duration);
} else if ($random < 113) {
obj_add(npc_coord, coins, 1, ^lootdrop_duration);
} else if ($random < 118) {
Expand Down
72 changes: 36 additions & 36 deletions data/src/scripts/drop tables/scripts/zombie.rs2
View file
Original file line number Diff line number Diff line change
@@ -1,35 +1,3 @@
[ai_queue3,zombie_entrana]
gosub(npc_death);
if (npc_findhero = false) {
return;
}
obj_add(npc_coord, npc_param(death_drop), 1, ^lootdrop_duration);
def_int $dropint = random(128);
if ($dropint < 50) {
obj_add(npc_coord, bronze_axe, 1, ^lootdrop_duration);
} else if ($dropint < 54) {
obj_add(npc_coord, bronze_med_helm, 1, ^lootdrop_duration);
} else if ($dropint < 55) {
obj_add(npc_coord, bronze_longsword, 1, ^lootdrop_duration);
} else if ($dropint < 56) {
obj_add(npc_coord, iron_axe, 1, ^lootdrop_duration);
} else if ($dropint < 60) {
obj_add(npc_coord, airrune, 13, ^lootdrop_duration);
} else if ($dropint < 64) {
obj_add(npc_coord, bronze_arrow, 8, ^lootdrop_duration);
} else if ($dropint < 65) {
obj_add(npc_coord, naturerune, 6, ^lootdrop_duration);
} else if ($dropint < 69) {
obj_add(npc_coord, ~randomherb, ^lootdrop_duration);
} else if ($dropint < 115) {
obj_add(npc_coord, fishing_bait, 5, ^lootdrop_duration);
} else if ($dropint < 118) {
obj_add(npc_coord, coins, 18, ^lootdrop_duration);
} else if ($dropint < 120) {
obj_add(npc_coord, coins, 28, ^lootdrop_duration);
}
// Nothing - 8/128

// Unarmed Zombie
[ai_queue3,zombie1] @unarmed_zombie;
[ai_queue3,zombie2] @unarmed_zombie;
Expand All @@ -50,7 +18,7 @@ if ($dropint < 4) {
} else if ($dropint < 13) {
obj_add(npc_coord, iron_arrow, 5, ^lootdrop_duration);
} else if ($dropint < 18) {
obj_add(npc_coord, bodyrune, 5, ^lootdrop_duration);
obj_add(npc_coord, bodyrune, 6, ^lootdrop_duration);
} else if ($dropint < 23) {
obj_add(npc_coord, mindrune, 5, ^lootdrop_duration);
} else if ($dropint < 27) {
Expand Down Expand Up @@ -100,7 +68,7 @@ if ($dropint < 3) {
} else if ($dropint < 12) {
obj_add(npc_coord, airrune, 3, ^lootdrop_duration);
} else if ($dropint < 14) {
obj_add(npc_coord, bodyrune, 2, ^lootdrop_duration);
obj_add(npc_coord, bodyrune, 3, ^lootdrop_duration);
} else if ($dropint < 15) {
obj_add(npc_coord, chaosrune, 4, ^lootdrop_duration);
} else if ($dropint < 16) {
Expand All @@ -116,7 +84,7 @@ if ($dropint < 3) {
} else if ($dropint < 86) {
obj_add(npc_coord, coins, 26, ^lootdrop_duration);
} else if ($dropint < 92) {
obj_add(npc_coord, coins, 36, ^lootdrop_duration);
obj_add(npc_coord, coins, 35, ^lootdrop_duration);
} else if ($dropint < 94) {
obj_add(npc_coord, coins, 1, ^lootdrop_duration);
} else if ($dropint < 120) {
Expand All @@ -129,4 +97,36 @@ if ($dropint < 3) {
obj_add(npc_coord, tin_ore, 1, ^lootdrop_duration);
} else if ($dropint < 125) {
obj_add(npc_coord, ~randomjewel, ^lootdrop_duration);
}
}

[ai_queue3,zombie_entrana]
gosub(npc_death);
if (npc_findhero = false) {
return;
}
obj_add(npc_coord, npc_param(death_drop), 1, ^lootdrop_duration);
def_int $dropint = random(128);
if ($dropint < 50) {
obj_add(npc_coord, bronze_axe, 1, ^lootdrop_duration);
} else if ($dropint < 54) {
obj_add(npc_coord, bronze_med_helm, 1, ^lootdrop_duration);
} else if ($dropint < 55) {
obj_add(npc_coord, bronze_longsword, 1, ^lootdrop_duration);
} else if ($dropint < 56) {
obj_add(npc_coord, iron_axe, 1, ^lootdrop_duration);
} else if ($dropint < 60) {
obj_add(npc_coord, airrune, 13, ^lootdrop_duration);
} else if ($dropint < 64) {
obj_add(npc_coord, bronze_arrow, 8, ^lootdrop_duration);
} else if ($dropint < 65) {
obj_add(npc_coord, naturerune, 6, ^lootdrop_duration);
} else if ($dropint < 69) {
obj_add(npc_coord, ~randomherb, ^lootdrop_duration);
} else if ($dropint < 115) {
obj_add(npc_coord, fishing_bait, 5, ^lootdrop_duration);
} else if ($dropint < 118) {
obj_add(npc_coord, coins, 18, ^lootdrop_duration);
} else if ($dropint < 120) {
obj_add(npc_coord, coins, 28, ^lootdrop_duration);
}
// Nothing - 8/128

0 comments on commit 1eacbd3

Please sign in to comment.