From: Mario Date: Thu, 6 Jun 2013 08:40:29 +0000 (+1000) Subject: Merge branch 'Mario/melee_mutator' into Mario/mutators X-Git-Tag: xonotic-v0.8.0~366^2~33 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=abbead1a164088a600b14ac5d75df679d50de19b;p=xonotic%2Fxonotic-data.pk3dir.git Merge branch 'Mario/melee_mutator' into Mario/mutators --- abbead1a164088a600b14ac5d75df679d50de19b diff --cc defaultXonotic.cfg index 7f718746a,d7ecf5fd8..bd9ebc176 --- a/defaultXonotic.cfg +++ b/defaultXonotic.cfg @@@ -1602,10 -1602,4 +1602,12 @@@ set cl_weapon_stay_alpha 0.75 "Alpha o seta g_superspectate 0 "server side, allows extended spectator functions through the cmd interface. followpowerup, followstrength, followstshield or followfc [red|blue] will transfer spectation to the relevent player, if any" +set g_random_gravity 0 "enable random gravity mutator" +set g_random_gravity_delay 3 "delay between gravity changes" +set g_random_gravity_negative_chance 0.5 "chance of gravity being a negative value" +set g_random_gravity_min -2000 "minimum gravity" +set g_random_gravity_max 2000 "maximum gravity" +set g_random_gravity_positive 1000 "positive gravity multiplier" +set g_random_gravity_negative 1000 "negative gravity multiplier" ++ + set g_melee_only 0 "enable melee only arena" diff --cc qcsrc/server/miscfunctions.qc index 1b0fed067,b9c1475d4..d0a0a84a5 --- a/qcsrc/server/miscfunctions.qc +++ b/qcsrc/server/miscfunctions.qc @@@ -918,14 -919,7 +918,15 @@@ void readlevelcvars(void CHECK_MUTATOR_ADD("g_rocket_flying", mutator_rocketflying, !cvar("g_minstagib")); CHECK_MUTATOR_ADD("g_vampire", mutator_vampire, !cvar("g_minstagib")); CHECK_MUTATOR_ADD("g_superspectate", mutator_superspec, 1); + CHECK_MUTATOR_ADD("g_pinata", mutator_pinata, !cvar("g_minstagib")); + CHECK_MUTATOR_ADD("g_midair", mutator_midair, 1); + CHECK_MUTATOR_ADD("g_bloodloss", mutator_bloodloss, !cvar("g_minstagib")); + CHECK_MUTATOR_ADD("g_random_gravity", mutator_random_gravity, 1); + CHECK_MUTATOR_ADD("g_norecoil", mutator_norecoil, 1); + CHECK_MUTATOR_ADD("g_multijump", mutator_multijump, 1); + CHECK_MUTATOR_ADD("g_jump_grunt", mutator_jump_grunt, 1); + CHECK_MUTATOR_ADD("g_footsteps", mutator_footsteps, 1); + CHECK_MUTATOR_ADD("g_melee_only", mutator_melee_only, !cvar("g_minstagib")); CHECK_MUTATOR_ADD("g_sandbox", sandbox, 1); #undef CHECK_MUTATOR_ADD diff --cc qcsrc/server/mutators/mutators.qh index edfd81d31,e150bddbb..48ada7784 --- a/qcsrc/server/mutators/mutators.qh +++ b/qcsrc/server/mutators/mutators.qh @@@ -21,13 -21,6 +21,14 @@@ MUTATOR_DECLARATION(mutator_vampire) MUTATOR_DECLARATION(mutator_superspec); MUTATOR_DECLARATION(mutator_minstagib); MUTATOR_DECLARATION(mutator_touchexplode); +MUTATOR_DECLARATION(mutator_pinata); +MUTATOR_DECLARATION(mutator_midair); +MUTATOR_DECLARATION(mutator_bloodloss); +MUTATOR_DECLARATION(mutator_random_gravity); +MUTATOR_DECLARATION(mutator_norecoil); +MUTATOR_DECLARATION(mutator_multijump); +MUTATOR_DECLARATION(mutator_jump_grunt); +MUTATOR_DECLARATION(mutator_footsteps); + MUTATOR_DECLARATION(mutator_melee_only); MUTATOR_DECLARATION(sandbox); diff --cc qcsrc/server/progs.src index 3f97fd36f,5b6825e8d..7be15ed7c --- a/qcsrc/server/progs.src +++ b/qcsrc/server/progs.src @@@ -248,14 -248,7 +248,15 @@@ mutators/sandbox.q mutators/mutator_superspec.qc mutators/mutator_minstagib.qc mutators/mutator_touchexplode.qc +mutators/mutator_pinata.qc +mutators/mutator_midair.qc +mutators/mutator_bloodloss.qc +mutators/mutator_random_gravity.qc +mutators/mutator_norecoil.qc +mutators/mutator_multijump.qc +mutators/mutator_jump_grunt.qc +mutators/mutator_footsteps.qc + mutators/mutator_melee_only.qc ../warpzonelib/anglestransform.qc ../warpzonelib/mathlib.qc