Merge remote branch 'refs/remotes/origin/terencehill/bot_vs_human_fix'
authorRudolf Polzer <divverent@alientrap.org>
Tue, 15 Jun 2010 09:08:10 +0000 (11:08 +0200)
committerRudolf Polzer <divverent@alientrap.org>
Tue, 15 Jun 2010 09:08:10 +0000 (11:08 +0200)
304 files changed:
Makefile
balance.cfg
balance25.cfg
balanceFruit.cfg [new file with mode: 0644]
balanceSamual.cfg
balanceXPM.cfg
default.cfg
default25.cfg [deleted file]
default26.cfg [deleted file]
defaultSamual.cfg [new file with mode: 0644]
defaultXPM.cfg [new file with mode: 0644]
defaultXonotic.cfg
effectinfo.txt
effects-high.cfg
effects-low.cfg
effects-med.cfg
effects-normal.cfg
effects-omg.cfg
gfx/brand.tga [deleted file]
gfx/loading.tga
models/items/a_bullets.md3
models/items/a_bullets.mdl
models/items/a_rockets.md3
models/misc/chatbubble.spr_0.tga
models/player/erebus.iqm [new file with mode: 0644]
models/player/erebus.iqm.framegroups [new file with mode: 0644]
models/player/erebus.iqm_0.tga [new file with mode: 0644]
models/player/erebus.iqm_0.txt [new file with mode: 0644]
models/player/gak.iqm [new file with mode: 0644]
models/player/gak.iqm.framegroups [new file with mode: 0644]
models/player/gak.iqm_0.tga [new file with mode: 0644]
models/player/gak.iqm_0.txt [new file with mode: 0644]
models/player/gakarmored.iqm [new file with mode: 0644]
models/player/gakarmored.iqm.framegroups [new file with mode: 0644]
models/player/gakarmored.iqm_0.tga [new file with mode: 0644]
models/player/gakarmored.iqm_0.txt [new file with mode: 0644]
models/player/gakmasked.iqm [new file with mode: 0644]
models/player/gakmasked.iqm.framegroups [new file with mode: 0644]
models/player/gakmasked.iqm_0.tga [new file with mode: 0644]
models/player/gakmasked.iqm_0.txt [new file with mode: 0644]
models/player/ignis.iqm [new file with mode: 0644]
models/player/ignis.iqm.framegroups [new file with mode: 0644]
models/player/ignis.iqm_0.tga [new file with mode: 0644]
models/player/ignis.iqm_0.txt [new file with mode: 0644]
models/player/ignishalfmasked.iqm [new file with mode: 0644]
models/player/ignishalfmasked.iqm.framegroups [new file with mode: 0644]
models/player/ignishalfmasked.iqm_0.tga [new file with mode: 0644]
models/player/ignishalfmasked.iqm_0.txt [new file with mode: 0644]
models/player/ignishalfmasked_lod1.iqm [new file with mode: 0644]
models/player/ignishalfmasked_lod2.iqm [new file with mode: 0644]
models/player/ignismasked.iqm [new file with mode: 0644]
models/player/ignismasked.iqm.framegroups [new file with mode: 0644]
models/player/ignismasked.iqm_0.tga [new file with mode: 0644]
models/player/ignismasked.iqm_0.txt [new file with mode: 0644]
models/player/nyx.iqm [new file with mode: 0644]
models/player/nyx.iqm.framegroups [new file with mode: 0644]
models/player/nyx.iqm_0.tga [new file with mode: 0644]
models/player/nyx.iqm_0.txt [new file with mode: 0644]
models/player/pyria.iqm
models/player/pyria.iqm.framegroups
models/player/pyria.iqm_0.tga
models/player/pyria.iqm_0.txt
models/player/pyria_lod1.iqm [new file with mode: 0644]
models/player/pyria_lod2.iqm [new file with mode: 0644]
models/player/seraphina.iqm [new file with mode: 0644]
models/player/seraphina.iqm.framegroups [new file with mode: 0644]
models/player/seraphina.iqm_0.tga [new file with mode: 0644]
models/player/seraphina.iqm_0.txt [new file with mode: 0644]
models/player/seraphinamasked.iqm [new file with mode: 0644]
models/player/seraphinamasked.iqm.framegroups [new file with mode: 0644]
models/player/seraphinamasked.iqm_0.tga [new file with mode: 0644]
models/player/seraphinamasked.iqm_0.txt [new file with mode: 0644]
models/player/umbra.blend [deleted file]
models/player/umbra.iqm
models/player/umbra.iqm.framegroups
models/player/umbra.iqm_0.tga
models/player/umbra.iqm_0.txt
models/weapons/h_campingrifle.dpm [deleted file]
models/weapons/h_campingrifle.dpm.framegroups [deleted file]
models/weapons/h_campingrifle.iqm [new file with mode: 0644]
models/weapons/h_campingrifle.iqm.framegroups [new file with mode: 0644]
models/weapons/h_crylink.dpm [deleted file]
models/weapons/h_crylink.dpm.framegroups [deleted file]
models/weapons/h_crylink.iqm [new file with mode: 0644]
models/weapons/h_crylink.iqm.framegroups [new file with mode: 0644]
models/weapons/h_electro.dpm [deleted file]
models/weapons/h_electro.dpm.framegroups [deleted file]
models/weapons/h_electro.iqm [new file with mode: 0644]
models/weapons/h_electro.iqm.framegroups [new file with mode: 0644]
models/weapons/h_fireball.dpm [deleted file]
models/weapons/h_fireball.dpm.framegroups [deleted file]
models/weapons/h_fireball.iqm [new file with mode: 0644]
models/weapons/h_fireball.iqm.framegroups [new file with mode: 0644]
models/weapons/h_gl.dpm [deleted file]
models/weapons/h_gl.dpm.framegroups [deleted file]
models/weapons/h_gl.iqm [new file with mode: 0644]
models/weapons/h_gl.iqm.framegroups [new file with mode: 0644]
models/weapons/h_hagar.dpm [deleted file]
models/weapons/h_hagar.dpm.framegroups [deleted file]
models/weapons/h_hagar.iqm [new file with mode: 0644]
models/weapons/h_hagar.iqm.framegroups [new file with mode: 0644]
models/weapons/h_hlac.dpm [deleted file]
models/weapons/h_hlac.dpm.framegroups [deleted file]
models/weapons/h_hlac.iqm [new file with mode: 0644]
models/weapons/h_hlac.iqm.framegroups [new file with mode: 0644]
models/weapons/h_hookgun.dpm [deleted file]
models/weapons/h_hookgun.dpm.framegroups [deleted file]
models/weapons/h_hookgun.iqm [new file with mode: 0644]
models/weapons/h_hookgun.iqm.framegroups [new file with mode: 0644]
models/weapons/h_laser.dpm [deleted file]
models/weapons/h_laser.dpm.framegroups [deleted file]
models/weapons/h_laser.iqm [new file with mode: 0644]
models/weapons/h_laser.iqm.framegroups [new file with mode: 0644]
models/weapons/h_minstanex.dpm [deleted file]
models/weapons/h_minstanex.dpm.framegroups [deleted file]
models/weapons/h_minstanex.iqm [new file with mode: 0644]
models/weapons/h_minstanex.iqm.framegroups [new file with mode: 0644]
models/weapons/h_nex.dpm [deleted file]
models/weapons/h_nex.dpm.framegroups [deleted file]
models/weapons/h_nex.iqm [new file with mode: 0644]
models/weapons/h_nex.iqm.framegroups [new file with mode: 0644]
models/weapons/h_porto.dpm [deleted file]
models/weapons/h_porto.dpm.framegroups [deleted file]
models/weapons/h_porto.iqm [new file with mode: 0644]
models/weapons/h_porto.iqm.framegroups [new file with mode: 0644]
models/weapons/h_rl.dpm [deleted file]
models/weapons/h_rl.dpm.framegroups [deleted file]
models/weapons/h_rl.iqm [new file with mode: 0644]
models/weapons/h_rl.iqm.framegroups [new file with mode: 0644]
models/weapons/h_seeker.dpm [deleted file]
models/weapons/h_seeker.dpm.framegroups [deleted file]
models/weapons/h_seeker.iqm [new file with mode: 0644]
models/weapons/h_seeker.iqm.framegroups [new file with mode: 0644]
models/weapons/h_shotgun.dpm [deleted file]
models/weapons/h_shotgun.dpm.framegroups [deleted file]
models/weapons/h_shotgun.iqm [new file with mode: 0644]
models/weapons/h_shotgun.iqm.framegroups [new file with mode: 0644]
models/weapons/h_tuba.dpm [deleted file]
models/weapons/h_tuba.dpm.framegroups [deleted file]
models/weapons/h_tuba.iqm [new file with mode: 0644]
models/weapons/h_tuba.iqm.framegroups [new file with mode: 0644]
models/weapons/h_uzi.dpm [deleted file]
models/weapons/h_uzi.dpm.framegroups [deleted file]
models/weapons/h_uzi.iqm [new file with mode: 0644]
models/weapons/h_uzi.iqm.framegroups [new file with mode: 0644]
models/weapons/v_campingrifle.md3
models/weapons/v_crylink.md3
models/weapons/v_electro.md3
models/weapons/v_fireball.md3
models/weapons/v_gl.md3
models/weapons/v_hagar.md3
models/weapons/v_hlac.md3
models/weapons/v_hookgun.md3
models/weapons/v_laser.md3
models/weapons/v_minstanex.md3
models/weapons/v_nex.md3
models/weapons/v_porto.md3
models/weapons/v_rl.md3
models/weapons/v_seeker.md3
models/weapons/v_shotgun.md3
models/weapons/v_tuba.md3
models/weapons/v_uzi.md3
physics10.cfg
physics11.cfg
physics151.cfg
physics151b.cfg
physics16rc1.cfg
physics20.cfg
physics25.cfg
physics26.cfg
physicsCPMA.cfg
physicsHavoc.cfg
physicsLeeStricklin.cfg
physicsLzd.cfg
physicsNoQWBunny.cfg
physicsQ.cfg
physicsQ2.cfg
physicsQ2a.cfg
physicsQ3.cfg
physicsQBF.cfg
physicsQBFplus.cfg
physicsSamual.cfg
physicsWarsow.cfg
physicsWarsowClassicBunny.cfg
physicsWarsowDev.cfg
physicsXPM.cfg
qcsrc/client/Main.qc
qcsrc/client/d [deleted file]
qcsrc/client/damage.qc
qcsrc/client/progs.src
qcsrc/client/projectile.qc
qcsrc/common/constants.qh
qcsrc/common/items.qh
qcsrc/menu/anim/animation.c
qcsrc/menu/anim/animhost.c
qcsrc/menu/anim/easing.c
qcsrc/menu/anim/keyframe.c
qcsrc/menu/item/listbox.c
qcsrc/menu/item/slider.c
qcsrc/menu/item/textslider.c
qcsrc/menu/menu.qc
qcsrc/menu/xonotic/dialog_settings_effects.c
qcsrc/menu/xonotic/slider.c
qcsrc/menu/xonotic/slider_decibels.c
qcsrc/menu/xonotic/textslider.c
qcsrc/menu/xonotic/util.qc
qcsrc/server/bot/bot.qc
qcsrc/server/bot/bot.qh
qcsrc/server/cl_client.qc
qcsrc/server/cl_physics.qc
qcsrc/server/cl_player.qc
qcsrc/server/cl_weapons.qc
qcsrc/server/cl_weaponsystem.qc
qcsrc/server/defs.qh
qcsrc/server/extensions.qh
qcsrc/server/g_world.qc
qcsrc/server/gamecommand.qc
qcsrc/server/miscfunctions.qc
qcsrc/server/sv_main.qc
qcsrc/server/t_items.qc
qcsrc/server/t_jumppads.qc
qcsrc/server/vote.qc
qcsrc/server/w_campingrifle.qc
qcsrc/server/w_common.qc
qcsrc/server/w_crylink.qc
qcsrc/server/w_electro.qc
qcsrc/server/w_fireball.qc
qcsrc/server/w_grenadelauncher.qc
qcsrc/server/w_hagar.qc
qcsrc/server/w_hlac.qc
qcsrc/server/w_hook.qc
qcsrc/server/w_laser.qc
qcsrc/server/w_minstanex.qc
qcsrc/server/w_nex.qc
qcsrc/server/w_porto.qc
qcsrc/server/w_rocketlauncher.qc
qcsrc/server/w_seeker.qc
qcsrc/server/w_shotgun.qc
qcsrc/server/w_tuba.qc
qcsrc/server/w_uzi.qc
qcsrc/warpzonelib/server.qc
scripts/model-common.shader [new file with mode: 0644]
scripts/turrets.shader [new file with mode: 0644]
sound/announcer/default/welcome.ogg [deleted file]
sound/weapons/fireball_fly.ogg [new file with mode: 0644]
sound/weapons/fireball_fly.wav [deleted file]
sound/weapons/fireball_fly2.ogg [new file with mode: 0644]
sound/weapons/fireball_fly2.wav [deleted file]
textures/erebus.tga [new file with mode: 0644]
textures/erebus_gloss.tga [new file with mode: 0644]
textures/erebus_glow.tga [new file with mode: 0644]
textures/erebus_norm.tga [new file with mode: 0644]
textures/erebus_shirt.tga [new file with mode: 0644]
textures/gak.tga [new file with mode: 0644]
textures/gak_gloss.tga [new file with mode: 0644]
textures/gak_norm.tga [new file with mode: 0644]
textures/gak_shirt.tga [new file with mode: 0644]
textures/gakarmor.tga [new file with mode: 0644]
textures/gakarmor_gloss.tga [new file with mode: 0644]
textures/gakarmor_norm.tga [new file with mode: 0644]
textures/gakarmor_pants.tga [new file with mode: 0644]
textures/gakarmor_shirt.tga [new file with mode: 0644]
textures/ignis.tga [new file with mode: 0644]
textures/ignis_gloss.tga [new file with mode: 0644]
textures/ignis_glow.tga [new file with mode: 0644]
textures/ignis_norm.tga [new file with mode: 0644]
textures/ignis_shirt.tga [new file with mode: 0644]
textures/ignishead.tga [new file with mode: 0644]
textures/ignishead_gloss.tga [new file with mode: 0644]
textures/ignishead_glow.tga [new file with mode: 0644]
textures/ignishead_norm.tga [new file with mode: 0644]
textures/ignishead_shirt.tga [new file with mode: 0644]
textures/items/a_bullets.jpg [new file with mode: 0644]
textures/items/a_rocket_box.jpg [new file with mode: 0644]
textures/items/a_rocket_gre.jpg [new file with mode: 0644]
textures/items/a_rocket_gre_glow.jpg [new file with mode: 0644]
textures/items/a_rocket_roc.jpg [new file with mode: 0644]
textures/items/a_rocket_roc_gloss.jpg [new file with mode: 0644]
textures/items/a_rocket_roc_glow.jpg [new file with mode: 0644]
textures/items/a_rocket_roc_norm.jpg [new file with mode: 0644]
textures/items/a_rocket_tag.jpg [new file with mode: 0644]
textures/nyx.tga [new file with mode: 0644]
textures/nyx_gloss.tga [new file with mode: 0644]
textures/nyx_glow.tga [new file with mode: 0644]
textures/nyx_norm.tga [new file with mode: 0644]
textures/nyx_shirt.tga [new file with mode: 0644]
textures/rl.tga [new file with mode: 0644]
textures/rl_gloss.jpg [new file with mode: 0644]
textures/rl_norm.tga [new file with mode: 0644]
textures/rl_pants.tga [new file with mode: 0644]
textures/rl_shirt.tga [new file with mode: 0644]
textures/seraphina.tga [new file with mode: 0644]
textures/seraphina_gloss.jpg [new file with mode: 0644]
textures/seraphina_glow.tga [new file with mode: 0644]
textures/seraphina_norm.tga [new file with mode: 0644]
textures/shadowhead.tga [new file with mode: 0644]
textures/shadowhead_gloss.tga [new file with mode: 0644]
textures/shadowhead_glow.tga [new file with mode: 0644]
textures/shadowhead_norm.tga [new file with mode: 0644]
textures/shadowhead_shirt.tga [new file with mode: 0644]
textures/uzi.tga
textures/uzi_norm.tga
textures/uzi_pants.tga
textures/uzi_shirt.tga [deleted file]

index 7128da2..313fb84 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -6,7 +6,8 @@ ZIP ?= 7za a -tzip -mx=9
 ZIPEXCLUDE ?= -x\!*.pk3 -xr\!\.svn -x\!qcsrc
 DIFF ?= diff
 
-FTEQCCFLAGS ?= -Werror -Wall -Wno-mundane -O3 -Ono-c -Ono-cs -flo
+FTEQCCFLAGS_WATERMARK ?= -DWATERMARK='"^1$(shell git describe) TEST BUILD"'
+FTEQCCFLAGS ?= -Werror -Wall -Wno-mundane -O3 -Ono-c -Ono-cs -flo $(FTEQCCFLAGS_EXTRA) $(FTEQCCFLAGS_WATERMARK)
 FTEQCCFLAGS_PROGS ?= 
 FTEQCCFLAGS_MENU ?= 
 
@@ -57,12 +58,15 @@ clean:
        rm -f progs.dat menu.dat csprogs.dat
 
 csprogs.dat: qcsrc/client/*.* qcsrc/common/*.* qcsrc/warpzonelib/*.*
+       @echo make[1]: Entering directory \`$(PWD)/qcsrc/client\'
        cd qcsrc/client && $(FTEQCC) $(FTEQCCFLAGS) $(FTEQCCFLAGS_CSPROGS)
 
 progs.dat: qcsrc/server/*.* qcsrc/common/*.* qcsrc/server/*/*.* qcsrc/server/*/*/*.* qcsrc/warpzonelib/*.*
+       @echo make[1]: Entering directory \`$(PWD)/qcsrc/server\'
        cd qcsrc/server && $(FTEQCC) $(FTEQCCFLAGS) $(FTEQCCFLAGS_PROGS)
 
 menu.dat: qcsrc/menu/*.* qcsrc/menu/*/*.* qcsrc/common/*.*
+       @echo make[1]: Entering directory \`$(PWD)/qcsrc/menu\'
        cd qcsrc/menu && $(FTEQCC) $(FTEQCCFLAGS) $(FTEQCCFLAGS_MENU)
 
 gfx/menu/default/skinvalues.txt: qcsrc/menu/skin-customizables.inc
index b7750d4..cb58e9a 100644 (file)
@@ -1,29 +1,3 @@
-// {{{ weapon replacement
-// NOTE: this only replaces weapons on the map
-// use g_start_weapon_* to also replace the on-startup weapons!
-// example: g_weaponreplace_nex "nex minstanex", then Nexes become MinstaNexes 50% of the times
-// set the cvars to "0" to totally disable a weapon
-set sv_q3acompat_machineshotgunswap 0 "shorthand for swapping uzi and shotgun"
-set g_weaponreplace_laser ""
-set g_weaponreplace_shotgun ""
-set g_weaponreplace_uzi ""
-set g_weaponreplace_grenadelauncher ""
-set g_weaponreplace_electro ""
-set g_weaponreplace_crylink ""
-set g_weaponreplace_nex ""
-set g_weaponreplace_hagar ""
-set g_weaponreplace_rocketlauncher ""
-set g_weaponreplace_porto ""
-set g_weaponreplace_minstanex ""
-set g_weaponreplace_hook ""
-set g_weaponreplace_hlac ""
-set g_weaponreplace_campingrifle ""
-set g_weaponreplace_tuba ""
-set g_weaponreplace_fireball ""
-set g_weaponreplace_seeker ""
-set sv_q3acompat_machineshotgunswap 0 "shorthand for swapping uzi and shotgun (for Q3A map compatibility)"
-// }}}
-
 // {{{ starting gear
 set g_start_weapon_laser -1 "0 = never provide the weapon, 1 = always provide the weapon, -1 = game mode default, -2 = provide the weapon in ca and lms"
 set g_start_weapon_shotgun -1 "0 = never provide the weapon, 1 = always provide the weapon, -1 = game mode default, -2 = provide the weapon in ca and lms"
@@ -37,11 +11,11 @@ set g_start_weapon_rocketlauncher -1 "0 = never provide the weapon, 1 = always p
 set g_start_weapon_minstanex -1 "0 = never provide the weapon, 1 = always provide the weapon, -1 = game mode default, -2 = provide the weapon in ca and lms"
 set g_start_weapon_porto -1 "0 = never provide the weapon, 1 = always provide the weapon, -1 = game mode default, -2 = provide the weapon in ca and lms"
 set g_start_weapon_hook -1 "0 = never provide the weapon, 1 = always provide the weapon, -1 = game mode default, -2 = provide the weapon in ca and lms"
-set g_start_weapon_hlac 0 "0 = never provide the weapon, 1 = always provide the weapon, -1 = game mode default, -2 = provide the weapon in ca and lms"
+set g_start_weapon_hlac -1 "0 = never provide the weapon, 1 = always provide the weapon, -1 = game mode default, -2 = provide the weapon in ca and lms"
 set g_start_weapon_campingrifle -1 "0 = never provide the weapon, 1 = always provide the weapon, -1 = game mode default, -2 = provide the weapon in ca and lms"
 set g_start_weapon_tuba -1 "0 = never provide the weapon, 1 = always provide the weapon, -1 = game mode default, -2 = provide the weapon in ca and lms"
-set g_start_weapon_fireball 0 "0 = never provide the weapon, 1 = always provide the weapon, -1 = game mode default, -2 = provide the weapon in ca and lms"
-set g_start_weapon_seeker 0 "0 = never provide the weapon, 1 = always provide the weapon, -1 = game mode default, -2 = provide the weapon in ca and lms"
+set g_start_weapon_fireball -1 "0 = never provide the weapon, 1 = always provide the weapon, -1 = game mode default, -2 = provide the weapon in ca and lms"
+set g_start_weapon_seeker -1 "0 = never provide the weapon, 1 = always provide the weapon, -1 = game mode default, -2 = provide the weapon in ca and lms"
 set g_balance_health_start 100
 set g_balance_armor_start 0
 set g_start_ammo_shells 45
@@ -78,6 +52,8 @@ set g_balance_nix_ammoincr_fuel 2
 // }}}
 
 // {{{ pickup items
+set g_pickup_ammo_anyway 0
+set g_pickup_weapons_anyway 0
 set g_pickup_shells 30
 set g_pickup_shells_max 120
 set g_pickup_nails 80
@@ -91,20 +67,28 @@ set g_pickup_fuel_jetpack 50
 set g_pickup_fuel_max 999
 set g_pickup_armorsmall 10
 set g_pickup_armorsmall_max 100
+set g_pickup_armorsmall_anyway 0
 set g_pickup_armormedium 25
 set g_pickup_armormedium_max 100
+set g_pickup_armormedium_anyway 0
 set g_pickup_armorbig 50
 set g_pickup_armorbig_max 100
+set g_pickup_armorbig_anyway 0
 set g_pickup_armorlarge 100
 set g_pickup_armorlarge_max 100
+set g_pickup_armorlarge_anyway 0
 set g_pickup_healthsmall 10
 set g_pickup_healthsmall_max 200
+set g_pickup_healthsmall_anyway 0
 set g_pickup_healthmedium 25
 set g_pickup_healthmedium_max 200
+set g_pickup_healthmedium_anyway 0
 set g_pickup_healthlarge 50
 set g_pickup_healthlarge_max 200
+set g_pickup_healthlarge_anyway 0
 set g_pickup_healthmega 100
 set g_pickup_healthmega_max 200
+set g_pickup_healthmega_anyway 0
 set g_pickup_respawntime_short 15
 set g_pickup_respawntime_medium 20
 set g_pickup_respawntime_long 30
@@ -533,6 +517,7 @@ set g_balance_campingrifle_primary_animtime 0.3
 set g_balance_campingrifle_primary_ammo 10
 set g_balance_campingrifle_primary_bulletconstant 130 // 56.3qu
 set g_balance_campingrifle_primary_burstcost 0.35 // require same cooldown as secondary, note it's smaller than primary refire time
+set g_balance_campingrifle_primary_bullethail 0
 set g_balance_campingrifle_secondary_damage 15
 set g_balance_campingrifle_secondary_headshotaddeddamage 25
 set g_balance_campingrifle_secondary_spread 0.02
@@ -544,6 +529,7 @@ set g_balance_campingrifle_secondary_animtime 0.1
 set g_balance_campingrifle_secondary_ammo 4
 set g_balance_campingrifle_secondary_bulletconstant 130 // 18.3qu
 set g_balance_campingrifle_secondary_burstcost 0.35
+set g_balance_campingrifle_secondary_bullethail 0
 // }}}
 // {{{ tuba
 set g_balance_tuba_refire 0.05
index 2f4ca97..a436924 100644 (file)
@@ -1,29 +1,3 @@
-// {{{ weapon replacement
-// NOTE: this only replaces weapons on the map
-// use g_start_weapon_* to also replace the on-startup weapons!
-// example: g_weaponreplace_nex "nex minstanex", then Nexes become MinstaNexes 50% of the times
-// set the cvars to "0" to totally disable a weapon
-set sv_q3acompat_machineshotgunswap 0 "shorthand for swapping uzi and shotgun"
-set g_weaponreplace_laser ""
-set g_weaponreplace_shotgun ""
-set g_weaponreplace_uzi ""
-set g_weaponreplace_grenadelauncher ""
-set g_weaponreplace_electro ""
-set g_weaponreplace_crylink ""
-set g_weaponreplace_nex ""
-set g_weaponreplace_hagar ""
-set g_weaponreplace_rocketlauncher ""
-set g_weaponreplace_porto ""
-set g_weaponreplace_minstanex ""
-set g_weaponreplace_hook ""
-set g_weaponreplace_hlac ""
-set g_weaponreplace_campingrifle ""
-set g_weaponreplace_tuba ""
-set g_weaponreplace_fireball ""
-set g_weaponreplace_seeker ""
-set sv_q3acompat_machineshotgunswap 0 "shorthand for swapping uzi and shotgun (for Q3A map compatibility)"
-// }}}
-
 // {{{ starting gear
 set g_start_weapon_laser -1 "0 = never provide the weapon, 1 = always provide the weapon, -1 = game mode default, -2 = provide the weapon in ca and lms"
 set g_start_weapon_shotgun -1 "0 = never provide the weapon, 1 = always provide the weapon, -1 = game mode default, -2 = provide the weapon in ca and lms"
@@ -78,6 +52,8 @@ set g_balance_nix_ammoincr_fuel 2
 // }}}
 
 // {{{ pickup items
+set g_pickup_ammo_anyway 0
+set g_pickup_weapons_anyway 0
 set g_pickup_shells 15
 set g_pickup_shells_max 999
 set g_pickup_nails 80
@@ -91,20 +67,28 @@ set g_pickup_fuel_jetpack 50
 set g_pickup_fuel_max 999
 set g_pickup_armorsmall 5
 set g_pickup_armorsmall_max 999
+set g_pickup_armorsmall_anyway 0
 set g_pickup_armormedium 25
 set g_pickup_armormedium_max 999
+set g_pickup_armormedium_anyway 0
 set g_pickup_armorbig 50
 set g_pickup_armorbig_max 999
+set g_pickup_armorbig_anyway 0
 set g_pickup_armorlarge 100
 set g_pickup_armorlarge_max 999
+set g_pickup_armorlarge_anyway 0
 set g_pickup_healthsmall 5
 set g_pickup_healthsmall_max 999
+set g_pickup_healthsmall_anyway 0
 set g_pickup_healthmedium 25
 set g_pickup_healthmedium_max 999
+set g_pickup_healthmedium_anyway 0
 set g_pickup_healthlarge 50
 set g_pickup_healthlarge_max 999
+set g_pickup_healthlarge_anyway 0
 set g_pickup_healthmega 100
 set g_pickup_healthmega_max 999
+set g_pickup_healthmega_anyway 0
 set g_pickup_respawntime_short 15
 set g_pickup_respawntime_medium 20
 set g_pickup_respawntime_long 30
@@ -533,6 +517,7 @@ set g_balance_campingrifle_primary_animtime 0.3
 set g_balance_campingrifle_primary_ammo 10
 set g_balance_campingrifle_primary_bulletconstant 130 // 56.3qu
 set g_balance_campingrifle_primary_burstcost 0
+set g_balance_campingrifle_primary_bullethail 0 // empty magazine on shot
 set g_balance_campingrifle_secondary_damage 35
 set g_balance_campingrifle_secondary_headshotaddeddamage 15 // 50 damage only on head
 set g_balance_campingrifle_secondary_spread 0.008
@@ -544,6 +529,7 @@ set g_balance_campingrifle_secondary_animtime 0.1
 set g_balance_campingrifle_secondary_ammo 10
 set g_balance_campingrifle_secondary_bulletconstant 130 // 18.3qu
 set g_balance_campingrifle_secondary_burstcost 0
+set g_balance_campingrifle_secondary_bullethail 0 // empty magazine on shot
 // }}}
 // {{{ tuba
 set g_balance_tuba_refire 0.05
diff --git a/balanceFruit.cfg b/balanceFruit.cfg
new file mode 100644 (file)
index 0000000..415a458
--- /dev/null
@@ -0,0 +1,633 @@
+// {{{ starting gear
+set g_start_weapon_laser -1 "0 = never provide the weapon, 1 = always provide the weapon, -1 = game mode default, -2 = provide the weapon in ca and lms"
+set g_start_weapon_shotgun -2 "0 = never provide the weapon, 1 = always provide the weapon, -1 = game mode default, -2 = provide the weapon in ca and lms"
+set g_start_weapon_uzi 1 "0 = never provide the weapon, 1 = always provide the weapon, -1 = game mode default, -2 = provide the weapon in ca and lms"
+set g_start_weapon_grenadelauncher -1 "0 = never provide the weapon, 1 = always provide the weapon, -1 = game mode default, -2 = provide the weapon in ca and lms"
+set g_start_weapon_electro -1 "0 = never provide the weapon, 1 = always provide the weapon, -1 = game mode default, -2 = provide the weapon in ca and lms"
+set g_start_weapon_crylink -1 "0 = never provide the weapon, 1 = always provide the weapon, -1 = game mode default, -2 = provide the weapon in ca and lms"
+set g_start_weapon_nex -1 "0 = never provide the weapon, 1 = always provide the weapon, -1 = game mode default, -2 = provide the weapon in ca and lms"
+set g_start_weapon_hagar -1 "0 = never provide the weapon, 1 = always provide the weapon, -1 = game mode default, -2 = provide the weapon in ca and lms"
+set g_start_weapon_rocketlauncher -1 "0 = never provide the weapon, 1 = always provide the weapon, -1 = game mode default, -2 = provide the weapon in ca and lms"
+set g_start_weapon_minstanex 0 "0 = never provide the weapon, 1 = always provide the weapon, -1 = game mode default, -2 = provide the weapon in ca and lms"
+set g_start_weapon_porto 0 "0 = never provide the weapon, 1 = always provide the weapon, -1 = game mode default, -2 = provide the weapon in ca and lms"
+set g_start_weapon_hook 0 "0 = never provide the weapon, 1 = always provide the weapon, -1 = game mode default, -2 = provide the weapon in ca and lms"
+set g_start_weapon_hlac 0 "0 = never provide the weapon, 1 = always provide the weapon, -1 = game mode default, -2 = provide the weapon in ca and lms"
+set g_start_weapon_campingrifle 0 "0 = never provide the weapon, 1 = always provide the weapon, -1 = game mode default, -2 = provide the weapon in ca and lms"
+set g_start_weapon_tuba 0 "0 = never provide the weapon, 1 = always provide the weapon, -1 = game mode default, -2 = provide the weapon in ca and lms"
+set g_start_weapon_fireball 0 "0 = never provide the weapon, 1 = always provide the weapon, -1 = game mode default, -2 = provide the weapon in ca and lms"
+set g_start_weapon_seeker 0 "0 = never provide the weapon, 1 = always provide the weapon, -1 = game mode default, -2 = provide the weapon in ca and lms"
+set g_balance_health_start 125
+set g_balance_armor_start 0
+set g_start_ammo_shells 0
+set g_start_ammo_nails 90
+set g_start_ammo_rockets 0
+set g_start_ammo_cells 0
+set g_start_ammo_fuel 0
+set g_warmup_start_health 250 "starting values when being in warmup-stage"
+set g_warmup_start_armor 100 "starting values when being in warmup-stage"
+set g_warmup_start_ammo_shells 50 "starting values when being in warmup-stage"
+set g_warmup_start_ammo_nails 150 "starting values when being in warmup-stage"
+set g_warmup_start_ammo_rockets 50 "starting values when being in warmup-stage"
+set g_warmup_start_ammo_cells 50 "starting values when being in warmup-stage"
+set g_warmup_start_ammo_fuel 0 "starting values when being in warmup-stage"
+set g_lms_start_health 250
+set g_lms_start_armor 100
+set g_lms_start_ammo_shells 50
+set g_lms_start_ammo_nails 150
+set g_lms_start_ammo_rockets 50
+set g_lms_start_ammo_cells 50
+set g_lms_start_ammo_fuel 0
+set g_balance_nix_roundtime 25
+set g_balance_nix_incrtime 1.6
+set g_balance_nix_ammo_shells 15
+set g_balance_nix_ammo_nails 45
+set g_balance_nix_ammo_rockets 15
+set g_balance_nix_ammo_cells 15
+set g_balance_nix_ammo_fuel 0
+set g_balance_nix_ammoincr_shells 2
+set g_balance_nix_ammoincr_nails 6
+set g_balance_nix_ammoincr_rockets 2
+set g_balance_nix_ammoincr_cells 2
+set g_balance_nix_ammoincr_fuel 2
+// }}}
+
+// {{{ pickup items
+set g_pickup_ammo_anyway 1
+set g_pickup_weapons_anyway 1
+set g_pickup_shells 15
+set g_pickup_shells_max 100
+set g_pickup_nails 80
+set g_pickup_nails_max 400
+set g_pickup_rockets 15
+set g_pickup_rockets_max 200
+set g_pickup_cells 25
+set g_pickup_cells_max 200
+set g_pickup_fuel 25
+set g_pickup_fuel_jetpack 50
+set g_pickup_fuel_max 100
+set g_pickup_armorsmall 5
+set g_pickup_armorsmall_max 200
+set g_pickup_armorsmall_anyway 1
+set g_pickup_armormedium 25
+set g_pickup_armormedium_max 200
+set g_pickup_armormedium_anyway 1
+set g_pickup_armorbig 50
+set g_pickup_armorbig_max 200
+set g_pickup_armorbig_anyway 1
+set g_pickup_armorlarge 100
+set g_pickup_armorlarge_max 200
+set g_pickup_armorlarge_anyway 1
+set g_pickup_healthsmall 5
+set g_pickup_healthsmall_max 200
+set g_pickup_healthsmall_anyway 1
+set g_pickup_healthmedium 25
+set g_pickup_healthmedium_max 100
+set g_pickup_healthmedium_anyway 0
+set g_pickup_healthlarge 50
+set g_pickup_healthlarge_max 100
+set g_pickup_healthlarge_anyway 0
+set g_pickup_healthmega 100
+set g_pickup_healthmega_max 200
+set g_pickup_healthmega_anyway 1
+set g_pickup_respawntime_short 15
+set g_pickup_respawntime_medium 20
+set g_pickup_respawntime_long 30
+set g_pickup_respawntime_powerup 120
+set g_pickup_respawntime_weapon 5
+set g_pickup_respawntime_ammo 25
+set g_pickup_respawntimejitter_short 0
+set g_pickup_respawntimejitter_medium 0
+set g_pickup_respawntimejitter_long 0
+set g_pickup_respawntimejitter_powerup 10
+set g_pickup_respawntimejitter_weapon 0
+set g_pickup_respawntimejitter_ammo 0
+// }}}
+
+// {{{ regen/rot
+set g_balance_health_regen 0
+set g_balance_health_regenlinear 0
+set g_balance_pause_health_regen 0
+set g_balance_pause_health_regen_spawn 0
+set g_balance_health_rot 0
+set g_balance_health_rotlinear 1
+set g_balance_pause_health_rot 1
+set g_balance_pause_health_rot_spawn 0
+set g_balance_health_regenstable 100
+set g_balance_health_rotstable 100
+set g_balance_health_limit 200
+set g_balance_armor_regen 0
+set g_balance_armor_regenlinear 0
+set g_balance_armor_rot 0
+set g_balance_armor_rotlinear 1
+set g_balance_pause_armor_rot 1
+set g_balance_pause_armor_rot_spawn 0
+set g_balance_armor_regenstable 100
+set g_balance_armor_rotstable 100
+set g_balance_armor_limit 200
+set g_balance_armor_blockpercent 0.7
+set g_balance_fuel_regen 0.1 "fuel regeneration (only applies if the player owns IT_FUEL_REGEN)"
+set g_balance_fuel_regenlinear 0
+set g_balance_pause_fuel_regen 2 // other than this, fuel uses the health regen counter
+set g_balance_fuel_rot 0.05
+set g_balance_fuel_rotlinear 0
+set g_balance_pause_fuel_rot 5
+set g_balance_pause_fuel_rot_spawn 10
+set g_balance_fuel_regenstable 50
+set g_balance_fuel_rotstable 100
+set g_balance_fuel_limit 999
+// }}}
+
+// {{{ misc
+set g_balance_selfdamagepercent 0.65
+set g_balance_weaponswitchdelay 0.15
+set g_weaponspeedfactor 1 "weapon projectile speed multiplier"
+set g_weaponratefactor 1 "weapon fire rate multiplier"
+set g_weapondamagefactor 1 "weapon damage multiplier"
+set g_weaponforcefactor 1 "weapon force multiplier"
+set g_weaponspreadfactor 1 "weapon spread multiplier"
+set g_balance_firetransfer_time 0.9
+set g_balance_firetransfer_damage 0.8
+set g_throughfloor_damage 0.5
+set g_throughfloor_force 0.7
+set g_projectiles_newton_style 2
+// possible values:
+// 0: absolute velocity projectiles (like Quake)
+// 1: relative velocity projectiles, "Newtonian" (like Tribes 2)
+// 2: relative velocity projectiles, but aim is precorrected so projectiles hit the crosshair (note: strafe rockets then are SLOWER than ones shot while standing, happens in 1 too when aiming correctly which is hard)
+// 3: absolute velocity + player velocity component in shot direction (note: does NOT yield the right relative velocity, but may be good enough, but it is somewhat prone to sniper rockets)
+// 4: just add the player velocity length to the absolute velocity (tZork's sniper rockets)
+set g_projectiles_newton_style_2_minfactor 0.7
+set g_projectiles_newton_style_2_maxfactor 5
+set g_projectiles_spread_style 4
+// possible values:
+// 0: forward + solid sphere (like Quake) - varies velocity
+// 1: forward + flattened solid sphere
+// 2: forward + solid circle
+// 3: forward + normal distribution 3D - varies velocity
+// 4: forward + normal distribution on a plane
+// 5: forward + circle with 1-r falloff
+// 6: forward + circle with 1-r^2 falloff
+// 7: forward + circle with (1-r)(2-r) falloff
+set g_balance_falldamage_deadminspeed 150
+set g_balance_falldamage_minspeed 800
+set g_balance_falldamage_factor 0.20
+set g_balance_falldamage_maxdamage 15
+// }}}
+
+// {{{ powerups
+set g_balance_powerup_invincible_takedamage 0.3
+set g_balance_powerup_invincible_time 30
+set g_balance_powerup_strength_damage 3
+set g_balance_powerup_strength_force 4
+set g_balance_powerup_strength_time 30
+set g_balance_powerup_strength_selfdamage 1.5
+set g_balance_powerup_strength_selfforce 1.5
+// }}}
+
+// {{{ jetpack/hook
+set g_jetpack_antigravity 0.8 "factor of gravity compensation of the jetpack"
+set g_jetpack_acceleration_side 1200 "acceleration of the jetpack in xy direction"
+set g_jetpack_acceleration_up 600 "acceleration of the jetpack in z direction (note: you have to factor in gravity here, if antigravity is not 1)"
+set g_jetpack_maxspeed_side 1500 "max speed of the jetpack in xy direction"
+set g_jetpack_maxspeed_up 600 "max speed of the jetpack in z direction"
+set g_jetpack_fuel 8 "fuel per second for jetpack"
+set g_jetpack_attenuation 2 "jetpack sound attenuation"
+
+set g_grappling_hook_tarzan 2 // 2: can also pull players
+set g_balance_grapplehook_speed_fly 1800
+set g_balance_grapplehook_speed_pull 2000
+set g_balance_grapplehook_force_rubber 2000
+set g_balance_grapplehook_force_rubber_overstretch 1000
+set g_balance_grapplehook_length_min 50
+set g_balance_grapplehook_stretch 50
+set g_balance_grapplehook_airfriction 0.2
+set g_balance_grapplehook_health 130
+// }}}
+
+// {{{ weapon properties
+// {{{ laser
+set g_balance_laser_primary_damage 22
+set g_balance_laser_primary_edgedamage 0
+set g_balance_laser_primary_force 200
+set g_balance_laser_primary_radius 60
+set g_balance_laser_primary_speed 0
+set g_balance_laser_primary_spread 0
+set g_balance_laser_primary_refire 0.1
+set g_balance_laser_primary_animtime 0.1
+set g_balance_laser_primary_lifetime 0
+set g_balance_laser_primary_shotangle 0
+set g_balance_laser_primary_delay 0
+set g_balance_laser_gauntlet 1
+set g_balance_laser_secondary 0 // when 1, a secondary laser mode exists
+set g_balance_laser_secondary_damage 35
+set g_balance_laser_secondary_edgedamage 10
+set g_balance_laser_secondary_force 400
+set g_balance_laser_secondary_radius 70
+set g_balance_laser_secondary_speed 9000
+set g_balance_laser_secondary_spread 0
+set g_balance_laser_secondary_refire 0.7
+set g_balance_laser_secondary_animtime 0.3
+set g_balance_laser_secondary_lifetime 30
+set g_balance_laser_secondary_shotangle 0
+set g_balance_laser_secondary_delay 0
+// }}}
+// {{{ shotgun
+set g_balance_shotgun_primary_bullets 15
+set g_balance_shotgun_primary_damage 7
+set g_balance_shotgun_primary_force 20
+set g_balance_shotgun_primary_spread 0.16
+set g_balance_shotgun_primary_refire 1
+set g_balance_shotgun_primary_animtime 0.7
+set g_balance_shotgun_primary_ammo 1
+set g_balance_shotgun_primary_speed 12000
+set g_balance_shotgun_primary_bulletconstant 75 // 3.8qu
+set g_balance_shotgun_secondary 1
+set g_balance_shotgun_secondary_bullets 6 // one more per shot than 15/3 (primary bullets/amount of shots = 3)
+set g_balance_shotgun_secondary_damage 7
+set g_balance_shotgun_secondary_force 20
+set g_balance_shotgun_secondary_spread 0.20
+set g_balance_shotgun_secondary_refire 1.35
+set g_balance_shotgun_secondary_animtime 0.33
+set g_balance_shotgun_secondary_ammo 1
+set g_balance_shotgun_secondary_speed 12000
+set g_balance_shotgun_secondary_bulletconstant 75 // 3.8qu
+// }}}
+// {{{ uzi
+set g_balance_uzi_first 1
+set g_balance_uzi_first_damage 24
+set g_balance_uzi_first_force 30
+set g_balance_uzi_first_spread 0.0125
+set g_balance_uzi_first_refire 0.2
+set g_balance_uzi_first_ammo 1
+set g_balance_uzi_sustained_damage 12
+set g_balance_uzi_sustained_force 20
+set g_balance_uzi_sustained_spread 0.0125
+set g_balance_uzi_sustained_refire 0.1
+set g_balance_uzi_sustained_ammo 1
+set g_balance_uzi_speed 18000
+set g_balance_uzi_bulletconstant 115 // 13.1qu
+// }}}
+// {{{ mortar // TODO
+set g_balance_grenadelauncher_primary2secondary 0
+set g_balance_grenadelauncher_primary_damage 60
+set g_balance_grenadelauncher_primary_edgedamage 28
+set g_balance_grenadelauncher_primary_force 200
+set g_balance_grenadelauncher_primary_radius 140
+set g_balance_grenadelauncher_primary_speed 1200
+set g_balance_grenadelauncher_primary_speed_up 200
+set g_balance_grenadelauncher_primary_speed_z 0
+set g_balance_grenadelauncher_primary_spread 0
+set g_balance_grenadelauncher_primary_lifetime 10
+set g_balance_grenadelauncher_primary_refire 0.8
+set g_balance_grenadelauncher_primary_animtime 0.5
+set g_balance_grenadelauncher_primary_ammo 2
+set g_balance_grenadelauncher_secondary_damage 65
+set g_balance_grenadelauncher_secondary_edgedamage 30
+set g_balance_grenadelauncher_secondary_force 300
+set g_balance_grenadelauncher_secondary_radius 200
+set g_balance_grenadelauncher_secondary_speed 800
+set g_balance_grenadelauncher_secondary_speed_up 0
+set g_balance_grenadelauncher_secondary_speed_z 200
+set g_balance_grenadelauncher_secondary_spread 0
+set g_balance_grenadelauncher_secondary_lifetime 2
+set g_balance_grenadelauncher_secondary_refire 0.8
+set g_balance_grenadelauncher_secondary_animtime 0.5
+set g_balance_grenadelauncher_secondary_ammo 2
+set g_balance_grenadelauncher_secondary_health 0
+set g_balance_grenadelauncher_secondary_damageforcescale 0
+set g_balance_grenadelauncher_secondary_bouncefactor 0.5
+set g_balance_grenadelauncher_secondary_bouncestop 0.075
+// }}}
+// {{{ electro // TODO
+set g_balance_electro_lightning 0
+set g_balance_electro_primary_damage 65
+set g_balance_electro_primary_edgedamage 0
+set g_balance_electro_primary_force 200
+set g_balance_electro_primary_radius 150
+set g_balance_electro_primary_comboradius 0
+set g_balance_electro_primary_speed 2000
+set g_balance_electro_primary_spread 0
+set g_balance_electro_primary_lifetime 30
+set g_balance_electro_primary_refire 0.6
+set g_balance_electro_primary_animtime 0.3
+set g_balance_electro_primary_ammo 2
+set g_balance_electro_secondary_damage 50
+set g_balance_electro_secondary_spread 0.05
+set g_balance_electro_secondary_edgedamage 0
+set g_balance_electro_secondary_force 200
+set g_balance_electro_secondary_radius 150
+set g_balance_electro_secondary_speed 900
+set g_balance_electro_secondary_speed_up 200
+set g_balance_electro_secondary_speed_z 0
+set g_balance_electro_secondary_spread 0
+set g_balance_electro_secondary_lifetime 5
+set g_balance_electro_secondary_refire 0.3
+set g_balance_electro_secondary_refire2 0
+set g_balance_electro_secondary_animtime 0.3
+set g_balance_electro_secondary_ammo 2
+set g_balance_electro_secondary_health 5
+set g_balance_electro_secondary_damageforcescale 4
+set g_balance_electro_secondary_count 1
+set g_balance_electro_combo_damage 80
+set g_balance_electro_combo_edgedamage 0
+set g_balance_electro_combo_force 200
+set g_balance_electro_combo_radius 250
+set g_balance_electro_combo_comboradius 0
+set g_balance_electro_combo_speed 2000
+// }}}
+// {{{ crylink
+set g_balance_crylink_primary_damage 18
+set g_balance_crylink_primary_edgedamage 0
+set g_balance_crylink_primary_force -80
+set g_balance_crylink_primary_radius 100
+set g_balance_crylink_primary_speed 2000
+set g_balance_crylink_primary_spread 0.03
+set g_balance_crylink_primary_shots 4
+set g_balance_crylink_primary_bounces 1
+set g_balance_crylink_primary_refire 0.4
+set g_balance_crylink_primary_animtime 0.3
+set g_balance_crylink_primary_ammo 2
+set g_balance_crylink_primary_bouncedamagefactor 0.5
+
+set g_balance_crylink_primary_middle_lifetime 5 // range: 10000 full, fades to 20000
+set g_balance_crylink_primary_middle_fadetime 5
+set g_balance_crylink_primary_star_lifetime 0.4 // range: 800 full, fades to 1300
+set g_balance_crylink_primary_star_fadetime 0.25
+set g_balance_crylink_primary_other_lifetime 0.4 // range: 800 full, fades to 1300
+set g_balance_crylink_primary_other_fadetime 0.25
+
+set g_balance_crylink_secondary 1
+set g_balance_crylink_secondary_damage 18
+set g_balance_crylink_secondary_edgedamage 0
+set g_balance_crylink_secondary_force -80
+set g_balance_crylink_secondary_radius 5
+set g_balance_crylink_secondary_speed 2000
+set g_balance_crylink_secondary_spread 0.04
+set g_balance_crylink_secondary_shots 7
+set g_balance_crylink_secondary_bounces 0
+set g_balance_crylink_secondary_refire 0.5
+set g_balance_crylink_secondary_animtime 0.3
+set g_balance_crylink_secondary_ammo 2
+set g_balance_crylink_secondary_bouncedamagefactor 0.5
+
+set g_balance_crylink_secondary_middle_lifetime 5 // range: 10000 full, fades to 10000
+set g_balance_crylink_secondary_middle_fadetime 5
+set g_balance_crylink_secondary_line_lifetime 2 // range: 4000 full, fades to 8000
+set g_balance_crylink_secondary_line_fadetime 2
+// }}}
+// {{{ nex
+set g_balance_nex_damage 100
+set g_balance_nex_force 200
+set g_balance_nex_refire 1.25
+set g_balance_nex_animtime 1
+set g_balance_nex_ammo 5
+set g_balance_nex_damagefalloff_mindist 1000
+set g_balance_nex_damagefalloff_maxdist 3000
+set g_balance_nex_damagefalloff_halflife 2000
+set g_balance_nex_damagefalloff_forcehalflife 2000
+// }}}
+// {{{ minstanex
+set g_balance_minstanex_refire 1.25
+set g_balance_minstanex_animtime 1
+set g_balance_minstanex_ammo 10
+// }}}
+// {{{ hagar
+set g_balance_hagar_primary_damage 30
+set g_balance_hagar_primary_edgedamage 15
+set g_balance_hagar_primary_force 70
+set g_balance_hagar_primary_radius 50
+set g_balance_hagar_primary_spread 0.005
+set g_balance_hagar_primary_speed 2000
+set g_balance_hagar_primary_lifetime 30
+set g_balance_hagar_primary_refire 0.13
+set g_balance_hagar_primary_ammo 1
+set g_balance_hagar_secondary 1
+set g_balance_hagar_secondary_damage 30
+set g_balance_hagar_secondary_edgedamage 15
+set g_balance_hagar_secondary_force 70
+set g_balance_hagar_secondary_radius 50
+set g_balance_hagar_secondary_spread 0.01
+set g_balance_hagar_secondary_speed 1400
+set g_balance_hagar_secondary_lifetime_min 30
+set g_balance_hagar_secondary_lifetime_rand 0
+set g_balance_hagar_secondary_refire 0.13
+set g_balance_hagar_secondary_ammo 1
+// }}}
+// {{{ rocketlauncher // TODO
+set g_balance_rocketlauncher_damage 100
+set g_balance_rocketlauncher_edgedamage 33
+set g_balance_rocketlauncher_force 350
+set g_balance_rocketlauncher_radius 120
+set g_balance_rocketlauncher_speed 1000
+set g_balance_rocketlauncher_speedaccel 0
+set g_balance_rocketlauncher_speedstart 1000
+set g_balance_rocketlauncher_lifetime 30
+set g_balance_rocketlauncher_refire 1
+set g_balance_rocketlauncher_animtime 0.3
+set g_balance_rocketlauncher_ammo 3
+set g_balance_rocketlauncher_health 0
+set g_balance_rocketlauncher_damageforcescale 0
+set g_balance_rocketlauncher_detonatedelay 9999 // positive: timer till detonation is allowed, negative: "security device" that prevents ANY remote detonation if it could hurt its owner, zero: detonatable at any time
+set g_balance_rocketlauncher_guiderate 45 // max degrees per second
+set g_balance_rocketlauncher_guideratedelay 0.01 // immediate
+set g_balance_rocketlauncher_guidegoal 512 // goal distance for (non-laser) guiding (higher = less control, lower = erratic)
+set g_balance_rocketlauncher_guidedelay 0.15 // delay before guiding kicks in
+set g_balance_rocketlauncher_guidestop 0 // stop guiding when firing again
+set g_balance_rocketlauncher_laserguided_speed 1000 //650
+set g_balance_rocketlauncher_laserguided_speedaccel 0
+set g_balance_rocketlauncher_laserguided_speedstart 1000
+set g_balance_rocketlauncher_laserguided_turnrate 0.75 //0.5
+set g_balance_rocketlauncher_laserguided_allow_steal 1
+// }}}
+// {{{ porto
+set g_balance_porto_primary_refire 1.5
+set g_balance_porto_primary_animtime 0.3
+set g_balance_porto_primary_speed 2000
+set g_balance_porto_primary_lifetime 30
+set g_balance_portal_health 200 // these get recharged whenever the portal is used
+set g_balance_portal_lifetime 15 // these get recharged whenever the portal is used
+// }}}
+// {{{ hook
+set g_balance_hook_primary_fuel 5 // hook monkeys set 0
+set g_balance_hook_primary_refire 0 // hook monkeys set 0
+set g_balance_hook_primary_animtime 0.3 // good shoot anim
+set g_balance_hook_primary_hooked_time_max 0 // infinite
+set g_balance_hook_primary_hooked_time_free 2 // 2s being hooked are free
+set g_balance_hook_primary_hooked_fuel 5 // fuel per second hooked
+set g_balance_hook_secondary_damage 25 // not much
+set g_balance_hook_secondary_edgedamage 5 // not much
+set g_balance_hook_secondary_radius 500 // LOTS
+set g_balance_hook_secondary_force -2000 // LOTS
+set g_balance_hook_secondary_ammo 50 // a whole pack
+set g_balance_hook_secondary_lifetime 30 // infinite
+set g_balance_hook_secondary_speed 0 // not much throwing
+set g_balance_hook_secondary_gravity 5 // fast falling
+set g_balance_hook_secondary_refire 3 // don't drop too many bombs...
+set g_balance_hook_secondary_animtime 0.3 // good shoot anim
+set g_balance_hook_secondary_power 3 // effect behaves like a square function
+set g_balance_hook_secondary_duration 1.5 // effect runs for three seconds
+// }}}
+// {{{ hlac
+set g_balance_hlac_primary_spread_min 0.01
+set g_balance_hlac_primary_spread_max 0.25
+set g_balance_hlac_primary_spread_add 0.0045
+set g_balance_hlac_primary_spread_crouchmod 0.25
+
+set g_balance_hlac_primary_damage 23
+set g_balance_hlac_primary_edgedamage 10
+set g_balance_hlac_primary_force 100
+set g_balance_hlac_primary_radius 70
+set g_balance_hlac_primary_speed 9000
+set g_balance_hlac_primary_lifetime 5
+
+set g_balance_hlac_primary_refire 0.1
+set g_balance_hlac_primary_animtime 0.4
+set g_balance_hlac_primary_ammo 1
+
+set g_balance_hlac_secondary 1
+set g_balance_hlac_secondary_spread 0.15
+set g_balance_hlac_secondary_spread_crouchmod 0.5
+
+set g_balance_hlac_secondary_damage 23
+set g_balance_hlac_secondary_edgedamage 10
+set g_balance_hlac_secondary_force 100
+set g_balance_hlac_secondary_radius 70
+set g_balance_hlac_secondary_speed 9000
+set g_balance_hlac_secondary_lifetime 5
+
+set g_balance_hlac_secondary_refire 1
+set g_balance_hlac_secondary_animtime 0.3
+set g_balance_hlac_secondary_ammo 10
+set g_balance_hlac_secondary_shots 6
+// }}}
+// {{{ campingrifle
+set g_balance_campingrifle_magazinecapacity 8
+set g_balance_campingrifle_reloadtime 2 // matches reload anim
+set g_balance_campingrifle_auto_reload_after_changing_weapons 0
+set g_balance_campingrifle_bursttime 0
+set g_balance_campingrifle_tracer 0
+set g_balance_campingrifle_primary_damage 60
+set g_balance_campingrifle_primary_headshotaddeddamage 100
+set g_balance_campingrifle_primary_spread 0
+set g_balance_campingrifle_primary_force 2
+set g_balance_campingrifle_primary_speed 35000
+set g_balance_campingrifle_primary_lifetime 5
+set g_balance_campingrifle_primary_refire 0.8
+set g_balance_campingrifle_primary_animtime 0.3
+set g_balance_campingrifle_primary_ammo 10
+set g_balance_campingrifle_primary_bulletconstant 130 // 56.3qu
+set g_balance_campingrifle_primary_burstcost 0
+set g_balance_campingrifle_primary_bullethail 0 // empty magazine on shot
+set g_balance_campingrifle_secondary_damage 35
+set g_balance_campingrifle_secondary_headshotaddeddamage 15 // 50 damage only on head
+set g_balance_campingrifle_secondary_spread 0.008
+set g_balance_campingrifle_secondary_force 1
+set g_balance_campingrifle_secondary_speed 20000
+set g_balance_campingrifle_secondary_lifetime 5
+set g_balance_campingrifle_secondary_refire 0.15
+set g_balance_campingrifle_secondary_animtime 0.1
+set g_balance_campingrifle_secondary_ammo 10
+set g_balance_campingrifle_secondary_bulletconstant 130 // 18.3qu
+set g_balance_campingrifle_secondary_burstcost 0
+set g_balance_campingrifle_secondary_bullethail 0 // empty magazine on shot
+// }}}
+// {{{ tuba
+set g_balance_tuba_refire 0.05
+set g_balance_tuba_animtime 0.05
+set g_balance_tuba_attenuation 0.5
+set g_balance_tuba_volume 1
+set g_balance_tuba_fadetime 0.25
+set g_balance_tuba_damage 5
+set g_balance_tuba_edgedamage 0
+set g_balance_tuba_radius 200
+set g_balance_tuba_force 40
+// }}}
+// {{{ fireball
+set g_balance_fireball_primary_ammo 40
+set g_balance_fireball_primary_animtime 0.15
+set g_balance_fireball_primary_bfgdamage 100
+set g_balance_fireball_primary_bfgforce 0
+set g_balance_fireball_primary_bfgradius 1000
+set g_balance_fireball_primary_damage 200
+set g_balance_fireball_primary_damageforcescale 4
+set g_balance_fireball_primary_edgedamage 0
+set g_balance_fireball_primary_force 700
+set g_balance_fireball_primary_health 50
+set g_balance_fireball_primary_laserburntime 0.5
+set g_balance_fireball_primary_laserdamage 80
+set g_balance_fireball_primary_laseredgedamage 20
+set g_balance_fireball_primary_laserradius 256
+set g_balance_fireball_primary_lifetime 15
+set g_balance_fireball_primary_radius 200
+set g_balance_fireball_primary_refire 5
+set g_balance_fireball_primary_refire2 0
+set g_balance_fireball_primary_speed 650
+set g_balance_fireball_primary_spread 0
+set g_balance_fireball_secondary_ammo 5
+set g_balance_fireball_secondary_animtime 0.3
+set g_balance_fireball_secondary_damage 40
+set g_balance_fireball_secondary_damageforcescale 4
+set g_balance_fireball_secondary_damagetime 5
+set g_balance_fireball_secondary_force 100
+set g_balance_fireball_secondary_laserburntime 0.5
+set g_balance_fireball_secondary_laserdamage 50
+set g_balance_fireball_secondary_laseredgedamage 20
+set g_balance_fireball_secondary_laserradius 110
+set g_balance_fireball_secondary_lifetime 7
+set g_balance_fireball_secondary_refire 2
+set g_balance_fireball_secondary_speed 900
+set g_balance_fireball_secondary_speed_up 100
+set g_balance_fireball_secondary_speed_z 0
+set g_balance_fireball_secondary_spread 0
+// }}}
+// {{{ seeker
+set g_balance_seeker_flac_ammo 0.5
+set g_balance_seeker_flac_animtime 0.1
+set g_balance_seeker_flac_damage 15
+set g_balance_seeker_flac_edgedamage 10
+set g_balance_seeker_flac_force 50
+set g_balance_seeker_flac_lifetime 0.1
+set g_balance_seeker_flac_lifetime_rand 0.05
+set g_balance_seeker_flac_radius 100
+set g_balance_seeker_flac_refire 0.1
+set g_balance_seeker_flac_speed 3000
+set g_balance_seeker_flac_speed_up 1000
+set g_balance_seeker_flac_speed_z 0
+set g_balance_seeker_flac_spread 0.4
+set g_balance_seeker_missile_accel 1.05
+set g_balance_seeker_missile_ammo 2
+set g_balance_seeker_missile_animtime 0.3
+set g_balance_seeker_missile_count 4
+set g_balance_seeker_missile_damage 40
+set g_balance_seeker_missile_damageforcescale 4
+set g_balance_seeker_missile_decel 0.9
+set g_balance_seeker_missile_delay 0.25
+set g_balance_seeker_missile_edgedamage 10
+set g_balance_seeker_missile_force 250
+set g_balance_seeker_missile_health 5
+set g_balance_seeker_missile_lifetime 15
+set g_balance_seeker_missile_proxy 0
+set g_balance_seeker_missile_proxy_delay 0.2
+set g_balance_seeker_missile_proxy_maxrange 45
+set g_balance_seeker_missile_radius 80
+set g_balance_seeker_missile_refire 0.5
+set g_balance_seeker_missile_smart 1
+set g_balance_seeker_missile_smart_mindist 800
+set g_balance_seeker_missile_smart_trace_max 2500
+set g_balance_seeker_missile_smart_trace_min 1000
+set g_balance_seeker_missile_speed 700
+set g_balance_seeker_missile_speed_accel 0
+set g_balance_seeker_missile_speed_up 300
+set g_balance_seeker_missile_speed_z 0
+set g_balance_seeker_missile_speed_max 1250
+set g_balance_seeker_missile_spread 0
+set g_balance_seeker_missile_turnrate 0.65
+set g_balance_seeker_tag_ammo 1
+set g_balance_seeker_tag_animtime 0.3
+set g_balance_seeker_tag_damageforcescale 4
+set g_balance_seeker_tag_health 5
+set g_balance_seeker_tag_lifetime 15
+set g_balance_seeker_tag_refire 0.7
+set g_balance_seeker_tag_speed 9000
+set g_balance_seeker_tag_spread 0
+// End new seeker
index e633c74..21242f1 100644 (file)
@@ -1,29 +1,3 @@
-// {{{ weapon replacement
-// NOTE: this only replaces weapons on the map
-// use g_start_weapon_* to also replace the on-startup weapons!
-// example: g_weaponreplace_nex "nex minstanex", then Nexes become MinstaNexes 50% of the times
-// set the cvars to "0" to totally disable a weapon
-set sv_q3acompat_machineshotgunswap 0 "shorthand for swapping uzi and shotgun"
-set g_weaponreplace_laser ""
-set g_weaponreplace_shotgun ""
-set g_weaponreplace_uzi ""
-set g_weaponreplace_grenadelauncher ""
-set g_weaponreplace_electro ""
-set g_weaponreplace_crylink ""
-set g_weaponreplace_nex ""
-set g_weaponreplace_hagar ""
-set g_weaponreplace_rocketlauncher ""
-set g_weaponreplace_porto ""
-set g_weaponreplace_minstanex ""
-set g_weaponreplace_hook ""
-set g_weaponreplace_hlac 0 // I don't particularly like this weapon.
-set g_weaponreplace_campingrifle ""
-set g_weaponreplace_tuba ""
-set g_weaponreplace_fireball 0 // Don't kill me div0, just for now until I figure out a good balance for it.
-set g_weaponreplace_seeker ""
-set sv_q3acompat_machineshotgunswap 0 "shorthand for swapping uzi and shotgun (for Q3A map compatibility)"
-// }}}
-
 // {{{ starting gear
 set g_start_weapon_laser -1 "0 = never provide the weapon, 1 = always provide the weapon, -1 = game mode default, -2 = provide the weapon in ca and lms"
 set g_start_weapon_shotgun -1 "0 = never provide the weapon, 1 = always provide the weapon, -1 = game mode default, -2 = provide the weapon in ca and lms"
@@ -42,9 +16,9 @@ set g_start_weapon_campingrifle -1 "0 = never provide the weapon, 1 = always pro
 set g_start_weapon_tuba -1 "0 = never provide the weapon, 1 = always provide the weapon, -1 = game mode default, -2 = provide the weapon in ca and lms"
 set g_start_weapon_fireball 0 "0 = never provide the weapon, 1 = always provide the weapon, -1 = game mode default, -2 = provide the weapon in ca and lms"
 set g_start_weapon_seeker 0 "0 = never provide the weapon, 1 = always provide the weapon, -1 = game mode default, -2 = provide the weapon in ca and lms"
-set g_balance_health_start 100
+set g_balance_health_start 125
 set g_balance_armor_start 0
-set g_start_ammo_shells 45
+set g_start_ammo_shells 30
 set g_start_ammo_nails 0
 set g_start_ammo_rockets 0
 set g_start_ammo_cells 0
@@ -57,18 +31,18 @@ set g_warmup_start_ammo_rockets 50 "starting values when being in warmup-stage"
 set g_warmup_start_ammo_cells 50 "starting values when being in warmup-stage"
 set g_warmup_start_ammo_fuel 0 "starting values when being in warmup-stage"
 set g_lms_start_health 200
-set g_lms_start_armor 100
-set g_lms_start_ammo_shells 50
-set g_lms_start_ammo_nails 150
-set g_lms_start_ammo_rockets 50
-set g_lms_start_ammo_cells 50
+set g_lms_start_armor 200
+set g_lms_start_ammo_shells 120
+set g_lms_start_ammo_nails 400
+set g_lms_start_ammo_rockets 120
+set g_lms_start_ammo_cells 200
 set g_lms_start_ammo_fuel 0
 set g_balance_nix_roundtime 25
 set g_balance_nix_incrtime 1.6
-set g_balance_nix_ammo_shells 15
-set g_balance_nix_ammo_nails 45
-set g_balance_nix_ammo_rockets 15
-set g_balance_nix_ammo_cells 15
+set g_balance_nix_ammo_shells 120
+set g_balance_nix_ammo_nails 400
+set g_balance_nix_ammo_rockets 120
+set g_balance_nix_ammo_cells 200
 set g_balance_nix_ammo_fuel 0
 set g_balance_nix_ammoincr_shells 2
 set g_balance_nix_ammoincr_nails 6
@@ -78,6 +52,8 @@ set g_balance_nix_ammoincr_fuel 2
 // }}}
 
 // {{{ pickup items
+set g_pickup_ammo_anyway 1
+set g_pickup_weapons_anyway 1
 set g_pickup_shells 30
 set g_pickup_shells_max 120
 set g_pickup_nails 80
@@ -90,21 +66,29 @@ set g_pickup_fuel 25
 set g_pickup_fuel_jetpack 50
 set g_pickup_fuel_max 999
 set g_pickup_armorsmall 10
-set g_pickup_armorsmall_max 100
+set g_pickup_armorsmall_max 200
+set g_pickup_armorsmall_anyway 1
 set g_pickup_armormedium 25
-set g_pickup_armormedium_max 100
+set g_pickup_armormedium_max 200
+set g_pickup_armormedium_anyway 1
 set g_pickup_armorbig 50
-set g_pickup_armorbig_max 100
+set g_pickup_armorbig_max 200
+set g_pickup_armorbig_anyway 1
 set g_pickup_armorlarge 100
-set g_pickup_armorlarge_max 100
+set g_pickup_armorlarge_max 200
+set g_pickup_armorlarge_anyway 1
 set g_pickup_healthsmall 10
 set g_pickup_healthsmall_max 200
+set g_pickup_healthsmall_anyway 1
 set g_pickup_healthmedium 25
 set g_pickup_healthmedium_max 200
+set g_pickup_healthmedium_anyway 1
 set g_pickup_healthlarge 50
 set g_pickup_healthlarge_max 200
+set g_pickup_healthlarge_anyway 1
 set g_pickup_healthmega 100
 set g_pickup_healthmega_max 200
+set g_pickup_healthmega_anyway 1
 set g_pickup_respawntime_short 15
 set g_pickup_respawntime_medium 20
 set g_pickup_respawntime_long 30
@@ -134,7 +118,7 @@ set g_balance_health_limit 999
 set g_balance_armor_regen 0
 set g_balance_armor_regenlinear 0
 set g_balance_armor_rot 0
-set g_balance_armor_rotlinear 0
+set g_balance_armor_rotlinear 3
 set g_balance_pause_armor_rot 1
 set g_balance_pause_armor_rot_spawn 1
 set g_balance_armor_regenstable 100
@@ -154,7 +138,7 @@ set g_balance_fuel_limit 999
 // }}}
 
 // {{{ misc
-set g_balance_selfdamagepercent 0.6
+set g_balance_selfdamagepercent 0.75
 set g_balance_weaponswitchdelay 0.15
 set g_weaponspeedfactor 1 "weapon projectile speed multiplier"
 set g_weaponratefactor 1 "weapon fire rate multiplier"
@@ -250,7 +234,7 @@ set g_balance_laser_secondary_delay 0
 // {{{ shotgun
 set g_balance_shotgun_primary_bullets 6
 set g_balance_shotgun_primary_damage 8
-set g_balance_shotgun_primary_force 0
+set g_balance_shotgun_primary_force 15
 set g_balance_shotgun_primary_spread 0.11
 set g_balance_shotgun_primary_refire 0.5
 set g_balance_shotgun_primary_animtime 0.2
@@ -260,7 +244,7 @@ set g_balance_shotgun_primary_bulletconstant 75 // 3.8qu
 set g_balance_shotgun_secondary 1
 set g_balance_shotgun_secondary_bullets 6
 set g_balance_shotgun_secondary_damage 8
-set g_balance_shotgun_secondary_force 0
+set g_balance_shotgun_secondary_force 15
 set g_balance_shotgun_secondary_spread 0.17
 set g_balance_shotgun_secondary_refire 1.35
 set g_balance_shotgun_secondary_animtime 0.2
@@ -271,12 +255,12 @@ set g_balance_shotgun_secondary_bulletconstant 75 // 3.8qu
 // {{{ uzi
 set g_balance_uzi_first 1
 set g_balance_uzi_first_damage 12
-set g_balance_uzi_first_force 0
+set g_balance_uzi_first_force 5
 set g_balance_uzi_first_spread 0.015
 set g_balance_uzi_first_refire 0.15
 set g_balance_uzi_first_ammo 1
 set g_balance_uzi_sustained_damage 7
-set g_balance_uzi_sustained_force 0
+set g_balance_uzi_sustained_force 5
 set g_balance_uzi_sustained_spread 0.05
 set g_balance_uzi_sustained_refire 0.075
 set g_balance_uzi_sustained_ammo 1
@@ -355,9 +339,9 @@ set g_balance_electro_combo_speed 2000
 set g_balance_crylink_primary_damage 14
 set g_balance_crylink_primary_edgedamage 0
 set g_balance_crylink_primary_force -55
-set g_balance_crylink_primary_radius 80
+set g_balance_crylink_primary_radius 50
 set g_balance_crylink_primary_speed 7000
-set g_balance_crylink_primary_spread 0.01
+set g_balance_crylink_primary_spread 0.02
 set g_balance_crylink_primary_shots 4
 set g_balance_crylink_primary_bounces 1
 set g_balance_crylink_primary_refire 0.4
@@ -383,7 +367,7 @@ set g_balance_crylink_secondary_shots 3
 set g_balance_crylink_secondary_bounces 0
 set g_balance_crylink_secondary_refire 0.1
 set g_balance_crylink_secondary_animtime 0.1
-set g_balance_crylink_secondary_ammo 1
+set g_balance_crylink_secondary_ammo 2
 set g_balance_crylink_secondary_bouncedamagefactor 0.5
 
 set g_balance_crylink_secondary_middle_lifetime 5 // range: 35000 full, fades to 70000
@@ -393,7 +377,7 @@ set g_balance_crylink_secondary_line_fadetime 2
 // }}}
 // {{{ nex
 set g_balance_nex_damage 90
-set g_balance_nex_force 200
+set g_balance_nex_force 300
 set g_balance_nex_refire 1.5
 set g_balance_nex_animtime 0.3
 set g_balance_nex_ammo 5
@@ -443,7 +427,7 @@ set g_balance_rocketlauncher_animtime 0.3
 set g_balance_rocketlauncher_ammo 3
 set g_balance_rocketlauncher_health 40
 set g_balance_rocketlauncher_damageforcescale 4
-set g_balance_rocketlauncher_detonatedelay -1 // positive: timer till detonation is allowed, negative: "security device" that prevents ANY remote detonation if it could hurt its owner, zero: detonatable at any time
+set g_balance_rocketlauncher_detonatedelay 0.05 // positive: timer till detonation is allowed, negative: "security device" that prevents ANY remote detonation if it could hurt its owner, zero: detonatable at any time
 set g_balance_rocketlauncher_guiderate 140 // max degrees per second
 set g_balance_rocketlauncher_guideratedelay 0.01 // immediate
 set g_balance_rocketlauncher_guidegoal 512 // goal distance for (non-laser) guiding (higher = less control, lower = erratic)
@@ -525,7 +509,7 @@ set g_balance_campingrifle_tracer 1
 set g_balance_campingrifle_primary_damage 50
 set g_balance_campingrifle_primary_headshotaddeddamage 50
 set g_balance_campingrifle_primary_spread 0
-set g_balance_campingrifle_primary_force 0
+set g_balance_campingrifle_primary_force 50
 set g_balance_campingrifle_primary_speed 35000
 set g_balance_campingrifle_primary_lifetime 5
 set g_balance_campingrifle_primary_refire 0.7
@@ -533,10 +517,11 @@ set g_balance_campingrifle_primary_animtime 0.3
 set g_balance_campingrifle_primary_ammo 10
 set g_balance_campingrifle_primary_bulletconstant 130 // 56.3qu
 set g_balance_campingrifle_primary_burstcost 0.35 // require same cooldown as secondary, note it's smaller than primary refire time
+set g_balance_campingrifle_primary_bullethail 0
 set g_balance_campingrifle_secondary_damage 15
 set g_balance_campingrifle_secondary_headshotaddeddamage 25
 set g_balance_campingrifle_secondary_spread 0.02
-set g_balance_campingrifle_secondary_force 0
+set g_balance_campingrifle_secondary_force 30
 set g_balance_campingrifle_secondary_speed 20000
 set g_balance_campingrifle_secondary_lifetime 5
 set g_balance_campingrifle_secondary_refire 0.1
@@ -544,6 +529,7 @@ set g_balance_campingrifle_secondary_animtime 0.1
 set g_balance_campingrifle_secondary_ammo 4
 set g_balance_campingrifle_secondary_bulletconstant 130 // 18.3qu
 set g_balance_campingrifle_secondary_burstcost 0.35
+set g_balance_campingrifle_secondary_bullethail 0
 // }}}
 // {{{ tuba
 set g_balance_tuba_refire 0.05
index 4d2fd05..bb0416a 100644 (file)
@@ -1,28 +1,3 @@
-// {{{ weapon replacement
-// NOTE: this only replaces weapons on the map
-// use g_start_weapon_* to also replace the on-startup weapons!
-// example: g_weaponreplace_nex "nex minstanex", then Nexes become MinstaNexes 50% of the times
-// set the cvars to "0" to totally disable a weapon
-set g_weaponreplace_laser ""
-set g_weaponreplace_shotgun "uzi"
-set g_weaponreplace_uzi "shotgun"
-set g_weaponreplace_grenadelauncher ""
-set g_weaponreplace_electro ""
-set g_weaponreplace_crylink ""
-set g_weaponreplace_nex ""
-set g_weaponreplace_hagar ""
-set g_weaponreplace_rocketlauncher ""
-set g_weaponreplace_porto ""
-set g_weaponreplace_minstanex ""
-set g_weaponreplace_hook 0
-set g_weaponreplace_hlac 0
-set g_weaponreplace_campingrifle 0
-set g_weaponreplace_tuba ""
-set g_weaponreplace_fireball 0
-set g_weaponreplace_seeker 0
-set sv_q3acompat_machineshotgunswap 0
-// }}}
-
 // {{{ starting gear
 set g_start_weapon_laser -1 "0 = never provide the weapon, 1 = always provide the weapon, -1 = game mode default, -2 = provide the weapon in ca and lms"
 set g_start_weapon_shotgun -2 "0 = never provide the weapon, 1 = always provide the weapon, -1 = game mode default, -2 = provide the weapon in ca and lms"
@@ -77,6 +52,8 @@ set g_balance_nix_ammoincr_fuel 2
 // }}}
 
 // {{{ pickup items
+set g_pickup_ammo_anyway 0
+set g_pickup_weapons_anyway 0
 set g_pickup_shells 10
 set g_pickup_shells_max 30
 set g_pickup_nails 30
@@ -90,20 +67,28 @@ set g_pickup_fuel_jetpack 50
 set g_pickup_fuel_max 999
 set g_pickup_armorsmall 5
 set g_pickup_armorsmall_max 200
+set g_pickup_armorsmall_anyway 0
 set g_pickup_armormedium 25
 set g_pickup_armormedium_max 200
+set g_pickup_armormedium_anyway 0
 set g_pickup_armorbig 50
 set g_pickup_armorbig_max 200
+set g_pickup_armorbig_anyway 0
 set g_pickup_armorlarge 100
 set g_pickup_armorlarge_max 200
+set g_pickup_armorlarge_anyway 0
 set g_pickup_healthsmall 5
 set g_pickup_healthsmall_max 200
+set g_pickup_healthsmall_anyway 0
 set g_pickup_healthmedium 25
 set g_pickup_healthmedium_max 100
+set g_pickup_healthmedium_anyway 0
 set g_pickup_healthlarge 50
 set g_pickup_healthlarge_max 100
+set g_pickup_healthlarge_anyway 0
 set g_pickup_healthmega 100
 set g_pickup_healthmega_max 200
+set g_pickup_healthmega_anyway 0
 set g_pickup_respawntime_short 30
 set g_pickup_respawntime_medium 30
 set g_pickup_respawntime_long 30
@@ -248,8 +233,8 @@ set g_balance_laser_secondary_shotangle 0
 set g_balance_laser_secondary_delay 0
 // }}}
 // {{{ shotgun
-set g_balance_shotgun_primary_bullets 36
-set g_balance_shotgun_primary_damage 3
+set g_balance_shotgun_primary_bullets 25
+set g_balance_shotgun_primary_damage 4
 set g_balance_shotgun_primary_force 10
 set g_balance_shotgun_primary_spread 0.18
 set g_balance_shotgun_primary_refire 1
@@ -275,8 +260,8 @@ set g_balance_uzi_first_force 50
 set g_balance_uzi_first_spread 0.007
 set g_balance_uzi_first_refire 0.15
 set g_balance_uzi_first_ammo 1
-set g_balance_uzi_sustained_damage 7
-set g_balance_uzi_sustained_force 30
+set g_balance_uzi_sustained_damage 5
+set g_balance_uzi_sustained_force 10
 set g_balance_uzi_sustained_spread 0.02
 set g_balance_uzi_sustained_refire 0.1
 set g_balance_uzi_sustained_ammo 1
@@ -392,10 +377,10 @@ set g_balance_crylink_secondary_line_lifetime 2 // range: 35000 full, fades to 7
 set g_balance_crylink_secondary_line_fadetime 2
 // }}}
 // {{{ nex
-set g_balance_nex_damage 100
+set g_balance_nex_damage 80
 set g_balance_nex_force 200
 set g_balance_nex_refire 1.25
-set g_balance_nex_animtime 0.8
+set g_balance_nex_animtime 1.25
 set g_balance_nex_ammo 5
 set g_balance_nex_damagefalloff_mindist 1000
 set g_balance_nex_damagefalloff_maxdist 3000
@@ -533,6 +518,7 @@ set g_balance_campingrifle_primary_animtime 0.7
 set g_balance_campingrifle_primary_ammo 10
 set g_balance_campingrifle_primary_bulletconstant 130 // 56.3qu
 set g_balance_campingrifle_primary_burstcost 0.35 // require same cooldown as secondary, note it's smaller than primary refire time
+set g_balance_campingrifle_primary_bullethail 0
 set g_balance_campingrifle_secondary_damage 15
 set g_balance_campingrifle_secondary_headshotaddeddamage 25
 set g_balance_campingrifle_secondary_spread 0.02
@@ -544,6 +530,7 @@ set g_balance_campingrifle_secondary_animtime 0.1
 set g_balance_campingrifle_secondary_ammo 4
 set g_balance_campingrifle_secondary_bulletconstant 130 // 18.3qu
 set g_balance_campingrifle_secondary_burstcost 0.35
+set g_balance_campingrifle_secondary_bullethail 0
 // }}}
 // {{{ tuba
 set g_balance_tuba_refire 0.05
index 8cf217c..86b4808 100644 (file)
@@ -1,4 +1 @@
 exec defaultXonotic.cfg
-
-// we're not xonotic 2.6 yet
-//exec default25.cfg
diff --git a/default25.cfg b/default25.cfg
deleted file mode 100644 (file)
index 8d380fd..0000000
+++ /dev/null
@@ -1,5 +0,0 @@
-cl_netfps 20
-sys_ticrate 0.05
-sv_gameplayfix_delayprojectiles 1
-exec physics25.cfg
-exec balance25.cfg
diff --git a/default26.cfg b/default26.cfg
deleted file mode 100644 (file)
index 260c96d..0000000
+++ /dev/null
@@ -1,5 +0,0 @@
-cl_netfps 60
-sys_ticrate 0.0166667
-sv_gameplayfix_delayprojectiles 0
-exec physics26.cfg
-exec balance.cfg
diff --git a/defaultSamual.cfg b/defaultSamual.cfg
new file mode 100644 (file)
index 0000000..c0dce41
--- /dev/null
@@ -0,0 +1,31 @@
+// Samual's mod configuration file
+exec defaultXonotic.cfg
+
+// weapon replace options
+set g_weaponreplace_laser ""
+set g_weaponreplace_shotgun ""
+set g_weaponreplace_uzi ""
+set g_weaponreplace_grenadelauncher ""
+set g_weaponreplace_electro ""
+set g_weaponreplace_crylink ""
+set g_weaponreplace_nex ""
+set g_weaponreplace_hagar ""
+set g_weaponreplace_rocketlauncher ""
+set g_weaponreplace_porto ""
+set g_weaponreplace_minstanex ""
+set g_weaponreplace_hook ""
+set g_weaponreplace_hlac 0 // Maybe will be enabled later after I figure out what I want to do with it
+set g_weaponreplace_campingrifle ""
+set g_weaponreplace_tuba "" 
+set g_weaponreplace_fireball 0 // Same with this
+set g_weaponreplace_seeker 0 // Same with this
+set sv_q3acompat_machineshotgunswap 0
+
+// other options
+set sv_fragmessage_information_ping 1
+set sv_fragmessage_information_handicap 2
+set sv_fragmessage_information_stats 1
+set sv_fragmessage_information_typefrag 1
+
+exec physicsSamual.cfg
+exec balanceSamual.cfg
diff --git a/defaultXPM.cfg b/defaultXPM.cfg
new file mode 100644 (file)
index 0000000..f480e22
--- /dev/null
@@ -0,0 +1,23 @@
+exec defaultXonotic.cfg
+
+set g_weaponreplace_laser ""
+set g_weaponreplace_shotgun "uzi"
+set g_weaponreplace_uzi "shotgun"
+set g_weaponreplace_grenadelauncher ""
+set g_weaponreplace_electro ""
+set g_weaponreplace_crylink ""
+set g_weaponreplace_nex ""
+set g_weaponreplace_hagar ""
+set g_weaponreplace_rocketlauncher ""
+set g_weaponreplace_porto ""
+set g_weaponreplace_minstanex ""
+set g_weaponreplace_hook 0
+set g_weaponreplace_hlac 0
+set g_weaponreplace_campingrifle 0
+set g_weaponreplace_tuba ""
+set g_weaponreplace_fireball 0
+set g_weaponreplace_seeker 0
+set sv_q3acompat_machineshotgunswap 0
+
+exec physicsXPM.cfg
+exec balanceXPM.cfg
index 1c6942d..725510d 100644 (file)
@@ -1,17 +1,5 @@
 set g_xonoticversion 2.5svn    "Xonotic version (formatted for humans)"
 
-//!<showbrand
-showbrand 3
-echo
-echo A warning about this being a SVN development version was set up.
-echo This build shall be used for development and testing only!
-echo
-echo If you want to disable this warning, add the line
-echo   showbrand 0
-echo to your autoexec.cfg.
-echo
-//!>showbrand
-
 // changes a cvar and reports it to the server (for the menu to notify the
 // server about changes)
 alias setreport "set \"$1\" \"$2\" ; sendcvar \"$1\""
@@ -252,7 +240,28 @@ cl_bobcycle 0 // how long the cycle of up/down view movement takes (only works i
 cl_bob 0.01 // how much view moves up/down when moving (does not move if cl_bobcycle is 0, but still enables cl_bobmodel), default is 0.02
 cl_bobmodel 1 // whether to have gun model move around on screen when moving (only works if cl_bob is not 0), default is 1
 cl_leanmodel 1 // enables weapon leaning effect when looking around
+cl_leanmodel_side_speed 0.7 "gun leaning sideways speed"
+cl_leanmodel_side_limit 35 "gun leaning sideways limit"
+cl_leanmodel_side_highpass1 30 "gun leaning sideways pre-highpass in 1/s"
+cl_leanmodel_side_highpass 3 "gun leaning sideways highpass in 1/s"
+cl_leanmodel_side_lowpass 20 "gun leaning sideways lowpass in 1/s"
+cl_leanmodel_up_speed 0.65 "gun leaning upward speed"
+cl_leanmodel_up_limit 50 "gun leaning upward limit"
+cl_leanmodel_up_highpass1 5 "gun leaning upward pre-highpass in 1/s"
+cl_leanmodel_up_highpass 15 "gun leaning upward highpass in 1/s"
+cl_leanmodel_up_lowpass 20 "gun leaning upward lowpass in 1/s"
 cl_followmodel 1 // enables weapon pushing / pulling effect when walking
+cl_followmodel_side_speed 0.25 "gun following sideways speed"
+cl_followmodel_side_limit 6 "gun following sideways limit"
+cl_followmodel_side_highpass1 30 "gun following sideways pre-highpass in 1/s"
+cl_followmodel_side_highpass 5 "gun following sideways highpass in 1/s"
+cl_followmodel_side_lowpass 10 "gun following sideways lowpass in 1/s"
+cl_followmodel_up_speed 0.5 "gun following upward speed"
+cl_followmodel_up_limit 5 "gun following upward limit"
+cl_followmodel_up_highpass1 60 "gun following upward pre-highpass in 1/s"
+cl_followmodel_up_highpass 2 "gun following upward highpass in 1/s"
+cl_followmodel_up_lowpass 10 "gun following upward lowpass in 1/s"
+
 cl_rollangle 0 // amount of view tilt when strafing, default is 2.0
 v_kicktime 0 // how long damage kicks of the view last, default is 0 seconds
 gl_polyblend 0.5 // whether to use screen tints, default is 1
@@ -319,7 +328,7 @@ set g_telefrags 1
 set g_telefrags_avoid 0
 set g_teleport_maxspeed 0 "maximum speed that a player can keep when going through a teleporter (if a misc_teleporter_dest also has a cap the smallest one of these will be used), 0 = don't limit, -1 = keep no speed"
 
-set g_respawn_ghosts 1 "if 1 dead bodies become ghosts and float away when the player respawns"
+set g_respawn_ghosts 0 "if 1 dead bodies become ghosts and float away when the player respawns"
 set g_respawn_ghosts_speed 5 "the speed with which respawn ghosts float and rotate"
 set g_respawn_ghosts_maxtime 6 "maximum amount of time a respawn ghost can last, minimum time is half this value. 0 disables and ghosts fade when the body would"
 
@@ -342,9 +351,9 @@ set sv_player_crouch_maxs "16 16 25" "maxs of a crouched playermodel"
 
 set sv_pogostick 1 "don't require releasing the space bar for jumping again"
 set sv_doublejump 0 "allow Quake 2-style double jumps"
-set sv_jumpspeedcap_min "" "wont perform a doublejump if z-axis speed is higher than sv_jumpvelocity * this"
-set sv_jumpspeedcap_max "" "wont perform a doublejump if z-axis speed is higher than sv_jumpvelocity * this"
-set sv_jumpspeedcap_max_disable_on_ramps 0 "disable max jumpspeedcap on ramps to preserve the old rampjump style"
+set sv_jumpspeedcap_min "" "lower bound on the baseline velocity of a jump; final velocity will be >= (jumpheight * min + jumpheight)"
+set sv_jumpspeedcap_max "" "upper bound on the baseline velocity of a jump; final velocity will be <= (jumpheight * max + jumpheight)"
+set sv_jumpspeedcap_max_disable_on_ramps 0 "disable upper baseline velocity bound on ramps to preserve the old rampjump style"
 
 seta sv_precacheplayermodels 1
 seta sv_precacheweapons 0
@@ -1584,6 +1593,8 @@ alias rankings "cmd rankings"
 
 set g_ballistics_materialconstant 1414213562
 set g_ballistics_mindistance 16
+set g_ballistics_density_player 0.50 // players are 2x as easy to pass as walls
+set g_ballistics_density_corpse 0.10 // corpses are 10x as easy to pass as walls
 // unit: qJ / qu^3 (energy needed per volume unit of solid to push/burn away
 // parameter: bullet constant: mass / area in g/qu^2
 // = mass / (pi/4 * caliber^2)
@@ -1761,7 +1772,7 @@ seta cl_noantilag 0 "turn this on if you believe antilag is bad"
 
 set sv_pitch_min -35 "minimum aiming angle for shooting direction display of the gun"
 set sv_pitch_max  35 "maximum aiming angle for shooting direction display of the gun"
-set sv_pitch_fixyaw 1 "workaround to fix the aiming direction on stupidly made player models, FIXME fix the models and set this to 0"
+set sv_pitch_fixyaw 0 "workaround to fix the aiming direction on stupidly made player models, FIXME fix the models and set this to 0"
 
 set rescan_pending 0 "set to 1 to schedule a fs_rescan at the end of this match"
 
@@ -1833,3 +1844,28 @@ volume 1
 
 // sucks less than the old one
 cl_decals_newsystem 1
+
+// NOTE: this only replaces weapons on the map
+// use g_start_weapon_* to also replace the on-startup weapons!
+// example: g_weaponreplace_nex "nex minstanex", then Nexes become MinstaNexes 50% of the times
+// set the cvars to "0" to totally disable a weapon
+set g_weaponreplace_laser ""
+set g_weaponreplace_shotgun ""
+set g_weaponreplace_uzi ""
+set g_weaponreplace_grenadelauncher ""
+set g_weaponreplace_electro ""
+set g_weaponreplace_crylink ""
+set g_weaponreplace_nex ""
+set g_weaponreplace_hagar ""
+set g_weaponreplace_rocketlauncher ""
+set g_weaponreplace_porto ""
+set g_weaponreplace_minstanex ""
+set g_weaponreplace_hook ""
+set g_weaponreplace_hlac ""
+set g_weaponreplace_campingrifle ""
+set g_weaponreplace_tuba ""
+set g_weaponreplace_fireball ""
+set g_weaponreplace_seeker ""
+set sv_q3acompat_machineshotgunswap 0 "shorthand for swapping uzi and shotgun (for Q3A map compatibility in mapinfo files)"
+
+set g_movement_highspeed 1 "movement speed modification factor (only changes movement when above maxspeed)"
index f915b0e..53926a7 100644 (file)
@@ -14,7 +14,7 @@ lightradiusfade 200
 lightcolor 0.4 0.9 0.9
 // cloud of particles which expand rapidly and then slow to form a ball
 effect TE_WIZSPIKE
-count 100
+count 50
 type static
 color 0x63F2EA 0x63f2EA
 size 2 2
@@ -47,7 +47,7 @@ alpha 256 256 1024
 size 24 24
 // sparks that rapidly expand and rapidly slow down to form an interesting spherical effect
 effect TE_KNIGHTSPIKE
-count 256
+count 128
 type spark
 color 0x800000 0xFF8020
 alpha 256 256 1024
@@ -70,7 +70,7 @@ alpha 256 256 0
 originjitter 6 6 6
 // dust/smoke drifting away from the impact
 effect TE_SPIKE
-count 8
+count 4
 type smoke
 tex 0 8
 color 0x101010 0x101010
@@ -81,7 +81,7 @@ originjitter 0 0 0
 velocityjitter 8 8 8
 // dust/smoke staying at the impact
 effect TE_SPIKE
-count 1
+count 0.5
 type smoke
 tex 0 8
 color 0x505050 0x505050
@@ -92,7 +92,7 @@ originjitter 0 0 0
 velocityjitter 0 0 0
 // bouncing sparks
 effect TE_SPIKE
-count 20
+count 10
 type spark
 color 0x8f4333 0xfff31b
 size 0.4 0.4
@@ -125,7 +125,7 @@ size 48 48
 alpha 256 256 128
 // large sparks
 effect TE_SPIKEQUAD
-count 20
+count 10
 type static
 color 0x2030FF 0x80C0FF
 size 32 32
@@ -149,7 +149,7 @@ alpha 256 256 0
 originjitter 6 6 6
 // dust/smoke drifting away from the impact
 effect TE_SUPERSPIKE
-count 8
+count 4
 type smoke
 tex 0 8
 color 0x101010 0x101010
@@ -160,7 +160,7 @@ originjitter 0 0 0
 velocityjitter 8 8 8
 // dust/smoke staying at the impact
 effect TE_SUPERSPIKE
-count 1
+count 0.5
 type smoke
 tex 0 8
 color 0x505050 0x505050
@@ -171,7 +171,7 @@ originjitter 0 0 0
 velocityjitter 0 0 0
 // sparks that disappear on impact
 effect TE_SUPERSPIKE
-count 30
+count 15
 type spark
 color 0x8f4333 0xfff31b
 size 0.4 0.4
@@ -196,7 +196,7 @@ lightradiusfade 500
 lightcolor 0.15 0.15 1.5
 // dust/smoke drifting away from the impact
 effect TE_SUPERSPIKEQUAD
-count 8
+count 4
 type smoke
 tex 0 8
 color 0x101010 0x101010
@@ -207,7 +207,7 @@ originjitter 0 0 0
 velocityjitter 8 8 8
 // dust/smoke staying at the impact
 effect TE_SUPERSPIKEQUAD
-count 1
+count 0.5
 type smoke
 tex 0 8
 color 0x505050 0x505050
@@ -218,7 +218,7 @@ originjitter 0 0 0
 velocityjitter 0 0 0
 // sparks that disappear on impact
 effect TE_SUPERSPIKEQUAD
-count 30
+count 15
 type spark
 color 0x8f4333 0xfff31b
 size 0.4 0.4
@@ -240,7 +240,7 @@ alpha 256 256 0
 originjitter 6 6 6
 // dust/smoke drifting away from the impact
 effect TE_GUNSHOT
-count 4
+count 2
 type smoke
 tex 0 8
 color 0x101010 0x101010
@@ -251,7 +251,7 @@ originjitter 0 0 0
 velocityjitter 8 8 8
 // dust/smoke staying at the impact
 effect TE_GUNSHOT
-count 1
+count 0.5
 type smoke
 tex 0 8
 color 0x505050 0x505050
@@ -262,7 +262,7 @@ originjitter 0 0 0
 velocityjitter 0 0 0
 // bouncing sparks
 effect TE_GUNSHOT
-count 10
+count 5
 type spark
 color 0x8f4333 0xfff31b
 size 0.4 0.4
@@ -295,7 +295,7 @@ size 8 8
 alpha 256 256 512
 // purple sparks
 effect TE_GUNSHOTQUAD
-count 12
+count 6
 type spark
 color 0xA040C0 0xFFFFFF
 size 1 1
@@ -329,7 +329,7 @@ alpha 192 192 64
 // fire effect which expands then slows
 effect TE_EXPLOSION
 notunderwater
-count 128
+count 64
 type static
 tex 48 55
 color 0x902010 0xFFD080
@@ -343,7 +343,7 @@ velocityjitter 256 256 256
 // underwater bubbles
 effect TE_EXPLOSION
 underwater
-count 32
+count 16
 type bubble
 tex 62 62
 color 0x404040 0x808080
@@ -357,7 +357,7 @@ velocityjitter 96 96 96
 // bouncing sparks
 effect TE_EXPLOSION
 notunderwater
-count 32
+count 16
 type spark
 color 0x903010 0xFFD030
 size 2 2
@@ -385,7 +385,7 @@ lightcolor 4 2 8
 // smoke cloud
 effect TE_EXPLOSIONQUAD
 notunderwater
-count 32
+count 16
 type smoke
 color 0x202020 0x404040
 tex 0 8
@@ -395,7 +395,7 @@ velocityjitter 48 48 48
 // underwater bubbles
 effect TE_EXPLOSIONQUAD
 underwater
-count 32
+count 16
 type bubble
 tex 62 62
 color 0x404040 0x808080
@@ -409,7 +409,7 @@ velocityjitter 96 96 96
 // sparks which go through walls
 effect TE_EXPLOSIONQUAD
 notunderwater
-count 128
+count 64
 type spark
 color 0x903010 0xFFD030
 size 1 1
@@ -436,7 +436,7 @@ lightcolor 1.6 0.8 2
 // smoke cloud
 effect TE_TAREXPLOSION
 notunderwater
-count 32
+count 16
 type smoke
 color 0x202020 0x404040
 tex 0 8
@@ -446,7 +446,7 @@ velocityjitter 48 48 48
 // underwater bubbles
 effect TE_TAREXPLOSION
 underwater
-count 32
+count 16
 type bubble
 tex 62 62
 color 0x404040 0x808080
@@ -460,7 +460,7 @@ velocityjitter 96 96 96
 // sparks which go through walls
 effect TE_TAREXPLOSION
 notunderwater
-count 128
+count 64
 type spark
 color 0x903010 0xFFD030
 size 1 1
@@ -474,7 +474,7 @@ velocityjitter 256 256 256
 // bloody impact effect indicating damage
 // used nowhere in code
 effect TE_BLOOD
-count 0.333
+count 0.167
 type blood
 tex 24 32
 size 8 8
@@ -493,7 +493,7 @@ staintex 16 24
 // used in qcsrc/server/antilag.qc:            te_spark(antilag_takebackorigin(e, time - e.antilag_debug), '0 0 0', 32)
 // used in qcsrc/server/g_triggers.qc: self.mdl = "TE_SPARK"
 effect TE_SPARK
-count 1
+count 0.5
 type spark
 tex 40 40
 color 0x8f4333 0xfff31b
@@ -528,7 +528,7 @@ size 8 8
 alpha 256 256 512
 // small sparks which form a sphere as they slow down
 effect TE_PLASMABURN
-count 256
+count 128
 type spark
 color 0x2030FF 0x80C0FF
 size 1 2
@@ -549,7 +549,7 @@ lightcolor 2 2 2
 // quake effect
 // used nowhere in code
 effect TE_FLAMEJET
-count 1
+count 0.5
 type smoke
 color 0x6f0f00 0xe3974f
 size 4 4
@@ -564,7 +564,7 @@ velocitymultiplier 1
 // quake effect
 // used nowhere in code
 effect TE_LAVASPLASH
-count 64
+count 32
 type alphastatic
 color 0x6f0f00 0xe3974f
 size 12 12
@@ -578,7 +578,7 @@ velocityjitter 128 128 0
 // player teleport effect
 // used nowhere in code
 effect TE_TELEPORT
-count 112
+count 56
 type static
 color 0xA0A0A0 0xFFFFFF
 size 10 10
@@ -601,7 +601,7 @@ size 4 4
 alpha 128 128 256
 // experimental
 effect TE_TEI_G3
-trailspacing 2
+trailspacing 4
 type static
 color 0x202020 0x404040
 size 1 1
@@ -614,7 +614,7 @@ type smoke
 // smoke effect
 // used nowhere in code
 effect TE_TEI_SMOKE
-count 0.333
+count 0.167
 type smoke
 color 0x202020 0x404040
 tex 0 8
@@ -648,7 +648,7 @@ alpha 192 192 64
 // fire effect
 effect TE_TEI_BIGEXPLOSION
 notunderwater
-count 256
+count 128
 type static
 tex 48 55
 color 0x902010 0xFFD080
@@ -662,7 +662,7 @@ velocityjitter 512 512 512
 // underwater bubbles
 effect TE_TEI_BIGEXPLOSION
 underwater
-count 64
+count 32
 type bubble
 tex 62 62
 color 0x404040 0x808080
@@ -676,7 +676,7 @@ velocityjitter 144 144 144
 // bouncing sparks
 effect TE_TEI_BIGEXPLOSION
 notunderwater
-count 128
+count 64
 type spark
 color 0x903010 0xFFD030
 size 2 2
@@ -711,7 +711,7 @@ size 32 32
 alpha 256 256 512
 // cloud of bouncing sparks
 effect TE_TEI_PLASMAHIT
-count 1
+count 0.5
 type spark
 color 0x2030FF 0x80C0FF
 size 2 4
@@ -739,7 +739,7 @@ velocityjitter 512 512 512
 // used in qcsrc/client/gibs.qc:       pointparticles(particleeffectnum("blood"), self.origin + '0 0 1', '0 0 30', 10)
 // used in qcsrc/client/gibs.qc:                       pointparticles(particleeffectnum("blood"), org, vel, amount * 16)
 effect blood
-count 0.333
+count 0.167
 type blood
 tex 24 32
 size 3 8
@@ -767,7 +767,7 @@ originjitter 11 11 11
 // used in qcsrc/server/t_teleporters.qc:              pointparticles(particleeffectnum("teleport"), player.origin, '0 0 0', 1)
 // used in qcsrc/server/t_teleporters.qc:              pointparticles(particleeffectnum("teleport"), to + v_forward * 32, '0 0 0', 1)
 effect teleport
-count 1000
+count 500
 type spark
 tex 64 64
 color 0xff8400 0xff2a00
@@ -795,7 +795,7 @@ color 0xff8400 0xff2a00
 // normal super gory blood trail (used by gibs)
 // used in qcsrc/client/gibs.qc:               trailparticles(self, particleeffectnum("TR_BLOOD"), oldorg, self.origin)
 effect TR_BLOOD
-trailspacing 16
+trailspacing 32
 type blood
 color 0xA8FFFF 0xA8FFFF
 tex 24 32
@@ -814,7 +814,7 @@ staintex 16 24
 // thinner blood trail (used by quake zombies)
 // used in qcsrc/client/gibs.qc:               trailparticles(self, particleeffectnum("TR_SLIGHTBLOOD"), oldorg, self.origin)
 effect TR_SLIGHTBLOOD
-trailspacing 32
+trailspacing 64
 type blood
 color 0xA8FFFF 0xA8FFFF
 tex 24 32
@@ -834,7 +834,7 @@ staintex 16 24
 // used in qcsrc/server/g_triggers.qc: self.effects = EF_STARDUST
 // used in qcsrc/server/portals.qc:    portal.effects = EF_STARDUST | EF_BLUE
 effect EF_STARDUST
-count 75
+count 37.5
 type static
 color 0xfff368 0xfff368
 size 1.0 2.0
@@ -859,7 +859,7 @@ size 32 32
 alpha 128 128 128
 // cloud of particles which expand rapidly and then slow to form a ball
 effect item_respawn
-count 256
+count 128
 type spark
 tex 41 41
 color 0x63F2EA 0x63f2EA
@@ -897,7 +897,7 @@ lightradiusfade 2000
 lightcolor 3 0.1 0.1
 // electricity
 effect laser_muzzleflash
-count 6
+count 3
 type spark
 color 0xb44215 0xff0000
 tex 43 43
@@ -912,7 +912,7 @@ stretchfactor 2.3
 rotate -180 180 4000 -4000
 // fire
 effect laser_muzzleflash
-count 12
+count 6
 type spark
 color 0xff4200 0xff0000
 tex 8 15
@@ -949,7 +949,7 @@ alpha 256 256 1024
 size 24 24
 // sparks that rapidly expand and rapidly slow down to form an interesting spherical effect
 effect laser_impact
-count 256
+count 128
 type spark
 color 0x800000 0xFF8020
 alpha 256 256 1024
@@ -960,7 +960,7 @@ liquidfriction 6
 //originjitter 32 32 32
 velocityjitter 256 256 256
 effect laser_impact
-count 8
+count 4
 type smoke
 tex 48 55
 color 0x800000 0xFF8020
@@ -977,7 +977,7 @@ sizeincrease 6
 // used in qcsrc/server/w_shotgun.qc:  pointparticles(particleeffectnum("shotgun_muzzleflash"), w_shotorg, w_shotdir * 1000, cvar("g_balance_shotgun_primary_ammo"))
 // used in qcsrc/server/w_shotgun.qc:  pointparticles(particleeffectnum("shotgun_muzzleflash"), w_shotorg, w_shotdir * 1000, cvar("g_balance_shotgun_secondary_ammo"))
 effect shotgun_muzzleflash
-count 3
+count 1.5
 type smoke
 color 0x202020 0x404040
 tex 0 8
@@ -992,7 +992,7 @@ lightcolor 2 1.5 0.2
 sizeincrease 12
 velocitymultiplier 0.05
 effect shotgun_muzzleflash
-count 32
+count 16
 type spark
 tex 48 55
 color 0xffdb96 0xff5400
@@ -1022,7 +1022,7 @@ effect shotgun_impact
 type alphastatic
 notunderwater
 tex 0 8
-count 6
+count 3
 size 10 20
 sizeincrease 25
 alpha 300 550 756
@@ -1036,7 +1036,7 @@ effect shotgun_impact
 type alphastatic
 notunderwater
 tex 36 36
-count 1
+count 0.5
 size 10 11
 sizeincrease 74
 alpha 200 350 500
@@ -1049,7 +1049,7 @@ rotate 0 360 -50 50
 // sparks
 effect shotgun_impact
 notunderwater
-count 3
+count 1.5
 type spark
 tex 40 40
 color 0xFDFFD9 0xFDFFD9
@@ -1065,7 +1065,7 @@ velocitymultiplier 0.2
 
 // used in qcsrc/server/w_uzi.qc:      pointparticles(particleeffectnum("uzi_muzzleflash"), w_shotorg, w_shotdir * 1000, 1)
 effect uzi_muzzleflash
-count 2
+count 1
 type static
 color 0x202020 0x404040
 tex 0 8
@@ -1079,7 +1079,7 @@ lightradiusfade 2000
 lightcolor 2 1.5 0.2
 gravity -0.1
 effect uzi_muzzleflash
-count 20
+count 10
 type spark
 tex 40 40
 color 0xFFFDD9 0xFFFDD9
@@ -1110,7 +1110,7 @@ effect machinegun_impact
 type alphastatic
 notunderwater
 tex 0 8
-count 6
+count 3
 size 10 20
 sizeincrease 15
 alpha 300 550 456
@@ -1124,7 +1124,7 @@ effect machinegun_impact
 type alphastatic
 notunderwater
 tex 36 36
-count 1
+count 0.5
 size 10 11
 sizeincrease 74
 alpha 200 350 500
@@ -1139,7 +1139,7 @@ effect machinegun_impact
 type alphastatic
 notunderwater
 tex 66 68
-count 2
+count 1
 size 1 5
 airfriction 1
 gravity 1.4
@@ -1152,7 +1152,7 @@ rotate 0 360 -500 500
 // sparks
 effect machinegun_impact
 notunderwater
-count 2
+count 1
 type spark
 tex 40 40
 color 0xFDFFD9 0xFDFFD9
@@ -1173,7 +1173,7 @@ velocitymultiplier 0.2
 // used in qcsrc/server/w_grenadelauncher.qc:  pointparticles(particleeffectnum("grenadelauncher_muzzleflash"), w_shotorg, w_shotdir * 1000, 1)
 // used in qcsrc/server/w_porto.qc:    //pointparticles(particleeffectnum("grenadelauncher_muzzleflash"), w_shotorg, w_shotdir * 1000, 1)
 effect grenadelauncher_muzzleflash
-count 3
+count 1.5
 type smoke
 color 0x202020 0x404040
 tex 0 8
@@ -1187,7 +1187,7 @@ lightradius 200
 lightradiusfade 2000
 lightcolor 2 1.5 0.2
 effect grenadelauncher_muzzleflash
-count 32
+count 16
 type spark
 tex 48 55
 color 0xffdb96 0xff5400
@@ -1206,7 +1206,7 @@ stretchfactor 2.5
 // used in qcsrc/client/projectile.qc:                 trailparticles(self, particleeffectnum("TR_GRENADE"), from, to)
 // used in qcsrc/client/projectile.qc:                 trailparticles(self, particleeffectnum("TR_GRENADE"), from, to)
 effect TR_GRENADE
-trailspacing 2
+trailspacing 4
 type smoke
 color 0x101010 0x000000
 tex 0 8
@@ -1221,7 +1221,7 @@ velocitymultiplier -0.02
 // fire
 effect TR_GRENADE
 notunderwater
-trailspacing 2
+trailspacing 4
 type static
 color 0xffdf72 0x811200
 tex 48 55
@@ -1234,7 +1234,7 @@ velocitymultiplier -1.0
 // bubbles
 effect TR_GRENADE
 underwater
-trailspacing 8
+trailspacing 16
 type bubble
 tex 62 62
 color 0x404040 0x808080
@@ -1254,7 +1254,7 @@ velocityjitter 16 16 16
 // used in qcsrc/client/projectile.qc:                 trailparticles(self, particleeffectnum("TR_KNIGHTSPIKE"), from, to)
 effect TR_KNIGHTSPIKE // used for MF_TRACER2
 notunderwater
-trailspacing 3
+trailspacing 6
 type smoke
 color 0x303030 0x000000
 tex 0 8
@@ -1273,12 +1273,12 @@ color 0x666666 0x000000
 tex 62 62
 size 1 1
 sizeincrease -0.1
-trailspacing 1
+trailspacing 2
 alpha 256 256 720
 // bubbles
 effect TR_KNIGHTSPIKE // used for MF_TRACER2
 underwater
-trailspacing 16
+trailspacing 32
 type bubble
 tex 62 62
 color 0x404040 0x808080
@@ -1306,7 +1306,7 @@ lightcolor 8 4 1
 // fire effect which expands then slows
 effect grenade_explode
 notunderwater
-count 80
+count 40
 type static
 tex 48 55
 color 0xe03f00 0x5e0000
@@ -1321,7 +1321,7 @@ velocityjitter 256 256 256
 // fire effect which make brigt dot inside
 effect grenade_explode
 notunderwater
-count 30
+count 15
 type static
 tex 48 55
 color 0xe03f00 0xffdf92
@@ -1338,7 +1338,7 @@ effect grenade_explode
 type alphastatic
 notunderwater
 tex 0 8
-count 20
+count 10
 size 20 40
 sizeincrease 34
 alpha 300 550 556
@@ -1349,7 +1349,7 @@ bounce 6
 // underwater bubbles
 effect grenade_explode
 underwater
-count 64
+count 32
 type bubble
 tex 62 62
 color 0x404040 0x808080
@@ -1374,7 +1374,7 @@ velocitymultiplier 0.3
 // bouncing sparks
 effect grenade_explode
 notunderwater
-count 32
+count 16
 type spark
 tex 40 40
 color 0xffa35b 0xfff2be
@@ -1390,7 +1390,7 @@ velocityjitter 424 424 624
 // derbis
 effect grenade_explode
 notunderwater
-count 24
+count 12
 type alphastatic
 tex 66 68
 color 0x6a3d25 0xcac5b4
@@ -1422,7 +1422,7 @@ lightradiusfade 2000
 lightcolor 1.5 3 6
 
 effect electro_muzzleflash
-count 14
+count 7
 type spark
 tex 8 15
 color 0xD9FDFF 0xD9FDFF
@@ -1435,7 +1435,7 @@ airfriction 2
 stretchfactor 1.5
 
 effect electro_muzzleflash
-count 10
+count 5
 type spark
 tex 41 41
 color 0xD9FDFF 0xD9FDFF
@@ -1453,7 +1453,7 @@ stretchfactor 0.1
 // glowing vapor trail
 // used in qcsrc/client/projectile.qc:                 trailparticles(self, particleeffectnum("TR_NEXUIZPLASMA"), from, to)
 effect TR_NEXUIZPLASMA
-trailspacing 1
+trailspacing 2
 type static
 color 0x283880 0x283880
 size 3 3
@@ -1466,8 +1466,8 @@ lightcolor 1.5 3 6
 velocitymultiplier -0.1
 // bright sparks
 effect TR_NEXUIZPLASMA
-trailspacing 6
-count 3
+trailspacing 12
+count 1.5
 type snow
 tex 42 42
 color 0x629dff 0x0018ff
@@ -1514,7 +1514,7 @@ size 12 32
 alpha 256 256 512
 // cloud of bouncing sparks
 effect electro_impact
-count 60
+count 30
 type smoke
 tex 42 42
 color 0x629dff 0x0018ff
@@ -1529,7 +1529,7 @@ velocityjitter 512 512 512
 rotate -180 180 -9999 9999
 // inner cloud of smoke
 effect electro_impact
-count 60
+count 30
 type smoke
 color 0x629dff 0x0018ff
 tex 0 8
@@ -1562,7 +1562,7 @@ size 32 32
 alpha 256 256 512
 // cloud of bouncing sparks
 effect electro_ballexplode
-count 128
+count 64
 type spark
 tex 41 41
 color 0xFDFFD9 0xFDFFD9
@@ -1575,7 +1575,7 @@ originjitter 1 1 1
 velocityjitter 512 512 512
 // inner cloud of smoke
 effect electro_ballexplode
-count 16
+count 8
 type smoke
 color 0x202020 0x404040
 tex 0 8
@@ -1608,7 +1608,7 @@ size 48 48
 alpha 128 128 64
 // large sparks
 effect electro_combo
-count 10
+count 5
 type static
 color 0x2030FF 0x80C0FF
 size 32 32
@@ -1621,7 +1621,7 @@ liquidfriction 16
 //velocityoffset 0 0 120
 velocityjitter 512 512 512
 effect electro_combo
-count 64
+count 32
 type spark
 tex 41 41
 color 0xa9cacf 0x0054ff
@@ -1636,7 +1636,7 @@ originjitter 1 1 1
 velocityjitter 312 312 312
 // inner cloud of smoke
 effect electro_combo
-count 0.25
+count 0.125
 type smoke
 color 0x202020 0x404040
 tex 0 8
@@ -1660,7 +1660,7 @@ velocitymultiplier 0.3
 // used in qcsrc/server/w_crylink.qc:  pointparticles(particleeffectnum("crylink_muzzleflash"), w_shotorg, w_shotdir * 1000, shots)
 // used in qcsrc/server/w_crylink.qc:  pointparticles(particleeffectnum("crylink_muzzleflash"), w_shotorg, w_shotdir * 1000, shots)
 effect crylink_muzzleflash
-count 1
+count 0.5
 type smoke
 color 0xdd9cff 0xff0090
 tex 65 65
@@ -1671,7 +1671,7 @@ lightradius 200
 lightradiusfade 2000
 lightcolor 1.6 0.2 2
 effect crylink_muzzleflash
-count 10
+count 5
 type spark
 tex 35 36
 color 0xA080C0 0xA080C0
@@ -1707,7 +1707,7 @@ size 8 8
 alpha 256 256 512
 // purple sparks
 effect crylink_impact
-count 20
+count 10
 type spark
 tex 41 41
 color 0xA040C0 0xA040C0
@@ -1717,7 +1717,7 @@ alpha 256 256 1024
 velocityjitter 256 256 256
 // purple splash
 effect crylink_impact
-count 3
+count 1.5
 type static
 color 0xE070FF 0xE070FF
 size 8 8
@@ -1725,7 +1725,7 @@ alpha 256 256 512
 velocityjitter 8 8 8
 // purple splash
 effect crylink_impact
-count 3
+count 1.5
 type static
 color 0xE070FF 0xE070FF
 size 8 8
@@ -1737,7 +1737,7 @@ velocityjitter 32 32 32
 // used in qcsrc/server/w_minstanex.qc:        pointparticles(particleeffectnum("nex_muzzleflash"), w_shotorg, w_shotdir * 1000, 1)
 // used in qcsrc/client/particles.qc:  pointparticles(particleeffectnum("nex_muzzleflash"), shotorg, normalize(endpos - shotorg) * 1000, 1)
 effect nex_muzzleflash
-count 24
+count 12
 type spark
 color 0x202020 0x0072ff
 tex 48 55
@@ -1753,7 +1753,7 @@ lightradius 200
 lightradiusfade 200
 lightcolor 2 2.5 3
 effect nex_muzzleflash
-count 100
+count 50
 type spark
 tex 41 41
 color 0xD9FDFF 0xD9FDFF
@@ -1777,7 +1777,7 @@ airfriction 9
 // nex beam: ring smoke
 // used in qcsrc/client/particles.qc:          trailparticles(world, particleeffectnum("nex_beam"), shotorg, endpos)
 effect nex_beam
-trailspacing 32
+trailspacing 64
 color 0x1680A0 0x1680A0
 size 4 4
 tex 32 32
@@ -1787,7 +1787,7 @@ sizeincrease 2
 type static
 // nex beam: drifting smoke
 effect nex_beam
-trailspacing 6
+trailspacing 12
 color 0x5080A0 0x5080A0
 size 1 1
 tex 0 8
@@ -1798,7 +1798,7 @@ velocityjitter 64 64 64
 type static
 // nex beam: bright core
 effect nex_beam
-trailspacing 6
+trailspacing 12
 color 0x80CDFF 0x80CDFF
 size 4 4
 //tex 48 55
@@ -1806,7 +1806,7 @@ alpha 256 256 1280
 type static
 //sparks
 effect nex_beam
-trailspacing 8
+trailspacing 16
 color 0x1680A0 0x1680A0
 size 1 1
 tex 63 63
@@ -1832,7 +1832,7 @@ lightcolor 4 6 8
 rotate -180 180 0 0
 // rotating something
 effect nex_impact
-count 10
+count 5
 type smoke
 tex 46 46
 color 0x1680A0 0x1680A0
@@ -1880,7 +1880,7 @@ alpha 256 256 256
 //velocityjitter 384 384 384
 // small sparks which glow brightly but live briefly
 effect nex_impact
-count 128
+count 64
 type spark
 tex 41 41
 color 0xD9FDFF 0xD9FDFF
@@ -1893,7 +1893,7 @@ velocitymultiplier 0.5
 airfriction 9
 // small sparks that live longer
 effect nex_impact
-count 32
+count 16
 type spark
 tex 41 41
 color 0xD9FDFF 0xD9FDFF
@@ -1910,7 +1910,7 @@ gravity 1
 // used in qcsrc/server/w_hagar.qc:    pointparticles(particleeffectnum("hagar_muzzleflash"), w_shotorg, w_shotdir * 1000, 1)
 // used in qcsrc/server/w_seeker.qc:   pointparticles(particleeffectnum("hagar_muzzleflash"), w_shotorg, w_shotdir * 1000, 1)
 effect hagar_muzzleflash
-count 4
+count 2
 type smoke
 color 0x202020 0x404040
 tex 0 8
@@ -1923,7 +1923,7 @@ lightradius 200
 lightradiusfade 2000
 lightcolor 2 1.5 0.2
 effect hagar_muzzleflash
-count 30
+count 15
 type spark
 tex 48 55
 color 0xff8400 0xff4200
@@ -1940,7 +1940,7 @@ rotate -180 180 -400 400
 
 // used in qcsrc/server/w_hagar.qc:            pointparticles(particleeffectnum("hagar_bounce"), self.origin, self.velocity, 1)
 effect hagar_bounce
-count 4
+count 2
 type smoke
 color 0x202020 0x404040
 tex 0 8
@@ -1953,7 +1953,7 @@ lightradius 60
 lightradiusfade 300
 lightcolor 2 1.5 0.2
 effect hagar_bounce
-count 30
+count 15
 type spark
 tex 40 40
 color 0xFFFDD9 0xFFFDD9
@@ -1985,7 +1985,7 @@ lightcolor 8 4 1
 // fire effect which make bright dot inside
 effect hagar_explode
 notunderwater
-count 10
+count 5
 type smoke
 tex 48 55
 color 0xffe955 0xff5a00
@@ -2000,7 +2000,7 @@ velocityjitter 156 156 156
 // fire effect which expands then slows
 effect hagar_explode
 notunderwater
-count 24
+count 12
 type static
 tex 48 55
 color 0x8f0d00 0xff5a00
@@ -2018,7 +2018,7 @@ effect hagar_explode
 type alphastatic
 notunderwater
 tex 0 8
-count 20
+count 10
 size 20 40
 sizeincrease 20
 alpha 200 500 600
@@ -2030,7 +2030,7 @@ bounce 2
 // underwater bubbles
 effect hagar_explode
 underwater
-count 32
+count 16
 type bubble
 tex 62 62
 color 0x404040 0x808080
@@ -2044,7 +2044,7 @@ velocityjitter 96 96 96
 // bouncing sparks
 effect hagar_explode
 notunderwater
-count 8
+count 4
 type spark
 tex 40 40
 color 0xffa35b 0xfff2be
@@ -2062,7 +2062,7 @@ velocityjitter 224 224 224
 
 // used in qcsrc/server/w_rocketlauncher.qc:   pointparticles(particleeffectnum("rocketlauncher_muzzleflash"), w_shotorg, w_shotdir * 1000, 1)
 effect rocketlauncher_muzzleflash
-count 20
+count 10
 type smoke
 color 0x202020 0x404040
 tex 0 8
@@ -2077,7 +2077,7 @@ velocitymultiplier -0.13
 //lightradiusfade 2000
 //lightcolor 2 1.5 0.2
 effect rocketlauncher_muzzleflash
-count 12
+count 6
 type smoke
 tex 35 36
 color 0xFFFDD9 0xFFFDD9
@@ -2099,7 +2099,7 @@ rotate -180 180 -30 30
 // used in qcsrc/client/projectile.qc:                 trailparticles(self, particleeffectnum("TR_ROCKET"), from, to)
 // used in qcsrc/client/projectile.qc:                 trailparticles(self, particleeffectnum("TR_ROCKET"), from, to)
 effect TR_ROCKET
-trailspacing 5
+trailspacing 10
 type smoke
 notunderwater
 color 0x000000 0x666666
@@ -2118,7 +2118,7 @@ rotate -180 180 -30 30
 //gravity -0.11
 // fire
 effect TR_ROCKET
-trailspacing 2
+trailspacing 4
 type static
 color 0xffdf72 0x811200
 tex 48 55
@@ -2132,7 +2132,7 @@ velocitymultiplier -1.5
 effect TR_ROCKET
 type bubble
 underwater
-trailspacing 8
+trailspacing 16
 tex 62 62
 size 1 2
 alpha 256 256 256
@@ -2145,7 +2145,7 @@ rotate 0 0 0 0
 // sparks
 effect TR_ROCKET
 notunderwater
-trailspacing 10
+trailspacing 20
 type spark
 tex 40 40
 color 0xFFFDD9 0xFFFDD9
@@ -2174,7 +2174,7 @@ lightcolor 8 4 1
 // fire effect
 effect rocket_explode
 notunderwater
-count 64
+count 32
 type static
 tex 48 55
 color 0x8f0d00 0xff5a00
@@ -2189,7 +2189,7 @@ velocityjitter 512 512 512
 // fire effect 2
 effect rocket_explode
 notunderwater
-count 28
+count 14
 type smoke
 tex 48 55
 color 0xea691b 0xeed05a
@@ -2206,7 +2206,7 @@ effect rocket_explode
 type alphastatic
 notunderwater
 tex 0 8
-count 64
+count 32
 size 20 40
 sizeincrease 44
 alpha 200 450 456
@@ -2217,7 +2217,7 @@ bounce 2
 // underwater bubbles
 effect rocket_explode
 underwater
-count 64
+count 32
 type bubble
 tex 62 62
 color 0x404040 0x808080
@@ -2241,7 +2241,7 @@ velocitymultiplier 0.3
 // bouncing sparks
 effect rocket_explode
 notunderwater
-count 32
+count 16
 type spark
 tex 40 40
 color 0xffa35b 0xfff2be
@@ -2257,7 +2257,7 @@ velocityjitter 424 424 624
 // derbis
 effect rocket_explode
 notunderwater
-count 24
+count 12
 type alphastatic
 tex 66 68
 color 0x6a3d25 0xcac5b4
@@ -2297,7 +2297,7 @@ sizeincrease 1
 
 // used nowhere in code
 effect nex242_misc_laser_beam_end
-count 1
+count 0.5
 type spark
 color 0x8f4333 0xfff31b
 size 0.4 0.4
@@ -2321,7 +2321,7 @@ sizeincrease 0.1
 
 // used nowhere in code
 effect nex242_misc_laser_beam_fast_end
-count 1
+count 0.5
 type spark
 color 0x8f4333 0xfff31b
 size 0.4 0.4
@@ -2344,7 +2344,7 @@ sizeincrease 1
 
 // used nowhere in code
 effect nex242_misc_laser_green_beam_end
-count 1
+count 0.5
 type spark
 color 0x8f4333 0xfff31b
 size 0.4 0.4
@@ -2366,7 +2366,7 @@ sizeincrease 1
 
 // used nowhere in code
 effect nex242_misc_laser_blue_beam_end
-count 1
+count 0.5
 type spark
 color 0x8f4333 0xfff31b
 size 0.4 0.4
@@ -2388,7 +2388,7 @@ sizeincrease 1
 
 // used nowhere in code
 effect nex242_misc_laser_yellow_beam_end
-count 1
+count 0.5
 type spark
 color 0x8f4333 0xfff31b
 size 0.4 0.4
@@ -2410,7 +2410,7 @@ sizeincrease 1
 
 // used nowhere in code
 effect nex242_misc_laser_cyan_beam_end
-count 1
+count 0.5
 type spark
 color 0x8f4333 0xfff31b
 size 0.4 0.4
@@ -2432,7 +2432,7 @@ sizeincrease 1
 
 // used nowhere in code
 effect nex242_misc_laser_magenta_beam_end
-count 1
+count 0.5
 type spark
 color 0x8f4333 0xfff31b
 size 0.4 0.4
@@ -2454,7 +2454,7 @@ sizeincrease 1
 
 // used nowhere in code
 effect nex242_misc_laser_white_beam_end
-count 1
+count 0.5
 type spark
 color 0x8f4333 0xfff31b
 size 0.4 0.4
@@ -2476,7 +2476,7 @@ sizeincrease 1
 
 // used nowhere in code
 effect nex242_misc_laser_black_beam_end
-count 1
+count 0.5
 type spark
 color 0x8f4333 0xfff31b
 size 0.4 0.4
@@ -2498,7 +2498,7 @@ sizeincrease 1
 
 // used nowhere in code
 effect nex242_misc_laser_orange_beam_end
-count 1
+count 0.5
 type spark
 color 0x8f4333 0xfff31b
 size 0.4 0.4
@@ -2534,7 +2534,7 @@ size 24 24
 alpha 256 256 512
 // purple sparks
 effect crylink_impactbig
-count 80
+count 40
 type spark
 tex 41 41
 color 0xA040C0 0xA040C0
@@ -2544,7 +2544,7 @@ alpha 256 256 1024
 velocityjitter 512 512 512
 // purple splash
 effect crylink_impactbig
-count 3
+count 1.5
 type static
 color 0xE070FF 0xE070FF
 size 16 16
@@ -2552,7 +2552,7 @@ alpha 256 256 512
 velocityjitter 32 32 32
 // purple splash
 effect crylink_impactbig
-count 6
+count 3
 type static
 color 0xE070FF 0xE070FF
 size 16 16
@@ -2565,7 +2565,7 @@ velocityjitter 256 256 256
 // used in qcsrc/client/gibs.qc:                       pointparticles(particleeffectnum("damage_hit"), org, vel, amount * 16)
 effect damage_hit
 tex 48 55
-count 1
+count 0.5
 type alphastatic
 color 0x00FFFF 0xFF00FF
 size 16 16
@@ -2578,7 +2578,7 @@ liquidfriction 10
 velocityjitter 256 256 256
 effect damage_hit
 tex 48 55
-count 1
+count 0.5
 type alphastatic
 color 0xFF00FF 0xFFFF00
 size 16 16
@@ -2591,7 +2591,7 @@ liquidfriction 10
 velocityjitter 256 256 256
 effect damage_hit
 tex 48 55
-count 1
+count 0.5
 type alphastatic
 color 0xFFFF00 0x00FFFF
 size 16 16
@@ -2610,7 +2610,7 @@ velocityjitter 256 256 256
 // used in qcsrc/client/gibs.qc:                       pointparticles(particleeffectnum("damage_dissolve"), org, vel, amount)
 effect damage_dissolve
 tex 48 55
-count 30
+count 15
 type alphastatic
 color 0x00FFFF 0xFF00FF
 size 32 32
@@ -2623,7 +2623,7 @@ liquidfriction 6
 velocityjitter 512 512 512
 effect damage_dissolve
 tex 48 55
-count 30
+count 15
 type alphastatic
 color 0xFF00FF 0xFFFF00
 size 32 32
@@ -2636,7 +2636,7 @@ liquidfriction 6
 velocityjitter 512 512 512
 effect damage_dissolve
 tex 48 55
-count 30
+count 15
 type alphastatic
 color 0xFFFF00 0x00FFFF
 size 32 32
@@ -2661,7 +2661,7 @@ alpha 256 256 0
 originjitter 6 6 6
 // dust/smoke drifting away from the impact
 effect laser_deadly
-count 0.05 // 50 per second
+count 0.025
 type smoke
 tex 48 55
 color 0xFFFFFF 0xFFFFFF
@@ -2676,7 +2676,7 @@ velocitymultiplier 20
 // sparks
 effect laser_deadly
 notunderwater
-count 0.05 // 50 per second
+count 0.025
 type spark
 tex 40 40
 color 0xFDFFD9 0xFDFFD9
@@ -2695,7 +2695,7 @@ velocitymultiplier 100
 // used nowhere in code
 effect torch_small
 //notunderwater
-count 16
+count 8
 type smoke
 tex 48 55
 size 1 11
@@ -2709,7 +2709,7 @@ velocityjitter 1 1 50
 // smoke
 effect torch_small
 type alphastatic
-count 8
+count 4
 tex 0 8
 size 5 10
 sizeincrease 5
@@ -2723,7 +2723,7 @@ velocityjitter 11 11 50
 //fountain01
 // used nowhere in code
 effect fountain01
-count 32
+count 16
 tex 0 8
 size 10 15
 alpha 0 100 100
@@ -2740,7 +2740,7 @@ velocitymultiplier 2
 // decal
 // used in qcsrc/client/damage.qc:                             pointparticles(particleeffectnum("hookbomb_explode"), org2, '0 0 0', 1)
 effect hookbomb_explode
-count 50
+count 25
 type static
 tex 38 38
 color 0x807aff 0x4463d5
@@ -2773,7 +2773,7 @@ alpha 256 256 0
 originjitter 6 6 6
 // some sparks
 effect hookbomb_explode
-count 60
+count 30
 type spark
 tex 38 38
 color 0x807aff 0x4463d5
@@ -2791,7 +2791,7 @@ airfriction 2
 // smoke
 effect EF_MGTURRETTRAIL
 notunderwater
-trailspacing 5
+trailspacing 10
 type smoke
 color 0xd0d0a0 0xffffff
 tex 0 8
@@ -2802,7 +2802,7 @@ gravity -0.01
 // bubbles
 effect EF_MGTURRETTRAIL
 underwater
-trailspacing 16
+trailspacing 32
 type bubble
 tex 62 62
 color 0x404040 0x808080
@@ -2818,7 +2818,7 @@ velocityjitter 16 16 16
 // used nowhere in code
 effect fire_big
 //notunderwater
-count 52
+count 26
 type smoke
 tex 48 55
 size 11 31
@@ -2832,7 +2832,7 @@ velocityjitter 22 22 50
 // smoke
 effect fire_big
 type alphastatic
-count 22
+count 11
 tex 0 8
 size 22 33
 sizeincrease 11
@@ -2848,7 +2848,7 @@ bounce 2
 // used nowhere in code
 effect red_flare
 type alphastatic
-count 21
+count 10.5
 tex 0 8
 size 1 11
 sizeincrease 11
@@ -2864,7 +2864,7 @@ bounce 1
 // used nowhere in code
 effect blue_flare
 type alphastatic
-count 21
+count 10.5
 tex 0 8
 size 1 11
 sizeincrease 11
@@ -2880,7 +2880,7 @@ bounce 1
 // used in qcsrc/server/ctf.qc:                pointparticles(particleeffectnum("smoke_ring"), 0.5 * (self.absmin + self.absmax), '0 0 0', 1);
 effect smoke_ring
 type smoke
-count 90
+count 45
 tex 0 8
 size 1 11
 sizeincrease 21
@@ -2898,7 +2898,7 @@ notunderwater
 // used nowhere in code
 effect smoke_large
 type alphastatic
-count 50
+count 25
 tex 0 8
 size 11 21
 sizeincrease 21
@@ -2914,7 +2914,7 @@ notunderwater
 //sparks
 // used nowhere in code
 effect sparks
-count 30
+count 15
 type spark
 tex 40 40
 color 0xFFFDD9 0xFFFDD9
@@ -2930,7 +2930,7 @@ airfriction 3
 //sparks
 // used nowhere in code
 effect electricity_sparks
-count 70
+count 35
 type spark
 tex 40 40
 color 0x807aff 0x4463d5
@@ -2947,7 +2947,7 @@ airfriction 3
 // used nowhere in code
 effect steam
 type smoke
-count 2
+count 1
 tex 0 8
 size 1 3
 sizeincrease 7
@@ -2964,7 +2964,7 @@ notunderwater
 // smoke emiter
 // used nowhere in code
 effect smoking
-count 20
+count 10
 type alphastatic
 tex 0 8
 color 0x292929 0x000000
@@ -2981,7 +2981,7 @@ airfriction -1
 //golden dust (create it once per second to cover large area in small yellow particles)
 // used nowhere in code
 effect goldendust
-count 50
+count 25
 type snow
 tex 38 38
 color 0xff9600 0xffefb8
@@ -2997,7 +2997,7 @@ velocityjitter 0.1 0.1 0.1
 
 // used nowhere in code
 effect healing_fx
-count 50
+count 25
 type spark
 tex 40 40
 color 0xff0000 0xff0000
@@ -3013,7 +3013,7 @@ airfriction -0.5
 
 // used nowhere in code
 effect armorrepair_fx
-count 50
+count 25
 type spark
 tex 40 40
 color 0x00ff00 0x00ff00
@@ -3029,7 +3029,7 @@ airfriction -0.5
 
 // used nowhere in code
 effect ammoregen_fx
-count 50
+count 25
 type spark
 tex 40 40
 color 0x0000ff 0x0000ff
@@ -3046,7 +3046,7 @@ airfriction -0.5
 // red-yellow flame like fx
 // used nowhere in code
 effect rage
-count 5
+count 2.5
 type smoke
 tex 35 36
 color 0xff0000 0xff7800
@@ -3061,7 +3061,7 @@ airfriction 2
 // pieces of glass or ice falling on the floor
 // used nowhere in code
 effect iceorglass
-count 30
+count 15
 type alphastatic
 tex 44 44
 color 0xffffff 0xb2d3e6
@@ -3078,7 +3078,7 @@ airfriction 3
 // cover small area in poison gas, spawn it once per second
 // used nowhere in code
 effect poisonfield
-count 30
+count 15
 type smoke
 tex 0 8
 color 0x00ff00 0x7db843
@@ -3094,7 +3094,7 @@ airfriction 1
 // cover small area in icy mist, spawn it once per second
 // used nowhere in code
 effect icefield
-count 20
+count 10
 type smoke
 tex 0 8
 color 0x008aff 0x75e7ff
@@ -3107,7 +3107,7 @@ originjitter 333 333 0
 velocityjitter 5 5 30
 airfriction 1
 effect icefield
-count 10
+count 5
 type smoke
 tex 48 55
 size 1 1
@@ -3122,7 +3122,7 @@ originjitter 333 333 0
 // flames that go up
 // used nowhere in code
 effect firefield
-count 200
+count 100
 type smoke
 tex 48 55
 color 0x8f0d00 0xff5a00
@@ -3136,7 +3136,7 @@ velocityjitter 5 5 30
 airfriction 1
 //flames that stay on the ground
 effect firefield
-count 100
+count 50
 type smoke
 tex 48 55
 color 0x8f0d00 0xff5a00
@@ -3146,7 +3146,7 @@ alpha 50 256 200
 originjitter 180 180 0
 // smoke
 effect firefield
-count 40
+count 20
 type alphastatic
 tex 0 8
 size 1 1
@@ -3160,7 +3160,7 @@ originjitter 180 180 0
 //fast fire
 // used nowhere in code
 effect flamethrower
-count 6
+count 3
 type smoke
 tex 48 55
 color 0x8f0d00 0xff5a00
@@ -3174,7 +3174,7 @@ velocitymultiplier 30
 airfriction 1.2
 //slowfire
 effect flamethrower
-count 5
+count 2.5
 type smoke
 tex 48 55
 color 0x8f0d00 0xff5a00
@@ -3188,7 +3188,7 @@ velocitymultiplier 20
 airfriction 1.2
 // very slow and small fire
 effect flamethrower
-count 3
+count 1.5
 type smoke
 tex 48 55
 color 0x8f0d00 0xff5a00
@@ -3202,7 +3202,7 @@ velocitymultiplier 10
 airfriction 0.3
 //decreasing fire
 effect flamethrower
-count 4
+count 2
 type smoke
 tex 48 55
 color 0x8f0d00 0xff5a00
@@ -3216,7 +3216,7 @@ velocitymultiplier 15
 airfriction 0.3
 //smoke
 effect flamethrower
-count 1
+count 0.5
 type alphastatic
 tex 0 8
 size 5 15
@@ -3234,7 +3234,7 @@ airfriction 1
 // used in qcsrc/client/projectile.qc:                 trailparticles(self, particleeffectnum("TR_WIZSPIKE"), from, to)
 // used in qcsrc/client/projectile.qc:                 trailparticles(self, particleeffectnum("TR_WIZSPIKE"), from, to)
 effect TR_WIZSPIKE
-trailspacing 2
+trailspacing 4
 type static
 color 0x404040 0x404040
 size 3 3
@@ -3247,8 +3247,8 @@ lightcolor 1.5 3 6
 velocitymultiplier -0.1
 // bright sparks
 effect TR_WIZSPIKE
-trailspacing 6
-count 3
+trailspacing 12
+count 1.5
 type snow
 tex 42 42
 color 0x404040 0x404040
@@ -3266,7 +3266,7 @@ velocityjitter 50 50 50
 // used in qcsrc/client/projectile.qc:                 trailparticles(self, particleeffectnum("TR_VORESPIKE"), from, to)
 // used in qcsrc/client/projectile.qc:                 trailparticles(self, particleeffectnum("TR_VORESPIKE"), from, to)
 effect TR_VORESPIKE
-trailspacing 2
+trailspacing 4
 type static
 color 0x804000 0x804000
 size 3 3
@@ -3279,8 +3279,8 @@ lightcolor 1.5 3 6
 velocitymultiplier -0.1
 // bright sparks
 effect TR_VORESPIKE
-trailspacing 6
-count 3
+trailspacing 12
+count 1.5
 type snow
 tex 42 42
 color 0xff8000 0xff8000
@@ -3307,7 +3307,7 @@ lightcolor 8 4 1
 // fire effect which make bright dot inside
 effect flac_explode
 notunderwater
-count 6
+count 3
 type smoke
 tex 48 55
 color 0xffe955 0xff5a00
@@ -3322,7 +3322,7 @@ velocityjitter 156 156 156
 // fire effect which expands then slows
 effect flac_explode
 notunderwater
-count 12
+count 6
 type static
 tex 48 55
 color 0x8f0d00 0xff5a00
@@ -3340,7 +3340,7 @@ effect flac_explode
 type alphastatic
 notunderwater
 tex 0 8
-count 10
+count 5
 size 10 20
 sizeincrease 20
 alpha 500 600 556
@@ -3352,7 +3352,7 @@ bounce 2
 // underwater bubbles
 effect flac_explode
 underwater
-count 16
+count 8
 type bubble
 tex 62 62
 color 0x404040 0x808080
@@ -3366,7 +3366,7 @@ velocityjitter 96 96 96
 // bouncing sparks
 effect flac_explode
 notunderwater
-count 8
+count 4
 type spark
 color 0x903010 0xFFD030
 size 2 2
@@ -3384,7 +3384,7 @@ velocityjitter 256 256 256
 // used in qcsrc/server/w_common.qc:                           zcurveparticles_from_tracetoss(particleeffectnum("tr_bullet"), self.origin, trace_endpos, self.velocity)
 // used in qcsrc/client/projectile.qc:                 trailparticles(self, particleeffectnum("tr_bullet"), from, to)
 effect tr_bullet
-trailspacing 128
+trailspacing 256
 type spark
 color 0x800000 0xFF8020
 alpha 256 256 2560
@@ -3395,7 +3395,7 @@ velocitymultiplier 0.7
 // smoke emitter for small pipes
 // used nowhere in code
 effect smoking_smallemitter
-count 20
+count 10
 type alphastatic
 tex 0 8
 color 0x292929 0x000000
@@ -3414,7 +3414,7 @@ airfriction -1
 // used in qcsrc/client/projectile.qc:                 trailparticles(self, particleeffectnum("TR_CRYLINKPLASMA"), from, to)
 // used in qcsrc/client/projectile.qc:                 trailparticles(self, particleeffectnum("TR_CRYLINKPLASMA"), from, to)
 effect TR_CRYLINKPLASMA
-trailspacing 64
+trailspacing 128
 type static
 color 0x5522aa 0x6622ff
 size 2 2
@@ -3428,7 +3428,7 @@ velocityjitter 8 8 8
 velocitymultiplier -0.01
 // crylink main trail
 effect TR_CRYLINKPLASMA
-trailspacing 8
+trailspacing 16
 type static
 color 0x5522aa 0x6622ff
 size 3 3
@@ -3439,7 +3439,7 @@ velocityjitter 2 2 2
 velocitymultiplier 0.01
 
 effect cherryblossom
-count 3
+count 1.5
 type static
 color 0xb123ff 0xb183ff
 size 1.5 2
@@ -3455,7 +3455,7 @@ tex 40 40
 //lighttime 0
 
 effect alien_blood
-count 0.333
+count 0.167
 type blood
 tex 24 32
 size 3 8
@@ -3479,7 +3479,7 @@ color 0x000000 0x204010
 originjitter 11 11 11
 
 effect robot_blood
-count 0.333
+count 0.167
 type blood
 tex 24 32
 size 3 8
@@ -3504,7 +3504,7 @@ originjitter 11 11 11
 
 
 effect alien_TR_BLOOD
-trailspacing 16
+trailspacing 32
 type blood
 color 0xC080B0 0xC080B0
 tex 24 32
@@ -3519,7 +3519,7 @@ staincolor 0x808080 0x808080
 staintex 16 24
 
 effect robot_TR_BLOOD
-trailspacing 16
+trailspacing 32
 type blood
 color 0xC0D890 0xC0D890
 tex 24 32
@@ -3534,7 +3534,7 @@ staincolor 0x808080 0x808080
 staintex 16 24
 
 effect alien_TR_SLIGHTBLOOD
-trailspacing 32
+trailspacing 64
 type blood
 color 0xC080B0 0xC080B0
 tex 24 32
@@ -3549,7 +3549,7 @@ staincolor 0x808080 0x808080
 staintex 16 24
 
 effect robot_TR_SLIGHTBLOOD
-trailspacing 32
+trailspacing 64
 type blood
 color 0xC0D890 0xC0D890
 tex 24 32
@@ -3573,7 +3573,7 @@ size 8 16
 alpha 128 64 64
 // cloud of particles which expand rapidly and then slow to form a ball
 effect item_pickup
-count 64
+count 32
 type spark
 tex 41 41
 color 0x63F2EA 0xB0C5C4
@@ -3633,7 +3633,7 @@ staintex 16 24
 // used in qsrc/server/ctf.qc:         pointparticles(particleeffectnum("red_ground_quake"), self.origin, '0 0 0', 1);
 effect red_ground_quake
 type smoke
-count 180
+count 90
 tex 0 8
 size 20 50
 sizeincrease 100
@@ -3648,7 +3648,7 @@ bounce 1.1
 notunderwater
 effect red_ground_quake
 type smoke
-count 80
+count 40
 tex 0 8
 size 10 30
 sizeincrease 60
@@ -3663,7 +3663,7 @@ bounce 1.2
 notunderwater
 effect red_ground_quake
 //notunderwater
-count 32
+count 16
 type smoke
 tex 48 55
 size 4 20
@@ -3678,7 +3678,7 @@ velocityjitter 22 22 50
 // smoke
 effect red_ground_quake
 type alphastatic
-count 22
+count 11
 tex 0 8
 size 22 33
 sizeincrease 11
@@ -3695,7 +3695,7 @@ bounce 2
 // used in qsrc/server/ctf.qc:         pointparticles(particleeffectnum("blue_ground_quake"), self.origin, '0 0 0', 1);
 effect blue_ground_quake
 type smoke
-count 180
+count 90
 tex 0 8
 size 20 50
 sizeincrease 100
@@ -3710,7 +3710,7 @@ bounce 1.1
 notunderwater
 effect blue_ground_quake
 type smoke
-count 80
+count 40
 tex 0 8
 size 10 30
 sizeincrease 60
@@ -3725,7 +3725,7 @@ bounce 1.2
 notunderwater
 effect blue_ground_quake
 //notunderwater
-count 32
+count 16
 type smoke
 tex 48 55
 size 4 20
@@ -3740,7 +3740,7 @@ velocityjitter 22 22 50
 // smoke
 effect blue_ground_quake
 type alphastatic
-count 22
+count 11
 tex 0 8
 size 22 33
 sizeincrease 11
@@ -3759,7 +3759,7 @@ bounce 2
 // used in qcsrc/client/gibs.qc:                       pointparticles(particleeffectnum("damage_hit"), org, vel, amount * 16)
 effect morphed_damage_hit
 tex 43 43
-count 1
+count 0.5
 type spark
 color 0xffffff 0x9271fb
 size 14 24
@@ -3772,7 +3772,7 @@ velocityjitter 356 356 456
 
 effect morphed_damage_hit
 tex 0 8
-count 1
+count 0.5
 type smoke
 color 0xffffff 0x9271fb
 size 24 24
@@ -3790,7 +3790,7 @@ originjitter 10 10 10
 // used in qcsrc/client/gibs.qc:                       pointparticles(particleeffectnum("damage_dissolve"), org, vel, amount)
 effect morphed_damage_dissolve
 tex 43 43
-count 20
+count 10
 type smoke
 color 0xffffff 0x9271fb
 size 40 40
@@ -3804,7 +3804,7 @@ rotate -180 180 -399 -99
 
 effect morphed_damage_dissolve
 tex 43 43
-count 5
+count 2.5
 type smoke
 color 0x7bdbff 0xbed2ff
 size 40 40
@@ -3818,7 +3818,7 @@ rotate -180 180 0 0
 
 effect morphed_damage_dissolve
 tex 65 65
-count 10
+count 5
 type smoke
 color 0xffffff 0x9271fb
 size 44 44
@@ -3830,7 +3830,7 @@ originjitter 22 22 76
 
 effect morphed_damage_dissolve
 tex 46 46
-count 30
+count 15
 type smoke
 color 0xffffff 0x9271fb
 size 32 32
@@ -3853,7 +3853,7 @@ size 4 4
 alpha 128 128 256
 // experimental
 effect TE_TEI_G3RED
-trailspacing 4
+trailspacing 8
 type static
 color 0x200000 0x400000
 size 0.3 0.3
@@ -3874,7 +3874,7 @@ size 8 8
 alpha 128 128 256
 // experimental
 effect TE_TEI_G3RED_HIT
-trailspacing 10
+trailspacing 20
 type static
 color 0xFFFFFF 0xFF0011
 size 2 2
@@ -3886,7 +3886,7 @@ velocityjitter 2 2 2
 type smoke
 // rings
 effect TE_TEI_G3RED_HIT
-trailspacing 20
+trailspacing 40
 type static
 color 0xFF0000 0xFF0011
 size 10 10 
@@ -3905,7 +3905,7 @@ size 4 4
 alpha 128 128 256
 // experimental
 effect TE_TEI_G3BLUE
-trailspacing 4
+trailspacing 8
 type static
 color 0x000020 0x000040
 size 0.3 0.3
@@ -3926,7 +3926,7 @@ size 8 8
 alpha 128 128 256
 // experimental
 effect TE_TEI_G3BLUE_HIT
-trailspacing 10
+trailspacing 20
 type static
 color 0xFFFFFF 0x100FF
 size 2 2
@@ -3938,7 +3938,7 @@ velocityjitter 2 2 2
 type smoke
 // rings
 effect TE_TEI_G3BLUE_HIT
-trailspacing 20
+trailspacing 40
 type static
 color 0x0000FF 0x1100FF
 size 10 10 
@@ -3957,7 +3957,7 @@ color 0xffff00 0xffff11
 size 4 4
 alpha 128 128 256
 effect TE_TEI_G3YELLOW
-trailspacing 4
+trailspacing 8
 type static
 color 0x202000 0x404000
 size 0.3 0.3
@@ -3976,7 +3976,7 @@ color 0xffff00 0xffff11
 size 8 8
 alpha 128 128 256
 effect TE_TEI_G3YELLOW_HIT
-trailspacing 10
+trailspacing 20
 type static
 color 0xFFFFFF 0xffff10
 size 2 2
@@ -3987,7 +3987,7 @@ velocityjitter 2 2 2
 type smoke
 // rings
 effect TE_TEI_G3YELLOW_HIT
-trailspacing 20
+trailspacing 40
 type static
 color 0xffff00 0xffff11
 size 10 10 
@@ -4008,7 +4008,7 @@ size 4 4
 alpha 128 128 256
 // experimental
 effect TE_TEI_G3PINK
-trailspacing 4
+trailspacing 8
 type static
 color 0x200020 0x400040
 size 0.3 0.3
@@ -4029,7 +4029,7 @@ size 8 8
 alpha 128 128 256
 // experimental
 effect TE_TEI_G3PINK_HIT
-trailspacing 10
+trailspacing 20
 type static
 color 0xFFFFFF 0xFF10FF
 size 2 2
@@ -4041,7 +4041,7 @@ velocityjitter 2 2 2
 type smoke
 // rings
 effect TE_TEI_G3PINK_HIT
-trailspacing 20
+trailspacing 40
 type static
 color 0xFF00FF 0xFF11FF
 size 10 10 
@@ -4060,7 +4060,7 @@ type smoke
 // core decal
 effect particlegibs_damage_hit
 type blood
-count 1
+count 0.5
 tex 0 8
 size 5 10
 color 0xA8FFFF 0xA8FFFFF
@@ -4075,7 +4075,7 @@ staintex 16 24
 // front blood
 effect particlegibs_damage_hit
 type blood
-count 0.2
+count 0.1
 tex 24 32
 size 10 20
 color 0xA8FFFF 0xA8FFFFF
@@ -4092,7 +4092,7 @@ staintex 16 24
 // back blood
 effect particlegibs_damage_hit
 type blood
-count 0.2
+count 0.1
 tex 24 32
 size 5 15
 color 0xA8FFFF 0xA8FFFFF
@@ -4116,7 +4116,7 @@ staintex 16 24
 // small core blood no decals
 effect particlegibs_damage_dissolve
 type blood
-count 64
+count 32
 tex 0 8
 size 15 20
 color 0x00ffff 0x82ffff
@@ -4131,7 +4131,7 @@ staintex 16 24
 // core decal
 effect particlegibs_damage_dissolve
 type blood
-count 24
+count 12
 tex 0 8
 size 20 40
 color 0xA8FFFF 0xA8FFFFF
@@ -4147,7 +4147,7 @@ staintex 16 24
 // front blood
 effect particlegibs_damage_dissolve
 type blood
-count 64
+count 32
 tex 24 32
 size 10 20
 color 0xA8FFFF 0xA8FFFFF
@@ -4165,7 +4165,7 @@ staintex 16 24
 // back blood
 effect particlegibs_damage_dissolve
 type blood
-count 64
+count 32
 tex 24 32
 size 5 15
 color 0xA8FFFF 0xA8FFFFF
@@ -4183,7 +4183,7 @@ staintex 16 24
 // small bits
 effect particlegibs_damage_dissolve
 type blood
-count 150
+count 75
 tex 24 32
 size 1 1
 color 0xA8FFFF 0xA8FFFFF
@@ -4200,7 +4200,7 @@ staintex 16 24
 // fire effect which expands then slows
 effect onslaught_generator_gib_explode
 notunderwater
-count 34
+count 17
 type static
 tex 48 55
 color 0x8f0d00 0xff5a00
@@ -4218,7 +4218,7 @@ effect onslaught_generator_gib_explode
 type alphastatic
 notunderwater
 tex 0 8
-count 12
+count 6
 size 1 10
 sizeincrease 90
 gravity -0.3
@@ -4231,7 +4231,7 @@ bounce 2
 // underwater bubbles
 effect onslaught_generator_gib_explode
 underwater
-count 32
+count 16
 type bubble
 tex 62 62
 color 0x404040 0x808080
@@ -4246,7 +4246,7 @@ velocityjitter 96 96 96
 // fire effect which expands then slows
 effect onslaught_generator_gib_flame
 notunderwater
-count 30
+count 15
 type static
 tex 48 55
 color 0x8f0d00 0xff5a00
@@ -4263,7 +4263,7 @@ effect onslaught_generator_gib_flame
 type alphastatic
 notunderwater
 tex 0 8
-count 2
+count 1
 size 10 20
 sizeincrease 30
 gravity -0.8
@@ -4276,7 +4276,7 @@ bounce 2
 // underwater bubbles
 effect onslaught_generator_gib_flame
 underwater
-count 32
+count 16
 type bubble
 tex 62 62
 color 0x404040 0x808080
@@ -4291,8 +4291,8 @@ velocityjitter 96 96 96
 
 // used nowhere in code
 effect firemine
-trailspacing 1
-count 1
+trailspacing 2
+count 0.5
 type smoke
 tex 48 55
 color 0x8f0d00 0xff5a00
@@ -4305,8 +4305,8 @@ velocityjitter 10 10 2
 airfriction 1.2
 //slowfire
 effect firemine
-trailspacing 1
-count 1
+trailspacing 2
+count 0.5
 type smoke
 tex 48 55
 color 0x8f0d00 0xff5a00
@@ -4319,8 +4319,8 @@ velocityjitter 10 10 10
 airfriction 1.2
 // very slow and small fire
 effect firemine
-trailspacing 2
-count 1
+trailspacing 4
+count 0.5
 type smoke
 tex 48 55
 color 0x8f0d00 0xff5a00
@@ -4333,8 +4333,8 @@ velocityjitter 8 8 8
 airfriction 0.3
 //decreasing fire
 effect firemine
-trailspacing 2
-count 1
+trailspacing 4
+count 0.5
 type smoke
 tex 48 55
 color 0x8f0d00 0xff5a00
@@ -4347,8 +4347,8 @@ velocityjitter 3 3 3
 airfriction 0.3
 //smoke
 effect firemine
-trailspacing 4
-count 1
+trailspacing 8
+count 0.5
 type alphastatic
 tex 0 8
 size 1 4
@@ -4361,8 +4361,8 @@ velocityoffset 0 0 3
 airfriction 1
 //fastfire
 effect firemine
-trailspacing 0.5
-count 1
+trailspacing 1
+count 0.5
 type smoke
 tex 48 55
 color 0x8f0d00 0xff5a00
@@ -4375,15 +4375,15 @@ velocityjitter 0 0 0
 airfriction 1.2
 // light only
 effect firemine
-trailspacing 8
+trailspacing 16
 lightradius 50
 lightradiusfade 50000
 lightcolor 2.7 2.7 0.6
 
 // used nowhere in code
 effect fireball
-trailspacing 1
-count 1
+trailspacing 2
+count 0.5
 type smoke
 tex 48 55
 color 0x8f0d00 0xff5a00
@@ -4396,8 +4396,8 @@ velocityjitter 40 40 11
 airfriction 1.2
 //slowfire
 effect fireball
-trailspacing 1
-count 1
+trailspacing 2
+count 0.5
 type smoke
 tex 48 55
 color 0x8f0d00 0xff5a00
@@ -4410,8 +4410,8 @@ velocityjitter 40 40 40
 airfriction 1.2
 // very slow and small fire
 effect fireball
-trailspacing 2
-count 1
+trailspacing 4
+count 0.5
 type smoke
 tex 48 55
 color 0x8f0d00 0xff5a00
@@ -4424,8 +4424,8 @@ velocityjitter 30 30 30
 airfriction 0.3
 //decreasing fire
 effect fireball
-trailspacing 2
-count 1
+trailspacing 4
+count 0.5
 type smoke
 tex 48 55
 color 0x8f0d00 0xff5a00
@@ -4438,8 +4438,8 @@ velocityjitter 10 10 10
 airfriction 0.3
 //smoke
 effect fireball
-trailspacing 4
-count 1
+trailspacing 8
+count 0.5
 type alphastatic
 tex 0 8
 size 5 15
@@ -4452,8 +4452,8 @@ velocityoffset 0 0 10
 airfriction 1
 //fastfire
 effect fireball
-trailspacing 0.5
-count 1
+trailspacing 1
+count 0.5
 type smoke
 tex 48 55
 color 0x8f0d00 0xff5a00
@@ -4466,14 +4466,14 @@ velocityjitter 0 0 0
 airfriction 1.2
 // light only
 effect fireball
-trailspacing 8
+trailspacing 16
 lightradius 300
 lightradiusfade 3000
 lightcolor 2.7 2.7 0.6
 
 // fireball
 effect fireball_laser
-count 20
+count 10
 type spark
 color 0x800000 0xFF8020
 alpha 192 256 2560
@@ -4506,7 +4506,7 @@ alpha 192 192 64
 // fire effect
 effect fireball_explode
 notunderwater
-count 256
+count 128
 type static
 tex 48 55
 color 0x902010 0xFFD080
@@ -4520,7 +4520,7 @@ velocityjitter 512 512 512
 // underwater bubbles
 effect fireball_explode
 underwater
-count 64
+count 32
 type bubble
 tex 62 62
 color 0x404040 0x808080
@@ -4534,7 +4534,7 @@ velocityjitter 144 144 144
 // bouncing sparks
 effect fireball_explode
 notunderwater
-count 128
+count 64
 type spark
 color 0x903010 0xFFD030
 size 2 2
@@ -4547,7 +4547,7 @@ velocityoffset 0 0 80
 velocityjitter 384 384 384
 
 effect fireball_muzzleflash
-count 4
+count 2
 type smoke
 color 0x202020 0x404040
 tex 0 8
@@ -4560,7 +4560,7 @@ lightradius 200
 lightradiusfade 2000
 lightcolor 2 1.5 0.2
 effect fireball_muzzleflash
-count 30
+count 15
 type spark
 tex 40 40
 color 0xFFFDD9 0xFFFDD9
@@ -4572,7 +4572,7 @@ velocitymultiplier 0.5
 airfriction 12
 
 effect fireball_preattack_muzzleflash
-count 4
+count 2
 type smoke
 color 0x202020 0x404040
 tex 0 8
@@ -4585,7 +4585,7 @@ lightradius 200
 lightradiusfade 2000
 lightcolor 2 1.5 0.2
 effect fireball_preattack_muzzleflash
-count 30
+count 15
 type spark
 tex 40 40
 color 0xFFFDD9 0xFFFDD9
@@ -4597,7 +4597,7 @@ velocitymultiplier 0.5
 airfriction 12
 
 effect fireball_bfgdamage
-count 4
+count 2
 type smoke
 color 0x202020 0x404040
 tex 0 8
@@ -4610,7 +4610,7 @@ lightradius 200
 lightradiusfade 2000
 lightcolor 2 1.5 0.2
 effect fireball_bfgdamage
-count 30
+count 15
 type spark
 tex 40 40
 color 0xFFFDD9 0xFFFDD9
@@ -4626,7 +4626,7 @@ airfriction 12
 // used nowhere in code
 effect EF_FLAME
 //notunderwater
-count 200
+count 100
 type smoke
 tex 48 55
 size 5 21
@@ -4641,7 +4641,7 @@ velocityjitter 22 22 50
 // smoke
 effect EF_FLAME
 type alphastatic
-count 100
+count 50
 tex 0 8
 size 11 15
 sizeincrease 6
@@ -4653,7 +4653,7 @@ originjitter 12 12 34
 velocityjitter 11 11 50
 bounce 2
 effect EF_FLAME
-count 1
+count 0.5
 lightradius 200
 lightradiusfade 10000
 lightcolor 0.9 0.9 0.2
@@ -4662,7 +4662,7 @@ lightcolor 0.9 0.9 0.2
 // used in qcsrc/server/w_common.qc:                           zcurveparticles_from_tracetoss(particleeffectnum("tr_bullet"), self.origin, trace_endpos, self.velocity)
 // used in qcsrc/client/projectile.qc:                 trailparticles(self, particleeffectnum("tr_bullet"), from, to)
 effect tr_rifle
-trailspacing 128
+trailspacing 256
 type spark
 color 0x800000 0xFF8020
 alpha 256 256 2560
@@ -4672,7 +4672,7 @@ velocitymultiplier 0.7
 effect tr_rifle
 notunderwater
 tex 0 8
-trailspacing 8
+trailspacing 16
 type static
 color 0x202020 0x404040
 size 2 2
@@ -4683,7 +4683,7 @@ velocityjitter 4 4 4
 type smoke
 effect tr_rifle
 underwater
-trailspacing 32
+trailspacing 64
 type bubble
 tex 62 62
 color 0x404040 0x808080
@@ -4700,7 +4700,7 @@ velocityjitter 16 16 16
 // underwater bubbles
 effect rocket_guide
 underwater
-count 4
+count 2
 type bubble
 tex 62 62
 color 0x404040 0x808080
@@ -4715,7 +4715,7 @@ velocitymultiplier -0.1
 // bouncing sparks
 effect rocket_guide
 notunderwater
-count 16
+count 8
 type spark
 color 0x903010 0xFFD030
 size 0.3 0.7
@@ -4744,7 +4744,7 @@ alpha 100 100 500
 // used in qcsrc/server/w_laser.qc
 effect laser_gauntlet
 tex 43 43
-count 3
+count 1.5
 type spark
 color 0xff00ff 0xff0000
 size 4 8
@@ -4760,7 +4760,7 @@ velocityjitter 50 50 50
 //fast fire
 // used nowhere in code, meant for maps
 effect torchflame
-count 6
+count 3
 type smoke
 tex 48 55
 color 0x8f0d00 0xff5a00
@@ -4773,7 +4773,7 @@ velocitymultiplier 30
 airfriction 1.2
 //slowfire
 effect torchflame
-count 5
+count 2.5
 type smoke
 tex 48 55
 color 0x8f0d00 0xff5a00
@@ -4786,7 +4786,7 @@ velocitymultiplier 20
 airfriction 1.2
 // very slow and small fire
 effect torchflame
-count 3
+count 1.5
 type smoke
 tex 48 55
 color 0x8f0d00 0xff5a00
@@ -4799,7 +4799,7 @@ velocitymultiplier 10
 airfriction 0.3
 //decreasing fire
 effect torchflame
-count 4
+count 2
 type smoke
 tex 48 55
 color 0x8f0d00 0xff5a00
@@ -4812,7 +4812,7 @@ velocitymultiplier 15
 airfriction 0.3
 //smoke
 effect torchflame
-count 1
+count 0.5
 type alphastatic
 tex 0 8
 size 5 15
@@ -4828,7 +4828,7 @@ airfriction 1
 //happy death fx for cl_gentle
 effect happy_damage_dissolve
 tex 69 69
-count 30
+count 15
 type alphastatic
 color 0x00FFFF 0xFF00FF
 size 32 32
@@ -4841,7 +4841,7 @@ liquidfriction 6
 velocityjitter 312 312 312
 effect happy_damage_dissolve
 tex 69 69
-count 30
+count 15
 type alphastatic
 color 0xFF00FF 0xFFFF00
 size 32 32
@@ -4854,7 +4854,7 @@ liquidfriction 6
 velocityjitter 312 312 312
 effect happy_damage_dissolve
 tex 69 69
-count 30
+count 15
 type alphastatic
 color 0xFFFF00 0x00FFFF
 size 32 32
@@ -4870,7 +4870,7 @@ velocityjitter 312 312 312
 //happy damage fx for cl_gentle
 effect happy_damage_hit
 tex 69 69
-count 0.2
+count 0.1
 type alphastatic
 color 0x00FFFF 0xFF00FF
 size 26 26
@@ -4883,7 +4883,7 @@ liquidfriction 10
 velocityjitter 156 156 156
 effect happy_damage_hit
 tex 69 69
-count 0.2
+count 0.1
 type alphastatic
 color 0xFF00FF 0xFFFF00
 size 26 26
@@ -4896,7 +4896,7 @@ liquidfriction 10
 velocityjitter 156 156 156
 effect happy_damage_hit
 tex 69 69
-count 0.2
+count 0.1
 type alphastatic
 color 0xFFFF00 0x00FFFF
 size 26 26
index ea74e60..676e958 100644 (file)
@@ -1,6 +1,6 @@
 cl_decals 1
 cl_decals_time 4
-cl_particles_quality 0.75
+cl_particles_quality 1
 gl_flashblend 0
 gl_picmip 1
 gl_texture_anisotropy 16
index c75e383..82da917 100644 (file)
@@ -1,6 +1,6 @@
 cl_decals 1
 cl_decals_time 2
-cl_particles_quality 0.2
+cl_particles_quality 0.4
 gl_flashblend 1
 gl_picmip 2
 gl_texture_anisotropy 1
index 6b8b28a..9b2a8b3 100644 (file)
@@ -1,6 +1,6 @@
 cl_decals 1
 cl_decals_time 2
-cl_particles_quality 0.5
+cl_particles_quality 1
 gl_flashblend 0
 gl_picmip 1
 gl_texture_anisotropy 1
index fe6ebda..7c49b57 100644 (file)
@@ -1,6 +1,6 @@
 cl_decals 1
 cl_decals_time 2
-cl_particles_quality 0.5
+cl_particles_quality 1
 gl_flashblend 0
 gl_picmip 1
 gl_texture_anisotropy 1
index b583213..8bae286 100644 (file)
@@ -1,6 +1,6 @@
 cl_decals 0
 cl_decals_time 2
-cl_particles_quality 0.2
+cl_particles_quality 0.4
 gl_flashblend 1
 gl_picmip 1337
 gl_texture_anisotropy 1
diff --git a/gfx/brand.tga b/gfx/brand.tga
deleted file mode 100644 (file)
index d2e88c2..0000000
Binary files a/gfx/brand.tga and /dev/null differ
index 1a84a05..a5d3548 100644 (file)
Binary files a/gfx/loading.tga and b/gfx/loading.tga differ
index 0ffc127..5442fa5 100644 (file)
Binary files a/models/items/a_bullets.md3 and b/models/items/a_bullets.md3 differ
index 0ffc127..5442fa5 100644 (file)
Binary files a/models/items/a_bullets.mdl and b/models/items/a_bullets.mdl differ
index 6452635..61384b5 100644 (file)
Binary files a/models/items/a_rockets.md3 and b/models/items/a_rockets.md3 differ
index c7a1ec7..c1858ef 100644 (file)
Binary files a/models/misc/chatbubble.spr_0.tga and b/models/misc/chatbubble.spr_0.tga differ
diff --git a/models/player/erebus.iqm b/models/player/erebus.iqm
new file mode 100644 (file)
index 0000000..28a3c07
Binary files /dev/null and b/models/player/erebus.iqm differ
diff --git a/models/player/erebus.iqm.framegroups b/models/player/erebus.iqm.framegroups
new file mode 100644 (file)
index 0000000..71128c6
--- /dev/null
@@ -0,0 +1,23 @@
+0 36 15.000000 0 // dieone
+36 20 15.000000 0 // dietwo
+56 15 15.000000 1 // draw
+71 20 15.000000 1 // duck
+91 21 30.000000 1 // duckwalk
+112 16 15.000000 0 // duckjump
+128 15 5.000000 1 // duckidle
+143 41 5.000000 1 // idle
+184 21 25.000000 0 // jump
+205 15 15.000000 0 // painone
+220 17 15.000000 0 // paintwo
+237 3 15.000000 1 // shoot
+240 21 15.000000 1 // taunt
+261 21 35.000000 1 // run
+282 21 35.000000 1 // runbackwards
+303 21 35.000000 1 // strafeleft
+324 21 35.000000 1 // straferight
+345 2 15.000000 0 // deadone
+347 2 15.000000 0 // deadtwo
+349 21 35.000000 1 // forwardright
+370 21 35.000000 1 // forwardleft
+391 21 35.000000 1 // backright
+412 21 30.000000 1 // backleft
diff --git a/models/player/erebus.iqm_0.tga b/models/player/erebus.iqm_0.tga
new file mode 100644 (file)
index 0000000..ee7fb58
Binary files /dev/null and b/models/player/erebus.iqm_0.tga differ
diff --git a/models/player/erebus.iqm_0.txt b/models/player/erebus.iqm_0.txt
new file mode 100644 (file)
index 0000000..ac81e7e
--- /dev/null
@@ -0,0 +1,7 @@
+name Erebus
+species human
+sex Male
+weight 105
+age 26
+
+Heavyweight Xonotic Solider
diff --git a/models/player/gak.iqm b/models/player/gak.iqm
new file mode 100644 (file)
index 0000000..22a1975
Binary files /dev/null and b/models/player/gak.iqm differ
diff --git a/models/player/gak.iqm.framegroups b/models/player/gak.iqm.framegroups
new file mode 100644 (file)
index 0000000..71128c6
--- /dev/null
@@ -0,0 +1,23 @@
+0 36 15.000000 0 // dieone
+36 20 15.000000 0 // dietwo
+56 15 15.000000 1 // draw
+71 20 15.000000 1 // duck
+91 21 30.000000 1 // duckwalk
+112 16 15.000000 0 // duckjump
+128 15 5.000000 1 // duckidle
+143 41 5.000000 1 // idle
+184 21 25.000000 0 // jump
+205 15 15.000000 0 // painone
+220 17 15.000000 0 // paintwo
+237 3 15.000000 1 // shoot
+240 21 15.000000 1 // taunt
+261 21 35.000000 1 // run
+282 21 35.000000 1 // runbackwards
+303 21 35.000000 1 // strafeleft
+324 21 35.000000 1 // straferight
+345 2 15.000000 0 // deadone
+347 2 15.000000 0 // deadtwo
+349 21 35.000000 1 // forwardright
+370 21 35.000000 1 // forwardleft
+391 21 35.000000 1 // backright
+412 21 30.000000 1 // backleft
diff --git a/models/player/gak.iqm_0.tga b/models/player/gak.iqm_0.tga
new file mode 100644 (file)
index 0000000..093b7f0
Binary files /dev/null and b/models/player/gak.iqm_0.tga differ
diff --git a/models/player/gak.iqm_0.txt b/models/player/gak.iqm_0.txt
new file mode 100644 (file)
index 0000000..8aa7419
--- /dev/null
@@ -0,0 +1,7 @@
+name Gak
+species alien
+sex Male
+weight 85
+age 16
+
+Lightweight Xonotic Solider
diff --git a/models/player/gakarmored.iqm b/models/player/gakarmored.iqm
new file mode 100644 (file)
index 0000000..9df6bdb
Binary files /dev/null and b/models/player/gakarmored.iqm differ
diff --git a/models/player/gakarmored.iqm.framegroups b/models/player/gakarmored.iqm.framegroups
new file mode 100644 (file)
index 0000000..71128c6
--- /dev/null
@@ -0,0 +1,23 @@
+0 36 15.000000 0 // dieone
+36 20 15.000000 0 // dietwo
+56 15 15.000000 1 // draw
+71 20 15.000000 1 // duck
+91 21 30.000000 1 // duckwalk
+112 16 15.000000 0 // duckjump
+128 15 5.000000 1 // duckidle
+143 41 5.000000 1 // idle
+184 21 25.000000 0 // jump
+205 15 15.000000 0 // painone
+220 17 15.000000 0 // paintwo
+237 3 15.000000 1 // shoot
+240 21 15.000000 1 // taunt
+261 21 35.000000 1 // run
+282 21 35.000000 1 // runbackwards
+303 21 35.000000 1 // strafeleft
+324 21 35.000000 1 // straferight
+345 2 15.000000 0 // deadone
+347 2 15.000000 0 // deadtwo
+349 21 35.000000 1 // forwardright
+370 21 35.000000 1 // forwardleft
+391 21 35.000000 1 // backright
+412 21 30.000000 1 // backleft
diff --git a/models/player/gakarmored.iqm_0.tga b/models/player/gakarmored.iqm_0.tga
new file mode 100644 (file)
index 0000000..b4a58ea
Binary files /dev/null and b/models/player/gakarmored.iqm_0.tga differ
diff --git a/models/player/gakarmored.iqm_0.txt b/models/player/gakarmored.iqm_0.txt
new file mode 100644 (file)
index 0000000..06ff355
--- /dev/null
@@ -0,0 +1,7 @@
+name Gak Armored
+species alien
+sex Male
+weight 90
+age 20
+
+Heavyweight Xonotic Solider
diff --git a/models/player/gakmasked.iqm b/models/player/gakmasked.iqm
new file mode 100644 (file)
index 0000000..275953d
Binary files /dev/null and b/models/player/gakmasked.iqm differ
diff --git a/models/player/gakmasked.iqm.framegroups b/models/player/gakmasked.iqm.framegroups
new file mode 100644 (file)
index 0000000..71128c6
--- /dev/null
@@ -0,0 +1,23 @@
+0 36 15.000000 0 // dieone
+36 20 15.000000 0 // dietwo
+56 15 15.000000 1 // draw
+71 20 15.000000 1 // duck
+91 21 30.000000 1 // duckwalk
+112 16 15.000000 0 // duckjump
+128 15 5.000000 1 // duckidle
+143 41 5.000000 1 // idle
+184 21 25.000000 0 // jump
+205 15 15.000000 0 // painone
+220 17 15.000000 0 // paintwo
+237 3 15.000000 1 // shoot
+240 21 15.000000 1 // taunt
+261 21 35.000000 1 // run
+282 21 35.000000 1 // runbackwards
+303 21 35.000000 1 // strafeleft
+324 21 35.000000 1 // straferight
+345 2 15.000000 0 // deadone
+347 2 15.000000 0 // deadtwo
+349 21 35.000000 1 // forwardright
+370 21 35.000000 1 // forwardleft
+391 21 35.000000 1 // backright
+412 21 30.000000 1 // backleft
diff --git a/models/player/gakmasked.iqm_0.tga b/models/player/gakmasked.iqm_0.tga
new file mode 100644 (file)
index 0000000..40d2958
Binary files /dev/null and b/models/player/gakmasked.iqm_0.tga differ
diff --git a/models/player/gakmasked.iqm_0.txt b/models/player/gakmasked.iqm_0.txt
new file mode 100644 (file)
index 0000000..aff4f75
--- /dev/null
@@ -0,0 +1,7 @@
+name Gak Masked
+species alien
+sex Male
+weight 87
+age 18
+
+Mediumweight Xonotic Solider
diff --git a/models/player/ignis.iqm b/models/player/ignis.iqm
new file mode 100644 (file)
index 0000000..cccb00c
Binary files /dev/null and b/models/player/ignis.iqm differ
diff --git a/models/player/ignis.iqm.framegroups b/models/player/ignis.iqm.framegroups
new file mode 100644 (file)
index 0000000..71128c6
--- /dev/null
@@ -0,0 +1,23 @@
+0 36 15.000000 0 // dieone
+36 20 15.000000 0 // dietwo
+56 15 15.000000 1 // draw
+71 20 15.000000 1 // duck
+91 21 30.000000 1 // duckwalk
+112 16 15.000000 0 // duckjump
+128 15 5.000000 1 // duckidle
+143 41 5.000000 1 // idle
+184 21 25.000000 0 // jump
+205 15 15.000000 0 // painone
+220 17 15.000000 0 // paintwo
+237 3 15.000000 1 // shoot
+240 21 15.000000 1 // taunt
+261 21 35.000000 1 // run
+282 21 35.000000 1 // runbackwards
+303 21 35.000000 1 // strafeleft
+324 21 35.000000 1 // straferight
+345 2 15.000000 0 // deadone
+347 2 15.000000 0 // deadtwo
+349 21 35.000000 1 // forwardright
+370 21 35.000000 1 // forwardleft
+391 21 35.000000 1 // backright
+412 21 30.000000 1 // backleft
diff --git a/models/player/ignis.iqm_0.tga b/models/player/ignis.iqm_0.tga
new file mode 100644 (file)
index 0000000..9905384
Binary files /dev/null and b/models/player/ignis.iqm_0.tga differ
diff --git a/models/player/ignis.iqm_0.txt b/models/player/ignis.iqm_0.txt
new file mode 100644 (file)
index 0000000..7597e41
--- /dev/null
@@ -0,0 +1,7 @@
+name Ignis
+species human
+sex Male
+weight 88
+age 31
+
+Heavyweight Xonotic Solider
diff --git a/models/player/ignishalfmasked.iqm b/models/player/ignishalfmasked.iqm
new file mode 100644 (file)
index 0000000..5a823e2
Binary files /dev/null and b/models/player/ignishalfmasked.iqm differ
diff --git a/models/player/ignishalfmasked.iqm.framegroups b/models/player/ignishalfmasked.iqm.framegroups
new file mode 100644 (file)
index 0000000..71128c6
--- /dev/null
@@ -0,0 +1,23 @@
+0 36 15.000000 0 // dieone
+36 20 15.000000 0 // dietwo
+56 15 15.000000 1 // draw
+71 20 15.000000 1 // duck
+91 21 30.000000 1 // duckwalk
+112 16 15.000000 0 // duckjump
+128 15 5.000000 1 // duckidle
+143 41 5.000000 1 // idle
+184 21 25.000000 0 // jump
+205 15 15.000000 0 // painone
+220 17 15.000000 0 // paintwo
+237 3 15.000000 1 // shoot
+240 21 15.000000 1 // taunt
+261 21 35.000000 1 // run
+282 21 35.000000 1 // runbackwards
+303 21 35.000000 1 // strafeleft
+324 21 35.000000 1 // straferight
+345 2 15.000000 0 // deadone
+347 2 15.000000 0 // deadtwo
+349 21 35.000000 1 // forwardright
+370 21 35.000000 1 // forwardleft
+391 21 35.000000 1 // backright
+412 21 30.000000 1 // backleft
diff --git a/models/player/ignishalfmasked.iqm_0.tga b/models/player/ignishalfmasked.iqm_0.tga
new file mode 100644 (file)
index 0000000..c0beb4a
Binary files /dev/null and b/models/player/ignishalfmasked.iqm_0.tga differ
diff --git a/models/player/ignishalfmasked.iqm_0.txt b/models/player/ignishalfmasked.iqm_0.txt
new file mode 100644 (file)
index 0000000..39c488c
--- /dev/null
@@ -0,0 +1,7 @@
+name Ignis - HalfMasked
+species human
+sex Male
+weight 90
+age 31
+
+Heavyweight Xonotic Solider
diff --git a/models/player/ignishalfmasked_lod1.iqm b/models/player/ignishalfmasked_lod1.iqm
new file mode 100644 (file)
index 0000000..c3b3fa4
Binary files /dev/null and b/models/player/ignishalfmasked_lod1.iqm differ
diff --git a/models/player/ignishalfmasked_lod2.iqm b/models/player/ignishalfmasked_lod2.iqm
new file mode 100644 (file)
index 0000000..3ad25e9
Binary files /dev/null and b/models/player/ignishalfmasked_lod2.iqm differ
diff --git a/models/player/ignismasked.iqm b/models/player/ignismasked.iqm
new file mode 100644 (file)
index 0000000..a165aac
Binary files /dev/null and b/models/player/ignismasked.iqm differ
diff --git a/models/player/ignismasked.iqm.framegroups b/models/player/ignismasked.iqm.framegroups
new file mode 100644 (file)
index 0000000..71128c6
--- /dev/null
@@ -0,0 +1,23 @@
+0 36 15.000000 0 // dieone
+36 20 15.000000 0 // dietwo
+56 15 15.000000 1 // draw
+71 20 15.000000 1 // duck
+91 21 30.000000 1 // duckwalk
+112 16 15.000000 0 // duckjump
+128 15 5.000000 1 // duckidle
+143 41 5.000000 1 // idle
+184 21 25.000000 0 // jump
+205 15 15.000000 0 // painone
+220 17 15.000000 0 // paintwo
+237 3 15.000000 1 // shoot
+240 21 15.000000 1 // taunt
+261 21 35.000000 1 // run
+282 21 35.000000 1 // runbackwards
+303 21 35.000000 1 // strafeleft
+324 21 35.000000 1 // straferight
+345 2 15.000000 0 // deadone
+347 2 15.000000 0 // deadtwo
+349 21 35.000000 1 // forwardright
+370 21 35.000000 1 // forwardleft
+391 21 35.000000 1 // backright
+412 21 30.000000 1 // backleft
diff --git a/models/player/ignismasked.iqm_0.tga b/models/player/ignismasked.iqm_0.tga
new file mode 100644 (file)
index 0000000..572e8fe
Binary files /dev/null and b/models/player/ignismasked.iqm_0.tga differ
diff --git a/models/player/ignismasked.iqm_0.txt b/models/player/ignismasked.iqm_0.txt
new file mode 100644 (file)
index 0000000..d1c8566
--- /dev/null
@@ -0,0 +1,7 @@
+name Ignis - Masked
+species human
+sex Male
+weight 92
+age 31
+
+Heavyweight Xonotic Solider
diff --git a/models/player/nyx.iqm b/models/player/nyx.iqm
new file mode 100644 (file)
index 0000000..85cc5f5
Binary files /dev/null and b/models/player/nyx.iqm differ
diff --git a/models/player/nyx.iqm.framegroups b/models/player/nyx.iqm.framegroups
new file mode 100644 (file)
index 0000000..71128c6
--- /dev/null
@@ -0,0 +1,23 @@
+0 36 15.000000 0 // dieone
+36 20 15.000000 0 // dietwo
+56 15 15.000000 1 // draw
+71 20 15.000000 1 // duck
+91 21 30.000000 1 // duckwalk
+112 16 15.000000 0 // duckjump
+128 15 5.000000 1 // duckidle
+143 41 5.000000 1 // idle
+184 21 25.000000 0 // jump
+205 15 15.000000 0 // painone
+220 17 15.000000 0 // paintwo
+237 3 15.000000 1 // shoot
+240 21 15.000000 1 // taunt
+261 21 35.000000 1 // run
+282 21 35.000000 1 // runbackwards
+303 21 35.000000 1 // strafeleft
+324 21 35.000000 1 // straferight
+345 2 15.000000 0 // deadone
+347 2 15.000000 0 // deadtwo
+349 21 35.000000 1 // forwardright
+370 21 35.000000 1 // forwardleft
+391 21 35.000000 1 // backright
+412 21 30.000000 1 // backleft
diff --git a/models/player/nyx.iqm_0.tga b/models/player/nyx.iqm_0.tga
new file mode 100644 (file)
index 0000000..da5cbe7
Binary files /dev/null and b/models/player/nyx.iqm_0.tga differ
diff --git a/models/player/nyx.iqm_0.txt b/models/player/nyx.iqm_0.txt
new file mode 100644 (file)
index 0000000..9fb92f6
--- /dev/null
@@ -0,0 +1,7 @@
+name Nyx
+species human
+sex Female
+weight 100
+age 24
+
+Heavyweight Xonotic Soldier
index f1a0bd4..c4e7539 100644 (file)
Binary files a/models/player/pyria.iqm and b/models/player/pyria.iqm differ
index dc908e6..b98d0b9 100644 (file)
@@ -1,23 +1,23 @@
-0 36 15.000000 0 // dieone
-36 20 15.000000 0 // dietwo
-56 15 15.000000 1 // draw
-71 10 15.000000 1 // duck
-81 11 15.000000 1 // duckwalk
-92 16 15.000000 0 // duckjump
-108 15 5.000000 1 // duckidle
-123 16 5.000000 1 // idle
-139 16 15.000000 0 // jump
-155 15 15.000000 0 // painone
-170 17 15.000000 0 // paintwo
-187 3 15.000000 1 // shoot
-190 35 15.000000 1 // taunt
-225 12 20.000000 1 // run
-237 12 20.000000 1 // runbackwards
-249 12 20.000000 1 // strafeleft
-261 12 20.000000 1 // straferight
-273 2 15.000000 0 // deadone
-275 2 15.000000 0 // deadtwo
-277 12 20.000000 1 // forwardright
-289 12 20.000000 1 // forwardleft
-301 12 20.000000 1 // backright
-313 12 20.000000 1 // backleft
+0 36 20.000000 0 // dieone
+36 27 20.000000 0 // dietwo
+63 15 15.000000 1 // draw
+78 20 15.000000 1 // duck
+98 11 15.000000 1 // duckwalk
+109 16 15.000000 0 // duckjump
+125 15 5.000000 1 // duckidle
+140 16 5.000000 1 // idle
+156 16 15.000000 0 // jump
+172 15 15.000000 0 // painone
+187 17 15.000000 0 // paintwo
+204 5 15.000000 1 // shoot
+209 21 15.000000 1 // taunt
+230 21 40.000000 1 // run
+251 21 40.000000 1 // runbackwards
+272 21 40.000000 1 // strafeleft
+293 21 40.000000 1 // straferight
+314 2 15.000000 0 // deadone
+316 2 15.000000 0 // deadtwo
+318 21 40.000000 1 // forwardright
+339 21 40.000000 1 // forwardleft
+360 21 40.000000 1 // backright
+381 21 40.000000 1 // backleft
index 96f53c8..b155a57 100644 (file)
Binary files a/models/player/pyria.iqm_0.tga and b/models/player/pyria.iqm_0.tga differ
index 4308a41..2c52f60 100644 (file)
@@ -1,5 +1,6 @@
 name Pyria
 species human
+sex Female
 weight 57
 age 53
 
diff --git a/models/player/pyria_lod1.iqm b/models/player/pyria_lod1.iqm
new file mode 100644 (file)
index 0000000..5364a05
Binary files /dev/null and b/models/player/pyria_lod1.iqm differ
diff --git a/models/player/pyria_lod2.iqm b/models/player/pyria_lod2.iqm
new file mode 100644 (file)
index 0000000..3179c71
Binary files /dev/null and b/models/player/pyria_lod2.iqm differ
diff --git a/models/player/seraphina.iqm b/models/player/seraphina.iqm
new file mode 100644 (file)
index 0000000..716bcc0
Binary files /dev/null and b/models/player/seraphina.iqm differ
diff --git a/models/player/seraphina.iqm.framegroups b/models/player/seraphina.iqm.framegroups
new file mode 100644 (file)
index 0000000..71128c6
--- /dev/null
@@ -0,0 +1,23 @@
+0 36 15.000000 0 // dieone
+36 20 15.000000 0 // dietwo
+56 15 15.000000 1 // draw
+71 20 15.000000 1 // duck
+91 21 30.000000 1 // duckwalk
+112 16 15.000000 0 // duckjump
+128 15 5.000000 1 // duckidle
+143 41 5.000000 1 // idle
+184 21 25.000000 0 // jump
+205 15 15.000000 0 // painone
+220 17 15.000000 0 // paintwo
+237 3 15.000000 1 // shoot
+240 21 15.000000 1 // taunt
+261 21 35.000000 1 // run
+282 21 35.000000 1 // runbackwards
+303 21 35.000000 1 // strafeleft
+324 21 35.000000 1 // straferight
+345 2 15.000000 0 // deadone
+347 2 15.000000 0 // deadtwo
+349 21 35.000000 1 // forwardright
+370 21 35.000000 1 // forwardleft
+391 21 35.000000 1 // backright
+412 21 30.000000 1 // backleft
diff --git a/models/player/seraphina.iqm_0.tga b/models/player/seraphina.iqm_0.tga
new file mode 100644 (file)
index 0000000..299f5a3
Binary files /dev/null and b/models/player/seraphina.iqm_0.tga differ
diff --git a/models/player/seraphina.iqm_0.txt b/models/player/seraphina.iqm_0.txt
new file mode 100644 (file)
index 0000000..6b4fcf6
--- /dev/null
@@ -0,0 +1,7 @@
+name Seraphina
+species human
+sex Female
+weight 89
+age 31
+
+Heavyweight Xonotic Solider
diff --git a/models/player/seraphinamasked.iqm b/models/player/seraphinamasked.iqm
new file mode 100644 (file)
index 0000000..98f29be
Binary files /dev/null and b/models/player/seraphinamasked.iqm differ
diff --git a/models/player/seraphinamasked.iqm.framegroups b/models/player/seraphinamasked.iqm.framegroups
new file mode 100644 (file)
index 0000000..71128c6
--- /dev/null
@@ -0,0 +1,23 @@
+0 36 15.000000 0 // dieone
+36 20 15.000000 0 // dietwo
+56 15 15.000000 1 // draw
+71 20 15.000000 1 // duck
+91 21 30.000000 1 // duckwalk
+112 16 15.000000 0 // duckjump
+128 15 5.000000 1 // duckidle
+143 41 5.000000 1 // idle
+184 21 25.000000 0 // jump
+205 15 15.000000 0 // painone
+220 17 15.000000 0 // paintwo
+237 3 15.000000 1 // shoot
+240 21 15.000000 1 // taunt
+261 21 35.000000 1 // run
+282 21 35.000000 1 // runbackwards
+303 21 35.000000 1 // strafeleft
+324 21 35.000000 1 // straferight
+345 2 15.000000 0 // deadone
+347 2 15.000000 0 // deadtwo
+349 21 35.000000 1 // forwardright
+370 21 35.000000 1 // forwardleft
+391 21 35.000000 1 // backright
+412 21 30.000000 1 // backleft
diff --git a/models/player/seraphinamasked.iqm_0.tga b/models/player/seraphinamasked.iqm_0.tga
new file mode 100644 (file)
index 0000000..e5a61db
Binary files /dev/null and b/models/player/seraphinamasked.iqm_0.tga differ
diff --git a/models/player/seraphinamasked.iqm_0.txt b/models/player/seraphinamasked.iqm_0.txt
new file mode 100644 (file)
index 0000000..4776359
--- /dev/null
@@ -0,0 +1,7 @@
+name Seraphina - Masked
+species human
+sex Female
+weight 90
+age 31
+
+Heavyweight Xonotic Solider
diff --git a/models/player/umbra.blend b/models/player/umbra.blend
deleted file mode 100644 (file)
index bcd6a64..0000000
Binary files a/models/player/umbra.blend and /dev/null differ
index 335a470..2b53ad2 100644 (file)
Binary files a/models/player/umbra.iqm and b/models/player/umbra.iqm differ
index dc908e6..b98d0b9 100644 (file)
@@ -1,23 +1,23 @@
-0 36 15.000000 0 // dieone
-36 20 15.000000 0 // dietwo
-56 15 15.000000 1 // draw
-71 10 15.000000 1 // duck
-81 11 15.000000 1 // duckwalk
-92 16 15.000000 0 // duckjump
-108 15 5.000000 1 // duckidle
-123 16 5.000000 1 // idle
-139 16 15.000000 0 // jump
-155 15 15.000000 0 // painone
-170 17 15.000000 0 // paintwo
-187 3 15.000000 1 // shoot
-190 35 15.000000 1 // taunt
-225 12 20.000000 1 // run
-237 12 20.000000 1 // runbackwards
-249 12 20.000000 1 // strafeleft
-261 12 20.000000 1 // straferight
-273 2 15.000000 0 // deadone
-275 2 15.000000 0 // deadtwo
-277 12 20.000000 1 // forwardright
-289 12 20.000000 1 // forwardleft
-301 12 20.000000 1 // backright
-313 12 20.000000 1 // backleft
+0 36 20.000000 0 // dieone
+36 27 20.000000 0 // dietwo
+63 15 15.000000 1 // draw
+78 20 15.000000 1 // duck
+98 11 15.000000 1 // duckwalk
+109 16 15.000000 0 // duckjump
+125 15 5.000000 1 // duckidle
+140 16 5.000000 1 // idle
+156 16 15.000000 0 // jump
+172 15 15.000000 0 // painone
+187 17 15.000000 0 // paintwo
+204 5 15.000000 1 // shoot
+209 21 15.000000 1 // taunt
+230 21 40.000000 1 // run
+251 21 40.000000 1 // runbackwards
+272 21 40.000000 1 // strafeleft
+293 21 40.000000 1 // straferight
+314 2 15.000000 0 // deadone
+316 2 15.000000 0 // deadtwo
+318 21 40.000000 1 // forwardright
+339 21 40.000000 1 // forwardleft
+360 21 40.000000 1 // backright
+381 21 40.000000 1 // backleft
index f515b2f..d3b3cc4 100644 (file)
Binary files a/models/player/umbra.iqm_0.tga and b/models/player/umbra.iqm_0.tga differ
index 807311d..21f4c80 100644 (file)
@@ -5,7 +5,3 @@ weight 61
 age 25
 
 Lightweight Xonotic Solider
-
-Sex: Female
-Weight: 61 kg
-Age: 25
diff --git a/models/weapons/h_campingrifle.dpm b/models/weapons/h_campingrifle.dpm
deleted file mode 100644 (file)
index 97d227b..0000000
Binary files a/models/weapons/h_campingrifle.dpm and /dev/null differ
diff --git a/models/weapons/h_campingrifle.dpm.framegroups b/models/weapons/h_campingrifle.dpm.framegroups
deleted file mode 100644 (file)
index 474f093..0000000
+++ /dev/null
@@ -1,4 +0,0 @@
-1 8 20 0 // fire
-9 5 20 0 // fire2
-15 200 20 1 // idle
-215 39 20 0 // reload
diff --git a/models/weapons/h_campingrifle.iqm b/models/weapons/h_campingrifle.iqm
new file mode 100644 (file)
index 0000000..2d4e970
Binary files /dev/null and b/models/weapons/h_campingrifle.iqm differ
diff --git a/models/weapons/h_campingrifle.iqm.framegroups b/models/weapons/h_campingrifle.iqm.framegroups
new file mode 100644 (file)
index 0000000..474f093
--- /dev/null
@@ -0,0 +1,4 @@
+1 8 20 0 // fire
+9 5 20 0 // fire2
+15 200 20 1 // idle
+215 39 20 0 // reload
diff --git a/models/weapons/h_crylink.dpm b/models/weapons/h_crylink.dpm
deleted file mode 100644 (file)
index f708fba..0000000
Binary files a/models/weapons/h_crylink.dpm and /dev/null differ
diff --git a/models/weapons/h_crylink.dpm.framegroups b/models/weapons/h_crylink.dpm.framegroups
deleted file mode 100644 (file)
index 0a59625..0000000
+++ /dev/null
@@ -1,4 +0,0 @@
-1 8 20 0 // fire
-9 5 20 0 // fire2
-15 200 20 1 // idle
-215 40 20 0 // reload
diff --git a/models/weapons/h_crylink.iqm b/models/weapons/h_crylink.iqm
new file mode 100644 (file)
index 0000000..2aadd39
Binary files /dev/null and b/models/weapons/h_crylink.iqm differ
diff --git a/models/weapons/h_crylink.iqm.framegroups b/models/weapons/h_crylink.iqm.framegroups
new file mode 100644 (file)
index 0000000..0a59625
--- /dev/null
@@ -0,0 +1,4 @@
+1 8 20 0 // fire
+9 5 20 0 // fire2
+15 200 20 1 // idle
+215 40 20 0 // reload
diff --git a/models/weapons/h_electro.dpm b/models/weapons/h_electro.dpm
deleted file mode 100644 (file)
index e405532..0000000
Binary files a/models/weapons/h_electro.dpm and /dev/null differ
diff --git a/models/weapons/h_electro.dpm.framegroups b/models/weapons/h_electro.dpm.framegroups
deleted file mode 100644 (file)
index 0a59625..0000000
+++ /dev/null
@@ -1,4 +0,0 @@
-1 8 20 0 // fire
-9 5 20 0 // fire2
-15 200 20 1 // idle
-215 40 20 0 // reload
diff --git a/models/weapons/h_electro.iqm b/models/weapons/h_electro.iqm
new file mode 100644 (file)
index 0000000..ef0c7e2
Binary files /dev/null and b/models/weapons/h_electro.iqm differ
diff --git a/models/weapons/h_electro.iqm.framegroups b/models/weapons/h_electro.iqm.framegroups
new file mode 100644 (file)
index 0000000..0a59625
--- /dev/null
@@ -0,0 +1,4 @@
+1 8 20 0 // fire
+9 5 20 0 // fire2
+15 200 20 1 // idle
+215 40 20 0 // reload
diff --git a/models/weapons/h_fireball.dpm b/models/weapons/h_fireball.dpm
deleted file mode 100644 (file)
index d4cb641..0000000
Binary files a/models/weapons/h_fireball.dpm and /dev/null differ
diff --git a/models/weapons/h_fireball.dpm.framegroups b/models/weapons/h_fireball.dpm.framegroups
deleted file mode 100644 (file)
index 0a59625..0000000
+++ /dev/null
@@ -1,4 +0,0 @@
-1 8 20 0 // fire
-9 5 20 0 // fire2
-15 200 20 1 // idle
-215 40 20 0 // reload
diff --git a/models/weapons/h_fireball.iqm b/models/weapons/h_fireball.iqm
new file mode 100644 (file)
index 0000000..9fb4af5
Binary files /dev/null and b/models/weapons/h_fireball.iqm differ
diff --git a/models/weapons/h_fireball.iqm.framegroups b/models/weapons/h_fireball.iqm.framegroups
new file mode 100644 (file)
index 0000000..0a59625
--- /dev/null
@@ -0,0 +1,4 @@
+1 8 20 0 // fire
+9 5 20 0 // fire2
+15 200 20 1 // idle
+215 40 20 0 // reload
diff --git a/models/weapons/h_gl.dpm b/models/weapons/h_gl.dpm
deleted file mode 100644 (file)
index 6adb433..0000000
Binary files a/models/weapons/h_gl.dpm and /dev/null differ
diff --git a/models/weapons/h_gl.dpm.framegroups b/models/weapons/h_gl.dpm.framegroups
deleted file mode 100644 (file)
index 0a59625..0000000
+++ /dev/null
@@ -1,4 +0,0 @@
-1 8 20 0 // fire
-9 5 20 0 // fire2
-15 200 20 1 // idle
-215 40 20 0 // reload
diff --git a/models/weapons/h_gl.iqm b/models/weapons/h_gl.iqm
new file mode 100644 (file)
index 0000000..33fab12
Binary files /dev/null and b/models/weapons/h_gl.iqm differ
diff --git a/models/weapons/h_gl.iqm.framegroups b/models/weapons/h_gl.iqm.framegroups
new file mode 100644 (file)
index 0000000..0a59625
--- /dev/null
@@ -0,0 +1,4 @@
+1 8 20 0 // fire
+9 5 20 0 // fire2
+15 200 20 1 // idle
+215 40 20 0 // reload
diff --git a/models/weapons/h_hagar.dpm b/models/weapons/h_hagar.dpm
deleted file mode 100644 (file)
index e588dab..0000000
Binary files a/models/weapons/h_hagar.dpm and /dev/null differ
diff --git a/models/weapons/h_hagar.dpm.framegroups b/models/weapons/h_hagar.dpm.framegroups
deleted file mode 100644 (file)
index 0a59625..0000000
+++ /dev/null
@@ -1,4 +0,0 @@
-1 8 20 0 // fire
-9 5 20 0 // fire2
-15 200 20 1 // idle
-215 40 20 0 // reload
diff --git a/models/weapons/h_hagar.iqm b/models/weapons/h_hagar.iqm
new file mode 100644 (file)
index 0000000..e3a4d57
Binary files /dev/null and b/models/weapons/h_hagar.iqm differ
diff --git a/models/weapons/h_hagar.iqm.framegroups b/models/weapons/h_hagar.iqm.framegroups
new file mode 100644 (file)
index 0000000..0a59625
--- /dev/null
@@ -0,0 +1,4 @@
+1 8 20 0 // fire
+9 5 20 0 // fire2
+15 200 20 1 // idle
+215 40 20 0 // reload
diff --git a/models/weapons/h_hlac.dpm b/models/weapons/h_hlac.dpm
deleted file mode 100644 (file)
index 1baded8..0000000
Binary files a/models/weapons/h_hlac.dpm and /dev/null differ
diff --git a/models/weapons/h_hlac.dpm.framegroups b/models/weapons/h_hlac.dpm.framegroups
deleted file mode 100644 (file)
index 0a59625..0000000
+++ /dev/null
@@ -1,4 +0,0 @@
-1 8 20 0 // fire
-9 5 20 0 // fire2
-15 200 20 1 // idle
-215 40 20 0 // reload
diff --git a/models/weapons/h_hlac.iqm b/models/weapons/h_hlac.iqm
new file mode 100644 (file)
index 0000000..157a56b
Binary files /dev/null and b/models/weapons/h_hlac.iqm differ
diff --git a/models/weapons/h_hlac.iqm.framegroups b/models/weapons/h_hlac.iqm.framegroups
new file mode 100644 (file)
index 0000000..0a59625
--- /dev/null
@@ -0,0 +1,4 @@
+1 8 20 0 // fire
+9 5 20 0 // fire2
+15 200 20 1 // idle
+215 40 20 0 // reload
diff --git a/models/weapons/h_hookgun.dpm b/models/weapons/h_hookgun.dpm
deleted file mode 100644 (file)
index 536febc..0000000
Binary files a/models/weapons/h_hookgun.dpm and /dev/null differ
diff --git a/models/weapons/h_hookgun.dpm.framegroups b/models/weapons/h_hookgun.dpm.framegroups
deleted file mode 100644 (file)
index 0a59625..0000000
+++ /dev/null
@@ -1,4 +0,0 @@
-1 8 20 0 // fire
-9 5 20 0 // fire2
-15 200 20 1 // idle
-215 40 20 0 // reload
diff --git a/models/weapons/h_hookgun.iqm b/models/weapons/h_hookgun.iqm
new file mode 100644 (file)
index 0000000..0492d0a
Binary files /dev/null and b/models/weapons/h_hookgun.iqm differ
diff --git a/models/weapons/h_hookgun.iqm.framegroups b/models/weapons/h_hookgun.iqm.framegroups
new file mode 100644 (file)
index 0000000..0a59625
--- /dev/null
@@ -0,0 +1,4 @@
+1 8 20 0 // fire
+9 5 20 0 // fire2
+15 200 20 1 // idle
+215 40 20 0 // reload
diff --git a/models/weapons/h_laser.dpm b/models/weapons/h_laser.dpm
deleted file mode 100644 (file)
index e5fcb46..0000000
Binary files a/models/weapons/h_laser.dpm and /dev/null differ
diff --git a/models/weapons/h_laser.dpm.framegroups b/models/weapons/h_laser.dpm.framegroups
deleted file mode 100644 (file)
index 0a59625..0000000
+++ /dev/null
@@ -1,4 +0,0 @@
-1 8 20 0 // fire
-9 5 20 0 // fire2
-15 200 20 1 // idle
-215 40 20 0 // reload
diff --git a/models/weapons/h_laser.iqm b/models/weapons/h_laser.iqm
new file mode 100644 (file)
index 0000000..0ca28e9
Binary files /dev/null and b/models/weapons/h_laser.iqm differ
diff --git a/models/weapons/h_laser.iqm.framegroups b/models/weapons/h_laser.iqm.framegroups
new file mode 100644 (file)
index 0000000..0a59625
--- /dev/null
@@ -0,0 +1,4 @@
+1 8 20 0 // fire
+9 5 20 0 // fire2
+15 200 20 1 // idle
+215 40 20 0 // reload
diff --git a/models/weapons/h_minstanex.dpm b/models/weapons/h_minstanex.dpm
deleted file mode 100644 (file)
index dbbc1a0..0000000
Binary files a/models/weapons/h_minstanex.dpm and /dev/null differ
diff --git a/models/weapons/h_minstanex.dpm.framegroups b/models/weapons/h_minstanex.dpm.framegroups
deleted file mode 100644 (file)
index 0a59625..0000000
+++ /dev/null
@@ -1,4 +0,0 @@
-1 8 20 0 // fire
-9 5 20 0 // fire2
-15 200 20 1 // idle
-215 40 20 0 // reload
diff --git a/models/weapons/h_minstanex.iqm b/models/weapons/h_minstanex.iqm
new file mode 100644 (file)
index 0000000..77d6775
Binary files /dev/null and b/models/weapons/h_minstanex.iqm differ
diff --git a/models/weapons/h_minstanex.iqm.framegroups b/models/weapons/h_minstanex.iqm.framegroups
new file mode 100644 (file)
index 0000000..0a59625
--- /dev/null
@@ -0,0 +1,4 @@
+1 8 20 0 // fire
+9 5 20 0 // fire2
+15 200 20 1 // idle
+215 40 20 0 // reload
diff --git a/models/weapons/h_nex.dpm b/models/weapons/h_nex.dpm
deleted file mode 100644 (file)
index 76c1293..0000000
Binary files a/models/weapons/h_nex.dpm and /dev/null differ
diff --git a/models/weapons/h_nex.dpm.framegroups b/models/weapons/h_nex.dpm.framegroups
deleted file mode 100644 (file)
index 0a59625..0000000
+++ /dev/null
@@ -1,4 +0,0 @@
-1 8 20 0 // fire
-9 5 20 0 // fire2
-15 200 20 1 // idle
-215 40 20 0 // reload
diff --git a/models/weapons/h_nex.iqm b/models/weapons/h_nex.iqm
new file mode 100644 (file)
index 0000000..22642ef
Binary files /dev/null and b/models/weapons/h_nex.iqm differ
diff --git a/models/weapons/h_nex.iqm.framegroups b/models/weapons/h_nex.iqm.framegroups
new file mode 100644 (file)
index 0000000..0a59625
--- /dev/null
@@ -0,0 +1,4 @@
+1 8 20 0 // fire
+9 5 20 0 // fire2
+15 200 20 1 // idle
+215 40 20 0 // reload
diff --git a/models/weapons/h_porto.dpm b/models/weapons/h_porto.dpm
deleted file mode 100644 (file)
index 5040c06..0000000
Binary files a/models/weapons/h_porto.dpm and /dev/null differ
diff --git a/models/weapons/h_porto.dpm.framegroups b/models/weapons/h_porto.dpm.framegroups
deleted file mode 100644 (file)
index 0a59625..0000000
+++ /dev/null
@@ -1,4 +0,0 @@
-1 8 20 0 // fire
-9 5 20 0 // fire2
-15 200 20 1 // idle
-215 40 20 0 // reload
diff --git a/models/weapons/h_porto.iqm b/models/weapons/h_porto.iqm
new file mode 100644 (file)
index 0000000..0c6ed41
Binary files /dev/null and b/models/weapons/h_porto.iqm differ
diff --git a/models/weapons/h_porto.iqm.framegroups b/models/weapons/h_porto.iqm.framegroups
new file mode 100644 (file)
index 0000000..0a59625
--- /dev/null
@@ -0,0 +1,4 @@
+1 8 20 0 // fire
+9 5 20 0 // fire2
+15 200 20 1 // idle
+215 40 20 0 // reload
diff --git a/models/weapons/h_rl.dpm b/models/weapons/h_rl.dpm
deleted file mode 100644 (file)
index af04093..0000000
Binary files a/models/weapons/h_rl.dpm and /dev/null differ
diff --git a/models/weapons/h_rl.dpm.framegroups b/models/weapons/h_rl.dpm.framegroups
deleted file mode 100644 (file)
index 0a59625..0000000
+++ /dev/null
@@ -1,4 +0,0 @@
-1 8 20 0 // fire
-9 5 20 0 // fire2
-15 200 20 1 // idle
-215 40 20 0 // reload
diff --git a/models/weapons/h_rl.iqm b/models/weapons/h_rl.iqm
new file mode 100644 (file)
index 0000000..21b7225
Binary files /dev/null and b/models/weapons/h_rl.iqm differ
diff --git a/models/weapons/h_rl.iqm.framegroups b/models/weapons/h_rl.iqm.framegroups
new file mode 100644 (file)
index 0000000..0a59625
--- /dev/null
@@ -0,0 +1,4 @@
+1 8 20 0 // fire
+9 5 20 0 // fire2
+15 200 20 1 // idle
+215 40 20 0 // reload
diff --git a/models/weapons/h_seeker.dpm b/models/weapons/h_seeker.dpm
deleted file mode 100644 (file)
index d4cb641..0000000
Binary files a/models/weapons/h_seeker.dpm and /dev/null differ
diff --git a/models/weapons/h_seeker.dpm.framegroups b/models/weapons/h_seeker.dpm.framegroups
deleted file mode 100644 (file)
index 0a59625..0000000
+++ /dev/null
@@ -1,4 +0,0 @@
-1 8 20 0 // fire
-9 5 20 0 // fire2
-15 200 20 1 // idle
-215 40 20 0 // reload
diff --git a/models/weapons/h_seeker.iqm b/models/weapons/h_seeker.iqm
new file mode 100644 (file)
index 0000000..9fb4af5
Binary files /dev/null and b/models/weapons/h_seeker.iqm differ
diff --git a/models/weapons/h_seeker.iqm.framegroups b/models/weapons/h_seeker.iqm.framegroups
new file mode 100644 (file)
index 0000000..0a59625
--- /dev/null
@@ -0,0 +1,4 @@
+1 8 20 0 // fire
+9 5 20 0 // fire2
+15 200 20 1 // idle
+215 40 20 0 // reload
diff --git a/models/weapons/h_shotgun.dpm b/models/weapons/h_shotgun.dpm
deleted file mode 100644 (file)
index ad489c5..0000000
Binary files a/models/weapons/h_shotgun.dpm and /dev/null differ
diff --git a/models/weapons/h_shotgun.dpm.framegroups b/models/weapons/h_shotgun.dpm.framegroups
deleted file mode 100644 (file)
index 0a59625..0000000
+++ /dev/null
@@ -1,4 +0,0 @@
-1 8 20 0 // fire
-9 5 20 0 // fire2
-15 200 20 1 // idle
-215 40 20 0 // reload
diff --git a/models/weapons/h_shotgun.iqm b/models/weapons/h_shotgun.iqm
new file mode 100644 (file)
index 0000000..1fb76f8
Binary files /dev/null and b/models/weapons/h_shotgun.iqm differ
diff --git a/models/weapons/h_shotgun.iqm.framegroups b/models/weapons/h_shotgun.iqm.framegroups
new file mode 100644 (file)
index 0000000..0a59625
--- /dev/null
@@ -0,0 +1,4 @@
+1 8 20 0 // fire
+9 5 20 0 // fire2
+15 200 20 1 // idle
+215 40 20 0 // reload
diff --git a/models/weapons/h_tuba.dpm b/models/weapons/h_tuba.dpm
deleted file mode 100644 (file)
index e405532..0000000
Binary files a/models/weapons/h_tuba.dpm and /dev/null differ
diff --git a/models/weapons/h_tuba.dpm.framegroups b/models/weapons/h_tuba.dpm.framegroups
deleted file mode 100644 (file)
index 0a59625..0000000
+++ /dev/null
@@ -1,4 +0,0 @@
-1 8 20 0 // fire
-9 5 20 0 // fire2
-15 200 20 1 // idle
-215 40 20 0 // reload
diff --git a/models/weapons/h_tuba.iqm b/models/weapons/h_tuba.iqm
new file mode 100644 (file)
index 0000000..523bbb1
Binary files /dev/null and b/models/weapons/h_tuba.iqm differ
diff --git a/models/weapons/h_tuba.iqm.framegroups b/models/weapons/h_tuba.iqm.framegroups
new file mode 100644 (file)
index 0000000..0a59625
--- /dev/null
@@ -0,0 +1,4 @@
+1 8 20 0 // fire
+9 5 20 0 // fire2
+15 200 20 1 // idle
+215 40 20 0 // reload
diff --git a/models/weapons/h_uzi.dpm b/models/weapons/h_uzi.dpm
deleted file mode 100644 (file)
index 9f7c68a..0000000
Binary files a/models/weapons/h_uzi.dpm and /dev/null differ
diff --git a/models/weapons/h_uzi.dpm.framegroups b/models/weapons/h_uzi.dpm.framegroups
deleted file mode 100644 (file)
index 0a59625..0000000
+++ /dev/null
@@ -1,4 +0,0 @@
-1 8 20 0 // fire
-9 5 20 0 // fire2
-15 200 20 1 // idle
-215 40 20 0 // reload
diff --git a/models/weapons/h_uzi.iqm b/models/weapons/h_uzi.iqm
new file mode 100644 (file)
index 0000000..523bbb1
Binary files /dev/null and b/models/weapons/h_uzi.iqm differ
diff --git a/models/weapons/h_uzi.iqm.framegroups b/models/weapons/h_uzi.iqm.framegroups
new file mode 100644 (file)
index 0000000..0a59625
--- /dev/null
@@ -0,0 +1,4 @@
+1 8 20 0 // fire
+9 5 20 0 // fire2
+15 200 20 1 // idle
+215 40 20 0 // reload
index e9ef2c3..251e79f 100644 (file)
Binary files a/models/weapons/v_campingrifle.md3 and b/models/weapons/v_campingrifle.md3 differ
index 80ef5d6..af34658 100644 (file)
Binary files a/models/weapons/v_crylink.md3 and b/models/weapons/v_crylink.md3 differ
index 2f65d73..67105bc 100644 (file)
Binary files a/models/weapons/v_electro.md3 and b/models/weapons/v_electro.md3 differ
index 6bb210d..a5e847c 100644 (file)
Binary files a/models/weapons/v_fireball.md3 and b/models/weapons/v_fireball.md3 differ
index 41ceb9b..d705024 100644 (file)
Binary files a/models/weapons/v_gl.md3 and b/models/weapons/v_gl.md3 differ
index 1866470..19a2453 100644 (file)
Binary files a/models/weapons/v_hagar.md3 and b/models/weapons/v_hagar.md3 differ
index 7a26c18..3bbc34d 100644 (file)
Binary files a/models/weapons/v_hlac.md3 and b/models/weapons/v_hlac.md3 differ
index e4d0304..4ca6a13 100644 (file)
Binary files a/models/weapons/v_hookgun.md3 and b/models/weapons/v_hookgun.md3 differ
index 56c78c1..836ad36 100644 (file)
Binary files a/models/weapons/v_laser.md3 and b/models/weapons/v_laser.md3 differ
index 4d3153e..d583e1a 100644 (file)
Binary files a/models/weapons/v_minstanex.md3 and b/models/weapons/v_minstanex.md3 differ
index fef5950..9144fa0 100644 (file)
Binary files a/models/weapons/v_nex.md3 and b/models/weapons/v_nex.md3 differ
index 18faccf..5d06b3c 100644 (file)
Binary files a/models/weapons/v_porto.md3 and b/models/weapons/v_porto.md3 differ
index c1e9951..022b52d 100644 (file)
Binary files a/models/weapons/v_rl.md3 and b/models/weapons/v_rl.md3 differ
index d655516..146809f 100644 (file)
Binary files a/models/weapons/v_seeker.md3 and b/models/weapons/v_seeker.md3 differ
index 89a5a43..d4a6287 100644 (file)
Binary files a/models/weapons/v_shotgun.md3 and b/models/weapons/v_shotgun.md3 differ
index c076cf0..910b227 100644 (file)
Binary files a/models/weapons/v_tuba.md3 and b/models/weapons/v_tuba.md3 differ
index d266814..53b27c6 100644 (file)
Binary files a/models/weapons/v_uzi.md3 and b/models/weapons/v_uzi.md3 differ
index 4d9a118..4631d5e 100644 (file)
@@ -16,8 +16,10 @@ sv_airaccel_qw 0
 sv_airstopaccelerate 0
 sv_airstrafeaccelerate 0
 sv_maxairstrafespeed 0
+sv_airstrafeaccel_qw 0
 sv_aircontrol 0
 sv_aircontrol_power 2
+sv_airspeedlimit_nonqw 0
 sv_warsowbunny_turnaccel 0
 sv_warsowbunny_accel 0.1593
 sv_warsowbunny_topspeed 925
index 8fba574..8c8219a 100644 (file)
@@ -16,8 +16,10 @@ sv_airaccel_qw 0
 sv_airstopaccelerate 0
 sv_airstrafeaccelerate 0
 sv_maxairstrafespeed 0
+sv_airstrafeaccel_qw 0
 sv_aircontrol 0
 sv_aircontrol_power 2
+sv_airspeedlimit_nonqw 0
 sv_warsowbunny_turnaccel 0
 sv_warsowbunny_accel 0.1593
 sv_warsowbunny_topspeed 925
index 59cf1de..9707f6f 100644 (file)
@@ -16,8 +16,10 @@ sv_airaccel_qw 0
 sv_airstopaccelerate 0
 sv_airstrafeaccelerate 0
 sv_maxairstrafespeed 0
+sv_airstrafeaccel_qw 0
 sv_aircontrol 0
 sv_aircontrol_power 2
+sv_airspeedlimit_nonqw 0
 sv_warsowbunny_turnaccel 0
 sv_warsowbunny_accel 0.1593
 sv_warsowbunny_topspeed 925
index 6ab373f..475875b 100644 (file)
@@ -16,8 +16,10 @@ sv_airaccel_qw 0
 sv_airstopaccelerate 0
 sv_airstrafeaccelerate 0
 sv_maxairstrafespeed 0
+sv_airstrafeaccel_qw 0
 sv_aircontrol 0
 sv_aircontrol_power 2
+sv_airspeedlimit_nonqw 0
 sv_warsowbunny_turnaccel 0
 sv_warsowbunny_accel 0.1593
 sv_warsowbunny_topspeed 925
index e6926e4..68a8f19 100644 (file)
@@ -16,8 +16,10 @@ sv_airaccel_qw 0
 sv_airstopaccelerate 0
 sv_airstrafeaccelerate 0
 sv_maxairstrafespeed 0
+sv_airstrafeaccel_qw 0
 sv_aircontrol 0
 sv_aircontrol_power 2
+sv_airspeedlimit_nonqw 0
 sv_warsowbunny_turnaccel 0
 sv_warsowbunny_accel 0.1593
 sv_warsowbunny_topspeed 925
index 39d1e6a..b2e056e 100644 (file)
@@ -16,8 +16,10 @@ sv_airaccel_qw 0.93
 sv_airstopaccelerate 0
 sv_airstrafeaccelerate 0
 sv_maxairstrafespeed 0
+sv_airstrafeaccel_qw 0
 sv_aircontrol 0
 sv_aircontrol_power 2
+sv_airspeedlimit_nonqw 0
 sv_warsowbunny_turnaccel 0
 sv_warsowbunny_accel 0.1593
 sv_warsowbunny_topspeed 925
index 048d2bb..85e4841 100644 (file)
@@ -16,8 +16,10 @@ sv_airaccel_qw 0.95
 sv_airstopaccelerate 0
 sv_airstrafeaccelerate 0
 sv_maxairstrafespeed 0
+sv_airstrafeaccel_qw 0
 sv_aircontrol 0
 sv_aircontrol_power 2
+sv_airspeedlimit_nonqw 0
 sv_warsowbunny_turnaccel 0
 sv_warsowbunny_accel 0.1593
 sv_warsowbunny_topspeed 925
index b28cb4f..0e4de39 100644 (file)
@@ -16,8 +16,10 @@ sv_airaccel_qw 0.95
 sv_airstopaccelerate 0
 sv_airstrafeaccelerate 0
 sv_maxairstrafespeed 0
+sv_airstrafeaccel_qw 0
 sv_aircontrol 0
 sv_aircontrol_power 2
+sv_airspeedlimit_nonqw 0
 sv_warsowbunny_turnaccel 0
 sv_warsowbunny_accel 0.1593
 sv_warsowbunny_topspeed 925
index 4ee66f2..d572e6d 100644 (file)
@@ -16,8 +16,10 @@ sv_airaccel_qw 1
 sv_airstopaccelerate 2.5
 sv_airstrafeaccelerate 70
 sv_maxairstrafespeed 30
+sv_airstrafeaccel_qw 0
 sv_aircontrol 150
 sv_aircontrol_power 2
+sv_airspeedlimit_nonqw 0
 sv_warsowbunny_turnaccel 0
 sv_warsowbunny_accel 0.1593
 sv_warsowbunny_topspeed 925
index 1731b12..eb63775 100644 (file)
@@ -16,8 +16,10 @@ sv_airaccel_qw 0.95
 sv_airstopaccelerate 0
 sv_airstrafeaccelerate 0
 sv_maxairstrafespeed 0
+sv_airstrafeaccel_qw 0
 sv_aircontrol 0
 sv_aircontrol_power 2
+sv_airspeedlimit_nonqw 0
 sv_warsowbunny_turnaccel 0
 sv_warsowbunny_accel 0.1593
 sv_warsowbunny_topspeed 925
index c0a5e21..4a959db 100644 (file)
@@ -17,8 +17,10 @@ sv_airaccel_qw -0.93
 sv_airstopaccelerate 0
 sv_airstrafeaccelerate 0
 sv_maxairstrafespeed 0
+sv_airstrafeaccel_qw 0
 sv_aircontrol 0
 sv_aircontrol_power 2
+sv_airspeedlimit_nonqw 0
 sv_warsowbunny_turnaccel 0
 sv_warsowbunny_accel 0.1593
 sv_warsowbunny_topspeed 925
index d408285..2b437d3 100644 (file)
@@ -17,8 +17,10 @@ sv_airaccel_qw 0.95
 sv_airstopaccelerate 0
 sv_airstrafeaccelerate 0
 sv_maxairstrafespeed 0
+sv_airstrafeaccel_qw 0
 sv_aircontrol 0
 sv_aircontrol_power 2
+sv_airspeedlimit_nonqw 0
 sv_warsowbunny_turnaccel 0
 sv_warsowbunny_accel 0.1593
 sv_warsowbunny_topspeed 925
index 88290d6..d70bc1b 100644 (file)
@@ -1,23 +1,25 @@
 // 2.0-2.4.2 physics minus QW-bunnyhopping-bug, faster onground accel, CPMA air control
 sv_gravity 800
 sv_maxspeed 400
-sv_maxairspeed 220
+sv_maxairspeed 400
 sv_stopspeed 100
-sv_accelerate 12
-sv_airaccelerate 8
+sv_accelerate 15
+sv_airaccelerate 2
 sv_friction 7
 edgefriction 1
 sv_stepheight 34
 sv_jumpvelocity 300
 sv_wateraccelerate -1
 sv_waterfriction -1
-sv_airaccel_sideways_friction -0.125
-sv_airaccel_qw -0.95
-sv_airstopaccelerate 0
-sv_airstrafeaccelerate 0
-sv_maxairstrafespeed 0
-sv_aircontrol 100
-sv_aircontrol_power 3
+sv_airaccel_sideways_friction -0.2
+sv_airaccel_qw -0.9475
+sv_airstopaccelerate 2.5
+sv_airstrafeaccelerate 24
+sv_maxairstrafespeed 100
+sv_airstrafeaccel_qw -0.9825
+sv_aircontrol 125
+sv_aircontrol_power 2.5
+sv_airspeedlimit_nonqw 0
 sv_warsowbunny_turnaccel 0
 sv_warsowbunny_accel 0.1593
 sv_warsowbunny_topspeed 925
@@ -26,4 +28,4 @@ sv_friction_on_land 0
 sv_doublejump 0
 sv_jumpspeedcap_min ""
 sv_jumpspeedcap_max ""
-sv_jumpspeedcap_max_disable_on_ramps 0
+sv_jumpspeedcap_max_disable_on_ramps 1
index 343971c..ea8e1ac 100644 (file)
@@ -17,8 +17,10 @@ sv_airaccel_qw 1
 sv_airstopaccelerate 0
 sv_airstrafeaccelerate 0
 sv_maxairstrafespeed 0
+sv_airstrafeaccel_qw 0
 sv_aircontrol 0
 sv_aircontrol_power 2
+sv_airspeedlimit_nonqw 0
 sv_warsowbunny_turnaccel 0
 sv_warsowbunny_accel 0.1593
 sv_warsowbunny_topspeed 925
index de8ff72..1d08ae8 100644 (file)
@@ -16,8 +16,10 @@ sv_airaccel_qw 1
 sv_airstopaccelerate 0
 sv_airstrafeaccelerate 0
 sv_maxairstrafespeed 0
+sv_airstrafeaccel_qw 0
 sv_aircontrol 0
 sv_aircontrol_power 2
+sv_airspeedlimit_nonqw 0
 sv_warsowbunny_turnaccel 0
 sv_warsowbunny_accel 0.1593
 sv_warsowbunny_topspeed 925
index ff08d07..7409ae4 100644 (file)
@@ -17,8 +17,10 @@ sv_airaccel_qw 1
 sv_airstopaccelerate 0
 sv_airstrafeaccelerate 0
 sv_maxairstrafespeed 0
+sv_airstrafeaccel_qw 0
 sv_aircontrol 0
 sv_aircontrol_power 2
+sv_airspeedlimit_nonqw 0
 sv_warsowbunny_turnaccel 0
 sv_warsowbunny_accel 0.1593
 sv_warsowbunny_topspeed 925
index 716728e..1951bec 100644 (file)
@@ -16,8 +16,10 @@ sv_airaccel_qw 1
 sv_airstopaccelerate 0
 sv_airstrafeaccelerate 0
 sv_maxairstrafespeed 0
+sv_airstrafeaccel_qw 0
 sv_aircontrol 0
 sv_aircontrol_power 2
+sv_airspeedlimit_nonqw 0
 sv_warsowbunny_turnaccel 0
 sv_warsowbunny_accel 0.1593
 sv_warsowbunny_topspeed 925
index 88e7e8f..4bbb9be 100644 (file)
@@ -16,8 +16,10 @@ sv_airaccel_qw 1
 sv_airstopaccelerate 0
 sv_airstrafeaccelerate 0
 sv_maxairstrafespeed 0
+sv_airstrafeaccel_qw 0
 sv_aircontrol 0
 sv_aircontrol_power 2
+sv_airspeedlimit_nonqw 0
 sv_warsowbunny_turnaccel 0
 sv_warsowbunny_accel 0.1593
 sv_warsowbunny_topspeed 925
index 7c5da3f..6c17ad6 100644 (file)
@@ -16,8 +16,10 @@ sv_airaccel_qw 0.93
 sv_airstopaccelerate 0
 sv_airstrafeaccelerate 0
 sv_maxairstrafespeed 0
+sv_airstrafeaccel_qw 0
 sv_aircontrol 0
 sv_aircontrol_power 2
+sv_airspeedlimit_nonqw 0
 sv_warsowbunny_turnaccel 0
 sv_warsowbunny_accel 0.1593
 sv_warsowbunny_topspeed 925
index 3631c80..e03363a 100644 (file)
@@ -1,13 +1,14 @@
-sv_gravity 880
+// Mix of 2.3 physics and NANL physics, goal of going for faster movement
+sv_gravity 800
 sv_maxspeed 420
 sv_maxairspeed 235
 sv_stopspeed 200
 sv_accelerate 6
 sv_airaccelerate 6
 sv_friction 4
-edgefriction 0
+edgefriction 1
 sv_stepheight 34
-sv_jumpvelocity 330
+sv_jumpvelocity 300
 sv_wateraccelerate -1
 sv_waterfriction -1
 sv_airaccel_sideways_friction 0.3
@@ -15,8 +16,10 @@ sv_airaccel_qw 0.93
 sv_airstopaccelerate 0
 sv_airstrafeaccelerate 0
 sv_maxairstrafespeed 0
+sv_airstrafeaccel_qw 0
 sv_aircontrol 0
 sv_aircontrol_power 2
+sv_airspeedlimit_nonqw 0
 sv_warsowbunny_turnaccel 0
 sv_warsowbunny_accel 0.1593
 sv_warsowbunny_topspeed 925
index bc53f7a..b1b0655 100644 (file)
@@ -16,8 +16,10 @@ sv_airaccel_qw 1
 sv_airstopaccelerate 2.5
 sv_airstrafeaccelerate 70
 sv_maxairstrafespeed 30
+sv_airstrafeaccel_qw 0
 sv_aircontrol 0
 sv_aircontrol_power 2
+sv_airspeedlimit_nonqw 0
 sv_warsowbunny_turnaccel 9 // activates warsow movement mode
 sv_warsowbunny_accel 0.1593
 sv_warsowbunny_topspeed 925
index 6c60724..06e7c1a 100644 (file)
@@ -16,8 +16,10 @@ sv_airaccel_qw 1
 sv_airstopaccelerate 2.5
 sv_airstrafeaccelerate 70
 sv_maxairstrafespeed 30
+sv_airstrafeaccel_qw 0
 sv_aircontrol 150
 sv_aircontrol_power 2
+sv_airspeedlimit_nonqw 0
 sv_warsowbunny_turnaccel 0
 sv_warsowbunny_accel 0.1593
 sv_warsowbunny_topspeed 925
index 324676d..cb07a48 100644 (file)
@@ -16,8 +16,10 @@ sv_airaccel_qw 1
 sv_airstopaccelerate 2
 sv_airstrafeaccelerate 70
 sv_maxairstrafespeed 30
+sv_airstrafeaccel_qw 0
 sv_aircontrol 0
 sv_aircontrol_power 2
+sv_airspeedlimit_nonqw 0
 sv_warsowbunny_turnaccel 6 // activates warsow movement mode
 sv_warsowbunny_accel 0.1585
 sv_warsowbunny_topspeed 900
index da81a24..2a60b65 100644 (file)
@@ -20,8 +20,10 @@ sv_airaccel_qw 0.95
 sv_airstopaccelerate 2.5
 sv_airstrafeaccelerate 70
 sv_maxairstrafespeed 30
+sv_airstrafeaccel_qw 1
 sv_aircontrol 150
 sv_aircontrol_power 2
+sv_airspeedlimit_nonqw 0
 sv_warsowbunny_turnaccel 0
 sv_warsowbunny_accel 0.1593
 sv_warsowbunny_topspeed 925
index 9c1af7d..575f8b0 100644 (file)
@@ -60,6 +60,10 @@ void CSQC_Init(void)
        
        check_unacceptable_compiler_bugs();
 
+#ifdef WATERMARK
+       print("^4CSQC Build information: ", WATERMARK(), "\n");
+#endif
+
        float i;
        CSQC_CheckEngine();
 
diff --git a/qcsrc/client/d b/qcsrc/client/d
deleted file mode 100644 (file)
index d5a11c1..0000000
+++ /dev/null
@@ -1,19 +0,0 @@
---- sbar.qc.BASE.4129.qc       2010-05-06 19:58:30.171990860 +0200
-+++ sbar.qc    2010-05-06 20:01:25.251979343 +0200
-@@ -3395,8 +3395,15 @@
-               rr = RACE_RECORD;
-       t = stof(db_get(ClientProgsDB, strcat(shortmapname, rr, "time")));
--      if(score && score < t || !t)
-+      if(score && (score < t || !t)) {
-               db_put(ClientProgsDB, strcat(shortmapname, rr, "time"), ftos(score));
-+              if(cvar("cl_autodemo_delete_keeprecords"))
-+              {
-+                      f = cvar("cl_autodemo_delete");
-+                      f &~= 1;
-+                      cvar_set("cl_autodemo_delete", ftos(f)); // don't delete demo with new record!
-+              }
-+      }
-       if(t != crecordtime_prev) {
-               crecordtime_prev = t;
index 9e90bee..1b0138f 100644 (file)
@@ -1,22 +1,23 @@
 .float silent;
 
+float w_deathtype, w_issilent, w_random;
+vector w_org, w_backoff;
+
 void Ent_DamageInfo(float isNew)
 {
-       float hittype, dmg, rad, edge, thisdmg, forcemul;
-       float issilent;
-       vector force, org, thisforce;
+       float dmg, rad, edge, thisdmg, forcemul;
+       vector force, thisforce;
        entity oldself;
 
        oldself = self;
 
-       hittype = ReadShort();
-
-       issilent = (hittype & 0x8000);
-       hittype = (hittype & 0x7FFF);
+       w_deathtype = ReadShort();
+       w_issilent = (w_deathtype & 0x8000);
+       w_deathtype = (w_deathtype & 0x7FFF);
 
-       org_x = ReadCoord();
-       org_y = ReadCoord();
-       org_z = ReadCoord();
+       w_org_x = ReadCoord();
+       w_org_y = ReadCoord();
+       w_org_z = ReadCoord();
 
        dmg = ReadByte();
        rad = ReadByte();
@@ -34,22 +35,22 @@ void Ent_DamageInfo(float isNew)
        else
                forcemul = 1;
        
-       for(self = findradius(org, rad); self; self = self.chain)
+       for(self = findradius(w_org, rad); self; self = self.chain)
        {
                if(rad)
                {
-                       thisdmg = vlen(self.origin - org) / rad;
+                       thisdmg = vlen(self.origin - w_org) / rad;
                        if(thisdmg >= 1)
                                continue;
                        if(dmg)
                        {
                                thisdmg = dmg + (edge - dmg) * thisdmg;
-                               thisforce = forcemul * vlen(force) * (thisdmg / dmg) * normalize(self.origin - org);
+                               thisforce = forcemul * vlen(force) * (thisdmg / dmg) * normalize(self.origin - w_org);
                        }
                        else
                        {
                                thisdmg = 0;
-                               thisforce = forcemul * vlen(force) * normalize(self.origin - org);
+                               thisforce = forcemul * vlen(force) * normalize(self.origin - w_org);
                        }
                }
                else
@@ -69,276 +70,38 @@ void Ent_DamageInfo(float isNew)
                                //print("pushed ", ftos(num_for_edict(self)), " loose\n");
                        }
 
-               if(issilent)
+               if(w_issilent)
                        self.silent = 1;
 
                if(self.event_damage)
-                       self.event_damage(thisdmg, hittype, org, thisforce);
+                       self.event_damage(thisdmg, w_deathtype, w_org, thisforce);
        }
 
        self = oldself;
 
-       // TODO spawn particle effects and sounds based on hittype
+       // TODO spawn particle effects and sounds based on w_deathtype
        
-       if(!DEATH_ISSPECIAL(hittype))
+       if(!DEATH_ISSPECIAL(w_deathtype))
        {
-               float hitwep, secondary, bounce, headshot;
-               vector org2, backoff;
-               float r;
+               float hitwep;
 
-               hitwep = DEATH_WEAPONOFWEAPONDEATH(hittype);
-               secondary = hittype & HITTYPE_SECONDARY;
-               bounce = hittype & HITTYPE_BOUNCE;
-               headshot = hittype & HITTYPE_HEADSHOT;
-               r = prandom();
+               hitwep = DEATH_WEAPONOFWEAPONDEATH(w_deathtype);
+               w_random = prandom();
 
-               traceline(org - normalize(force) * 16, org + normalize(force) * 16, MOVE_NOMONSTERS, world);
+               traceline(w_org - normalize(force) * 16, w_org + normalize(force) * 16, MOVE_NOMONSTERS, world);
                if(trace_fraction < 1 && hitwep != WEP_NEX && hitwep != WEP_MINSTANEX)
-                       backoff = trace_plane_normal;
+                       w_backoff = trace_plane_normal;
                else
-                       backoff = -1 * normalize(force);
-
-               setorigin(self, org + backoff * 2); // for sound() calls
+                       w_backoff = -1 * normalize(force);
+               setorigin(self, w_org + w_backoff * 2); // for sound() calls
 
-               switch(hitwep)
-               {
-                       case WEP_LASER:
-                               org2 = org + backoff * 6;
-                               pointparticles(particleeffectnum("laser_impact"), org2, backoff * 1000, 1);
-                               if(!issilent)
-                                       sound(self, CHAN_PROJECTILE, "weapons/laserimpact.wav", VOL_BASE, ATTN_NORM);
-                               break;
-                       case WEP_SHOTGUN:
-                               org2 = org + backoff * 2;
-                               pointparticles(particleeffectnum("shotgun_impact"), org2, backoff * 1000, 1);
-                               if(!issilent)
-                               {
-                                       if(r < 0.05)
-                                               sound(self, CHAN_PROJECTILE, "weapons/ric1.wav", VOL_BASE, ATTN_NORM);
-                                       else if(r < 0.1)
-                                               sound(self, CHAN_PROJECTILE, "weapons/ric2.wav", VOL_BASE, ATTN_NORM);
-                                       else if(r < 0.2)
-                                               sound(self, CHAN_PROJECTILE, "weapons/ric3.wav", VOL_BASE, ATTN_NORM);
-                               }
-                               break;
-                       case WEP_UZI:
-                               org2 = org + backoff * 2;
-                               pointparticles(particleeffectnum("machinegun_impact"), org2, backoff * 1000, 1);
-                               if(!issilent)
-                                       if(r < 0.05)
-                                               sound(self, CHAN_PROJECTILE, "weapons/ric1.wav", VOL_BASE, ATTN_NORM);
-                                       else if(r < 0.1)
-                                               sound(self, CHAN_PROJECTILE, "weapons/ric2.wav", VOL_BASE, ATTN_NORM);
-                                       else if(r < 0.2)
-                                               sound(self, CHAN_PROJECTILE, "weapons/ric3.wav", VOL_BASE, ATTN_NORM);
-                               break;
-                       case WEP_GRENADE_LAUNCHER:
-                               org2 = org + backoff * 12;
-                               pointparticles(particleeffectnum("grenade_explode"), org2, '0 0 0', 1);
-                               if(!issilent)
-                                       sound(self, CHAN_PROJECTILE, "weapons/grenade_impact.wav", VOL_BASE, ATTN_NORM);
-                               break;
-                       case WEP_ELECTRO:
-                               org2 = org + backoff * 6;
-                               if(secondary)
-                               {
-                                       pointparticles(particleeffectnum("electro_ballexplode"), org2, '0 0 0', 1);
-                                       if(!issilent)
-                                               sound(self, CHAN_PROJECTILE, "weapons/electro_impact.wav", VOL_BASE, ATTN_NORM);
-                               }
-                               else
-                               {
-                                       if(bounce)
-                                       {
-                                               // this is sent as "primary bounce" to distinguish it from secondary bounced balls
-                                               pointparticles(particleeffectnum("electro_combo"), org2, '0 0 0', 1);
-                                               if(!issilent)
-                                                       sound(self, CHAN_PROJECTILE, "weapons/electro_impact_combo.wav", VOL_BASE, ATTN_NORM);
-                                       }
-                                       else
-                                       {
-                                               pointparticles(particleeffectnum("electro_impact"), org2, '0 0 0', 1);
-                                               if(!issilent)
-                                                       sound(self, CHAN_PROJECTILE, "weapons/electro_impact.wav", VOL_BASE, ATTN_NORM);
-                                       }
-                               }
-                               break;
-                       case WEP_CRYLINK:
-                               org2 = org + backoff * 2;
-                               if(secondary)
-                               {
-                                       pointparticles(particleeffectnum("crylink_impact"), org2, '0 0 0', 1);
-                                       if(!issilent)
-                                               sound(self, CHAN_PROJECTILE, "weapons/crylink_impact2.wav", VOL_BASE, ATTN_NORM);
-                               }
-                               else
-                               {
-                                       pointparticles(particleeffectnum("crylink_impactbig"), org2, '0 0 0', 1);
-                                       if(!issilent)
-                                               sound(self, CHAN_PROJECTILE, "weapons/crylink_impact.wav", VOL_BASE, ATTN_NORM);
-                               }
-                               break;
-                       case WEP_NEX:
-                               org2 = org + backoff * 6;
-                               pointparticles(particleeffectnum("nex_impact"), org2, '0 0 0', 1);
-                               if(!issilent)
-                                       sound(self, CHAN_PROJECTILE, "weapons/neximpact.wav", VOL_BASE, ATTN_NORM);
-                               break;
-                       case WEP_HAGAR:
-                               org2 = org + backoff * 6;
-                               pointparticles(particleeffectnum("hagar_explode"), org2, '0 0 0', 1);
-                               if(!issilent)
-                               {
-                                       if (r<0.15)
-                                               sound(self, CHAN_PROJECTILE, "weapons/hagexp1.wav", VOL_BASE, ATTN_NORM);
-                                       else if (r<0.7)
-                                               sound(self, CHAN_PROJECTILE, "weapons/hagexp2.wav", VOL_BASE, ATTN_NORM);
-                                       else
-                                               sound(self, CHAN_PROJECTILE, "weapons/hagexp3.wav", VOL_BASE, ATTN_NORM);
-                               }
-                               break;
-                       case WEP_ROCKET_LAUNCHER:
-                               org2 = org + backoff * 12;
-                               pointparticles(particleeffectnum("rocket_explode"), org2, '0 0 0', 1);
-                               if(!issilent)
-                                       sound(self, CHAN_PROJECTILE, "weapons/rocket_impact.wav", VOL_BASE, ATTN_NORM);
-                               break;
-                       case WEP_PORTO:
-                               print("Since when does Porto send DamageInfo?\n");
-                               break;
-                       case WEP_MINSTANEX:
-                               org2 = org + backoff * 6;
-                               pointparticles(particleeffectnum("nex_impact"), org2, '0 0 0', 1);
-                               if(!issilent)
-                                       sound(self, CHAN_PROJECTILE, "weapons/neximpact.wav", VOL_BASE, ATTN_NORM);
-                               break;
-                       case WEP_HOOK:
-                               org2 = org + backoff * 2;
-                               pointparticles(particleeffectnum("hookbomb_explode"), org2, '0 0 0', 1);
-                               if(!issilent)
-                                       sound(self, CHAN_PROJECTILE, "weapons/hookbomb_impact.wav", VOL_BASE, ATTN_NORM);
-                               break;
-                       case WEP_SEEKER:
-                               org2 = org + backoff * 6;
-                               if(secondary)
-                               {
-                                       pointparticles(particleeffectnum("flac_explode"), org2, '0 0 0', 1);
-                                       if(!issilent)
-                                       {
-                                               if (r<0.15)
-                                                       sound(self, CHAN_PROJECTILE, "weapons/flacexp1.wav", 1, ATTN_NORM);
-                                               else if (r<0.7)
-                                                       sound(self, CHAN_PROJECTILE, "weapons/flacexp2.wav", 1, ATTN_NORM);
-                                               else
-                                                       sound(self, CHAN_PROJECTILE, "weapons/flacexp3.wav", 1, ATTN_NORM);
-                                       }
-                               }
-                               else
-                               {
-                                       if(bounce)
-                                       {
-                                               pointparticles(particleeffectnum("hagar_explode"), org2, '0 0 0', 1);
-                                               if(!issilent)
-                                               {
-                                                       if (r<0.15)
-                                                               sound(self, CHAN_PROJECTILE, "weapons/tagexp1.wav", 1, ATTN_NORM);
-                                                       else if (r<0.7)
-                                                               sound(self, CHAN_PROJECTILE, "weapons/tagexp2.wav", 1, ATTN_NORM);
-                                                       else
-                                                               sound(self, CHAN_PROJECTILE, "weapons/tagexp3.wav", 1, ATTN_NORM);
-                                               }
-                                       }
-                                       else if(headshot)
-                                       {
-                                               if(!issilent)
-                                                       sound(self, CHAN_PROJECTILE, "weapons/tag_impact.wav", 1, ATTN_NORM);
-                                       }
-                                       else
-                                       {
-                                               pointparticles(particleeffectnum("hagar_explode"), org2, '0 0 0', 1);
-                                               if(!issilent)
-                                               {
-                                                       if (r<0.15)
-                                                               sound(self, CHAN_PROJECTILE, "weapons/seekerexp1.wav", 1, ATTN_NORM);
-                                                       else if (r<0.7)
-                                                               sound(self, CHAN_PROJECTILE, "weapons/seekerexp2.wav", 1, ATTN_NORM);
-                                                       else
-                                                               sound(self, CHAN_PROJECTILE, "weapons/seekerexp3.wav", 1, ATTN_NORM);
-                                               }
-                                       }
-                               }
-                               break;
-                       case WEP_HLAC:
-                               org2 = org + backoff * 6;
-                               pointparticles(particleeffectnum("laser_impact"), org2, backoff * 1000, 1);
-                               if(!issilent)
-                                       sound(self, CHAN_PROJECTILE, "weapons/laserimpact.wav", VOL_BASE, ATTN_NORM);
-                               break;
-                       case WEP_CAMPINGRIFLE:
-                               org2 = org + backoff * 2;
-                               pointparticles(particleeffectnum("machinegun_impact"), org2, backoff * 1000, 1);
-                               if(!issilent)
-                               {
-                                       if(r < 0.2)
-                                               sound(self, CHAN_PROJECTILE, "weapons/ric1.wav", VOL_BASE, ATTN_NORM);
-                                       else if(r < 0.4)
-                                               sound(self, CHAN_PROJECTILE, "weapons/ric2.wav", VOL_BASE, ATTN_NORM);
-                                       else if(r < 0.5)
-                                               sound(self, CHAN_PROJECTILE, "weapons/ric3.wav", VOL_BASE, ATTN_NORM);
-                               }
-                               break;
-                       case WEP_TUBA:
-                               break;
-                       case WEP_FIREBALL:
-                               if(secondary)
-                               {
-                                       // firemine goes out silently
-                               }
-                               else
-                               {
-                                       org2 = org + backoff * 16;
-                                       pointparticles(particleeffectnum("fireball_explode"), org2, '0 0 0', 1);
-                                       if(!issilent)
-                                               sound(self, CHAN_PROJECTILE, "weapons/fireball_impact2.wav", VOL_BASE, ATTN_NORM * 0.25); // long range boom
-                               }
-                               break;
-                       default:
-                               dprint("Unhandled damage of weapon ", ftos(hitwep), "\n");
-                               break;
-               }
+               (get_weaponinfo(hitwep)).weapon_func(WR_IMPACTEFFECT);
        }
 }
 
 void DamageInfo_Precache()
 {
-       precache_sound("weapons/crylink_impact2.wav");
-       precache_sound("weapons/crylink_impact.wav");
-       precache_sound("weapons/electro_impact.wav");
-       precache_sound("weapons/electro_impact_combo.wav");
-       precache_sound("weapons/flacexp1.wav");
-       precache_sound("weapons/flacexp2.wav");
-       precache_sound("weapons/flacexp3.wav")