From: Lyberta <lyberta@lyberta.net>
Date: Sat, 5 Aug 2017 02:45:28 +0000 (+0300)
Subject: Merge branch 'master' into Lyberta/StandaloneOverkillWeapons
X-Git-Tag: xonotic-v0.8.5~2119^2~61
X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=commitdiff_plain;h=2e96bd3f374953fcb40468bf47bcb55785e1f8db;hp=-c

Merge branch 'master' into Lyberta/StandaloneOverkillWeapons
---

2e96bd3f374953fcb40468bf47bcb55785e1f8db
diff --combined qcsrc/common/mutators/mutator/overkill/rpc.qh
index d4d5c1772e,417e9a6612..512f51a703
--- a/qcsrc/common/mutators/mutator/overkill/rpc.qh
+++ b/qcsrc/common/mutators/mutator/overkill/rpc.qh
@@@ -2,7 -2,7 +2,7 @@@
  
  CLASS(RocketPropelledChainsaw, Weapon)
  /* ammotype  */ ATTRIB(RocketPropelledChainsaw, ammo_field, .int, ammo_rockets);
- /* impulse   */ ATTRIB(RocketPropelledChainsaw, impulse, int, 7);
+ /* impulse   */ ATTRIB(RocketPropelledChainsaw, impulse, int, 9);
  /* flags     */ ATTRIB(RocketPropelledChainsaw, spawnflags, int, WEP_FLAG_MUTATORBLOCKED | WEP_FLAG_HIDDEN | WEP_FLAG_NORMAL | WEP_FLAG_CANCLIMB | WEP_FLAG_RELOADABLE | WEP_TYPE_SPLASH | WEP_FLAG_SUPERWEAPON);
  /* rating    */ ATTRIB(RocketPropelledChainsaw, bot_pickupbasevalue, float, 10000);
  /* color     */ ATTRIB(RocketPropelledChainsaw, wpcolor, vector, '0.5 0.5 0');
@@@ -18,34 -18,21 +18,34 @@@
  
  #define X(BEGIN, P, END, class, prefix) \
  	BEGIN(class) \
 -		P(class, prefix, ammo, float, NONE) \
 -		P(class, prefix, animtime, float, NONE) \
 -		P(class, prefix, damage2, float, NONE) \
 -		P(class, prefix, damageforcescale, float, NONE) \
 -		P(class, prefix, damage, float, NONE) \
 -		P(class, prefix, edgedamage, float, NONE) \
 -		P(class, prefix, force, float, NONE) \
 -		P(class, prefix, health, float, NONE) \
 -		P(class, prefix, lifetime, float, NONE) \
 -		P(class, prefix, radius, float, NONE) \
 -		P(class, prefix, refire, float, NONE) \
 +		P(class, prefix, ammo, float, PRI) \
 +		P(class, prefix, animtime, float, PRI) \
 +		P(class, prefix, damage, float, PRI) \
 +		P(class, prefix, damage2, float, PRI) \
 +		P(class, prefix, damageforcescale, float, PRI) \
 +		P(class, prefix, edgedamage, float, PRI) \
 +		P(class, prefix, force, float, PRI) \
 +		P(class, prefix, health, float, PRI) \
 +		P(class, prefix, lifetime, float, PRI) \
 +		P(class, prefix, radius, float, PRI) \
 +		P(class, prefix, refire, float, PRI) \
 +		P(class, prefix, speedaccel, float, PRI) \
 +		P(class, prefix, speed, float, PRI) \
 +		P(class, prefix, ammo, float, SEC) \
 +		P(class, prefix, animtime, float, SEC) \
 +		P(class, prefix, damage, float, SEC) \
 +		P(class, prefix, delay, float, SEC) \
 +		P(class, prefix, edgedamage, float, SEC) \
 +		P(class, prefix, force, float, SEC) \
 +		P(class, prefix, lifetime, float, SEC) \
 +		P(class, prefix, radius, float, SEC) \
 +		P(class, prefix, refire, float, SEC) \
 +		P(class, prefix, refire_type, float, SEC) \
 +		P(class, prefix, shotangle, float, SEC) \
 +		P(class, prefix, speed, float, SEC) \
 +		P(class, prefix, spread, float, SEC) \
  		P(class, prefix, reload_ammo, float, NONE) \
          P(class, prefix, reload_time, float, NONE) \
 -		P(class, prefix, speedaccel, float, NONE) \
 -		P(class, prefix, speed, float, NONE) \
          P(class, prefix, switchdelay_drop, float, NONE) \
          P(class, prefix, switchdelay_raise, float, NONE) \
          P(class, prefix, weaponreplace, string, NONE) \