Przeniesienie game_options.txt (aq33#661)

* game options 1 * Revert "game options 1" This reverts commit f81e4ab. * poprawka opcji * tryby gry bazowane (based) na ilosci graczy * Update game_options.txt Co-authored-by: JacekPlacek7312 <55637464+JacekPlacek7312@users.noreply.github.com>
Dejaku51 · Mar 27, 2021 · 2896249 · 2896249
1 parent 3c5376e
commit 2896249
Show file tree

Hide file tree

Showing 3 changed files with 86 additions and 86 deletions.
diff --git a/code/datums/helper_datums/getrev.dm b/code/datums/helper_datums/getrev.dm
@@ -98,7 +98,7 @@
 				var/ctag = initial(M.config_tag)
 				if(!(ctag in probabilities))
 					continue
-				if((min_pop[ctag] && (min_pop[ctag] > SSticker.totalPlayersReady)) || (max_pop[ctag] && (max_pop[ctag] < SSticker.totalPlayersReady)) || (initial(M.required_players) > SSticker.totalPlayersReady))
+				if((min_pop[ctag] && (min_pop[ctag] > SSticker.totalPlayers)) || (max_pop[ctag] && (max_pop[ctag] < SSticker.totalPlayers)) || (initial(M.required_players) > SSticker.totalPlayers))	// AQ EDIT (totalPlayersReady)
 					current_odds_differ = TRUE
 					continue
 				probs[ctag] = 1

diff --git a/code/game/gamemodes/game_mode.dm b/code/game/gamemodes/game_mode.dm
@@ -69,7 +69,7 @@
 /datum/game_mode/proc/can_start()
 	var/playerC = 0
 	for(var/mob/dead/new_player/player in GLOB.player_list)
-		if((player.client)&&(player.ready == PLAYER_READY_TO_PLAY) && player.has_valid_preferences())
+		if(player.client && player.has_valid_preferences())	// AQ EDIT (&&(player.ready == PLAYER_READY_TO_PLAY))
 			playerC++
 	if(!GLOB.Debug2)
 		if(playerC < required_players || (maximum_players >= 0 && playerC > maximum_players))

diff --git a/config/game_options.txt b/config/game_options.txt
@@ -1,7 +1,7 @@
 ## HEALTH ###
 
 ##Damage multiplier, effects both weapons and healing on all mobs. For example, 1.25 would result in 25% higher damage.
-DAMAGE_MULTIPLIER 1
+DAMAGE_MULTIPLIER 1.25
 
 ## REVIVAL ###
 
@@ -36,7 +36,7 @@ EMOJIS
 ## To speed things up make the number negative, to slow things down, make the number positive.
 
 ## These modify the run/walk speed of all mobs before the mob-specific modifiers are applied.
-RUN_DELAY 1.5
+RUN_DELAY 2
 WALK_DELAY 3
 
 ## The variables below affect the movement of specific mob types. THIS AFFECTS ALL SUBTYPES OF THE TYPE YOU CHOOSE!
@@ -59,7 +59,7 @@ HUMANS_NEED_SURNAMES
 #FORCE_RANDOM_NAMES
 
 ## Unhash this to turn on automatic reopening of a player's job if they suicide at roundstart
-#REOPEN_ROUNDSTART_SUICIDE_ROLES
+REOPEN_ROUNDSTART_SUICIDE_ROLES
 
 ## Unhash to enable reopening of command level positions
 #REOPEN_ROUNDSTART_SUICIDE_ROLES_COMMAND_POSITIONS
@@ -74,19 +74,19 @@ HUMANS_NEED_SURNAMES
 
 
 ## ALERT LEVELS ###
-ALERT_GREEN All threats to the station have passed. Security may not have weapons visible, privacy laws are once again fully enforced.
-ALERT_BLUE_UPTO The station has received reliable information about possible hostile activity on the station. Security staff may have weapons visible, random searches are permitted.
-ALERT_BLUE_DOWNTO The immediate threat has passed. Security may no longer have weapons drawn at all times, but may continue to have them visible. Random searches are still allowed.
-ALERT_RED_UPTO There is an immediate serious threat to the station. Security may have weapons unholstered at all times. Random searches are allowed and advised. Additionally, access requirements on some doors have been lifted.
-ALERT_RED_DOWNTO The station's destruction has been averted. There is still however an immediate serious threat to the station. Security may have weapons unholstered at all times, random searches are allowed and advised.
-ALERT_DELTA Destruction of the station is imminent. All crew are instructed to obey all instructions given by heads of staff. Any violations of these orders can be punished by death. This is not a drill.
+ALERT_GREEN Wszelkie zagrożenia minęły. Ochrona nie może nosić już broni na wierzchu, prawa prywatności znowu obowiązują.
+ALERT_BLUE_UPTO Stacja otrzymała wiarygodne informacje na temat możliwej wrogiej aktywności na terenie stacji. Ochrona może nosić broń na wierzchu, a losowe przeszukania są dozwolone.
+ALERT_BLUE_DOWNTO Bezpośrednie zagrożenie stacji minęło. Ochrona nie może mieć już wyciągniętej broni, choć nadal może pozostawać na widoku, losowe przeszukania są nadal dozwolone.
+ALERT_RED_UPTO Istnieje bezpośrednie zagrożenie dla stacji. Ochrona może mieć w dowolnej chwili wyciągniętą broń, losowe przeszukania są dozwolone i zalecane. Dodatkowo, wymagania dostępu do niektórych obszarów zostały uchylone.
+ALERT_RED_DOWNTO Zapobiegnięto zniszczeniu stacji. Lecz nadal istnieje bezpośrednie zagrożenie. Ochrona może mieć w dowolnej chwili wyciągniętą broń, losowe przeszukania są dozwolone i zalecane.
+ALERT_DELTA Zniszczenie stacji jest nieuniknione. Załoga zobowiązana jest do wykonywania wszelkich poleceń sztabu. Wszelkie odstępstwa od tych poleceń mogą być karane śmiercią. To nie są ćwiczenia.
 
 
 
 ## GAME MODES ###
 
 #Set the Master (Default) Game Mode.
-MASTER_MODE secret_extended
+MASTER_MODE secret
 
 ## Uncomment to not send a roundstart intercept report. Gamemodes may override this.
 #NO_INTERCEPT_REPORT
@@ -95,26 +95,26 @@ MASTER_MODE secret_extended
 ## Default probablity is 1, increase to make that mode more likely to be picked.
 ## Set to 0 to disable that mode.
 
-PROBABILITY DYNAMIC 9
-PROBABILITY TRAITOR 8
-PROBABILITY CULT 6
-PROBABILITY HERESY 6
-PROBABILITY NUCLEAR 6
+PROBABILITY DYNAMIC 2
+PROBABILITY TRAITOR 9
+PROBABILITY CULT 9
+PROBABILITY HERESY 9
+PROBABILITY NUCLEAR 9
 PROBABILITY TRAITORCHAN 5
-PROBABILITY CHANGELING 5
+PROBABILITY CHANGELING 9
 PROBABILITY INCURSION 4
-PROBABILITY REVOLUTION 4
-PROBABILITY INTERNAL_AFFAIRS 3
-PROBABILITY TRAITORBRO 3
-PROBABILITY WIZARD 2
-PROBABILITY CLOWNOPS 2
-PROBABILITY CLOCKCULT 1
-PROBABILITY MONKEY 0
+PROBABILITY REVOLUTION 9
+PROBABILITY INTERNAL_AFFAIRS 5
+PROBABILITY TRAITORBRO 9
+PROBABILITY WIZARD 1
+PROBABILITY CLOWNOPS 4
+PROBABILITY CLOCKCULT 9
+PROBABILITY MONKEY 7
 PROBABILITY GANG 0
-PROBABILITY METEOR 0
+PROBABILITY METEOR 7
 PROBABILITY SECRET_EXTENDED 0
-PROBABILITY DEVIL 0
-PROBABILITY DEVIL_AGENTS 0
+PROBABILITY DEVIL 1
+PROBABILITY DEVIL_AGENTS 1
 
 ## Creates issues when NO_INTERCEPT_REPORT is enabled
 PROBABILITY EXTENDED 0
@@ -138,7 +138,7 @@ CONTINUOUS INTERNAL_AFFAIRS
 #CONTINUOUS REVOLUTION
 CONTINUOUS CULT
 CONTINUOUS CHANGELING
-CONTINUOUS WIZARD
+#CONTINUOUS WIZARD
 #CONTINUOUS MONKEY
 CONTINUOUS HIVEMIND
 CONTINUOUS CLOCKCULT
@@ -161,13 +161,13 @@ CONTINUOUS SECRET_EXTENDED
 MIDROUND_ANTAG TRAITOR
 #MIDROUND_ANTAG INCURSION
 #MIDROUND_ANTAG TRAITORBRO
-MIDROUND_ANTAG TRAITORCHAN
+#MIDROUND_ANTAG TRAITORCHAN
 MIDROUND_ANTAG INTERNAL_AFFAIRS
-#MIDROUND_ANTAG  NUCLEAR
+MIDROUND_ANTAG  NUCLEAR
 #MIDROUND_ANTAG  REVOLUTION
-MIDROUND_ANTAG CULT
-MIDROUND_ANTAG CHANGELING
-MIDROUND_ANTAG WIZARD
+#MIDROUND_ANTAG CULT
+#MIDROUND_ANTAG CHANGELING
+#MIDROUND_ANTAG WIZARD
 #MIDROUND_ANTAG  MONKEY
 
 ## Uncomment these for overrides of the minimum / maximum number of players in a round type.
@@ -176,53 +176,53 @@ MIDROUND_ANTAG WIZARD
 ## Notes: For maximum number of players a value of -1 means no maximum. Setting minimums to
 ## VERY low numbers (< 5) can lead to errors if the roundtypes were not designed for that.
 
-#MIN_POP TRAITOR 0
-#MAX_POP TRAITOR -1
+MIN_POP TRAITOR 6
+MAX_POP TRAITOR -1
 
-#MIN_POP TRAITORBRO 0
-#MAX_POP TRAITORBRO -1
+MIN_POP TRAITORBRO 10
+MAX_POP TRAITORBRO -1
 
-#MIN_POP TRAITORCHAN 15
-#MAX_POP TRAITORCHAN -1
+MIN_POP TRAITORCHAN 15
+MAX_POP TRAITORCHAN -1
 
-#MIN_POP DOUBLE_AGENTS 25
-#MAX_POP DOUBLE_AGENTS -1
+MIN_POP DOUBLE_AGENTS 15
+MAX_POP DOUBLE_AGENTS -1
 
-#MIN_POP NUCLEAR 0
-#MAX_POP NUCLEAR -1
+MIN_POP NUCLEAR 15
+MAX_POP NUCLEAR -1
 
-#MIN_POP REVOLUTION 20
-#MAX_POP REVOLUTION -1
+MIN_POP REVOLUTION 15
+MAX_POP REVOLUTION -1
 
-#MIN_POP CULT 24
-#MAX_POP CULT -1
+MIN_POP CULT 15
+MAX_POP CULT -1
 
-#MIN_POP CHANGELING 15
-#MAX_POP CHANGELING -1
+MIN_POP CHANGELING 10
+MAX_POP CHANGELING -1
 
-#MIN_POP WIZARD 20
-#MAX_POP WIZARD -1
+MIN_POP WIZARD 28
+MAX_POP WIZARD -1
 
-#MIN_POP MONKEY 20
-#MAX_POP MONKEY -1
+MIN_POP MONKEY 15
+MAX_POP MONKEY -1
 
-#MIN_POP METEOR 0
-#MAX_POP METEOR -1
+MIN_POP METEOR 15
+MAX_POP METEOR -1
 
-#MIN_POP DEVIL 0
-#MAX_POP DEVIL -1
+MIN_POP DEVIL 12
+MAX_POP DEVIL -1
 
 #MIN_POP DEVIL_AGENTS 25
 #MAX_POP DEVIL_AGENTS -1
 
-MIN_POP INCURSION 22
+MIN_POP INCURSION 18
 MAX_POP INCURSION -1
 
 ## Setting at least one mode to be playable at 0/1 players is required.
-#MIN_POP EXTENDED 0
-#MAX_POP EXTENDED -1
+MIN_POP EXTENDED 0
+MAX_POP EXTENDED 5
 
-MIN_POP CLOCKCULT 32
+MIN_POP CLOCKCULT 15
 MAX_POP CLOCKCULT -1
 
 ## The amount of time it takes for the emergency shuttle to be called, from round start.
@@ -231,15 +231,15 @@ SHUTTLE_REFUEL_DELAY 12000
 ## Variables calculate how number of antagonists will scale to population.
 ## Used as (Antagonists = Population / Coeff)
 ## Set to 0 to disable scaling and use default numbers instead.
-TRAITOR_SCALING_COEFF 6
-BROTHER_SCALING_COEFF 6
-CHANGELING_SCALING_COEFF 6
+TRAITOR_SCALING_COEFF 8
+BROTHER_SCALING_COEFF 7
+CHANGELING_SCALING_COEFF 9
 ECULT_SCALING_COEFF 6
 
 ## Variables calculate how number of open security officer positions will scale to population.
 ## Used as (Officers = Population / Coeff)
 ## Set to 0 to disable scaling and use default numbers instead.
-SECURITY_SCALING_COEFF 10
+SECURITY_SCALING_COEFF 8
 
 ## The number of objectives traitors get.
 ## Not including escaping/hijacking.
@@ -257,7 +257,7 @@ PROTECT_ROLES_FROM_ANTAGONIST
 PROTECT_HEADS_FROM_ANTAGONIST
 
 ## If non-human species are barred from joining as a head of staff
-#ENFORCE_HUMAN_AUTHORITY
+ENFORCE_HUMAN_AUTHORITY
 
 ## If late-joining players have a chance to become a traitor/changeling
 ALLOW_LATEJOIN_ANTAGONISTS
@@ -276,7 +276,7 @@ INCURSION_OBJECTIVE_AMOUNT 4
 ## roll antagonist in subsequent rounds until they get it.
 ##
 ## For details See the comments for /datum/game_mode/proc/antag_pick in code/game/gamemodes/game_mode.dm
-USE_ANTAG_REP
+# USE_ANTAG_REP
 
 ## The maximum amount of antagonist reputation tickets a player can bank (not use at once)
 ANTAG_REP_MAXIMUM 200
@@ -331,11 +331,11 @@ ALLOW_AI_MULTICAM
 ## AWAY MISSIONS ###
 
 ## Uncomment to load one of the missions from awaymissionconfig.txt at roundstart.
-#ROUNDSTART_AWAY
+ROUNDSTART_AWAY
 
 ## How long the delay is before the Away Mission gate opens. Default is half an hour.
 ## 600 is one minute.
-GATEWAY_DELAY 18000
+GATEWAY_DELAY 9000
 
 
 ## ACCESS ###
@@ -390,7 +390,7 @@ NEAR_DEATH_EXPERIENCE
 ## Set to 1 for "custom", silicons will start with the custom laws defined in silicon_laws.txt. (If silicon_laws.txt is empty, the AI will spawn with asimov and Custom boards will auto-delete.)
 ## Set to 2 for "random", silicons will start with a random lawset picked from random laws specified below.
 ## Set to 3 for "weighted random", using values in "silicon_weights.txt", a law will be selected, with weights specifed in that file.
-DEFAULT_LAWS 0
+DEFAULT_LAWS 3
 
 ## RANDOM LAWS ##
 ## ------------------------------------------------------------------------------------------
@@ -482,7 +482,7 @@ ROUNDSTART_RACES ipc
 ROUNDSTART_RACES ethereal
 ROUNDSTART_RACES apid
 ROUNDSTART_RACES oozeling
-#ROUNDSTART_RACES jelly
+ROUNDSTART_RACES jelly
 #ROUNDSTART_RACES iron_golem
 #ROUNDSTART_RACES adamantine_golem
 #ROUNDSTART_RACES plasma_golem
@@ -494,8 +494,8 @@ ROUNDSTART_RACES oozeling
 #ROUNDSTART_RACES synth
 
 ## Races that are straight upgrades. If these are on expect powergamers to always pick them
-#ROUNDSTART_RACES skeleton
-#ROUNDSTART_RACES zombie
+ROUNDSTART_RACES skeleton
+ROUNDSTART_RACES zombie
 #ROUNDSTART_RACES slime
 #ROUNDSTART_RACES pod
 #ROUNDSTART_RACES military_synth
@@ -520,18 +520,18 @@ OVERFLOW_CAP -1
 
 ## Starlight for exterior walls and breaches. Uncomment for starlight!
 ## This is disabled by default to make testing quicker, should be enabled on production servers or testing servers messing with lighting
-#STARLIGHT
+STARLIGHT
 
 ## Uncomment to bring back old grey suit assistants instead of the now default rainbow colored assistants.
-#GREY_ASSISTANTS
+GREY_ASSISTANTS
 
 ## Midround Antag (aka Mulligan antag) config options ###
 
 ## A time, in minutes, after which the midround antag system stops attempting to run and continuous rounds end immediately upon completion.
-MIDROUND_ANTAG_TIME_CHECK 60
+MIDROUND_ANTAG_TIME_CHECK 120
 
 ## A ratio of living to total crew members, the lower this is, the more people will have to die in order for midround antag to be skipped
-MIDROUND_ANTAG_LIFE_CHECK 0.7
+MIDROUND_ANTAG_LIFE_CHECK 0.9
 
 ##Limit Spell Choices##
 ## Uncomment to disallow wizards from using certain spells that may be too chaotic/fun for your playerbase
@@ -553,19 +553,19 @@ REACTIONARY_EXPLOSIONS
 ## Small (3, 7, 14)
 #BOMBCAP 14
 ## Default (6, 12, 24) (recommended if you enable REACTIONARY_EXPLOSIONS above)
-BOMBCAP 24
+#BOMBCAP 24
 ## LagHell (7, 14, 28)
-#BOMBCAP 28
+BOMBCAP 28
 
 ## Lavaland "Budget"
 ## Lavaland ruin spawning has an imaginary budget to spend on ruins, where
 ## a less lootfilled or smaller or less round effecting ruin costs less to
 ## spawn, while the converse is true. Alter this number to affect the amount
 ## of ruins.
-LAVALAND_BUDGET 60
+LAVALAND_BUDGET 30
 
 ## Space Ruin Budged
-Space_Budget 8
+Space_Budget 20
 
 ## Time in ds from when a player latejoins till the arrival shuttle docks at the station
 ## Must be at least 30. At least 55 recommended to be visually/aurally appropriate
@@ -582,7 +582,7 @@ ARRIVALS_SHUTTLE_DOCK_WINDOW 55
 MICE_ROUNDSTART 10
 
 ## If the percentage of players alive (doesn't count conversions) drops below this threshold the emergency shuttle will be forcefully called (provided it can be)
-#EMERGENCY_SHUTTLE_AUTOCALL_THRESHOLD 0.2
+EMERGENCY_SHUTTLE_AUTOCALL_THRESHOLD 0.1
 
 ## Determines if players are allowed to print integrated circuits, uncomment to allow.
 IC_PRINTING
@@ -595,10 +595,10 @@ ROUNDSTART_TRAITS
 #DISABLE_HUMAN_MOOD
 
 ## Enable night shifts ##
-#ENABLE_NIGHT_SHIFTS
+ENABLE_NIGHT_SHIFTS
 
 ## Enable randomized shift start times##
-#RANDOMIZE_SHIFT_TIME
+RANDOMIZE_SHIFT_TIME
 
 ## Sets shift time to server time at roundstart. Overridden by RANDOMIZE_SHIFT_TIME ##
 #SHIFT_TIME_REALTIME
@@ -633,4 +633,4 @@ DONATOR_ITEMS
 ROUNDSTART_BLUESPACE_MINERS 2
 
 ## Enable the bluespace miner research node?
-#BSMINER_RESEARCHABLE
+BSMINER_RESEARCHABLE