Merge remote-tracking branch 'origin/terencehill/HUD_config_string_fix'
authorSamual Lenks <samual@xonotic.org>
Mon, 19 Aug 2013 21:15:03 +0000 (17:15 -0400)
committerSamual Lenks <samual@xonotic.org>
Mon, 19 Aug 2013 21:15:03 +0000 (17:15 -0400)
111 files changed:
.gitignore
_hud_common.cfg
_hud_descriptions.cfg
balance25.cfg
balanceFruitieX.cfg
balanceXDF.cfg
balanceXPM.cfg
balanceXonotic.cfg
commands.cfg
cpp.cfg
crosshairs.cfg
defaultXDF.cfg
defaultXPM.cfg
defaultXonotic.cfg
effectinfo.txt
gamemodes.cfg
hud_luminos.cfg
hud_luminos_minimal.cfg
hud_luminos_minimal_xhair.cfg
hud_luminos_old.cfg
hud_nexuiz.cfg
input-rtlights.cfg
models/ok_nade_counter/ok_nade_counter.md3 [new file with mode: 0644]
models/ok_nade_counter/ok_nade_counter.md3_0.skin [new file with mode: 0644]
models/ok_nade_counter/ok_nade_counter.md3_1.skin [new file with mode: 0644]
models/ok_nade_counter/ok_nade_counter.md3_2.skin [new file with mode: 0644]
models/ok_nade_counter/ok_nade_counter.md3_3.skin [new file with mode: 0644]
models/ok_nade_counter/ok_nade_counter.md3_4.skin [new file with mode: 0644]
models/ok_nade_counter/ok_nade_counter.md3_5.skin [new file with mode: 0644]
models/ok_nade_counter/ok_nade_counter.md3_6.skin [new file with mode: 0644]
models/ok_nade_counter/ok_nade_counter.md3_7.skin [new file with mode: 0644]
models/ok_nade_counter/ok_nade_counter.md3_8.skin [new file with mode: 0644]
models/ok_nade_counter/ok_nade_counter.md3_9.skin [new file with mode: 0644]
models/ok_nade_counter/ok_nade_counter_01.tga [new file with mode: 0644]
models/ok_nade_counter/ok_nade_counter_02.tga [new file with mode: 0644]
models/ok_nade_counter/ok_nade_counter_03.tga [new file with mode: 0644]
models/ok_nade_counter/ok_nade_counter_04.tga [new file with mode: 0644]
models/ok_nade_counter/ok_nade_counter_05.tga [new file with mode: 0644]
models/ok_nade_counter/ok_nade_counter_06.tga [new file with mode: 0644]
models/ok_nade_counter/ok_nade_counter_07.tga [new file with mode: 0644]
models/ok_nade_counter/ok_nade_counter_08.tga [new file with mode: 0644]
models/ok_nade_counter/ok_nade_counter_09.tga [new file with mode: 0644]
mutators.cfg [new file with mode: 0644]
physicsX.cfg
physicsX07.cfg [new file with mode: 0644]
physicsXSamual.cfg [deleted file]
qcsrc/Makefile
qcsrc/client/Main.qc
qcsrc/client/View.qc
qcsrc/client/autocvars.qh
qcsrc/client/command/cl_cmd.qc
qcsrc/client/csqc_builtins.qc [deleted file]
qcsrc/client/hud.qc
qcsrc/client/particles.qc
qcsrc/client/projectile.qc
qcsrc/client/target_music.qc
qcsrc/collect-precache.sh [new file with mode: 0755]
qcsrc/common/constants.qh
qcsrc/common/deathtypes.qh
qcsrc/common/mapinfo.qc
qcsrc/common/notifications.qh
qcsrc/dpdefs/csprogsdefs.qc
qcsrc/menu/menu.qc
qcsrc/menu/xonotic/dialog_settings_audio.c
qcsrc/menu/xonotic/slider_decibels.c
qcsrc/server/autocvars.qh
qcsrc/server/bot/havocbot/havocbot.qc
qcsrc/server/cheats.qc
qcsrc/server/cl_client.qc
qcsrc/server/cl_physics.qc
qcsrc/server/cl_player.qc
qcsrc/server/cl_weaponsystem.qc
qcsrc/server/defs.qh
qcsrc/server/g_damage.qc
qcsrc/server/g_world.qc
qcsrc/server/miscfunctions.qc
qcsrc/server/mutators/base.qh
qcsrc/server/mutators/gamemode_arena.qc
qcsrc/server/mutators/gamemode_ca.qc
qcsrc/server/mutators/gamemode_freezetag.qc
qcsrc/server/mutators/gamemode_lms.qc
qcsrc/server/mutators/gamemode_lms.qh
qcsrc/server/mutators/gamemode_nexball.qc
qcsrc/server/mutators/mutator_bloodloss.qc [new file with mode: 0644]
qcsrc/server/mutators/mutator_campcheck.qc [new file with mode: 0644]
qcsrc/server/mutators/mutator_dodging.qc
qcsrc/server/mutators/mutator_dodging.qh
qcsrc/server/mutators/mutator_melee_only.qc [new file with mode: 0644]
qcsrc/server/mutators/mutator_midair.qc [new file with mode: 0644]
qcsrc/server/mutators/mutator_minstagib.qc
qcsrc/server/mutators/mutator_multijump.qc [new file with mode: 0644]
qcsrc/server/mutators/mutator_nades.qc [new file with mode: 0644]
qcsrc/server/mutators/mutator_nades.qh [new file with mode: 0644]
qcsrc/server/mutators/mutator_pinata.qc [new file with mode: 0644]
qcsrc/server/mutators/mutator_random_gravity.qc [new file with mode: 0644]
qcsrc/server/mutators/mutator_vampire.qc
qcsrc/server/mutators/mutators.qh
qcsrc/server/progs.src
qcsrc/server/sv_main.qc
qcsrc/server/t_items.qc
qcsrc/server/t_jumppads.qc
qcsrc/server/teamplay.qc
qcsrc/server/w_crylink.qc
qcsrc/server/w_hlac.qc
qcsrc/server/w_uzi.qc
qcsrc/warpzonelib/common.qc
scripts/ok_nade_counter.shader [new file with mode: 0644]
scripts/shaderlist.txt
vehicle_racer.cfg
vehicle_raptor.cfg
vehicle_spiderbot.cfg

index 2a4ad93..111ff91 100644 (file)
@@ -6,3 +6,4 @@ qcsrc/menu/fteqcc.log
 qcsrc/server/fteqcc.log
 weapons.qc.tmp
 *.lno
+qcsrc/qccversion.*
index 15453b7..4a49997 100644 (file)
@@ -81,7 +81,7 @@ seta hud_contents_fadeintime 0.02 "factor of time it takes for the alpha level t
 seta hud_contents_fadeouttime 0.1 "factor of time it takes for the alpha level to reach normal value when leaving the liquid"
 seta hud_contents_lava_alpha 0.7 "alpha of the lava"
 seta hud_contents_lava_color "0.8 0.1 0" "color blend when inside lava"
-seta hud_contents_slime_alpha 0.7 "alpha of the slime" 
+seta hud_contents_slime_alpha 0.7 "alpha of the slime"
 seta hud_contents_slime_color "0 0.4 0.1" "color blend when inside slime"
 seta hud_contents_water_alpha 0.5 "alpha of the water"
 seta hud_contents_water_color "0.4 0.3 0.3" "color blend when inside water"
index 9c7201d..5f21867 100644 (file)
@@ -167,7 +167,7 @@ seta hud_panel_score_bg_color_team "" "override panel color with team color in t
 seta hud_panel_score_bg_alpha "" "if set to something else than \"\" = override default panel background alpha"
 seta hud_panel_score_bg_border "" "if set to something else than \"\" = override default size of border around the background"
 seta hud_panel_score_bg_padding "" "if set to something else than \"\" = override default padding of contents from border"
-seta hud_panel_score_rankings "" "show rankings: 1 always show my own score; 2 pure rankings" 
+seta hud_panel_score_rankings "" "show rankings: 1 always show my own score; 2 pure rankings"
 
 seta hud_panel_racetimer "" "enable/disable this panel"
 seta hud_panel_racetimer_pos "" "position of this base of the panel"
index 3438918..9451d37 100644 (file)
@@ -158,7 +158,7 @@ set g_projectiles_damage 2
 // possible values:
 // -2: absolutely no damage to projectiles (no exceptions)
 // -1: no damage other than the exceptions (electro combo, hagar join explode, ML mines)
-// 0: only damage from contents (lava/slime) or exceptions 
+// 0: only damage from contents (lava/slime) or exceptions
 // 1: only self damage or damage from contents or exceptions
 // 2: allow all damage to projectiles normally
 set g_projectiles_keep_owner 0
@@ -303,7 +303,7 @@ set g_balance_uzi_burst_animtime 0.75
 set g_balance_uzi_burst_refire 0.05            // refire between burst bullets
 set g_balance_uzi_burst_refire2 0.75   // refire after burst
 set g_balance_uzi_burst_spread 0.04
-set g_balance_uzi_burst_damage 18              
+set g_balance_uzi_burst_damage 18
 set g_balance_uzi_burst_force 50
 set g_balance_uzi_burst_ammo 3
 
@@ -440,7 +440,6 @@ set g_balance_crylink_primary_ammo 2
 set g_balance_crylink_primary_bouncedamagefactor 0.5
 set g_balance_crylink_primary_joindelay 0
 set g_balance_crylink_primary_joinspread 0
-set g_balance_crylink_primary_jointime 0
 set g_balance_crylink_primary_joinexplode 0
 set g_balance_crylink_primary_joinexplode_damage 0
 set g_balance_crylink_primary_joinexplode_edgedamage 0
@@ -469,9 +468,8 @@ set g_balance_crylink_secondary_ammo 2
 set g_balance_crylink_secondary_bouncedamagefactor 0.5
 set g_balance_crylink_secondary_joindelay 0
 set g_balance_crylink_secondary_joinspread 0
-set g_balance_crylink_secondary_jointime 0
-set g_balance_crylink_secondary_joinexplode 0                  
-set g_balance_crylink_secondary_joinexplode_damage 0   
+set g_balance_crylink_secondary_joinexplode 0
+set g_balance_crylink_secondary_joinexplode_damage 0
 set g_balance_crylink_secondary_joinexplode_edgedamage 0
 set g_balance_crylink_secondary_joinexplode_radius 0
 set g_balance_crylink_secondary_joinexplode_force 0
index ce12542..f985659 100644 (file)
@@ -158,7 +158,7 @@ set g_projectiles_damage 2
 // possible values:
 // -2: absolutely no damage to projectiles (no exceptions)
 // -1: no damage other than the exceptions (electro combo, hagar join explode, ML mines)
-// 0: only damage from contents (lava/slime) or exceptions 
+// 0: only damage from contents (lava/slime) or exceptions
 // 1: only self damage or damage from contents or exceptions
 // 2: allow all damage to projectiles normally
 set g_projectiles_keep_owner 0
@@ -440,7 +440,6 @@ set g_balance_crylink_primary_ammo 2
 set g_balance_crylink_primary_bouncedamagefactor 0.2
 set g_balance_crylink_primary_joindelay 0
 set g_balance_crylink_primary_joinspread 0.2
-set g_balance_crylink_primary_jointime 0.1
 set g_balance_crylink_primary_joinexplode 0
 set g_balance_crylink_primary_joinexplode_damage 0
 set g_balance_crylink_primary_joinexplode_edgedamage 0
@@ -469,9 +468,8 @@ set g_balance_crylink_secondary_ammo 3 // LOG: 2 -> 3
 set g_balance_crylink_secondary_bouncedamagefactor 0.4 // LOG: 0.2 -> 0.4
 set g_balance_crylink_secondary_joindelay 0
 set g_balance_crylink_secondary_joinspread 0.2
-set g_balance_crylink_secondary_jointime 0.1
-set g_balance_crylink_secondary_joinexplode 0                  
-set g_balance_crylink_secondary_joinexplode_damage 0   
+set g_balance_crylink_secondary_joinexplode 0
+set g_balance_crylink_secondary_joinexplode_damage 0
 set g_balance_crylink_secondary_joinexplode_edgedamage 0
 set g_balance_crylink_secondary_joinexplode_radius 0
 set g_balance_crylink_secondary_joinexplode_force 0
index 5745548..4e06315 100644 (file)
@@ -158,7 +158,7 @@ set g_projectiles_damage 2
 // possible values:
 // -2: absolutely no damage to projectiles (no exceptions)
 // -1: no damage other than the exceptions (electro combo, hagar join explode, ML mines)
-// 0: only damage from contents (lava/slime) or exceptions 
+// 0: only damage from contents (lava/slime) or exceptions
 // 1: only self damage or damage from contents or exceptions
 // 2: allow all damage to projectiles normally
 set g_projectiles_keep_owner 0
@@ -303,7 +303,7 @@ set g_balance_uzi_burst_animtime 0.3
 set g_balance_uzi_burst_refire 0.06            // refire between burst bullets
 set g_balance_uzi_burst_refire2 0.45   // refire after burst
 set g_balance_uzi_burst_spread 0.03
-set g_balance_uzi_burst_damage 25              
+set g_balance_uzi_burst_damage 25
 set g_balance_uzi_burst_force 20
 set g_balance_uzi_burst_ammo 3
 
@@ -425,7 +425,7 @@ set g_balance_electro_switchdelay_raise 0
 set g_balance_electro_reload_ammo 0 //default: 20
 set g_balance_electro_reload_time 2
 // }}}
-// {{{ crylink 
+// {{{ crylink
 set g_balance_crylink_primary_damage 12
 set g_balance_crylink_primary_edgedamage 6
 set g_balance_crylink_primary_force -50
@@ -440,7 +440,6 @@ set g_balance_crylink_primary_ammo 3
 set g_balance_crylink_primary_bouncedamagefactor 0.5
 set g_balance_crylink_primary_joindelay 0.1
 set g_balance_crylink_primary_joinspread 0.2
-set g_balance_crylink_primary_jointime 0
 set g_balance_crylink_primary_joinexplode 1
 set g_balance_crylink_primary_joinexplode_damage 0
 set g_balance_crylink_primary_joinexplode_edgedamage 0
@@ -450,7 +449,7 @@ set g_balance_crylink_primary_linkexplode 1
 
 set g_balance_crylink_primary_middle_lifetime 5 // range: 35000 full, fades to 70000
 set g_balance_crylink_primary_middle_fadetime 5
-set g_balance_crylink_primary_other_lifetime 5 
+set g_balance_crylink_primary_other_lifetime 5
 set g_balance_crylink_primary_other_fadetime 5
 
 set g_balance_crylink_secondary 1
@@ -469,9 +468,8 @@ set g_balance_crylink_secondary_ammo 2
 set g_balance_crylink_secondary_bouncedamagefactor 0.5
 set g_balance_crylink_secondary_joindelay 0
 set g_balance_crylink_secondary_joinspread 0
-set g_balance_crylink_secondary_jointime 0
-set g_balance_crylink_secondary_joinexplode 0                  
-set g_balance_crylink_secondary_joinexplode_damage 0   
+set g_balance_crylink_secondary_joinexplode 0
+set g_balance_crylink_secondary_joinexplode_damage 0
 set g_balance_crylink_secondary_joinexplode_edgedamage 0
 set g_balance_crylink_secondary_joinexplode_radius 0
 set g_balance_crylink_secondary_joinexplode_force 0
@@ -479,7 +477,7 @@ set g_balance_crylink_secondary_linkexplode 1
 
 set g_balance_crylink_secondary_middle_lifetime 5 // range: 35000 full, fades to 70000
 set g_balance_crylink_secondary_middle_fadetime 5
-set g_balance_crylink_secondary_line_lifetime 5 
+set g_balance_crylink_secondary_line_lifetime 5
 set g_balance_crylink_secondary_line_fadetime 5
 
 set g_balance_crylink_switchdelay_drop 0
@@ -669,7 +667,7 @@ set g_balance_tuba_pitchstep 6
 set g_balance_tuba_switchdelay_drop 0
 set g_balance_tuba_switchdelay_raise 0
 // }}}
-// {{{ fireball // this is a superweapon -- lets make it behave as one. 
+// {{{ fireball // this is a superweapon -- lets make it behave as one.
 set g_balance_fireball_primary_animtime 0.2
 set g_balance_fireball_primary_bfgdamage 100
 set g_balance_fireball_primary_bfgforce 0
index 9eebc5e..b60d779 100644 (file)
@@ -158,7 +158,7 @@ set g_projectiles_damage 1
 // possible values:
 // -2: absolutely no damage to projectiles (no exceptions)
 // -1: no damage other than the exceptions (electro combo, hagar join explode, ML mines)
-// 0: only damage from contents (lava/slime) or exceptions 
+// 0: only damage from contents (lava/slime) or exceptions
 // 1: only self damage or damage from contents or exceptions
 // 2: allow all damage to projectiles normally
 set g_projectiles_keep_owner 0
@@ -303,7 +303,7 @@ set g_balance_uzi_burst_animtime 0.3
 set g_balance_uzi_burst_refire 0.06            // refire between burst bullets
 set g_balance_uzi_burst_refire2 0.45   // refire after burst
 set g_balance_uzi_burst_spread 0.02
-set g_balance_uzi_burst_damage 25              
+set g_balance_uzi_burst_damage 25
 set g_balance_uzi_burst_force 20
 set g_balance_uzi_burst_ammo 3
 
@@ -425,7 +425,7 @@ set g_balance_electro_switchdelay_raise 0.2
 set g_balance_electro_reload_ammo 0 //default: 20
 set g_balance_electro_reload_time 2
 // }}}
-// {{{ crylink 
+// {{{ crylink
 set g_balance_crylink_primary_damage 12
 set g_balance_crylink_primary_edgedamage 6
 set g_balance_crylink_primary_force -50
@@ -440,7 +440,6 @@ set g_balance_crylink_primary_ammo 3
 set g_balance_crylink_primary_bouncedamagefactor 0.5
 set g_balance_crylink_primary_joindelay 0.1
 set g_balance_crylink_primary_joinspread 0.2
-set g_balance_crylink_primary_jointime 0
 set g_balance_crylink_primary_joinexplode 1
 set g_balance_crylink_primary_joinexplode_damage 0
 set g_balance_crylink_primary_joinexplode_edgedamage 0
@@ -450,7 +449,7 @@ set g_balance_crylink_primary_linkexplode 1
 
 set g_balance_crylink_primary_middle_lifetime 5 // range: 35000 full, fades to 70000
 set g_balance_crylink_primary_middle_fadetime 5
-set g_balance_crylink_primary_other_lifetime 5 
+set g_balance_crylink_primary_other_lifetime 5
 set g_balance_crylink_primary_other_fadetime 5
 
 set g_balance_crylink_secondary 1
@@ -469,9 +468,8 @@ set g_balance_crylink_secondary_ammo 2
 set g_balance_crylink_secondary_bouncedamagefactor 0.5
 set g_balance_crylink_secondary_joindelay 0
 set g_balance_crylink_secondary_joinspread 0
-set g_balance_crylink_secondary_jointime 0
-set g_balance_crylink_secondary_joinexplode 0                  
-set g_balance_crylink_secondary_joinexplode_damage 0   
+set g_balance_crylink_secondary_joinexplode 0
+set g_balance_crylink_secondary_joinexplode_damage 0
 set g_balance_crylink_secondary_joinexplode_edgedamage 0
 set g_balance_crylink_secondary_joinexplode_radius 0
 set g_balance_crylink_secondary_joinexplode_force 0
@@ -479,7 +477,7 @@ set g_balance_crylink_secondary_linkexplode 1
 
 set g_balance_crylink_secondary_middle_lifetime 5 // range: 35000 full, fades to 70000
 set g_balance_crylink_secondary_middle_fadetime 5
-set g_balance_crylink_secondary_line_lifetime 5 
+set g_balance_crylink_secondary_line_lifetime 5
 set g_balance_crylink_secondary_line_fadetime 5
 
 set g_balance_crylink_switchdelay_drop 0.2
@@ -669,7 +667,7 @@ set g_balance_tuba_pitchstep 6
 set g_balance_tuba_switchdelay_drop 0.2
 set g_balance_tuba_switchdelay_raise 0.2
 // }}}
-// {{{ fireball // this is a superweapon -- lets make it behave as one. 
+// {{{ fireball // this is a superweapon -- lets make it behave as one.
 set g_balance_fireball_primary_animtime 0.2
 set g_balance_fireball_primary_bfgdamage 100
 set g_balance_fireball_primary_bfgforce 0
index fa4795c..3b8724c 100644 (file)
@@ -158,7 +158,7 @@ set g_projectiles_damage 2
 // possible values:
 // -2: absolutely no damage to projectiles (no exceptions)
 // -1: no damage other than the exceptions (electro combo, hagar join explode, ML mines)
-// 0: only damage from contents (lava/slime) or exceptions 
+// 0: only damage from contents (lava/slime) or exceptions
 // 1: only self damage or damage from contents or exceptions
 // 2: allow all damage to projectiles normally
 set g_projectiles_keep_owner 0
@@ -303,7 +303,7 @@ set g_balance_uzi_burst_animtime 0.3
 set g_balance_uzi_burst_refire 0.06            // refire between burst bullets
 set g_balance_uzi_burst_refire2 0.45   // refire after burst
 set g_balance_uzi_burst_spread 0.02
-set g_balance_uzi_burst_damage 25              
+set g_balance_uzi_burst_damage 25
 set g_balance_uzi_burst_force 20
 set g_balance_uzi_burst_ammo 3
 
@@ -425,7 +425,7 @@ set g_balance_electro_switchdelay_raise 0.2
 set g_balance_electro_reload_ammo 0 //default: 20
 set g_balance_electro_reload_time 2
 // }}}
-// {{{ crylink 
+// {{{ crylink
 set g_balance_crylink_primary_damage 12
 set g_balance_crylink_primary_edgedamage 6
 set g_balance_crylink_primary_force -50
@@ -440,7 +440,6 @@ set g_balance_crylink_primary_ammo 3
 set g_balance_crylink_primary_bouncedamagefactor 0.5
 set g_balance_crylink_primary_joindelay 0.1
 set g_balance_crylink_primary_joinspread 0.2
-set g_balance_crylink_primary_jointime 0
 set g_balance_crylink_primary_joinexplode 1
 set g_balance_crylink_primary_joinexplode_damage 0
 set g_balance_crylink_primary_joinexplode_edgedamage 0
@@ -450,7 +449,7 @@ set g_balance_crylink_primary_linkexplode 1
 
 set g_balance_crylink_primary_middle_lifetime 5 // range: 35000 full, fades to 70000
 set g_balance_crylink_primary_middle_fadetime 5
-set g_balance_crylink_primary_other_lifetime 5 
+set g_balance_crylink_primary_other_lifetime 5
 set g_balance_crylink_primary_other_fadetime 5
 
 set g_balance_crylink_secondary 1
@@ -469,9 +468,8 @@ set g_balance_crylink_secondary_ammo 2
 set g_balance_crylink_secondary_bouncedamagefactor 0.5
 set g_balance_crylink_secondary_joindelay 0
 set g_balance_crylink_secondary_joinspread 0
-set g_balance_crylink_secondary_jointime 0
-set g_balance_crylink_secondary_joinexplode 0                  
-set g_balance_crylink_secondary_joinexplode_damage 0   
+set g_balance_crylink_secondary_joinexplode 0
+set g_balance_crylink_secondary_joinexplode_damage 0
 set g_balance_crylink_secondary_joinexplode_edgedamage 0
 set g_balance_crylink_secondary_joinexplode_radius 0
 set g_balance_crylink_secondary_joinexplode_force 0
@@ -479,7 +477,7 @@ set g_balance_crylink_secondary_linkexplode 1
 
 set g_balance_crylink_secondary_middle_lifetime 5 // range: 35000 full, fades to 70000
 set g_balance_crylink_secondary_middle_fadetime 5
-set g_balance_crylink_secondary_line_lifetime 5 
+set g_balance_crylink_secondary_line_lifetime 5
 set g_balance_crylink_secondary_line_fadetime 5
 
 set g_balance_crylink_switchdelay_drop 0.2
@@ -669,7 +667,7 @@ set g_balance_tuba_pitchstep 6
 set g_balance_tuba_switchdelay_drop 0.2
 set g_balance_tuba_switchdelay_raise 0.2
 // }}}
-// {{{ fireball // this is a superweapon -- lets make it behave as one. 
+// {{{ fireball // this is a superweapon -- lets make it behave as one.
 set g_balance_fireball_primary_animtime 0.2
 set g_balance_fireball_primary_bfgdamage 100
 set g_balance_fireball_primary_bfgforce 0
index 20f8b6b..3259478 100644 (file)
@@ -226,7 +226,7 @@ alias movetoauto "moveplayer ${1 ?} auto"
 
 
 // =======================================================
-//  Aliases for settemp subsystem. Warning: Do not touch. 
+//  Aliases for settemp subsystem. Warning: Do not touch.
 //  Usage: settemp variable value, next map resets it.
 // =======================================================
 alias settemp "qc_cmd_svcl settemp $*"
diff --git a/cpp.cfg b/cpp.cfg
index 3a19053..16cab22 100644 (file)
--- a/cpp.cfg
+++ b/cpp.cfg
@@ -1,6 +1,6 @@
 alias _dont        ""
 alias _do          "$*"
-                  
+
 set _ifstack       ""
 alias #            "$_ifstack $*"
 
index e02e7c2..c6a9e83 100644 (file)
@@ -10,10 +10,10 @@ seta crosshair_alpha 0.75
 seta crosshair_size 0.3
 
 // crosshair dot settings
-seta crosshair_dot 0 
+seta crosshair_dot 0
 seta crosshair_dot_alpha 1
 seta crosshair_dot_size 0.600000
-seta crosshair_dot_color "1 0 0" 
+seta crosshair_dot_color "1 0 0"
 seta crosshair_dot_color_custom 1 "use a custom color for the crosshair dot"
 
 // smooth transitions for crosshair changes
index f5a5442..5d31426 100644 (file)
@@ -9,7 +9,7 @@ exec physicsXDF.cfg
 // general gameplay
 set g_jump_grunt 1 // make enemies even easier to hear when they're jumping around
 set g_shootfromcenter 1 // hit where you point at with the crosshair (almost so, no shooteye because it's really ugly)
-set g_balance_kill_antispam 0 
+set g_balance_kill_antispam 0
 set g_forced_respawn 1
 set g_jump_grunt 1
 // g_playerclip_collisions 0 // do not check playerclips
index 0e96e08..4a55a5e 100644 (file)
@@ -6,7 +6,7 @@ exec defaultXonotic.cfg
 exec balanceXPM.cfg
 
 // general gameplay
-set g_norecoil 1 
+set g_norecoil 1
 set g_shootfromcenter 1 // hit where you point at with the crosshair (almost so, no shooteye because it's really ugly)
 set g_balance_kill_antispam 0
 set g_forced_respawn 1
index 66ac0b2..7d59ac4 100644 (file)
@@ -37,6 +37,8 @@ alias -hook -button6
 alias use "impulse 21"
 
 // for backwards compatibility
+// TODO Remove after 0.8 release!
+cl_particles_forcetraileffects 1
 
 alias dropweapon "impulse 17"
 alias +show_info +button7
@@ -243,7 +245,7 @@ set cl_deathglow 0.8 "number of seconds during which dead bodies glow out"
 
 set sv_gibhealth 100 "Minus health a dead body must have in order to get gibbed"
 
-// fragmessage: This allows extra information to be displayed with the frag centerprints. 
+// fragmessage: This allows extra information to be displayed with the frag centerprints.
 set sv_fraginfo 1 "Enable extra frag message information, 0 = Never display, 1 = Display only in warmup mode; 2 = Always display"
 set sv_fraginfo_ping 1 "Enable ping display information, 0 = Never display, 1 = Always display (If the player is a bot, it will say bot instead of the ping.)"
 set sv_fraginfo_handicap 1 "Enable handicap display information, 0 = Never display, 1 = Only when the player has handicap on, 2 = Always display (Displays Off if disabled)"
@@ -378,13 +380,6 @@ set g_weapon_throwable 1 "if set to 1, weapons can be dropped"
 set g_powerups -1 "if set to 0 the strength and shield (invincibility) will not spawn on the map, if 1 they will spawn in all game modes, -1 is game mode default"
 set g_use_ammunition 1 "if set to 0 all weapons have unlimited ammunition"
 set g_pickup_items -1 "if set to 0 all items (health, armor, ammo, weapons...) are removed from the map, if 1 they are forced to spawn"
-set g_minstagib 0      "enable minstagib"
-set g_minstagib_extralives 1   "how many extra lives you will get per powerup"
-set g_minstagib_ammo_start 10  "starting ammo"
-set g_minstagib_ammo_drop 5    "how much ammo you'll get for weapons or cells"
-set g_minstagib_invis_alpha 0.15
-set g_minstagib_speed_highspeed 1.5 "speed-multiplier that applies while you carry the invincibility powerup"
-set g_vampire 0 "set to 1 to enable the vampire mode, where the damage done to your opponent gets added to your own health"
 set g_weaponarena "0"  "put in a list of weapons to enable a weapon arena mode, or try \"all\" or \"most\""
 set g_weaponarena_random "0"   "if set to a number, only that weapon count is given on every spawn (randomly)"
 set g_weaponarena_random_with_laser "1"        "additionally, always provide the laser in random weapon arena games"
@@ -414,23 +409,6 @@ set g_player_alpha 1
 set g_player_brightness 0      "set to 2 for brighter players"
 seta g_balance_cloaked_alpha 0.25
 
-set g_sandbox 0 "allow players to spawn and edit objects around the map"
-set g_sandbox_info 1 "print object information to the server. 1 prints info about spawned / removed objects, 2 also prints info about edited objects"
-set g_sandbox_readonly 0 "when this mode is active, players cannot modify objects or use any sandbox commands"
-set g_sandbox_storage_name default "name of the selected storage to use"
-set g_sandbox_storage_autosave 5 "storage is automatically saved every specified number of seconds"
-set g_sandbox_storage_autoload 1 "if a storage file exists for the given map, automatically load it at startup"
-set g_sandbox_editor_flood 1 "players must wait this many seconds between spawning objects"
-set g_sandbox_editor_maxobjects 1000 "maximum number of objects that may exist at a time"
-set g_sandbox_editor_free 1 "0 = players can only copy or edit their own objects, 1 = players can copy but not edit other objects, 2 = players can copy and edit all object"
-set g_sandbox_editor_distance_spawn 200 "distance at which objects spawn in front of the player"
-set g_sandbox_editor_distance_edit 300 "distance at which players can edit or remove objects they are looking at"
-set g_sandbox_object_scale_min 0.1 "minimum scale that objects can be set to"
-set g_sandbox_object_scale_max 2 "maximum scale that objects can be set to"
-set g_sandbox_object_material_velocity_min 100 "velocity objects must have while colliding for material effects to be applied"
-set g_sandbox_object_material_velocity_factor 0.002 "velocity range which decides the intensity of material effects"
-set cl_sandbox_clipboard ""
-
 seta menu_sandbox_spawn_model ""
 seta menu_sandbox_attach_bone ""
 seta menu_sandbox_edit_skin 0
@@ -453,26 +431,9 @@ set welcome_message_time 8
 
 set g_grappling_hook 0 "let players spawn with the grappling hook which allows them to pull themselves up"
 
-set g_invincible_projectiles 0 "set to 1 to disable any damage to projectiles in all balance configs, regardless of g_projectiles_damage"
-set g_dodging 0 "set to 1 to enable dodging in games"
-set g_rocket_flying 0 "set to 1 to enable rocket flying in all balance configs"
-
-seta cl_dodging_timeout 0.2 "determines how long apart (in seconds) two taps on the same direction key are considered a dodge. use 0 to disable"
-
-set sv_dodging_wall_dodging 0 "set to 1 to allow dodging off walls. 0 to disable"
-set sv_dodging_delay 0.5 "determines how long a player has to wait to be able to dodge again after dodging"
-set sv_dodging_up_speed 200 "the jump velocity of the dodge"
-set sv_dodging_horiz_speed 400 "the horizontal velocity of the dodge"
-set sv_dodging_ramp_time 0.1 "a ramp so that the horizontal part of the dodge is added smoothly (seconds)"
-set sv_dodging_height_threshold 10 "the maximum height above ground where to allow dodging"
-set sv_dodging_wall_distance_threshold 10 "the maximum distance from a wall that still allows dodging"
-set sv_dodging_sound 1 "if 1 dodging makes a sound. if 0 dodging is silent"
-
 set g_spawn_alloweffects 1 "allow clients to enable spawn point and event effects such as particles and sounds, see cl_spawn_ cvars for more info"
 set g_spawn_furthest 1 "this amount of the spawns shall be far away from any players"
 set g_spawn_useallspawns 0 "use all spawns, e.g. also team spawns in non-teamplay, and all spawns, even enemy spawns, in teamplay"
-set g_spawn_near_teammate 0 "if set, players prefer spawns near a team mate"
-set g_spawn_near_teammate_distance 640 "max distance to consider a spawn to be near a team mate"
 // respawn delay
 set g_respawn_delay 2 "number of seconds you have to wait before you can respawn again"
 set g_respawn_waves 0 "respawn in waves (every n seconds), intended to decrease overwhelming base attacks"
@@ -749,13 +710,6 @@ bind F2 vno
 //used for spectate/observer mode
 bind F3 spec
 
-// NIX (No Items Xonotic) - at each time, everyone uses the same weapon,
-// and in regular intervals, this weapon is cycled
-set g_nix 0 "No Items Xonotic - instead of pickup items, everyone plays with the same weapon. After some time, a countdown will start, after which everyone will switch to another weapon, and so on"
-set g_nix_with_laser 0 "always carry the laser as an additional weapon in NIX"
-set g_nix_with_healtharmor 0 "when 1, health and armor still show up in NIX"
-set g_nix_with_powerups 0 "when 1, powerups still show up in NIX"
-
 // score log
 set sv_logscores_console 0     "print scores to server console"
 set sv_logscores_file 0        "print scores to file"
@@ -973,7 +927,7 @@ seta scoreboard_color_bg_team 0.5 "team color multiplier of the scoreboard backg
 seta scoreboard_alpha_bg 0.6 "scoreboard background alpha"
 seta scoreboard_alpha_fg 1 "scoreboard foreground alpha"
 seta scoreboard_alpha_name 0.9 "alpha of player text in scoreboard list other than self"
-seta scoreboard_alpha_name_self 1 "alpha of player text in scoreboard list of self" 
+seta scoreboard_alpha_name_self 1 "alpha of player text in scoreboard list of self"
 seta scoreboard_fadeinspeed 10 "speed at which scoreboard fades in, higher is faster (0 = instant)"
 seta scoreboard_fadeoutspeed 5 "speed at which scoreboard fades out, higher is faster (0 = instant)"
 seta scoreboard_highlight 1 "enable highlighting for rows and columns in the scoreboard"
@@ -1042,19 +996,22 @@ set con_completion_vnextmap      map
 set con_completion_vdomap      map
 set con_completion_playermodel models/player/*.iqm
 
+// helper
 // these non-saved engine cvars shall be saved
-seta cl_port $cl_port
-seta r_showsurfaces $r_showsurfaces
-seta r_ambient $r_ambient
-seta skill 4
-seta gl_finish $gl_finish
-seta v_kicktime $v_kicktime
-seta r_subdivisions_tolerance $r_subdivisions_tolerance
-seta vid_gl20 $vid_gl20
-seta vid_gl13 $vid_gl13
-seta r_drawviewmodel $r_drawviewmodel
-seta v_idlescale $v_idlescale
-seta net_slist_queriespersecond $net_slist_queriespersecond
+alias makesaved "seta $1 \"${$1 ?}\"
+makesaved cl_maxfps_alwayssleep
+makesaved cl_port
+makesaved gl_finish
+makesaved net_slist_queriespersecond
+makesaved r_ambient
+makesaved r_drawviewmodel
+makesaved r_showsurfaces
+makesaved r_subdivisions_tolerance
+makesaved skill
+makesaved vid_gl13
+makesaved vid_gl20
+makesaved v_idlescale
+makesaved v_kicktime
 
 // ticrate
 //sys_ticrate 0.0166667
@@ -1086,10 +1043,6 @@ alias sethostname "set menu_use_default_hostname 0; hostname $*"
 
 set sv_foginterval 1 "force enable fog in regular intervals"
 
-set g_physical_items 0 "1 uses ODE physics for dropped weapons, 2 for all items, requires physics_ode to be enabled"
-set g_physical_items_damageforcescale 3 "how affected physical weapons are by damage"
-set g_physical_items_reset 1 "return map items to their original lotation after being picked up"
-
 // Audio track names (for old-style "cd loop NUMBER" usage)
 set _cdtrack_first "1"
 alias _cdtrack_0 "g_cdtracks_remaplist \"$g_cdtracks_remaplist $1\""
@@ -1148,7 +1101,7 @@ set sv_clones 0   "number of clones a player may make (reset by the \"kill\" comma
 
 set cl_handicap 1      "the higher, the more damage you will receive (client setting) NOTE: reconnect or use sendcvar command to update the choice."
 
-seta cl_clippedspectating 1 "movement collision for spectators so that you can't pass through walls and such. (client setting) NOTE: reconnect or use sendcvar command to update the choice." 
+seta cl_clippedspectating 1 "movement collision for spectators so that you can't pass through walls and such. (client setting) NOTE: reconnect or use sendcvar command to update the choice."
 
 seta cl_autoscreenshot 1 "Take a screenshot upon the end of a match... 0 = Disable completely, 1 = Allow sv_autoscreenshot to take a screenshot when requested, 2 = Always take an autoscreenshot anyway."
 
@@ -1172,12 +1125,6 @@ set g_bugrigs_speed_ref 400      "reference speed for accel and steer responsiveness"
 set g_bugrigs_speed_pow 2      "reference power for accel and steer responsiveness"
 set g_bugrigs_steer 1  "steering amount"
 
-set g_touchexplode 0
-set g_touchexplode_radius 50
-set g_touchexplode_damage 10
-set g_touchexplode_edgedamage 0
-set g_touchexplode_force 150
-
 set g_ban_sync_uri ""  "sync using this ban list provider (empty string to disable)"
 set g_ban_sync_interval 5      "sync every 5 minutes"
 set g_ban_sync_trusted_servers ""      "request ban lists from these xonotic servers (do not include your own server there, or unbanning may fail)"
@@ -1279,7 +1226,7 @@ seta cl_casings_maxcount 100 "maximum amount of shell casings (must be at least
 seta cl_gibs_maxcount 100 "maximum amount of gibs (must be at least 1)"
 seta cl_vehicle_spiderbot_cross_alpha 0.6
 seta cl_vehicle_spiderbot_cross_size 1
-seta cl_vehicles_hudscale 0.5 
+seta cl_vehicles_hudscale 0.5
 seta cl_vehicles_hudalpha 0.75
 seta cl_vehicles_hud_tactical 1
 
@@ -1329,7 +1276,6 @@ set developer_csqcentities 0 "csqc entity spam"
 set waypoint_benchmark 0 "quit after waypoint loading to benchmark bot navigation code"
 set g_debug_bot_commands 0 "print scripted bot commands before executing"
 set g_debug_defaultsounds 0 "always use default sounds"
-set cl_precacheplayermodels 0 "TODO please check if this needs to be 1 or if precaching a model the server already requested is fast enough to do it at runtime"
 seta cl_forceplayermodels 0 "make everyone look like your own model (requires server to have sv_defaultcharacter 0)"
 seta cl_forceplayercolors 0 "make everyone look like your own color (requires server to have sv_defaultcharacter 0, and is ignored in teamplay with more than two teams)"
 seta cl_forcemyplayermodel "" "set to the model file name you want to show yourself as (does not affect how enemies look with cl_forceplayermodels)"
@@ -1337,10 +1283,6 @@ seta cl_forcemyplayerskin 0 "set to the skin number you want to show yourself as
 seta cl_forcemyplayercolors 0 "set to the color value (encoding is same as _cl_color) for your own player model (ignored in teamplay; does not affect how enemies look with cl_forceplayermodels)"
 seta cl_movement_errorcompensation 1 "try to compensate for prediction errors and reduce preceived lag"
 
-// debug cvars for keyhunt attaching
-set _angles "0 0 0"
-set _origin "0 0 0"
-
 // campaign internal, set when loading a campaign map1G
 set _campaign_index ""
 set _campaign_name ""
@@ -1533,6 +1475,7 @@ set snd_soundradius 1200
 set snd_softclip 1
 set snd_maxchannelvolume 0
 set snd_streaming_length 2
+seta menu_snd_sliderscale 2 "0: decibels; 1: linear percent; 2: 0..10 scale; 3: slider size percent"
 seta menu_snd_attenuation_method 1 "Use exponential instead of linear falloff for sound attenuation"
 alias snd_attenuation_method_0 "set menu_snd_attenuation_method 0; set snd_soundradius 1200; set snd_attenuation_exponent 1; set snd_attenuation_decibel 0" // Quake default
 alias snd_attenuation_method_1 "set menu_snd_attenuation_method 1; set snd_soundradius 2400; set snd_attenuation_exponent 4; set snd_attenuation_decibel 0" // nice approximation for method 2
@@ -1566,6 +1509,7 @@ exec turrets.cfg
 exec vehicles.cfg
 exec crosshairs.cfg
 exec gamemodes.cfg
+exec mutators.cfg
 exec notifications.cfg
 
 // load console command aliases and settings
@@ -1579,7 +1523,7 @@ exec _hud_descriptions.cfg
 exec hud_luminos.cfg
 
 
-// ... and now that everything is configured/aliased, we can do some things: 
+// ... and now that everything is configured/aliased, we can do some things:
 
 // Change g_start_delay based upon if the server is local or not.
 if_client set g_start_delay 0  "delay before the game starts, so everyone can join; recommended to set this to like 15 on a public server"
@@ -1599,5 +1543,3 @@ set cl_simpleitems_postfix "_simple" "posfix to add fo model name when simple it
 set cl_fullbright_items 0 "enable fullbright items (if server allows, controled by g_fullbrightitems)"
 set cl_weapon_stay_color "2 0.5 0.5" "Color of picked up weapons when g_weapon_stay > 0"
 set cl_weapon_stay_alpha 0.75 "Alpha of picked up weapons when g_weapon_stay > 0"
-
-seta g_superspectate 0 "server side, allows extended spectator functions through the cmd interface. followpowerup, followstrength, followstshield or followfc [red|blue] will transfer spectation to the relevent player, if any"
index c2f702f..d069d5f 100644 (file)
@@ -7977,3 +7977,976 @@ size 100 100
 alpha 190 190 180
 sizeincrease -80
 color 0xFFFFFF 0xFFFFFF
+
+
+// nade effects
+effect nade_blue
+trailspacing 1
+type smoke
+color 0x006cff 0x0600ff
+tex 65 65
+size 3 3
+sizeincrease -1
+alpha 100 100 250
+//gravity -0.11
+// fire
+effect nade_blue
+notunderwater
+trailspacing 8
+type smoke
+color 0x0600ff 0x9794ff
+tex 65 65
+size 15 25
+sizeincrease -10
+alpha 30 30 150
+// bubbles
+effect nade_blue
+underwater
+trailspacing 16
+type bubble
+tex 62 62
+color 0x006cff 0x0600ff
+size 1 1
+alpha 256 256 256
+gravity -0.125
+bounce 1.5
+liquidfriction 4
+velocityjitter 16 16 16
+
+effect nade_red
+trailspacing 1
+type smoke
+color 0xff0000 0xff3c00
+tex 65 65
+size 3 3
+sizeincrease -1
+alpha 100 100 250
+//gravity -0.11
+// fire
+effect nade_red
+notunderwater
+trailspacing 8
+type smoke
+color 0xff0000 0xffa2a2
+tex 65 65
+size 15 25
+sizeincrease -10
+alpha 30 30 150
+// bubbles
+effect nade_red
+underwater
+trailspacing 16
+type bubble
+tex 62 62
+color 0xff0000 0xff3c00
+size 1 1
+alpha 256 256 256
+gravity -0.125
+bounce 1.5
+liquidfriction 4
+velocityjitter 16 16 16
+
+effect nade_yellow
+trailspacing 1
+type smoke
+color 0xFFFF0F 0xFFFF0F
+tex 65 65
+size 3 3
+sizeincrease -1
+alpha 100 100 250
+//gravity -0.11
+// fire
+effect nade_yellow
+notunderwater
+trailspacing 8
+type smoke
+color 0xFFFF0F 0xFFFF0F
+tex 65 65
+size 15 25
+sizeincrease -10
+alpha 30 30 150
+// bubbles
+effect nade_yellow
+underwater
+trailspacing 16
+type bubble
+tex 62 62
+color 0xFFFF0F 0xFFFF0F
+size 1 1
+alpha 256 256 256
+gravity -0.125
+bounce 1.5
+liquidfriction 4
+velocityjitter 16 16 16
+
+effect nade_pink
+trailspacing 1
+type smoke
+color 0xFF0FFF 0xFF0FFF
+tex 65 65
+size 3 3
+sizeincrease -1
+alpha 100 100 250
+//gravity -0.11
+// fire
+effect nade_pink
+notunderwater
+trailspacing 8
+type smoke
+color 0xFF0FFF 0xFF0FFF
+tex 65 65
+size 15 25
+sizeincrease -10
+alpha 30 30 150
+// bubbles
+effect nade_pink
+underwater
+trailspacing 16
+type bubble
+tex 62 62
+color 0xFF0FFF 0xFF0FFF
+size 1 1
+alpha 256 256 256
+gravity -0.125
+bounce 1.5
+liquidfriction 4
+velocityjitter 16 16 16
+
+effect nade
+trailspacing 1
+type smoke
+color 0xFFFFFF 0xFFFFFF
+tex 65 65
+size 3 3
+sizeincrease -1
+alpha 100 100 250
+//gravity -0.11
+// fire
+effect nade
+notunderwater
+trailspacing 8
+type smoke
+color 0xFFFFFF 0xFFFFFF
+tex 65 65
+size 15 25
+sizeincrease -10
+alpha 30 30 150
+// bubbles
+effect nade
+underwater
+trailspacing 16
+type bubble
+tex 62 62
+color 0xFFFFFF 0xFFFFFF
+size 1 1
+alpha 256 256 256
+gravity -0.125
+bounce 1.5
+liquidfriction 4
+velocityjitter 16 16 16
+
+effect nade_red_burn
+trailspacing 1
+type smoke
+color 0xff0000 0xff3c00
+tex 65 65
+size 5 5
+sizeincrease -1
+alpha 100 100 250
+//gravity -0.11
+// fire
+effect nade_red_burn
+notunderwater
+trailspacing 64
+type smoke
+color 0xff0000 0xffa2a2
+tex 65 65
+size 45 25
+sizeincrease -30
+alpha 200 200 1000
+// bubbles
+effect nade_red_burn
+underwater
+trailspacing 16
+type bubble
+tex 62 62
+color 0xff0000 0xff3c00
+size 1 1
+alpha 256 256 256
+gravity -0.125
+bounce 1.5
+liquidfriction 4
+velocityjitter 16 16 16
+effect nade_red_burn
+trailspacing 16
+type smoke
+color 0xff0000 0xff3c00
+tex 71 73
+size 15 25
+sizeincrease -40
+rotate -180 180 20 -20
+originjitter 2 2 2
+velocityjitter 10 10 10
+alpha 300 900 1500
+
+effect nade_blue_burn
+trailspacing 1
+type smoke
+color 0x006cff 0x0600ff
+tex 65 65
+size 5 5
+sizeincrease -1
+alpha 100 100 250
+//gravity -0.11
+// fire
+effect nade_blue_burn
+notunderwater
+trailspacing 64
+type smoke
+color 0x0600ff 0x9794ff
+tex 65 65
+size 45 25
+sizeincrease -30
+alpha 200 200 1000
+// bubbles
+effect nade_blue_burn
+underwater
+trailspacing 16
+type bubble
+tex 62 62
+color 0x006cff 0x0600ff
+size 1 1
+alpha 256 256 256
+gravity -0.125
+bounce 1.5
+liquidfriction 4
+velocityjitter 16 16 16
+effect nade_blue_burn
+trailspacing 16
+type smoke
+color 0x006cff 0x0600ff
+tex 33 33
+size 25 25
+sizeincrease -30
+
+effect nade_yellow_burn
+trailspacing 1
+type smoke
+color 0xFFFF0F 0xFFFF0F
+tex 65 65
+size 5 5
+sizeincrease -1
+alpha 100 100 250
+//gravity -0.11
+// fire
+effect nade_yellow_burn
+notunderwater
+trailspacing 64
+type smoke
+color 0xFFFF0F 0xFFFF0F
+tex 65 65
+size 45 25
+sizeincrease -30
+alpha 200 200 1000
+// bubbles
+effect nade_yellow_burn
+underwater
+trailspacing 16
+type bubble
+tex 62 62
+color 0xFFFF0F 0xFFFF0F
+size 1 1
+alpha 256 256 256
+gravity -0.125
+bounce 1.5
+liquidfriction 4
+velocityjitter 16 16 16
+effect nade_yellow_burn
+trailspacing 16
+type smoke
+color 0xFFFF0F 0xFFFF0F
+tex 33 33
+size 25 25
+sizeincrease -30
+
+effect nade_pink_burn
+trailspacing 1
+type smoke
+color 0xFF0FFF 0xFF0FFF
+tex 65 65
+size 5 5
+sizeincrease -1
+alpha 100 100 250
+//gravity -0.11
+// fire
+effect nade_pink_burn
+notunderwater
+trailspacing 64
+type smoke
+color 0xFF0FFF 0xFF0FFF
+tex 65 65
+size 45 25
+sizeincrease -30
+alpha 200 200 1000
+// bubbles
+effect nade_pink_burn
+underwater
+trailspacing 16
+type bubble
+tex 62 62
+color 0xFF0FFF 0xFF0FFF
+size 1 1
+alpha 256 256 256
+gravity -0.125
+bounce 1.5
+liquidfriction 4
+velocityjitter 16 16 16
+effect nade_pink_burn
+trailspacing 16
+type smoke
+color 0xFF0FFF 0xFF0FFF
+tex 33 33
+size 25 25
+sizeincrease -30
+
+effect nade_burn
+trailspacing 1
+type smoke
+color 0xFFFFFF 0xFFFFFF
+tex 65 65
+size 5 5
+sizeincrease -1
+alpha 100 100 250
+//gravity -0.11
+// fire
+effect nade_burn
+notunderwater
+trailspacing 64
+type smoke
+color 0xFFFFFF 0xFFFFFF
+tex 65 65
+size 45 25
+sizeincrease -30
+alpha 200 200 1000
+// bubbles
+effect nade_burn
+underwater
+trailspacing 16
+type bubble
+tex 62 62
+color 0xFFFFFF 0xFFFFFF
+size 1 1
+alpha 256 256 256
+gravity -0.125
+bounce 1.5
+liquidfriction 4
+velocityjitter 16 16 16
+effect nade_burn
+trailspacing 16
+type smoke
+color 0xFFFFFF 0xFFFFFF
+tex 33 33
+size 25 25
+sizeincrease -30
+
+effect nade_blue_explode
+countabsolute 1
+type decal
+tex 8 16
+size 88 88
+alpha 256 256 0
+originjitter 26 26 26
+lightradius 300
+lightradiusfade 1500
+lightcolor 20 20 100
+// shockwave
+effect nade_blue_explode
+type smoke
+countabsolute 1
+tex 33 33
+size 32 32
+sizeincrease 1800
+color 0x80C0FF 0x80C0FF
+alpha 80 80 650
+velocitymultiplier 44
+// fire
+effect nade_blue_explode
+notunderwater
+count 16
+type smoke
+color 0x629dff 0x0018ff
+tex 48 55
+size 20 24
+sizeincrease 555
+alpha 400 656 2000
+airfriction 30
+originjitter 50 50 50
+velocityjitter 320 320 320
+rotate -180 180 -9 9
+// fire streched
+effect nade_blue_explode
+count 8
+type spark
+tex 48 55
+color 0x629dff 0x0018ff
+size 60 90
+alpha 1500 3000 13000
+stretchfactor 80
+sizeincrease 40
+velocityjitter 30 30 30
+airfriction -9
+//smoke
+effect nade_blue_explode
+type smoke
+count 32
+blend alpha
+tex 0 7
+size 60 30
+color 0x222222 0x000000
+alpha 128 328 390
+rotate -180 180 2 -2
+velocityjitter 200 200 200
+velocityoffset 0 0 180
+originjitter 50 50 10
+sizeincrease 50
+airfriction 0.04
+gravity 0.4
+// underwater bubbles
+effect nade_blue_explode
+underwater
+count 32
+type bubble
+tex 62 62
+color 0x404040 0x808080
+size 3 6
+alpha 128 256 64
+gravity -0.125
+bounce 1.5
+liquidfriction 0.25
+originjitter 16 16 16
+velocityjitter 196 196 196
+rotate 0 0 0 0
+// bouncing sparks
+effect nade_blue_explode
+notunderwater
+count 8
+type spark
+tex 40 40
+color 0x006cff 0x0600ff
+size 1 2
+alpha 644 956 484
+gravity 1
+airfriction 1
+bounce 1.6
+liquidfriction 0.8
+velocityoffset 0 0 80
+originjitter 16 16 16
+velocityjitter 424 424 624
+// notbouncing sparks
+effect nade_blue_explode
+count 16
+type spark
+tex 40 40
+color 0x006cff 0x0600ff
+size 1 2
+alpha 644 956 684
+gravity 0.5
+airfriction 0.7
+liquidfriction 0.8
+velocityoffset 0 0 80
+originjitter 16 16 16
+velocityjitter 424 424 624
+// derbis
+effect nade_blue_explode
+notunderwater
+count 12
+type alphastatic
+tex 66 68
+color 0x6a3d25 0xcac5b4
+size 2 6
+alpha 644 956 684
+gravity 1.3
+airfriction 0.5
+bounce 1.6
+velocityjitter 324 324 524
+rotate -180 180 -1000 1000
+
+effect nade_red_explode
+countabsolute 1
+type decal
+tex 8 16
+size 88 88
+alpha 256 256 0
+originjitter 26 26 26
+lightradius 300
+lightradiusfade 1500
+lightcolor 100 20 20
+// shockwave
+effect nade_red_explode
+type smoke
+countabsolute 1
+tex 33 33
+size 32 32
+sizeincrease 2200
+color 0xff0000 0xffa2a2
+alpha 80 80 650
+velocitymultiplier 44
+// fire
+effect nade_red_explode
+notunderwater
+count 16
+type smoke
+color 0xff0000 0xff4200
+tex 48 55
+size 20 24
+sizeincrease 555
+alpha 400 656 2000
+airfriction 30
+originjitter 50 50 50
+velocityjitter 320 320 320
+rotate -180 180 -9 9
+// fire streched
+effect nade_red_explode
+count 8
+type spark
+tex 48 55
+color 0xff0000 0xff4200
+size 60 90
+alpha 1500 3000 13000
+stretchfactor 80
+sizeincrease 40
+velocityjitter 30 30 30
+airfriction -9
+//smoke
+effect nade_red_explode
+type smoke
+count 32
+blend alpha
+tex 0 7
+size 60 30
+color 0x222222 0x000000
+alpha 128 328 390
+rotate -180 180 2 -2
+velocityjitter 200 200 200
+velocityoffset 0 0 180
+originjitter 50 50 10
+sizeincrease 50
+airfriction 0.04
+gravity 0.4
+// underwater bubbles
+effect nade_red_explode
+underwater
+count 32
+type bubble
+tex 62 62
+color 0x404040 0x808080
+size 3 6
+alpha 128 256 64
+gravity -0.125
+bounce 1.5
+liquidfriction 0.25
+originjitter 16 16 16
+velocityjitter 196 196 196
+rotate 0 0 0 0
+// bouncing sparks
+effect nade_red_explode
+notunderwater
+count 8
+type spark
+tex 40 40
+color 0xff0000 0xffa2a2
+size 1 2
+alpha 644 956 484
+gravity 1
+airfriction 1
+bounce 1.6
+liquidfriction 0.8
+velocityoffset 0 0 80
+originjitter 16 16 16
+velocityjitter 424 424 624
+// notbouncing sparks
+effect nade_red_explode
+count 16
+type spark
+tex 40 40
+color 0xff0000 0xffa2a2
+size 1 2
+alpha 644 956 684
+gravity 0.5
+airfriction 0.7
+liquidfriction 0.8
+velocityoffset 0 0 80
+originjitter 16 16 16
+velocityjitter 424 424 624
+// derbis
+effect nade_red_explode
+notunderwater
+count 8
+type smoke
+tex 71 73
+color 0xff0000 0xffa2a2
+size 20 40
+alpha 644 956 2500
+originjitter 64 64 64
+velocityjitter 324 324 324
+rotate -180 180 -100 100
+
+effect nade_yellow_explode
+countabsolute 1
+type decal
+tex 8 16
+size 88 88
+alpha 256 256 0
+originjitter 26 26 26
+lightradius 300
+lightradiusfade 1500
+lightcolor 100 20 20
+// shockwave
+effect nade_yellow_explode
+type smoke
+countabsolute 1
+tex 33 33
+size 32 32
+sizeincrease 2200
+color 0xff0000 0xffa2a2
+alpha 80 80 650
+velocitymultiplier 44
+// fire
+effect nade_yellow_explode
+notunderwater
+count 16
+type smoke
+color 0xFFFF0F 0xFFFF0F
+tex 48 55
+size 20 24
+sizeincrease 555
+alpha 400 656 2000
+airfriction 30
+originjitter 50 50 50
+velocityjitter 320 320 320
+rotate -180 180 -9 9
+// fire streched
+effect nade_yellow_explode
+count 8
+type spark
+tex 48 55
+color 0xFFFF0F 0xFFFF0F
+size 60 90
+alpha 1500 3000 13000
+stretchfactor 80
+sizeincrease 40
+velocityjitter 30 30 30
+airfriction -9
+//smoke
+effect nade_yellow_explode
+type smoke
+count 32
+blend alpha
+tex 0 7
+size 60 30
+color 0x222222 0x000000
+alpha 128 328 390
+rotate -180 180 2 -2
+velocityjitter 200 200 200
+velocityoffset 0 0 180
+originjitter 50 50 10
+sizeincrease 50
+airfriction 0.04
+gravity 0.4
+// underwater bubbles
+effect nade_yellow_explode
+underwater
+count 32
+type bubble
+tex 62 62
+color 0x404040 0x808080
+size 3 6
+alpha 128 256 64
+gravity -0.125
+bounce 1.5
+liquidfriction 0.25
+originjitter 16 16 16
+velocityjitter 196 196 196
+rotate 0 0 0 0
+// bouncing sparks
+effect nade_yellow_explode
+notunderwater
+count 8
+type spark
+tex 40 40
+color 0xff0000 0xffa2a2
+size 1 2
+alpha 644 956 484
+gravity 1
+airfriction 1
+bounce 1.6
+liquidfriction 0.8
+velocityoffset 0 0 80
+originjitter 16 16 16
+velocityjitter 424 424 624
+// notbouncing sparks
+effect nade_yellow_explode
+count 16
+type spark
+tex 40 40
+color 0xff0000 0xffa2a2
+size 1 2
+alpha 644 956 684
+gravity 0.5
+airfriction 0.7
+liquidfriction 0.8
+velocityoffset 0 0 80
+originjitter 16 16 16
+velocityjitter 424 424 624
+// derbis
+effect nade_yellow_explode
+notunderwater
+count 8
+type smoke
+tex 71 73
+color 0xff0000 0xffa2a2
+size 20 40
+alpha 644 956 2500
+originjitter 64 64 64
+velocityjitter 324 324 324
+rotate -180 180 -100 100
+
+effect nade_pink_explode
+countabsolute 1
+type decal
+tex 8 16
+size 88 88
+alpha 256 256 0
+originjitter 26 26 26
+lightradius 300
+lightradiusfade 1500
+lightcolor 100 20 20
+// shockwave
+effect nade_pink_explode
+type smoke
+countabsolute 1
+tex 33 33
+size 32 32
+sizeincrease 2200
+color 0xff0000 0xffa2a2
+alpha 80 80 650
+velocitymultiplier 44
+// fire
+effect nade_pink_explode
+notunderwater
+count 16
+type smoke
+color 0xFF0FFF 0xFF0FFF
+tex 48 55
+size 20 24
+sizeincrease 555
+alpha 400 656 2000
+airfriction 30
+originjitter 50 50 50
+velocityjitter 320 320 320
+rotate -180 180 -9 9
+// fire streched
+effect nade_pink_explode
+count 8
+type spark
+tex 48 55
+color 0xFF0FFF 0xFF0FFF
+size 60 90
+alpha 1500 3000 13000
+stretchfactor 80
+sizeincrease 40
+velocityjitter 30 30 30
+airfriction -9
+//smoke
+effect nade_pink_explode
+type smoke
+count 32
+blend alpha
+tex 0 7
+size 60 30
+color 0x222222 0x000000
+alpha 128 328 390
+rotate -180 180 2 -2
+velocityjitter 200 200 200
+velocityoffset 0 0 180
+originjitter 50 50 10
+sizeincrease 50
+airfriction 0.04
+gravity 0.4
+// underwater bubbles
+effect nade_pink_explode
+underwater
+count 32
+type bubble
+tex 62 62
+color 0x404040 0x808080
+size 3 6
+alpha 128 256 64
+gravity -0.125
+bounce 1.5
+liquidfriction 0.25
+originjitter 16 16 16
+velocityjitter 196 196 196
+rotate 0 0 0 0
+// bouncing sparks
+effect nade_pink_explode
+notunderwater
+count 8
+type spark
+tex 40 40
+color 0xff0000 0xffa2a2
+size 1 2
+alpha 644 956 484
+gravity 1
+airfriction 1
+bounce 1.6
+liquidfriction 0.8
+velocityoffset 0 0 80
+originjitter 16 16 16
+velocityjitter 424 424 624
+// notbouncing sparks
+effect nade_pink_explode
+count 16
+type spark
+tex 40 40
+color 0xff0000 0xffa2a2
+size 1 2
+alpha 644 956 684
+gravity 0.5
+airfriction 0.7
+liquidfriction 0.8
+velocityoffset 0 0 80
+originjitter 16 16 16
+velocityjitter 424 424 624
+// derbis
+effect nade_pink_explode
+notunderwater
+count 8
+type smoke
+tex 71 73
+color 0xff0000 0xffa2a2
+size 20 40
+alpha 644 956 2500
+originjitter 64 64 64
+velocityjitter 324 324 324
+rotate -180 180 -100 100
+
+effect nade_explode
+countabsolute 1
+type decal
+tex 8 16
+size 88 88
+alpha 256 256 0
+originjitter 26 26 26
+lightradius 300
+lightradiusfade 1500
+lightcolor 100 20 20
+// shockwave
+effect nade_explode
+type smoke
+countabsolute 1
+tex 33 33
+size 32 32
+sizeincrease 2200
+color 0xff0000 0xffa2a2
+alpha 80 80 650
+velocitymultiplier 44
+// fire
+effect nade_explode
+notunderwater
+count 16
+type smoke
+color 0xFFFFFF 0xFFFFFF
+tex 48 55
+size 20 24
+sizeincrease 555
+alpha 400 656 2000
+airfriction 30
+originjitter 50 50 50
+velocityjitter 320 320 320
+rotate -180 180 -9 9
+// fire streched
+effect nade_explode
+count 8
+type spark
+tex 48 55
+color 0xFFFFFF 0xFFFFFF
+size 60 90
+alpha 1500 3000 13000
+stretchfactor 80
+sizeincrease 40
+velocityjitter 30 30 30
+airfriction -9
+//smoke
+effect nade_explode
+type smoke
+count 32
+blend alpha
+tex 0 7
+size 60 30
+color 0x222222 0x000000
+alpha 128 328 390
+rotate -180 180 2 -2
+velocityjitter 200 200 200
+velocityoffset 0 0 180
+originjitter 50 50 10
+sizeincrease 50
+airfriction 0.04
+gravity 0.4
+// underwater bubbles
+effect nade_explode
+underwater
+count 32
+type bubble
+tex 62 62
+color 0x404040 0x808080
+size 3 6
+alpha 128 256 64
+gravity -0.125
+bounce 1.5
+liquidfriction 0.25
+originjitter 16 16 16
+velocityjitter 196 196 196
+rotate 0 0 0 0
+// bouncing sparks
+effect nade_explode
+notunderwater
+count 8
+type spark
+tex 40 40
+color 0xff0000 0xffa2a2
+size 1 2
+alpha 644 956 484
+gravity 1
+airfriction 1
+bounce 1.6
+liquidfriction 0.8
+velocityoffset 0 0 80
+originjitter 16 16 16
+velocityjitter 424 424 624
+// notbouncing sparks
+effect nade_explode
+count 16
+type spark
+tex 40 40
+color 0xff0000 0xffa2a2
+size 1 2
+alpha 644 956 684
+gravity 0.5
+airfriction 0.7
+liquidfriction 0.8
+velocityoffset 0 0 80
+originjitter 16 16 16
+velocityjitter 424 424 624
+// derbis
+effect nade_explode
+notunderwater
+count 8
+type smoke
+tex 71 73
+color 0xff0000 0xffa2a2
+size 20 40
+alpha 644 956 2500
+originjitter 64 64 64
+velocityjitter 324 324 324
+rotate -180 180 -100 100
index a1ad723..665fa55 100644 (file)
@@ -278,6 +278,8 @@ seta g_freezetag_point_leadlimit -1 "Freeze Tag point lead limit overriding the
 set g_freezetag_revive_speed 0.4 "Speed for reviving a frozen teammate"
 set g_freezetag_revive_clearspeed 1.6 "Speed at which reviving progress gets lost when out of range"
 set g_freezetag_revive_extra_size 100 "Distance in qu that you can stand from a frozen teammate to keep reviving him"
+set g_freezetag_revive_falldamage 0 "Enable reviving from this amount of fall damage"
+set g_freezetag_revive_falldamage_health 40 "Amount of health player has if they revived from falling"
 set g_freezetag_round_timelimit 180
 set g_freezetag_frozen_force 0.6 "How much to multiply the force on a frozen player with"
 set g_freezetag_frozen_maxtime 60 "frozen players will be automatically unfrozen after this time in seconds"
@@ -343,9 +345,6 @@ set g_lms 0 "Last Man Standing: everyone starts with a certain amount of lives,
 set g_lms_lives_override -1
 set g_lms_extra_lives 0
 set g_lms_regenerate 0
-set g_lms_campcheck_interval 10
-set g_lms_campcheck_damage 100
-set g_lms_campcheck_distance 1800
 set g_lms_last_join 3  "if g_lms_join_anytime is false, new players can only join if the worst active player has more than (fraglimit - g_lms_last_join) lives"
 set g_lms_join_anytime 1       "if true, new players can join, but get same amount of lives as the worst player"
 
index f99494a..f2b4fa4 100644 (file)
@@ -20,9 +20,9 @@ seta hud_progressbar_health_color "0.6 0 0"
 seta hud_progressbar_armor_color "0 0.6 0"
 seta hud_progressbar_fuel_color "0.6 0.6 0"
 seta hud_progressbar_nexball_color "0.7 0.1 0"
-seta hud_progressbar_speed_color "1 0.75 0" 
-seta hud_progressbar_acceleration_color "0.5 0.75 1" 
-seta hud_progressbar_acceleration_neg_color "0.125 0.25 0.5" 
+seta hud_progressbar_speed_color "1 0.75 0"
+seta hud_progressbar_acceleration_color "0.5 0.75 1"
+seta hud_progressbar_acceleration_neg_color "0.125 0.25 0.5"
 
 seta _hud_panelorder "15 12 9 10 5 6 14 0 7 4 11 2 1 3 8 13 16 "
 
@@ -54,7 +54,7 @@ seta hud_panel_weapons_ammo_alpha "1"
 seta hud_panel_weapons_aspect "2"
 seta hud_panel_weapons_timeout "1"
 seta hud_panel_weapons_timeout_effect "1"
-seta hud_panel_weapons_timeout_fadebgmin "0.4" 
+seta hud_panel_weapons_timeout_fadebgmin "0.4"
 seta hud_panel_weapons_timeout_fadefgmin "0.4"
 seta hud_panel_weapons_timeout_speed_in "0.25"
 seta hud_panel_weapons_timeout_speed_out "0.75"
@@ -290,7 +290,7 @@ seta hud_panel_centerprint_fade_out "0.5"
 seta hud_panel_centerprint_fade_subsequent "1"
 seta hud_panel_centerprint_fade_subsequent_passone "3"
 seta hud_panel_centerprint_fade_subsequent_passone_minalpha "0.5"
-seta hud_panel_centerprint_fade_subsequent_passtwo "10" 
+seta hud_panel_centerprint_fade_subsequent_passtwo "10"
 seta hud_panel_centerprint_fade_subsequent_passtwo_minalpha "0.5"
 seta hud_panel_centerprint_fade_subsequent_minfontsize "0.75"
 seta hud_panel_centerprint_fade_minfontsize "0"
index bfa0c0b..c401132 100644 (file)
@@ -20,9 +20,9 @@ seta hud_progressbar_health_color "0.6 0 0"
 seta hud_progressbar_armor_color "0 0.6 0"
 seta hud_progressbar_fuel_color "0.6 0.6 0"
 seta hud_progressbar_nexball_color "0.7 0.1 0"
-seta hud_progressbar_speed_color "1 0.75 0" 
-seta hud_progressbar_acceleration_color "0.5 0.75 1" 
-seta hud_progressbar_acceleration_neg_color "0.125 0.25 0.5" 
+seta hud_progressbar_speed_color "1 0.75 0"
+seta hud_progressbar_acceleration_color "0.5 0.75 1"
+seta hud_progressbar_acceleration_neg_color "0.125 0.25 0.5"
 
 seta _hud_panelorder "10 3 0 14 6 9 13 4 1 2 11 12 7 5 8 15 16 "
 
@@ -54,7 +54,7 @@ seta hud_panel_weapons_ammo_alpha "1"
 seta hud_panel_weapons_aspect "2"
 seta hud_panel_weapons_timeout "0"
 seta hud_panel_weapons_timeout_effect "0"
-seta hud_panel_weapons_timeout_fadebgmin "0" 
+seta hud_panel_weapons_timeout_fadebgmin "0"
 seta hud_panel_weapons_timeout_fadefgmin "0"
 seta hud_panel_weapons_timeout_speed_in "0.25"
 seta hud_panel_weapons_timeout_speed_out "0.75"
@@ -290,7 +290,7 @@ seta hud_panel_centerprint_fade_out "0.5"
 seta hud_panel_centerprint_fade_subsequent "1"
 seta hud_panel_centerprint_fade_subsequent_passone "3"
 seta hud_panel_centerprint_fade_subsequent_passone_minalpha "0.5"
-seta hud_panel_centerprint_fade_subsequent_passtwo "10" 
+seta hud_panel_centerprint_fade_subsequent_passtwo "10"
 seta hud_panel_centerprint_fade_subsequent_passtwo_minalpha "0.5"
 seta hud_panel_centerprint_fade_subsequent_minfontsize "0.75"
 seta hud_panel_centerprint_fade_minfontsize "0"
index 27ca9ab..518492e 100644 (file)
@@ -20,9 +20,9 @@ seta hud_progressbar_health_color "0.6 0 0"
 seta hud_progressbar_armor_color "0 0.6 0"
 seta hud_progressbar_fuel_color "0.6 0.6 0"
 seta hud_progressbar_nexball_color "0.7 0.1 0"
-seta hud_progressbar_speed_color "1 0.75 0" 
-seta hud_progressbar_acceleration_color "0.5 0.75 1" 
-seta hud_progressbar_acceleration_neg_color "0.125 0.25 0.5" 
+seta hud_progressbar_speed_color "1 0.75 0"
+seta hud_progressbar_acceleration_color "0.5 0.75 1"
+seta hud_progressbar_acceleration_neg_color "0.125 0.25 0.5"
 
 seta _hud_panelorder "15 3 1 2 11 10 0 14 6 9 13 4 12 7 5 8 16 "
 
@@ -54,7 +54,7 @@ seta hud_panel_weapons_ammo_alpha "1"
 seta hud_panel_weapons_aspect "2"
 seta hud_panel_weapons_timeout "0"
 seta hud_panel_weapons_timeout_effect "0"
-seta hud_panel_weapons_timeout_fadebgmin "0" 
+seta hud_panel_weapons_timeout_fadebgmin "0"
 seta hud_panel_weapons_timeout_fadefgmin "0"
 seta hud_panel_weapons_timeout_speed_in "0.25"
 seta hud_panel_weapons_timeout_speed_out "0.75"
@@ -290,7 +290,7 @@ seta hud_panel_centerprint_fade_out "0.5"
 seta hud_panel_centerprint_fade_subsequent "1"
 seta hud_panel_centerprint_fade_subsequent_passone "3"
 seta hud_panel_centerprint_fade_subsequent_passone_minalpha "0.5"
-seta hud_panel_centerprint_fade_subsequent_passtwo "10" 
+seta hud_panel_centerprint_fade_subsequent_passtwo "10"
 seta hud_panel_centerprint_fade_subsequent_passtwo_minalpha "0.5"
 seta hud_panel_centerprint_fade_subsequent_minfontsize "0.75"
 seta hud_panel_centerprint_fade_minfontsize "0"
index 3a489a0..0a5f059 100644 (file)
@@ -20,9 +20,9 @@ seta hud_progressbar_health_color "0.6 0 0"
 seta hud_progressbar_armor_color "0 0.6 0"
 seta hud_progressbar_fuel_color "0.6 0.6 0"
 seta hud_progressbar_nexball_color "0.7 0.1 0"
-seta hud_progressbar_speed_color "1 0.75 0" 
-seta hud_progressbar_acceleration_color "0.5 0.75 1" 
-seta hud_progressbar_acceleration_neg_color "0.125 0.25 0.5" 
+seta hud_progressbar_speed_color "1 0.75 0"
+seta hud_progressbar_acceleration_color "0.5 0.75 1"
+seta hud_progressbar_acceleration_neg_color "0.125 0.25 0.5"
 
 seta _hud_panelorder "15 10 9 6 8 14 5 0 4 13 2 7 1 3 11 12 16 "
 
@@ -54,7 +54,7 @@ seta hud_panel_weapons_ammo_alpha "1"
 seta hud_panel_weapons_aspect "2"
 seta hud_panel_weapons_timeout "3"
 seta hud_panel_weapons_timeout_effect "1"
-seta hud_panel_weapons_timeout_fadebgmin "0" 
+seta hud_panel_weapons_timeout_fadebgmin "0"
 seta hud_panel_weapons_timeout_fadefgmin "0"
 seta hud_panel_weapons_timeout_speed_in "0.25"
 seta hud_panel_weapons_timeout_speed_out "0.75"
@@ -290,7 +290,7 @@ seta hud_panel_centerprint_fade_out "0.5"
 seta hud_panel_centerprint_fade_subsequent "1"
 seta hud_panel_centerprint_fade_subsequent_passone "3"
 seta hud_panel_centerprint_fade_subsequent_passone_minalpha "0.5"
-seta hud_panel_centerprint_fade_subsequent_passtwo "10" 
+seta hud_panel_centerprint_fade_subsequent_passtwo "10"
 seta hud_panel_centerprint_fade_subsequent_passtwo_minalpha "0.5"
 seta hud_panel_centerprint_fade_subsequent_minfontsize "0.75"
 seta hud_panel_centerprint_fade_minfontsize "0"
index 5705341..acf3ad9 100644 (file)
@@ -20,9 +20,9 @@ seta hud_progressbar_health_color "0.6 0 0"
 seta hud_progressbar_armor_color "0 0.6 0"
 seta hud_progressbar_fuel_color "0.6 0.6 0"
 seta hud_progressbar_nexball_color "0.7 0.1 0"
-seta hud_progressbar_speed_color "1 0.75 0" 
-seta hud_progressbar_acceleration_color "0.5 0.75 1" 
-seta hud_progressbar_acceleration_neg_color "0.125 0.25 0.5" 
+seta hud_progressbar_speed_color "1 0.75 0"
+seta hud_progressbar_acceleration_color "0.5 0.75 1"
+seta hud_progressbar_acceleration_neg_color "0.125 0.25 0.5"
 
 seta _hud_panelorder "15 0 11 8 5 6 14 9 13 7 2 3 1 10 12 4 16 "
 
@@ -54,7 +54,7 @@ seta hud_panel_weapons_ammo_alpha "1"
 seta hud_panel_weapons_aspect "2"
 seta hud_panel_weapons_timeout "0"
 seta hud_panel_weapons_timeout_effect "0"
-seta hud_panel_weapons_timeout_fadebgmin "0" 
+seta hud_panel_weapons_timeout_fadebgmin "0"
 seta hud_panel_weapons_timeout_fadefgmin "0"
 seta hud_panel_weapons_timeout_speed_in "0.25"
 seta hud_panel_weapons_timeout_speed_out "0.75"
@@ -290,7 +290,7 @@ seta hud_panel_centerprint_fade_out "0.5"
 seta hud_panel_centerprint_fade_subsequent "1"
 seta hud_panel_centerprint_fade_subsequent_passone "3"
 seta hud_panel_centerprint_fade_subsequent_passone_minalpha "0.5"
-seta hud_panel_centerprint_fade_subsequent_passtwo "10" 
+seta hud_panel_centerprint_fade_subsequent_passtwo "10"
 seta hud_panel_centerprint_fade_subsequent_passtwo_minalpha "0.5"
 seta hud_panel_centerprint_fade_subsequent_minfontsize "0.75"
 seta hud_panel_centerprint_fade_minfontsize "0"
index fbeba74..3f6d65f 100644 (file)
@@ -1,12 +1,12 @@
 //     small   big     dark    bright  -red    +red    -green  +green  -blue   +blue                                   higher
 //     1       2       3       4       5       6       7       8       9       0                                       Page ^
-//     
+//
 //     spawn   ^       remove  static  style   style   style   style   style   style                                   lower
 //     Q       W       E       R       T       Y       U       I       O       P                                       Page v
-//     
+//
 //     <       v       >       style   style   style   style   style   style           save                    north
 //     A       S       D       F       G       H       J       K       L               ENTER                   ^
-//     
+//
 //                     copy    paste                           fine    coarse                          west    south   east
 //     Z       X       C       V       B       N       M       ,       .                               <       v       >
 
diff --git a/models/ok_nade_counter/ok_nade_counter.md3 b/models/ok_nade_counter/ok_nade_counter.md3
new file mode 100644 (file)
index 0000000..7bcd7ef
Binary files /dev/null and b/models/ok_nade_counter/ok_nade_counter.md3 differ
diff --git a/models/ok_nade_counter/ok_nade_counter.md3_0.skin b/models/ok_nade_counter/ok_nade_counter.md3_0.skin
new file mode 100644 (file)
index 0000000..f510486
--- /dev/null
@@ -0,0 +1 @@
+sprite,models/ok_nade_counter/ok_nade_counter_01
\ No newline at end of file
diff --git a/models/ok_nade_counter/ok_nade_counter.md3_1.skin b/models/ok_nade_counter/ok_nade_counter.md3_1.skin
new file mode 100644 (file)
index 0000000..c7bfc3b
--- /dev/null
@@ -0,0 +1 @@
+sprite,models/ok_nade_counter/ok_nade_counter_02
\ No newline at end of file
diff --git a/models/ok_nade_counter/ok_nade_counter.md3_2.skin b/models/ok_nade_counter/ok_nade_counter.md3_2.skin
new file mode 100644 (file)
index 0000000..ee84c4f
--- /dev/null
@@ -0,0 +1 @@
+sprite,models/ok_nade_counter/ok_nade_counter_03
\ No newline at end of file
diff --git a/models/ok_nade_counter/ok_nade_counter.md3_3.skin b/models/ok_nade_counter/ok_nade_counter.md3_3.skin
new file mode 100644 (file)
index 0000000..df0b108
--- /dev/null
@@ -0,0 +1 @@
+sprite,models/ok_nade_counter/ok_nade_counter_04
\ No newline at end of file
diff --git a/models/ok_nade_counter/ok_nade_counter.md3_4.skin b/models/ok_nade_counter/ok_nade_counter.md3_4.skin
new file mode 100644 (file)
index 0000000..d76d110
--- /dev/null
@@ -0,0 +1 @@
+sprite,models/ok_nade_counter/ok_nade_counter_05
\ No newline at end of file
diff --git a/models/ok_nade_counter/ok_nade_counter.md3_5.skin b/models/ok_nade_counter/ok_nade_counter.md3_5.skin
new file mode 100644 (file)
index 0000000..c25c2b5
--- /dev/null
@@ -0,0 +1 @@
+sprite,models/ok_nade_counter/ok_nade_counter_06
\ No newline at end of file
diff --git a/models/ok_nade_counter/ok_nade_counter.md3_6.skin b/models/ok_nade_counter/ok_nade_counter.md3_6.skin
new file mode 100644 (file)
index 0000000..df03930
--- /dev/null
@@ -0,0 +1 @@
+sprite,models/ok_nade_counter/ok_nade_counter_07
\ No newline at end of file
diff --git a/models/ok_nade_counter/ok_nade_counter.md3_7.skin b/models/ok_nade_counter/ok_nade_counter.md3_7.skin
new file mode 100644 (file)
index 0000000..3021e51
--- /dev/null
@@ -0,0 +1 @@
+sprite,models/ok_nade_counter/ok_nade_counter_08
\ No newline at end of file
diff --git a/models/ok_nade_counter/ok_nade_counter.md3_8.skin b/models/ok_nade_counter/ok_nade_counter.md3_8.skin
new file mode 100644 (file)
index 0000000..e3df814
--- /dev/null
@@ -0,0 +1 @@
+sprite,models/ok_nade_counter/ok_nade_counter_09
\ No newline at end of file
diff --git a/models/ok_nade_counter/ok_nade_counter.md3_9.skin b/models/ok_nade_counter/ok_nade_counter.md3_9.skin
new file mode 100644 (file)
index 0000000..1402b7a
--- /dev/null
@@ -0,0 +1 @@
+sprite,models/ok_nade_counter/ok_nade_counter_10
\ No newline at end of file
diff --git a/models/ok_nade_counter/ok_nade_counter_01.tga b/models/ok_nade_counter/ok_nade_counter_01.tga
new file mode 100644 (file)
index 0000000..c58a70d
Binary files /dev/null and b/models/ok_nade_counter/ok_nade_counter_01.tga differ
diff --git a/models/ok_nade_counter/ok_nade_counter_02.tga b/models/ok_nade_counter/ok_nade_counter_02.tga
new file mode 100644 (file)
index 0000000..3d91413
Binary files /dev/null and b/models/ok_nade_counter/ok_nade_counter_02.tga differ
diff --git a/models/ok_nade_counter/ok_nade_counter_03.tga b/models/ok_nade_counter/ok_nade_counter_03.tga
new file mode 100644 (file)
index 0000000..eddb7cb
Binary files /dev/null and b/models/ok_nade_counter/ok_nade_counter_03.tga differ
diff --git a/models/ok_nade_counter/ok_nade_counter_04.tga b/models/ok_nade_counter/ok_nade_counter_04.tga
new file mode 100644 (file)
index 0000000..7f14db6
Binary files /dev/null and b/models/ok_nade_counter/ok_nade_counter_04.tga differ
diff --git a/models/ok_nade_counter/ok_nade_counter_05.tga b/models/ok_nade_counter/ok_nade_counter_05.tga
new file mode 100644 (file)
index 0000000..a7cdf8c
Binary files /dev/null and b/models/ok_nade_counter/ok_nade_counter_05.tga differ
diff --git a/models/ok_nade_counter/ok_nade_counter_06.tga b/models/ok_nade_counter/ok_nade_counter_06.tga
new file mode 100644 (file)
index 0000000..150f061
Binary files /dev/null and b/models/ok_nade_counter/ok_nade_counter_06.tga differ
diff --git a/models/ok_nade_counter/ok_nade_counter_07.tga b/models/ok_nade_counter/ok_nade_counter_07.tga
new file mode 100644 (file)
index 0000000..36e5c3b
Binary files /dev/null and b/models/ok_nade_counter/ok_nade_counter_07.tga differ
diff --git a/models/ok_nade_counter/ok_nade_counter_08.tga b/models/ok_nade_counter/ok_nade_counter_08.tga
new file mode 100644 (file)
index 0000000..3f42394
Binary files /dev/null and b/models/ok_nade_counter/ok_nade_counter_08.tga differ
diff --git a/models/ok_nade_counter/ok_nade_counter_09.tga b/models/ok_nade_counter/ok_nade_counter_09.tga
new file mode 100644 (file)
index 0000000..31219ab
Binary files /dev/null and b/models/ok_nade_counter/ok_nade_counter_09.tga differ
diff --git a/mutators.cfg b/mutators.cfg
new file mode 100644 (file)
index 0000000..e88fbc0
--- /dev/null
@@ -0,0 +1,158 @@
+// =========================
+//  Config for all mutators
+// =========================
+
+
+// =========
+//  dodging
+// =========
+set g_dodging 0 "set to 1 to enable dodging in games"
+
+seta cl_dodging_timeout 0.2 "determines how long apart (in seconds) two taps on the same direction key are considered a dodge. use 0 to disable"
+
+set sv_dodging_wall_dodging 0 "set to 1 to allow dodging off walls. 0 to disable"
+set sv_dodging_delay 0.7 "determines how long a player has to wait to be able to dodge again after dodging"
+set sv_dodging_up_speed 200 "the jump velocity of the dodge"
+set sv_dodging_horiz_speed 400 "the horizontal velocity of the dodge"
+set sv_dodging_horiz_speed_frozen 200 "the horizontal velocity of the dodge while frozen"
+set sv_dodging_ramp_time 0.1 "a ramp so that the horizontal part of the dodge is added smoothly (seconds)"
+set sv_dodging_height_threshold 10 "the maximum height above ground where to allow dodging"
+set sv_dodging_wall_distance_threshold 10 "the maximum distance from a wall that still allows dodging"
+set sv_dodging_sound 1 "if 1 dodging makes a sound. if 0 dodging is silent"
+set sv_dodging_frozen 0 "allow dodging while frozen"
+
+
+// ===========
+//  minstagib
+// ===========
+set g_minstagib 0 "enable minstagib"
+set g_minstagib_extralives 1 "how many extra lives you will get per powerup"
+set g_minstagib_ammo_start 10 "starting ammo"
+set g_minstagib_ammo_drop 5 "how much ammo you'll get for weapons or cells"
+set g_minstagib_invis_alpha 0.15
+set g_minstagib_speed_highspeed 1.5 "speed-multiplier that applies while you carry the invincibility powerup"
+
+
+// =========
+//  vampire
+// =========
+set g_vampire 0 "set to 1 to enable the vampire mode, where the damage done to your opponent gets added to your own health"
+
+
+// =========
+//  sandbox
+// =========
+set g_sandbox 0 "allow players to spawn and edit objects around the map"
+set g_sandbox_info 1 "print object information to the server. 1 prints info about spawned / removed objects, 2 also prints info about edited objects"
+set g_sandbox_readonly 0 "when this mode is active, players cannot modify objects or use any sandbox commands"
+set g_sandbox_storage_name default "name of the selected storage to use"
+set g_sandbox_storage_autosave 5 "storage is automatically saved every specified number of seconds"
+set g_sandbox_storage_autoload 1 "if a storage file exists for the given map, automatically load it at startup"
+set g_sandbox_editor_flood 1 "players must wait this many seconds between spawning objects"
+set g_sandbox_editor_maxobjects 1000 "maximum number of objects that may exist at a time"
+set g_sandbox_editor_free 1 "0 = players can only copy or edit their own objects, 1 = players can copy but not edit other objects, 2 = players can copy and edit all object"
+set g_sandbox_editor_distance_spawn 200 "distance at which objects spawn in front of the player"
+set g_sandbox_editor_distance_edit 300 "distance at which players can edit or remove objects they are looking at"
+set g_sandbox_object_scale_min 0.1 "minimum scale that objects can be set to"
+set g_sandbox_object_scale_max 2 "maximum scale that objects can be set to"
+set g_sandbox_object_material_velocity_min 100 "velocity objects must have while colliding for material effects to be applied"
+set g_sandbox_object_material_velocity_factor 0.002 "velocity range which decides the intensity of material effects"
+set cl_sandbox_clipboard ""
+
+
+// ========================
+//  invincible projectiles
+// ========================
+set g_invincible_projectiles 0 "set to 1 to disable any damage to projectiles in all balance configs, regardless of g_projectiles_damage"
+
+
+// ===============
+//  rocket flying
+// ===============
+set g_rocket_flying 0 "set to 1 to enable rocket flying in all balance configs"
+
+
+// =====================
+//  spawn near teammate
+// =====================
+set g_spawn_near_teammate 0 "if set, players prefer spawns near a team mate"
+set g_spawn_near_teammate_distance 640 "max distance to consider a spawn to be near a team mate"
+
+
+// ========================
+//  NIX (No Items Xonotic)
+// ========================
+// at each time, everyone uses the same weapon,
+// and in regular intervals, this weapon is cycled
+set g_nix 0 "No Items Xonotic - instead of pickup items, everyone plays with the same weapon. After some time, a countdown will start, after which everyone will switch to another weapon, and so on"
+set g_nix_with_laser 0 "always carry the laser as an additional weapon in NIX"
+set g_nix_with_healtharmor 0 "when 1, health and armor still show up in NIX"
+set g_nix_with_powerups 0 "when 1, powerups still show up in NIX"
+
+
+// ================
+//  physical items
+// ================
+set g_physical_items 0 "1 uses ODE physics for dropped weapons, 2 for all items, requires physics_ode to be enabled"
+set g_physical_items_damageforcescale 3 "how affected physical weapons are by damage"
+set g_physical_items_reset 1 "return map items to their original lotation after being picked up"
+
+
+// ===============
+//  touch explode
+// ===============
+set g_touchexplode 0 "touching other players causes an explosion"
+set g_touchexplode_radius 50
+set g_touchexplode_damage 10
+set g_touchexplode_edgedamage 0
+set g_touchexplode_force 150
+
+
+// ================
+//  super spectate
+// ================
+set g_superspectate 0 "server side, allows extended spectator functions through the cmd interface. followpowerup, followstrength, followstshield or followfc [red|blue] will transfer spectation to the relevent player, if any"
+
+
+// ==================
+//  melee only arena
+// ==================
+set g_melee_only 0 "enable melee only arena"
+
+
+// ================
+//  random gravity
+// ================
+set g_random_gravity 0 "enable random gravity mutator"
+set g_random_gravity_delay 3 "delay between gravity changes"
+set g_random_gravity_negative_chance 0.5 "chance of gravity being a negative value"
+set g_random_gravity_min -2000 "minimum gravity"
+set g_random_gravity_max 2000 "maximum gravity"
+set g_random_gravity_positive 1000 "positive gravity multiplier"
+set g_random_gravity_negative 1000 "negative gravity multiplier"
+
+
+// =======
+//  nades
+// =======
+set g_nades 0 "enable off-hand grenades"
+set g_nades_spawn 1 "give nades right away when player spawns rather than delaying entire refire"
+set g_nades_nade_lifetime 3.5
+set g_nades_nade_minforce 400
+set g_nades_nade_maxforce 2000
+set g_nades_nade_health 25
+set g_nades_nade_refire 6
+set g_nades_nade_damage 225
+set g_nades_nade_edgedamage 90
+set g_nades_nade_radius 300
+set g_nades_nade_force 650
+set g_nades_nade_newton_style 0
+
+
+// ============
+//  camp check
+// ============
+set g_campcheck 0 "damages campers every few seconds"
+set g_campcheck_interval 10
+set g_campcheck_damage 100
+set g_campcheck_distance 1800
index e2a3ef6..5495537 100644 (file)
@@ -1,29 +1,28 @@
 g_mod_physics Xonotic
 // current Xonotic physics
 
-sv_gravity 800
+sv_gravity 700
 sv_maxspeed 360
 sv_maxairspeed 360
 
 sv_stopspeed 100
 sv_accelerate 15
 sv_airaccelerate 2
-sv_friction 8
+sv_friction 6
 edgefriction 1
-sv_stepheight 26
+sv_stepheight 31
 // Q1: 16+2
 // Nex: 32+2
-// we try: 24+2
+// Xon 0.7: 24+2
+// Samual: 31 (just below 32, keeping things smooth without allowing 32qu steps)
 
-// actually, what we want is 266.6666 for 180bpm
-// but 260 takes same amount of frames and is nicer to mappers
 // jump height == sv_jumpvelocity^2 / (2*sv_gravity)
-// in this case: 42.25 qu
+// in this case: 42.87 qu
 // player: 24+45 qu
-// total: 111.25qu
+// total: 111.87qu
 // this is smaller than 112 qu, so a 112 qu high corridor (7 of 8 grid units in
 // the 16 grid, and the 8th unit used for wall/floor) just lets a player jump!
-sv_jumpvelocity 260
+sv_jumpvelocity 245
 sv_wateraccelerate -1
 sv_waterfriction -1
 sv_airaccel_sideways_friction 0
@@ -31,13 +30,13 @@ sv_airaccel_qw -0.8
 sv_airaccel_qw_stretchfactor 2
 
 sv_airstopaccelerate 3
-sv_airstrafeaccelerate 24
+sv_airstrafeaccelerate 18
 sv_maxairstrafespeed 100
 sv_airstrafeaccel_qw -0.95
-sv_aircontrol 125
-sv_aircontrol_penalty 180
+sv_aircontrol 100
+sv_aircontrol_penalty 0
 sv_aircontrol_power 2
-sv_airspeedlimit_nonqw 800
+sv_airspeedlimit_nonqw 900
 sv_warsowbunny_turnaccel 0
 sv_warsowbunny_accel 0.1593
 sv_warsowbunny_topspeed 925
diff --git a/physicsX07.cfg b/physicsX07.cfg
new file mode 100644 (file)
index 0000000..e2a3ef6
--- /dev/null
@@ -0,0 +1,50 @@
+g_mod_physics Xonotic
+// current Xonotic physics
+
+sv_gravity 800
+sv_maxspeed 360
+sv_maxairspeed 360
+
+sv_stopspeed 100
+sv_accelerate 15
+sv_airaccelerate 2
+sv_friction 8
+edgefriction 1
+sv_stepheight 26
+// Q1: 16+2
+// Nex: 32+2
+// we try: 24+2
+
+// actually, what we want is 266.6666 for 180bpm
+// but 260 takes same amount of frames and is nicer to mappers
+// jump height == sv_jumpvelocity^2 / (2*sv_gravity)
+// in this case: 42.25 qu
+// player: 24+45 qu
+// total: 111.25qu
+// this is smaller than 112 qu, so a 112 qu high corridor (7 of 8 grid units in
+// the 16 grid, and the 8th unit used for wall/floor) just lets a player jump!
+sv_jumpvelocity 260
+sv_wateraccelerate -1
+sv_waterfriction -1
+sv_airaccel_sideways_friction 0
+sv_airaccel_qw -0.8
+sv_airaccel_qw_stretchfactor 2
+
+sv_airstopaccelerate 3
+sv_airstrafeaccelerate 24
+sv_maxairstrafespeed 100
+sv_airstrafeaccel_qw -0.95
+sv_aircontrol 125
+sv_aircontrol_penalty 180
+sv_aircontrol_power 2
+sv_airspeedlimit_nonqw 800
+sv_warsowbunny_turnaccel 0
+sv_warsowbunny_accel 0.1593
+sv_warsowbunny_topspeed 925
+sv_warsowbunny_backtosideratio 0.8
+sv_friction_on_land 0
+sv_doublejump 0
+sv_jumpspeedcap_min ""
+sv_jumpspeedcap_max ""
+sv_jumpspeedcap_max_disable_on_ramps 1
+g_teleport_maxspeed 0
diff --git a/physicsXSamual.cfg b/physicsXSamual.cfg
deleted file mode 100644 (file)
index 0f9f77a..0000000
+++ /dev/null
@@ -1,49 +0,0 @@
-g_mod_physics Xonotic
-// current Xonotic physics
-
-sv_gravity 700
-sv_maxspeed 360
-sv_maxairspeed 360
-
-sv_stopspeed 100
-sv_accelerate 15
-sv_airaccelerate 2
-sv_friction 6
-edgefriction 1
-sv_stepheight 34
-// Q1: 16+2
-// Nex: 32+2
-// we try: 24+2
-// samual: 32+2
-
-// jump height == sv_jumpvelocity^2 / (2*sv_gravity)
-// in this case: 42.87 qu
-// player: 24+45 qu
-// total: 111.87qu
-// this is smaller than 112 qu, so a 112 qu high corridor (7 of 8 grid units in
-// the 16 grid, and the 8th unit used for wall/floor) just lets a player jump!
-sv_jumpvelocity 245
-sv_wateraccelerate -1
-sv_waterfriction -1
-sv_airaccel_sideways_friction 0
-sv_airaccel_qw -0.8
-sv_airaccel_qw_stretchfactor 2
-
-sv_airstopaccelerate 3
-sv_airstrafeaccelerate 18
-sv_maxairstrafespeed 100
-sv_airstrafeaccel_qw -0.95
-sv_aircontrol 100
-sv_aircontrol_penalty 0
-sv_aircontrol_power 2
-sv_airspeedlimit_nonqw 900
-sv_warsowbunny_turnaccel 0
-sv_warsowbunny_accel 0.1593
-sv_warsowbunny_topspeed 925
-sv_warsowbunny_backtosideratio 0.8
-sv_friction_on_land 0
-sv_doublejump 0
-sv_jumpspeedcap_min ""
-sv_jumpspeedcap_max ""
-sv_jumpspeedcap_max_disable_on_ramps 1
-g_teleport_maxspeed 0
index 3e98265..a92b06b 100644 (file)
@@ -3,12 +3,12 @@ PERL ?= perl
 QCCFLAGS_WATERMARK ?= -DWATERMARK='"$(shell git describe)"' -DCVAR_POPCON=1
 QCC ?= gmqcc
 
-VERSION_MESSAGE = $(shell cd server && $(QCC) --version --help)
-ifneq (,$(findstring GMQCC,$(VERSION_MESSAGE)))
-# this is gmqcc
+QCCVERSIONFILE := qccversion.$(shell $(QCC) --version > qccversion.txt && git hash-object qccversion.txt)
+
 QCCFLAGS ?= \
        -std=fteqcc \
        -Werror -Wall \
+       -Wcpp \
        -Wno-field-redeclared \
        -Wno-double-declaration \
        -Wno-uninitialized-global \
@@ -35,10 +35,6 @@ QCCFLAGS ?= \
        -fno-permissive \
        -fvariadic-args \
        $(QCCFLAGS_EXTRA) $(QCCFLAGS_WATERMARK)
-else
-# this. is. fteqccccccccccccccccccc!
-QCCFLAGS ?= -Werror -Wno-Q302 -O3 -Ono-return_only -fno-fastarrays $(QCCFLAGS_EXTRA) $(QCCFLAGS_WATERMARK)
-endif
 
 # xonotic build system overrides this by command line argument to turn off the update-cvarcount step
 XON_BUILDSYSTEM =
@@ -54,20 +50,27 @@ qc-recursive: ../menu.dat ../progs.dat ../csprogs.dat
 
 .PHONY: clean
 clean:
-       rm -f ../progs.dat ../menu.dat ../csprogs.dat
+       rm -f ../progs.dat ../menu.dat ../csprogs.dat server/precache-for-csqc.inc
+
+$(QCCVERSIONFILE):
+       $(RM) qccversion.*
+       echo This file intentionally left blank. > $@
 
 FILES_CSPROGS = $(shell find client common warpzonelib csqcmodellib -type f -not -name fteqcc.log -not -name qc.asm) $(wildcard server/w_*.qc)
-../csprogs.dat: $(FILES_CSPROGS)
+../csprogs.dat: $(FILES_CSPROGS) $(QCCVERSIONFILE)
        @echo make[1]: Entering directory \`$(PWD)/client\'
        cd client && $(QCC) $(QCCFLAGS)
 
+server/precache-for-csqc.inc: $(FILES_CSPROGS)
+       sh collect-precache.sh
+
 FILES_PROGS = $(shell find server common warpzonelib csqcmodellib -type f -not -name fteqcc.log -not -name qc.asm) $(wildcard server/w_*.qc)
-../progs.dat: $(FILES_PROGS)
+../progs.dat: $(FILES_PROGS) $(QCCVERSIONFILE) server/precache-for-csqc.inc
        @echo make[1]: Entering directory \`$(PWD)/server\'
        cd server && $(QCC) $(QCCFLAGS)
 
 FILES_MENU = $(shell find menu common warpzonelib -type f -not -name fteqcc.log -not -name qc.asm) $(wildcard server/w_*.qc)
-../menu.dat: $(FILES_MENU)
+../menu.dat: $(FILES_MENU) $(QCCVERSIONFILE)
        @echo make[1]: Entering directory \`$(PWD)/menu\'
        cd menu && $(QCC) $(QCCFLAGS)
 
index 7178cdb..42fadc0 100644 (file)
@@ -32,55 +32,6 @@ void menu_sub_null()
 float __engine_check;
 #endif
 
-void precache_playermodel(string m)
-{
-       string f;
-
-       if(substring(m, -9,5) == "_lod1")
-               return;
-       if(substring(m, -9,5) == "_lod2")
-               return;
-       precache_model(m);
-       f = strcat(substring(m, 0, -5), "_lod1", substring(m, -4, -1));
-       if(fexists(f))
-               precache_model(f);
-       f = strcat(substring(m, 0, -5), "_lod2", substring(m, -4, -1));
-       if(fexists(f))
-               precache_model(f);
-
-       /*
-       float globhandle, i, n;
-       globhandle = search_begin(strcat(m, "_*.sounds"), TRUE, FALSE);
-       if (globhandle < 0)
-               return;
-       n = search_getsize(globhandle);
-       for (i = 0; i < n; ++i)
-       {
-               //print(search_getfilename(globhandle, i), "\n");
-               f = search_getfilename(globhandle, i);
-               PrecachePlayerSounds(f);
-       }
-       search_end(globhandle);
-       */
-}
-void precache_all_playermodels(string pattern)
-{
-       float globhandle, i, n;
-       string f;
-
-       globhandle = search_begin(pattern, TRUE, FALSE);
-       if (globhandle < 0)
-               return;
-       n = search_getsize(globhandle);
-       for (i = 0; i < n; ++i)
-       {
-               //print(search_getfilename(globhandle, i), "\n");
-               f = search_getfilename(globhandle, i);
-               precache_playermodel(f);
-       }
-       search_end(globhandle);
-}
-
 string forcefog;
 void WaypointSprite_Load();
 void ConsoleCommand_macro_init();
@@ -164,14 +115,6 @@ void CSQC_Init(void)
        precache_model("null");
        precache_sound("misc/hit.wav");
        precache_sound("misc/typehit.wav");
-       if (autocvar_cl_precacheplayermodels)
-       {
-               precache_all_playermodels("models/player/*.zym");
-               precache_all_playermodels("models/player/*.dpm");
-               precache_all_playermodels("models/player/*.md3");
-               precache_all_playermodels("models/player/*.psk");
-               precache_all_playermodels("models/player/*.iqm");
-       }
 
        Projectile_Precache();
        Hook_Precache();
index 13e41a4..44f8236 100644 (file)
@@ -483,7 +483,15 @@ void CSQC_UpdateView(float w, float h)
                if(spectatee_status >= 0 && (autocvar_cl_eventchase_death && is_dead) || intermission)
                {
                        // make special vector since we can't use view_origin (It is one frame old as of this code, it gets set later with the results this code makes.)
-                       vector current_view_origin = ((csqcplayer ? csqcplayer.origin : pmove_org) + autocvar_cl_eventchase_viewoffset);
+                       vector current_view_origin = (csqcplayer ? csqcplayer.origin : pmove_org);
+
+                       // detect maximum viewoffset and use it
+                       if(autocvar_cl_eventchase_viewoffset)
+                       {
+                               WarpZone_TraceLine(current_view_origin, current_view_origin + autocvar_cl_eventchase_viewoffset + ('0 0 1' * autocvar_cl_eventchase_maxs_z), MOVE_WORLDONLY, self);
+                               if(trace_fraction == 1) { current_view_origin += autocvar_cl_eventchase_viewoffset; }
+                               else { current_view_origin_z += max(0, (trace_endpos_z - current_view_origin_z) - autocvar_cl_eventchase_maxs_z); }
+                       }
 
                        // We must enable chase_active to get a third person view (weapon viewmodel hidden and own player model showing).
                        // Ideally, there should be another way to enable third person cameras, such as through setproperty()
index af70081..8175695 100644 (file)
@@ -424,7 +424,6 @@ float autocvar_cl_forcemyplayercolors;
 float autocvar__cl_color;
 float autocvar__cl_playerskin;
 string autocvar__cl_playermodel;
-float autocvar_cl_precacheplayermodels;
 float autocvar_cl_deathglow;
 float autocvar_developer_csqcentities;
 float autocvar_g_jetpack_attenuation;
index 7926544..cbf294f 100644 (file)
@@ -26,7 +26,7 @@ void LocalCommand_blurtest(float request)
 {
        // Simple command to work with postprocessing temporarily... possibly completely pointless, the glsl shader is used for a real feature now...
        // Anyway, to enable it, just compile the client with -DBLURTEST and then you can use the command.
-       
+
        #ifdef BLURTEST
        switch(request)
        {
@@ -57,6 +57,57 @@ void LocalCommand_blurtest(float request)
        #endif
 }
 
+void LocalCommand_boxparticles(float request, float argc)
+{
+       switch(request)
+       {
+               case CMD_REQUEST_COMMAND:
+               {
+                       if (argc == 9)
+                       {
+                               float effect = particleeffectnum(argv(1));
+                               if (effect >= 0)
+                               {
+                                       float index = stof(argv(2));
+                                       entity own;
+                                       if(index <= 0)
+                                               own = entitybyindex(-index);
+                                       else
+                                               own = findfloat(world, entnum, index);
+                                       vector org_from = stov(argv(3));
+                                       vector org_to = stov(argv(4));
+                                       vector dir_from = stov(argv(5));
+                                       vector dir_to = stov(argv(6));
+                                       float countmultiplier = stof(argv(7));
+                                       float flags = stof(argv(8));
+                                       boxparticles(effect, own, org_from, org_to, dir_from, dir_to, countmultiplier, flags);
+                                       return;
+                               }
+                       }
+               }
+
+               default:
+                       print("Incorrect parameters for ^2boxparticles^7\n");
+               case CMD_REQUEST_USAGE:
+               {
+                       print("\nUsage:^3 lv_cmd boxparticles effectname own org_from org_to, dir_from, dir_to, countmultiplier, flags\n");
+                       print("  'effectname' is the name of a particle effect in effectinfo.txt\n");
+                       print("  'own' is the entity number of the owner (negative for csqc ent, positive for svqc ent)\n");
+                       print("  'org_from' is the starting origin of the box\n");
+                       print("  'org_to' is the ending origin of the box\n");
+                       print("  'dir_from' is the minimum velocity\n");
+                       print("  'dir_to' is the maximum velocity\n");
+                       print("  'countmultiplier' defines a multiplier for the particle count (affects count only, not countabsolute or trailspacing)\n");
+                       print("  'flags' can contain:\n");
+                       print("    1 to respect globals particles_alphamin, particles_alphamax (set right before via prvm_globalset client)\n");
+                       print("    2 to respect globals particles_colormin, particles_colormax (set right before via prvm_globalset client)\n");
+                       print("    4 to respect globals particles_fade (set right before via prvm_globalset client)\n");
+                       print("    128 to draw a trail, not a box\n");
+                       return;
+               }
+       }
+}
+
 void LocalCommand_create_scrshot_ent(float request)
 {
        switch(request)
@@ -351,6 +402,7 @@ void LocalCommand_(float request)
 // Normally do not hard code aliases for these, instead create them in commands.cfg... also: keep in alphabetical order, please ;)
 #define CLIENT_COMMANDS(request,arguments) \
        CLIENT_COMMAND("blurtest", LocalCommand_blurtest(request), "Feature for testing blur postprocessing") \
+       CLIENT_COMMAND("boxparticles", LocalCommand_boxparticles(request, arguments), "Spawn particles manually") \
        CLIENT_COMMAND("create_scrshot_ent", LocalCommand_create_scrshot_ent(request), "Create an entity at this location for automatic screenshots") \
        CLIENT_COMMAND("debugmodel", LocalCommand_debugmodel(request, arguments), "Spawn a debug model manually") \
        CLIENT_COMMAND("handlevote", LocalCommand_handlevote(request, arguments), "System to handle selecting a vote or option") \
diff --git a/qcsrc/client/csqc_builtins.qc b/qcsrc/client/csqc_builtins.qc
deleted file mode 100644 (file)
index 0fabb0d..0000000
+++ /dev/null
@@ -1,359 +0,0 @@
-void (vector ang)                                                      makevectors = #1;
-void(entity e, vector o) setorigin     = #2;
-void (entity e, string m)                                              setmodel = #3;
-void(entity e, vector min, vector max) setsize = #4;
-
-void ()                                                                        break = #6;
-float ()                                                               random = #7;
-void (entity e, float chan, string samp, float vol, float atten)       sound = #8;
-vector (vector v)                                                      normalize = #9;
-void (string e)                                                                error = #10;
-void (string e)                                                                objerror = #11;
-float (vector v)                                                       vlen = #12;
-float (vector v)                                                       vectoyaw = #13;
-entity ()                                                              spawn = #14;
-void (entity e)                                                                remove = #15;
-
-void (vector v1, vector v2, float nomonsters, entity forent)           traceline = #16;
-
-entity (entity start, .string fld, string match)                       find = #18;
-string (string s)                                                      precache_sound = #19;
-string (string s)                                                      precache_model = #20;
-
-void (string s, ...)                                           dprint = #25;
-string (float f)                                                       ftos = #26;
-string (vector v)                                                      vtos = #27;
-void ()                                                                        coredump = #28;
-void ()                                                                        traceon = #29;
-void ()                                                                        traceoff = #30;
-void (entity e)                                                                eprint = #31;
-
-float (float v)                                                                rint = #36;
-float (float v)                                                                floor = #37;
-float (float v)                                                                ceil = #38;
-
-float (vector v)                                                       pointcontents = #41;
-float (float f)                                                                fabs = #43;
-
-float (string s)                                                       cvar = #45;
-void (string s, ...)                                                   localcmd = #46;
-entity (entity e)                                                      nextent = #47;
-
-vector (vector v)                                                      vectoangles = #51;
-vector (vector v, vector w)                                                    vectoangles2 = #51;
-
-void (string var, string val)                                          cvar_set = #72;
-
-
-float()                                                                        ReadByte = #360;
-float()                                                                        ReadChar = #361;
-float()                                                                        ReadShort = #362;
-float()                                                                        ReadLong = #363;
-float()                                                                        ReadCoord = #364;
-float()                                                                        ReadAngle = #365;
-string()                                                               ReadString = #366;      //warning: this returns a temporary!
-
-float(string s)                                                                stof = #81;
-
-
-void (vector v1, vector min, vector max, vector v2, float nomonsters, entity forent)   tracebox = #90;
-float (string name, string value, ...)                                 registercvar = #93;
-
-entity (entity start, .entity fld, entity match)                       findentity = #98;
-entity (entity start, .float fld, float match)                         findfloat = #98;
-
-float (string s)                                                       checkextension = #99;
-
-float (string filename, float mode)                                    fopen = #110;
-void (float fhandle)                                                   fclose = #111;
-string (float fhandle)                                                 fgets = #112;
-void (float fhandle, string s)                                         fputs = #113;
-float (string s)                                                       strlen = #114;
-string (...)                                                           strcat = #115;
-string (string s, float start, float length)                           substring = #116;
-vector (string s)                                                      stov = #117;
-string (string s)                                                      strzone = #118;
-void (string s)                                                                strunzone = #119;
-
-void ()                                                                        R_ClearScene = #300;
-void (float mask)                                                      R_AddEntities = #301;
-void (entity e)                                                                R_AddEntity = #302;
-float (float property, ...)                                            R_SetView = #303;
-vector (float property, ...)                                           R_SetView3fv = #303;
-void ()                                                                        R_RenderScene = #304;
-void (vector org, float radius, vector rgb)                            R_AddDynamicLight = #305;
-void ()                                                                        R_CalcRefDef = #306;
-
-vector (vector v)                                                      cs_unproject = #310;
-vector (vector v)                                                      cs_project = #311;
-
-void   drawline(float width, vector pos1, vector pos2, vector rgb, float alpha, float flags) = #315;
-float  iscachedpic(string name)        = #316;
-string precache_pic(string name, ...)  = #317;
-vector draw_getimagesize(string pic) = #318;
-void   freepic(string name)            = #319;
-float  drawcharacter(vector position, float character, vector scale, vector rgb, float alpha, float flag) = #320;
-float  drawstring(vector position, string text, vector scale, vector rgb, float alpha, float flag) = #321;
-float  drawpic(vector position, string pic, vector size, vector rgb, float alpha, float flag) = #322;
-float  drawfill(vector position, vector size, vector rgb, float alpha, float flag) = #323;
-void   drawsetcliparea(float x, float y, float width, float height) = #324;
-void   drawresetcliparea(void) = #325;
-float  drawcolorcodedstring(vector position, string text, vector scale, float alpha, float flag) = #326;
-float  stringwidth(string text, float handleColors, vector fontSize) = #327;
-float  drawsubpic(vector position, vector size, string pic, vector srcPosition, vector srcSize, vector rgb, float alpha, float flag) = #328;
-
-
-float (float statnum)                                                  getstatf = #330;
-float (float statnum)                                                  getstati = #331;
-string (float statnum)                                                 getstats = #332;
-
-void (entity e, float i)                                               setmodelindex = #333;
-string (float i)                                                       modelnameforindex = #334;
-
-float(string efname)                                                   particleeffectnum = #335;
-void(entity ent, float effectnum, vector start, vector end, ...)       trailparticles = #336;
-void (float efnum, vector org, vector vel, float countmultiplier, ...) pointparticles = #337;
-
-void (string s, ...)                                                   cprint = #338;
-void (string s, ...)                                                   print = #339;
-
-void (float scale)                                                     setsensitivityscale = #346;
-
-
-float (float framenum)                                                 getinputstate = #345;
-void (entity e)                                                                        runstandardplayerphysics = #347;
-
-string (float playernum, string key)                                   getplayerkeyvalue = #348;
-void (string cmdname)                                                  registercmd = #352;
-void(float usecursor)                                                  setcursormode = #343;
-vector ()                                                              getmousepos = #344;
-
-string (string s)                                                      uncolorstring = #170;
-
-void (vector org, vector forward, vector right, vector up)             setlistener = #351;
-
-float (vector start, vector end, float ignore, float csqcents)         selecttraceline = #355;
-float ()                                                               isdemo = #349;
-float ()                                                               isserver = #350;
-
-void (float f)                                                         setwantsmousemove = #343;
-string (float key)                                                     getkeybind = #342;
-//string (float f)                                                     chr = #78;
-string (float f)                                                       chr = #78;
-float(string str, float ofs)                                           str2chr = #222;
-string(float c, ...)                                                   chr2str = #223;
-
-vector (vector org)                                                    getlight = #92;
-
-entity (.string fld, string match)                                     findchain = #402;
-entity (.float fld, float match)                                       findchainflags = #450;
-entity (.entity fld, entity match)                                     findchainentity = #403;
-entity (.float fld, float match)                                       findchainfloat = #403;
-entity (entity start, .float fld, float match)                         findflags = #449;
-
-float (string pattern, float caseinsensitive, float quiet)             search_begin = #444;
-void (float handle)                                                    search_end = #445;
-float (float handle)                                                   search_getsize = #446;
-string (float handle, float num)                                       search_getfilename = #447;
-
-
-#define SPA_POSITION 0
-#define SPA_S_AXIS 1
-#define SPA_T_AXIS 2
-#define SPA_R_AXIS 3
-#define SPA_TEXCOORDS0 4
-#define SPA_LIGHTMAP0_TEXCOORDS 5
-#define SPA_LIGHTMAP_COLOR 6
-float (entity e, float s)                                              getsurfacenumpoints = #434;
-vector (entity e, float s, float n)                                    getsurfacepoint = #435;
-vector (entity e, float s)                                             getsurfacenormal = #436;
-string (entity e, float s)                                             getsurfacetexture = #437;
-float (entity e, vector p)                                             getsurfacenearpoint = #438;
-vector (entity e, float s, vector p)                                   getsurfaceclippedpoint = #439;
-vector(entity e, float s, float n, float a) getsurfacepointattribute = #486;
-float(entity e, float s) getsurfacenumtriangles = #628;
-vector(entity e, float s, float n) getsurfacetriangle = #629;
-
-
-float (float a, float b, ...) min = #94;
-float (float a, float b, float c) min3 = #94;
-float (float a, float b, float c, float d) min4 = #94;
-float (float a, float b, float c, float d, float e) min5 = #94;
-float (float a, float b, float c, float d, float e, float f) min6 = #94;
-float (float a, float b, float c, float d, float e, float f, float g) min7 = #94;
-float (float a, float b, float c, float d, float e, float f, float g, float h) min8 = #94;
-float (float a, float b, ...) max = #95;
-float (float a, float b, float c) max3 = #95;
-float (float a, float b, float c, float d) max4 = #95;
-float (float a, float b, float c, float d, float e) max5 = #95;
-float (float a, float b, float c, float d, float e, float f) max6 = #95;
-float (float a, float b, float c, float d, float e, float f, float g) max7 = #95;
-float (float a, float b, float c, float d, float e, float f, float g, float h) max8 = #95;
-float (float minimum, float val, float maximum) bound = #96;
-
-vector () randomvec = #91;
-
-float (float val)              sin = #60;
-float (float val)              cos = #61;
-float (float val)              sqrt = #62;
-float (float a, float b)       pow = #97;
-
-void (vector org, string modelname, float startframe, float endframe, float framerate) effect = #404;
-
-void (vector org, vector velocity, float howmany) te_blood = #405;
-void (vector mincorner, vector maxcorner, float explosionspeed, float howmany) te_bloodshower = #406;
-void (vector org, float radius, float lifetime, vector color) te_customflash = #417;
-void(vector org, vector color) te_explosionrgb = #407;
-void(vector mincorner, vector maxcorner, vector vel, float howmany, float color, float gravityflag, float randomveljitter) te_particlecube = #408;
-void(vector mincorner, vector maxcorner, vector vel, float howmany, float color) te_particlerain = #409;
-void(vector mincorner, vector maxcorner, vector vel, float howmany, float color) te_particlesnow = #410;
-void(vector org) te_plasmaburn = #433;
-void(vector org) te_gunshotquad = #412;
-void(vector org) te_spikequad = #413;
-void(vector org) te_superspikequad = #414;
-void(vector org) te_explosionquad = #415;
-void(vector org) te_smallflash = #416;
-void(vector org, vector vel, float howmany) te_spark = #411;
-
-void(vector org) te_gunshot = #418;
-void(vector org) te_spike = #419;
-void(vector org) te_superspike = #420;
-void(vector org) te_explosion = #421;
-void(vector org) te_tarexplosion = #422;
-void(vector org) te_wizspike = #423;
-void(vector org) te_knightspike = #424;
-void(vector org) te_lavasplash = #425;
-void(vector org) te_teleport = #426;
-void(vector org, float color, float colorlength) te_explosion2 = #427;
-void(entity own, vector start, vector end) te_lightning1 = #428;
-void(entity own, vector start, vector end) te_lightning2 = #429;
-void(entity own, vector start, vector end) te_lightning3 = #430;
-void(entity own, vector start, vector end) te_beam = #431;
-
-float (entity ent, string tagname)     gettagindex = #451;
-vector (entity ent, float tagindex)    gettaginfo = #452;
-
-float (string s)       tokenize = #441;
-string (float argnum)  argv = #442;
-
-string (string s) cvar_string = #448;
-string (string s) cvar_defstring = #482;
-
-float ()                                               buf_create = #460;
-void (float bufhandle)                                 buf_del = #461;
-float (float bufhandle)                                        buf_getsize = #462;
-void (float bufhandle_from, float bufhandle_to)                buf_copy = #463;
-void (float bufhandle, float sortpower, float backward)        buf_sort = #464;
-string (float bufhandle, string glue)                  buf_implode = #465;
-string (float bufhandle, float string_index)           bufstr_get = #466;
-void (float bufhandle, float string_index, string str) bufstr_set = #467;
-float (float bufhandle, string str, float order)       bufstr_add = #468;
-void (float bufhandle, float string_index)             bufstr_free = #469;
-
-float () onground = #355;
-
-void(string texturename, ...) R_BeginPolygon = #306;
-void(vector org, vector texcoords, vector rgb, float alpha) R_PolygonVertex = #307;
-void() R_EndPolygon = #308;
-
-float(string s, float num) charindex = #356;
-
-// Darkplaces Additional Functions
-string(string s) strdecolorize = #477;
-string(string s) strtolower = #480; // returns the passed in string in pure lowercase form
-string(string s) strtoupper = #481; // returns the passed in string in pure uppercase form
-float(string s) strlennocol = #476;
-
-void(vector origin, string sample, float volume, float attenuation) pointsound = #483;
-
-// added by blub
-
-string(string key)                                     serverkey = #354;
-float(string s1, string s2)                            strcasecmp = #229;
-float(string s1, string s2, float len)                 strncasecmp = #230;
-float(string str, string sub, float startoffs)         strstrofs = #221;
-//float(string str, string sub)                        strstrofs = #221;
-entity(float num)                                      edict_num = #459;
-string(void)                                           ReadPicture = #501;
-string(string filename)                                        whichpack = #503;
-float(entity ent)                                      num_for_edict = #512;
-float(string s, string separator1, ...) tokenizebyseparator = #479;
-string(string in) uri_unescape = #511;
-float(float caseinsensitive, string s, ...) crc16 = #494;
-string(string info, string key) infoget = #227;
-string(string info, string key, string value, ...) infoadd = #226;
-string(string in) uri_escape = #510;
-
-float stringtokeynum(string keyname) = #341;
-string keynumtostring(float keynum) = #520;
-string findkeysforcommand(string command) = #521;
-
-string(float ccase, float calpha, float cnum, string s, ...) strconv = #224;
-float(entity ent) wasfreed = #353;
-
-entity(vector org, float rad) findradius = #22;
-
-string(float uselocaltime, string format, ...) strftime = #478;
-float(float timer) gettime = #519;
-#define GETTIME_REALTIME 1
-#define GETTIME_CDTRACK 4
-
-float(string s) tokenize_console = #514;
-float(float i) argv_start_index = #515;
-float(float i) argv_end_index = #516;
-
-float(float s) asin = #471; // returns angle in radians for a given sin() value, the result is in the range -PI*0.5 to PI*0.5
-float(float c) acos = #472; // returns angle in radians for a given cos() value, the result is in the range 0 to PI
-float(float t) atan = #473; // returns angle in radians for a given tan() value, the result is in the range -PI*0.5 to PI*0.5
-float(float c, float s) atan2 = #474; // returns angle in radians for a given cos() and sin() value pair, the result is in the range -PI to PI (this is identical to vectoyaw except it returns radians rather than degrees)
-float(float a) tan = #475; // returns tangent value (which is simply sin(a)/cos(a)) for the given angle in radians, the result is in the range -infinity to +infinity
-float DEG2RAD = 0.0174532925199432957692369076848861271344287188854172545609719144;
-float RAD2DEG = 57.2957795130823208767981548141051703324054724665643215491602438612;
-float PI      = 3.1415926535897932384626433832795028841971693993751058209749445923;
-float log(float f) = #532;
-
-void(entity e, entity ignore) tracetoss = #64;
-
-float(entity e, float ch) getsoundtime = #533; // (DP_SND_GETSOUNDTIME)
-
-#define PARTICLES_USEALPHA 1
-float particles_alphamin, particles_alphamax;
-#define PARTICLES_USECOLOR 2
-vector particles_colormin, particles_colormax;
-void(float effectindex, entity own, vector org_from, vector org_to, vector dir_from, vector dir_to, float countmultiplier, float flags)        boxparticles = #502;
-string(string format, ...) sprintf = #627;
-
-float(string name) cvar_type = #495;
-float CVAR_TYPEFLAG_EXISTS = 1;
-float CVAR_TYPEFLAG_SAVED = 2;
-float CVAR_TYPEFLAG_PRIVATE = 4;
-float CVAR_TYPEFLAG_ENGINE = 8;
-float CVAR_TYPEFLAG_HASDESCRIPTION = 16;
-float CVAR_TYPEFLAG_READONLY = 32;
-
-void (entity e, float chan, string samp, float vol, float atten, float pitchshift, float flags)        sound7 = #8;
-
-float trace_dphitcontents;
-float trace_networkentity;
-
-string(string search, string replace, string subject) strreplace = #484;
-
-//DP_QC_DIGEST
-//idea: motorsep, Spike
-//DarkPlaces implementation: divVerent
-//builtin definitions:
-string(string digest, string data, ...) digest_hex = #639;
-//description:
-//returns a given hex digest of given data
-//the returned digest is always encoded in hexadecimal
-//only the "MD4" digest is always supported!
-//if the given digest is not supported, string_null is returned
-//the digest string is matched case sensitively, use "MD4", not "md4"!
-
-//DP_CSQC_MINFPS_QUALITY
-//idea: divVerent
-//darkplaces implementation: divVerent
-//constant definitions:
-const float VF_MINFPS_QUALITY   = 213;
-//use getproperty(VF_MINFPS_QUALITY); to do CSQC based LOD based on cl_minfps
-//1 should lead to an unmodified view
index 99e5b32..5444c8a 100644 (file)
@@ -4593,7 +4593,7 @@ void HUD_Main (void)
                                hud_panel[panel_order[i]].update_time = time;
                }
        }
-       else if (hud_configure_prev && autocvar_hud_cursormode)
+       else if(hud_configure_prev && hud_configure_prev != -1 && autocvar_hud_cursormode)
                setcursormode(0);
 
        hud_configure_prev = autocvar__hud_configure;
index 3e2222f..00343a4 100644 (file)
@@ -295,9 +295,10 @@ void Net_ReadNexgunBeamParticle()
        
        //draw either the old v2.3 beam or the new beam
        charge = sqrt(charge); // divide evenly among trail spacing and alpha
-       particles_alphamin = particles_alphamax = charge;
+       particles_alphamin = particles_alphamax = particles_fade = charge;
+
        if (autocvar_cl_particles_oldnexbeam && (getstati(STAT_ALLOW_OLDNEXBEAM) || isdemo()))
-               WarpZone_TrailParticles_WithMultiplier(world, particleeffectnum("TE_TEI_G3"), shotorg, endpos, charge, 1);
+               WarpZone_TrailParticles_WithMultiplier(world, particleeffectnum("TE_TEI_G3"), shotorg, endpos, 1, PARTICLES_USEALPHA | PARTICLES_USEFADE);
        else
-               WarpZone_TrailParticles_WithMultiplier(world, particleeffectnum("nex_beam"), shotorg, endpos, charge, 1);
+               WarpZone_TrailParticles_WithMultiplier(world, particleeffectnum("nex_beam"), shotorg, endpos, 1, PARTICLES_USEALPHA | PARTICLES_USEFADE);
 }
index fb4fdd5..de45141 100644 (file)
@@ -40,8 +40,8 @@ void Projectile_DrawTrail(vector to)
 
        if (self.traileffect)
        {
-               particles_alphamin = particles_alphamax = sqrt(self.alpha);
-               boxparticles(self.traileffect, self, from, to, self.velocity, self.velocity, sqrt(self.alpha), PARTICLES_USEALPHA);
+               particles_alphamin = particles_alphamax = particles_fade = sqrt(self.alpha);
+               boxparticles(self.traileffect, self, from, to, self.velocity, self.velocity, 1, PARTICLES_USEALPHA | PARTICLES_USEFADE | PARTICLES_DRAWASTRAIL);
        }
 }
 
@@ -101,6 +101,18 @@ void Projectile_Draw()
                        case PROJECTILE_GRENADE_BOUNCING:
                                rot = '0 -1000 0'; // sideways
                                break;
+                       case PROJECTILE_NADE_RED_BURN:
+                       case PROJECTILE_NADE_RED:
+                       case PROJECTILE_NADE_BLUE_BURN:
+                       case PROJECTILE_NADE_BLUE:
+                       case PROJECTILE_NADE_YELLOW_BURN:
+                       case PROJECTILE_NADE_YELLOW:
+                       case PROJECTILE_NADE_PINK_BURN:
+                       case PROJECTILE_NADE_PINK:
+                       case PROJECTILE_NADE_BURN:
+                       case PROJECTILE_NADE:
+                               rot = self.avelocity; 
+                               break;
                        case PROJECTILE_HOOKBOMB:
                                rot = '1000 0 0'; // forward
                                break;
@@ -124,6 +136,18 @@ void Projectile_Draw()
        trailorigin = self.origin;
        switch(self.cnt)
        {
+           case PROJECTILE_NADE_RED_BURN:
+               case PROJECTILE_NADE_RED:
+               case PROJECTILE_NADE_BLUE_BURN:
+               case PROJECTILE_NADE_BLUE:
+               case PROJECTILE_NADE_YELLOW_BURN:
+               case PROJECTILE_NADE_YELLOW:
+               case PROJECTILE_NADE_PINK_BURN:
+               case PROJECTILE_NADE_PINK:
+               case PROJECTILE_NADE_BURN:
+               case PROJECTILE_NADE:
+                       trailorigin += v_up * 4;
+                       break;
                case PROJECTILE_GRENADE:
                case PROJECTILE_GRENADE_BOUNCING:
                        trailorigin += v_right * 1 + v_forward * -10;
@@ -300,6 +324,17 @@ void Ent_Projectile()
 
                        case PROJECTILE_BUMBLE_GUN: setmodel(self, "models/elaser.mdl");self.traileffect = particleeffectnum("TR_NEXUIZPLASMA"); break;
                        case PROJECTILE_BUMBLE_BEAM: setmodel(self, "models/elaser.mdl");self.traileffect = particleeffectnum("TR_NEXUIZPLASMA"); break;
+                       
+                       case PROJECTILE_NADE_RED: setmodel(self, "models/weapons/v_ok_grenade.md3");self.traileffect = particleeffectnum("nade_red"); break;
+                       case PROJECTILE_NADE_RED_BURN: setmodel(self, "models/weapons/v_ok_grenade.md3");self.traileffect = particleeffectnum("nade_red_burn"); break;
+                       case PROJECTILE_NADE_BLUE: setmodel(self, "models/weapons/v_ok_grenade.md3");self.traileffect = particleeffectnum("nade_blue"); break;
+                       case PROJECTILE_NADE_BLUE_BURN: setmodel(self, "models/weapons/v_ok_grenade.md3");self.traileffect = particleeffectnum("nade_blue_burn"); break;
+                       case PROJECTILE_NADE_YELLOW: setmodel(self, "models/weapons/v_ok_grenade.md3");self.traileffect = particleeffectnum("nade_yellow"); break;
+                       case PROJECTILE_NADE_YELLOW_BURN: setmodel(self, "models/weapons/v_ok_grenade.md3");self.traileffect = particleeffectnum("nade_yellow_burn"); break;
+                       case PROJECTILE_NADE_PINK: setmodel(self, "models/weapons/v_ok_grenade.md3");self.traileffect = particleeffectnum("nade_pink"); break;
+                       case PROJECTILE_NADE_PINK_BURN: setmodel(self, "models/weapons/v_ok_grenade.md3");self.traileffect = particleeffectnum("nade_pink_burn"); break;
+                       case PROJECTILE_NADE: setmodel(self, "models/weapons/v_ok_grenade.md3");self.traileffect = particleeffectnum("nade"); break;
+                       case PROJECTILE_NADE_BURN: setmodel(self, "models/weapons/v_ok_grenade.md3");self.traileffect = particleeffectnum("nade_burn"); break;
 
                        default:
                                error("Received invalid CSQC projectile, can't work with this!");
@@ -334,6 +369,17 @@ void Ent_Projectile()
                                self.mins = '-3 -3 -3';
                                self.maxs = '3 3 3';
                                break;
+                       case PROJECTILE_NADE_RED_BURN:
+                       case PROJECTILE_NADE_RED:
+                       case PROJECTILE_NADE_BLUE_BURN:
+                       case PROJECTILE_NADE_BLUE:
+                               self.mins = '-3 -3 -3';
+                               self.maxs = '3 3 3';
+                               self.move_movetype = MOVETYPE_BOUNCE;
+                               self.move_touch = func_null;
+                               self.scale = 1.5;
+                               self.avelocity = randomvec() * 720;
+                               break;
                        case PROJECTILE_GRENADE_BOUNCING:
                                self.mins = '-3 -3 -3';
                                self.maxs = '3 3 3';
@@ -342,6 +388,23 @@ void Ent_Projectile()
                                self.move_bounce_factor = g_balance_grenadelauncher_bouncefactor;
                                self.move_bounce_stopspeed = g_balance_grenadelauncher_bouncestop;
                                break;
+                       case PROJECTILE_NADE_RED_BURN:
+                       case PROJECTILE_NADE_RED:
+                       case PROJECTILE_NADE_BLUE_BURN:
+                       case PROJECTILE_NADE_BLUE:
+                       case PROJECTILE_NADE_YELLOW_BURN:
+                       case PROJECTILE_NADE_YELLOW:
+                       case PROJECTILE_NADE_PINK_BURN:
+                       case PROJECTILE_NADE_PINK:
+                       case PROJECTILE_NADE_BURN:
+                       case PROJECTILE_NADE:
+                               self.mins = '-16 -16 -16';
+                               self.maxs = '16 16 16';
+                               self.move_movetype = MOVETYPE_BOUNCE;
+                               self.move_touch = func_null;
+                               self.scale = 1.5;
+                               self.avelocity = randomvec() * 720;
+                               break;
                        case PROJECTILE_MINE:
                                self.mins = '-4 -4 -4';
                                self.maxs = '4 4 4';
@@ -460,6 +523,8 @@ void Projectile_Precache()
        precache_model("models/rocket.md3");
        precache_model("models/tagrocket.md3");
        precache_model("models/tracer.mdl");
+       
+       precache_model("models/weapons/v_ok_grenade.md3");
 
        precache_sound("weapons/electro_fly.wav");
        precache_sound("weapons/rocket_fly.wav");
index 77cb253..4bbbf03 100644 (file)
@@ -2,6 +2,7 @@ float music_disabled;
 entity music_default;
 entity music_target;
 entity music_trigger;
+// FIXME also control bgmvolume here, to not require a target_music for the default track.
 
 .float state;
 .float lastvol;
diff --git a/qcsrc/collect-precache.sh b/qcsrc/collect-precache.sh
new file mode 100755 (executable)
index 0000000..302220c
--- /dev/null
@@ -0,0 +1,7 @@
+#!/bin/sh
+
+{
+       grep -h '\<precache_model *( *"' client/* | grep -v "//NO_SV_PRECACHE"
+       grep -h '\<precache_sound *( *"' client/* | grep -v "//NO_SV_PRECACHE"
+} > server/precache-for-csqc.inc
+
index b399f38..1a70b34 100644 (file)
@@ -355,6 +355,17 @@ float PROJECTILE_WAKICANNON     = 29;
 float PROJECTILE_BUMBLE_GUN     = 30;
 float PROJECTILE_BUMBLE_BEAM    = 31;
 
+float PROJECTILE_NADE_RED              = 50;
+float PROJECTILE_NADE_RED_BURN         = 51;
+float PROJECTILE_NADE_BLUE             = 52;
+float PROJECTILE_NADE_BLUE_BURN        = 53;
+float PROJECTILE_NADE_YELLOW           = 54;
+float PROJECTILE_NADE_YELLOW_BURN      = 55;
+float PROJECTILE_NADE_PINK             = 56;
+float PROJECTILE_NADE_PINK_BURN        = 57;
+float PROJECTILE_NADE                          = 58;
+float PROJECTILE_NADE_BURN                     = 59;
+
 float SPECIES_HUMAN        =  0;
 float SPECIES_ROBOT_SOLID  =  1;
 float SPECIES_ALIEN        =  2;
index f9a9ceb..48a269b 100644 (file)
@@ -15,6 +15,7 @@
        DEATHTYPE(DEATH_KILL,                   DEATH_SELF_SUICIDE,                 NO_MSG,                        NORMAL_POS) \
        DEATHTYPE(DEATH_LAVA,                   DEATH_SELF_LAVA,                    DEATH_MURDER_LAVA,             NORMAL_POS) \
        DEATHTYPE(DEATH_MIRRORDAMAGE,           DEATH_SELF_BETRAYAL,                NO_MSG,                        NORMAL_POS) \
+       DEATHTYPE(DEATH_NADE,                                   DEATH_SELF_NADE,                                        DEATH_MURDER_NADE,                         NORMAL_POS) \
        DEATHTYPE(DEATH_NOAMMO,                 DEATH_SELF_NOAMMO,                  NO_MSG,                        NORMAL_POS) \
        DEATHTYPE(DEATH_ROT,                    DEATH_SELF_ROT,                     NO_MSG,                        NORMAL_POS) \
        DEATHTYPE(DEATH_SHOOTING_STAR,          DEATH_SELF_SHOOTING_STAR,           DEATH_MURDER_SHOOTING_STAR,    NORMAL_POS) \
index 82c5673..7570393 100644 (file)
@@ -1073,20 +1073,21 @@ float MapInfo_Get_ByName_NoFallbacks(string pFilename, float pAllowGenerate, flo
                }
                else if(t == "fog")
                {
-                       if not(cvar_value_issafe(t))
+                       if not(cvar_value_issafe(s))
                                print("Map ", pFilename, " contains a potentially harmful fog setting, ignored\n");
                        else
                                MapInfo_Map_fog = s;
                }
                else if(t == "cdtrack")
                {
-                       if(pGametypeToSet)
+                       t = car(s); s = cdr(s);
+                       if(pGametypeToSet) // FIXME is this check right here?
                        {
                                if not(cvar_value_issafe(t))
                                        print("Map ", pFilename, " contains a potentially harmful cdtrack, ignored\n");
                                else
                                        MapInfo_Map_clientstuff = strcat(
-                                               MapInfo_Map_clientstuff, "cd loop \"", s, "\"\n"
+                                               MapInfo_Map_clientstuff, "cd loop \"", t, "\"\n"
                                        );
                        }
                }
index 9bd8d5e..1ad03e5 100644 (file)
@@ -263,6 +263,7 @@ void Send_Notification_WOVA(
        MSG_INFO_NOTIF(1, INFO_DEATH_MURDER_FALL,              3, 2, "spree_inf s1 s2 s3loc spree_end", "s2 s1",  "notify_fall",          _("^BG%s%s^K1 was grounded by ^BG%s^K1%s%s\n"), "") \
        MSG_INFO_NOTIF(1, INFO_DEATH_MURDER_FIRE,              3, 2, "spree_inf s1 s2 s3loc spree_end", "s2 s1",  "notify_death",         _("^BG%s%s^K1 was burnt up into a crisp by ^BG%s^K1%s%s\n"), _("^BG%s%s^K1 felt a little hot from ^BG%s^K1's fire^K1%s%s\n")) \
        MSG_INFO_NOTIF(1, INFO_DEATH_MURDER_LAVA,              3, 2, "spree_inf s1 s2 s3loc spree_end", "s2 s1",  "notify_lava",          _("^BG%s%s^K1 was cooked by ^BG%s^K1%s%s\n"), "") \
+       MSG_INFO_NOTIF(1, INFO_DEATH_MURDER_NADE,              3, 2, "spree_inf s1 s2 s3loc spree_end", "s2 s1",  "notify_death",         _("^BG%s%s^K1 was blown up by ^BG%s^K1's Nade%s%s\n"), "") \
        MSG_INFO_NOTIF(1, INFO_DEATH_MURDER_SHOOTING_STAR,     3, 2, "spree_inf s1 s2 s3loc spree_end", "s2 s1",  "notify_shootingstar",  _("^BG%s%s^K1 was shot into space by ^BG%s^K1%s%s\n"), "") \
        MSG_INFO_NOTIF(1, INFO_DEATH_MURDER_SLIME,             3, 2, "spree_inf s1 s2 s3loc spree_end", "s2 s1",  "notify_slime",         _("^BG%s%s^K1 was slimed by ^BG%s^K1%s%s\n"), "") \
        MSG_INFO_NOTIF(1, INFO_DEATH_MURDER_SWAMP,             3, 2, "spree_inf s1 s2 s3loc spree_end", "s2 s1",  "notify_slime",         _("^BG%s%s^K1 was preserved by ^BG%s^K1%s%s\n"), "") \
@@ -291,6 +292,7 @@ void Send_Notification_WOVA(
        MSG_INFO_NOTIF(1, INFO_DEATH_SELF_FIRE,                2, 1, "s1 s2loc spree_lost", "s1",       "notify_death",         _("^BG%s^K1 became a bit too crispy%s%s\n"), _("^BG%s^K1 felt a little hot%s%s\n")) \
        MSG_INFO_NOTIF(1, INFO_DEATH_SELF_GENERIC,             2, 1, "s1 s2loc spree_lost", "s1",       "notify_selfkill",      _("^BG%s^K1 died%s%s\n"), "") \
        MSG_INFO_NOTIF(1, INFO_DEATH_SELF_LAVA,                2, 1, "s1 s2loc spree_lost", "s1",       "notify_lava",          _("^BG%s^K1 turned into hot slag%s%s\n"), _("^BG%s^K1 found a hot place%s%s\n")) \
+       MSG_INFO_NOTIF(1, INFO_DEATH_SELF_NADE,                2, 1, "s1 s2loc spree_lost", "s1",       "notify_death",         _("^BG%s^K1 mastered the art of self-nading%s%s\n"), "") \
        MSG_INFO_NOTIF(1, INFO_DEATH_SELF_NOAMMO,              2, 1, "s1 s2loc spree_lost", "s1",       "notify_outofammo",     _("^BG%s^K1 died%s%s. What's the point of living without ammo?\n"), _("^BG%s^K1 ran out of ammo%s%s\n")) \
        MSG_INFO_NOTIF(1, INFO_DEATH_SELF_ROT,                 2, 1, "s1 s2loc spree_lost", "s1",       "notify_death",         _("^BG%s^K1 rotted away%s%s\n"), "") \
        MSG_INFO_NOTIF(1, INFO_DEATH_SELF_SHOOTING_STAR,       2, 1, "s1 s2loc spree_lost", "s1",       "notify_shootingstar",  _("^BG%s^K1 became a shooting star%s%s\n"), "") \
@@ -324,6 +326,7 @@ void Send_Notification_WOVA(
        MULTITEAM_INFO(1, INFO_DEATH_TEAMKILL_, 4,             3, 1, "s1 s2 s3loc spree_end", "s2 s1",  "notify_teamkill_%s",   _("^BG%s^K1 was betrayed by ^BG%s^K1%s%s\n"), "") \
        MSG_INFO_NOTIF(1, INFO_FREEZETAG_FREEZE,               2, 0, "s1 s2", "",                       "",                     _("^BG%s^K1 was frozen by ^BG%s\n"), "") \
        MSG_INFO_NOTIF(1, INFO_FREEZETAG_REVIVED,              2, 0, "s1 s2", "",                       "",                     _("^BG%s^K3 was revived by ^BG%s\n"), "") \
+       MSG_INFO_NOTIF(1, INFO_FREEZETAG_REVIVED_FALL,         1, 0, "s1", "",                          "",                     _("^BG%s^K3 was revived by falling\n"), "") \
        MSG_INFO_NOTIF(1, INFO_FREEZETAG_AUTO_REVIVED,         1, 1, "s1 f1", "",                       "",                     _("^BG%s^K3 was automatically revived after %s second(s)\n"), "") \
        MULTITEAM_INFO(1, INFO_ROUND_TEAM_WIN_, 4,             0, 0, "", "",                            "",                     _("^TC^TT^BG team wins the round\n"), "") \
        MSG_INFO_NOTIF(1, INFO_ROUND_PLAYER_WIN,               1, 0, "s1", "",                          "",                     _("^BG%s^BG wins the round\n"), "") \
@@ -438,6 +441,7 @@ void Send_Notification_WOVA(
        MSG_CENTER_NOTIF(1, CENTER_COUNTDOWN_ROUNDSTOP,         0, 0, "",             CPID_ROUND,          "2 0", _("^F4Round cannot start"), "") \
        MSG_CENTER_NOTIF(1, CENTER_ROUND_TIED,                  0, 0, "",             CPID_ROUND,          "0 0", _("^BGRound tied"), "") \
        MSG_CENTER_NOTIF(1, CENTER_ROUND_OVER,                  0, 0, "",             CPID_ROUND,          "0 0", _("^BGRound over, there's no winner"), "") \
+       MSG_CENTER_NOTIF(1, CENTER_CAMPCHECK,                   0, 0, "",             CPID_CAMPCHECK,      "0 0", _("^F2Don't camp!"), "") \
        MSG_CENTER_NOTIF(1, CENTER_CTF_CAPTURESHIELD_FREE,      0, 0, "",             CPID_CTF_CAPSHIELD,  "0 0", _("^BGYou are now free.\n^BGFeel free to ^F2try to capture^BG the flag again\n^BGif you think you will succeed."), "") \
        MSG_CENTER_NOTIF(1, CENTER_CTF_CAPTURESHIELD_SHIELDED,  0, 0, "",             CPID_CTF_CAPSHIELD,  "0 0", _("^BGYou are now ^F1shielded^BG from the flag\n^BGfor ^F2too many unsuccessful attempts^BG to capture.\n^BGMake some defensive scores before trying again."), "") \
        MULTITEAM_CENTER(1, CENTER_CTF_CAPTURE_, 2,             0, 0, "",             CPID_CTF_LOWPRIO,    "0 0", _("^BGYou captured the ^TC^TT^BG flag!"), "") \
@@ -463,6 +467,7 @@ void Send_Notification_WOVA(
        MSG_CENTER_NOTIF(1, CENTER_DEATH_MURDER_TYPEFRAGGED,          1, 1, "spree_cen s1",             NO_CPID, "0 0", _("^K1%sYou were typefragged by ^BG%s"), _("^K1%sYou were scored against by ^BG%s^K1 while typing!")) \
        MSG_CENTER_NOTIF(1, CENTER_DEATH_MURDER_TYPEFRAGGED_VERBOSE,  1, 4, "spree_cen s1 frag_stats",  NO_CPID, "0 0", _("^K1%sYou were typefragged by ^BG%s^BG%s"), _("^K1%sYou were scored against by ^BG%s^K1 while typing^BG%s")) \
        MSG_CENTER_NOTIF(1, CENTER_DEATH_MURDER_TYPEFRAG_VERBOSE,     1, 2, "spree_cen s1 frag_ping",   NO_CPID, "0 0", _("^K1%sYou typefragged ^BG%s^BG%s"), _("^K1%sYou scored against ^BG%s^K1 while they were typing^BG%s")) \
+       MSG_CENTER_NOTIF(1, CENTER_NADE_THROW,                          0, 0, "",             CPID_NADES,          "0 0", _("^BGPress ^F2DROPWEAPON^BG again to toss the nade!"), "") \
        MSG_CENTER_NOTIF(1, CENTER_DEATH_SELF_AUTOTEAMCHANGE,   0, 1, "death_team",   NO_CPID,             "0 0", _("^BGYou have been moved into a different team\nYou are now on: %s"), "") \
        MSG_CENTER_NOTIF(1, CENTER_DEATH_SELF_BETRAYAL,         0, 0, "",             NO_CPID,             "0 0", _("^K1Don't shoot your team mates!"), _("^K1Don't go against your team mates!")) \
        MSG_CENTER_NOTIF(1, CENTER_DEATH_SELF_CAMP,             0, 0, "",             NO_CPID,             "0 0", _("^K1Die camper!"), _("^K1Reconsider your tactics, camper!")) \
@@ -473,6 +478,7 @@ void Send_Notification_WOVA(
        MSG_CENTER_NOTIF(1, CENTER_DEATH_SELF_FIRE,             0, 0, "",             NO_CPID,             "0 0", _("^K1You got a little bit too crispy!"), _("^K1You felt a little too hot!")) \
        MSG_CENTER_NOTIF(1, CENTER_DEATH_SELF_GENERIC,          0, 0, "",             NO_CPID,             "0 0", _("^K1You killed your own dumb self!"), _("^K1You need to be more careful!")) \
        MSG_CENTER_NOTIF(1, CENTER_DEATH_SELF_LAVA,             0, 0, "",             NO_CPID,             "0 0", _("^K1You couldn't stand the heat!"), "") \
+       MSG_CENTER_NOTIF(1, CENTER_DEATH_SELF_NADE,                             0, 0, "",                         NO_CPID,                         "0 0", _("^K1You forgot to put the pin back in!"), _("^K1Tastes like chicken!")) \
        MSG_CENTER_NOTIF(1, CENTER_DEATH_SELF_NOAMMO,           0, 0, "",             NO_CPID,             "0 0", _("^K1You were killed for running out of ammo..."), _("^K1You are respawning for running out of ammo...")) \
        MSG_CENTER_NOTIF(1, CENTER_DEATH_SELF_ROT,              0, 0, "",             NO_CPID,             "0 0", _("^K1You grew too old without taking your medicine"), _("^K1You need to preserve your health")) \
        MSG_CENTER_NOTIF(1, CENTER_DEATH_SELF_SHOOTING_STAR,    0, 0, "",             NO_CPID,             "0 0", _("^K1You became a shooting star!"), "") \
@@ -500,6 +506,7 @@ void Send_Notification_WOVA(
        MSG_CENTER_NOTIF(1, CENTER_FREEZETAG_FREEZE,            1, 0, "s1",           NO_CPID,             "0 0", _("^K3You froze ^BG%s"), "") \
        MSG_CENTER_NOTIF(1, CENTER_FREEZETAG_FROZEN,            1, 0, "s1",           NO_CPID,             "0 0", _("^K1You were frozen by ^BG%s"), "") \
        MSG_CENTER_NOTIF(1, CENTER_FREEZETAG_REVIVE,            1, 0, "s1",           NO_CPID,             "0 0", _("^K3You revived ^BG%s"), "") \
+       MSG_CENTER_NOTIF(1, CENTER_FREEZETAG_REVIVE_FALL,       0, 0, "",             NO_CPID,             "0 0", _("^K3You revived yourself"), "") \
        MSG_CENTER_NOTIF(1, CENTER_FREEZETAG_REVIVED,           1, 0, "s1",           NO_CPID,             "0 0", _("^K3You were revived by ^BG%s"), "") \
        MSG_CENTER_NOTIF(1, CENTER_FREEZETAG_AUTO_REVIVED,      0, 1, "f1",           NO_CPID,             "0 0", _("^K3You were automatically revived after %s second(s)"), "") \
        MULTITEAM_CENTER(1, CENTER_ROUND_TEAM_WIN_, 4,          0, 0, "",             CPID_ROUND,          "0 0", _("^TC^TT^BG team wins the round"), "") \
@@ -526,7 +533,6 @@ void Send_Notification_WOVA(
        MSG_CENTER_NOTIF(1, CENTER_KEYHUNT_WAIT,                0, 4, "missing_teams", CPID_KEYHUNT_OTHER,    "0 0", _("^BGWaiting for players to join...\nNeed active players for: %s"), "") \
        MSG_CENTER_NOTIF(1, CENTER_MISSING_TEAMS,               0, 4, "missing_teams", CPID_MISSING_TEAMS,    "-1 0", _("^BGWaiting for players to join...\nNeed active players for: %s"), "") \
        MSG_CENTER_NOTIF(1, CENTER_MISSING_PLAYERS,             0, 1, "f1",            CPID_MISSING_PLAYERS,  "-1 0", _("^BGWaiting for %s player(s) to join..."), "") \
-       MSG_CENTER_NOTIF(1, CENTER_LMS_CAMPCHECK,               0, 0, "",              CPID_LMS_CAMP,         "0 0", _("^F2Don't camp!"), "") \
        MSG_CENTER_NOTIF(1, CENTER_MINSTA_FINDAMMO,             0, 0, "",              CPID_MINSTA_FINDAMMO,  "1 9", _("^F4^COUNT^BG left to find some ammo!"), "") \
        MSG_CENTER_NOTIF(1, CENTER_MINSTA_FINDAMMO_FIRST,       0, 0, "",              CPID_MINSTA_FINDAMMO,  "1 10", _("^BGGet some ammo or you'll be dead in ^F4^COUNT^BG!"), _("^BGGet some ammo! ^F4^COUNT^BG left!")) \
        MSG_CENTER_NOTIF(1, CENTER_MINSTA_LIVES_REMAINING,      0, 1, "f1",            NO_CPID,                           "0 0", _("^F2Extra lives remaining: ^K1%s"), "") \
@@ -534,6 +540,7 @@ void Send_Notification_WOVA(
        MSG_CENTER_NOTIF(1, CENTER_MOTD,                        1, 0, "s1",            CPID_MOTD,             "-1 0", _("^BG%s"), "") \
        MSG_CENTER_NOTIF(1, CENTER_NIX_COUNTDOWN,               0, 2, "item_wepname",  CPID_NIX,              "1 f2", _("^F2^COUNT^BG until weapon change...\nNext weapon: ^F1%s"), "") \
        MSG_CENTER_NOTIF(1, CENTER_NIX_NEWWEAPON,               0, 1, "item_wepname",  CPID_NIX,              "0 0", _("^F2Active weapon: ^F1%s"), "") \
+       MSG_CENTER_NOTIF(1, CENTER_NADE,                                0, 0, "",              NO_CPID,                   "0 0", _("^BGPress ^F2DROPWEAPON^BG again to toss the grenade!"), "") \
        MSG_CENTER_NOTIF(1, CENTER_OVERTIME_FRAG,               0, 0, "",              CPID_OVERTIME,         "0 0", _("^F2Now playing ^F4OVERTIME^F2!\nKeep fragging until we have a winner!"), _("^F2Now playing ^F4OVERTIME^F2!\nKeep scoring until we have a winner!")) \
        MSG_CENTER_NOTIF(1, CENTER_OVERTIME_TIME,               0, 1, "f1time",        CPID_OVERTIME,         "0 0", _("^F2Now playing ^F4OVERTIME^F2!\n^BGAdded ^F4%s^BG to the game!"), "") \
        MSG_CENTER_NOTIF(1, CENTER_POWERDOWN_INVISIBILITY,      0, 0, "",              CPID_POWERUP,          "0 0", _("^F2Invisibility has worn off"), "") \
@@ -561,6 +568,7 @@ void Send_Notification_WOVA(
        MSG_MULTI_NOTIF(1, DEATH_MURDER_FALL,                    NO_MSG,        INFO_DEATH_MURDER_FALL,                    NO_MSG) \
        MSG_MULTI_NOTIF(1, DEATH_MURDER_FIRE,                    NO_MSG,        INFO_DEATH_MURDER_FIRE,                    NO_MSG) \
        MSG_MULTI_NOTIF(1, DEATH_MURDER_LAVA,                    NO_MSG,        INFO_DEATH_MURDER_LAVA,                    NO_MSG) \
+       MSG_MULTI_NOTIF(1, DEATH_MURDER_NADE,                    NO_MSG,        INFO_DEATH_MURDER_NADE,                   NO_MSG) \
        MSG_MULTI_NOTIF(1, DEATH_MURDER_SHOOTING_STAR,           NO_MSG,        INFO_DEATH_MURDER_SHOOTING_STAR,           NO_MSG) \
        MSG_MULTI_NOTIF(1, DEATH_MURDER_SLIME,                   NO_MSG,        INFO_DEATH_MURDER_SLIME,                   NO_MSG) \
        MSG_MULTI_NOTIF(1, DEATH_MURDER_SWAMP,                   NO_MSG,        INFO_DEATH_MURDER_SWAMP,                   NO_MSG) \
@@ -589,6 +597,7 @@ void Send_Notification_WOVA(
        MSG_MULTI_NOTIF(1, DEATH_SELF_FIRE,                      NO_MSG,        INFO_DEATH_SELF_FIRE,                      CENTER_DEATH_SELF_FIRE) \
        MSG_MULTI_NOTIF(1, DEATH_SELF_GENERIC,                   NO_MSG,        INFO_DEATH_SELF_GENERIC,                   CENTER_DEATH_SELF_GENERIC) \
        MSG_MULTI_NOTIF(1, DEATH_SELF_LAVA,                      NO_MSG,        INFO_DEATH_SELF_LAVA,                      CENTER_DEATH_SELF_LAVA) \
+       MSG_MULTI_NOTIF(1, DEATH_SELF_NADE,                                              NO_MSG,                INFO_DEATH_SELF_NADE,                                      CENTER_DEATH_SELF_NADE) \
        MSG_MULTI_NOTIF(1, DEATH_SELF_NOAMMO,                    NO_MSG,        INFO_DEATH_SELF_NOAMMO,                    CENTER_DEATH_SELF_NOAMMO) \
        MSG_MULTI_NOTIF(1, DEATH_SELF_ROT,                       NO_MSG,        INFO_DEATH_SELF_ROT,                       CENTER_DEATH_SELF_ROT) \
        MSG_MULTI_NOTIF(1, DEATH_SELF_SHOOTING_STAR,             NO_MSG,        INFO_DEATH_SELF_SHOOTING_STAR,             CENTER_DEATH_SELF_SHOOTING_STAR) \
index 79d33fd..fb3ddb4 100644 (file)
@@ -1447,6 +1447,9 @@ float PARTICLES_USEALPHA = 1;
 float particles_alphamin, particles_alphamax;
 float PARTICLES_USECOLOR = 2;
 vector particles_colormin, particles_colormax;
+float PARTICLES_USEFADE = 4;  // fades the COUNT (fade alpha using alphamin/alphamax)
+float particles_fade;
+float PARTICLES_DRAWASTRAIL = 128;
 void(float effectindex, entity own, vector org_from, vector org_to, vector dir_from, vector dir_to, float countmultiplier, float flags) boxparticles = #502;
 float trace_networkentity;
 const float RF_FULLBRIGHT      = 256;
index a76efb8..78c1969 100644 (file)
@@ -257,6 +257,19 @@ void m_keydown(float key, float ascii)
                return;
        if(!Menu_Active)
                return;
+
+       if(menuMouseMode)
+       if(key >= K_MOUSE1 && key <= K_MOUSE3)
+       {
+               // detect a click outside of the game window
+               vector p = getmousepos();
+               if(p_x < 0 || p_x > realconwidth || p_y < 0 || p_y > realconheight)
+               {
+                       ++mouseButtonsPressed;
+                       return;
+               }
+       }
+
        if(keyGrabber)
        {
                entity e;
index 174873f..108b984 100644 (file)
@@ -23,92 +23,72 @@ void XonoticAudioSettingsTab_fill(entity me)
        entity e, s, sl;
 
        me.TR(me);
-               s = makeXonoticDecibelsSlider(-40, 0, 1, "mastervolume");
-               me.TD(me, 1, 1, e = makeXonoticSliderCheckBox(-1000000, 1, s, _("Master:")));
-               if(s.value != e.savedValue)
-                       e.savedValue = 0; // default
+               s = makeXonoticDecibelsSlider(-40, 0, 0.4, "mastervolume");
+               me.TD(me, 1, 1, e = makeXonoticTextLabel(0, _("Master:")));
                me.TD(me, 1, 2, s);
        me.TR(me);
                me.TDempty(me, 0.2);
-               s = makeXonoticDecibelsSlider(-40, 0, 1, "bgmvolume");
+               s = makeXonoticDecibelsSlider(-40, 0, 0.4, "bgmvolume");
                makeMulti(s, "snd_channel8volume");
-               me.TD(me, 1, 0.8, e = makeXonoticSliderCheckBox(-1000000, 1, s, _("Music:")));
-               if(s.value != e.savedValue)
-                       e.savedValue = 0; // default
+               me.TD(me, 1, 0.8, e = makeXonoticTextLabel(0, _("Music:")));
                me.TD(me, 1, 2, s);
                setDependentStringNotEqual(e, "mastervolume", "0");
                setDependentStringNotEqual(s, "mastervolume", "0");
        me.TR(me);
                me.TDempty(me, 0.2);
-               s = makeXonoticDecibelsSlider(-40, 0, 1, "snd_staticvolume");
+               s = makeXonoticDecibelsSlider(-40, 0, 0.4, "snd_staticvolume");
                makeMulti(s, "snd_channel9volume");
-               me.TD(me, 1, 0.8, e = makeXonoticSliderCheckBox(-1000000, 1, s, ZCTX(_("VOL^Ambient:"))));
-               if(s.value != e.savedValue)
-                       e.savedValue = 0; // default
+               me.TD(me, 1, 0.8, e = makeXonoticTextLabel(0, ZCTX(_("VOL^Ambient:"))));
                me.TD(me, 1, 2, s);
                setDependentStringNotEqual(e, "mastervolume", "0");
                setDependentStringNotEqual(s, "mastervolume", "0");
        me.TR(me);
                me.TDempty(me, 0.2);
-               s = makeXonoticDecibelsSlider(-40, 0, 1, "snd_channel0volume");
-               me.TD(me, 1, 0.8, e = makeXonoticSliderCheckBox(-1000000, 1, s, _("Info:")));
-               if(s.value != e.savedValue)
-                       e.savedValue = 0; // default
+               s = makeXonoticDecibelsSlider(-40, 0, 0.4, "snd_channel0volume");
+               me.TD(me, 1, 0.8, e = makeXonoticTextLabel(0, _("Info:")));
                me.TD(me, 1, 2, s);
                setDependentStringNotEqual(e, "mastervolume", "0");
                setDependentStringNotEqual(s, "mastervolume", "0");
        me.TR(me);
                me.TDempty(me, 0.2);
-               s = makeXonoticDecibelsSlider(-40, 0, 1, "snd_channel3volume");
-               me.TD(me, 1, 0.8, e = makeXonoticSliderCheckBox(-1000000, 1, s, _("Items:")));
-               if(s.value != e.savedValue)
-                       e.savedValue = 0; // default
+               s = makeXonoticDecibelsSlider(-40, 0, 0.4, "snd_channel3volume");
+               me.TD(me, 1, 0.8, e = makeXonoticTextLabel(0, _("Items:")));
                me.TD(me, 1, 2, s);
                setDependentStringNotEqual(e, "mastervolume", "0");
                setDependentStringNotEqual(s, "mastervolume", "0");
        me.TR(me);
                me.TDempty(me, 0.2);
-               s = makeXonoticDecibelsSlider(-40, 0, 1, "snd_channel6volume");
-               me.TD(me, 1, 0.8, e = makeXonoticSliderCheckBox(-1000000, 1, s, _("Pain:")));
-               if(s.value != e.savedValue)
-                       e.savedValue = 0; // default
+               s = makeXonoticDecibelsSlider(-40, 0, 0.4, "snd_channel6volume");
+               me.TD(me, 1, 0.8, e = makeXonoticTextLabel(0, _("Pain:")));
                me.TD(me, 1, 2, s);
                setDependentStringNotEqual(e, "mastervolume", "0");
                setDependentStringNotEqual(s, "mastervolume", "0");
        me.TR(me);
                me.TDempty(me, 0.2);
-               s = makeXonoticDecibelsSlider(-40, 0, 1, "snd_channel7volume");
-               me.TD(me, 1, 0.8, e = makeXonoticSliderCheckBox(-1000000, 1, s, _("Player:")));
-               if(s.value != e.savedValue)
-                       e.savedValue = 0; // default
+               s = makeXonoticDecibelsSlider(-40, 0, 0.4, "snd_channel7volume");
+               me.TD(me, 1, 0.8, e = makeXonoticTextLabel(0, _("Player:")));
                me.TD(me, 1, 2, s);
                setDependentStringNotEqual(e, "mastervolume", "0");
                setDependentStringNotEqual(s, "mastervolume", "0");
        me.TR(me);
                me.TDempty(me, 0.2);
-               s = makeXonoticDecibelsSlider(-40, 0, 1, "snd_channel4volume");
-               me.TD(me, 1, 0.8, e = makeXonoticSliderCheckBox(-1000000, 1, s, _("Shots:")));
-               if(s.value != e.savedValue)
-                       e.savedValue = 0; // default
+               s = makeXonoticDecibelsSlider(-40, 0, 0.4, "snd_channel4volume");
+               me.TD(me, 1, 0.8, e = makeXonoticTextLabel(0, _("Shots:")));
                me.TD(me, 1, 2, s);
                setDependentStringNotEqual(e, "mastervolume", "0");
                setDependentStringNotEqual(s, "mastervolume", "0");
        me.TR(me);
                me.TDempty(me, 0.2);
-               s = makeXonoticDecibelsSlider(-40, 0, 1, "snd_channel2volume");
-               me.TD(me, 1, 0.8, e = makeXonoticSliderCheckBox(-1000000, 1, s, _("Voice:")));
-               if(s.value != e.savedValue)
-                       e.savedValue = 0; // default
+               s = makeXonoticDecibelsSlider(-40, 0, 0.4, "snd_channel2volume");
+               me.TD(me, 1, 0.8, e = makeXonoticTextLabel(0, _("Voice:")));
                me.TD(me, 1, 2, s);
                setDependentStringNotEqual(e, "mastervolume", "0");
                setDependentStringNotEqual(s, "mastervolume", "0");
        me.TR(me);
                me.TDempty(me, 0.2);
-               s = makeXonoticDecibelsSlider(-40, 0, 1, "snd_channel1volume");
+               s = makeXonoticDecibelsSlider(-40, 0, 0.4, "snd_channel1volume");
                makeMulti(s, "snd_channel5volume"); // @!#%'n Tuba
-               me.TD(me, 1, 0.8, e = makeXonoticSliderCheckBox(-1000000, 1, s, _("Weapons:")));
-               if(s.value != e.savedValue)
-                       e.savedValue = 0; // default
+               me.TD(me, 1, 0.8, e = makeXonoticTextLabel(0, _("Weapons:")));
                me.TD(me, 1, 2, s);
                setDependentStringNotEqual(e, "mastervolume", "0");
                setDependentStringNotEqual(s, "mastervolume", "0");
index 729bec0..0ea9d16 100644 (file)
@@ -9,14 +9,32 @@ entity makeXonoticDecibelsSlider(float, float, float, string);
 
 #ifdef IMPLEMENTATION
 
-float toDecibelOfSquare(float f)
+float toDecibelOfSquare(float f, float mi)
 {
-       return 20.0 * log10(f);
+       float A = log(10) / 20; // note: about 0.115; inverse: about 8.686
+       if(mi != 0)
+       {
+               // linear scale part
+               float t = 1 / A + mi;
+               float y = exp(1 + A * mi);
+               if(f <= y)
+                       return mi + (t - mi) * (f / y);
+       }
+       return log(f) / A;
 }
 
-float fromDecibelOfSquare(float f)
+float fromDecibelOfSquare(float f, float mi)
 {
-       return pow(10, f / 20.0);
+       float A = log(10) / 20; // note: about 0.115; inverse: about 8.686
+       if(mi != 0)
+       {
+               // linear scale part
+               float t = 1 / A + mi;
+               float y = exp(1 + A * mi);
+               if(f <= t)
+                       return y * ((f - mi) / (t - mi));
+       }
+       return exp(A * f);
 }
 
 entity makeXonoticDecibelsSlider(float theValueMin, float theValueMax, float theValueStep, string theCvar)
@@ -36,12 +54,10 @@ void XonoticDecibelsSlider_loadCvars(entity me)
        v = cvar(me.cvarName);
 
        // snapping
-       if(v > fromDecibelOfSquare(me.valueMax - 0.5 * me.valueStep))
+       if(v > fromDecibelOfSquare(me.valueMax - 0.5 * me.valueStep, me.valueMin))
                Slider_setValue(me, me.valueMax);
-       else if(v < fromDecibelOfSquare(me.valueMin - 0.5 * me.valueStep))
-               Slider_setValue(me, -1000000); // virtually infinite
        else
-               Slider_setValue(me, me.valueStep * floor(0.5 + toDecibelOfSquare(v) / me.valueStep) );
+               Slider_setValue(me, me.valueStep * floor(0.5 + toDecibelOfSquare(v, me.valueMin) / me.valueStep) );
 }
 void XonoticDecibelsSlider_saveCvars(entity me)
 {
@@ -49,20 +65,41 @@ void XonoticDecibelsSlider_saveCvars(entity me)
                return;
 
        if(me.value > me.valueMax - 0.5 * me.valueStep)
-               cvar_set(me.cvarName, ftos(fromDecibelOfSquare(me.valueMax)));
-       else if(me.value < me.valueMin - 0.5 * me.valueStep)
-               cvar_set(me.cvarName, "0");
+               cvar_set(me.cvarName, ftos(fromDecibelOfSquare(me.valueMax, me.valueMin)));
        else
-               cvar_set(me.cvarName, ftos(fromDecibelOfSquare(me.value)));
+               cvar_set(me.cvarName, ftos(fromDecibelOfSquare(me.value, me.valueMin)));
 }
 
+float autocvar_menu_snd_sliderscale;
 string XonoticDecibelsSlider_valueToText(entity me, float v)
 {
        if(v > me.valueMax - 0.5 * me.valueStep)
                return CTX(_("VOL^MAX"));
-       else if(v < me.valueMin - 0.5 * me.valueStep)
+       else if(v <= me.valueMin)
                return CTX(_("VOL^OFF"));
-       return sprintf(_("%s dB"), SUPER(XonoticDecibelsSlider).valueToText(me, v));
+       else if(autocvar_menu_snd_sliderscale == 3) // fake percent scale
+               return sprintf(_("%d %%"), (v - me.valueMin) / (me.valueMax - me.valueMin) * 100);
+       else if(autocvar_menu_snd_sliderscale == 2) // 0..10 scale
+               return sprintf(_("%.1f"), (v - me.valueMin) / (me.valueMax - me.valueMin) * 10);
+       else if(autocvar_menu_snd_sliderscale == 1) // real percent scale
+               return sprintf(_("%.2f %%"), fromDecibelOfSquare(v, me.valueMin) * 100);
+       else // decibel scale
+               return sprintf(_("%s dB"), ftos_decimals(toDecibelOfSquare(fromDecibelOfSquare(v, me.valueMin), 0), me.valueDigits));
+}
+
+void _TEST_XonoticDecibelsSlider()
+{
+       float i;
+       for(i = -400; i < 0; ++i)
+       {
+               float db = i * 0.1;
+               float v = fromDecibelOfSquare(db, -40);
+               float dbv = toDecibelOfSquare(v, -40);
+               float d = dbv - db;
+               print(sprintf("%f -> %f -> %f (diff: %f)\n", db, v, dbv, d));
+               TEST_Check(fabs(d) > 0.02);
+       }
+       TEST_OK();
 }
 
 #endif
index dead5a9..711d914 100644 (file)
@@ -139,7 +139,6 @@ float autocvar_g_balance_crylink_primary_joinexplode_edgedamage;
 float autocvar_g_balance_crylink_primary_joinexplode_force;
 float autocvar_g_balance_crylink_primary_joinexplode_radius;
 float autocvar_g_balance_crylink_primary_joinspread;
-float autocvar_g_balance_crylink_primary_jointime;
 float autocvar_g_balance_crylink_primary_linkexplode;
 float autocvar_g_balance_crylink_primary_middle_fadetime;
 float autocvar_g_balance_crylink_primary_middle_lifetime;
@@ -165,7 +164,6 @@ float autocvar_g_balance_crylink_secondary_joinexplode_edgedamage;
 float autocvar_g_balance_crylink_secondary_joinexplode_force;
 float autocvar_g_balance_crylink_secondary_joinexplode_radius;
 float autocvar_g_balance_crylink_secondary_joinspread;
-float autocvar_g_balance_crylink_secondary_jointime;
 float autocvar_g_balance_crylink_secondary_line_fadetime;
 float autocvar_g_balance_crylink_secondary_line_lifetime;
 float autocvar_g_balance_crylink_secondary_linkexplode;
@@ -817,6 +815,8 @@ string autocvar_g_forced_team_red;
 string autocvar_g_forced_team_yellow;
 float autocvar_g_freezetag_frozen_force;
 float autocvar_g_freezetag_frozen_maxtime;
+float autocvar_g_freezetag_revive_falldamage;
+float autocvar_g_freezetag_revive_falldamage_health;
 float autocvar_g_freezetag_point_leadlimit;
 float autocvar_g_freezetag_point_limit;
 float autocvar_g_freezetag_revive_extra_size;
@@ -865,10 +865,7 @@ float autocvar_g_keyhunt_point_leadlimit;
 #define autocvar_g_keyhunt_point_limit cvar("g_keyhunt_point_limit")
 float autocvar_g_keyhunt_teams;
 float autocvar_g_keyhunt_teams_override;
-float autocvar_g_lms_campcheck_damage;
-float autocvar_g_lms_campcheck_distance;
 float autocvar_g_lms_extra_lives;
-float autocvar_g_lms_campcheck_interval;
 float autocvar_g_lms_join_anytime;
 float autocvar_g_lms_last_join;
 #define autocvar_g_lms_lives_override cvar("g_lms_lives_override")
@@ -892,7 +889,6 @@ float autocvar_g_maxplayers;
 float autocvar_g_maxplayers_spectator_blocktime;
 float autocvar_g_maxpushtime;
 float autocvar_g_maxspeed;
-#define autocvar_g_midair cvar("g_midair")
 float autocvar_g_midair_shieldtime;
 #define autocvar_g_minstagib cvar("g_minstagib")
 float autocvar_g_minstagib_ammo_drop;
@@ -1110,11 +1106,13 @@ float autocvar_sv_defaultplayerskin;
 float autocvar_sv_dodging_delay;
 float autocvar_sv_dodging_height_threshold;
 float autocvar_sv_dodging_horiz_speed;
+float autocvar_sv_dodging_horiz_speed_frozen;
 float autocvar_sv_dodging_ramp_time;
 float autocvar_sv_dodging_sound;
 float autocvar_sv_dodging_up_speed;
 float autocvar_sv_dodging_wall_distance_threshold;
 float autocvar_sv_dodging_wall_dodging;
+float autocvar_sv_dodging_frozen;
 float autocvar_sv_doublejump;
 float autocvar_sv_eventlog;
 float autocvar_sv_eventlog_console;
@@ -1234,3 +1232,26 @@ float autocvar_g_touchexplode_radius;
 float autocvar_g_touchexplode_damage;
 float autocvar_g_touchexplode_edgedamage;
 float autocvar_g_touchexplode_force;
+#define autocvar_g_bloodloss cvar("g_bloodloss")
+float autocvar_g_random_gravity_negative_chance;
+float autocvar_g_random_gravity_min;
+float autocvar_g_random_gravity_max;
+float autocvar_g_random_gravity_positive;
+float autocvar_g_random_gravity_negative;
+float autocvar_g_random_gravity_delay;
+float autocvar_g_nades;
+float autocvar_g_nades_spawn;
+float autocvar_g_nades_nade_lifetime;
+float autocvar_g_nades_nade_minforce;
+float autocvar_g_nades_nade_maxforce;
+float autocvar_g_nades_nade_health;
+float autocvar_g_nades_nade_refire;
+float autocvar_g_nades_nade_damage;
+float autocvar_g_nades_nade_edgedamage;
+float autocvar_g_nades_nade_radius;
+float autocvar_g_nades_nade_force;
+float autocvar_g_nades_nade_newton_style;
+float autocvar_g_campcheck_damage;
+float autocvar_g_campcheck_distance;
+float autocvar_g_campcheck_interval;
+float autocvar_g_jump_grunt;
index a9a3ea9..5b889b8 100644 (file)
@@ -253,9 +253,6 @@ void havocbot_bunnyhop(vector dir)
        float maxspeed;
        vector gco, gno;
 
-       if(autocvar_g_midair)
-               return;
-
        // Don't jump when attacking
        if(self.aistatus & AI_STATUS_ATTACKING)
                return;
index 017999d..c87eee4 100644 (file)
@@ -236,7 +236,7 @@ float CheatImpulse(float i)
                                        break;
                                }
                        }
-                       if(MoveToRandomMapLocation(self, DPCONTENTS_SOLID | DPCONTENTS_CORPSE | DPCONTENTS_PLAYERCLIP, DPCONTENTS_SLIME | DPCONTENTS_LAVA | DPCONTENTS_SKY | DPCONTENTS_BODY | DPCONTENTS_DONOTENTER, Q3SURFACEFLAG_SKY, ((gamestart_sv_cheats < 2) ? 100 : 100000), 1024, 256))
+                       if(MoveToRandomMapLocation(self, DPCONTENTS_SOLID | DPCONTENTS_CORPSE | DPCONTENTS_PLAYERCLIP, DPCONTENTS_SLIME | DPCONTENTS_LAVA | DPCONTENTS_SKY | DPCONTENTS_BODY | DPCONTENTS_DONOTENTER, Q3SURFACEFLAG_SKY, ((gamestart_sv_cheats < 2) ? 100 : 100000), 384, 384))
                        {
                                sprint(self, "Emergency teleport used random location\n");
                                self.angles_x = -self.angles_x;
index c687c45..d7ca62b 100644 (file)
@@ -1517,15 +1517,6 @@ void player_powerups (void)
        if(autocvar_g_fullbrightplayers)
                self.effects = self.effects | EF_FULLBRIGHT;
 
-       // midair gamemode: damage only while in the air
-       // if in midair mode, being on ground grants temporary invulnerability
-       // (this is so that multishot weapon don't clear the ground flag on the
-       // first damage in the frame, leaving the player vulnerable to the
-       // remaining hits in the same frame)
-       if (self.flags & FL_ONGROUND)
-       if (g_midair)
-               self.spawnshieldtime = max(self.spawnshieldtime, time + autocvar_g_midair_shieldtime);
-
        if (time >= game_starttime)
        if (time < self.spawnshieldtime)
                self.effects = self.effects | (EF_ADDITIVE | EF_FULLBRIGHT);
@@ -2355,8 +2346,6 @@ void PlayerPreThink (void)
                float do_crouch = self.BUTTON_CROUCH;
                if(self.hook.state)
                        do_crouch = 0;
-               if(self.health <= g_bloodloss)
-                       do_crouch = 1;
                if(self.vehicle)
                        do_crouch = 0;
                if(self.freezetag_frozen)
@@ -2388,15 +2377,6 @@ void PlayerPreThink (void)
                        }
                }
 
-               if(self.health <= g_bloodloss && self.deadflag == DEAD_NO)
-               {
-                       if(self.bloodloss_timer < time)
-                       {
-                               self.event_damage(self, self, 1, DEATH_ROT, self.origin, '0 0 0');
-                               self.bloodloss_timer = time + 0.5 + random() * 0.5;
-                       }
-               }
-
                FixPlayermodel();
 
                GrapplingHookFrame();
@@ -2424,9 +2404,6 @@ void PlayerPreThink (void)
 
                if(frametime)
                        player_anim();
-
-               if(g_nexball)
-                       nexball_setstatus();
                
                // secret status
                secrets_setstatus();
index 5ce7b7d..a7051ff 100644 (file)
 .float wasFlying;
 .float spectatorspeed;
 
-.float multijump_count;
-.float multijump_ready;
-.float prevjumpbutton;
-
 /*
 =============
 PlayerJump
@@ -23,13 +19,16 @@ When you press the jump key
 */
 void PlayerJump (void)
 {
-       if(self.freezetag_frozen)
-               return; // no jumping in freezetag when frozen
+       float doublejump = FALSE;
 
-       float mjumpheight;
-       float doublejump;
+       player_multijump = doublejump;
+       if(MUTATOR_CALLHOOK(PlayerJump))
+               return;
+               
+       doublejump = player_multijump;
 
-       doublejump = FALSE;
+       float mjumpheight;
+       
        if (autocvar_sv_doublejump)
        {
                tracebox(self.origin + '0 0 0.01', self.mins, self.maxs, self.origin - '0 0 0.01', MOVE_NORMAL, self);
@@ -52,56 +51,6 @@ void PlayerJump (void)
                return;
        }
 
-       if (autocvar_g_multijump)
-       {
-               if (self.prevjumpbutton == FALSE && !(self.flags & FL_ONGROUND)) // jump button pressed this frame and we are in midair
-                       self.multijump_ready = TRUE;  // this is necessary to check that we released the jump button and pressed it again
-               else
-                       self.multijump_ready = FALSE;
-       }
-
-       if(!doublejump && self.multijump_ready && self.multijump_count < autocvar_g_multijump && self.velocity_z > autocvar_g_multijump_speed)
-       {
-               // doublejump = FALSE; // checked above in the if
-               if (autocvar_g_multijump)
-               {
-                       if (autocvar_g_multijump_add == 0) // in this case we make the z velocity == jumpvelocity
-                       {
-                               if (self.velocity_z < mjumpheight)
-                               {
-                                       doublejump = TRUE;
-                                       self.velocity_z = 0;
-                               }
-                       }
-                       else
-                               doublejump = TRUE;
-
-                       if(doublejump)
-                       {
-                               if(self.movement_x != 0 || self.movement_y != 0) // don't remove all speed if player isnt pressing any movement keys
-                               {
-                                       float curspeed;
-                                       vector wishvel, wishdir;
-
-                                       curspeed = max(
-                                               vlen(vec2(self.velocity)), // current xy speed
-                                               vlen(vec2(antilag_takebackavgvelocity(self, max(self.lastteleporttime + sys_frametime, time - 0.25), time))) // average xy topspeed over the last 0.25 secs
-                                       );
-                                       makevectors(self.v_angle_y * '0 1 0');
-                                       wishvel = v_forward * self.movement_x + v_right * self.movement_y;
-                                       wishdir = normalize(wishvel);
-
-                                       self.velocity_x = wishdir_x * curspeed; // allow "dodging" at a multijump
-                                       self.velocity_y = wishdir_y * curspeed;
-                                       // keep velocity_z unchanged!
-                               }
-                               if (autocvar_g_multijump > 0)
-                                       self.multijump_count += 1;
-                       }
-               }
-               self.multijump_ready = FALSE; // require releasing and pressing the jump button again for the next jump
-       }
-
        if (!doublejump)
                if (!(self.flags & FL_ONGROUND))
                        return;
@@ -110,9 +59,6 @@ void PlayerJump (void)
                if (!(self.flags & FL_JUMPRELEASED))
                        return;
 
-       if(self.health <= g_bloodloss)
-               return;
-
        // sv_jumpspeedcap_min/sv_jumpspeedcap_max act as baseline
        // velocity bounds.  Final velocity is bound between (jumpheight *
        // min + jumpheight) and (jumpheight * max + jumpheight);
@@ -164,8 +110,8 @@ void PlayerJump (void)
        self.flags &~= FL_JUMPRELEASED;
 
        animdecide_setaction(self, ANIMACTION_JUMP, TRUE);
-
-       if(g_jump_grunt)
+       
+       if(autocvar_g_jump_grunt)
                PlayerSound(playersound_jump, CH_PLAYER, VOICETYPE_PLAYERSOUND);
 
        self.restart_jump = -1; // restart jump anim next time
@@ -201,14 +147,6 @@ void CheckWaterJump()
 }
 void CheckPlayerJump()
 {
-       if(self.flags & FL_ONGROUND)
-       {
-               if (autocvar_g_multijump > 0)
-                       self.multijump_count = 0;
-               else
-                       self.multijump_count = -2; // the cvar value for infinite jumps is -1, so this needs to be smaller
-       }
-
        if (self.BUTTON_JUMP)
                PlayerJump ();
        else
@@ -216,7 +154,6 @@ void CheckPlayerJump()
 
        if (self.waterlevel == WATERLEVEL_SWIMMING)
                CheckWaterJump ();
-       self.prevjumpbutton = self.BUTTON_JUMP;
 }
 
 float racecar_angle(float forward, float down)
index 68a2de3..fbe6d7a 100644 (file)
@@ -262,22 +262,9 @@ void player_anim (void)
 
 void SpawnThrownWeapon (vector org, float w)
 {
-       if(g_pinata)
-       {
-               float j;
-               for(j = WEP_FIRST; j <= WEP_LAST; ++j)
-               {
-                       if(WEPSET_CONTAINS_EW(self, j))
-                               if(W_IsWeaponThrowable(j))
-                                       W_ThrowNewWeapon(self, j, FALSE, org, randomvec() * 175 + '0 0 325');
-               }
-       }
-       else
-       {
-               if(WEPSET_CONTAINS_EW(self, self.weapon))
-                       if(W_IsWeaponThrowable(self.weapon))
-                               W_ThrowNewWeapon(self, self.weapon, FALSE, org, randomvec() * 125 + '0 0 200');
-       }
+       if(WEPSET_CONTAINS_EW(self, self.weapon))
+               if(W_IsWeaponThrowable(self.weapon))
+                       W_ThrowNewWeapon(self, self.weapon, FALSE, org, randomvec() * 125 + '0 0 200');
 }
 
 void PlayerCorpseDamage (entity inflictor, entity attacker, float damage, float deathtype, vector hitloc, vector force)
@@ -498,9 +485,6 @@ void PlayerDamage (entity inflictor, entity attacker, float damage, float deatht
        self.dmg_take = self.dmg_take + take;//max(take - 10, 0);
        self.dmg_inflictor = inflictor;
 
-       if(g_ca && self != attacker && IS_PLAYER(attacker))
-               PlayerTeamScore_Add(attacker, SP_SCORE, ST_SCORE, (damage - excess) * autocvar_g_ca_damage2score_multiplier);
-
        float abot, vbot, awep;
        abot = (IS_BOT_CLIENT(attacker));
        vbot = (IS_BOT_CLIENT(self));
index 26af874..81a4f5a 100644 (file)
@@ -233,7 +233,7 @@ void W_SetupShot_Dir_ProjectileSize_Range(entity ent, vector s_forward, vector m
 
        ent.dphitcontentsmask = oldsolid; // restore solid type (generally SOLID_SLIDEBOX)
 
-       if (!g_norecoil)
+       if (!autocvar_g_norecoil)
                ent.punchangle_x = recoil * -1;
 
        if (snd != "")
@@ -667,6 +667,9 @@ float client_hasweapon(entity cl, float wpn, float andammo, float complain)
                complain = 0;
        if(complain)
                self.hasweapon_complain_spam = time + 0.2;
+               
+       if(wpn == WEP_HOOK && !g_grappling_hook && autocvar_g_nades && !WEPSET_CONTAINS_EW(cl, wpn) && !WEPSET_CONTAINS_AW(weaponsInMap, wpn))
+               complain = 0;
 
        if (wpn < WEP_FIRST || wpn > WEP_LAST)
        {
index 7d35857..74d4345 100644 (file)
@@ -16,7 +16,7 @@ noref float require_spawnfunc_prefix; // if this float exists, only functions wi
 
 // Globals
 
-float g_cloaked, g_footsteps, g_jump_grunt, g_grappling_hook, g_midair, g_minstagib, g_pinata, g_norecoil, g_bloodloss;
+float g_cloaked, g_footsteps, g_grappling_hook, g_minstagib;
 float g_warmup_limit;
 float g_warmup_allguns;
 float g_warmup_allow_timeout;
@@ -549,7 +549,6 @@ float client_cefc_accumulatortime;
 
 .float spectatee_status;
 .float zoomstate;
-.float bloodloss_timer;
 .float restriction;
 
 .entity clientdata;
index da013fc..bd4fe2b 100644 (file)
@@ -626,13 +626,10 @@ void Damage (entity targ, entity inflictor, entity attacker, float damage, float
                                                {
                                                        attacker.dmg_team = attacker.dmg_team + damage;
                                                        complainteamdamage = attacker.dmg_team - autocvar_g_teamdamage_threshold;
-                                                       if(complainteamdamage > 0 && !g_ca) // FIXME why is g_ca ruled out here? Why not just g_mirrordamage 0 on CA servers?
+                                                       if(complainteamdamage > 0)
                                                                mirrordamage = autocvar_g_mirrordamage * complainteamdamage;
                                                        mirrorforce = autocvar_g_mirrordamage * vlen(force);
-                                                       if(g_ca)
-                                                               damage = 0;
-                                                       else
-                                                               damage = autocvar_g_friendlyfire * damage;
+                                                       damage = autocvar_g_friendlyfire * damage;
                                                        // mirrordamage will be used LATER
 
                                                        if(autocvar_g_mirrordamage_virtual)
@@ -708,7 +705,7 @@ void Damage (entity targ, entity inflictor, entity attacker, float damage, float
 
                if (targ == attacker)
                {
-                       if(g_ca || (g_cts && !autocvar_g_cts_selfdamage))
+                       if(g_cts && !autocvar_g_cts_selfdamage)
                                damage = 0;
                        else
                                damage = damage * autocvar_g_balance_selfdamagepercent; // Partial damage if the attacker hits himself
@@ -772,7 +769,7 @@ void Damage (entity targ, entity inflictor, entity attacker, float damage, float
        // apply push
        if (self.damageforcescale)
        if (vlen(force))
-       if (!IS_PLAYER(self) || time >= self.spawnshieldtime || g_midair)
+       if (!IS_PLAYER(self) || time >= self.spawnshieldtime)
        {
                vector farce = damage_explosion_calcpush(self.damageforcescale * force, self.velocity, autocvar_g_balance_damagepush_speedfactor);
                if(self.movetype == MOVETYPE_PHYSICS)
index 3043a30..e8b3450 100644 (file)
@@ -707,10 +707,6 @@ void spawnfunc_worldspawn (void)
                        s = strcat(s, ":norecoil");
 
                // TODO to mutator system
-               if(autocvar_g_midair)
-                       s = strcat(s, ":midair");
-
-               // TODO to mutator system
                if(autocvar_g_powerups == 0)
                        s = strcat(s, ":no_powerups");
                if(autocvar_g_powerups > 0)
@@ -887,7 +883,7 @@ void spawnfunc_worldspawn (void)
                s = "";
                n = tokenize_console(cvar_string("sv_curl_serverpackages"));
                for(i = 0; i < n; ++i)
-                       if(substring(argv(i), -14, -1) != "-serverpackage.txt")
+                       if(substring(argv(i), -18, -1) != "-serverpackage.txt")
                        if(substring(argv(i), -14, -1) != ".serverpackage") // OLD legacy
                                s = strcat(s, " ", argv(i));
                fd = search_begin("*-serverpackage.txt", TRUE, FALSE);
index f69b133..ef05b5a 100644 (file)
@@ -767,7 +767,6 @@ void readplayerstartcvars()
 
        if (g_weaponarena)
        {
-               g_pinata = 0; // incompatible
                g_weapon_stay = 0; // incompatible
                WEPSET_COPY_AA(start_weapons, g_weaponarena_weapons);
                start_items |= IT_UNLIMITED_AMMO;
@@ -789,10 +788,7 @@ void readplayerstartcvars()
 
        if(!cvar("g_use_ammunition"))
                start_items |= IT_UNLIMITED_AMMO;
-
-       if(cvar("g_nexball"))
-               start_items |= IT_UNLIMITED_SUPERWEAPONS; // FIXME BAD BAD BAD BAD HACK, NEXBALL SHOULDN'T ABUSE PORTO'S WEAPON SLOT
-
+       
        if(start_items & IT_UNLIMITED_WEAPON_AMMO)
        {
                start_ammo_rockets = 999;
@@ -919,7 +915,15 @@ void readlevelcvars(void)
        CHECK_MUTATOR_ADD("g_rocket_flying", mutator_rocketflying, !cvar("g_minstagib"));
        CHECK_MUTATOR_ADD("g_vampire", mutator_vampire, !cvar("g_minstagib"));
        CHECK_MUTATOR_ADD("g_superspectate", mutator_superspec, 1);
+       CHECK_MUTATOR_ADD("g_pinata", mutator_pinata, !cvar("g_minstagib"));
+       CHECK_MUTATOR_ADD("g_midair", mutator_midair, 1);
+       CHECK_MUTATOR_ADD("g_bloodloss", mutator_bloodloss, !cvar("g_minstagib"));
+       CHECK_MUTATOR_ADD("g_random_gravity", mutator_random_gravity, 1);
+       CHECK_MUTATOR_ADD("g_multijump", mutator_multijump, 1);
+       CHECK_MUTATOR_ADD("g_melee_only", mutator_melee_only, !cvar("g_minstagib"));
+       CHECK_MUTATOR_ADD("g_nades", mutator_nades, 1);
        CHECK_MUTATOR_ADD("g_sandbox", sandbox, 1);
+       CHECK_MUTATOR_ADD("g_campcheck", mutator_campcheck, 1);
        
        #undef CHECK_MUTATOR_ADD
        
@@ -949,13 +953,9 @@ void readlevelcvars(void)
        g_cloaked = cvar("g_cloaked");
     if(g_cts)
         g_cloaked = 1; // always enable cloak in CTS
-       g_jump_grunt = cvar("g_jump_grunt");
        g_footsteps = cvar("g_footsteps");
        g_grappling_hook = cvar("g_grappling_hook");
        g_jetpack = cvar("g_jetpack");
-       g_midair = cvar("g_midair");
-       g_norecoil = cvar("g_norecoil");
-       g_bloodloss = cvar("g_bloodloss");
        sv_maxidle = cvar("sv_maxidle");
        sv_maxidle_spectatorsareidle = cvar("sv_maxidle_spectatorsareidle");
        sv_autotaunt = cvar("sv_autotaunt");
@@ -966,7 +966,7 @@ void readlevelcvars(void)
        g_warmup_allguns = cvar("g_warmup_allguns");
        g_warmup_allow_timeout = cvar("g_warmup_allow_timeout");
 
-       if ((g_race && g_race_qualifying == 2) || g_arena || g_minstagib || g_assault || cvar("g_campaign"))
+       if ((g_race && g_race_qualifying == 2) || g_arena || g_assault || cvar("g_campaign"))
                inWarmupStage = 0; // these modes cannot work together, sorry
 
        g_pickup_respawntime_weapon = cvar("g_pickup_respawntime_weapon");
@@ -1029,8 +1029,6 @@ void readlevelcvars(void)
        g_pickup_ammo_anyway = cvar("g_pickup_ammo_anyway");
        g_pickup_weapons_anyway = cvar("g_pickup_weapons_anyway");
 
-       g_pinata = cvar("g_pinata");
-
     g_weapon_stay = cvar(strcat("g_", GetGametype(), "_weapon_stay"));
     if(!g_weapon_stay)
         g_weapon_stay = cvar("g_weapon_stay");
@@ -1416,6 +1414,8 @@ void precache()
         ambientsound ('0 0 0', self.noise, VOL_BASE, ATTN_NONE);
     }
 #endif
+
+#include "precache-for-csqc.inc"
 }
 
 // WARNING: this kills the trace globals
index ee0da7e..98a4494 100644 (file)
@@ -72,6 +72,11 @@ MUTATOR_HOOKABLE(PlayerDies);
                entity frag_attacker;
                entity frag_target; // same as self
                float frag_deathtype;
+               
+MUTATOR_HOOKABLE(PlayerJump);
+       // called when a player presses the jump key
+       // INPUT, OUTPUT:
+               float player_multijump;
 
 MUTATOR_HOOKABLE(GiveFragsForKill);
        // called when someone was fragged by "self", and is expected to change frag_score to adjust scoring for the kill
index 46b8fac..bb6312e 100644 (file)
@@ -237,6 +237,15 @@ MUTATOR_HOOKFUNCTION(arena_SV_StartFrame)
        return 1;
 }
 
+MUTATOR_HOOKFUNCTION(arena_FilterItem)
+{
+       if(autocvar_g_powerups <= 0)
+       if(self.flags & FL_POWERUP)
+               return TRUE;
+               
+       return FALSE;
+}
+
 void arena_Initialize()
 {
        maxspawned = max(2, autocvar_g_arena_maxspawned);
@@ -260,6 +269,7 @@ MUTATOR_DEFINITION(gamemode_arena)
        MUTATOR_HOOK(GiveFragsForKill, arena_GiveFragsForKill, CBC_ORDER_ANY);
        MUTATOR_HOOK(PlayerDies, arena_PlayerDies, CBC_ORDER_ANY);
        MUTATOR_HOOK(SV_StartFrame, arena_SV_StartFrame, CBC_ORDER_ANY);
+       MUTATOR_HOOK(FilterItem, arena_FilterItem, CBC_ORDER_ANY);
 
        MUTATOR_ONADD
        {
index 7c8c1cb..7c49045 100644 (file)
@@ -238,6 +238,40 @@ MUTATOR_HOOKFUNCTION(ca_SetStartItems)
        return 0;
 }
 
+MUTATOR_HOOKFUNCTION(ca_PlayerDamage)
+{
+       if(IS_PLAYER(frag_target))
+       if(frag_target.deadflag == DEAD_NO)
+       if(frag_target == frag_attacker || !IsDifferentTeam(frag_target, frag_attacker) || frag_deathtype == DEATH_FALL)
+               frag_damage = 0;
+               
+       frag_mirrordamage = 0;
+               
+       return FALSE;
+}
+
+MUTATOR_HOOKFUNCTION(ca_FilterItem)
+{
+       if(autocvar_g_powerups <= 0)
+       if(self.flags & FL_POWERUP)
+               return TRUE;
+               
+       if(autocvar_g_pickup_items <= 0)
+               return TRUE;
+               
+       return FALSE;
+}
+
+MUTATOR_HOOKFUNCTION(ca_PlayerDamage_SplitHealthArmor)
+{
+       float excess = max(0, frag_damage - damage_take - damage_save);
+       
+       if(frag_target != frag_attacker && IS_PLAYER(frag_attacker))
+               PlayerTeamScore_Add(frag_attacker, SP_SCORE, ST_SCORE, (frag_damage - excess) * autocvar_g_ca_damage2score_multiplier);
+               
+       return FALSE;
+}
+
 // scoreboard setup
 void ca_ScoreRules()
 {
@@ -280,6 +314,9 @@ MUTATOR_DEFINITION(gamemode_ca)
        MUTATOR_HOOK(ForbidThrowCurrentWeapon, ca_ForbidThrowCurrentWeapon, CBC_ORDER_ANY);
        MUTATOR_HOOK(GiveFragsForKill, ca_GiveFragsForKill, CBC_ORDER_FIRST);
        MUTATOR_HOOK(SetStartItems, ca_SetStartItems, CBC_ORDER_ANY);
+       MUTATOR_HOOK(PlayerDamage_Calculate, ca_PlayerDamage, CBC_ORDER_ANY);
+       MUTATOR_HOOK(FilterItem, ca_FilterItem, CBC_ORDER_ANY);
+       MUTATOR_HOOK(PlayerDamage_SplitHealthArmor, ca_PlayerDamage_SplitHealthArmor, CBC_ORDER_ANY);
 
        MUTATOR_ONADD
        {
index 8214782..0c22db0 100644 (file)
@@ -523,7 +523,15 @@ MUTATOR_HOOKFUNCTION(freezetag_PlayerPhysics)
 {
        if(self.freezetag_frozen)
        {
-               self.movement = '0 0 0';
+               if(autocvar_sv_dodging_frozen && IS_REAL_CLIENT(self))
+               {
+                       self.movement_x = bound(-5, self.movement_x, 5);
+                       self.movement_y = bound(-5, self.movement_y, 5);
+                       self.movement_z = bound(-5, self.movement_z, 5);
+               }
+               else
+                       self.movement = '0 0 0';
+                       
                self.disableclientprediction = 1;
        }
        return 1;
@@ -533,12 +541,31 @@ MUTATOR_HOOKFUNCTION(freezetag_PlayerDamage_Calculate)
 {
        if(frag_target.freezetag_frozen && frag_deathtype != DEATH_HURTTRIGGER)
        {
+               if(autocvar_g_freezetag_revive_falldamage > 0)
+               if(frag_deathtype == DEATH_FALL)
+               if(frag_damage >= autocvar_g_freezetag_revive_falldamage)
+               {
+                       freezetag_Unfreeze(frag_target);
+                       frag_target.health = autocvar_g_freezetag_revive_falldamage_health;
+                       pointparticles(particleeffectnum("iceorglass"), frag_target.origin, '0 0 0', 3);
+                       Send_Notification(NOTIF_ALL, world, MSG_INFO, INFO_FREEZETAG_REVIVED_FALL, frag_target.netname);
+                       Send_Notification(NOTIF_ONE, frag_target, MSG_CENTER, CENTER_FREEZETAG_REVIVE_FALL);
+               }
+       
                frag_damage = 0;
                frag_force = frag_force * autocvar_g_freezetag_frozen_force;
        }
        return 1;
 }
 
+MUTATOR_HOOKFUNCTION(freezetag_PlayerJump)
+{
+       if(self.freezetag_frozen)
+               return TRUE; // no jumping in freezetag when frozen
+       
+       return FALSE;
+}
+
 MUTATOR_HOOKFUNCTION(freezetag_ForbidThrowCurrentWeapon)
 {
        if (self.freezetag_frozen)
@@ -619,6 +646,7 @@ MUTATOR_DEFINITION(gamemode_freezetag)
        MUTATOR_HOOK(PlayerPreThink, freezetag_PlayerPreThink, CBC_ORDER_FIRST);
        MUTATOR_HOOK(PlayerPhysics, freezetag_PlayerPhysics, CBC_ORDER_FIRST);
        MUTATOR_HOOK(PlayerDamage_Calculate, freezetag_PlayerDamage_Calculate, CBC_ORDER_ANY);
+       MUTATOR_HOOK(PlayerJump, freezetag_PlayerJump, CBC_ORDER_ANY);
        MUTATOR_HOOK(ForbidThrowCurrentWeapon, freezetag_ForbidThrowCurrentWeapon, CBC_ORDER_ANY);
        MUTATOR_HOOK(ItemTouch, freezetag_ItemTouch, CBC_ORDER_ANY);
        MUTATOR_HOOK(HavocBot_ChooseRule, freezetag_BotRoles, CBC_ORDER_ANY);
index 193b537..aa8e8f3 100644 (file)
@@ -46,14 +46,6 @@ MUTATOR_HOOKFUNCTION(lms_PlayerPreSpawn)
        return FALSE;
 }
 
-MUTATOR_HOOKFUNCTION(lms_PlayerSpawn)
-{
-       self.lms_nextcheck = time + autocvar_g_lms_campcheck_interval*2;
-       self.lms_traveled_distance = 0;
-               
-       return FALSE;
-}
-
 MUTATOR_HOOKFUNCTION(lms_PlayerDies)
 {
        self.respawn_flags |= RESPAWN_FORCE;
@@ -97,50 +89,6 @@ MUTATOR_HOOKFUNCTION(lms_PlayerThink)
        if(self.deadflag == DEAD_DYING)
                self.deadflag = DEAD_RESPAWNING;
                
-       if not(self.deadflag)
-       if(autocvar_g_lms_campcheck_interval)
-       {
-               vector dist;
-
-               // calculate player movement (in 2 dimensions only, so jumping on one spot doesn't count as movement)
-               dist = self.prevorigin - self.origin;
-               dist_z = 0;
-               self.lms_traveled_distance += fabs(vlen(dist));
-
-               if((autocvar_g_campaign && !campaign_bots_may_start) || (time < game_starttime))
-               {
-                       self.lms_nextcheck = time + autocvar_g_lms_campcheck_interval*2;
-                       self.lms_traveled_distance = 0;
-               }
-
-               if(time > self.lms_nextcheck)
-               {
-                       if(self.lms_traveled_distance < autocvar_g_lms_campcheck_distance)
-                       {
-                               Send_Notification(NOTIF_ONE, self, MSG_CENTER, CENTER_LMS_CAMPCHECK);
-                               if(self.vehicle)
-                                       Damage(self.vehicle, self, self, autocvar_g_lms_campcheck_damage * 2, DEATH_CAMP, self.vehicle.origin, '0 0 0');
-                               else
-                                       Damage(self, self, self, bound(0, autocvar_g_lms_campcheck_damage, self.health + self.armorvalue * autocvar_g_balance_armor_blockpercent + 5), DEATH_CAMP, self.origin, '0 0 0');
-                       }
-                       self.lms_nextcheck = time + autocvar_g_lms_campcheck_interval;
-                       self.lms_traveled_distance = 0;
-               }
-       }
-               
-       return FALSE;
-}
-
-MUTATOR_HOOKFUNCTION(lms_PlayerDamage)
-{
-       if(IS_PLAYER(frag_target))
-       if(IS_PLAYER(frag_attacker))
-       if(frag_attacker != frag_target)
-       {
-               frag_target.lms_traveled_distance = autocvar_g_lms_campcheck_distance;
-               frag_attacker.lms_traveled_distance = autocvar_g_lms_campcheck_distance;
-       }
-               
        return FALSE;
 }
 
@@ -237,12 +185,10 @@ MUTATOR_DEFINITION(gamemode_lms)
        MUTATOR_HOOK(reset_map_global, lms_ResetMap, CBC_ORDER_ANY);
        MUTATOR_HOOK(reset_map_players, lms_ResetPlayers, CBC_ORDER_ANY);
        MUTATOR_HOOK(PutClientInServer, lms_PlayerPreSpawn, CBC_ORDER_ANY);
-       MUTATOR_HOOK(PlayerSpawn, lms_PlayerSpawn, CBC_ORDER_ANY);
        MUTATOR_HOOK(PlayerDies, lms_PlayerDies, CBC_ORDER_ANY);
        MUTATOR_HOOK(MakePlayerObserver, lms_RemovePlayer, CBC_ORDER_ANY);
        MUTATOR_HOOK(ClientConnect, lms_ClientConnect, CBC_ORDER_ANY);
        MUTATOR_HOOK(PlayerPreThink, lms_PlayerThink, CBC_ORDER_ANY);
-       MUTATOR_HOOK(PlayerDamage_Calculate, lms_PlayerDamage, CBC_ORDER_ANY);
        MUTATOR_HOOK(ForbidThrowCurrentWeapon, lms_ForbidThrowing, CBC_ORDER_ANY);
        MUTATOR_HOOK(GiveFragsForKill, lms_GiveFragsForKill, CBC_ORDER_ANY);
        MUTATOR_HOOK(SetStartItems, lms_SetStartItems, CBC_ORDER_ANY);
index 508bf8c..16fda61 100644 (file)
@@ -5,8 +5,4 @@
 // lives related defs
 float lms_lowest_lives;
 float lms_next_place;
-float LMS_NewPlayerLives();
-
-// camp check
-.float lms_nextcheck;
-.float lms_traveled_distance;
\ No newline at end of file
+float LMS_NewPlayerLives();
\ No newline at end of file
index 78d9d70..adfb31a 100644 (file)
@@ -929,6 +929,9 @@ MUTATOR_HOOKFUNCTION(nexball_PlayerPreThink)
                }
                
        }
+       
+       nexball_setstatus();
+       
        return FALSE;
 }
 
@@ -944,6 +947,13 @@ MUTATOR_HOOKFUNCTION(nexball_PlayerSpawn)
        return FALSE;
 }
 
+MUTATOR_HOOKFUNCTION(nexball_SetStartItems)
+{
+       start_items |= IT_UNLIMITED_SUPERWEAPONS; // FIXME BAD BAD BAD BAD HACK, NEXBALL SHOULDN'T ABUSE PORTO'S WEAPON SLOT
+       
+       return FALSE;
+}
+
 MUTATOR_DEFINITION(gamemode_nexball)
 {
        MUTATOR_HOOK(PlayerDies, nexball_BallDrop, CBC_ORDER_ANY);
@@ -953,6 +963,7 @@ MUTATOR_DEFINITION(gamemode_nexball)
        MUTATOR_HOOK(BuildMutatorsString, nexball_BuildMutatorsString, CBC_ORDER_ANY);
        MUTATOR_HOOK(PlayerSpawn, nexball_PlayerSpawn, CBC_ORDER_ANY);
        MUTATOR_HOOK(PlayerPreThink, nexball_PlayerPreThink, CBC_ORDER_ANY);
+       MUTATOR_HOOK(SetStartItems, nexball_SetStartItems, CBC_ORDER_ANY);
 
        MUTATOR_ONADD
        {
diff --git a/qcsrc/server/mutators/mutator_bloodloss.qc b/qcsrc/server/mutators/mutator_bloodloss.qc
new file mode 100644 (file)
index 0000000..adffdec
--- /dev/null
@@ -0,0 +1,48 @@
+.float bloodloss_timer;
+
+MUTATOR_HOOKFUNCTION(bloodloss_PlayerThink)
+{
+       if(IS_PLAYER(self))
+       if(self.health <= autocvar_g_bloodloss && self.deadflag == DEAD_NO)
+       {
+               self.BUTTON_CROUCH = TRUE;
+               
+               if(time >= self.bloodloss_timer)
+               {
+                       self.event_damage(self, self, 1, DEATH_ROT, self.origin, '0 0 0');
+                       self.bloodloss_timer = time + 0.5 + random() * 0.5;
+               }
+       }
+       
+       return FALSE;
+}
+
+MUTATOR_HOOKFUNCTION(bloodloss_PlayerJump)
+{
+       if(self.health <= autocvar_g_bloodloss)
+               return TRUE;
+               
+       return FALSE;
+}
+
+MUTATOR_HOOKFUNCTION(bloodloss_BuildMutatorsString)
+{
+       ret_string = strcat(ret_string, ":bloodloss");
+       return FALSE;
+}
+
+MUTATOR_HOOKFUNCTION(bloodloss_BuildMutatorsPrettyString)
+{
+       ret_string = strcat(ret_string, ", Blood loss");
+       return FALSE;
+}
+
+MUTATOR_DEFINITION(mutator_bloodloss)
+{
+       MUTATOR_HOOK(PlayerPreThink, bloodloss_PlayerThink, CBC_ORDER_ANY);
+       MUTATOR_HOOK(PlayerJump, bloodloss_PlayerJump, CBC_ORDER_ANY);
+       MUTATOR_HOOK(BuildMutatorsString, bloodloss_BuildMutatorsString, CBC_ORDER_ANY);
+       MUTATOR_HOOK(BuildMutatorsPrettyString, bloodloss_BuildMutatorsPrettyString, CBC_ORDER_ANY);
+
+       return FALSE;
+}
diff --git a/qcsrc/server/mutators/mutator_campcheck.qc b/qcsrc/server/mutators/mutator_campcheck.qc
new file mode 100644 (file)
index 0000000..d9d219c
--- /dev/null
@@ -0,0 +1,84 @@
+.float campcheck_nextcheck;
+.float campcheck_traveled_distance;
+
+MUTATOR_HOOKFUNCTION(campcheck_PlayerDies)
+{
+       Kill_Notification(NOTIF_ONE_ONLY, self, MSG_CENTER_CPID, CPID_CAMPCHECK);
+       
+       return FALSE;
+}
+
+MUTATOR_HOOKFUNCTION(campcheck_PlayerDamage)
+{
+       if(IS_PLAYER(frag_target))
+       if(IS_PLAYER(frag_attacker))
+       if(frag_attacker != frag_target)
+       {
+               frag_target.campcheck_traveled_distance = autocvar_g_campcheck_distance;
+               frag_attacker.campcheck_traveled_distance = autocvar_g_campcheck_distance;
+       }
+       
+       return FALSE;
+}
+
+MUTATOR_HOOKFUNCTION(campcheck_PlayerThink)
+{
+       if(IS_PLAYER(self))
+       if(self.deadflag == DEAD_NO)
+       if(autocvar_g_campcheck_interval)
+       {
+               vector dist;
+
+               // calculate player movement (in 2 dimensions only, so jumping on one spot doesn't count as movement)
+               dist = self.prevorigin - self.origin;
+               dist_z = 0;
+               self.campcheck_traveled_distance += fabs(vlen(dist));
+
+               if((autocvar_g_campaign && !campaign_bots_may_start) || (time < game_starttime) || (round_handler_IsActive() && !round_handler_IsRoundStarted()))
+               {
+                       self.campcheck_nextcheck = time + autocvar_g_campcheck_interval * 2;
+                       self.campcheck_traveled_distance = 0;
+               }
+
+               if(time > self.campcheck_nextcheck)
+               {
+                       if(self.campcheck_traveled_distance < autocvar_g_campcheck_distance)
+                       {
+                               Send_Notification(NOTIF_ONE, self, MSG_CENTER, CENTER_CAMPCHECK);
+                               if(self.vehicle)
+                                       Damage(self.vehicle, self, self, autocvar_g_campcheck_damage * 2, DEATH_CAMP, self.vehicle.origin, '0 0 0');
+                               else
+                                       Damage(self, self, self, bound(0, autocvar_g_campcheck_damage, self.health + self.armorvalue * autocvar_g_balance_armor_blockpercent + 5), DEATH_CAMP, self.origin, '0 0 0');
+                       }
+                       self.campcheck_nextcheck = time + autocvar_g_campcheck_interval;
+                       self.campcheck_traveled_distance = 0;
+               }
+       }
+
+       return FALSE;
+}
+
+MUTATOR_HOOKFUNCTION(campcheck_PlayerSpawn)
+{
+       self.campcheck_nextcheck = time + autocvar_g_campcheck_interval * 2;
+       self.campcheck_traveled_distance = 0;
+               
+       return FALSE;
+}
+
+MUTATOR_HOOKFUNCTION(campcheck_BuildMutatorsString)
+{
+       ret_string = strcat(ret_string, ":CampCheck");
+       return FALSE;
+}
+
+MUTATOR_DEFINITION(mutator_campcheck)
+{
+       MUTATOR_HOOK(PlayerDies, campcheck_PlayerDies, CBC_ORDER_ANY);
+       MUTATOR_HOOK(PlayerDamage_Calculate, campcheck_PlayerDamage, CBC_ORDER_ANY);
+       MUTATOR_HOOK(PlayerPreThink, campcheck_PlayerThink, CBC_ORDER_ANY);
+       MUTATOR_HOOK(PlayerSpawn, campcheck_PlayerSpawn, CBC_ORDER_ANY);
+       MUTATOR_HOOK(BuildMutatorsString, campcheck_BuildMutatorsString, CBC_ORDER_ANY);
+
+       return FALSE;
+}
index 1d6dd91..263df82 100644 (file)
 // and to ramp up the dodge acceleration in the physics hook.
 .float last_dodging_time;
 
-// set to 1 to indicate dodging has started.. reset by physics hook after dodge has been done..
-.float dodging_action;
-
 // This is the velocity gain to be added over the ramp time.
 // It will decrease from frame to frame during dodging_action = 1
 // until it's 0.
 .float dodging_velocity_gain;
 
-// the jump part of the dodge cannot be ramped
-.float dodging_single_action;
-
 MUTATOR_HOOKFUNCTION(dodging_GetCvars) {
        GetCvars_handleFloat(get_cvars_s, get_cvars_f, cvar_cl_dodging_timeout, "cl_dodging_timeout");
        return 0;
@@ -39,6 +33,10 @@ MUTATOR_HOOKFUNCTION(dodging_PlayerPhysics) {
        float new_velocity_gain;
        float velocity_difference;
        float clean_up_and_do_nothing;
+       float horiz_speed = autocvar_sv_dodging_horiz_speed;
+       
+       if(self.freezetag_frozen)
+               horiz_speed = autocvar_sv_dodging_horiz_speed_frozen;
 
     if (self.deadflag != DEAD_NO)
         return 0;
@@ -72,7 +70,7 @@ MUTATOR_HOOKFUNCTION(dodging_PlayerPhysics) {
        if (common_factor > 1) 
                common_factor = 1;
 
-       new_velocity_gain = self.dodging_velocity_gain - (common_factor * autocvar_sv_dodging_horiz_speed);
+       new_velocity_gain = self.dodging_velocity_gain - (common_factor * horiz_speed);
        if (new_velocity_gain < 0)
                new_velocity_gain = 0;
 
@@ -170,6 +168,9 @@ MUTATOR_HOOKFUNCTION(dodging_GetPressedKeys) {
 
        tap_direction_x = 0;
        tap_direction_y = 0;
+       
+       float frozen_dodging;
+       frozen_dodging = (self.freezetag_frozen && autocvar_sv_dodging_frozen);
 
        float dodge_detected;
        if (g_dodging == 0)
@@ -187,7 +188,7 @@ MUTATOR_HOOKFUNCTION(dodging_GetPressedKeys) {
 
        if (self.movement_x > 0) {
                // is this a state change?
-               if (!(self.pressedkeys & KEY_FORWARD)) {
+               if (!(self.pressedkeys & KEY_FORWARD) || frozen_dodging) {
                        if ((time - self.last_FORWARD_KEY_time) < self.cvar_cl_dodging_timeout) { 
                                tap_direction_x = 1.0;
                                dodge_detected = 1;
@@ -198,7 +199,7 @@ MUTATOR_HOOKFUNCTION(dodging_GetPressedKeys) {
 
        if (self.movement_x < 0) {
                // is this a state change?
-               if (!(self.pressedkeys & KEY_BACKWARD)) {
+               if (!(self.pressedkeys & KEY_BACKWARD) || frozen_dodging) {
                        tap_direction_x = -1.0;
                        if ((time - self.last_BACKWARD_KEY_time) < self.cvar_cl_dodging_timeout)        { 
                                dodge_detected = 1;
@@ -209,7 +210,7 @@ MUTATOR_HOOKFUNCTION(dodging_GetPressedKeys) {
 
        if (self.movement_y > 0) {
                // is this a state change?
-               if (!(self.pressedkeys & KEY_RIGHT)) {
+               if (!(self.pressedkeys & KEY_RIGHT) || frozen_dodging) {
                        tap_direction_y = 1.0;
                        if ((time - self.last_RIGHT_KEY_time) < self.cvar_cl_dodging_timeout)   { 
                                dodge_detected = 1;
@@ -220,7 +221,7 @@ MUTATOR_HOOKFUNCTION(dodging_GetPressedKeys) {
 
        if (self.movement_y < 0) {
                // is this a state change?
-               if (!(self.pressedkeys & KEY_LEFT)) {
+               if (!(self.pressedkeys & KEY_LEFT) || frozen_dodging) {
                        tap_direction_y = -1.0;
                        if ((time - self.last_LEFT_KEY_time) < self.cvar_cl_dodging_timeout)    { 
                                dodge_detected = 1;
index 8e8be25..9840325 100644 (file)
@@ -1,2 +1,7 @@
 float g_dodging;
 
+// set to 1 to indicate dodging has started.. reset by physics hook after dodge has been done..
+.float dodging_action;
+
+// the jump part of the dodge cannot be ramped
+.float dodging_single_action;
diff --git a/qcsrc/server/mutators/mutator_melee_only.qc b/qcsrc/server/mutators/mutator_melee_only.qc
new file mode 100644 (file)
index 0000000..639bba5
--- /dev/null
@@ -0,0 +1,44 @@
+MUTATOR_HOOKFUNCTION(melee_SetStartItems)
+{
+       start_ammo_shells = 0;
+       warmup_start_ammo_shells = 0;
+       
+       WEPSET_COPY_AW(start_weapons, WEP_SHOTGUN);
+       WEPSET_COPY_AW(warmup_start_weapons, WEP_SHOTGUN);
+               
+       return FALSE;
+}
+
+MUTATOR_HOOKFUNCTION(melee_FilterItem)
+{
+       switch (self.items)
+       {
+               case IT_5HP:
+               case IT_ARMOR_SHARD:
+                       return FALSE;
+       }
+       
+       return TRUE;
+}
+
+MUTATOR_HOOKFUNCTION(melee_BuildMutatorsString)
+{
+       ret_string = strcat(ret_string, ":MeleeOnly");
+       return FALSE;
+}
+
+MUTATOR_HOOKFUNCTION(melee_BuildMutatorsPrettyString)
+{
+       ret_string = strcat(ret_string, ", Melee Only Arena");
+       return FALSE;
+}
+
+MUTATOR_DEFINITION(mutator_melee_only)
+{
+       MUTATOR_HOOK(SetStartItems, melee_SetStartItems, CBC_ORDER_ANY);
+       MUTATOR_HOOK(FilterItem, melee_FilterItem, CBC_ORDER_ANY);
+       MUTATOR_HOOK(BuildMutatorsString, melee_BuildMutatorsString, CBC_ORDER_ANY);
+       MUTATOR_HOOK(BuildMutatorsPrettyString, melee_BuildMutatorsPrettyString, CBC_ORDER_ANY);
+
+       return FALSE;
+}
diff --git a/qcsrc/server/mutators/mutator_midair.qc b/qcsrc/server/mutators/mutator_midair.qc
new file mode 100644 (file)
index 0000000..0d48fef
--- /dev/null
@@ -0,0 +1,54 @@
+.float midair_shieldtime;
+
+MUTATOR_HOOKFUNCTION(midair_PlayerDamage)
+{
+       if(IS_PLAYER(frag_attacker))
+       if(IS_PLAYER(frag_target))
+       if(time < self.midair_shieldtime)
+               frag_damage = FALSE;
+
+       return FALSE;
+}
+
+MUTATOR_HOOKFUNCTION(midair_PlayerPowerups)
+{
+       if(time >= game_starttime)
+       if(self.flags & FL_ONGROUND)
+       {
+               self.effects |= (EF_ADDITIVE | EF_FULLBRIGHT);
+               self.midair_shieldtime = max(self.midair_shieldtime, time + autocvar_g_midair_shieldtime);
+       }
+               
+       return FALSE;
+}
+
+MUTATOR_HOOKFUNCTION(midair_PlayerSpawn)
+{
+       if(IS_BOT_CLIENT(self))
+               self.bot_moveskill = 0; // disable bunnyhopping
+
+       return FALSE;
+}
+
+MUTATOR_HOOKFUNCTION(midair_BuildMutatorsString)
+{
+       ret_string = strcat(ret_string, ":midair");
+       return FALSE;
+}
+
+MUTATOR_HOOKFUNCTION(midair_BuildMutatorsPrettyString)
+{
+       ret_string = strcat(ret_string, ", Midair");
+       return FALSE;
+}
+
+MUTATOR_DEFINITION(mutator_midair)
+{
+       MUTATOR_HOOK(PlayerDamage_Calculate, midair_PlayerDamage, CBC_ORDER_ANY);
+       MUTATOR_HOOK(PlayerPowerups, midair_PlayerPowerups, CBC_ORDER_ANY);
+       MUTATOR_HOOK(PlayerSpawn, midair_PlayerSpawn, CBC_ORDER_ANY);
+       MUTATOR_HOOK(BuildMutatorsString, midair_BuildMutatorsString, CBC_ORDER_ANY);
+       MUTATOR_HOOK(BuildMutatorsPrettyString, midair_BuildMutatorsPrettyString, CBC_ORDER_ANY);
+
+       return FALSE;
+}
index a0786b7..9b4bd70 100644 (file)
@@ -203,6 +203,7 @@ MUTATOR_HOOKFUNCTION(minstagib_SplitHealthArmor)
 MUTATOR_HOOKFUNCTION(minstagib_ForbidThrowing)
 {
        // weapon dropping on death handled by FilterItem
+       nades_CheckThrow();
 
        return TRUE;
 }
@@ -275,6 +276,7 @@ MUTATOR_HOOKFUNCTION(minstagib_SetStartItems)
        start_health = 100;
        start_armorvalue = 0;
        WEPSET_COPY_AW(start_weapons, WEP_MINSTANEX);
+       WEPSET_COPY_AW(warmup_start_weapons, WEP_MINSTANEX);
        start_items |= IT_UNLIMITED_SUPERWEAPONS;
                
        return FALSE;
diff --git a/qcsrc/server/mutators/mutator_multijump.qc b/qcsrc/server/mutators/mutator_multijump.qc
new file mode 100644 (file)
index 0000000..c945e1c
--- /dev/null
@@ -0,0 +1,88 @@
+.float multijump_count;
+.float multijump_ready;
+
+MUTATOR_HOOKFUNCTION(multijump_PlayerPhysics)
+{
+       if(self.flags & FL_ONGROUND)
+       {
+               if (autocvar_g_multijump > 0)
+                       self.multijump_count = 0;
+               else
+                       self.multijump_count = -2; // the cvar value for infinite jumps is -1, so this needs to be smaller
+       }
+               
+       return FALSE;
+}
+
+MUTATOR_HOOKFUNCTION(multijump_PlayerJump)
+{
+       if (self.flags & FL_JUMPRELEASED && !(self.flags & FL_ONGROUND)) // jump button pressed this frame and we are in midair
+               self.multijump_ready = TRUE;  // this is necessary to check that we released the jump button and pressed it again
+       else
+               self.multijump_ready = FALSE;
+               
+       if(!player_multijump && self.multijump_ready && self.multijump_count < autocvar_g_multijump && self.velocity_z > autocvar_g_multijump_speed)
+       {
+               if (autocvar_g_multijump)
+               {
+                       if (autocvar_g_multijump_add == 0) // in this case we make the z velocity == jumpvelocity
+                       {
+                               if (self.velocity_z < autocvar_sv_jumpvelocity)
+                               {
+                                       player_multijump = TRUE;
+                                       self.velocity_z = 0;
+                               }
+                       }
+                       else
+                               player_multijump = TRUE;
+
+                       if(player_multijump)
+                       {
+                               if(self.movement_x != 0 || self.movement_y != 0) // don't remove all speed if player isnt pressing any movement keys
+                               {
+                                       float curspeed;
+                                       vector wishvel, wishdir;
+
+                                       curspeed = max(
+                                               vlen(vec2(self.velocity)), // current xy speed
+                                               vlen(vec2(antilag_takebackavgvelocity(self, max(self.lastteleporttime + sys_frametime, time - 0.25), time))) // average xy topspeed over the last 0.25 secs
+                                       );
+                                       makevectors(self.v_angle_y * '0 1 0');
+                                       wishvel = v_forward * self.movement_x + v_right * self.movement_y;
+                                       wishdir = normalize(wishvel);
+
+                                       self.velocity_x = wishdir_x * curspeed; // allow "dodging" at a multijump
+                                       self.velocity_y = wishdir_y * curspeed;
+                                       // keep velocity_z unchanged!
+                               }
+                               if (autocvar_g_multijump > 0)
+                                       self.multijump_count += 1;
+                       }
+               }
+               self.multijump_ready = FALSE; // require releasing and pressing the jump button again for the next jump
+       }
+
+       return FALSE;
+}
+
+MUTATOR_HOOKFUNCTION(multijump_BuildMutatorsString)
+{
+       ret_string = strcat(ret_string, ":multijump");
+       return FALSE;
+}
+
+MUTATOR_HOOKFUNCTION(multijump_BuildMutatorsPrettyString)
+{
+       ret_string = strcat(ret_string, ", Multi jump");
+       return FALSE;
+}
+
+MUTATOR_DEFINITION(mutator_multijump)
+{
+       MUTATOR_HOOK(PlayerPhysics, multijump_PlayerPhysics, CBC_ORDER_ANY);
+       MUTATOR_HOOK(PlayerJump, multijump_PlayerJump, CBC_ORDER_ANY);
+       MUTATOR_HOOK(BuildMutatorsString, multijump_BuildMutatorsString, CBC_ORDER_ANY);
+       MUTATOR_HOOK(BuildMutatorsPrettyString, multijump_BuildMutatorsPrettyString, CBC_ORDER_ANY);
+
+       return FALSE;
+}
diff --git a/qcsrc/server/mutators/mutator_nades.qc b/qcsrc/server/mutators/mutator_nades.qc
new file mode 100644 (file)
index 0000000..a223f8b
--- /dev/null
@@ -0,0 +1,398 @@
+void nade_timer_think()
+{
+       self.skin = 8 - (self.owner.wait - time) / (autocvar_g_nades_nade_lifetime / 10);
+       self.nextthink = time;
+       if(!self.owner || wasfreed(self.owner))
+               remove(self);
+       
+}
+
+void nade_burn_spawn(entity _nade)
+{
+       float p;
+       
+       switch(_nade.realowner.team)
+       {
+               case NUM_TEAM_1: p = PROJECTILE_NADE_RED_BURN; break;
+               case NUM_TEAM_2: p = PROJECTILE_NADE_BLUE_BURN; break;
+               case NUM_TEAM_3: p = PROJECTILE_NADE_YELLOW_BURN; break;
+               case NUM_TEAM_4: p = PROJECTILE_NADE_PINK_BURN; break;
+               default:                 p = PROJECTILE_NADE_BURN; break;
+       }
+       
+       CSQCProjectile(_nade, TRUE, p, TRUE);
+}
+
+void nade_spawn(entity _nade)
+{
+       float p;
+       entity timer = spawn();
+       setmodel(timer, "models/ok_nade_counter/ok_nade_counter.md3");
+       setattachment(timer, _nade, "");
+       timer.classname = "nade_timer";
+       timer.colormap = _nade.colormap;
+       timer.glowmod = _nade.glowmod;
+       timer.think = nade_timer_think;
+       timer.nextthink = time;
+       timer.wait = _nade.wait;
+       timer.owner = _nade;    
+       timer.skin = 10;
+       
+       switch(_nade.realowner.team)
+       {
+               case NUM_TEAM_1: p = PROJECTILE_NADE_RED; break;
+               case NUM_TEAM_2: p = PROJECTILE_NADE_BLUE; break;
+               case NUM_TEAM_3: p = PROJECTILE_NADE_YELLOW; break;
+               case NUM_TEAM_4: p = PROJECTILE_NADE_PINK; break;
+               default:                 p = PROJECTILE_NADE; break;
+       }
+       
+       CSQCProjectile(_nade, TRUE, p, TRUE);
+       
+}
+
+void nade_boom()
+{
+       string expef;
+       
+       switch(self.realowner.team)
+       {
+               case NUM_TEAM_1: expef = "nade_red_explode"; break;
+               case NUM_TEAM_2: expef = "nade_blue_explode"; break;
+               case NUM_TEAM_3: expef = "nade_yellow_explode"; break;
+               case NUM_TEAM_4: expef = "nade_pink_explode"; break;
+               default:                 expef = "nade_explode"; break;
+       }
+       
+       sound(self, CH_SHOTS_SINGLE, "misc/null.wav", VOL_BASE, ATTN_NORM);
+       sound(self, CH_SHOTS, "weapons/rocket_impact.wav", VOL_BASE, ATTN_NORM);
+       pointparticles(particleeffectnum(expef), self.origin + '0 0 1', '0 0 0', 1);
+       
+       Damage_DamageInfo(self.origin, autocvar_g_nades_nade_damage, autocvar_g_nades_nade_edgedamage, autocvar_g_nades_nade_radius, '1 1 1' * autocvar_g_nades_nade_force, self.projectiledeathtype, 0, self);
+
+       self.takedamage = DAMAGE_NO;
+       RadiusDamage(self, self.realowner, autocvar_g_nades_nade_damage, autocvar_g_nades_nade_edgedamage,
+                                autocvar_g_nades_nade_radius, self, autocvar_g_nades_nade_force, self.projectiledeathtype, self.enemy);
+
+       remove(self);
+}
+
+void nade_touch()
+{
+       PROJECTILE_TOUCH;
+       //setsize(self, '-2 -2 -2', '2 2 2');
+       //UpdateCSQCProjectile(self);
+       if(self.health == self.max_health)
+       {
+               spamsound(self, CH_SHOTS, strcat("weapons/grenade_bounce", ftos(1 + rint(random() * 5)), ".wav"), VOL_BASE, ATTN_NORM);
+               return;
+       }
+
+       self.enemy = other;
+       nade_boom();
+}
+
+void nade_beep()
+{
+       sound(self, CH_SHOTS_SINGLE, "overkill/grenadebip.ogg", VOL_BASE, 0.5 *(ATTN_LARGE + ATTN_MAX));
+       self.think = nade_boom;
+       self.nextthink = max(self.wait, time);
+}
+
+void nade_damage(entity inflictor, entity attacker, float damage, float deathtype, vector hitloc, vector force)
+{
+       if(DEATH_ISWEAPON(deathtype, WEP_LASER))
+               return;
+
+       if(DEATH_ISWEAPON(deathtype, WEP_NEX) || DEATH_ISWEAPON(deathtype, WEP_MINSTANEX))
+       {
+               force *= 6;
+               damage = self.max_health * 0.55;
+       }
+
+       if(DEATH_ISWEAPON(deathtype, WEP_UZI))
+               damage = self.max_health * 0.1;
+
+       if(DEATH_ISWEAPON(deathtype, WEP_SHOTGUN) && !(deathtype & HITTYPE_SECONDARY))
+               damage = self.max_health * 1.1;
+               
+       if(DEATH_ISWEAPON(deathtype, WEP_SHOTGUN) && (deathtype & HITTYPE_SECONDARY))
+       {
+               damage = self.max_health * 0.1;
+               force *= 15;
+       }
+       
+       self.velocity += force;
+
+       if(!damage || (self.flags & FL_ONGROUND && IS_PLAYER(attacker)))
+               return;
+
+       if(self.health == self.max_health)
+       {
+               sound(self, CH_SHOTS_SINGLE, "misc/null.wav", VOL_BASE, 0.5 *(ATTN_LARGE + ATTN_MAX));
+               self.nextthink = max(time + autocvar_g_nades_nade_lifetime, time);
+               self.think = nade_beep;
+       }
+
+       self.health   -= damage;
+       self.realowner = attacker;
+
+       if(self.health <= 0)
+               W_PrepareExplosionByDamage(attacker, nade_boom);
+       else
+               nade_burn_spawn(self);
+}
+
+void toss_nade(entity e, vector _velocity, float _time)
+{
+       entity _nade = e.nade;
+       e.nade = world;
+       
+       remove(e.fake_nade);
+       e.fake_nade = world;
+       
+       makevectors(e.v_angle);
+       
+       W_SetupShot(e, FALSE, FALSE, "", CH_WEAPON_A, 0);
+       
+       Kill_Notification(NOTIF_ONE_ONLY, e, MSG_CENTER_CPID, CPID_NADES);
+       
+       //setorigin(_nade, CENTER_OR_VIEWOFS(e) + (v_right * 10) * -1);
+       setorigin(_nade, w_shotorg + (v_right * 25) * -1);
+       setmodel(_nade, "models/weapons/v_ok_grenade.md3");
+       setattachment(_nade, world, "");
+       PROJECTILE_MAKETRIGGER(_nade);
+       setsize(_nade, '-16 -16 -16', '16 16 16');
+       _nade.movetype = MOVETYPE_BOUNCE;
+       
+       tracebox(_nade.origin, _nade.mins, _nade.maxs, _nade.origin, FALSE, _nade);
+       if (trace_startsolid)
+               setorigin(_nade, e.origin);
+       
+       if(e.crouch)
+               _nade.velocity = '0 0 -10';
+       else if(autocvar_g_nades_nade_newton_style == 1)
+               _nade.velocity = e.velocity + _velocity;
+       else if(autocvar_g_nades_nade_newton_style == 2)
+               _nade.velocity = _velocity;
+       else
+               _nade.velocity = W_CalculateProjectileVelocity(e.velocity, _velocity, TRUE);
+
+       //_nade.solid = SOLID_BBOX; // TODO: remember why this was needed
+       _nade.touch = nade_touch;
+       _nade.health = autocvar_g_nades_nade_health;
+       _nade.max_health = _nade.health;
+       _nade.takedamage = DAMAGE_AIM;
+       _nade.event_damage = nade_damage;
+       _nade.teleportable = TRUE;
+       _nade.pushable = TRUE;
+       _nade.gravity = 1;
+       _nade.missile_flags = MIF_SPLASH | MIF_ARC;
+       _nade.damagedbycontents = TRUE;
+       _nade.angles = vectoangles(_nade.velocity);
+       _nade.flags = FL_PROJECTILE;
+
+       nade_spawn(_nade);
+
+       if(_time)
+       {
+               _nade.think = nade_boom;
+               _nade.nextthink = _time;
+       }
+
+       e.nade_refire = time + autocvar_g_nades_nade_refire;
+}
+
+void nade_prime()
+{
+       if(self.nade)
+               remove(self.nade);
+               
+       if(self.fake_nade)
+               remove(self.fake_nade);
+       
+       self.nade = spawn();
+       setmodel(self.nade, "null");
+       setattachment(self.nade, self, "bip01 l hand");
+       self.nade.classname = "nade";
+       self.nade.realowner = self;
+       self.nade.colormap = self.colormap;
+       self.nade.glowmod = self.glowmod;
+       self.nade.wait = time + autocvar_g_nades_nade_lifetime;
+       self.nade.lifetime = time;
+       self.nade.think = nade_beep;
+       self.nade.nextthink = max(self.nade.wait - 3, time);
+       self.nade.projectiledeathtype = DEATH_NADE;
+
+       self.fake_nade = spawn();
+       setmodel(self.fake_nade, "models/weapons/h_ok_grenade.iqm");
+       setattachment(self.fake_nade, self.weaponentity, "");
+       self.fake_nade.classname = "fake_nade";
+       //self.fake_nade.viewmodelforclient = self;
+       self.fake_nade.realowner = self.fake_nade.owner = self;
+       self.fake_nade.colormap = self.colormap;
+       self.fake_nade.glowmod = self.glowmod;
+       self.fake_nade.think = SUB_Remove;
+       self.fake_nade.nextthink = self.nade.wait;
+}
+
+float CanThrowNade()
+{
+       if(self.vehicle)
+               return FALSE;
+               
+       if(gameover)
+               return FALSE;
+               
+       if(self.deadflag != DEAD_NO)
+               return FALSE;
+       
+       if not(autocvar_g_nades)
+               return FALSE; // allow turning them off mid match
+               
+       if(forbidWeaponUse())
+               return FALSE;
+               
+       if not(IS_PLAYER(self))
+               return FALSE;
+               
+       return TRUE;
+}
+
+void nades_CheckThrow()
+{
+       if(!CanThrowNade())
+               return;
+               
+       if(!self.nade)
+       {
+               if(self.nade_refire < time)
+               {
+                       Send_Notification(NOTIF_ONE, self, MSG_CENTER, CENTER_NADE_THROW);
+                       nade_prime();
+                       self.nade_refire = time + autocvar_g_nades_nade_refire;
+               }
+       }
+       else
+       {
+               if(time - self.nade.lifetime >= 1)
+               {
+                       makevectors(self.v_angle);
+                       float _force = time - self.nade.lifetime;
+                       _force /= autocvar_g_nades_nade_lifetime;
+                       _force = autocvar_g_nades_nade_minforce + (_force * (autocvar_g_nades_nade_maxforce - autocvar_g_nades_nade_minforce));
+                       toss_nade(self, (v_forward * 0.75 + v_up * 0.2 + v_right * 0.05) * _force, 0);
+               }
+       }
+}
+
+MUTATOR_HOOKFUNCTION(nades_VehicleEnter)
+{
+       if(other.nade)
+               toss_nade(other, '0 0 100', max(other.nade.wait, time + 0.05));
+       
+       return FALSE;
+}
+
+MUTATOR_HOOKFUNCTION(nades_PlayerPreThink)
+{
+       float key_pressed = ((g_grappling_hook || client_hasweapon(self, WEP_HOOK, FALSE, FALSE) || WEPSET_CONTAINS_AW(weaponsInMap, WEP_HOOK)) ? self.button16 : self.BUTTON_HOOK);
+       
+       if(self.nade)
+               if(self.nade.wait - 0.1 <= time)
+                       toss_nade(self, '0 0 0', time + 0.05);
+                       
+       if(CanThrowNade())
+       if(self.nade_refire < time)
+       {
+               if(key_pressed)
+               {
+                       if(!self.nade)
+                               nade_prime();
+               }
+               else if(time - self.nade.lifetime >= 1)
+               {
+                       if(self.nade)
+                       {
+                               makevectors(self.v_angle);
+                               float _force = time - self.nade.lifetime;
+                               _force /= autocvar_g_nades_nade_lifetime;
+                               _force = autocvar_g_nades_nade_minforce + (_force * (autocvar_g_nades_nade_maxforce - autocvar_g_nades_nade_minforce));                         
+                               toss_nade(self, (v_forward * 0.7 + v_up * 0.2 + v_right * 0.1) * _force, 0);
+                       }
+               }
+       }
+
+       return FALSE;
+}
+
+MUTATOR_HOOKFUNCTION(nades_PlayerSpawn)
+{
+       if(autocvar_g_nades_spawn)
+               self.nade_refire = time + autocvar_g_spawnshieldtime;
+       else
+               self.nade_refire  = time + autocvar_g_nades_nade_refire;
+
+       return FALSE;
+}
+
+MUTATOR_HOOKFUNCTION(nades_PlayerDies)
+{
+       if(self.nade)
+               toss_nade(self, '0 0 100', max(self.nade.wait, time + 0.05));
+               
+       return FALSE;
+}
+
+MUTATOR_HOOKFUNCTION(nades_RemovePlayer)
+{
+       if(self.nade)
+               remove(self.nade);
+
+       if(self.fake_nade)
+               remove(self.fake_nade);
+               
+       return FALSE;
+}
+
+MUTATOR_HOOKFUNCTION(nades_BuildMutatorsString)
+{
+       ret_string = strcat(ret_string, ":Nades");
+       return FALSE;
+}
+
+MUTATOR_HOOKFUNCTION(nades_BuildMutatorsPrettyString)
+{
+       ret_string = strcat(ret_string, ", Nades");
+       return FALSE;
+}
+
+MUTATOR_DEFINITION(mutator_nades)
+{
+       MUTATOR_HOOK(VehicleEnter, nades_VehicleEnter, CBC_ORDER_ANY);
+       MUTATOR_HOOK(PlayerPreThink, nades_PlayerPreThink, CBC_ORDER_ANY);
+       MUTATOR_HOOK(PlayerSpawn, nades_PlayerSpawn, CBC_ORDER_ANY);
+       MUTATOR_HOOK(PlayerDies, nades_PlayerDies, CBC_ORDER_ANY);
+       MUTATOR_HOOK(MakePlayerObserver, nades_RemovePlayer, CBC_ORDER_ANY);
+       MUTATOR_HOOK(ClientDisconnect, nades_RemovePlayer, CBC_ORDER_ANY);
+       MUTATOR_HOOK(BuildMutatorsString, nades_BuildMutatorsString, CBC_ORDER_ANY);
+       MUTATOR_HOOK(BuildMutatorsPrettyString, nades_BuildMutatorsPrettyString, CBC_ORDER_ANY);
+       
+       MUTATOR_ONADD
+       {
+               precache_model("models/ok_nade_counter/ok_nade_counter.md3");
+               
+               precache_model("models/weapons/h_ok_grenade.iqm");
+               precache_model("models/weapons/v_ok_grenade.md3");
+               precache_sound("weapons/rocket_impact.wav");
+               precache_sound("weapons/grenade_bounce1.wav");
+               precache_sound("weapons/grenade_bounce2.wav");
+               precache_sound("weapons/grenade_bounce3.wav");
+               precache_sound("weapons/grenade_bounce4.wav");
+               precache_sound("weapons/grenade_bounce5.wav");
+               precache_sound("weapons/grenade_bounce6.wav");
+               precache_sound("overkill/grenadebip.ogg");
+       }
+
+       return FALSE;
+}
diff --git a/qcsrc/server/mutators/mutator_nades.qh b/qcsrc/server/mutators/mutator_nades.qh
new file mode 100644 (file)
index 0000000..1940f4e
--- /dev/null
@@ -0,0 +1,5 @@
+.entity nade;
+.entity fake_nade;
+.float nade_refire;
+
+void() nades_CheckThrow;
diff --git a/qcsrc/server/mutators/mutator_pinata.qc b/qcsrc/server/mutators/mutator_pinata.qc
new file mode 100644 (file)
index 0000000..e32c08a
--- /dev/null
@@ -0,0 +1,32 @@
+MUTATOR_HOOKFUNCTION(pinata_PlayerDies)
+{
+       float j;
+       for(j = WEP_FIRST; j <= WEP_LAST; ++j)
+       if(WEPSET_CONTAINS_EW(self, j))
+       if(self.switchweapon != j)
+       if(W_IsWeaponThrowable(j))
+               W_ThrowNewWeapon(self, j, FALSE, self.origin + (self.mins + self.maxs) * 0.5, randomvec() * 175 + '0 0 325');
+               
+       return TRUE;
+}
+
+MUTATOR_HOOKFUNCTION(pinata_BuildMutatorsString)
+{
+       ret_string = strcat(ret_string, ":Pinata");
+       return FALSE;
+}
+
+MUTATOR_HOOKFUNCTION(pinata_BuildMutatorsPrettyString)
+{
+       ret_string = strcat(ret_string, ", Piñata");
+       return FALSE;
+}
+
+MUTATOR_DEFINITION(mutator_pinata)
+{
+       MUTATOR_HOOK(PlayerDies, pinata_PlayerDies, CBC_ORDER_ANY);
+       MUTATOR_HOOK(BuildMutatorsString, pinata_BuildMutatorsString, CBC_ORDER_ANY);
+       MUTATOR_HOOK(BuildMutatorsPrettyString, pinata_BuildMutatorsPrettyString, CBC_ORDER_ANY);
+
+       return FALSE;
+}
diff --git a/qcsrc/server/mutators/mutator_random_gravity.qc b/qcsrc/server/mutators/mutator_random_gravity.qc
new file mode 100644 (file)
index 0000000..e2832ac
--- /dev/null
@@ -0,0 +1,51 @@
+// Random Gravity
+//
+// Mutator by Mario
+// Inspired by Player 2
+
+float gravity_delay;
+
+MUTATOR_HOOKFUNCTION(gravity_StartFrame)
+{
+       if(gameover || !cvar("g_random_gravity")) return FALSE; 
+       if(time < gravity_delay) return FALSE;
+       if(time < game_starttime) return FALSE;
+       if(round_handler_IsActive() && !round_handler_IsRoundStarted()) return FALSE;
+       
+    if(random() >= autocvar_g_random_gravity_negative_chance) 
+        cvar_set("sv_gravity", ftos(bound(autocvar_g_random_gravity_min, random() - random() * -autocvar_g_random_gravity_negative, autocvar_g_random_gravity_max)));
+    else
+        cvar_set("sv_gravity", ftos(bound(autocvar_g_random_gravity_min, random() * autocvar_g_random_gravity_positive, autocvar_g_random_gravity_max)));
+       
+       gravity_delay = time + autocvar_g_random_gravity_delay;
+       
+       dprint("Gravity is now: ", ftos(autocvar_sv_gravity), "\n");
+       
+       return FALSE;
+}
+
+MUTATOR_HOOKFUNCTION(gravity_BuildMutatorsString)
+{
+       ret_string = strcat(ret_string, ":RandomGravity");
+       return 0;
+}
+
+MUTATOR_HOOKFUNCTION(gravity_BuildMutatorsPrettyString)
+{
+       ret_string = strcat(ret_string, ", Random gravity");
+       return 0;
+}
+
+MUTATOR_DEFINITION(mutator_random_gravity)
+{
+       MUTATOR_HOOK(SV_StartFrame, gravity_StartFrame, CBC_ORDER_ANY);
+       MUTATOR_HOOK(BuildMutatorsString, gravity_BuildMutatorsString, CBC_ORDER_ANY);
+       MUTATOR_HOOK(BuildMutatorsPrettyString, gravity_BuildMutatorsPrettyString, CBC_ORDER_ANY);
+       
+       MUTATOR_ONADD
+       {
+               cvar_settemp("sv_gravity", cvar_string("sv_gravity")); // settemp current gravity so it's restored on match end
+       }
+
+       return FALSE;
+}
index 1aa293b..edfcba4 100644 (file)
@@ -1,19 +1,14 @@
 MUTATOR_HOOKFUNCTION(vampire_PlayerDamage)
 {
-       if(time < self.spawnshieldtime)
-               return 0;
-       if(g_minstagib)
+       if(time >= frag_target.spawnshieldtime)
+       if(frag_target != frag_attacker)
+       if(frag_target.deadflag == DEAD_NO)
        {
-               // minstagib: each hit means +1 ammo
-               if(frag_attacker != frag_target)
-                       frag_attacker.ammo_cells += 2; // note: 1 cell was deducted for the shot
+               frag_attacker.health += bound(0, damage_take, frag_target.health);
+               frag_attacker.health = bound(0, frag_attacker.health, autocvar_g_balance_health_limit);
        }
-       else
-       {
-               // otherwise: each hit gets damage back
-               frag_attacker.health = frag_attacker.health + bound(0, damage_take, self.health);
-       }
-       return 0;
+               
+       return FALSE;
 }
 
 MUTATOR_HOOKFUNCTION(vampire_BuildMutatorsString)
index 3f9f020..e7a95de 100644 (file)
@@ -21,5 +21,13 @@ MUTATOR_DECLARATION(mutator_vampire);
 MUTATOR_DECLARATION(mutator_superspec);
 MUTATOR_DECLARATION(mutator_minstagib);
 MUTATOR_DECLARATION(mutator_touchexplode);
+MUTATOR_DECLARATION(mutator_pinata);
+MUTATOR_DECLARATION(mutator_midair);
+MUTATOR_DECLARATION(mutator_bloodloss);
+MUTATOR_DECLARATION(mutator_random_gravity);
+MUTATOR_DECLARATION(mutator_multijump);
+MUTATOR_DECLARATION(mutator_melee_only);
+MUTATOR_DECLARATION(mutator_nades);
+MUTATOR_DECLARATION(mutator_campcheck);
 
 MUTATOR_DECLARATION(sandbox);
index 367e860..e9e9a4b 100644 (file)
@@ -46,6 +46,7 @@ mutators/gamemode_keepaway.qh
 mutators/gamemode_nexball.qh 
 mutators/gamemode_lms.qh
 mutators/mutator_dodging.qh
+mutators/mutator_nades.qh
 
 //// tZork Turrets ////
 tturrets/include/turrets_early.qh
@@ -249,6 +250,14 @@ mutators/sandbox.qc
 mutators/mutator_superspec.qc
 mutators/mutator_minstagib.qc
 mutators/mutator_touchexplode.qc
+mutators/mutator_pinata.qc
+mutators/mutator_midair.qc
+mutators/mutator_bloodloss.qc
+mutators/mutator_random_gravity.qc
+mutators/mutator_multijump.qc
+mutators/mutator_melee_only.qc
+mutators/mutator_nades.qc
+mutators/mutator_campcheck.qc
 
 ../warpzonelib/anglestransform.qc
 ../warpzonelib/mathlib.qc
index 538dcc6..a9b2443 100644 (file)
@@ -93,7 +93,7 @@ void CreatureFrame (void)
                {
                        // check for falling damage
                        float velocity_len = vlen(self.velocity);
-                       if(!self.hook.state && !g_ca && !(g_cts && !autocvar_g_cts_selfdamage))
+                       if(!self.hook.state && !(g_cts && !autocvar_g_cts_selfdamage))
                        {
                                dm = vlen(self.oldvelocity) - velocity_len; // dm is now the velocity DECREASE. Velocity INCREASE should never cause a sound or any damage.
                                if (self.deadflag)
index 926a4ab..61e2a09 100644 (file)
@@ -277,10 +277,6 @@ float have_pickup_item(void)
                        return TRUE;
                if(autocvar_g_powerups == 0)
                        return FALSE;
-               if(g_ca)
-                       return FALSE;
-               if(g_arena)
-                       return FALSE;
        }
        else
        {
@@ -288,8 +284,6 @@ float have_pickup_item(void)
                        return TRUE;
                if(autocvar_g_pickup_items == 0)
                        return FALSE;
-               if(g_ca)
-                       return FALSE;
                if(g_weaponarena)
                        if(!WEPSET_EMPTY_E(self) || (self.items & IT_AMMO))
                                return FALSE;
@@ -1165,12 +1159,9 @@ void weapon_defaultspawnfunc(float wpn)
 
                if(e.spawnflags & WEP_FLAG_MUTATORBLOCKED)
                {
-                       print("Attempted to spawn a mutator-blocked weapon; these guns will in the future require a mutator\n");
-                       /*
                        objerror("Attempted to spawn a mutator-blocked weapon rejected");
                        startitem_failed = TRUE;
                        return;
-                       */
                }
 
                s = W_Apply_Weaponreplace(e.netname);
index fba705c..0efb77d 100644 (file)
@@ -71,7 +71,7 @@ vector trigger_push_calculatevelocity(vector org, entity tgt, float ht)
         */
 
        // push him so high...
-       vz = sqrt(2 * grav * jumpheight); // NOTE: sqrt(positive)!
+       vz = sqrt(fabs(2 * grav * jumpheight)); // NOTE: sqrt(positive)!
 
        // we start with downwards velocity only if it's a downjump and the jump apex should be outside the jump!
        if(ht < 0)
index 0ba1e7c..b481f46 100644 (file)
@@ -286,14 +286,8 @@ string getwelcomemessage(void)
                modifications = strcat(modifications, ", Cloaked");
        if(g_grappling_hook)
                modifications = strcat(modifications, ", Hook");
-       if(g_midair)
-               modifications = strcat(modifications, ", Midair");
-       if(g_pinata)
-               modifications = strcat(modifications, ", Piñata");
        if(g_weapon_stay && !g_cts)
                modifications = strcat(modifications, ", Weapons stay");
-       if(g_bloodloss > 0)
-               modifications = strcat(modifications, ", Blood loss");
        if(g_jetpack)
                modifications = strcat(modifications, ", Jet pack");
        if(autocvar_g_powerups == 0)
index 4cce61b..320d84b 100644 (file)
@@ -94,10 +94,9 @@ void W_Crylink_LinkExplode (entity e, entity e2)
 // stored in w_crylink_linkjoin_time.
 // could possibly network this origin and time, and display a special particle
 // effect when projectiles meet there :P
-// jspeed: MINIMUM jing speed
-// jtime: MAXIMUM jing time (0: none)
+// jspeed: joining speed (calculate this as join spread * initial speed)
 float w_crylink_linkjoin_time;
-vector W_Crylink_LinkJoin(entity e, float jspeed, float jtime)
+vector W_Crylink_LinkJoin(entity e, float jspeed)
 {
        vector avg_origin, avg_velocity;
        vector targ_origin;
@@ -134,7 +133,7 @@ vector W_Crylink_LinkJoin(entity e, float jspeed, float jtime)
        if(avg_dist == 0)
                return avg_origin; // no change needed
 
-       if(jspeed == 0 && jtime == 0)
+       if(jspeed == 0)
        {
                e.velocity = avg_velocity;
                UpdateCSQCProjectile(e);
@@ -147,14 +146,6 @@ vector W_Crylink_LinkJoin(entity e, float jspeed, float jtime)
        }
        else
        {
-               if(jtime)
-               {
-                       if(jspeed)
-                               w_crylink_linkjoin_time = min(jtime, avg_dist / jspeed);
-                       else
-                               w_crylink_linkjoin_time = jtime;
-               }
-               else
                        w_crylink_linkjoin_time = avg_dist / jspeed;
                targ_origin = avg_origin + w_crylink_linkjoin_time * avg_velocity;
 
@@ -453,7 +444,7 @@ void W_Crylink_Attack (void)
 
                other = proj; MUTATOR_CALLHOOK(EditProjectile);
        }
-       if(autocvar_g_balance_crylink_primary_joinspread != 0 || autocvar_g_balance_crylink_primary_jointime != 0)
+       if(autocvar_g_balance_crylink_primary_joinspread != 0)
        {
                self.crylink_lastgroup = proj;
                W_Crylink_CheckLinks(proj);
@@ -569,7 +560,7 @@ void W_Crylink_Attack2 (void)
 
                other = proj; MUTATOR_CALLHOOK(EditProjectile);
        }
-       if(autocvar_g_balance_crylink_secondary_joinspread != 0 || autocvar_g_balance_crylink_secondary_jointime != 0)
+       if(autocvar_g_balance_crylink_secondary_joinspread != 0)
        {
                self.crylink_lastgroup = proj;
                W_Crylink_CheckLinks(proj);
@@ -629,12 +620,12 @@ float w_crylink(float req)
 
                                        if(self.crylink_waitrelease == 1)
                                        {
-                                               pos = W_Crylink_LinkJoin(self.crylink_lastgroup, autocvar_g_balance_crylink_primary_joinspread * autocvar_g_balance_crylink_primary_speed, autocvar_g_balance_crylink_primary_jointime);
+                                               pos = W_Crylink_LinkJoin(self.crylink_lastgroup, autocvar_g_balance_crylink_primary_joinspread * autocvar_g_balance_crylink_primary_speed);
 
                                        }
                                        else
                                        {
-                                               pos = W_Crylink_LinkJoin(self.crylink_lastgroup, autocvar_g_balance_crylink_secondary_joinspread * autocvar_g_balance_crylink_secondary_speed, autocvar_g_balance_crylink_secondary_jointime);
+                                               pos = W_Crylink_LinkJoin(self.crylink_lastgroup, autocvar_g_balance_crylink_secondary_joinspread * autocvar_g_balance_crylink_secondary_speed);
                                        }
 
                                        linkjoineffect = spawn();
index 0b5d386..618a21f 100644 (file)
@@ -41,7 +41,7 @@ void W_HLAC_Attack (void)
 
        W_SetupShot (self, FALSE, 3, "weapons/lasergun_fire.wav", CH_WEAPON_A, autocvar_g_balance_hlac_primary_damage);
        pointparticles(particleeffectnum("laser_muzzleflash"), w_shotorg, w_shotdir * 1000, 1);
-       if (!g_norecoil)
+       if (!autocvar_g_norecoil)
        {
                self.punchangle_x = random () - 0.5;
                self.punchangle_y = random () - 0.5;
@@ -129,7 +129,7 @@ void W_HLAC_Attack2 (void)
     for(i=autocvar_g_balance_hlac_secondary_shots;i>0;--i)
         W_HLAC_Attack2f();
 
-       if (!g_norecoil)
+       if (!autocvar_g_norecoil)
        {
                self.punchangle_x = random () - 0.5;
                self.punchangle_y = random () - 0.5;
index 923ed95..38793a9 100644 (file)
@@ -52,7 +52,7 @@ void UziFlash()
 void W_UZI_Attack (float deathtype)
 {
        W_SetupShot (self, autocvar_g_antilag_bullets && autocvar_g_balance_uzi_speed >= autocvar_g_antilag_bullets, 0, "weapons/uzi_fire.wav", CH_WEAPON_A, ((self.misc_bulletcounter == 1) ? autocvar_g_balance_uzi_first_damage : autocvar_g_balance_uzi_sustained_damage));
-       if (!g_norecoil)
+       if (!autocvar_g_norecoil)
        {
                self.punchangle_x = random () - 0.5;
                self.punchangle_y = random () - 0.5;
@@ -129,7 +129,7 @@ void uzi_mode1_fire_auto()
        W_DecreaseAmmo(ammo_nails, autocvar_g_balance_uzi_sustained_ammo, autocvar_g_balance_uzi_reload_ammo);
 
        W_SetupShot (self, autocvar_g_antilag_bullets && autocvar_g_balance_uzi_speed >= autocvar_g_antilag_bullets, 0, "weapons/uzi_fire.wav", CH_WEAPON_A, autocvar_g_balance_uzi_sustained_damage);
-       if (!g_norecoil)
+       if (!autocvar_g_norecoil)
        {
                self.punchangle_x = random () - 0.5;
                self.punchangle_y = random () - 0.5;
@@ -156,7 +156,7 @@ void uzi_mode1_fire_auto()
 void uzi_mode1_fire_burst()
 {
        W_SetupShot (self, autocvar_g_antilag_bullets && autocvar_g_balance_uzi_speed >= autocvar_g_antilag_bullets, 0, "weapons/uzi_fire.wav", CH_WEAPON_A, autocvar_g_balance_uzi_sustained_damage);
-       if (!g_norecoil)
+       if (!autocvar_g_norecoil)
        {
                self.punchangle_x = random () - 0.5;
                self.punchangle_y = random () - 0.5;
index 9040c72..c2a6e8a 100644 (file)
@@ -469,12 +469,13 @@ void WarpZone_TrailParticles_WithMultiplier_trace_callback(vector from, vector e
        boxparticles(WarpZone_TrailParticles_trace_callback_eff, WarpZone_TrailParticles_trace_callback_own, from, endpos, WarpZone_TrailParticles_trace_callback_own.velocity, WarpZone_TrailParticles_trace_callback_own.velocity, WarpZone_TrailParticles_trace_callback_f, WarpZone_TrailParticles_trace_callback_flags);
 }
 
+float PARTICLES_DRAWASTRAIL = 128;
 void WarpZone_TrailParticles_WithMultiplier(entity own, float eff, vector org, vector end, float f, float boxflags)
 {
        WarpZone_TrailParticles_trace_callback_own = own;
        WarpZone_TrailParticles_trace_callback_eff = eff;
        WarpZone_TrailParticles_trace_callback_f = f;
-       WarpZone_TrailParticles_trace_callback_flags = boxflags;
+       WarpZone_TrailParticles_trace_callback_flags = boxflags | PARTICLES_DRAWASTRAIL;
        WarpZone_TraceBox_ThroughZone(org, '0 0 0', '0 0 0', end, MOVE_NOMONSTERS, world, world, WarpZone_TrailParticles_WithMultiplier_trace_callback);
 }
 #endif
diff --git a/scripts/ok_nade_counter.shader b/scripts/ok_nade_counter.shader
new file mode 100644 (file)
index 0000000..130bee7
--- /dev/null
@@ -0,0 +1,90 @@
+models/ok_nade_counter/ok_nade_counter_01
+{
+       dpnoshadow
+       deformVertexes autosprite
+       dppolygonoffset -6000
+       {
+               map "models/ok_nade_counter/ok_nade_counter_01"
+               blendfunc add
+       }
+}
+models/ok_nade_counter/ok_nade_counter_02
+{
+       dpnoshadow
+       deformVertexes autosprite
+       dppolygonoffset -6000
+       {
+               map "models/ok_nade_counter/ok_nade_counter_02"
+               blendfunc add
+       }
+}
+models/ok_nade_counter/ok_nade_counter_03
+{
+       dpnoshadow
+       deformVertexes autosprite
+       dppolygonoffset -6000
+       {
+               map "models/ok_nade_counter/ok_nade_counter_03"
+               blendfunc add
+       }
+}
+models/ok_nade_counter/ok_nade_counter_04
+{
+       dpnoshadow
+       deformVertexes autosprite
+       dppolygonoffset -6000
+       {
+               map "models/ok_nade_counter/ok_nade_counter_04"
+               blendfunc add
+       }
+}
+models/ok_nade_counter/ok_nade_counter_05
+{
+       dpnoshadow
+       deformVertexes autosprite
+       dppolygonoffset -6000
+       {
+               map "models/ok_nade_counter/ok_nade_counter_05"
+               blendfunc add
+       }
+}
+models/ok_nade_counter/ok_nade_counter_06
+{
+       dpnoshadow
+       deformVertexes autosprite
+       dppolygonoffset -6000
+       {
+               map "models/ok_nade_counter/ok_nade_counter_06"
+               blendfunc add
+       }
+}
+models/ok_nade_counter/ok_nade_counter_07
+{
+       dpnoshadow
+       deformVertexes autosprite
+       dppolygonoffset -6000
+       {
+               map "models/ok_nade_counter/ok_nade_counter_07"
+               blendfunc add
+       }
+}
+models/ok_nade_counter/ok_nade_counter_08
+{
+       dpnoshadow
+       deformVertexes autosprite
+       dppolygonoffset -6000
+       {
+               map "models/ok_nade_counter/ok_nade_counter_08"
+               blendfunc add
+       }
+}
+models/ok_nade_counter/ok_nade_counter_09
+{
+       dpnoshadow
+       deformVertexes autosprite
+       dppolygonoffset -6000
+       {
+               map "models/ok_nade_counter/ok_nade_counter_09"
+               blendfunc add
+       }
+}
\ No newline at end of file
index a73e7e2..366f24c 100644 (file)
@@ -14,3 +14,4 @@ tree
 tuba
 turrets
 weapons
+ok_nade_counter
index 5c3e06a..4a78620 100644 (file)
@@ -52,7 +52,7 @@ set g_vehicle_racer_rocket_cost        0
 set g_vehicle_racer_rocket_climbspeed  1600
 
 set g_vehicle_racer_rocket_locktarget           1
-set g_vehicle_racer_rocket_locking_time         0.35
+set g_vehicle_racer_rocket_locking_time         0.9
 set g_vehicle_racer_rocket_locking_releasetime  0.5
 set g_vehicle_racer_rocket_locked_time          4
 set g_vehicle_racer_rocket_locked_maxangle      1.8
index 1efc2f1..d91b79b 100644 (file)
@@ -29,12 +29,12 @@ set g_vehicle_raptor_bomblet_force      150
 set g_vehicle_raptor_bomblet_explode_delay 0.4
 set g_vehicle_raptor_bombs_refire       5
 
-set g_vehicle_raptor_cannon_turnspeed 60
+set g_vehicle_raptor_cannon_turnspeed 120
 set g_vehicle_raptor_cannon_turnlimit 20
 set g_vehicle_raptor_cannon_pitchlimit_up   12
 set g_vehicle_raptor_cannon_pitchlimit_down 32
 
-set g_vehicle_raptor_cannon_locktarget          1
+set g_vehicle_raptor_cannon_locktarget          0
 set g_vehicle_raptor_cannon_locking_time        0.2
 set g_vehicle_raptor_cannon_locking_releasetime 0.45
 set g_vehicle_raptor_cannon_locked_time         1
@@ -44,7 +44,7 @@ set g_vehicle_raptor_cannon_cost     1
 set g_vehicle_raptor_cannon_damage   10
 set g_vehicle_raptor_cannon_radius   60
 set g_vehicle_raptor_cannon_refire   0.03
-set g_vehicle_raptor_cannon_speed    12000
+set g_vehicle_raptor_cannon_speed    24000
 set g_vehicle_raptor_cannon_spread   0.01
 set g_vehicle_raptor_cannon_force    25
 
index 0223b09..88fba27 100644 (file)
@@ -26,14 +26,14 @@ set g_vehicle_spiderbot_speed_strafe       400
 set g_vehicle_spiderbot_movement_inertia   0.15
 set g_vehicle_spiderbot_tiltlimit          90
 
-set g_vehicle_spiderbot_minigun_damage          12       // 400 (x2) DPS 
-set g_vehicle_spiderbot_minigun_refire          0.03
+set g_vehicle_spiderbot_minigun_damage          24       // 400 (x2) DPS
+set g_vehicle_spiderbot_minigun_refire          0.06
 set g_vehicle_spiderbot_minigun_force           9
 set g_vehicle_spiderbot_minigun_spread          0.015
 set g_vehicle_spiderbot_minigun_speed           45000  // ~ 32QU
 set g_vehicle_spiderbot_minigun_bulletconstant  110
 set g_vehicle_spiderbot_minigun_ammo_cost       1
-set g_vehicle_spiderbot_minigun_ammo_max        200
+set g_vehicle_spiderbot_minigun_ammo_max        100
 set g_vehicle_spiderbot_minigun_ammo_regen      40
 set g_vehicle_spiderbot_minigun_ammo_regen_pause 1