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

Add restricted roles for assassinate contract, add contracts number limit #12750

Merged
merged 3 commits into from
Sep 23, 2024
Merged

Add restricted roles for assassinate contract, add contracts number limit #12750

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b374e33
restricted role assasinate, contracts overfill
Animusin Aug 23, 2024
803444c
fix intents, think
Animusin Sep 22, 2024
4054f02
Update fixer.dm
Animusin Sep 22, 2024
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
14 changes: 13 additions & 1 deletion code/game/gamemodes/traitor/contracts.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,7 @@ GLOBAL_LIST_INIT(syndicate_factions, list(
var/reason
var/list/reason_list = list()
var/datum/contract_organization/organization
var/list/wanted_jobs = list()

/datum/antag_contract/New(datum/contract_organization/contract_organization, reason, datum/mind/target)
ASSERT(intent)
Expand Down Expand Up @@ -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(length(wanted_jobs))
if(title in wanted_jobs)
return FALSE
else
return TRUE
else
return FALSE

/datum/antag_contract/proc/create_contract(new_reason, target)
return

Expand Down Expand Up @@ -400,6 +411,7 @@ GLOBAL_LIST_INIT(syndicate_factions, list(
var/weakref/alternative_target // obj/item
var/weakref/H // mob/living/carbon/human
var/full_reward_mod = 1.5
wanted_jobs = list(/datum/job/captain,/datum/job/hop,/datum/job/rd,/datum/job/chief_engineer,/datum/job/cmo,/datum/job/hos, /datum/job/warden, /datum/job/detective, /datum/job/qm)

/datum/antag_contract/item/assassinate/New(datum/contract_organization/contract_organization, reason, datum/mind/target)
organization = contract_organization
Expand Down Expand Up @@ -438,7 +450,7 @@ GLOBAL_LIST_INIT(syndicate_factions, list(

target_real_name = _H.real_name
target_mind = candidate_mind
if(skip_antag_role() || skip_unwanted_species(_H))
if(skip_antag_role() || skip_unwanted_species(_H) || skip_unwanted_job(_H))
target_mind = null
_H = null
continue
Expand Down
29 changes: 18 additions & 11 deletions code/game/gamemodes/traitor/fixer.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,16 @@
set_next_think(world.time + time_to_next_contract)

/datum/contract_fixer/think()
create_random_contract(1)
if(!contract_list_closed())
create_random_contract(1)
set_next_think(world.time + time_to_next_contract)

/datum/contract_fixer/proc/contract_list_closed()
if(length(GLOB.all_contracts) > (6 + round(length(SSticker.minds) / 5)))
return TRUE
else
return FALSE

/datum/contract_fixer/proc/create_random_contract(count = 1)
while(count--)
var/datum/contract_organization/CO = pick(organizations)
Expand All @@ -36,11 +43,11 @@
/datum/contract_organization
var/name = "This is bug!"
var/list/datum/antag_contract/contracts = list()
var/intents // what contracts organization prefers?
var/intentz // what contracts organization prefers?
var/datum/contract_fixer/holder

/datum/contract_organization/New(datum/contract_fixer/CF)
ASSERT(intents)
ASSERT(intentz)
holder = CF
holder.organizations.Add(src)
holder.organizations_by_name[name] = src
Expand All @@ -60,7 +67,7 @@
var/datum/antag_contract/C = new contract_type(src)
if(!C)
continue
var/not_avaliable = (intents ^ C.intent)
var/not_avaliable = (intentz ^ C.intent)
if(not_avaliable && prob(25))
not_avaliable = FALSE
if(!C.can_place() || not_avaliable)
Expand Down Expand Up @@ -106,22 +113,22 @@

/datum/contract_organization/syndicate/tti
name = "Trauma Team Interspace"
intents = CONTRACT_IMPACT_SOCIAL | CONTRACT_IMPACT_OPERATION
intentz = CONTRACT_IMPACT_SOCIAL | CONTRACT_IMPACT_OPERATION
/datum/contract_organization/syndicate/ms
name = "MiliSpace"
intents = CONTRACT_IMPACT_MILITARY | CONTRACT_IMPACT_HIJACK
intentz = CONTRACT_IMPACT_MILITARY | CONTRACT_IMPACT_HIJACK
/datum/contract_organization/syndicate/bs
name = "Biospacenica"
intents = CONTRACT_IMPACT_SOCIAL
intentz = CONTRACT_IMPACT_SOCIAL
/datum/contract_organization/syndicate/kt
name = "Kang Too"
intents = CONTRACT_IMPACT_SOCIAL | CONTRACT_IMPACT_OPERATION | CONTRACT_IMPACT_MILITARY
intentz = CONTRACT_IMPACT_SOCIAL | CONTRACT_IMPACT_OPERATION | CONTRACT_IMPACT_MILITARY
/datum/contract_organization/syndicate/nv
name = "NovaPlasma"
intents = CONTRACT_IMPACT_SOCIAL | CONTRACT_IMPACT_OPERATION
intentz = CONTRACT_IMPACT_SOCIAL | CONTRACT_IMPACT_OPERATION
/datum/contract_organization/syndicate/dt
name = "Dynamoon Technologies"
intents = CONTRACT_IMPACT_SOCIAL | CONTRACT_IMPACT_HIJACK
intentz = CONTRACT_IMPACT_SOCIAL | CONTRACT_IMPACT_HIJACK
/datum/contract_organization/syndicate/ns
name = "NanoSaka"
intents = CONTRACT_IMPACT_SOCIAL | CONTRACT_IMPACT_OPERATION | CONTRACT_IMPACT_MILITARY | CONTRACT_IMPACT_HIJACK
intentz = CONTRACT_IMPACT_SOCIAL | CONTRACT_IMPACT_OPERATION | CONTRACT_IMPACT_MILITARY | CONTRACT_IMPACT_HIJACK
Loading