Merge branch 'malf-dynamic' into super-special-awesome-dynamic

config/game_options.txt

@@ -258,6 +258,12 @@ EVENTS_MIN_PLAYERS_MUL 1
 
 ### DYNAMIC MODE ###
 
+## Injection delays: how long (in minutes) will pass before a midround or latejoin antag is injected.
+DYNAMIC_MIDROUND_DELAY_MIN 15
+DYNAMIC_MIDROUND_DELAY_MAX 35
+DYNAMIC_LATEJOIN_DELAY_MIN 5
+DYNAMIC_LATEJOIN_DELAY_MAX 25
+
 ## How many roundstart players required for high population override to take effect.
 DYNAMIC_HIGH_POP_LIMIT 80 #80 instead of 55 because fewer robust players
 
@@ -274,6 +280,7 @@ DYNAMIC_POP_PER_REQUIREMENT 9 # 9 instead of 6 because 1/3 of players are probab
 ## 1 -> 9, probability for this rule to be picked against other rules.
 ## Note that requirements must also be met, and some requirements are impossible to meet.
 DYNAMIC_WEIGHT TRAITOR 5
+DYNAMIC_WEIGHT MALF_AI 1
 DYNAMIC_WEIGHT TRAITORBRO 4
 DYNAMIC_WEIGHT CHANGELING 1
 DYNAMIC_WEIGHT WIZARD 1
@@ -290,7 +297,7 @@ DYNAMIC_WEIGHT METEOR 3
 
 ## Midround antags
 DYNAMIC_WEIGHT MIDROUND_TRAITOR 7
-DYNAMIC_WEIGHT MALF_AI 3
+DYNAMIC_WEIGHT MIDROUND_MALF_AI 3
 DYNAMIC_WEIGHT MIDROUND_WIZARD 1
 DYNAMIC_WEIGHT MIDROUND_NUCLEAR 5
 DYNAMIC_WEIGHT BLOB 4
@@ -303,6 +310,7 @@ DYNAMIC_WEIGHT LATEJOIN_REVOLUTION 2
 
 ## Threat cost. This is decreased from the mode's threat when the rule is executed.
 DYNAMIC_COST TRAITOR 10
+DYNAMIC_COST MALF_AI 35
 DYNAMIC_COST TRAITORBRO 10
 DYNAMIC_COST CHANGELING 30
 DYNAMIC_COST WIZARD 30
@@ -319,7 +327,7 @@ DYNAMIC_COST METEOR 0
 
 ## Midround antags
 DYNAMIC_COST MIDROUND_TRAITOR 10
-DYNAMIC_COST MALF_AI 35
+DYNAMIC_COST MIDROUND_MALF_AI 35
 DYNAMIC_COST MIDROUND_WIZARD 20
 DYNAMIC_COST MIDROUND_NUCLEAR 35
 DYNAMIC_COST BLOB 10
@@ -335,6 +343,7 @@ DYNAMIC_COST LATEJOIN_REVOLUTION 20
 ## This means that 40 30 30 20 20 20 15 15 15 10 will not generate below 40 at 0-8, 30 at 9-17 etc.
 DYNAMIC_REQUIREMENTS TRAITOR 40 30 20 15 15 15 15 15 15 15
 DYNAMIC_REQUIREMENTS TRAITORBRO 50 40 30 20 20 15 15 15 15 15
+DYNAMIC_REQUIREMENTS MALF_AI 101 101 80 70 60 60 50 50 40 40
 DYNAMIC_REQUIREMENTS CHANGELING 101 101 101 101 101 101 101 101 101 101
 DYNAMIC_REQUIREMENTS WIZARD 100 90 70 40 30 20 15 15 15 15
 DYNAMIC_REQUIREMENTS CULT 100 90 80 60 40 30 15 15 15 15
@@ -350,7 +359,7 @@ DYNAMIC_REQUIREMENTS METEOR 101 101 101 101 101 101 101 101 101 101
 
 ## Midround antags
 DYNAMIC_REQUIREMENTS MIDROUND_TRAITOR 50 40 30 20 15 15 15 15 15 15
-DYNAMIC_REQUIREMENTS MALF_AI 101 101 80 70 60 60 50 50 40 40
+DYNAMIC_REQUIREMENTS MIDROUND_MALF_AI 101 101 80 70 60 60 50 50 40 40
 DYNAMIC_REQUIREMENTS MIDROUND_WIZARD 90 90 70 40 30 20 15 15 15 15
 DYNAMIC_REQUIREMENTS MIDROUND_NUCLEAR 90 90 90 80 60 40 30 20 15 15
 DYNAMIC_REQUIREMENTS BLOB 101 101 101 80 60 50 30 20 15 15
@@ -363,6 +372,7 @@ DYNAMIC_REQUIREMENTS LATEJOIN_REVOLUTION 101 101 70 40 30 20 20 20 20 20
 
 ## An alternative, static requirement used instead when pop is over mode's high_pop_limit.
 DYNAMIC_HIGH_POPULATION_REQUIREMENT TRAITOR 15
+DYNAMIC_HIGH_POPULATION_REQUIREMENT MALF_AI 15
 DYNAMIC_HIGH_POPULATION_REQUIREMENT TRAITORBRO 15
 DYNAMIC_HIGH_POPULATION_REQUIREMENT CHANGELING 101
 DYNAMIC_HIGH_POPULATION_REQUIREMENT WIZARD 15
@@ -379,7 +389,7 @@ DYNAMIC_HIGH_POPULATION_REQUIREMENT METEOR 101
 
 ## Midround antags
 DYNAMIC_HIGH_POPULATION_REQUIREMENT MIDROUND_TRAITOR 15
-DYNAMIC_HIGH_POPULATION_REQUIREMENT MALF_AI 35
+DYNAMIC_HIGH_POPULATION_REQUIREMENT MIDROUND_MALF_AI 35
 DYNAMIC_HIGH_POPULATION_REQUIREMENT MIDROUND_WIZARD 50
 DYNAMIC_HIGH_POPULATION_REQUIREMENT MIDROUND_NUCLEAR 15
 DYNAMIC_HIGH_POPULATION_REQUIREMENT BLOB 50
@@ -398,7 +408,14 @@ ALLOW_AI
 ## Allow the AI Multicamera feature to be used by AI players
 ALLOW_AI_MULTICAM
 
+## CYBORG ##
+## Uncomment to disable the ability for cyborg flashes to knock down carbon targets
+#DISABLE_BORG_FLASH_KNOCKDOWN
+
 ## Secborg ###
+## Uncomment to bring secborgs and K-9s back in line with the rest of the modules available. This is strongly recommended if you have secborgs configured to be available at all times.
+#WEAKEN_SECBORG
+
 ## Uncomment to prevent the security cyborg module from being chosen
 #DISABLE_SECBORG
 

config/maps.txt

@@ -10,6 +10,8 @@ Format:
 	maxplayers [number] (0 or less disables this requirement)
 	default (The last map with this defined will get all votes of players who have not explicitly voted for a map)
 	voteweight [number] (How much to count each player vote as, defaults to 1, setting to 0.5 counts each vote as half a vote, 2 as double, etc, Setting to 0 disables the map but allows players to still pick it)
+	max_round_search_span [number] (If this is nonzero, then if this map has been played more than a specified amount of times within this number of rounds, the map won't show up in votes. Max for this value determined by a define in persistence.dm)
+	max_rounds_played [number] (This determines how many times a map can be played within the above number of rounds before it's forbidden from votes.)
 	disabled (disables the map)
 endmap