From: Samual Lenks Date: Mon, 9 Dec 2013 18:40:13 +0000 (-0500) Subject: Add the properties to all weapons now X-Git-Tag: xonotic-v0.8.0~152^2~271 X-Git-Url: http://de.git.xonotic.org/?a=commitdiff_plain;h=38d3c1a08c18abc768e5c37256552b5f30bdfa53;p=xonotic%2Fxonotic-data.pk3dir.git Add the properties to all weapons now --- diff --git a/qcsrc/common/weapons/w_arc.qc b/qcsrc/common/weapons/w_arc.qc index d6488d42c..0c1fcf37f 100644 --- a/qcsrc/common/weapons/w_arc.qc +++ b/qcsrc/common/weapons/w_arc.qc @@ -24,7 +24,9 @@ REGISTER_WEAPON( w_prop(WEP_ARC, arc, float, reloading_ammo, reload_ammo) \ w_prop(WEP_ARC, arc, float, reloading_time, reload_time) \ w_prop(WEP_ARC, arc, float, switchdelay_raise, switchdelay_raise) \ - w_prop(WEP_ARC, arc, float, switchdelay_drop, switchdelay_drop) + w_prop(WEP_ARC, arc, float, switchdelay_drop, switchdelay_drop) \ + w_prop(WEP_ARC, arc, string, weaponreplace, weaponreplace) \ + w_prop(WEP_ARC, arc, float, weaponstart, weaponstart) #ifndef MENUQC vector arc_shotorigin[4]; diff --git a/qcsrc/common/weapons/w_blaster.qc b/qcsrc/common/weapons/w_blaster.qc index 5d0ba61cd..58c1724e7 100644 --- a/qcsrc/common/weapons/w_blaster.qc +++ b/qcsrc/common/weapons/w_blaster.qc @@ -27,7 +27,9 @@ REGISTER_WEAPON( w_prop(WEP_BLASTER, blaster, float, reloading_ammo, reload_ammo) \ w_prop(WEP_BLASTER, blaster, float, reloading_time, reload_time) \ w_prop(WEP_BLASTER, blaster, float, switchdelay_raise, switchdelay_raise) \ - w_prop(WEP_BLASTER, blaster, float, switchdelay_drop, switchdelay_drop) + w_prop(WEP_BLASTER, blaster, float, switchdelay_drop, switchdelay_drop) \ + w_prop(WEP_BLASTER, blaster, string, weaponreplace, weaponreplace) \ + w_prop(WEP_BLASTER, blaster, float, weaponstart, weaponstart) #ifdef SVQC BLASTER_SETTINGS(WEP_ADD_CVAR, WEP_ADD_PROP) diff --git a/qcsrc/common/weapons/w_crylink.qc b/qcsrc/common/weapons/w_crylink.qc index 8c79e2091..f2824eed6 100644 --- a/qcsrc/common/weapons/w_crylink.qc +++ b/qcsrc/common/weapons/w_crylink.qc @@ -40,7 +40,9 @@ REGISTER_WEAPON( w_prop(WEP_CRYLINK, crylink, float, reloading_ammo, reload_ammo) \ w_prop(WEP_CRYLINK, crylink, float, reloading_time, reload_time) \ w_prop(WEP_CRYLINK, crylink, float, switchdelay_raise, switchdelay_raise) \ - w_prop(WEP_CRYLINK, crylink, float, switchdelay_drop, switchdelay_drop) + w_prop(WEP_CRYLINK, crylink, float, switchdelay_drop, switchdelay_drop) \ + w_prop(WEP_CRYLINK, crylink, string, weaponreplace, weaponreplace) \ + w_prop(WEP_CRYLINK, crylink, float, weaponstart, weaponstart) #ifdef SVQC CRYLINK_SETTINGS(WEP_ADD_CVAR, WEP_ADD_PROP) diff --git a/qcsrc/common/weapons/w_electro.qc b/qcsrc/common/weapons/w_electro.qc index e85572746..d2d7e9ad8 100644 --- a/qcsrc/common/weapons/w_electro.qc +++ b/qcsrc/common/weapons/w_electro.qc @@ -47,7 +47,9 @@ REGISTER_WEAPON( w_prop(WEP_ELECTRO, electro, float, reloading_ammo, reload_ammo) \ w_prop(WEP_ELECTRO, electro, float, reloading_time, reload_time) \ w_prop(WEP_ELECTRO, electro, float, switchdelay_raise, switchdelay_raise) \ - w_prop(WEP_ELECTRO, electro, float, switchdelay_drop, switchdelay_drop) + w_prop(WEP_ELECTRO, electro, float, switchdelay_drop, switchdelay_drop) \ + w_prop(WEP_ELECTRO, electro, string, weaponreplace, weaponreplace) \ + w_prop(WEP_ELECTRO, electro, float, weaponstart, weaponstart) #ifdef SVQC ELECTRO_SETTINGS(WEP_ADD_CVAR, WEP_ADD_PROP) diff --git a/qcsrc/common/weapons/w_fireball.qc b/qcsrc/common/weapons/w_fireball.qc index b09e24fa2..019ce9b00 100644 --- a/qcsrc/common/weapons/w_fireball.qc +++ b/qcsrc/common/weapons/w_fireball.qc @@ -37,7 +37,9 @@ REGISTER_WEAPON( w_prop(WEP_FIREBALL, fireball, float, reloading_ammo, reload_ammo) \ w_prop(WEP_FIREBALL, fireball, float, reloading_time, reload_time) \ w_prop(WEP_FIREBALL, fireball, float, switchdelay_raise, switchdelay_raise) \ - w_prop(WEP_FIREBALL, fireball, float, switchdelay_drop, switchdelay_drop) + w_prop(WEP_FIREBALL, fireball, float, switchdelay_drop, switchdelay_drop) \ + w_prop(WEP_FIREBALL, fireball, string, weaponreplace, weaponreplace) \ + w_prop(WEP_FIREBALL, fireball, float, weaponstart, weaponstart) #ifdef SVQC FIREBALL_SETTINGS(WEP_ADD_CVAR, WEP_ADD_PROP) diff --git a/qcsrc/common/weapons/w_hagar.qc b/qcsrc/common/weapons/w_hagar.qc index 2fd60fc4a..60ba9f95d 100644 --- a/qcsrc/common/weapons/w_hagar.qc +++ b/qcsrc/common/weapons/w_hagar.qc @@ -39,7 +39,9 @@ REGISTER_WEAPON( w_prop(WEP_HAGAR, hagar, float, reloading_ammo, reload_ammo) \ w_prop(WEP_HAGAR, hagar, float, reloading_time, reload_time) \ w_prop(WEP_HAGAR, hagar, float, switchdelay_raise, switchdelay_raise) \ - w_prop(WEP_HAGAR, hagar, float, switchdelay_drop, switchdelay_drop) + w_prop(WEP_HAGAR, hagar, float, switchdelay_drop, switchdelay_drop) \ + w_prop(WEP_HAGAR, hagar, string, weaponreplace, weaponreplace) \ + w_prop(WEP_HAGAR, hagar, float, weaponstart, weaponstart) #ifdef SVQC HAGAR_SETTINGS(WEP_ADD_CVAR, WEP_ADD_PROP) diff --git a/qcsrc/common/weapons/w_hlac.qc b/qcsrc/common/weapons/w_hlac.qc index e728bb9cf..6b26ba41c 100644 --- a/qcsrc/common/weapons/w_hlac.qc +++ b/qcsrc/common/weapons/w_hlac.qc @@ -31,7 +31,9 @@ REGISTER_WEAPON( w_prop(WEP_HLAC, hlac, float, reloading_ammo, reload_ammo) \ w_prop(WEP_HLAC, hlac, float, reloading_time, reload_time) \ w_prop(WEP_HLAC, hlac, float, switchdelay_raise, switchdelay_raise) \ - w_prop(WEP_HLAC, hlac, float, switchdelay_drop, switchdelay_drop) + w_prop(WEP_HLAC, hlac, float, switchdelay_drop, switchdelay_drop) \ + w_prop(WEP_HLAC, hlac, string, weaponreplace, weaponreplace) \ + w_prop(WEP_HLAC, hlac, float, weaponstart, weaponstart) #ifdef SVQC HLAC_SETTINGS(WEP_ADD_CVAR, WEP_ADD_PROP) diff --git a/qcsrc/common/weapons/w_hook.qc b/qcsrc/common/weapons/w_hook.qc index 264629d87..42bf3c110 100644 --- a/qcsrc/common/weapons/w_hook.qc +++ b/qcsrc/common/weapons/w_hook.qc @@ -32,7 +32,9 @@ REGISTER_WEAPON( w_prop(WEP_HOOK, hook, float, reloading_ammo, reload_ammo) \ w_prop(WEP_HOOK, hook, float, reloading_time, reload_time) \ w_prop(WEP_HOOK, hook, float, switchdelay_raise, switchdelay_raise) \ - w_prop(WEP_HOOK, hook, float, switchdelay_drop, switchdelay_drop) + w_prop(WEP_HOOK, hook, float, switchdelay_drop, switchdelay_drop) \ + w_prop(WEP_HOOK, hook, string, weaponreplace, weaponreplace) \ + w_prop(WEP_HOOK, hook, float, weaponstart, weaponstart) #ifdef SVQC HOOK_SETTINGS(WEP_ADD_CVAR, WEP_ADD_PROP) diff --git a/qcsrc/common/weapons/w_machinegun.qc b/qcsrc/common/weapons/w_machinegun.qc index 672f1bc59..0100b71dd 100644 --- a/qcsrc/common/weapons/w_machinegun.qc +++ b/qcsrc/common/weapons/w_machinegun.qc @@ -38,7 +38,9 @@ REGISTER_WEAPON( w_prop(WEP_UZI, uzi, float, reloading_ammo, reload_ammo) \ w_prop(WEP_UZI, uzi, float, reloading_time, reload_time) \ w_prop(WEP_UZI, uzi, float, switchdelay_raise, switchdelay_raise) \ - w_prop(WEP_UZI, uzi, float, switchdelay_drop, switchdelay_drop) + w_prop(WEP_UZI, uzi, float, switchdelay_drop, switchdelay_drop) \ + w_prop(WEP_UZI, uzi, string, weaponreplace, weaponreplace) \ + w_prop(WEP_UZI, uzi, float, weaponstart, weaponstart) #ifdef SVQC UZI_SETTINGS(WEP_ADD_CVAR, WEP_ADD_PROP) diff --git a/qcsrc/common/weapons/w_minelayer.qc b/qcsrc/common/weapons/w_minelayer.qc index 5bacdb9f9..9f773d01b 100644 --- a/qcsrc/common/weapons/w_minelayer.qc +++ b/qcsrc/common/weapons/w_minelayer.qc @@ -36,7 +36,9 @@ REGISTER_WEAPON( w_prop(WEP_MINE_LAYER, minelayer, float, reloading_ammo, reload_ammo) \ w_prop(WEP_MINE_LAYER, minelayer, float, reloading_time, reload_time) \ w_prop(WEP_MINE_LAYER, minelayer, float, switchdelay_raise, switchdelay_raise) \ - w_prop(WEP_MINE_LAYER, minelayer, float, switchdelay_drop, switchdelay_drop) + w_prop(WEP_MINE_LAYER, minelayer, float, switchdelay_drop, switchdelay_drop) \ + w_prop(WEP_MINE_LAYER, minelayer, string, weaponreplace, weaponreplace) \ + w_prop(WEP_MINE_LAYER, minelayer, float, weaponstart, weaponstart) #ifdef SVQC MINELAYER_SETTINGS(WEP_ADD_CVAR, WEP_ADD_PROP) diff --git a/qcsrc/common/weapons/w_minstanex.qc b/qcsrc/common/weapons/w_minstanex.qc index 178ffa4cc..c828cada2 100644 --- a/qcsrc/common/weapons/w_minstanex.qc +++ b/qcsrc/common/weapons/w_minstanex.qc @@ -30,7 +30,9 @@ REGISTER_WEAPON( w_prop(WEP_MINSTANEX, minstanex, float, reloading_ammo, reload_ammo) \ w_prop(WEP_MINSTANEX, minstanex, float, reloading_time, reload_time) \ w_prop(WEP_MINSTANEX, minstanex, float, switchdelay_raise, switchdelay_raise) \ - w_prop(WEP_MINSTANEX, minstanex, float, switchdelay_drop, switchdelay_drop) + w_prop(WEP_MINSTANEX, minstanex, float, switchdelay_drop, switchdelay_drop) \ + w_prop(WEP_MINSTANEX, minstanex, string, weaponreplace, weaponreplace) \ + w_prop(WEP_MINSTANEX, minstanex, float, weaponstart, weaponstart) #ifdef SVQC MINSTANEX_SETTINGS(WEP_ADD_CVAR, WEP_ADD_PROP) diff --git a/qcsrc/common/weapons/w_mortar.qc b/qcsrc/common/weapons/w_mortar.qc index a4dda2fb8..3e3744e74 100644 --- a/qcsrc/common/weapons/w_mortar.qc +++ b/qcsrc/common/weapons/w_mortar.qc @@ -36,7 +36,9 @@ REGISTER_WEAPON( w_prop(WEP_MORTAR, mortar, float, reloading_ammo, reload_ammo) \ w_prop(WEP_MORTAR, mortar, float, reloading_time, reload_time) \ w_prop(WEP_MORTAR, mortar, float, switchdelay_raise, switchdelay_raise) \ - w_prop(WEP_MORTAR, mortar, float, switchdelay_drop, switchdelay_drop) + w_prop(WEP_MORTAR, mortar, float, switchdelay_drop, switchdelay_drop) \ + w_prop(WEP_MORTAR, mortar, string, weaponreplace, weaponreplace) \ + w_prop(WEP_MORTAR, mortar, float, weaponstart, weaponstart) #ifdef SVQC MORTAR_SETTINGS(WEP_ADD_CVAR, WEP_ADD_PROP) diff --git a/qcsrc/common/weapons/w_nex.qc b/qcsrc/common/weapons/w_nex.qc index 3cff6e001..c2eaadd0e 100644 --- a/qcsrc/common/weapons/w_nex.qc +++ b/qcsrc/common/weapons/w_nex.qc @@ -40,7 +40,9 @@ REGISTER_WEAPON( w_prop(WEP_NEX, nex, float, reloading_ammo, reload_ammo) \ w_prop(WEP_NEX, nex, float, reloading_time, reload_time) \ w_prop(WEP_NEX, nex, float, switchdelay_raise, switchdelay_raise) \ - w_prop(WEP_NEX, nex, float, switchdelay_drop, switchdelay_drop) + w_prop(WEP_NEX, nex, float, switchdelay_drop, switchdelay_drop) \ + w_prop(WEP_NEX, nex, string, weaponreplace, weaponreplace) \ + w_prop(WEP_NEX, nex, float, weaponstart, weaponstart) #ifdef SVQC NEX_SETTINGS(WEP_ADD_CVAR, WEP_ADD_PROP) diff --git a/qcsrc/common/weapons/w_porto.qc b/qcsrc/common/weapons/w_porto.qc index 8ba8f9cc4..0dd5e4e5b 100644 --- a/qcsrc/common/weapons/w_porto.qc +++ b/qcsrc/common/weapons/w_porto.qc @@ -20,7 +20,9 @@ REGISTER_WEAPON( w_prop(WEP_PORTO, porto, float, reloading_ammo, reload_ammo) \ w_prop(WEP_PORTO, porto, float, reloading_time, reload_time) \ w_prop(WEP_PORTO, porto, float, switchdelay_raise, switchdelay_raise) \ - w_prop(WEP_PORTO, porto, float, switchdelay_drop, switchdelay_drop) + w_prop(WEP_PORTO, porto, float, switchdelay_drop, switchdelay_drop) \ + w_prop(WEP_PORTO, porto, string, weaponreplace, weaponreplace) \ + w_prop(WEP_PORTO, porto, float, weaponstart, weaponstart) #ifdef SVQC PORTO_SETTINGS(WEP_ADD_CVAR, WEP_ADD_PROP) diff --git a/qcsrc/common/weapons/w_rifle.qc b/qcsrc/common/weapons/w_rifle.qc index 8d0acb9b4..7d2aff27a 100644 --- a/qcsrc/common/weapons/w_rifle.qc +++ b/qcsrc/common/weapons/w_rifle.qc @@ -31,7 +31,9 @@ REGISTER_WEAPON( w_prop(WEP_RIFLE, rifle, float, reloading_ammo, reload_ammo) \ w_prop(WEP_RIFLE, rifle, float, reloading_time, reload_time) \ w_prop(WEP_RIFLE, rifle, float, switchdelay_raise, switchdelay_raise) \ - w_prop(WEP_RIFLE, rifle, float, switchdelay_drop, switchdelay_drop) + w_prop(WEP_RIFLE, rifle, float, switchdelay_drop, switchdelay_drop) \ + w_prop(WEP_RIFLE, rifle, string, weaponreplace, weaponreplace) \ + w_prop(WEP_RIFLE, rifle, float, weaponstart, weaponstart) #ifdef SVQC RIFLE_SETTINGS(WEP_ADD_CVAR, WEP_ADD_PROP) diff --git a/qcsrc/common/weapons/w_seeker.qc b/qcsrc/common/weapons/w_seeker.qc index 34061dd15..f27c2deac 100644 --- a/qcsrc/common/weapons/w_seeker.qc +++ b/qcsrc/common/weapons/w_seeker.qc @@ -65,7 +65,9 @@ REGISTER_WEAPON( w_prop(WEP_SEEKER, seeker, float, reloading_ammo, reload_ammo) \ w_prop(WEP_SEEKER, seeker, float, reloading_time, reload_time) \ w_prop(WEP_SEEKER, seeker, float, switchdelay_raise, switchdelay_raise) \ - w_prop(WEP_SEEKER, seeker, float, switchdelay_drop, switchdelay_drop) + w_prop(WEP_SEEKER, seeker, float, switchdelay_drop, switchdelay_drop) \ + w_prop(WEP_SEEKER, seeker, string, weaponreplace, weaponreplace) \ + w_prop(WEP_SEEKER, seeker, float, weaponstart, weaponstart) #ifdef SVQC SEEKER_SETTINGS(WEP_ADD_CVAR, WEP_ADD_PROP) diff --git a/qcsrc/common/weapons/w_shockwave.qc b/qcsrc/common/weapons/w_shockwave.qc index 2284f87fc..69819bced 100644 --- a/qcsrc/common/weapons/w_shockwave.qc +++ b/qcsrc/common/weapons/w_shockwave.qc @@ -68,7 +68,9 @@ REGISTER_WEAPON( w_prop(WEP_SHOCKWAVE, shockwave, float, reloading_ammo, reload_ammo) \ w_prop(WEP_SHOCKWAVE, shockwave, float, reloading_time, reload_time) \ w_prop(WEP_SHOCKWAVE, shockwave, float, switchdelay_raise, switchdelay_raise) \ - w_prop(WEP_SHOCKWAVE, shockwave, float, switchdelay_drop, switchdelay_drop) + w_prop(WEP_SHOCKWAVE, shockwave, float, switchdelay_drop, switchdelay_drop) \ + w_prop(WEP_SHOCKWAVE, shockwave, string, weaponreplace, weaponreplace) \ + w_prop(WEP_SHOCKWAVE, shockwave, float, weaponstart, weaponstart) #ifdef SVQC SHOCKWAVE_SETTINGS(WEP_ADD_CVAR, WEP_ADD_PROP) diff --git a/qcsrc/common/weapons/w_tuba.qc b/qcsrc/common/weapons/w_tuba.qc index e6122f8ec..4f1e6c99c 100644 --- a/qcsrc/common/weapons/w_tuba.qc +++ b/qcsrc/common/weapons/w_tuba.qc @@ -23,7 +23,9 @@ REGISTER_WEAPON( w_prop(WEP_TUBA, tuba, float, reloading_ammo, reload_ammo) \ w_prop(WEP_TUBA, tuba, float, reloading_time, reload_time) \ w_prop(WEP_TUBA, tuba, float, switchdelay_raise, switchdelay_raise) \ - w_prop(WEP_TUBA, tuba, float, switchdelay_drop, switchdelay_drop) + w_prop(WEP_TUBA, tuba, float, switchdelay_drop, switchdelay_drop) \ + w_prop(WEP_TUBA, tuba, string, weaponreplace, weaponreplace) \ + w_prop(WEP_TUBA, tuba, float, weaponstart, weaponstart) #ifdef SVQC TUBA_SETTINGS(WEP_ADD_CVAR, WEP_ADD_PROP)