cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-07-09 15:15:34 +01:00
Code Issues Packages Projects Releases Wiki Activity

[MIRROR] Move current pick_weight consumers to not pass in zeros [MDB IGNORE] (#9647)

Browse Source 
* Move current pick_weight consumers to not pass in zeros (#62940)

About The Pull Request

pick_weight_allow_zero was a backwards compatible hack, so it exists alongside pick_weight.

I would really like to just remove the old proc and just rename it, so I want to log what, if anything, is relying on this behavior, to see if it's a bug or if it needs to be handled especially in that case.

* Move current pick_weight consumers to not pass in zeros

Co-authored-by: Mothblocks <35135081+Mothblocks@users.noreply.github.com>
This commit is contained in:
SkyratBot
2021-11-23 13:39:03 +00:00
committed by GitHub
parent 0e9e5d9160
commit 8bcb0dfd7a
6 changed files with 28 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/effects/spawners/random/random.dm
+19 -4
View File
@@ -62,9 +62,9 @@
if(loot?.len)
var/loot_spawned = 0
while((spawn_loot_count-loot_spawned) && loot.len)
var/lootspawn = pick_weight(loot)
var/lootspawn = pick_weight(fill_with_ones(loot))
while(islist(lootspawn))
lootspawn = pick_weight(lootspawn)
lootspawn = pick_weight(fill_with_ones(lootspawn))
if(!spawn_loot_double)
loot.Remove(lootspawn)
if(lootspawn && (spawn_scatter_radius == 0 || spawn_locations.len))
@@ -139,7 +139,22 @@
stat_table[item] /= loot_count
/obj/item/loot_table_maker/proc/pick_loot(lootpool) //selects path from loot table and returns it
var/lootspawn = pick_weight(lootpool)
var/lootspawn = pick_weight(fill_with_ones(lootpool))
while(islist(lootspawn))
lootspawn = pick_weight(lootspawn)
lootspawn = pick_weight(fill_with_ones(lootspawn))
return lootspawn
// Lets loot tables be both list(a, b, c), as well as list(a = 3, b = 2, c = 2)
/proc/fill_with_ones(list/table)
if (!islist(table))
return table
var/list/final_table = list()
for (var/key in table)
if (table[key])
final_table[key] = table[key]
else
final_table[key] = 1
return final_table