From: LegendaryGuard Date: Tue, 6 Apr 2021 16:28:36 +0000 (+0200) Subject: Removed unnecessary SetResource(entity, RES_TYPE, ammoquantity) stuff X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=be10256cd932aa10a8bd5f5244f20db760d60b0e;p=xonotic%2Fxonotic-data.pk3dir.git Removed unnecessary SetResource(entity, RES_TYPE, ammoquantity) stuff --- diff --git a/gamemodes-server.cfg b/gamemodes-server.cfg index ee64d57fd..f19b435f0 100644 --- a/gamemodes-server.cfg +++ b/gamemodes-server.cfg @@ -585,5 +585,4 @@ set g_mmm_karma_bantime 1800 "number of seconds to ban someone with very low kar 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" -set g_mmm_playerammobrcstartquantity 20 "how many ammo (bullets, rockets, cells) a player can have each time round starts" \ No newline at end of file +set g_mmm_reward_sleuth 1 "give a point to all sleuth players if investigated corpses" \ No newline at end of file diff --git a/qcsrc/common/gamemodes/gamemode/mmm/sv_mmm.qc b/qcsrc/common/gamemodes/gamemode/mmm/sv_mmm.qc index 97acb8536..1a374e51c 100644 --- a/qcsrc/common/gamemodes/gamemode/mmm/sv_mmm.qc +++ b/qcsrc/common/gamemodes/gamemode/mmm/sv_mmm.qc @@ -16,7 +16,6 @@ float autocvar_g_mmm_karma_bantime = 1800; //karma ban seconds bool autocvar_g_mmm_karma_damageactive = true; //LegendGuard sets Karma damage setting if active 20-03-2021 float autocvar_g_mmm_karma_severity = 0.25; float autocvar_g_mmm_karma_damagepunishmentdeal = 20; //LegendGuard sets Karma punishment damage setting if player kills an ally 28-03-2021 -int autocvar_g_mmm_playerammobrcstartquantity = 20; // Sleuth is a created team, this team is added inside Civilians team void mmm_FakeTimeLimit(entity e, float t) @@ -336,9 +335,6 @@ void mmm_RoundStart() if(it.mmm_status == MMM_STATUS_CIVILIAN) { - SetResource(it, RES_BULLETS, autocvar_g_mmm_playerammobrcstartquantity); - SetResource(it, RES_ROCKETS, autocvar_g_mmm_playerammobrcstartquantity); - SetResource(it, RES_CELLS, autocvar_g_mmm_playerammobrcstartquantity); if (it.karmapoints <= totalmeankarma) { centerprint(it, strcat(BOLD_OPERATOR, "^1KARMA WARNING!\n^3Here, have the Rifle!")); @@ -352,9 +348,6 @@ void mmm_RoundStart() } else if(it.mmm_status == MMM_STATUS_MURDERER) { - SetResource(it, RES_BULLETS, autocvar_g_mmm_playerammobrcstartquantity); - SetResource(it, RES_ROCKETS, autocvar_g_mmm_playerammobrcstartquantity); - SetResource(it, RES_CELLS, autocvar_g_mmm_playerammobrcstartquantity); if (it.karmapoints <= totalmeankarma) { centerprint(it, strcat(BOLD_OPERATOR, "^1KARMA WARNING!\n^3Here, have the Rifle!")); @@ -368,7 +361,6 @@ void mmm_RoundStart() } else if(it.mmm_status == MMM_STATUS_SLEUTH) { - SetResource(it, RES_ROCKETS, 10); if (it.karmapoints <= totalmeankarma) { centerprint(it, strcat(BOLD_OPERATOR, "^1KARMA WARNING!\n^3Here, have the Rifle!"));