Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into abductor-update

code/controllers/configuration/entries/dynamic.dm

@@ -0,0 +1,126 @@
+/datum/config_entry/flag/dynamic_voting
+
+/datum/config_entry/number/dynamic_high_pop_limit
+	config_entry_value = 55
+	min_val = 1
+
+/datum/config_entry/number/dynamic_pop_per_requirement
+	config_entry_value = 6
+	min_val = 1
+
+/datum/config_entry/number/dynamic_midround_delay_min
+	config_entry_value = 15
+	min_val = 1
+
+/datum/config_entry/number/dynamic_midround_delay_max
+	config_entry_value = 35
+	min_val = 1
+
+/datum/config_entry/number/dynamic_latejoin_delay_min
+	config_entry_value = 5
+	min_val = 1
+
+/datum/config_entry/number/dynamic_latejoin_delay_max
+	config_entry_value = 25
+	min_val = 1
+
+/datum/config_entry/number/dynamic_first_midround_delay_min
+	config_entry_value = 20
+	min_val = 1
+
+/datum/config_entry/number/dynamic_first_midround_delay_max
+	config_entry_value = 40
+	min_val = 1
+
+/datum/config_entry/number/dynamic_first_latejoin_delay_min
+	config_entry_value = 10
+	min_val = 1
+
+/datum/config_entry/number/dynamic_first_latejoin_delay_max
+	config_entry_value = 30
+	min_val = 1
+
+
+/datum/config_entry/keyed_list/dynamic_cost
+	key_mode = KEY_MODE_TEXT
+	value_mode = VALUE_MODE_NUM
+
+/datum/config_entry/keyed_list/dynamic_weight
+	key_mode = KEY_MODE_TEXT
+	value_mode = VALUE_MODE_NUM
+
+/datum/config_entry/keyed_list/dynamic_requirements
+	key_mode = KEY_MODE_TEXT
+	value_mode = VALUE_MODE_NUM_LIST
+
+/datum/config_entry/keyed_list/dynamic_high_population_requirement
+	key_mode = KEY_MODE_TEXT
+	value_mode = VALUE_MODE_NUM
+
+/datum/config_entry/number_list/dynamic_second_rule_requirements
+
+/datum/config_entry/number_list/dynamic_third_rule_requirements
+
+/datum/config_entry/number/dynamic_second_rule_high_pop_requirement
+	config_entry_value = 50
+
+/datum/config_entry/number/dynamic_third_rule_high_pop_requirement
+	config_entry_value = 70
+
+/datum/config_entry/number_list/dynamic_hijack_requirements
+
+/datum/config_entry/number/dynamic_hijack_high_population_requirement
+	config_entry_value = 25
+
+/datum/config_entry/number/dynamic_hijack_cost
+	config_entry_value = 5
+	
+/datum/config_entry/number/dynamic_glorious_death_cost
+	config_entry_value = 5
+
+/datum/config_entry/number/dynamic_assassinate_cost
+	config_entry_value = 2
+
+/datum/config_entry/number/dynamic_summon_guns_requirement
+	config_entry_value = 10
+	min_val = 0
+
+/datum/config_entry/number/dynamic_summon_guns_cost
+	config_entry_value = 5
+	min_val = 0
+
+/datum/config_entry/number/dynamic_summon_magic_requirement
+	config_entry_value = 10
+	min_val = 0
+
+/datum/config_entry/number/dynamic_summon_magic_cost
+	config_entry_value = 5
+	min_val = 0
+
+/datum/config_entry/number/dynamic_summon_events_requirement
+	config_entry_value = 20
+	min_val = 0
+
+/datum/config_entry/number/dynamic_summon_events_cost
+	config_entry_value = 10
+	min_val = 0
+
+/datum/config_entry/number/dynamic_staff_of_change_requirement
+	config_entry_value = 20
+	min_val = 0
+
+/datum/config_entry/number/dynamic_staff_of_change_cost
+	config_entry_value = 10
+	min_val = 0
+
+/datum/config_entry/number/dynamic_apprentice_cost
+	config_entry_value = 10
+	min_val = 0
+
+/datum/config_entry/number/dynamic_warops_requirement
+	config_entry_value = 60
+	min_val = 0
+
+/datum/config_entry/number/dynamic_warops_cost
+	config_entry_value = 10
+	min_val = 0

code/controllers/configuration/entries/game_options.dm

@@ -379,43 +379,3 @@
 /datum/config_entry/number/auto_transfer_delay
 	config_entry_value = 72000
 	min_val = 0
-
-/datum/config_entry/number/dynamic_high_pop_limit
-	config_entry_value = 55
-	min_val = 1
-
-/datum/config_entry/number/dynamic_pop_per_requirement
-	config_entry_value = 6
-	min_val = 1
-
-/datum/config_entry/number/dynamic_midround_delay_min
-	config_entry_value = 15
-	min_val = 1
-
-/datum/config_entry/number/dynamic_midround_delay_max
-	config_entry_value = 35
-	min_val = 1
-
-/datum/config_entry/number/dynamic_latejoin_delay_min
-	config_entry_value = 5
-	min_val = 1
-
-/datum/config_entry/number/dynamic_latejoin_delay_max
-	config_entry_value = 25
-	min_val = 1
-
-/datum/config_entry/keyed_list/dynamic_cost
-	key_mode = KEY_MODE_TEXT
-	value_mode = VALUE_MODE_NUM
-
-/datum/config_entry/keyed_list/dynamic_weight
-	key_mode = KEY_MODE_TEXT
-	value_mode = VALUE_MODE_NUM
-
-/datum/config_entry/keyed_list/dynamic_requirements
-	key_mode = KEY_MODE_TEXT
-	value_mode = VALUE_MODE_NUM_LIST
-
-/datum/config_entry/keyed_list/dynamic_high_population_requirement
-	key_mode = KEY_MODE_TEXT
-	value_mode = VALUE_MODE_NUM

code/controllers/subsystem/ticker.dm

@@ -479,7 +479,8 @@ SUBSYSTEM_DEF(ticker)
 		if(SSticker.timeLeft < 900)
 			SSticker.timeLeft = 900
 		SSticker.modevoted = TRUE
-		SSvote.initiate_vote("roundtype","server",TRUE)
+		var/dynamic = CONFIG_GET(flag/dynamic_voting)
+		SSvote.initiate_vote(dynamic ? "dynamic" : "roundtype","server",TRUE)
 
 /datum/controller/subsystem/ticker/Recover()
 	current_state = SSticker.current_state

code/controllers/subsystem/vote.dm

@@ -87,7 +87,7 @@ SUBSYSTEM_DEF(vote)
 /datum/controller/subsystem/vote/proc/announce_result()
 	var/list/winners = get_result()
 	var/text
-	var/was_roundtype_vote = mode == "roundtype"
+	var/was_roundtype_vote = mode == "roundtype" || mode == "dynamic"
 	if(winners.len > 0)
 		if(question)
 			text += "<b>[question]</b>"
@@ -124,6 +124,9 @@ SUBSYSTEM_DEF(vote)
 		message_admins(admintext)
 	return .
 
+#define PEACE "calm"
+#define CHAOS "chaotic"
+
 /datum/controller/subsystem/vote/proc/result()
 	. = announce_result()
 	var/restart = 0
@@ -146,6 +149,32 @@ SUBSYSTEM_DEF(vote)
 						restart = 1
 					else
 						GLOB.master_mode = .
+			if("dynamic")
+				if(SSticker.current_state > GAME_STATE_PREGAME)//Don't change the mode if the round already started.
+					return message_admins("A vote has tried to change the gamemode, but the game has already started. Aborting.")
+				GLOB.master_mode = "dynamic"
+				var/mean = 0
+				var/voters = 0
+				for(var/client/c in GLOB.clients)
+					var/vote = c.prefs.preferred_chaos
+					if(vote)
+						voters += 1
+						switch(vote)
+							if(CHAOS_NONE)
+								mean -= 0.1
+							if(CHAOS_LOW)
+								mean -= 0.05
+							if(CHAOS_HIGH)
+								mean += 0.05
+							if(CHAOS_MAX)
+								mean += 0.1
+				mean/=voters
+				if(voted.len != 0)
+					mean += (choices[PEACE]*-1+choices[CHAOS])/voted.len
+				GLOB.dynamic_curve_centre = mean*20
+				GLOB.dynamic_curve_width = CLAMP(2-abs(mean*5),0.5,4)
+				to_chat(world,"<span class='boldannounce'>Dynamic curve centre set to [GLOB.dynamic_curve_centre] and width set to [GLOB.dynamic_curve_width].</span>")
+				log_admin("Dynamic curve centre set to [GLOB.dynamic_curve_centre] and width set to [GLOB.dynamic_curve_width]")
 			if("map")
 				var/datum/map_config/VM = config.maplist[.]
 				message_admins("The map has been voted for and will change to: [VM.map_name]")
@@ -223,6 +252,8 @@ SUBSYSTEM_DEF(vote)
 					choices |= M
 			if("roundtype") //CIT CHANGE - adds the roundstart secret/extended vote
 				choices.Add("secret", "extended")
+			if("dynamic")
+				choices.Add(PEACE,CHAOS)
 			if("custom")
 				question = stripped_input(usr,"What is the vote for?")
 				if(!question)
@@ -379,4 +410,7 @@ SUBSYSTEM_DEF(vote)
 	else if(owner.ckey)
 		var/datum/player_details/P = GLOB.player_details[owner.ckey]
 		if(P)
-			P.player_actions -= src
+			P.player_actions -= src
+
+#undef PEACE
+#undef CHAOS