Skip to content

Commit

Permalink
Separate loot pool for CC (#1801)
Browse files Browse the repository at this point in the history
<!-- Пишите **НИЖЕ** заголовков и **ВЫШЕ** комментариев, иначе что то
может пойти не так. -->
<!-- Вы можете прочитать Contributing.MD, если хотите узнать больше. -->

## Что этот PR делает

Добавляет отдельный пул для лута ЦК (Синди ЦК, если быть точнее).

Удаляет лишние шкафы депота (если на ЦК появлялся какой-то лут -
спавнилось по два шкафа, оба из которых нельзя передвигать. А если не
спавнилось - был один несдвигаемый шкаф).

<!-- Вкратце опишите изменения, которые вносите. -->
<!-- Опишите **все** изменения, так как противное может сказаться на
рассмотрении этого PR'а! -->
<!-- Если вы исправляете Issue, добавьте "Fixes #xxxx" (где xxxx - номер
Issue) где-нибудь в описании PR'а. Это автоматически закроет Issue после
принятия PR'а. -->

## Почему это хорошо для игры

ЦК - гиммик зона, на которую не должны распространяться рамки "баланса".
По этой причине все спавнеры на ней имеют стоимость в 0 очков, а сам пул
имеет бесконечное количество очков для траты. Иными словами, можно
спавнить что угодно и сколь угодно, не влияя на баланс игроков.

Кол-во очков лута для космоса не трогаю, т.к. в планах ещё сделать
отдельный пул для гейтов, и потом уже снизить до 1700 для космоса, как
на оффах.

<!-- Опишите, почему, по вашему, следует добавить эти изменения в игру.
-->

## Тестирование

Запустил локалку, лут появился и без лишних шкафов.

<!-- Как вы тестировали свой PR, если делали это вовсе? -->

## Summary by Sourcery

Introduce a separate loot pool for Central Command.

New Features:
- Added a dedicated loot pool for Central Command with infinite
available points, allowing for diverse item spawns without impacting
game balance.

Tests:
- Tested locally to confirm loot appeared correctly.
  • Loading branch information
kyunkyunkyun authored Feb 13, 2025
1 parent 94532de commit e5e768e
Show file tree
Hide file tree
Showing 2 changed files with 62 additions and 64 deletions.
91 changes: 27 additions & 64 deletions _maps/map_files220/generic/centcomm.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -337,6 +337,7 @@
"aoD" = (
/obj/effect/turf_decal/delivery,
/obj/structure/closet/crate,
/obj/effect/spawner/random/pool/centcommloot/syndicate/mixed,
/turf/simulated/floor/plasteel{
dir = 1;
icon_state = "dark"
Expand Down Expand Up @@ -2076,6 +2077,7 @@
/obj/effect/turf_decal/delivery,
/obj/structure/fans/tiny/invisible,
/obj/structure/closet/crate,
/obj/effect/spawner/random/pool/centcommloot/syndicate/mixed,
/turf/simulated/floor/plasteel{
dir = 1;
icon_state = "dark"
Expand Down Expand Up @@ -5713,6 +5715,7 @@
/obj/effect/turf_decal/delivery,
/obj/structure/light_fake/small,
/obj/structure/closet/crate,
/obj/effect/spawner/random/pool/centcommloot/syndicate/mixed,
/turf/simulated/floor/plasteel{
dir = 1;
icon_state = "dark"
Expand Down Expand Up @@ -11818,8 +11821,7 @@
/area/centcom/ss220/supply)
"haI" = (
/obj/effect/turf_decal/delivery/red,
/obj/effect/spawner/random/pool/spaceloot/syndicate/common/depot,
/obj/structure/closet/secure_closet/depot,
/obj/effect/spawner/random/pool/spaceloot/syndicate/common/depot/centcomm,
/turf/simulated/floor/plasteel{
icon_state = "dark"
},
Expand Down Expand Up @@ -17961,8 +17963,7 @@
dir = 4
},
/obj/effect/turf_decal/delivery/white,
/obj/effect/spawner/random/pool/spaceloot/syndicate/common/depot,
/obj/structure/closet/secure_closet/depot,
/obj/effect/spawner/random/pool/spaceloot/syndicate/common/depot/centcomm,
/turf/simulated/floor/plasteel{
icon_state = "dark"
},
Expand Down Expand Up @@ -19973,8 +19974,8 @@
/area/syndicate_mothership)
"lKt" = (
/obj/effect/turf_decal/delivery,
/obj/effect/spawner/random/pool/spaceloot/syndicate/common/depot,
/obj/structure/closet/secure_closet/depot,
/obj/effect/spawner/random/pool/centcommloot/syndicate/mixed,
/obj/structure/closet/crate,
/turf/simulated/floor/plasteel{
dir = 1;
icon_state = "dark"
Expand Down Expand Up @@ -20849,16 +20850,6 @@
/obj/machinery/computer/shuttle/sit,
/turf/simulated/floor/carpet/black,
/area/syndicate_mothership/control)
"mjW" = (
/obj/structure/light_fake/spot{
dir = 1
},
/obj/effect/spawner/random/pool/spaceloot/syndicate/common/depot,
/obj/structure/closet/secure_closet/depot,
/turf/simulated/floor/plasteel{
icon_state = "darkyellowalt"
},
/area/syndicate_mothership/cargo)
"mkf" = (
/obj/structure/chair/comfy/red{
dir = 1
Expand Down Expand Up @@ -22240,14 +22231,6 @@
icon_state = "darkyellowfull"
},
/area/syndicate_mothership/cargo)
"neJ" = (
/obj/effect/spawner/random/pool/spaceloot/syndicate/common/depot,
/obj/structure/closet/secure_closet/depot,
/turf/simulated/floor/plasteel{
dir = 10;
icon_state = "darkyellowalt"
},
/area/syndicate_mothership/cargo)
"neL" = (
/obj/machinery/economy/slot_machine,
/turf/simulated/floor/carpet/arcade,
Expand Down Expand Up @@ -22455,13 +22438,6 @@
},
/turf/simulated/floor/wood/oak,
/area/syndicate_mothership/control)
"nlb" = (
/obj/effect/spawner/random/pool/spaceloot/syndicate/common/depot,
/obj/structure/closet/secure_closet/depot,
/turf/simulated/floor/plasteel{
icon_state = "dark"
},
/area/syndicate_mothership)
"nlc" = (
/turf/simulated/wall/mineral/titanium,
/area/shuttle/gamma/space)
Expand Down Expand Up @@ -23153,8 +23129,7 @@
dir = 8
},
/obj/effect/turf_decal/delivery/white,
/obj/effect/spawner/random/pool/spaceloot/syndicate/common/depot,
/obj/structure/closet/secure_closet/depot,
/obj/effect/spawner/random/pool/spaceloot/syndicate/common/depot/centcomm,
/turf/simulated/floor/plasteel{
icon_state = "dark"
},
Expand Down Expand Up @@ -23578,8 +23553,7 @@
/area/syndicate_mothership/outside)
"nRS" = (
/obj/effect/turf_decal/delivery/white,
/obj/effect/spawner/random/pool/spaceloot/syndicate/common/depot,
/obj/structure/closet/secure_closet/depot,
/obj/effect/spawner/random/pool/spaceloot/syndicate/common/depot/centcomm,
/turf/simulated/floor/plasteel{
icon_state = "dark"
},
Expand Down Expand Up @@ -24730,8 +24704,7 @@
"oEC" = (
/obj/effect/turf_decal/stripes/line,
/obj/effect/turf_decal/delivery/red,
/obj/effect/spawner/random/pool/spaceloot/syndicate/common/depot,
/obj/structure/closet/secure_closet/depot,
/obj/effect/spawner/random/pool/spaceloot/syndicate/common/depot/centcomm,
/turf/simulated/floor/plasteel{
icon_state = "dark"
},
Expand Down Expand Up @@ -25393,9 +25366,8 @@
/turf/simulated/floor/indestructible/grass,
/area/syndicate_mothership/outside)
"oYr" = (
/obj/effect/spawner/random/pool/spaceloot/syndicate/common/depot,
/obj/structure/closet/secure_closet/depot,
/obj/structure/closet/crate,
/obj/effect/spawner/random/pool/centcommloot/syndicate/mixed,
/turf/simulated/floor/plasteel{
dir = 9;
icon_state = "darkyellowalt"
Expand Down Expand Up @@ -33866,6 +33838,7 @@
icon_state = "cardboard_syndicate"
},
/obj/effect/turf_decal/delivery/white,
/obj/effect/spawner/random/pool/spaceloot/syndicate/common/depot/centcomm,
/turf/simulated/floor/plasteel{
icon_state = "dark"
},
Expand Down Expand Up @@ -34405,9 +34378,8 @@
/turf/simulated/floor/wood/parquet/tile,
/area/centcom/ss220/admin2)
"upU" = (
/obj/effect/spawner/random/pool/spaceloot/syndicate/common/depot,
/obj/structure/closet/secure_closet/depot,
/obj/structure/closet/crate,
/obj/effect/spawner/random/pool/centcommloot/syndicate/mixed,
/turf/simulated/floor/plasteel{
dir = 5;
icon_state = "darkyellowalt"
Expand Down Expand Up @@ -36691,6 +36663,7 @@
"vEg" = (
/obj/structure/light_fake/spot,
/obj/structure/closet/crate,
/obj/effect/spawner/random/pool/centcommloot/syndicate/mixed,
/turf/simulated/floor/plasteel{
dir = 1;
icon_state = "darkyellowalt"
Expand Down Expand Up @@ -38194,8 +38167,7 @@
dir = 5
},
/obj/effect/turf_decal/delivery/white,
/obj/effect/spawner/random/pool/spaceloot/syndicate/common/depot,
/obj/structure/closet/secure_closet/depot,
/obj/effect/spawner/random/pool/spaceloot/syndicate/common/depot/centcomm,
/turf/simulated/floor/plasteel{
icon_state = "dark"
},
Expand Down Expand Up @@ -38751,16 +38723,6 @@
icon_state = "darkbluealt"
},
/area/centcom/ss220/admin1)
"wLN" = (
/obj/effect/turf_decal/delivery,
/obj/effect/spawner/random/pool/spaceloot/syndicate/common/depot,
/obj/structure/closet/secure_closet/depot,
/obj/structure/fans/tiny/invisible,
/turf/simulated/floor/plasteel{
dir = 1;
icon_state = "dark"
},
/area/syndicate_mothership/cargo)
"wMc" = (
/obj/machinery/door/airlock/titanium,
/obj/effect/mapping_helpers/airlock/access/all/security/brig,
Expand Down Expand Up @@ -40125,6 +40087,7 @@
dir = 1
},
/obj/structure/closet/crate,
/obj/effect/spawner/random/pool/centcommloot/syndicate/mixed,
/turf/simulated/floor/plasteel{
icon_state = "dark"
},
Expand Down Expand Up @@ -42638,7 +42601,7 @@ rQg
brK
vjy
bed
wLN
tJL
aoD
rQg
bnK
Expand Down Expand Up @@ -42895,7 +42858,7 @@ rQg
dqv
dcn
bed
wLN
tJL
jKB
rQg
apg
Expand Down Expand Up @@ -43152,7 +43115,7 @@ vVk
vVk
hlh
vVk
lKt
jKB
dxV
rQg
cNI
Expand Down Expand Up @@ -43410,7 +43373,7 @@ iLT
hOq
rQg
aoD
lKt
jKB
rQg
fgd
lpx
Expand Down Expand Up @@ -44683,7 +44646,7 @@ slN
slN
oYr
vVk
neJ
cex
slN
slN
nbj
Expand Down Expand Up @@ -44940,7 +44903,7 @@ slN
slN
vEg
rQg
mjW
sKq
slN
slN
nbj
Expand Down Expand Up @@ -46493,8 +46456,8 @@ iLT
iLT
gfa
rQg
lKt
lKt
jKB
jKB
rQg
fgd
mAS
Expand Down Expand Up @@ -47008,7 +46971,7 @@ kMv
dcn
mpV
tJL
lKt
jKB
rQg
apg
qFx
Expand Down Expand Up @@ -47265,7 +47228,7 @@ sRe
vHq
mpV
boW
lKt
jKB
rQg
bnK
lpx
Expand Down Expand Up @@ -50571,7 +50534,7 @@ fnU
gOQ
tCJ
bcl
nlb
ovP
haI
jsg
haI
Expand Down
35 changes: 35 additions & 0 deletions modular_ss220/balance/code/loot/pools.dm
Original file line number Diff line number Diff line change
@@ -1,3 +1,38 @@
// CC loot pool
/datum/spawn_pool/centcommloot
id = "central_command_spawn_pool"
available_points = INFINITY

/obj/effect/spawner/random/pool/centcommloot
icon = 'icons/effects/random_spawners.dmi'
icon_state = "giftbox"
spawn_pool_id = "central_command_spawn_pool"

/obj/effect/spawner/random/pool/spaceloot/syndicate/common/depot/centcomm
spawn_inside = null
spawn_pool_id = "central_command_spawn_pool"

/obj/effect/spawner/random/pool/spaceloot/syndicate/rare/depot/centcomm
spawn_inside = null
spawn_pool_id = "central_command_spawn_pool"

/obj/effect/spawner/random/pool/spaceloot/syndicate/officer/depot/centcomm
spawn_inside = null
spawn_pool_id = "central_command_spawn_pool"

/obj/effect/spawner/random/pool/spaceloot/syndicate/armory/depot/centcomm
spawn_inside = null
spawn_pool_id = "central_command_spawn_pool"

/obj/effect/spawner/random/pool/centcommloot/syndicate/mixed
loot = list(
/obj/effect/spawner/random/pool/spaceloot/syndicate/common/depot/centcomm = 30,
/obj/effect/spawner/random/pool/spaceloot/syndicate/rare/depot/centcomm = 20,
/obj/effect/spawner/random/pool/spaceloot/syndicate/officer/depot/centcomm = 5,
/obj/effect/spawner/random/pool/spaceloot/syndicate/armory/depot/centcomm = 1,
)

// space loot pool
/datum/spawn_pool/spaceloot
available_points = 2200 // tweak available points considering centcomm and away mission

Expand Down

0 comments on commit e5e768e

Please sign in to comment.