From: z411 Date: Fri, 23 Apr 2021 23:54:39 +0000 (-0400) Subject: Merge branch 'drjaska/mayhem' into z411/bai-server X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=refs%2Fheads%2Fz411%2Finventory;p=xonotic%2Fxonotic-data.pk3dir.git Merge branch 'drjaska/mayhem' into z411/bai-server --- 6fc233ea95dd07ed56bf0b67b93c991d29575aa7 diff --cc gamemodes-client.cfg index aa8daa67e,c3dd70912..31950fad7 --- a/gamemodes-client.cfg +++ b/gamemodes-client.cfg @@@ -32,7 -32,8 +32,9 @@@ alias cl_hook_gamestart_k alias cl_hook_gamestart_ft alias cl_hook_gamestart_inv alias cl_hook_gamestart_duel +alias cl_hook_gamestart_mmm //LegendGuard adds mmm client hook for MMM 20-02-2021 + alias cl_hook_gamestart_mayhem + alias cl_hook_gamestart_tmayhem alias cl_hook_gameend "rpn /cl_matchcount dup load 1 + =" // increase match count every time a game ends alias cl_hook_shutdown alias cl_hook_activeweapon diff --cc gamemodes-server.cfg index db0f4d257,f2b342285..04cd76445 --- a/gamemodes-server.cfg +++ b/gamemodes-server.cfg @@@ -29,7 -29,8 +29,9 @@@ alias sv_hook_gamestart_k alias sv_hook_gamestart_ft alias sv_hook_gamestart_inv alias sv_hook_gamestart_duel +alias sv_hook_gamestart_mmm //LegendGuard adds mmm hook for MMM 20-02-2021 + alias sv_hook_gamestart_mayhem + alias sv_hook_gamestart_tmayhem // there is currently no hook for when the match is restarted // see sv_hook_readyrestart for previous uses of this hook //alias sv_hook_gamerestart @@@ -59,7 -60,8 +61,9 @@@ alias sv_vote_gametype_hook_on alias sv_vote_gametype_hook_rc alias sv_vote_gametype_hook_tdm alias sv_vote_gametype_hook_duel +alias sv_vote_gametype_hook_mmm //LegendGuard adds mmm hook for MMM 20-02-2021 + alias sv_vote_gametype_hook_mayhem + alias sv_vote_gametype_hook_tmayhem // Example preset to allow 1v1ctf to be used for the gametype voting screen. // Aliases can have max 31 chars so the gametype can have max 9 chars. @@@ -210,13 -212,20 +214,27 @@@ set g_duel_respawn_delay_large_count set g_duel_respawn_delay_max 0 set g_duel_respawn_waves 0 set g_duel_weapon_stay 0 +set g_mmm_respawn_delay_small 0 //LegendGuard adds mmm cvars for MMM 20-02-2021 +set g_mmm_respawn_delay_small_count 0 +set g_mmm_respawn_delay_large 0 +set g_mmm_respawn_delay_large_count 0 +set g_mmm_respawn_delay_max 0 +set g_mmm_respawn_waves 0 +set g_mmm_weapon_stay 0 + set g_mayhem_respawn_delay_small 0 + set g_mayhem_respawn_delay_small_count 0 + set g_mayhem_respawn_delay_large 0 + set g_mayhem_respawn_delay_large_count 0 + set g_mayhem_respawn_delay_max 0 + set g_mayhem_respawn_waves 0 + set g_mayhem_weapon_stay 0 + set g_tmayhem_respawn_delay_small 0 + set g_tmayhem_respawn_delay_small_count 0 + set g_tmayhem_respawn_delay_large 0 + set g_tmayhem_respawn_delay_large_count 0 + set g_tmayhem_respawn_delay_max 0 + set g_tmayhem_respawn_waves 0 + set g_tmayhem_weapon_stay 0 // ========= @@@ -566,23 -575,28 +584,50 @@@ set g_duel 0 "Duel: frag the opponent m set g_duel_with_powerups 0 "Enable powerups to spawn in the duel gamemode" set g_duel_not_dm_maps 0 "when this is set, DM maps will NOT be listed in duel" +//LegendGuard adds mmm cvars for MMM 20-02-2021 +// ========== +// murder in megaerebus manor +// ========== +set g_mmm 0 "Murder in Megaerebus Manor: A group of space civilians have murderers among them. Murderers must kill civilians, while the civilians have to try to find and kill the murderers" +set g_mmm_not_lms_maps 0 "when this is set, LMS maps will NOT be listed in mmm" +set g_mmm_civilian_count 0.625 "number of players who will become civilians, set between 0 and 0.9 to use a multiplier of the current players, or 1 and above to specify an exact number of players" +//set g_mmm_murderer_count 0.25 "number of players who will become murderers, set between 0 and 0.9 to use a multiplier of the current players, or 1 and above to specify an exact number of players" +set g_mmm_punish_teamkill 0 "enable option to kill the player when they kill an ally" +set g_mmm_reward_civilian 1 "give a point to all civilian players if the round timelimit is reached, in addition to the points given for kills" +set g_mmm_warmup 10 "how long the players will have time to run around the map before the round starts" +set g_mmm_round_timelimit 180 "round time limit in seconds" +set g_mmm_max_karma_points 1000 "limit of maximum number of karma points will have in the server" +set g_mmm_min_karma_points 400 "limit where number of karma points can be reached when are being decreased" +set g_mmm_karma_bankick_tool 0 "tool for strict rules when karma is low: '0' forces player to spec, '1' kicks player, '2' bans player" +set g_mmm_karma_bantime 1800 "number of seconds to ban someone with very low karma" +set g_mmm_karma_damageactive 1 "enable karma damage rule. If a player's karma is low, they will not do as much damage as a player who has high or full karma" +set g_mmm_karma_damagepunishmentdeal 20 "punishment damage points when player kills an ally" +set g_mmm_karma_severity 0.25 "how severe karma is to decrease karma points to the players [0.1 - 1.0]" +set g_mmm_reward_sleuth 1 "give a point to all sleuth players if investigated corpses" ++ + // ====================== + // mayhem (ffa or team) + // ====================== + set g_mayhem 0 "Mayhem: the player with the most frags in total mayhem wins" + set g_mayhem_regenerate 0 "allow players to regenerate hp. rates controlled by hp regeneration and rotting cvars" + set g_mayhem_weaponarena "most_available" "starting weapons - takes the same options as g_weaponarena" + set g_mayhem_powerups 1 "Allow powerups in mayhem. Only checked if g_powerups is -1 therefore this will be overridden by g_powerups 1 or 0" + set g_mayhem_selfdamage 0 "0 = disable selfdamage in mayhem, 1 = enable selfdamage in mayhem" + set g_mayhem_frags2score 1 "enable frags counting towards score" + set g_mayhem_damage2score 0 "enable damage counting towards score" + set g_mayhem_damage2score_multiplier 0.0025 "how much score is given for damage dealt. 0.01 -> 1k dmg = 10 score, 0.001 1k dmg = 1 score, 0.0025 400 dmg = 1 score" + + set g_tmayhem 0 "Team Mayhem: the team with the most frags in total mayhem wins" + set g_tmayhem_teams 2 "how many teams are in team mayhem (set by mapinfo)" + set g_tmayhem_team_spawns 0 "when 1, players spawn from the team spawnpoints of the map, if any" + set g_tmayhem_teams_override 0 "how many teams are in team mayhem" + set g_tmayhem_point_limit -1 "Team Mayhem point limit overriding the mapinfo specified one (use 0 to play without limit, and -1 to use the mapinfo's limit)" + set g_tmayhem_point_leadlimit -1 "Team Mayhem point lead limit overriding the mapinfo specified one (use 0 to play without limit, and -1 to use the mapinfo's limit)" + set g_tmayhem_weaponarena "most_available" "starting weapons - takes the same options as g_weaponarena" + set g_tmayhem_powerups 1 "Allow powerups in team mayhem. Only checked if g_powerups is -1 therefore this will be overridden by g_powerups 1 or 0" + set g_tmayhem_regenerate 0 "allow players to regenerate hp. rates controlled by hp regeneration and rotting cvars" + set g_tmayhem_selfdamage 0 "0 = disable selfdamage in tmayhem, 1 = enable selfdamage in tmayhem" + set g_tmayhem_frags2score 1 "enable frags counting towards score" + set g_tmayhem_damage2score 0 "enable damage counting towards score" + set g_tmayhem_damage2score_multiplier 0.0025 "how much score is given for damage dealt. 0.01 -> 1k dmg = 10 score, 0.001 1k dmg = 1 score, 0.0025 400 dmg = 1 score" ++ diff --cc qcsrc/common/gamemodes/gamemode/_mod.inc index aed8d748b,b106ec9ac..96ba25f11 --- a/qcsrc/common/gamemodes/gamemode/_mod.inc +++ b/qcsrc/common/gamemodes/gamemode/_mod.inc @@@ -12,8 -12,9 +12,10 @@@ #include #include #include +#include //LegendGuard adds _mod.inc for Murder in Megaerebus Manor 20-02-2021 + #include #include #include #include - #include + #include -#include ++#include diff --cc qcsrc/common/gamemodes/gamemode/_mod.qh index 3631a218b,15b6ecaac..25c9c119d --- a/qcsrc/common/gamemodes/gamemode/_mod.qh +++ b/qcsrc/common/gamemodes/gamemode/_mod.qh @@@ -12,8 -12,9 +12,10 @@@ #include #include #include +#include //LegendGuard adds _mod.qh for Murder in Megaerebus Manor 20-02-2021 + #include #include #include #include - #include + #include -#include ++#include diff --cc qcsrc/server/world.qc index 232c7f3bd,3f4445d08..6735ec2a4 --- a/qcsrc/server/world.qc +++ b/qcsrc/server/world.qc @@@ -301,8 -302,8 +302,10 @@@ void cvar_changes_init( BADCVAR("g_tdm"); BADCVAR("g_tdm_on_dm_maps"); BADCVAR("g_tdm_teams"); + BADCVAR("g_mmm"); + BADCVAR("g_mmm_not_dm_maps"); + BADCVAR("g_tmayhem"); + BADCVAR("g_tmayhem_teams"); BADCVAR("g_vip"); BADCVAR("leadlimit"); BADCVAR("nextmap");