Add restricted roles for assassinate contract, add contracts number limit #12750
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Doster-d
requested changes
Sep 4, 2024
| @@ -103,6 +104,16 @@ GLOBAL_LIST_INIT(syndicate_factions, list( | |||
| return FALSE | |||
| return !!(H.species.species_flags & SPECIES_FLAG_NO_ANTAG_TARGET) | |||
|
|
|||
| /datum/antag_contract/proc/skip_unwanted_job(datum/mind/H) | |||
| var/datum/job/title = job_master.GetJob(H.assigned_role) | |||
| if(wanted_jobs.len) | |||
There was a problem hiding this comment.
Suggested change
| if(wanted_jobs.len) | |
| if(length(wanted_jobs)) |
code/game/gamemodes/traitor/fixer.dm
Outdated
| set_next_think(world.time + time_to_next_contract) | ||
| if(!contract_list_overfilled()) | ||
| create_random_contract(1) | ||
| set_next_think(world.time + time_to_next_contract) |
There was a problem hiding this comment.
Suggested change
| set_next_think(world.time + time_to_next_contract) | |
| set_next_think(world.time + time_to_next_contract) |
code/game/gamemodes/traitor/fixer.dm
Outdated
| set_next_think(world.time + time_to_next_contract) | ||
|
|
||
| /datum/contract_fixer/proc/contract_list_overfilled() | ||
| if(GLOB.all_contracts.len > (6 + round(SSticker.minds.len / 5))) |
There was a problem hiding this comment.
Может переделаешь на то, что контракты закрыты?
И да length
|
Иссуй был одобрен геймдизайнерами. Поддержали: felixartz |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Контракты на убийство выдаются только на глав, квартермейстера и старших офицеров СБ. Общее количество доступных контрактов не может превысить лимит (6 + количество игроков/5).
Поправлен баг с неправильной выдачей контрактов от разных фракций. Там у организаций использовалась побитовая переменная intents, которая уже была обьявлена глобально, что приводило к неправильной работе выдачи контрактов.
Чейнджлог