Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[TM] Spaceloot changes #1764

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open

[TM] Spaceloot changes #1764

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
c02b94e
Tweak spaceloot pool available points
m-dzianishchyts Jan 24, 2025
a19668b
Fix return value of pool spawner initialization
m-dzianishchyts Jan 24, 2025
2a5142b
Do not copy the list to count
m-dzianishchyts Jan 24, 2025
51dfa27
bruh
m-dzianishchyts Jan 24, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion code/game/objects/effects/spawners/random/pool/pool_spawner.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@
pool.guaranteed_spawners |= src
else
pool.known_spawners |= src
return INITIALIZE_HINT_QDEL
return INITIALIZE_HINT_NORMAL

/obj/effect/spawner/random/pool/generate_loot_list()
var/datum/spawn_pool/pool = GLOB.spawn_pool_manager.get(spawn_pool_id)
Expand Down
5 changes: 4 additions & 1 deletion code/game/objects/effects/spawners/random/pool/spawn_pool.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,13 +38,15 @@
process_guaranteed_spawners()

shuffle_inplace(known_spawners)
var/spawners_remaining = length(known_spawners)
while(length(known_spawners))
if(available_points <= 0)
break

var/obj/effect/spawner/random/pool/spawner = known_spawners[length(known_spawners)]
known_spawners.len--
if(spawner.point_value != INFINITY && available_points < spawner.point_value)
log_game("not enough points to spawn [spawner] ([available_points]/[spawner.point_value]).")
qdel(spawner)
continue

Expand All @@ -53,8 +55,9 @@
WARNING("non-guaranteed spawner [spawner.type] spawned a guaranteed spawner, this should be avoided")
process_guaranteed_spawners()

spawners_remaining--
qdel(spawner)

log_game("finished spawner [id] with [length(known_spawners)] remaining spawners and [available_points] points remaining.")
log_game("finished spawner [id] with [spawners_remaining] remaining spawners and [available_points]/[initial(available_points)] points remaining.")

QDEL_LIST_CONTENTS(known_spawners)
1 change: 1 addition & 0 deletions modular_ss220/balance/_balance.dme
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
#include "code/items/storage/surgical_tray.dm"
#include "code/items/storage/closets.dm"
#include "code/jobs/warden.dm"
#include "code/loot/pools.dm"
#include "code/mobs/aliens/larva.dm"
#include "code/species/machine.dm"
#include "code/species/skrell.dm"
2 changes: 2 additions & 0 deletions modular_ss220/balance/code/loot/pools.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
/datum/spawn_pool/spaceloot
available_points = 2200 // tweak available points considering centcomm and away mission
Loading