no assassination at all (!!) on calm

This commit is contained in:
Putnam
2019-12-23 00:43:25 -08:00
parent 0392145900
commit 13a8efe616
3 changed files with 8 additions and 1 deletions
+3
View File
@@ -124,3 +124,6 @@
#define PLURALITY_VOTING 0
#define APPROVAL_VOTING 1
#define RANKED_CHOICE_VOTING 2
// Dynamic stuff (see above, move later)
#define NO_ASSASSIN (1<<0)
@@ -4,6 +4,7 @@
var/list/property_weights = list()
var/curve_centre = 0
var/curve_width = 1.8
var/flags = 0
var/datum/game_mode/dynamic/mode = null
/**
@@ -135,6 +136,7 @@ Property weights are:
desc = "Chaos: low. Variation: medium. Likely antags: bloodsuckers, traitors, sentient disease, revenant."
curve_centre = -5
curve_width = 0.5
flags = NO_ASSASSIN
property_weights = list("extended" = 5, "chaos" = -1, "valid" = -1, "story_potential" = 1, "conversion" = -10)
/datum/dynamic_storyteller/extended
@@ -80,6 +80,8 @@
if(istype(SSticker.mode,/datum/game_mode/dynamic))
mode = SSticker.mode
is_dynamic = TRUE
if(mode.storyteller.flags & NO_ASSASSIN)
is_hijacker = FALSE
if(GLOB.joined_player_list.len>=GLOB.dynamic_high_pop_limit)
is_hijacker = (prob(10) && mode.threat_level > CONFIG_GET(number/dynamic_hijack_high_population_requirement))
else
@@ -180,7 +182,7 @@
destroy_objective.owner = owner
destroy_objective.find_target()
add_objective(destroy_objective)
else if(prob(30))
else if(prob(30) || (mode.storyteller.flags & NO_ASSASSIN))
var/datum/objective/maroon/maroon_objective = new
maroon_objective.owner = owner
maroon_objective.find_target()