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.

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

Terror spider spawn refactor #957

Merged
merged 15 commits into from
Apr 4, 2024
Merged

Conversation

Fullonibus
Copy link

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

Новая логика для спавна пауков террора. Теперь можно более гибко настраивать численность пауков при спавне.

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

Легче подкрутить баланс

Изображения изменений

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

Пауки спавнятся. Для более точных тестов нужен онлайн.

Changelog

🆑
experiment: Новый алгоритм спавна пауков террора
/:cl:

@github-actions github-actions bot added the :finnadie: НЕ МОДУЛЬНО Ну это ваще пиздец. Либо засовывай в модуль, либо заливай на апстрим. label Jan 28, 2024
@ss220bot ss220bot added the 📜 CL валиден Этот чейнджлог будет успешно опубликован label Jan 28, 2024
@Fullonibus Fullonibus marked this pull request as draft January 28, 2024 13:26
@AyIong AyIong added the Надо в апстрим Модульно это вряд ли получится, или это фикс офф. кода так что лучше сначала предложить оффам. label Jan 28, 2024
@github-actions github-actions bot removed the :finnadie: НЕ МОДУЛЬНО Ну это ваще пиздец. Либо засовывай в модуль, либо заливай на апстрим. label Jan 28, 2024
@Fullonibus Fullonibus marked this pull request as ready for review January 29, 2024 21:06
@AyIong AyIong added Testmerge Required and removed Надо в апстрим Модульно это вряд ли получится, или это фикс офф. кода так что лучше сначала предложить оффам. labels Jan 31, 2024
Copy link
Collaborator

@m-dzianishchyts m-dzianishchyts left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Есть ряд предложений

modular_ss220/events/code/spider_terror.dm Outdated Show resolved Hide resolved
modular_ss220/events/code/spider_terror.dm Outdated Show resolved Hide resolved
modular_ss220/events/code/spider_terror.dm Outdated Show resolved Hide resolved
modular_ss220/events/code/spider_terror.dm Outdated Show resolved Hide resolved
Copy link
Collaborator

@PhantornRU PhantornRU left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Нужно выкатить на тестмердж

Comment on lines 7 to 21
#define TERROR_GREEN /mob/living/simple_animal/hostile/poison/terror_spider/green
#define TERROR_WHITE /mob/living/simple_animal/hostile/poison/terror_spider/prince
#define TERROR_PRINCESS /mob/living/simple_animal/hostile/poison/terror_spider/queen/princess
#define TERROR_PRINCE /mob/living/simple_animal/hostile/poison/terror_spider/prince
#define TERROR_QUEEN /mob/living/simple_animal/hostile/poison/terror_spider/queen

/datum/event/spider_terror
announceWhen = 240
var/population_factor = 0.7 // higher - more spawnpoints
spawncount = 0 // amount of spawned spiders
var/spawnpoints = TS_POINTS_GREEN // weight points
/// lists for matching spiders and their weights
var/list/spider_types = list("TERROR_GREEN" = TERROR_GREEN, "TERROR_WHITE" = TERROR_WHITE, "TERROR_PRINCESS" = TERROR_PRINCESS, "TERROR_PRINCE" = TERROR_PRINCE, "TERROR_QUEEN" = TERROR_QUEEN)
var/list/spider_costs = list("TERROR_GREEN" = TS_POINTS_GREEN, "TERROR_WHITE" = TS_POINTS_WHITE, "TERROR_PRINCESS" = TS_POINTS_PRINCESS, "TERROR_PRINCE" = TS_POINTS_PRINCE, "TERROR_QUEEN" = TS_POINTS_QUEEN)
var/list/spider_counts = list("TERROR_GREEN" = 0, "TERROR_WHITE" = 0, "TERROR_PRINCESS" = 0, "TERROR_PRINCE" = 0, "TERROR_QUEEN" = 0)
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Убери дефайны и сделай список, каждое значение - с новой строки.

@AyIong
Copy link
Collaborator

AyIong commented Apr 4, 2024

Долго оно в ТМе?

@m-dzianishchyts
Copy link
Collaborator

Долго оно в ТМе?

Месяц точно

@AyIong AyIong merged commit fddf280 into ss220club:master Apr 4, 2024
13 checks passed
@Fullonibus Fullonibus deleted the spider_refactor branch May 26, 2024 17:30
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
📜 CL валиден Этот чейнджлог будет успешно опубликован Testmerge Required
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants