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

Merge branch 'jsonify-empty-charms' into 'master'

Browse source 
Move the global 1/15 chance to not drop charms from code to data.

See merge request 2009scape/2009scape!242
This commit is contained in:
Ceikry 2021-09-13 22:13:47 +00:00
commit 4ae2d74b79
2 changed files with 905 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

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

File diff suppressed because it is too large Load diff

9
Server/src/main/kotlin/rs09/game/content/global/NPCDropTable.kt
View file

@ -19,9 +19,10 @@ class NPCDropTable : WeightBasedTable() {
val items= ArrayList<Item>(3)
items.addAll(guaranteedItems.map { it.getItem() }.toList())
if(RandomFunction.random(1,15) == 5){
items.addAll(charmDrops.roll(null))
}
// Charms table is always rolled, and should contain explicit "Nothing"
// entries at the data level to account for the chance to not drop a charm.
items.addAll(charmDrops.roll(null))
if(size == 1){
items.add(get(0).getItem())
return items
@ -45,4 +46,4 @@ class NPCDropTable : WeightBasedTable() {
return items
}
}
}